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 a7945a63..a6ce79b4 100644 Binary files a/Laptop/mercs Files.cpp and b/Laptop/mercs Files.cpp differ 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", };