1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Feature improvement:

Browse Source 
- If MILITIA_USE_SECTOR_EQUIPMENT is TRUE and you assign a merc to the 'MOVE ITEM' assignment, you can select wether gear that the militia can use should be ignored.
- To prevent confusion, 'MOVE ITEM' has been renamed 'GETITEM'.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7517 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-09-14 14:02:16 +00:00
parent f46083515d
commit 5a0d93da94
12 changed files with 211 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/_ChineseText.cpp
+4 -4
View File
@@ -1847,7 +1847,7 @@ STR16 pAssignmentStrings[] =
L"游击队", //L"M.Militia", //training moving militia units //ham3.6
L"教练", // training a teammate
L"学员", // being trained by someone else
L"搬运物品", // move items
L"Get Item", // get items // TODO.Translate
L"兼职", // L"Staff", // operating a strategic facility //ham3.6
L"用餐", // eating at a facility (cantina etc.)
L"休息", //L"Rest",// Resting at a facility //ham3.6
@@ -1945,7 +1945,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"训练游击队",
L"教练",
L"学员",
L"搬运物品", // move items
L"Get Item", // get items // TODO.Translate
L"兼职",
L"用餐", // eating at a facility (cantina etc.)
L"休养",
@@ -2003,7 +2003,7 @@ STR16 pLongAssignmentStrings[] =
L"训练游击队", //L"Train Mobiles",
L"训练队友",
L"学员",
L"搬运物品", // move items
L"Get Item", // get items // TODO.Translate
L"兼职", //L"Staff Facility",
L"休养", //L"Rest at Facility",
L"审讯俘虏", // L"Interrogate prisoners",
@@ -2140,7 +2140,7 @@ STR16 pAssignMenuStrings[] =
L"无线电扫描", // Flugente: the merc is scanning for patrols in neighbouring sectors
L"告发", // anv: snitch actions
L"训练",
L"搬运物品", // move items
L"Get Item", // get items // TODO.Translate
L"设施", // L"Facility", // the merc is using/staffing a facility //ham3.6
L"取消",
};
Utils/_DutchText.cpp
+5 -5
View File
@@ -1844,7 +1844,7 @@ STR16 pAssignmentStrings[] =
L"M.Militia", //training moving militia units // TODO.Translate
L"Trainer", // training a teammate
L"Student", // being trained by someone else
L"Move Item", // move items // TODO.Translate
L"Get Item", // get items // TODO.Translate
L"Staff", // operating a strategic facility // TODO.Translate
L"Eat", // eating at a facility (cantina etc.) // TODO.Translate
L"Rest", // Resting at a facility // TODO.Translate
@@ -1942,7 +1942,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Training Mobile Militia", // TODO.Translate
L"Trainer", // training a teammate
L"Student", // being trained by someone else
L"Move item", // move items // TODO.Translate
L"Get Item", // get items // TODO.Translate
L"Facility Staff", // TODO.Translate
L"Eat", // eating at a facility (cantina etc.) // TODO.Translate
L"Resting at Facility", // TODO.Translate
@@ -2000,7 +2000,7 @@ STR16 pLongAssignmentStrings[] =
L"Train Mobiles", // TODO.Translate
L"Trainer", // training a teammate
L"Student", // being trained by someone else
L"Move Item", // move items // TODO.Translate
L"Get Item", // get items // TODO.Translate
L"Staff Facility", // TODO.Translate
L"Rest at Facility", // TODO.Translate
L"Interrogate prisoners", // Flugente: interrogate prisoners TODO.Translate
@@ -2137,7 +2137,7 @@ STR16 pAssignMenuStrings[] =
L"Radio Scan", // Flugente: the merc is scanning for patrols in neighbouring sectors
L"Snitch", // TODO.Translate // anv: snitch actions
L"Train", // the merc is training
L"Move Item", // move items // TODO.Translate
L"Get Item", // get items // TODO.Translate
L"Facility", // the merc is using/staffing a facility // TODO.Translate
L"Stop", // cancel this menu
};
@@ -3690,7 +3690,7 @@ STR16 pMapScreenInvenButtonHelpText[] =
L"|L|e|f|t |C|l|i|c|k: Toggle Kits\n|R|i|g|h|t |C|l|i|c|k: Show only Kits", // HEADROCK HAM 5: Filter Button
// 16 - 20
L"|L|e|f|t |C|l|i|c|k: Toggle Misc. Items\n|R|i|g|h|t |C|l|i|c|k: Show only Misc. Items", // HEADROCK HAM 5: Filter Button
L"Toggle Move Item Display", // Flugente: move item display // TODO.Translate
L"Toggle Get Item Display", // Flugente: move item display // TODO.Translate
};
STR16 pMapScreenBottomFastHelp[] =
Utils/_EnglishText.cpp
+57 -5
View File
@@ -1848,7 +1848,7 @@ STR16 pAssignmentStrings[] =
L"M.Militia", //training moving militia units
L"Trainer", // training a teammate
L"Student", // being trained by someone else
L"MoveItem", // move items
L"GetItem", // move items
L"Staff", // operating a strategic facility
L"Eat", // eating at a facility (cantina etc.)
L"Rest", // Resting at a facility
@@ -1946,7 +1946,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Training Mobile Militia", // Missing
L"Trainer",
L"Student",
L"Move item", // move items
L"Get item", // move items
L"Facility Staff", // Missing
L"Eat", // eating at a facility (cantina etc.)
L"Resting at Facility", // Missing
@@ -2004,7 +2004,7 @@ STR16 pLongAssignmentStrings[] =
L"Train Mobiles", // Missing
L"Train Teammate",
L"Student",
L"Move Item", // move items
L"Get Item", // move items
L"Staff Facility", // Missing
L"Rest at Facility", // Missing
L"Interrogate prisoners", // Flugente: interrogate prisoners
@@ -2141,7 +2141,7 @@ STR16 pAssignMenuStrings[] =
L"Radio Scan", // Flugente: the merc is scanning for patrols in neighbouring sectors
L"Snitch", // anv: snitch actions
L"Train", // the merc is training
L"Move Item", // move items
L"Get Item", // move items
L"Facility", // the merc is using/staffing a facility
L"Cancel", // cancel this menu
};
@@ -3689,7 +3689,7 @@ STR16 pMapScreenInvenButtonHelpText[] =
L"|L|e|f|t |C|l|i|c|k: Toggle Kits\n|R|i|g|h|t |C|l|i|c|k: Show only Kits", // HEADROCK HAM 5: Filter Button
// 16 - 20
L"|L|e|f|t |C|l|i|c|k: Toggle Misc. Items\n|R|i|g|h|t |C|l|i|c|k: Show only Misc. Items", // HEADROCK HAM 5: Filter Button
L"Toggle Move Item Display", // Flugente: move item display
L"Toggle Get Item Display", // Flugente: move item display
};
STR16 pMapScreenBottomFastHelp[] =
@@ -8764,6 +8764,32 @@ STR16 szCampaignStatsOperationPrefix[] =
L"Steadfast %s",
// 100
L"Narcoleptic %s",
L"Bleached %s",
L"Nail-biting %s",
L"Smite the %s",
L"Bloodthirsty %s",
L"Obese %s",
L"Scheming %s",
L"Tree-Humping %s",
L"Cheaply made %s",
L"Sanctified %s",
L"Falsely accused %s",
L"%s to the rescue",
L"Crab-people vs. %s",
L"%s in Space!!!",
L"%s vs. Godzilla",
L"Untamed %s",
L"Durable %s",
L"Brazen %s",
L"Greedy %s",
L"Midnight %s",
// 120
};
STR16 szCampaignStatsOperationSuffix[] =
@@ -8898,6 +8924,32 @@ STR16 szCampaignStatsOperationSuffix[] =
L"Mutual Fund",
// 100
L"Uniform",
L"Saber",
L"Snow Leopard",
L"Panther",
L"Centaur",
L"Scorpion",
L"Serpent",
L"Black Widow",
L"Tarantula",
L"Vulture",
L"Heretic",
L"Zombie",
L"Role-Model",
L"Hellhound",
L"Mongoose",
L"Nurse",
L"Nun",
L"",
L"",
L"",
// 120
};
STR16 szMercCompareWebSite[] =
Utils/_ItalianText.cpp
+5 -5
View File
@@ -1840,7 +1840,7 @@ STR16 pAssignmentStrings[] =
L"M.Militia", //training moving militia units // TODO.Translate
L"Istrutt.", // training a teammate
L"Studente", // being trained by someone else
L"Move Item", // move items // TODO.Translate
L"Get Item", // get items // TODO.Translate
L"Staff", // operating a strategic facility // TODO.Translate
L"Eat", // eating at a facility (cantina etc.) // TODO.Translate
L"Rest", // Resting at a facility // TODO.Translate
@@ -1938,7 +1938,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Training Mobile Militia", // TODO.Translate
L"Allenatore",
L"Studente",
L"Move item", // move items // TODO.Translate
L"Get Item", // get items // TODO.Translate
L"Facility Staff", // TODO.Translate
L"Eat", // eating at a facility (cantina etc.) // TODO.Translate
L"Resting at Facility", // TODO.Translate
@@ -1996,7 +1996,7 @@ STR16 pLongAssignmentStrings[] =
L"Train Mobiles", // TODO.Translate
L"Allena squadra",
L"Studente",
L"Move Item", // move items // TODO.Translate
L"Get Item", // get items // TODO.Translate
L"Staff Facility", // TODO.Translate
L"Rest at Facility", // TODO.Translate
L"Interrogate prisoners", // Flugente: interrogate prisoners TODO.Translate
@@ -2133,7 +2133,7 @@ STR16 pAssignMenuStrings[] =
L"Radio Scan", // Flugente: the merc is scanning for patrols in neighbouring sectors
L"Snitch", // TODO.Translate // anv: snitch actions
L"Si esercita", // the merc is training
L"Move Item", // move items // TODO.Translate
L"Get Item", // get items // TODO.Translate
L"Facility", // the merc is using/staffing a facility // TODO.Translate
L"Annulla", // cancel this menu
};
@@ -3686,7 +3686,7 @@ STR16 pMapScreenInvenButtonHelpText[] =
L"|L|e|f|t |C|l|i|c|k: Toggle Kits\n|R|i|g|h|t |C|l|i|c|k: Show only Kits", // HEADROCK HAM 5: Filter Button
// 16 - 20
L"|L|e|f|t |C|l|i|c|k: Toggle Misc. Items\n|R|i|g|h|t |C|l|i|c|k: Show only Misc. Items", // HEADROCK HAM 5: Filter Button
L"Toggle Move Item Display", // Flugente: move item display // TODO.Translate
L"Toggle Get Item Display", // Flugente: move item display // TODO.Translate
};
STR16 pMapScreenBottomFastHelp[] =
Utils/_PolishText.cpp
+5 -5
View File
@@ -1856,7 +1856,7 @@ STR16 pAssignmentStrings[] =
L"R.Samoobr.", //training moving militia units
L"Instruk.", // training a teammate
L"Uczeń", // being trained by someone else
L"Move Item", // move items // TODO.Translate
L"Get Item", // get items // TODO.Translate
L"Staff", // operating a strategic facility // TODO.Translate
L"Eat", // eating at a facility (cantina etc.) // TODO.Translate
L"Rest", // Resting at a facility // TODO.Translate
@@ -1954,7 +1954,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Training Mobile Militia", // TODO.Translate
L"Instruktor",
L"Uczeń",
L"Move item", // move items // TODO.Translate
L"Get Item", // get items // TODO.Translate
L"Facility Staff", // TODO.Translate
L"Eat", // eating at a facility (cantina etc.) // TODO.Translate
L"Resting at Facility", // TODO.Translate
@@ -2012,7 +2012,7 @@ STR16 pLongAssignmentStrings[] =
L"Train Mobiles", // TODO.Translate
L"Trenuj oddział",
L"Uczeń",
L"Move Item", // move items // TODO.Translate
L"Get Item", // get items // TODO.Translate
L"Staff Facility", // TODO.Translate
L"Rest at Facility", // TODO.Translate
L"Interrogate prisoners", // Flugente: interrogate prisoners TODO.Translate
@@ -2149,7 +2149,7 @@ STR16 pAssignMenuStrings[] =
L"Nasłuch", // Flugente: the merc is scanning for patrols in neighbouring sectors
L"Kapuś", // anv: snitch actions
L"Szkolenie", // the merc is training
L"Move Item", // move items // TODO.Translate
L"Get Item", // get items // TODO.Translate
L"Facility", // the merc is using/staffing a facility // TODO.Translate
L"Anuluj", // cancel this menu
};
@@ -3699,7 +3699,7 @@ STR16 pMapScreenInvenButtonHelpText[] =
L"|L|e|f|t |C|l|i|c|k: Toggle Kits\n|R|i|g|h|t |C|l|i|c|k: Show only Kits", // HEADROCK HAM 5: Filter Button
// 16 - 20
L"|L|e|f|t |C|l|i|c|k: Toggle Misc. Items\n|R|i|g|h|t |C|l|i|c|k: Show only Misc. Items", // HEADROCK HAM 5: Filter Button
L"Toggle Move Item Display", // Flugente: move item display // TODO.Translate
L"Toggle Get Item Display", // Flugente: move item display // TODO.Translate
};
STR16 pMapScreenBottomFastHelp[] =