You can only curse your own family members, not people from other lines.

jasonrohrer · Apr 22, 2019 · 3744524 · 3744524
1 parent b126de6
commit 3744524
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 13 deletions.
diff --git a/documentation/changeLog.txt b/documentation/changeLog.txt
@@ -9,6 +9,8 @@ Server Fixes:
 --You can no longer curses someone by name after they've been dead for 60
   seconds.
 
+--You can only curse your own family members, not people from other lines.
+
 
 
 

diff --git a/server/curses.cpp b/server/curses.cpp
@@ -81,6 +81,7 @@ typedef struct PlayerNameRecord {
         char *name;
         char *email;
         double timeCreated;
+        int lineageEveID;
     } PlayerNameRecord;
 
 
@@ -453,7 +454,8 @@ void cursesLogDeath( char *inEmail, double inAge ) {
 
 
 // can return NULL if name not found
-static CurseRecord *findCurseRecordByName( char *inName ) {
+static CurseRecord *findCurseRecordByName( char *inName,
+                                           int *outLineageEveID ) {
 
     char *email = NULL;
 
@@ -462,6 +464,7 @@ static CurseRecord *findCurseRecordByName( char *inName ) {
 
         if( strcmp( r->name, inName ) == 0 ) {
             email = r->email;
+            *outLineageEveID = r->lineageEveID;
             break;
             }
         }
@@ -513,16 +516,24 @@ void getNewCurseTokenHolders( SimpleVector<char*> *inEmailList ) {
 
 
 
-char cursePlayer( int inGiverID, char *inGiverEmail, 
+char cursePlayer( int inGiverID, int inGiverLineageEveID, char *inGiverEmail, 
                   char *inReceiverName ) {
     stepCurses();
 
-    CurseRecord *receiverRecord = findCurseRecordByName( inReceiverName );
+    int receiverLineageEveID = 0;
+
+    CurseRecord *receiverRecord = 
+        findCurseRecordByName( inReceiverName, &receiverLineageEveID );
 
     if( receiverRecord == NULL ) {
         return false;
         }
 
+    if( receiverLineageEveID != inGiverLineageEveID ) {
+        // not in the same family, can't curse
+        return false;
+        }
+
     if( !useCurseServer && receiverRecord->bornCursed ) {
         // already getting born cursed, from local curses, 
         // leave them alone for now
@@ -580,11 +591,13 @@ char cursePlayer( int inGiverID, char *inGiverEmail,
 
 
 
-void logPlayerNameForCurses( char *inPlayerEmail, char *inPlayerName ) {
+void logPlayerNameForCurses( char *inPlayerEmail, char *inPlayerName,
+                             int inLineageEveID ) {
     // structure to track names per player
     PlayerNameRecord r = { stringDuplicate( inPlayerName ),
                            stringDuplicate( inPlayerEmail ),
-                           Time::getCurrentTime() };
+                           Time::getCurrentTime(),
+                           inLineageEveID };
 
     playerNames.push_back( r );
     }

diff --git a/server/curses.h b/server/curses.h
@@ -25,9 +25,11 @@ void getNewCurseTokenHolders( SimpleVector<char*> *inEmailList );
 
 
 // returns true of curse effective
-char cursePlayer( int inGiverID, char *inGiverEmail, char *inReceiverName );
+char cursePlayer( int inGiverID, int inGiverLineageEveID, 
+                  char *inGiverEmail, char *inReceiverName );
 
-void logPlayerNameForCurses( char *inPlayerEmail, char *inPlayerName );
+void logPlayerNameForCurses( char *inPlayerEmail, char *inPlayerName,
+                             int inLineageEveID );
 
 
 

diff --git a/server/lifeLog.cpp b/server/lifeLog.cpp
@@ -273,11 +273,12 @@ void logDeath( int inPlayerID, char *inPlayerEmail,
 
 
 
-void logName( int inPlayerID, char *inEmail, char *inName ) {
+void logName( int inPlayerID, char *inEmail, char *inName,
+              int inLineageEveID ) {
     if( nameLogFile != NULL ) {
         fprintf( nameLogFile, "%d %s\n", inPlayerID, inName );
         }
-    logPlayerNameForCurses( inEmail, inName );
+    logPlayerNameForCurses( inEmail, inName, inLineageEveID );
     }
 
 

diff --git a/server/lifeLog.h b/server/lifeLog.h
@@ -31,5 +31,5 @@ void logDeath( int inPlayerID, char *inPlayerEmail,
                char *inKillerEmail = NULL );
 
 
-void logName( int inPlayerID, char *inEmail, char *inName );
+void logName( int inPlayerID, char *inEmail, char *inName, int inLineageEveID );
 
diff --git a/server/server.cpp b/server/server.cpp
@@ -3769,6 +3769,7 @@ static void makePlayerSay( LiveObject *inPlayer, char *inToSay ) {
         strcmp( cursedName, "" ) != 0 ) {
 
         isCurse = cursePlayer( inPlayer->id,
+                               inPlayer->lineageEveID,
                                inPlayer->email,
                                cursedName );
 
@@ -10304,7 +10305,8 @@ int main() {
 
                                 logName( nextPlayer->id,
                                          nextPlayer->email,
-                                         nextPlayer->name );
+                                         nextPlayer->name,
+                                         nextPlayer->lineageEveID );
                                 playerIndicesToSendNamesAbout.push_back( i );
                                 }
                             }
@@ -10402,7 +10404,8 @@ int main() {
 
                                     logName( babyO->id,
                                              babyO->email,
-                                             babyO->name );
+                                             babyO->name,
+                                             babyO->lineageEveID );
 
                                     playerIndicesToSendNamesAbout.push_back( 
                                         getLiveObjectIndex( babyO->id ) );
@@ -10436,7 +10439,8 @@ int main() {
 
                                     logName( closestOther->id,
                                              closestOther->email,
-                                             closestOther->name );
+                                             closestOther->name,
+                                             closestOther->lineageEveID );
 
                                     playerIndicesToSendNamesAbout.push_back( 
                                         getLiveObjectIndex(