diff --git a/Strategic/Assignments.h b/Strategic/Assignments.h index c26dbcf2..48d7acb8 100644 --- a/Strategic/Assignments.h +++ b/Strategic/Assignments.h @@ -77,15 +77,15 @@ enum // Train stats defines (must match ATTRIB_MENU_ defines, and pAttributeMenuStrings ) enum{ - STRENGTH = 0, - DEXTERITY, + HEALTH = 0, AGILITY, - HEALTH, - MARKSMANSHIP, - MEDICAL, - MECHANICAL, + DEXTERITY, + STRENGTH, LEADERSHIP, + MARKSMANSHIP, + MECHANICAL, EXPLOSIVE_ASSIGN, + MEDICAL, NUM_TRAINABLE_STATS // NOTE: Wisdom isn't trainable! }; diff --git a/Strategic/Map Screen Interface.h b/Strategic/Map Screen Interface.h index 3316019f..a49d4dff 100644 --- a/Strategic/Map Screen Interface.h +++ b/Strategic/Map Screen Interface.h @@ -95,15 +95,15 @@ enum{ // attribute menu defines (must match NUM_TRAINABLE_STATS defines, and pAttributeMenuStrings ) enum { - ATTRIB_MENU_STR=0, - ATTRIB_MENU_DEX, + ATTRIB_MENU_HEA=0, ATTRIB_MENU_AGI, - ATTRIB_MENU_HEA, - ATTRIB_MENU_MARK, - ATTRIB_MENU_MED, - ATTRIB_MENU_MECH, + ATTRIB_MENU_DEX, + ATTRIB_MENU_STR, ATTRIB_MENU_LEAD, + ATTRIB_MENU_MARK, + ATTRIB_MENU_MECH, ATTRIB_MENU_EXPLOS, + ATTRIB_MENU_MED, ATTRIB_MENU_CANCEL, MAX_ATTRIBUTE_STRING_COUNT, }; diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index 5b09d0cc..1bd57e7c 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -1951,15 +1951,15 @@ STR16 pRemoveMercStrings[] = STR16 pAttributeMenuStrings[] = { - L"力量", //"Strength", - L"灵巧", //"Dexterity", - L"敏捷", //"Agility", L"生命", //"Health", - L"枪法", //"Marksmanship", - L"医疗", //"Medical", - L"机械", //"Mechanical", + L"敏捷", //"Agility", + L"灵巧", //"Dexterity", + L"力量", //"Strength", L"领导", //"Leadership", + L"枪法", //"Marksmanship", + L"机械", //"Mechanical", L"爆破", //"Explosives", + L"医疗", //"Medical", L"取消", //"Cancel", }; diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index 8cb0fa32..01a915b3 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -1948,15 +1948,15 @@ STR16 pRemoveMercStrings[] = STR16 pAttributeMenuStrings[] = { - L"Kracht", - L"Behendigheid", - L"Lenigheid", L"Gezondheid", - L"Scherpschutterskunst", - L"Medisch", - L"Mechanisch", + L"Lenigheid", + L"Behendigheid", + L"Kracht", L"Leiderschap", + L"Scherpschutterskunst", + L"Mechanisch", L"Explosief", + L"Medisch", L"Annuleren", }; diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index 60e5ee8c..2a956b60 100644 --- a/Utils/_EnglishText.cpp +++ b/Utils/_EnglishText.cpp @@ -1951,15 +1951,15 @@ STR16 pRemoveMercStrings[] = STR16 pAttributeMenuStrings[] = { - L"Strength", - L"Dexterity", - L"Agility", L"Health", - L"Marksmanship", - L"Medical", - L"Mechanical", + L"Agility", + L"Dexterity", + L"Strength", L"Leadership", + L"Marksmanship", + L"Mechanical", L"Explosives", + L"Medical", L"Cancel", }; diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index bcf178a5..cc4d4878 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -1955,15 +1955,15 @@ STR16 pRemoveMercStrings[] = STR16 pAttributeMenuStrings[] = { - L"Force", - L"Dextérité", - L"Agilité", L"Santé", - L"Tir", - L"Médecine", - L"Mécanique", + L"Agilité", + L"Dextérité", + L"Force", L"Commandement", + L"Tir", + L"Mécanique", L"Explosifs", + L"Médecine", L"Annuler", }; diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index c8e6b67c..64053d16 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -1949,15 +1949,15 @@ STR16 pRemoveMercStrings[] ={ STR16 pAttributeMenuStrings[] = { - L"Kraft", - L"Geschicklichkeit", - L"Beweglichkeit", L"Gesundheit", - L"Treffsicherheit", - L"Medizin", - L"Technik", + L"Beweglichkeit", + L"Geschicklichkeit", + L"Kraft", L"Führungsqualität", + L"Treffsicherheit", + L"Technik", L"Sprengstoffe", + L"Medizin", L"Abbrechen", }; diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 7ec25f89..55963622 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -1943,15 +1943,15 @@ STR16 pRemoveMercStrings[] = STR16 pAttributeMenuStrings[] = { - L"Forza", - L"Destrezza", - L"Agilità", L"Salute", - L"Mira", - L"Pronto socc.", - L"Meccanica", + L"Agilità", + L"Destrezza", + L"Forza", L"Comando", + L"Mira", + L"Meccanica", L"Esplosivi", + L"Pronto socc.", L"Annulla", }; diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index 41ff9b93..59252b92 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -1959,15 +1959,15 @@ STR16 pRemoveMercStrings[] = STR16 pAttributeMenuStrings[] = { - L"Siła", - L"Zręczność", - L"Zwinność", L"Zdrowie", - L"Um. strzeleckie", - L"Wiedza med.", - L"Zn. mechaniki", + L"Zwinność", + L"Zręczność", + L"Siła", L"Um. dowodzenia", + L"Um. strzeleckie", + L"Zn. mechaniki", L"Zn. mat. wyb.", + L"Wiedza med.", L"Anuluj", }; diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 248cc73f..d06c2858 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -1951,15 +1951,15 @@ STR16 pRemoveMercStrings[] = STR16 pAttributeMenuStrings[] = { - L"Сила", - L"Ловкость", - L"Проворность", L"Здоровье", - L"Меткость", - L"Медицина", - L"Механика", + L"Проворность", + L"Ловкость", + L"Сила", L"Лидерство", + L"Меткость", + L"Механика", L"Взрывчатка", + L"Медицина", L"Отмена", }; diff --git a/Utils/_TaiwaneseText.cpp b/Utils/_TaiwaneseText.cpp index 1bcc568c..0a647169 100644 --- a/Utils/_TaiwaneseText.cpp +++ b/Utils/_TaiwaneseText.cpp @@ -1951,15 +1951,15 @@ STR16 pRemoveMercStrings[] = STR16 pAttributeMenuStrings[] = { - L"Strength", - L"Dexterity", - L"Agility", L"Health", - L"Marksmanship", - L"Medical", - L"Mechanical", + L"Agility", + L"Dexterity", + L"Strength", L"Leadership", + L"Marksmanship", + L"Mechanical", L"Explosives", + L"Medical", L"Cancel", };