diff --git a/Laptop/AimMembers.cpp b/Laptop/AimMembers.cpp index 9adb1783..b3e788db 100644 --- a/Laptop/AimMembers.cpp +++ b/Laptop/AimMembers.cpp @@ -3277,12 +3277,12 @@ BOOLEAN CanMercBeHired() if( gMercProfiles[ gbCurrentSoldier ].bHatedTime[ i ] < 24 ) { WaitForMercToFinishTalkingOrUserToClick(); - InitVideoFaceTalking(gbCurrentSoldier, QUOTE_HATE_MERC_1_ON_TEAM); + InitVideoFaceTalking(gbCurrentSoldier, QUOTE_HATED_1_ON_TEAM ); fRetVal = FALSE; } else { - InitVideoFaceTalking(gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_MERC_1); + InitVideoFaceTalking(gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_HATED_1 ); fRetVal = TRUE; } } @@ -3291,12 +3291,12 @@ BOOLEAN CanMercBeHired() if( gMercProfiles[ gbCurrentSoldier ].bHatedTime[ i ] < 24 ) { WaitForMercToFinishTalkingOrUserToClick(); - InitVideoFaceTalking(gbCurrentSoldier, QUOTE_HATE_MERC_2_ON_TEAM); + InitVideoFaceTalking(gbCurrentSoldier, QUOTE_HATED_2_ON_TEAM ); fRetVal = FALSE; } else { - InitVideoFaceTalking(gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_MERC_2); + InitVideoFaceTalking(gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_HATED_2 ); // DelayMercSpeech( gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_MERC_2, 750, TRUE, FALSE ); fRetVal = TRUE; } @@ -3306,12 +3306,12 @@ BOOLEAN CanMercBeHired() if( gMercProfiles[ gbCurrentSoldier ].bHatedTime[ i ] < 24 ) { WaitForMercToFinishTalkingOrUserToClick(); - InitVideoFaceTalking(gbCurrentSoldier, QUOTE_HATE_MERC_3_ON_TEAM); + InitVideoFaceTalking(gbCurrentSoldier, QUOTE_HATED_3_ON_TEAM ); fRetVal = FALSE; } else { - InitVideoFaceTalking(gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_MERC_3); + InitVideoFaceTalking(gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_HATED_3 ); fRetVal = TRUE; } } @@ -3320,12 +3320,12 @@ BOOLEAN CanMercBeHired() if( gMercProfiles[ gbCurrentSoldier ].bHatedTime[ i ] < 24 ) { WaitForMercToFinishTalkingOrUserToClick(); - InitVideoFaceTalking(gbCurrentSoldier, QUOTE_HATE_MERC_4_ON_TEAM); + InitVideoFaceTalking(gbCurrentSoldier, QUOTE_HATED_4_ON_TEAM ); fRetVal = FALSE; } else { - InitVideoFaceTalking(gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_MERC_4); + InitVideoFaceTalking(gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_HATED_4 ); fRetVal = TRUE; } } @@ -3334,12 +3334,12 @@ BOOLEAN CanMercBeHired() if( gMercProfiles[ gbCurrentSoldier ].bHatedTime[ i ] < 24 ) { WaitForMercToFinishTalkingOrUserToClick(); - InitVideoFaceTalking(gbCurrentSoldier, QUOTE_HATE_MERC_5_ON_TEAM); + InitVideoFaceTalking(gbCurrentSoldier, QUOTE_HATED_5_ON_TEAM ); fRetVal = FALSE; } else { - InitVideoFaceTalking(gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_MERC_5); + InitVideoFaceTalking(gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_HATED_5 ); fRetVal = TRUE; } } diff --git a/Strategic/Merc Contract.cpp b/Strategic/Merc Contract.cpp index 41c4fae9..a9c5eea5 100644 --- a/Strategic/Merc Contract.cpp +++ b/Strategic/Merc Contract.cpp @@ -586,15 +586,15 @@ BOOLEAN WillMercRenew( SOLDIERTYPE *pSoldier, BOOLEAN fSayQuote ) if ( fUnhappy ) { if( i == 0 ) - usReasonQuote = QUOTE_HATE_MERC_1_ON_TEAM_WONT_RENEW; + usReasonQuote = QUOTE_HATED_1_ON_TEAM_WONT_RENEW; else if( i == 1 ) - usReasonQuote = QUOTE_HATE_MERC_2_ON_TEAM_WONT_RENEW; + usReasonQuote = QUOTE_HATED_2_ON_TEAM_WONT_RENEW; else if( i == 2 ) - usReasonQuote = QUOTE_HATE_MERC_3_ON_TEAM_WONT_RENEW; + usReasonQuote = QUOTE_HATED_3_ON_TEAM_WONT_RENEW; else if( i == 3 ) - usReasonQuote = QUOTE_HATE_MERC_4_ON_TEAM_WONT_RENEW; + usReasonQuote = QUOTE_HATED_4_ON_TEAM_WONT_RENEW; else if( i == 4 ) - usReasonQuote = QUOTE_HATE_MERC_5_ON_TEAM_WONT_RENEW; + usReasonQuote = QUOTE_HATED_5_ON_TEAM_WONT_RENEW; // use first hated in case there are multiple break; } @@ -615,9 +615,9 @@ BOOLEAN WillMercRenew( SOLDIERTYPE *pSoldier, BOOLEAN fSayQuote ) { // our tolerance has run out! fUnhappy = TRUE; - usReasonQuote = QUOTE_LEARNED_TO_HATE_MERC_1_ON_TEAM_WONT_RENEW; + usReasonQuote = QUOTE_LEARNED_TO_HATE_ON_TEAM_WONT_RENEW; - } + } else if ( gMercProfiles[ pSoldier->ubProfile ].bLearnToHateCount <= gMercProfiles[ pSoldier->ubProfile ].bLearnToHateTime / 2 ) { pHated = FindSoldierByProfileID( bMercID, TRUE ); @@ -626,7 +626,7 @@ BOOLEAN WillMercRenew( SOLDIERTYPE *pSoldier, BOOLEAN fSayQuote ) pHated->bSectorZ == pSoldier->bSectorZ ) { fUnhappy = TRUE; - usReasonQuote = QUOTE_LEARNED_TO_HATE_MERC_1_ON_TEAM_WONT_RENEW; + usReasonQuote = QUOTE_LEARNED_TO_HATE_ON_TEAM_WONT_RENEW; } } } diff --git a/Strategic/Strategic Merc Handler.cpp b/Strategic/Strategic Merc Handler.cpp index 0082a420..8eb0f630 100644 --- a/Strategic/Strategic Merc Handler.cpp +++ b/Strategic/Strategic Merc Handler.cpp @@ -1010,32 +1010,32 @@ void UpdateBuddyAndHatedCounters( void ) // complain! if (iLoop == 0) { - TacticalCharacterDialogue( pSoldier, QUOTE_HATED_MERC_ONE ); + TacticalCharacterDialogue( pSoldier, QUOTE_HATED_1 ); } else if (iLoop == 1) { - TacticalCharacterDialogue( pSoldier, QUOTE_HATED_MERC_TWO ); + TacticalCharacterDialogue( pSoldier, QUOTE_HATED_2 ); } else if (iLoop == 2) { if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) - TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_MERC_THREE ); + TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_3 ); else - TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_MERC_THREE ); + TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_3 ); } else if (iLoop == 3) { if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) - TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_MERC_FOUR ); + TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_4 ); else - TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_MERC_FOUR ); + TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_4 ); } else if (iLoop == 4) { if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) - TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_MERC_FIVE ); + TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_5 ); else - TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_MERC_FIVE ); + TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_5 ); } StopTimeCompression(); } @@ -1047,23 +1047,23 @@ void UpdateBuddyAndHatedCounters( void ) // MERC mercs leave now! if (iLoop == 0) { - TacticalCharacterDialogue( pSoldier, QUOTE_MERC_QUIT_HATED1 ); + TacticalCharacterDialogue( pSoldier, QUOTE_MERC_QUIT_HATED_1 ); } else if (iLoop == 1) { - TacticalCharacterDialogue( pSoldier, QUOTE_MERC_QUIT_HATED2 ); + TacticalCharacterDialogue( pSoldier, QUOTE_MERC_QUIT_HATED_2 ); } else if (iLoop == 2) { - TacticalCharacterDialogue( pSoldier, QUOTE_MERC_QUIT_HATED3 ); + TacticalCharacterDialogue( pSoldier, QUOTE_MERC_QUIT_HATED_3 ); } else if (iLoop == 3) { - TacticalCharacterDialogue( pSoldier, QUOTE_MERC_QUIT_HATED4 ); + TacticalCharacterDialogue( pSoldier, QUOTE_MERC_QUIT_HATED_4 ); } else if (iLoop == 4) { - TacticalCharacterDialogue( pSoldier, QUOTE_MERC_QUIT_HATED5 ); + TacticalCharacterDialogue( pSoldier, QUOTE_MERC_QUIT_HATED_5 ); } // Leave now! ( handle equipment too ).... @@ -1076,32 +1076,32 @@ void UpdateBuddyAndHatedCounters( void ) // complain! if (iLoop == 0) { - TacticalCharacterDialogue( pSoldier, QUOTE_HATED_MERC_ONE ); + TacticalCharacterDialogue( pSoldier, QUOTE_HATED_1 ); } else if (iLoop == 1) { - TacticalCharacterDialogue( pSoldier, QUOTE_HATED_MERC_TWO ); + TacticalCharacterDialogue( pSoldier, QUOTE_HATED_2 ); } else if (iLoop == 2) { if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) - TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_MERC_THREE ); + TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_3 ); else - TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_MERC_THREE ); + TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_3 ); } else if (iLoop == 3) { if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) - TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_MERC_FOUR ); + TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_4 ); else - TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_MERC_FOUR ); + TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_4 ); } else if (iLoop == 4) { if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) - TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_MERC_FIVE ); + TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_5 ); else - TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_MERC_FIVE ); + TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_5 ); } pProfile->ubTimeTillNextHatedComplaint = TIME_BETWEEN_HATED_COMPLAINTS - 1; } @@ -1129,32 +1129,32 @@ void UpdateBuddyAndHatedCounters( void ) // complain! if (iLoop == 0) { - TacticalCharacterDialogue( pSoldier, QUOTE_HATED_MERC_ONE ); + TacticalCharacterDialogue( pSoldier, QUOTE_HATED_1 ); } else if (iLoop == 1) { - TacticalCharacterDialogue( pSoldier, QUOTE_HATED_MERC_TWO ); + TacticalCharacterDialogue( pSoldier, QUOTE_HATED_2 ); } else if (iLoop == 2) { if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) - TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_MERC_THREE ); + TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_3 ); else - TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_MERC_THREE ); + TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_3 ); } else if (iLoop == 3) { if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) - TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_MERC_FOUR ); + TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_4 ); else - TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_MERC_FOUR ); + TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_4 ); } else if (iLoop == 4) { if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) - TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_MERC_FIVE ); + TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_5 ); else - TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_MERC_FIVE ); + TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_5 ); } } } diff --git a/Strategic/strategic.cpp b/Strategic/strategic.cpp index fcc5a16e..4d618a5f 100644 --- a/Strategic/strategic.cpp +++ b/Strategic/strategic.cpp @@ -121,32 +121,32 @@ void HandleSoldierDeadComments( SOLDIERTYPE *pSoldier ) { case 0: // buddy #1 died! - TacticalCharacterDialogue( pTeamSoldier, QUOTE_BUDDY_ONE_KILLED ); + TacticalCharacterDialogue( pTeamSoldier, QUOTE_BUDDY_1_KILLED ); break; case 1: // buddy #2 died! - TacticalCharacterDialogue( pTeamSoldier, QUOTE_BUDDY_TWO_KILLED ); + TacticalCharacterDialogue( pTeamSoldier, QUOTE_BUDDY_2_KILLED ); break; case 2: // buddy #3 died! if( pTeamSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) - TacticalCharacterDialogue( pTeamSoldier, QUOTE_AIM_BUDDY_THREE_KILLED ); + TacticalCharacterDialogue( pTeamSoldier, QUOTE_AIM_BUDDY_3_KILLED ); else - TacticalCharacterDialogue( pTeamSoldier, QUOTE_NON_AIM_BUDDY_THREE_KILLED ); + TacticalCharacterDialogue( pTeamSoldier, QUOTE_NON_AIM_BUDDY_3_KILLED ); break; case 3: // buddy #4 died! if( pTeamSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) - TacticalCharacterDialogue( pTeamSoldier, QUOTE_AIM_BUDDY_FOUR_KILLED ); + TacticalCharacterDialogue( pTeamSoldier, QUOTE_AIM_BUDDY_4_KILLED ); else - TacticalCharacterDialogue( pTeamSoldier, QUOTE_NON_AIM_BUDDY_FOUR_KILLED ); + TacticalCharacterDialogue( pTeamSoldier, QUOTE_NON_AIM_BUDDY_4_KILLED ); break; case 4: // buddy #5 died! if( pTeamSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) - TacticalCharacterDialogue( pTeamSoldier, QUOTE_AIM_BUDDY_FIVE_KILLED ); + TacticalCharacterDialogue( pTeamSoldier, QUOTE_AIM_BUDDY_5_KILLED ); else - TacticalCharacterDialogue( pTeamSoldier, QUOTE_NON_AIM_BUDDY_FIVE_KILLED ); + TacticalCharacterDialogue( pTeamSoldier, QUOTE_NON_AIM_BUDDY_5_KILLED ); break; case 5: // learn to like buddy died! diff --git a/Tactical/Dialogue Control.h b/Tactical/Dialogue Control.h index a6dbd40b..44476979 100644 --- a/Tactical/Dialogue Control.h +++ b/Tactical/Dialogue Control.h @@ -36,8 +36,8 @@ enum DialogQuoteIDs QUOTE_SPOTTED_SOMETHING_TWO, QUOTE_OUT_OF_AMMO, QUOTE_SERIOUSLY_WOUNDED, - QUOTE_BUDDY_ONE_KILLED, - QUOTE_BUDDY_TWO_KILLED, + QUOTE_BUDDY_1_KILLED, + QUOTE_BUDDY_2_KILLED, QUOTE_LEARNED_TO_LIKE_MERC_KILLED, QUOTE_FORGETFULL_SLASH_CONFUSED, QUOTE_JAMMED_GUN, @@ -52,10 +52,10 @@ enum DialogQuoteIDs QUOTE_OUT_OF_BREATH, QUOTE_KILLED_AN_ENEMY, QUOTE_KILLED_A_CREATURE, - QUOTE_HATED_MERC_ONE, + QUOTE_HATED_1, //30 - QUOTE_HATED_MERC_TWO, + QUOTE_HATED_2, QUOTE_LEARNED_TO_HATE_MERC, QUOTE_AIM_KILLED_MIKE, QUOTE_MERC_QUIT_LEARN_TO_HATE = QUOTE_AIM_KILLED_MIKE, @@ -75,14 +75,14 @@ enum DialogQuoteIDs QUOTE_SOCIAL_TRAIT, QUOTE_PASSING_DISLIKE, QUOTE_EXPERIENCE_GAIN, - QUOTE_PRE_NOT_SMART, - QUOTE_POST_NOT_SMART, + QUOTE_REFUSE_TO_EATFOOD, + QUOTE_REFUSE_TO_SMOKE, QUOTE_HATED_1_ARRIVES, - QUOTE_MERC_QUIT_HATED1 = QUOTE_HATED_1_ARRIVES, + QUOTE_MERC_QUIT_HATED_1 = QUOTE_HATED_1_ARRIVES, //50 QUOTE_HATED_2_ARRIVES, - QUOTE_MERC_QUIT_HATED2 = QUOTE_HATED_2_ARRIVES, + QUOTE_MERC_QUIT_HATED_2 = QUOTE_HATED_2_ARRIVES, QUOTE_BUDDY_1_GOOD, QUOTE_BUDDY_2_GOOD, QUOTE_LEARNED_TO_LIKE_WITNESSED, @@ -121,31 +121,31 @@ enum DialogQuoteIDs //80 QUOTE_REPUTATION_REFUSAL, //80 - QUOTE_NON_AIM_BUDDY_THREE_KILLED = QUOTE_REPUTATION_REFUSAL, + QUOTE_NON_AIM_BUDDY_3_KILLED = QUOTE_REPUTATION_REFUSAL, QUOTE_DEATH_RATE_REFUSAL, //= 81, - QUOTE_NON_AIM_BUDDY_FOUR_KILLED = QUOTE_DEATH_RATE_REFUSAL, + QUOTE_NON_AIM_BUDDY_4_KILLED = QUOTE_DEATH_RATE_REFUSAL, QUOTE_LAME_REFUSAL, //= 82, - QUOTE_NON_AIM_BUDDY_FIVE_KILLED = QUOTE_LAME_REFUSAL, + QUOTE_NON_AIM_BUDDY_5_KILLED = QUOTE_LAME_REFUSAL, QUOTE_WONT_RENEW_CONTRACT_LAME_REFUSAL, //=83, - QUOTE_NON_AIM_HATED_MERC_THREE = QUOTE_WONT_RENEW_CONTRACT_LAME_REFUSAL, + QUOTE_NON_AIM_HATED_3 = QUOTE_WONT_RENEW_CONTRACT_LAME_REFUSAL, QUOTE_ANSWERING_MACHINE_MSG, //= 84, - QUOTE_NON_AIM_HATED_MERC_FOUR = QUOTE_ANSWERING_MACHINE_MSG, + QUOTE_NON_AIM_HATED_4 = QUOTE_ANSWERING_MACHINE_MSG, QUOTE_DEPARTING_COMMENT_CONTRACT_NOT_RENEWED_OR_48_OR_MORE, //=85, - QUOTE_NON_AIM_HATED_MERC_FIVE = QUOTE_DEPARTING_COMMENT_CONTRACT_NOT_RENEWED_OR_48_OR_MORE, - QUOTE_HATE_MERC_1_ON_TEAM,// = 86, - QUOTE_NON_AIM_BUDDY_3_GOOD = QUOTE_HATE_MERC_1_ON_TEAM, - QUOTE_HATE_MERC_2_ON_TEAM,// = 87, - QUOTE_NON_AIM_BUDDY_4_GOOD = QUOTE_HATE_MERC_2_ON_TEAM, + QUOTE_NON_AIM_HATED_5 = QUOTE_DEPARTING_COMMENT_CONTRACT_NOT_RENEWED_OR_48_OR_MORE, + QUOTE_HATED_1_ON_TEAM,// = 86, + QUOTE_NON_AIM_BUDDY_3_GOOD = QUOTE_HATED_1_ON_TEAM, + QUOTE_HATED_2_ON_TEAM,// = 87, + QUOTE_NON_AIM_BUDDY_4_GOOD = QUOTE_HATED_2_ON_TEAM, QUOTE_LEARNED_TO_HATE_MERC_ON_TEAM,// = 88, QUOTE_NON_AIM_BUDDY_5_GOOD = QUOTE_LEARNED_TO_HATE_MERC_ON_TEAM, QUOTE_CONTRACTS_OVER,// = 89, - QUOTE_MERC_QUIT_HATED3 = QUOTE_CONTRACTS_OVER, + QUOTE_MERC_QUIT_HATED_3 = QUOTE_CONTRACTS_OVER, //90 QUOTE_ACCEPT_CONTRACT_RENEWAL, // =90, - QUOTE_MERC_QUIT_HATED4 = QUOTE_ACCEPT_CONTRACT_RENEWAL, + QUOTE_MERC_QUIT_HATED_4 = QUOTE_ACCEPT_CONTRACT_RENEWAL, QUOTE_CONTRACT_ACCEPTANCE,// =91, - QUOTE_MERC_QUIT_HATED5 = QUOTE_CONTRACT_ACCEPTANCE, + QUOTE_MERC_QUIT_HATED_5 = QUOTE_CONTRACT_ACCEPTANCE, QUOTE_JOINING_CAUSE_BUDDY_1_ON_TEAM,// = 92, QUOTE_JOINING_CAUSE_BUDDY_2_ON_TEAM,// = 93, QUOTE_JOINING_CAUSE_LEARNED_TO_LIKE_BUDDY_ON_TEAM,// = 94, @@ -156,9 +156,9 @@ enum DialogQuoteIDs QUOTE_DEATH_RATE_RENEWAL, //100 - QUOTE_HATE_MERC_1_ON_TEAM_WONT_RENEW, - QUOTE_HATE_MERC_2_ON_TEAM_WONT_RENEW, - QUOTE_LEARNED_TO_HATE_MERC_1_ON_TEAM_WONT_RENEW, + QUOTE_HATED_1_ON_TEAM_WONT_RENEW, + QUOTE_HATED_2_ON_TEAM_WONT_RENEW, + QUOTE_LEARNED_TO_HATE_ON_TEAM_WONT_RENEW, QUOTE_RENEWING_CAUSE_BUDDY_1_ON_TEAM, QUOTE_RENEWING_CAUSE_BUDDY_2_ON_TEAM, QUOTE_RENEWING_CAUSE_LEARNED_TO_LIKE_BUDDY_ON_TEAM, @@ -171,8 +171,8 @@ enum DialogQuoteIDs QUOTE_IMPATIENT_QUOTE, QUOTE_LENGTH_OF_CONTRACT, QUOTE_COMMENT_BEFORE_HANG_UP, - QUOTE_PERSONALITY_BIAS_WITH_MERC_1, - QUOTE_PERSONALITY_BIAS_WITH_MERC_2, + QUOTE_PERSONALITY_BIAS_WITH_HATED_1, + QUOTE_PERSONALITY_BIAS_WITH_HATED_2, QUOTE_MERC_LEAVING_ALSUCO_SOON, QUOTE_MERC_GONE_UP_IN_PRICE, #ifdef JA2UB @@ -180,14 +180,14 @@ enum DialogQuoteIDs QUOTE_ENTER_SECTOR_WITH_FAN_2, #endif - QUOTE_AIM_BUDDY_THREE_KILLED = 119, + QUOTE_AIM_BUDDY_3_KILLED = 119, //120 - QUOTE_AIM_BUDDY_FOUR_KILLED, - QUOTE_AIM_BUDDY_FIVE_KILLED, - QUOTE_AIM_HATED_MERC_THREE, - QUOTE_AIM_HATED_MERC_FOUR, - QUOTE_AIM_HATED_MERC_FIVE, + QUOTE_AIM_BUDDY_4_KILLED, + QUOTE_AIM_BUDDY_5_KILLED, + QUOTE_AIM_HATED_3, + QUOTE_AIM_HATED_4, + QUOTE_AIM_HATED_5, QUOTE_HATED_3_ARRIVES, QUOTE_HATED_4_ARRIVES, QUOTE_HATED_5_ARRIVES, @@ -196,27 +196,24 @@ enum DialogQuoteIDs //130 QUOTE_AIM_BUDDY_5_GOOD, - QUOTE_HATE_MERC_3_ON_TEAM, - QUOTE_HATE_MERC_4_ON_TEAM, - QUOTE_HATE_MERC_5_ON_TEAM, + QUOTE_HATED_3_ON_TEAM, + QUOTE_HATED_4_ON_TEAM, + QUOTE_HATED_5_ON_TEAM, QUOTE_JOINING_CAUSE_BUDDY_3_ON_TEAM, QUOTE_JOINING_CAUSE_BUDDY_4_ON_TEAM, QUOTE_JOINING_CAUSE_BUDDY_5_ON_TEAM, - QUOTE_HATE_MERC_3_ON_TEAM_WONT_RENEW, - QUOTE_HATE_MERC_4_ON_TEAM_WONT_RENEW, - QUOTE_HATE_MERC_5_ON_TEAM_WONT_RENEW, + QUOTE_HATED_3_ON_TEAM_WONT_RENEW, + QUOTE_HATED_4_ON_TEAM_WONT_RENEW, + QUOTE_HATED_5_ON_TEAM_WONT_RENEW, //140 QUOTE_RENEWING_CAUSE_BUDDY_3_ON_TEAM, QUOTE_RENEWING_CAUSE_BUDDY_4_ON_TEAM, QUOTE_RENEWING_CAUSE_BUDDY_5_ON_TEAM, - QUOTE_PERSONALITY_BIAS_WITH_MERC_3, - QUOTE_PERSONALITY_BIAS_WITH_MERC_4, - QUOTE_PERSONALITY_BIAS_WITH_MERC_5, - - - -} ; + QUOTE_PERSONALITY_BIAS_WITH_HATED_3, + QUOTE_PERSONALITY_BIAS_WITH_HATED_4, + QUOTE_PERSONALITY_BIAS_WITH_HATED_5, +}; #define DEFAULT_EXTERN_PANEL_X_POS 320 diff --git a/Tactical/Food.cpp b/Tactical/Food.cpp index b930ee37..0bb043fe 100644 --- a/Tactical/Food.cpp +++ b/Tactical/Food.cpp @@ -118,7 +118,7 @@ BOOLEAN DoesSoldierRefuseToEat( SOLDIERTYPE *pSoldier, OBJECTTYPE *pObj ) ((Food[foodtype].bDrinkPoints > 0 && pSoldier->bDrinkLevel > FoodMoraleMods[FOOD_MERC_REFUSAL].bThreshold) || Food[foodtype].bDrinkPoints <= 0) ) { // Say quote! - TacticalCharacterDialogue( pSoldier, QUOTE_PRE_NOT_SMART ); + TacticalCharacterDialogue( pSoldier, QUOTE_REFUSE_TO_EATFOOD ); return TRUE; } @@ -147,7 +147,7 @@ BOOLEAN DoesSoldierRefuseToEat( SOLDIERTYPE *pSoldier, OBJECTTYPE *pObj ) ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szFoodTextStr[STR_FOOD_DONOTWANT_DRINK], pSoldier->GetName( ), Item[pObj->usItem].szItemName ); // Say quote! - TacticalCharacterDialogue( pSoldier, QUOTE_PRE_NOT_SMART ); + TacticalCharacterDialogue( pSoldier, QUOTE_REFUSE_TO_EATFOOD ); return TRUE; } diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp index 9bc7663b..a3d67cb2 100644 --- a/Tactical/Overhead.cpp +++ b/Tactical/Overhead.cpp @@ -3506,32 +3506,32 @@ void HandlePlayerTeamMemberDeath( SOLDIERTYPE *pSoldier ) { case 0: // buddy #1 died! - TacticalCharacterDialogue( pTeamSoldier, QUOTE_BUDDY_ONE_KILLED ); + TacticalCharacterDialogue( pTeamSoldier, QUOTE_BUDDY_1_KILLED ); break; case 1: // buddy #2 died! - TacticalCharacterDialogue( pTeamSoldier, QUOTE_BUDDY_TWO_KILLED ); + TacticalCharacterDialogue( pTeamSoldier, QUOTE_BUDDY_2_KILLED ); break; case 2: // buddy #3 died! if( pTeamSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) - TacticalCharacterDialogue( pTeamSoldier, QUOTE_AIM_BUDDY_THREE_KILLED ); + TacticalCharacterDialogue( pTeamSoldier, QUOTE_AIM_BUDDY_3_KILLED ); else - TacticalCharacterDialogue( pTeamSoldier, QUOTE_NON_AIM_BUDDY_THREE_KILLED ); + TacticalCharacterDialogue( pTeamSoldier, QUOTE_NON_AIM_BUDDY_3_KILLED ); break; case 3: // buddy #4 died! if( pTeamSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) - TacticalCharacterDialogue( pTeamSoldier, QUOTE_AIM_BUDDY_FOUR_KILLED ); + TacticalCharacterDialogue( pTeamSoldier, QUOTE_AIM_BUDDY_4_KILLED ); else - TacticalCharacterDialogue( pTeamSoldier, QUOTE_NON_AIM_BUDDY_FOUR_KILLED ); + TacticalCharacterDialogue( pTeamSoldier, QUOTE_NON_AIM_BUDDY_4_KILLED ); break; case 4: // buddy #5 died! if( pTeamSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) - TacticalCharacterDialogue( pTeamSoldier, QUOTE_AIM_BUDDY_FIVE_KILLED ); + TacticalCharacterDialogue( pTeamSoldier, QUOTE_AIM_BUDDY_5_KILLED ); else - TacticalCharacterDialogue( pTeamSoldier, QUOTE_NON_AIM_BUDDY_FIVE_KILLED ); + TacticalCharacterDialogue( pTeamSoldier, QUOTE_NON_AIM_BUDDY_5_KILLED ); break; case 5: // learn to like buddy died! diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp index 406acba1..d2eab411 100644 --- a/Tactical/Soldier Control.cpp +++ b/Tactical/Soldier Control.cpp @@ -23707,7 +23707,7 @@ BOOLEAN ApplyConsumable( SOLDIERTYPE* pSoldier, OBJECTTYPE *pObj, BOOLEAN fForce if ( Item[pObj->usItem].cigarette && pSoldier->GetBackgroundValue( BG_SMOKERTYPE ) == 2 ) { // merc gets slightly pissed by the player even suggesting this - TacticalCharacterDialogue( pSoldier, QUOTE_POST_NOT_SMART ); + TacticalCharacterDialogue( pSoldier, QUOTE_REFUSE_TO_SMOKE ); pSoldier->aiData.bMorale = max( 0, pSoldier->aiData.bMorale - 1 ); return FALSE;