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

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8503 3b4a5df2-a311-0410-b5c6-a8a6f20db521

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