1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

To make it easier to search for dialogue and understand what a line is supposed to mean, changed a few dialogue enums.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8503 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2017-10-31 19:18:35 +00:00
parent e4e58e81d0
commit 9c74bb75dc
8 changed files with 108 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/AimMembers.cpp
+10 -10
View File
@@ -3277,12 +3277,12 @@ BOOLEAN CanMercBeHired()
if( gMercProfiles[ gbCurrentSoldier ].bHatedTime[ i ] < 24 ) if( gMercProfiles[ gbCurrentSoldier ].bHatedTime[ i ] < 24 )
{ {
WaitForMercToFinishTalkingOrUserToClick(); WaitForMercToFinishTalkingOrUserToClick();
InitVideoFaceTalking(gbCurrentSoldier, QUOTE_HATE_MERC_1_ON_TEAM); InitVideoFaceTalking(gbCurrentSoldier, QUOTE_HATED_1_ON_TEAM );
fRetVal = FALSE; fRetVal = FALSE;
} }
else else
{ {
InitVideoFaceTalking(gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_MERC_1); InitVideoFaceTalking(gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_HATED_1 );
fRetVal = TRUE; fRetVal = TRUE;
} }
} }
@@ -3291,12 +3291,12 @@ BOOLEAN CanMercBeHired()
if( gMercProfiles[ gbCurrentSoldier ].bHatedTime[ i ] < 24 ) if( gMercProfiles[ gbCurrentSoldier ].bHatedTime[ i ] < 24 )
{ {
WaitForMercToFinishTalkingOrUserToClick(); WaitForMercToFinishTalkingOrUserToClick();
InitVideoFaceTalking(gbCurrentSoldier, QUOTE_HATE_MERC_2_ON_TEAM); InitVideoFaceTalking(gbCurrentSoldier, QUOTE_HATED_2_ON_TEAM );
fRetVal = FALSE; fRetVal = FALSE;
} }
else 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 ); // DelayMercSpeech( gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_MERC_2, 750, TRUE, FALSE );
fRetVal = TRUE; fRetVal = TRUE;
} }
@@ -3306,12 +3306,12 @@ BOOLEAN CanMercBeHired()
if( gMercProfiles[ gbCurrentSoldier ].bHatedTime[ i ] < 24 ) if( gMercProfiles[ gbCurrentSoldier ].bHatedTime[ i ] < 24 )
{ {
WaitForMercToFinishTalkingOrUserToClick(); WaitForMercToFinishTalkingOrUserToClick();
InitVideoFaceTalking(gbCurrentSoldier, QUOTE_HATE_MERC_3_ON_TEAM); InitVideoFaceTalking(gbCurrentSoldier, QUOTE_HATED_3_ON_TEAM );
fRetVal = FALSE; fRetVal = FALSE;
} }
else else
{ {
InitVideoFaceTalking(gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_MERC_3); InitVideoFaceTalking(gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_HATED_3 );
fRetVal = TRUE; fRetVal = TRUE;
} }
} }
@@ -3320,12 +3320,12 @@ BOOLEAN CanMercBeHired()
if( gMercProfiles[ gbCurrentSoldier ].bHatedTime[ i ] < 24 ) if( gMercProfiles[ gbCurrentSoldier ].bHatedTime[ i ] < 24 )
{ {
WaitForMercToFinishTalkingOrUserToClick(); WaitForMercToFinishTalkingOrUserToClick();
InitVideoFaceTalking(gbCurrentSoldier, QUOTE_HATE_MERC_4_ON_TEAM); InitVideoFaceTalking(gbCurrentSoldier, QUOTE_HATED_4_ON_TEAM );
fRetVal = FALSE; fRetVal = FALSE;
} }
else else
{ {
InitVideoFaceTalking(gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_MERC_4); InitVideoFaceTalking(gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_HATED_4 );
fRetVal = TRUE; fRetVal = TRUE;
} }
} }
@@ -3334,12 +3334,12 @@ BOOLEAN CanMercBeHired()
if( gMercProfiles[ gbCurrentSoldier ].bHatedTime[ i ] < 24 ) if( gMercProfiles[ gbCurrentSoldier ].bHatedTime[ i ] < 24 )
{ {
WaitForMercToFinishTalkingOrUserToClick(); WaitForMercToFinishTalkingOrUserToClick();
InitVideoFaceTalking(gbCurrentSoldier, QUOTE_HATE_MERC_5_ON_TEAM); InitVideoFaceTalking(gbCurrentSoldier, QUOTE_HATED_5_ON_TEAM );
fRetVal = FALSE; fRetVal = FALSE;
} }
else else
{ {
InitVideoFaceTalking(gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_MERC_5); InitVideoFaceTalking(gbCurrentSoldier, QUOTE_PERSONALITY_BIAS_WITH_HATED_5 );
fRetVal = TRUE; fRetVal = TRUE;
} }
} }
Strategic/Merc Contract.cpp
+8 -8
View File
@@ -586,15 +586,15 @@ BOOLEAN WillMercRenew( SOLDIERTYPE *pSoldier, BOOLEAN fSayQuote )
if ( fUnhappy ) if ( fUnhappy )
{ {
if( i == 0 ) if( i == 0 )
usReasonQuote = QUOTE_HATE_MERC_1_ON_TEAM_WONT_RENEW; usReasonQuote = QUOTE_HATED_1_ON_TEAM_WONT_RENEW;
else if( i == 1 ) 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 ) 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 ) 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 ) 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 // use first hated in case there are multiple
break; break;
} }
@@ -615,9 +615,9 @@ BOOLEAN WillMercRenew( SOLDIERTYPE *pSoldier, BOOLEAN fSayQuote )
{ {
// our tolerance has run out! // our tolerance has run out!
fUnhappy = TRUE; 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 ) else if ( gMercProfiles[ pSoldier->ubProfile ].bLearnToHateCount <= gMercProfiles[ pSoldier->ubProfile ].bLearnToHateTime / 2 )
{ {
pHated = FindSoldierByProfileID( bMercID, TRUE ); pHated = FindSoldierByProfileID( bMercID, TRUE );
@@ -626,7 +626,7 @@ BOOLEAN WillMercRenew( SOLDIERTYPE *pSoldier, BOOLEAN fSayQuote )
pHated->bSectorZ == pSoldier->bSectorZ ) pHated->bSectorZ == pSoldier->bSectorZ )
{ {
fUnhappy = TRUE; fUnhappy = TRUE;
usReasonQuote = QUOTE_LEARNED_TO_HATE_MERC_1_ON_TEAM_WONT_RENEW; usReasonQuote = QUOTE_LEARNED_TO_HATE_ON_TEAM_WONT_RENEW;
} }
} }
} }
Strategic/Strategic Merc Handler.cpp
+29 -29
View File
@@ -1010,32 +1010,32 @@ void UpdateBuddyAndHatedCounters( void )
// complain! // complain!
if (iLoop == 0) if (iLoop == 0)
{ {
TacticalCharacterDialogue( pSoldier, QUOTE_HATED_MERC_ONE ); TacticalCharacterDialogue( pSoldier, QUOTE_HATED_1 );
} }
else if (iLoop == 1) else if (iLoop == 1)
{ {
TacticalCharacterDialogue( pSoldier, QUOTE_HATED_MERC_TWO ); TacticalCharacterDialogue( pSoldier, QUOTE_HATED_2 );
} }
else if (iLoop == 2) else if (iLoop == 2)
{ {
if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC )
TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_MERC_THREE ); TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_3 );
else else
TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_MERC_THREE ); TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_3 );
} }
else if (iLoop == 3) else if (iLoop == 3)
{ {
if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC )
TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_MERC_FOUR ); TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_4 );
else else
TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_MERC_FOUR ); TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_4 );
} }
else if (iLoop == 4) else if (iLoop == 4)
{ {
if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC )
TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_MERC_FIVE ); TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_5 );
else else
TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_MERC_FIVE ); TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_5 );
} }
StopTimeCompression(); StopTimeCompression();
} }
@@ -1047,23 +1047,23 @@ void UpdateBuddyAndHatedCounters( void )
// MERC mercs leave now! // MERC mercs leave now!
if (iLoop == 0) if (iLoop == 0)
{ {
TacticalCharacterDialogue( pSoldier, QUOTE_MERC_QUIT_HATED1 ); TacticalCharacterDialogue( pSoldier, QUOTE_MERC_QUIT_HATED_1 );
} }
else if (iLoop == 1) else if (iLoop == 1)
{ {
TacticalCharacterDialogue( pSoldier, QUOTE_MERC_QUIT_HATED2 ); TacticalCharacterDialogue( pSoldier, QUOTE_MERC_QUIT_HATED_2 );
} }
else if (iLoop == 2) else if (iLoop == 2)
{ {
TacticalCharacterDialogue( pSoldier, QUOTE_MERC_QUIT_HATED3 ); TacticalCharacterDialogue( pSoldier, QUOTE_MERC_QUIT_HATED_3 );
} }
else if (iLoop == 3) else if (iLoop == 3)
{ {
TacticalCharacterDialogue( pSoldier, QUOTE_MERC_QUIT_HATED4 ); TacticalCharacterDialogue( pSoldier, QUOTE_MERC_QUIT_HATED_4 );
} }
else if (iLoop == 4) else if (iLoop == 4)
{ {
TacticalCharacterDialogue( pSoldier, QUOTE_MERC_QUIT_HATED5 ); TacticalCharacterDialogue( pSoldier, QUOTE_MERC_QUIT_HATED_5 );
} }
// Leave now! ( handle equipment too ).... // Leave now! ( handle equipment too )....
@@ -1076,32 +1076,32 @@ void UpdateBuddyAndHatedCounters( void )
// complain! // complain!
if (iLoop == 0) if (iLoop == 0)
{ {
TacticalCharacterDialogue( pSoldier, QUOTE_HATED_MERC_ONE ); TacticalCharacterDialogue( pSoldier, QUOTE_HATED_1 );
} }
else if (iLoop == 1) else if (iLoop == 1)
{ {
TacticalCharacterDialogue( pSoldier, QUOTE_HATED_MERC_TWO ); TacticalCharacterDialogue( pSoldier, QUOTE_HATED_2 );
} }
else if (iLoop == 2) else if (iLoop == 2)
{ {
if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC )
TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_MERC_THREE ); TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_3 );
else else
TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_MERC_THREE ); TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_3 );
} }
else if (iLoop == 3) else if (iLoop == 3)
{ {
if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC )
TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_MERC_FOUR ); TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_4 );
else else
TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_MERC_FOUR ); TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_4 );
} }
else if (iLoop == 4) else if (iLoop == 4)
{ {
if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC )
TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_MERC_FIVE ); TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_5 );
else else
TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_MERC_FIVE ); TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_5 );
} }
pProfile->ubTimeTillNextHatedComplaint = TIME_BETWEEN_HATED_COMPLAINTS - 1; pProfile->ubTimeTillNextHatedComplaint = TIME_BETWEEN_HATED_COMPLAINTS - 1;
} }
@@ -1129,32 +1129,32 @@ void UpdateBuddyAndHatedCounters( void )
// complain! // complain!
if (iLoop == 0) if (iLoop == 0)
{ {
TacticalCharacterDialogue( pSoldier, QUOTE_HATED_MERC_ONE ); TacticalCharacterDialogue( pSoldier, QUOTE_HATED_1 );
} }
else if (iLoop == 1) else if (iLoop == 1)
{ {
TacticalCharacterDialogue( pSoldier, QUOTE_HATED_MERC_TWO ); TacticalCharacterDialogue( pSoldier, QUOTE_HATED_2 );
} }
else if (iLoop == 2) else if (iLoop == 2)
{ {
if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC )
TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_MERC_THREE ); TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_3 );
else else
TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_MERC_THREE ); TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_3 );
} }
else if (iLoop == 3) else if (iLoop == 3)
{ {
if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC )
TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_MERC_FOUR ); TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_4 );
else else
TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_MERC_FOUR ); TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_4 );
} }
else if (iLoop == 4) else if (iLoop == 4)
{ {
if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) if( pSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC )
TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_MERC_FIVE ); TacticalCharacterDialogue( pSoldier, QUOTE_AIM_HATED_5 );
else else
TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_MERC_FIVE ); TacticalCharacterDialogue( pSoldier, QUOTE_NON_AIM_HATED_5 );
} }
} }
} }
Strategic/strategic.cpp
+8 -8
View File
@@ -121,32 +121,32 @@ void HandleSoldierDeadComments( SOLDIERTYPE *pSoldier )
{ {
case 0: case 0:
// buddy #1 died! // buddy #1 died!
TacticalCharacterDialogue( pTeamSoldier, QUOTE_BUDDY_ONE_KILLED ); TacticalCharacterDialogue( pTeamSoldier, QUOTE_BUDDY_1_KILLED );
break; break;
case 1: case 1:
// buddy #2 died! // buddy #2 died!
TacticalCharacterDialogue( pTeamSoldier, QUOTE_BUDDY_TWO_KILLED ); TacticalCharacterDialogue( pTeamSoldier, QUOTE_BUDDY_2_KILLED );
break; break;
case 2: case 2:
// buddy #3 died! // buddy #3 died!
if( pTeamSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) if( pTeamSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC )
TacticalCharacterDialogue( pTeamSoldier, QUOTE_AIM_BUDDY_THREE_KILLED ); TacticalCharacterDialogue( pTeamSoldier, QUOTE_AIM_BUDDY_3_KILLED );
else else
TacticalCharacterDialogue( pTeamSoldier, QUOTE_NON_AIM_BUDDY_THREE_KILLED ); TacticalCharacterDialogue( pTeamSoldier, QUOTE_NON_AIM_BUDDY_3_KILLED );
break; break;
case 3: case 3:
// buddy #4 died! // buddy #4 died!
if( pTeamSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) if( pTeamSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC )
TacticalCharacterDialogue( pTeamSoldier, QUOTE_AIM_BUDDY_FOUR_KILLED ); TacticalCharacterDialogue( pTeamSoldier, QUOTE_AIM_BUDDY_4_KILLED );
else else
TacticalCharacterDialogue( pTeamSoldier, QUOTE_NON_AIM_BUDDY_FOUR_KILLED ); TacticalCharacterDialogue( pTeamSoldier, QUOTE_NON_AIM_BUDDY_4_KILLED );
break; break;
case 4: case 4:
// buddy #5 died! // buddy #5 died!
if( pTeamSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) if( pTeamSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC )
TacticalCharacterDialogue( pTeamSoldier, QUOTE_AIM_BUDDY_FIVE_KILLED ); TacticalCharacterDialogue( pTeamSoldier, QUOTE_AIM_BUDDY_5_KILLED );
else else
TacticalCharacterDialogue( pTeamSoldier, QUOTE_NON_AIM_BUDDY_FIVE_KILLED ); TacticalCharacterDialogue( pTeamSoldier, QUOTE_NON_AIM_BUDDY_5_KILLED );
break; break;
case 5: case 5:
// learn to like buddy died! // learn to like buddy died!
Tactical/Dialogue Control.h
+42 -45
View File
@@ -36,8 +36,8 @@ enum DialogQuoteIDs
QUOTE_SPOTTED_SOMETHING_TWO, QUOTE_SPOTTED_SOMETHING_TWO,
QUOTE_OUT_OF_AMMO, QUOTE_OUT_OF_AMMO,
QUOTE_SERIOUSLY_WOUNDED, QUOTE_SERIOUSLY_WOUNDED,
QUOTE_BUDDY_ONE_KILLED, QUOTE_BUDDY_1_KILLED,
QUOTE_BUDDY_TWO_KILLED, QUOTE_BUDDY_2_KILLED,
QUOTE_LEARNED_TO_LIKE_MERC_KILLED, QUOTE_LEARNED_TO_LIKE_MERC_KILLED,
QUOTE_FORGETFULL_SLASH_CONFUSED, QUOTE_FORGETFULL_SLASH_CONFUSED,
QUOTE_JAMMED_GUN, QUOTE_JAMMED_GUN,
@@ -52,10 +52,10 @@ enum DialogQuoteIDs
QUOTE_OUT_OF_BREATH, QUOTE_OUT_OF_BREATH,
QUOTE_KILLED_AN_ENEMY, QUOTE_KILLED_AN_ENEMY,
QUOTE_KILLED_A_CREATURE, QUOTE_KILLED_A_CREATURE,
QUOTE_HATED_MERC_ONE, QUOTE_HATED_1,
//30 //30
QUOTE_HATED_MERC_TWO, QUOTE_HATED_2,
QUOTE_LEARNED_TO_HATE_MERC, QUOTE_LEARNED_TO_HATE_MERC,
QUOTE_AIM_KILLED_MIKE, QUOTE_AIM_KILLED_MIKE,
QUOTE_MERC_QUIT_LEARN_TO_HATE = QUOTE_AIM_KILLED_MIKE, QUOTE_MERC_QUIT_LEARN_TO_HATE = QUOTE_AIM_KILLED_MIKE,
@@ -75,14 +75,14 @@ enum DialogQuoteIDs
QUOTE_SOCIAL_TRAIT, QUOTE_SOCIAL_TRAIT,
QUOTE_PASSING_DISLIKE, QUOTE_PASSING_DISLIKE,
QUOTE_EXPERIENCE_GAIN, QUOTE_EXPERIENCE_GAIN,
QUOTE_PRE_NOT_SMART, QUOTE_REFUSE_TO_EATFOOD,
QUOTE_POST_NOT_SMART, QUOTE_REFUSE_TO_SMOKE,
QUOTE_HATED_1_ARRIVES, QUOTE_HATED_1_ARRIVES,
QUOTE_MERC_QUIT_HATED1 = QUOTE_HATED_1_ARRIVES, QUOTE_MERC_QUIT_HATED_1 = QUOTE_HATED_1_ARRIVES,
//50 //50
QUOTE_HATED_2_ARRIVES, 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_1_GOOD,
QUOTE_BUDDY_2_GOOD, QUOTE_BUDDY_2_GOOD,
QUOTE_LEARNED_TO_LIKE_WITNESSED, QUOTE_LEARNED_TO_LIKE_WITNESSED,
@@ -121,31 +121,31 @@ enum DialogQuoteIDs
//80 //80
QUOTE_REPUTATION_REFUSAL, //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_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_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_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_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_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_NON_AIM_HATED_5 = QUOTE_DEPARTING_COMMENT_CONTRACT_NOT_RENEWED_OR_48_OR_MORE,
QUOTE_HATE_MERC_1_ON_TEAM,// = 86, QUOTE_HATED_1_ON_TEAM,// = 86,
QUOTE_NON_AIM_BUDDY_3_GOOD = QUOTE_HATE_MERC_1_ON_TEAM, QUOTE_NON_AIM_BUDDY_3_GOOD = QUOTE_HATED_1_ON_TEAM,
QUOTE_HATE_MERC_2_ON_TEAM,// = 87, QUOTE_HATED_2_ON_TEAM,// = 87,
QUOTE_NON_AIM_BUDDY_4_GOOD = QUOTE_HATE_MERC_2_ON_TEAM, QUOTE_NON_AIM_BUDDY_4_GOOD = QUOTE_HATED_2_ON_TEAM,
QUOTE_LEARNED_TO_HATE_MERC_ON_TEAM,// = 88, QUOTE_LEARNED_TO_HATE_MERC_ON_TEAM,// = 88,
QUOTE_NON_AIM_BUDDY_5_GOOD = QUOTE_LEARNED_TO_HATE_MERC_ON_TEAM, QUOTE_NON_AIM_BUDDY_5_GOOD = QUOTE_LEARNED_TO_HATE_MERC_ON_TEAM,
QUOTE_CONTRACTS_OVER,// = 89, QUOTE_CONTRACTS_OVER,// = 89,
QUOTE_MERC_QUIT_HATED3 = QUOTE_CONTRACTS_OVER, QUOTE_MERC_QUIT_HATED_3 = QUOTE_CONTRACTS_OVER,
//90 //90
QUOTE_ACCEPT_CONTRACT_RENEWAL, // =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_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_1_ON_TEAM,// = 92,
QUOTE_JOINING_CAUSE_BUDDY_2_ON_TEAM,// = 93, QUOTE_JOINING_CAUSE_BUDDY_2_ON_TEAM,// = 93,
QUOTE_JOINING_CAUSE_LEARNED_TO_LIKE_BUDDY_ON_TEAM,// = 94, QUOTE_JOINING_CAUSE_LEARNED_TO_LIKE_BUDDY_ON_TEAM,// = 94,
@@ -156,9 +156,9 @@ enum DialogQuoteIDs
QUOTE_DEATH_RATE_RENEWAL, QUOTE_DEATH_RATE_RENEWAL,
//100 //100
QUOTE_HATE_MERC_1_ON_TEAM_WONT_RENEW, QUOTE_HATED_1_ON_TEAM_WONT_RENEW,
QUOTE_HATE_MERC_2_ON_TEAM_WONT_RENEW, QUOTE_HATED_2_ON_TEAM_WONT_RENEW,
QUOTE_LEARNED_TO_HATE_MERC_1_ON_TEAM_WONT_RENEW, QUOTE_LEARNED_TO_HATE_ON_TEAM_WONT_RENEW,
QUOTE_RENEWING_CAUSE_BUDDY_1_ON_TEAM, QUOTE_RENEWING_CAUSE_BUDDY_1_ON_TEAM,
QUOTE_RENEWING_CAUSE_BUDDY_2_ON_TEAM, QUOTE_RENEWING_CAUSE_BUDDY_2_ON_TEAM,
QUOTE_RENEWING_CAUSE_LEARNED_TO_LIKE_BUDDY_ON_TEAM, QUOTE_RENEWING_CAUSE_LEARNED_TO_LIKE_BUDDY_ON_TEAM,
@@ -171,8 +171,8 @@ enum DialogQuoteIDs
QUOTE_IMPATIENT_QUOTE, QUOTE_IMPATIENT_QUOTE,
QUOTE_LENGTH_OF_CONTRACT, QUOTE_LENGTH_OF_CONTRACT,
QUOTE_COMMENT_BEFORE_HANG_UP, QUOTE_COMMENT_BEFORE_HANG_UP,
QUOTE_PERSONALITY_BIAS_WITH_MERC_1, QUOTE_PERSONALITY_BIAS_WITH_HATED_1,
QUOTE_PERSONALITY_BIAS_WITH_MERC_2, QUOTE_PERSONALITY_BIAS_WITH_HATED_2,
QUOTE_MERC_LEAVING_ALSUCO_SOON, QUOTE_MERC_LEAVING_ALSUCO_SOON,
QUOTE_MERC_GONE_UP_IN_PRICE, QUOTE_MERC_GONE_UP_IN_PRICE,
#ifdef JA2UB #ifdef JA2UB
@@ -180,14 +180,14 @@ enum DialogQuoteIDs
QUOTE_ENTER_SECTOR_WITH_FAN_2, QUOTE_ENTER_SECTOR_WITH_FAN_2,
#endif #endif
QUOTE_AIM_BUDDY_THREE_KILLED = 119, QUOTE_AIM_BUDDY_3_KILLED = 119,
//120 //120
QUOTE_AIM_BUDDY_FOUR_KILLED, QUOTE_AIM_BUDDY_4_KILLED,
QUOTE_AIM_BUDDY_FIVE_KILLED, QUOTE_AIM_BUDDY_5_KILLED,
QUOTE_AIM_HATED_MERC_THREE, QUOTE_AIM_HATED_3,
QUOTE_AIM_HATED_MERC_FOUR, QUOTE_AIM_HATED_4,
QUOTE_AIM_HATED_MERC_FIVE, QUOTE_AIM_HATED_5,
QUOTE_HATED_3_ARRIVES, QUOTE_HATED_3_ARRIVES,
QUOTE_HATED_4_ARRIVES, QUOTE_HATED_4_ARRIVES,
QUOTE_HATED_5_ARRIVES, QUOTE_HATED_5_ARRIVES,
@@ -196,27 +196,24 @@ enum DialogQuoteIDs
//130 //130
QUOTE_AIM_BUDDY_5_GOOD, QUOTE_AIM_BUDDY_5_GOOD,
QUOTE_HATE_MERC_3_ON_TEAM, QUOTE_HATED_3_ON_TEAM,
QUOTE_HATE_MERC_4_ON_TEAM, QUOTE_HATED_4_ON_TEAM,
QUOTE_HATE_MERC_5_ON_TEAM, QUOTE_HATED_5_ON_TEAM,
QUOTE_JOINING_CAUSE_BUDDY_3_ON_TEAM, QUOTE_JOINING_CAUSE_BUDDY_3_ON_TEAM,
QUOTE_JOINING_CAUSE_BUDDY_4_ON_TEAM, QUOTE_JOINING_CAUSE_BUDDY_4_ON_TEAM,
QUOTE_JOINING_CAUSE_BUDDY_5_ON_TEAM, QUOTE_JOINING_CAUSE_BUDDY_5_ON_TEAM,
QUOTE_HATE_MERC_3_ON_TEAM_WONT_RENEW, QUOTE_HATED_3_ON_TEAM_WONT_RENEW,
QUOTE_HATE_MERC_4_ON_TEAM_WONT_RENEW, QUOTE_HATED_4_ON_TEAM_WONT_RENEW,
QUOTE_HATE_MERC_5_ON_TEAM_WONT_RENEW, QUOTE_HATED_5_ON_TEAM_WONT_RENEW,
//140 //140
QUOTE_RENEWING_CAUSE_BUDDY_3_ON_TEAM, QUOTE_RENEWING_CAUSE_BUDDY_3_ON_TEAM,
QUOTE_RENEWING_CAUSE_BUDDY_4_ON_TEAM, QUOTE_RENEWING_CAUSE_BUDDY_4_ON_TEAM,
QUOTE_RENEWING_CAUSE_BUDDY_5_ON_TEAM, QUOTE_RENEWING_CAUSE_BUDDY_5_ON_TEAM,
QUOTE_PERSONALITY_BIAS_WITH_MERC_3, QUOTE_PERSONALITY_BIAS_WITH_HATED_3,
QUOTE_PERSONALITY_BIAS_WITH_MERC_4, QUOTE_PERSONALITY_BIAS_WITH_HATED_4,
QUOTE_PERSONALITY_BIAS_WITH_MERC_5, QUOTE_PERSONALITY_BIAS_WITH_HATED_5,
};
} ;
#define DEFAULT_EXTERN_PANEL_X_POS 320 #define DEFAULT_EXTERN_PANEL_X_POS 320
Tactical/Food.cpp
+2 -2
View File
@@ -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) ) ((Food[foodtype].bDrinkPoints > 0 && pSoldier->bDrinkLevel > FoodMoraleMods[FOOD_MERC_REFUSAL].bThreshold) || Food[foodtype].bDrinkPoints <= 0) )
{ {
// Say quote! // Say quote!
TacticalCharacterDialogue( pSoldier, QUOTE_PRE_NOT_SMART ); TacticalCharacterDialogue( pSoldier, QUOTE_REFUSE_TO_EATFOOD );
return TRUE; 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 ); ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, szFoodTextStr[STR_FOOD_DONOTWANT_DRINK], pSoldier->GetName( ), Item[pObj->usItem].szItemName );
// Say quote! // Say quote!
TacticalCharacterDialogue( pSoldier, QUOTE_PRE_NOT_SMART ); TacticalCharacterDialogue( pSoldier, QUOTE_REFUSE_TO_EATFOOD );
return TRUE; return TRUE;
} }
Tactical/Overhead.cpp
+8 -8
View File
@@ -3506,32 +3506,32 @@ void HandlePlayerTeamMemberDeath( SOLDIERTYPE *pSoldier )
{ {
case 0: case 0:
// buddy #1 died! // buddy #1 died!
TacticalCharacterDialogue( pTeamSoldier, QUOTE_BUDDY_ONE_KILLED ); TacticalCharacterDialogue( pTeamSoldier, QUOTE_BUDDY_1_KILLED );
break; break;
case 1: case 1:
// buddy #2 died! // buddy #2 died!
TacticalCharacterDialogue( pTeamSoldier, QUOTE_BUDDY_TWO_KILLED ); TacticalCharacterDialogue( pTeamSoldier, QUOTE_BUDDY_2_KILLED );
break; break;
case 2: case 2:
// buddy #3 died! // buddy #3 died!
if( pTeamSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) if( pTeamSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC )
TacticalCharacterDialogue( pTeamSoldier, QUOTE_AIM_BUDDY_THREE_KILLED ); TacticalCharacterDialogue( pTeamSoldier, QUOTE_AIM_BUDDY_3_KILLED );
else else
TacticalCharacterDialogue( pTeamSoldier, QUOTE_NON_AIM_BUDDY_THREE_KILLED ); TacticalCharacterDialogue( pTeamSoldier, QUOTE_NON_AIM_BUDDY_3_KILLED );
break; break;
case 3: case 3:
// buddy #4 died! // buddy #4 died!
if( pTeamSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) if( pTeamSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC )
TacticalCharacterDialogue( pTeamSoldier, QUOTE_AIM_BUDDY_FOUR_KILLED ); TacticalCharacterDialogue( pTeamSoldier, QUOTE_AIM_BUDDY_4_KILLED );
else else
TacticalCharacterDialogue( pTeamSoldier, QUOTE_NON_AIM_BUDDY_FOUR_KILLED ); TacticalCharacterDialogue( pTeamSoldier, QUOTE_NON_AIM_BUDDY_4_KILLED );
break; break;
case 4: case 4:
// buddy #5 died! // buddy #5 died!
if( pTeamSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC ) if( pTeamSoldier->ubWhatKindOfMercAmI == MERC_TYPE__AIM_MERC )
TacticalCharacterDialogue( pTeamSoldier, QUOTE_AIM_BUDDY_FIVE_KILLED ); TacticalCharacterDialogue( pTeamSoldier, QUOTE_AIM_BUDDY_5_KILLED );
else else
TacticalCharacterDialogue( pTeamSoldier, QUOTE_NON_AIM_BUDDY_FIVE_KILLED ); TacticalCharacterDialogue( pTeamSoldier, QUOTE_NON_AIM_BUDDY_5_KILLED );
break; break;
case 5: case 5:
// learn to like buddy died! // learn to like buddy died!
Tactical/Soldier Control.cpp
+1 -1
View File
@@ -23707,7 +23707,7 @@ BOOLEAN ApplyConsumable( SOLDIERTYPE* pSoldier, OBJECTTYPE *pObj, BOOLEAN fForce
if ( Item[pObj->usItem].cigarette && pSoldier->GetBackgroundValue( BG_SMOKERTYPE ) == 2 ) if ( Item[pObj->usItem].cigarette && pSoldier->GetBackgroundValue( BG_SMOKERTYPE ) == 2 )
{ {
// merc gets slightly pissed by the player even suggesting this // 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 ); pSoldier->aiData.bMorale = max( 0, pSoldier->aiData.bMorale - 1 );
return FALSE; return FALSE;