From f914a1da774322fe2d37b0c985ab742f4dd7e091 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Fri, 11 Jan 2013 20:24:36 +0000
Subject: [PATCH] M.E.R.C Optional Gear (by Buggler) - Added MERC optional gear
 purchase - Adopted Tais' gear cost format as previously gear cost uses
 MercProfiles.xml 'optional gear cost' value if hire without pressing any
 'gear kit' button - Added condition to settle bills first before hiring same
 merc from MERC - Added MERC starting gear hotkey - Fix for AIM starting gear
 hotkey when using old inventory - Removed unused variable in fresh_header.h

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5780 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Laptop/AimMembers.cpp      |  10 +++++-----
 Laptop/mercs Files.cpp     | Bin 127420 -> 133846 bytes
 Multiplayer/fresh_header.h |   1 -
 Utils/Text.h               |   5 ++++-
 Utils/_ChineseText.cpp     |   6 +++++-
 Utils/_DutchText.cpp       |   6 +++++-
 Utils/_EnglishText.cpp     |   8 ++++++--
 Utils/_FrenchText.cpp      |   6 +++++-
 Utils/_GermanText.cpp      |   6 +++++-
 Utils/_ItalianText.cpp     |   6 +++++-
 Utils/_PolishText.cpp      |   4 ++++
 Utils/_RussianText.cpp     |   4 ++++
 Utils/_TaiwaneseText.cpp   |  10 +++++++---
 13 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/Laptop/AimMembers.cpp b/Laptop/AimMembers.cpp
index bd832458..918cb55c 100644
--- a/Laptop/AimMembers.cpp
+++ b/Laptop/AimMembers.cpp
@@ -5174,7 +5174,7 @@ void HandleAimMemberKeyBoardInput()
 					break;
 #endif
 				case '1':
-					if(gGameExternalOptions.gfUseNewStartingGearInterface)
+					if((gGameExternalOptions.gfUseNewStartingGearInterface) && (UsingNewInventorySystem() == true))
 					{
 						// kit 1
 						//gbCurrentSoldier = AimMercArray[gbCurrentIndex];
@@ -5197,7 +5197,7 @@ void HandleAimMemberKeyBoardInput()
 					}
 				break;
 				case '2':
-					if(gGameExternalOptions.gfUseNewStartingGearInterface)
+					if((gGameExternalOptions.gfUseNewStartingGearInterface) && (UsingNewInventorySystem() == true))
 					{
 						// kit 2
 						//gbCurrentSoldier = AimMercArray[gbCurrentIndex];
@@ -5220,7 +5220,7 @@ void HandleAimMemberKeyBoardInput()
 					}
 				break;
 				case '3':
-					if(gGameExternalOptions.gfUseNewStartingGearInterface)
+					if((gGameExternalOptions.gfUseNewStartingGearInterface) && (UsingNewInventorySystem() == true))
 					{
 						// kit 3
 						//gbCurrentSoldier = AimMercArray[gbCurrentIndex];
@@ -5243,7 +5243,7 @@ void HandleAimMemberKeyBoardInput()
 					}
 				break;
 				case '4':
-					if(gGameExternalOptions.gfUseNewStartingGearInterface)
+					if((gGameExternalOptions.gfUseNewStartingGearInterface) && (UsingNewInventorySystem() == true))
 					{
 						// kit 4
 						//gbCurrentSoldier = AimMercArray[gbCurrentIndex];
@@ -5266,7 +5266,7 @@ void HandleAimMemberKeyBoardInput()
 					}
 				break;
 				case '5':
-					if(gGameExternalOptions.gfUseNewStartingGearInterface)
+					if((gGameExternalOptions.gfUseNewStartingGearInterface) && (UsingNewInventorySystem() == true))
 					{
 						// kit 5
 						//gbCurrentSoldier = AimMercArray[gbCurrentIndex];
diff --git a/Laptop/mercs Files.cpp b/Laptop/mercs Files.cpp
index a7945a63e22f783a9b5a839a8668b87b400461c9..a6ce79b46e479f690defdacd4fb47c54b4cd1207 100644
GIT binary patch
delta 5381
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

delta 2908
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

diff --git a/Multiplayer/fresh_header.h b/Multiplayer/fresh_header.h
index 353b3543..58afdf26 100644
--- a/Multiplayer/fresh_header.h
+++ b/Multiplayer/fresh_header.h
@@ -2,7 +2,6 @@
 
 //time for a new header :)
 extern int readyteamreg[10];
-extern bool NOGEAR;
 
 typedef struct
 {
diff --git a/Utils/Text.h b/Utils/Text.h
index 5bcaf36b..8e2c7faa 100644
--- a/Utils/Text.h
+++ b/Utils/Text.h
@@ -1032,11 +1032,14 @@ enum
 	MERC_FILES_ALREADY_HIRED,			//5
 	MERC_FILES_SALARY,
 	MERC_FILES_PER_DAY,
+	MERC_FILES_GEAR,
+	MERC_FILES_TOTAL,
 	MERC_FILES_MERC_IS_DEAD,
 
 	MERC_FILES_HIRE_TO_MANY_PEOPLE_WARNING,
-
+	MERC_FILES_BUY_GEAR,
 	MERC_FILES_MERC_UNAVAILABLE,
+	MERC_FILES_MERC_OUTSTANDING,
 	MERC_FILES_BIO,	//JMich_MMG: Adding two new texts for the small button, assuming we manage to add a silhouette with the gear, add it after this.
 	MERC_FILES_INVENTORY,
 	TEXT_NUM_MERC_FILES,
diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp
index ac13ec33..4638d55c 100644
--- a/Utils/_ChineseText.cpp
+++ b/Utils/_ChineseText.cpp
@@ -4202,11 +4202,15 @@ STR16			MercInfo[] =
 	L"主页",	//"Home",
 	L"已雇佣",	//"Hired",
 	L"日薪: ",	//"Salary:",
-	L"每日",		//"Per Day",
+	L"每日",	//"per Day",
+	L"可选装备: ",	//"Optional Gear:",
+	L"合计: ",	//"Total:",
 	L"阵亡",	//"Deceased",
 
 	L"看起来你雇佣了太多的佣兵。最多只能雇18人。",	//"Looks like you're trying to hire too many mercs. Your limit is 18.",
+	L"购买装备？",	//"Buy Equipment?",	
 	L"不可雇佣",	//"Unavailable",
+	L"Unsettled Bills", //TODO.Translate
 	L"生平", //L"Bio",
 	L"物品", //L"Inv",
 };
diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp
index 4b336b1a..8ce0e555 100644
--- a/Utils/_DutchText.cpp
+++ b/Utils/_DutchText.cpp
@@ -4205,10 +4205,14 @@ STR16			MercInfo[] =
 	L"Ingehuurd",
 	L"Salaris:",
 	L"Per Dag",
+	L"Aanv. Uitrusting:",
+	L"Totaal:",
 	L"Overleden",
 
 	L"Lijkt erop dat je teveel huurlingen wil recruteren. Limiet is 18.",
-	L"Niet beschikbaar",											
+	L"Koop Uitrusting?",
+	L"Niet beschikbaar",
+	L"Unsettled Bills", //TODO.Translate
 	L"Bio", //TODO.Translate
 	L"Inv",							
 };
diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp
index 66e4d8fb..35431996 100644
--- a/Utils/_EnglishText.cpp
+++ b/Utils/_EnglishText.cpp
@@ -4201,11 +4201,15 @@ STR16			MercInfo[] =
 	L"Home",
 	L"Hired",
 	L"Salary:",
-	L"Per Day",
+	L"per Day",
+	L"Optional Gear:",
+	L"Total:",
 	L"Deceased",
 
 	L"Looks like you're trying to hire too many mercs. Your limit is 18.",
-	L"Unavailable",											
+	L"Buy Equipment?",
+	L"Unavailable",
+	L"Unsettled Bills",
 	L"Bio",
 	L"Inv",
 };
diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp
index de4320ff..9bea80dd 100644
--- a/Utils/_FrenchText.cpp
+++ b/Utils/_FrenchText.cpp
@@ -4195,10 +4195,14 @@ STR16			MercInfo[] =
 	L"Engagé",
 	L"Salaire :",
 	L"Par jour",
+	L"Matériel optionnel :",
+	L"Total :",
 	L"Décédé(e)",
 
 	L"Vous ne pouvez engager plus de 18 mercenaires.",
-	L"Indisponible",											
+	L"Acheter équipement ?",
+	L"Indisponible",
+	L"Unsettled Bills", //TODO.Translate
 	L"Bio", //TODO.Translate
 	L"Inv",								
 };
diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp
index f22d1557..60a520b0 100644
--- a/Utils/_GermanText.cpp
+++ b/Utils/_GermanText.cpp
@@ -4129,10 +4129,14 @@ STR16 MercInfo[] =
 	L"Angestellt",	
 	L"Sold:",
 	L"Pro Tag",
+	L"Zusätzl. Ausrüst:",
+	L"Gesamt:",
 	L"Verstorben",	
 
 	L"Sie versuchen, zu viele Söldner anzuheuern. Sie haben die Maximalanzahl erreicht.",
-	L"nicht da",											
+	L"Ausrüstung kaufen?",
+	L"nicht da",
+	L"Unsettled Bills", //TODO.Translate
 	L"Bio", //TODO.Translate
 	L"Inv",								
 };
diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp
index 6a78c843..291c4f00 100644
--- a/Utils/_ItalianText.cpp
+++ b/Utils/_ItalianText.cpp
@@ -4193,10 +4193,14 @@ STR16			MercInfo[] =
 	L"Assoldato",
 	L"Salario:",
 	L"Al giorno",
+	L"Dispositivo opzionale:",
+	L"Totale:",
 	L"Deceduto",
 
 	L"Sembra che state arruolando troppi mercenari. Il vostro limite è di 18.",
-	L"Non disponibile",											
+	L"Compra equip.?",
+	L"Non disponibile",
+	L"Unsettled Bills", //TODO.Translate
 	L"Bio", //TODO.Translate
 	L"Inv",								
 };
diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp
index dc175f7b..ff28628c 100644
--- a/Utils/_PolishText.cpp
+++ b/Utils/_PolishText.cpp
@@ -4201,10 +4201,14 @@ STR16			MercInfo[] =
 	L"Najęty",
 	L"Koszt:",
 	L"Dziennie",
+	L"Opcjonalne wyposażenie:",
+	L"Razem:",
 	L"Nie żyje",
 
 	L"Wygląda na to, że chcesz wynająć zbyt wielu najemników. Limit wynosi 18.",
+	L"Weź sprzęt?",
 	L"Niedostępny",
+	L"Unsettled Bills", //TODO.Translate
 	L"Bio", //TODO.Translate
 	L"Inv",
 };
diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp
index c00603fa..5693335c 100644
--- a/Utils/_RussianText.cpp
+++ b/Utils/_RussianText.cpp
@@ -4192,10 +4192,14 @@ STR16			MercInfo[] =
 	L"Нанят",
 	L"Oплaтa",
 	L"в день",
+	L"Снаряжение:",
+	L"Всего:",
 	L"Погиб",
 
 	L"Похоже, вы пытаетесь нанять более 18 наемников, а это недопустимо.",
+	L"Со снаряжением?",
 	L"Недоступно",
+	L"Unsettled Bills", //TODO.Translate
 	L"Bio", //TODO.Translate
 	L"Inv",
 };
diff --git a/Utils/_TaiwaneseText.cpp b/Utils/_TaiwaneseText.cpp
index 2e0b18af..0c07f340 100644
--- a/Utils/_TaiwaneseText.cpp
+++ b/Utils/_TaiwaneseText.cpp
@@ -4205,12 +4205,16 @@ STR16			MercInfo[] =
 	L"Home",
 	L"Hired",
 	L"Salary:",
-	L"Per Day",
+	L"per Day",
+	L"Optional Gear:",
+	L"Total:",
 	L"Deceased",
 
 	L"Looks like you're trying to hire too many mercs. Your limit is 18.",
-	L"Unavailable",											
-	L"Bio", //TODO.Translate
+	L"Buy Equipment?",
+	L"Unavailable",
+	L"Unsettled Bills",									
+	L"Bio",
 	L"Inv",								
 };