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

More buddies/foes (by anv)

Browse Source 
- Currently MercProfiles.xml contains 5 records for buddies and 5 for foes + 1 per "learn to", but in code only 2 first + "learn to" are handled. I changed it so all possible buddies and foes can be used, and it's possible to add their specific like/dislike quotes to quote .edts.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6538 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-10-28 20:02:19 +00:00
parent decc986649
commit 08e6bc4aca
14 changed files with 415 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Dialogue Control.h
+62 -16
View File
@@ -120,26 +120,38 @@ enum DialogQuoteIDs
QUOTE_SPARE2,
//80
QUOTE_REPUTATION_REFUSAL,
QUOTE_DEATH_RATE_REFUSAL, //= 99,
QUOTE_REPUTATION_REFUSAL, //80
QUOTE_NON_AIM_BUDDY_THREE_KILLED = QUOTE_REPUTATION_REFUSAL,
QUOTE_DEATH_RATE_REFUSAL, //= 81,
QUOTE_NON_AIM_BUDDY_FOUR_KILLED = QUOTE_DEATH_RATE_REFUSAL,
QUOTE_LAME_REFUSAL, //= 82,
QUOTE_WONT_RENEW_CONTRACT_LAME_REFUSAL, // ARM: now unused
QUOTE_ANSWERING_MACHINE_MSG,
QUOTE_DEPARTING_COMMENT_CONTRACT_NOT_RENEWED_OR_48_OR_MORE,
QUOTE_HATE_MERC_1_ON_TEAM,// = 100,
QUOTE_HATE_MERC_2_ON_TEAM,// = 101,
QUOTE_LEARNED_TO_HATE_MERC_ON_TEAM,// = 102,
QUOTE_NON_AIM_BUDDY_FIVE_KILLED = QUOTE_LAME_REFUSAL,
QUOTE_WONT_RENEW_CONTRACT_LAME_REFUSAL, //=83,
QUOTE_NON_AIM_HATED_MERC_THREE = QUOTE_WONT_RENEW_CONTRACT_LAME_REFUSAL,
QUOTE_ANSWERING_MACHINE_MSG, //= 84,
QUOTE_NON_AIM_HATED_MERC_FOUR = 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_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,
//90
QUOTE_ACCEPT_CONTRACT_RENEWAL,
QUOTE_CONTRACT_ACCEPTANCE,
QUOTE_JOINING_CAUSE_BUDDY_1_ON_TEAM,// = 103,
QUOTE_JOINING_CAUSE_BUDDY_2_ON_TEAM,// = 104,
QUOTE_JOINING_CAUSE_LEARNED_TO_LIKE_BUDDY_ON_TEAM,// = 105,
QUOTE_ACCEPT_CONTRACT_RENEWAL, // =90,
QUOTE_MERC_QUIT_HATED4 = QUOTE_ACCEPT_CONTRACT_RENEWAL,
QUOTE_CONTRACT_ACCEPTANCE,// =91,
QUOTE_MERC_QUIT_HATED5 = 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,
QUOTE_REFUSAL_RENEW_DUE_TO_MORALE,// = 95,
QUOTE_PRECEDENT_TO_REPEATING_ONESELF,// = 106,
QUOTE_REFUSAL_TO_JOIN_LACK_OF_FUNDS,// = 107,
QUOTE_PRECEDENT_TO_REPEATING_ONESELF,// = 96,
QUOTE_REFUSAL_TO_JOIN_LACK_OF_FUNDS,// = 97,
QUOTE_DEPART_COMMET_CONTRACT_NOT_RENEWED_OR_TERMINATED_UNDER_48,// = 98,
QUOTE_DEATH_RATE_RENEWAL,
@@ -168,6 +180,40 @@ enum DialogQuoteIDs
QUOTE_ENTER_SECTOR_WITH_FAN_2,
#endif
QUOTE_AIM_BUDDY_THREE_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_HATED_3_ARRIVES,
QUOTE_HATED_4_ARRIVES,
QUOTE_HATED_5_ARRIVES,
QUOTE_AIM_BUDDY_3_GOOD,
QUOTE_AIM_BUDDY_4_GOOD,
//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_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,
//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,
} ;