New Feature: gear templates allow us to save and load a merc's equipment, thereby speeding up the equipment process.

For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23462&goto=350497&#msg_350497

Requires GameDir >= r2384

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8440 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2017-08-06 21:06:49 +00:00
parent 35cdd64a92
commit f7423782db
15 changed files with 1345 additions and 108 deletions
+4
View File
@@ -167,6 +167,7 @@ enum
SKILLMENU_CANCEL,
SKILLMENU_X_MILITIA,
SKILLMENU_ALL_MILITIA,
SKILLMENU_MORE,
};
extern STR16 pSkillMenuStrings[]; //Flugente
@@ -2992,6 +2993,9 @@ extern STR16 szInteractiveActionText[];
extern STR16 szLaptopStatText[];
// Flugente: gear templates
extern STR16 szGearTemplateText[];
#define TACTICAL_INVENTORY_DIALOG_NUM 16
#define TACTICAL_COVER_DIALOG_NUM 16
+11 -1
View File
@@ -2837,8 +2837,9 @@ STR16 pSkillMenuStrings[] =
L"其他队伍",
L"取消",
L"%d 民兵",
L"所有民兵",
L"More",
};
STR16 pSnitchMenuStrings[] =
@@ -11251,6 +11252,15 @@ STR16 szLaptopStatText[] = // TODO.Translate
L"Recruit approach",
};
STR16 szGearTemplateText[] = // TODO.Translate
{
L"Enter Template Name",
L"Not possible during combat.",
L"Selected mercenary is not in this sector.",
L"%s is not in that sector.",
L"%s could not equip %s.",
};
// WANNE: Some Chinese specific strings that needs to be in unicode!
STR16 ChineseSpecString1 = L"%"; //defined in _ChineseText.cpp as this file is already unicode
STR16 ChineseSpecString2 = L"*%3d%%%"; //defined in _ChineseText.cpp as this file is already unicode
+11 -1
View File
@@ -2836,8 +2836,9 @@ STR16 pSkillMenuStrings[] = // TODO.Translate
L"Other Squads",
L"Cancel",
L"%d Militia",
L"All Militia",
L"More",
};
// TODO.Translate
@@ -11269,4 +11270,13 @@ STR16 szLaptopStatText[] = // TODO.Translate
L"Recruit approach",
};
STR16 szGearTemplateText[] = // TODO.Translate
{
L"Enter Template Name",
L"Not possible during combat.",
L"Selected mercenary is not in this sector.",
L"%s is not in that sector.",
L"%s could not equip %s.",
};
#endif //DUTCH
+11 -1
View File
@@ -2833,8 +2833,9 @@ STR16 pSkillMenuStrings[] =
L"Other Squads",
L"Cancel",
L"%d Militia",
L"All Militia",
L"More",
};
STR16 pSnitchMenuStrings[] =
@@ -11250,4 +11251,13 @@ STR16 szLaptopStatText[] =
L"Recruit approach",
};
STR16 szGearTemplateText[] =
{
L"Enter Template Name",
L"Not possible during combat.",
L"Selected mercenary is not in this sector.",
L"%s is not in that sector.",
L"%s could not equip %s.",
};
#endif //ENGLISH
+12 -2
View File
@@ -2839,14 +2839,15 @@ STR16 pTraitSkillsDenialStrings[] =
L" - aimed gun\n",
};
STR16 pSkillMenuStrings[] = // TODO.Translate
STR16 pSkillMenuStrings[] =
{
L"Milice",
L"Autre escouade",
L"Annuler",
L"%d miliciens",
L"Tous",
L"More", // TODO.Translate
};
STR16 pSnitchMenuStrings[] =
@@ -11251,4 +11252,13 @@ STR16 szLaptopStatText[] = // TODO.Translate
L"Recruit approach",
};
STR16 szGearTemplateText[] = // TODO.Translate
{
L"Enter Template Name",
L"Not possible during combat.",
L"Selected mercenary is not in this sector.",
L"%s is not in that sector.",
L"%s could not equip %s.",
};
#endif //FRENCH
+11 -1
View File
@@ -2840,8 +2840,9 @@ STR16 pSkillMenuStrings[] = // TODO.Translate
L"Other Squads",
L"Cancel",
L"%d Militia",
L"All Militia",
L"More", // TODO.Translate
};
// TODO.Translate
@@ -11081,4 +11082,13 @@ STR16 szLaptopStatText[] = // TODO.Translate
L"Recruit approach",
};
STR16 szGearTemplateText[] = // TODO.Translate
{
L"Enter Template Name",
L"Not possible during combat.",
L"Selected mercenary is not in this sector.",
L"%s is not in that sector.",
L"%s could not equip %s.",
};
#endif //GERMAN
+11 -1
View File
@@ -2831,8 +2831,9 @@ STR16 pSkillMenuStrings[] = // TODO.Translate
L"Other Squads",
L"Cancel",
L"%d Militia",
L"All Militia",
L"More", // TODO.Translate
};
// TODO.Translate
@@ -11260,4 +11261,13 @@ STR16 szLaptopStatText[] = // TODO.Translate
L"Recruit approach",
};
STR16 szGearTemplateText[] = // TODO.Translate
{
L"Enter Template Name",
L"Not possible during combat.",
L"Selected mercenary is not in this sector.",
L"%s is not in that sector.",
L"%s could not equip %s.",
};
#endif //ITALIAN
+11 -1
View File
@@ -2843,8 +2843,9 @@ STR16 pSkillMenuStrings[] = // TODO.Translate
L"Other Squads",
L"Cancel",
L"%d Militia",
L"All Militia",
L"More", // TODO.Translate
};
STR16 pSnitchMenuStrings[] =
@@ -11273,4 +11274,13 @@ STR16 szLaptopStatText[] = // TODO.Translate
L"Recruit approach",
};
STR16 szGearTemplateText[] = // TODO.Translate
{
L"Enter Template Name",
L"Not possible during combat.",
L"Selected mercenary is not in this sector.",
L"%s is not in that sector.",
L"%s could not equip %s.",
};
#endif //POLISH
+11 -1
View File
@@ -2837,8 +2837,9 @@ STR16 pSkillMenuStrings[] =
L"Другие отряды",
L"Отмена",
L"%d ополченцев",
L"Все ополченцы",
L"More", // TODO.Translate
};
STR16 pSnitchMenuStrings[] =
@@ -11254,4 +11255,13 @@ STR16 szLaptopStatText[] = // TODO.Translate
L"Recruit approach",
};
STR16 szGearTemplateText[] = // TODO.Translate
{
L"Enter Template Name",
L"Not possible during combat.",
L"Selected mercenary is not in this sector.",
L"%s is not in that sector.",
L"%s could not equip %s.",
};
#endif //RUSSIAN