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

- New feature: sector fortification allows to construct structures in sectors in a much easier way than by using amerc to build 'by hand'. Fortification nodes are in a subfolder in Profiles and can easily be altered and exchanged, even in an ongoing game.

Browse Source 
Fully savegame compatible.
GameDir >= r2296 is recommended, but not required.
- Cleaned up cover display functions.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8094 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2016-03-06 12:44:57 +00:00
parent 7e7476a4ea
commit 12ae810316
36 changed files with 5175 additions and 3307 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/Text.h
+3
View File
@@ -2931,6 +2931,9 @@ extern STR16 szMilitiaStrategicMovementText[];
// Flugente: enemy heli/SAM
extern STR16 szEnemyHeliText[];
// Flugente: fortification
extern STR16 szFortificationText[];
#define TACTICAL_INVENTORY_DIALOG_NUM 16
#define TACTICAL_COVER_DIALOG_NUM 16
Utils/_ChineseText.cpp
+20 -4
View File
@@ -2463,6 +2463,7 @@ STR16 pAssignmentStrings[] =
L"医生",// administering medical aid
L"病人", // getting medical aid
L"修理", // repairing
L"Fortify", // build structures according to external layout // TODO.Translate
};
@@ -2564,6 +2565,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"医生",
L"病人",
L"修理",
L"Fortify sector", // build structures according to external layout // TODO.Translate
};
@@ -2624,6 +2626,7 @@ STR16 pLongAssignmentStrings[] =
L"医生",
L"病人",
L"修理",
L"Fortify sector", // build structures according to external layout // TODO.Translate
};
@@ -2744,6 +2747,7 @@ STR16 pAssignMenuStrings[] =
L"告发", // anv: snitch actions
L"训练",
L"搬运物品", // get items
L"Fortify", // fortify sector // TODO.Translate
L"设施", // the merc is using/staffing a facility //ham3.6
L"取消",
};
@@ -8916,6 +8920,7 @@ STR16 szBackgroundText_Value[]=
L"吸烟者", //L"Smoker",
L"非吸烟者", //L"Nonsmoker",
L" %s%d%% 如果敌人 CTH 蹲在厚覆盖他们的方向\n", //L" %s%d%% enemy CTH if crouched against thick cover in their direction\n",
L" %s%d%% building speed\n",
};
STR16 szBackgroundTitleText[] =
@@ -9786,7 +9791,7 @@ STR16 szTacticalCoverDialogString[]=
L"",
L"角色", //L"Roles",
L"",
L"Fortification", // TODO.Translate
L"跟踪者",// L"Tracker",
L"",
@@ -9809,9 +9814,9 @@ STR16 szTacticalCoverDialogPrintString[]=
L"显示佣兵视野",
L"",
L"",
L"",
L"",
L"Display enemy role symbols", // TODO.Translate
L"Display planned fortifications",
L"Display enemy tracks",
L"",
L"显示绊线网络",
@@ -10862,6 +10867,17 @@ STR16 szEnemyHeliText[] = // TODO.Translate
L"SAM in %s fires at enemy helicopter in %s.",
};
STR16 szFortificationText[] =
{
L"No valid structure selected, nothing added to build plan.",
L"No gridno found to create items in %s - created items are lost.",
L"Structures could not be built in %s - people are in the way.",
L"Structures could not be built in %s - the following items are required:",
L"No fitting fortifications found for tileset %d: %s",
L"Tileset %d: %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
Utils/_DutchText.cpp
+20 -4
View File
@@ -2461,6 +2461,7 @@ STR16 pAssignmentStrings[] =
L"Dokter", // administering medical aid
L"Patiënt", // getting medical aid
L"Repareer", // repairing
L"Fortify", // build structures according to external layout // TODO.Translate
};
@@ -2562,6 +2563,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Dokter", // administering medical aid
L"Patiënt", // getting medical aid
L"Repareer", // repairing
L"Fortify sector", // build structures according to external layout // TODO.Translate
};
@@ -2622,6 +2624,7 @@ STR16 pLongAssignmentStrings[] =
L"Dokter", // administering medical aid
L"Patiënt", // getting medical aid
L"Repareer", // repairing
L"Fortify sector", // build structures according to external layout // TODO.Translate
};
@@ -2742,6 +2745,7 @@ STR16 pAssignMenuStrings[] =
L"Snitch", // TODO.Translate // anv: snitch actions
L"Train", // the merc is training
L"Get Item", // get items // TODO.Translate
L"Fortify", // fortify sector // TODO.Translate
L"Facility", // the merc is using/staffing a facility // TODO.Translate
L"Stop", // cancel this menu
};
@@ -8930,6 +8934,7 @@ STR16 szBackgroundText_Value[]=
L"Smoker",
L"Nonsmoker",
L" %s%d%% enemy CTH if crouched against thick cover in their direction\n",
L" %s%d%% building speed\n",
};
STR16 szBackgroundTitleText[] = // TODO.Translate
@@ -9799,7 +9804,7 @@ STR16 szTacticalCoverDialogString[]=
L"",
L"Roles", // TODO.Translate
L"",
L"Fortification", // TODO.Translate
L"Tracker",
L"",
@@ -9822,9 +9827,9 @@ STR16 szTacticalCoverDialogPrintString[]=
L"Showing merc view",
L"",
L"",
L"",
L"",
L"Display enemy role symbols", // TODO.Translate
L"Display planned fortifications",
L"Display enemy tracks",
L"",
L"Display trap network",
@@ -10876,4 +10881,15 @@ STR16 szEnemyHeliText[] = // TODO.Translate
L"SAM in %s fires at enemy helicopter in %s.",
};
STR16 szFortificationText[] =
{
L"No valid structure selected, nothing added to build plan.",
L"No gridno found to create items in %s - created items are lost.",
L"Structures could not be built in %s - people are in the way.",
L"Structures could not be built in %s - the following items are required:",
L"No fitting fortifications found for tileset %d: %s",
L"Tileset %d: %s",
};
#endif //DUTCH
Utils/_EnglishText.cpp
+20 -4
View File
@@ -2462,6 +2462,7 @@ STR16 pAssignmentStrings[] =
L"Doctor", // administering medical aid
L"Patient", // getting medical aid
L"Repair", // repairing
L"Fortify", // build structures according to external layout
};
@@ -2563,6 +2564,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Doctor",
L"Patient",
L"Repair",
L"Fortify sector", // build structures according to external layout
};
@@ -2623,6 +2625,7 @@ STR16 pLongAssignmentStrings[] =
L"Doctor",
L"Patient",
L"Repair",
L"Fortify sector", // build structures according to external layout
};
@@ -2743,6 +2746,7 @@ STR16 pAssignMenuStrings[] =
L"Snitch", // anv: snitch actions
L"Train", // the merc is training
L"Get Item", // move items
L"Fortify", // fortify sector
L"Facility", // the merc is using/staffing a facility
L"Cancel", // cancel this menu
};
@@ -8914,6 +8918,7 @@ STR16 szBackgroundText_Value[]=
L"Smoker",
L"Nonsmoker",
L" %s%d%% enemy CTH if crouched against thick cover in their direction\n",
L" %s%d%% building speed\n",
};
STR16 szBackgroundTitleText[] =
@@ -9837,7 +9842,7 @@ STR16 szTacticalCoverDialogString[]=
L"",
L"Roles",
L"",
L"Fortification",
L"Tracker",
L"",
@@ -9860,9 +9865,9 @@ STR16 szTacticalCoverDialogPrintString[]=
L"Showing merc view",
L"",
L"",
L"",
L"",
L"Display enemy role symbols",
L"Display planned fortifications",
L"Display enemy tracks",
L"",
L"Display trap network",
@@ -10914,4 +10919,15 @@ STR16 szEnemyHeliText[] =
L"SAM in %s fires at enemy helicopter in %s.",
};
STR16 szFortificationText[] =
{
L"No valid structure selected, nothing added to build plan.",
L"No gridno found to create items in %s - created items are lost.",
L"Structures could not be built in %s - people are in the way.",
L"Structures could not be built in %s - the following items are required:",
L"No fitting fortifications found for tileset %d: %s",
L"Tileset %d: %s",
};
#endif //ENGLISH
Utils/_FrenchText.cpp
+20 -4
View File
@@ -2470,6 +2470,7 @@ STR16 pAssignmentStrings[] =
L"Docteur", // administering medical aid
L"Patient(e)", // getting medical aid
L"Réparat.", // repairing
L"Fortify", // build structures according to external layout // TODO.Translate
};
@@ -2571,6 +2572,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Docteur",
L"Patient",
L"Réparation",
L"Fortify sector", // build structures according to external layout // TODO.Translate
};
@@ -2631,6 +2633,7 @@ STR16 pLongAssignmentStrings[] =
L"Docteur",
L"Patient",
L"Réparation",
L"Fortify sector", // build structures according to external layout // TODO.Translate
};
@@ -2751,6 +2754,7 @@ STR16 pAssignMenuStrings[] =
L"Infiltré", // anv: snitch actions
L"Formation", // the merc is training
L"Dépl obj.", // move items
L"Fortify", // fortify sector // TODO.Translate
L"Affectat.", // the merc is using/staffing a facility
L"Annuler", // cancel this menu
};
@@ -8915,6 +8919,7 @@ STR16 szBackgroundText_Value[]=
L"Smoker",
L"Nonsmoker",
L" %s%d%% enemy CTH if crouched against thick cover in their direction\n",
L" %s%d%% building speed\n",
};
STR16 szBackgroundTitleText[] =
@@ -9784,7 +9789,7 @@ STR16 szTacticalCoverDialogString[]=
L"",
L"Roles", // TODO.Translate
L"",
L"Fortification", // TODO.Translate
L"Tracker",
L"",
@@ -9807,9 +9812,9 @@ STR16 szTacticalCoverDialogPrintString[]=
L"Afficher la vue du mercenaire",
L"",
L"",
L"",
L"",
L"Display enemy role symbols", // TODO.Translate
L"Display planned fortifications",
L"Display enemy tracks",
L"",
L"Afficher réseau (piège)",
@@ -10861,4 +10866,15 @@ STR16 szEnemyHeliText[] = // TODO.Translate
L"SAM in %s fires at enemy helicopter in %s.",
};
STR16 szFortificationText[] =
{
L"No valid structure selected, nothing added to build plan.",
L"No gridno found to create items in %s - created items are lost.",
L"Structures could not be built in %s - people are in the way.",
L"Structures could not be built in %s - the following items are required:",
L"No fitting fortifications found for tileset %d: %s",
L"Tileset %d: %s",
};
#endif //FRENCH
Utils/_GermanText.cpp
+20 -4
View File
@@ -2475,6 +2475,7 @@ STR16 pAssignmentStrings[] =
L"Doktor", // administering medical aid
L"Patient", // getting medical aid
L"Repar.", // repairing
L"Fortify", // build structures according to external layout // TODO.Translate
};
STR16 pMilitiaString[] =
@@ -2572,6 +2573,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Doktor",
L"Patient",
L"Reparieren",
L"Fortify sector", // build structures according to external layout // TODO.Translate
};
// refer to above for comments
@@ -2630,6 +2632,7 @@ STR16 pLongAssignmentStrings[] =
L"Doktor",
L"Patient",
L"Reparieren",
L"Fortify sector", // build structures according to external layout // TODO.Translate
};
// the contract options
@@ -2746,6 +2749,7 @@ STR16 pAssignMenuStrings[] =
L"Snitch", // TODO.Translate // anv: snitch actions
L"Training", // the merc is training
L"Umzug", // move items
L"Fortify", // fortify sector // TODO.Translate
L"Betrieb", // the merc is using/staffing a facility
L"Abbrechen", // cancel this menu
};
@@ -8746,6 +8750,7 @@ STR16 szBackgroundText_Value[]=
L"Smoker",
L"Nonsmoker",
L" %s%d%% enemy CTH if crouched against thick cover in their direction\n",
L" %s%d%% building speed\n",
};
STR16 szBackgroundTitleText[] = // TODO.Translate
@@ -9615,7 +9620,7 @@ STR16 szTacticalCoverDialogString[]=
L"",
L"Roles", // TODO.Translate
L"",
L"Fortification", // TODO.Translate
L"Tracker",
L"",
@@ -9638,9 +9643,9 @@ STR16 szTacticalCoverDialogPrintString[]=
L"Showing merc view",
L"",
L"",
L"",
L"",
L"Display enemy role symbols", // TODO.Translate
L"Display planned fortifications",
L"Display enemy tracks",
L"",
L"Display trap network",
@@ -10692,4 +10697,15 @@ STR16 szEnemyHeliText[] = // TODO.Translate
L"SAM in %s fires at enemy helicopter in %s.",
};
STR16 szFortificationText[] =
{
L"No valid structure selected, nothing added to build plan.",
L"No gridno found to create items in %s - created items are lost.",
L"Structures could not be built in %s - people are in the way.",
L"Structures could not be built in %s - the following items are required:",
L"No fitting fortifications found for tileset %d: %s",
L"Tileset %d: %s",
};
#endif //GERMAN
Utils/_ItalianText.cpp
+20 -4
View File
@@ -2456,6 +2456,7 @@ STR16 pAssignmentStrings[] =
L"Dottore", // administering medical aid
L"Paziente", // getting medical aid
L"Riparare", // repairing
L"Fortify", // build structures according to external layout // TODO.Translate
};
@@ -2557,6 +2558,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Dottore",
L"Paziente",
L"Riparare",
L"Fortify sector", // build structures according to external layout // TODO.Translate
};
@@ -2617,6 +2619,7 @@ STR16 pLongAssignmentStrings[] =
L"Dottore",
L"Paziente",
L"Ripara",
L"Fortify sector", // build structures according to external layout // TODO.Translate
};
@@ -2737,6 +2740,7 @@ STR16 pAssignMenuStrings[] =
L"Snitch", // TODO.Translate // anv: snitch actions
L"Si esercita", // the merc is training
L"Get Item", // get items // TODO.Translate
L"Fortify", // fortify sector // TODO.Translate
L"Facility", // the merc is using/staffing a facility // TODO.Translate
L"Annulla", // cancel this menu
};
@@ -8924,6 +8928,7 @@ STR16 szBackgroundText_Value[]=
L"Smoker",
L"Nonsmoker",
L" %s%d%% enemy CTH if crouched against thick cover in their direction\n",
L" %s%d%% building speed\n",
};
STR16 szBackgroundTitleText[] = // TODO.Translate
@@ -9793,7 +9798,7 @@ STR16 szTacticalCoverDialogString[]=
L"",
L"Roles", // TODO.Translate
L"",
L"Fortification", // TODO.Translate
L"Tracker",
L"",
@@ -9816,9 +9821,9 @@ STR16 szTacticalCoverDialogPrintString[]=
L"Showing merc view",
L"",
L"",
L"",
L"",
L"Display enemy role symbols", // TODO.Translate
L"Display planned fortifications",
L"Display enemy tracks",
L"",
L"Display trap network",
@@ -10870,4 +10875,15 @@ STR16 szEnemyHeliText[] = // TODO.Translate
L"SAM in %s fires at enemy helicopter in %s.",
};
STR16 szFortificationText[] =
{
L"No valid structure selected, nothing added to build plan.",
L"No gridno found to create items in %s - created items are lost.",
L"Structures could not be built in %s - people are in the way.",
L"Structures could not be built in %s - the following items are required:",
L"No fitting fortifications found for tileset %d: %s",
L"Tileset %d: %s",
};
#endif //ITALIAN
Utils/_PolishText.cpp
+20 -4
View File
@@ -2468,6 +2468,7 @@ STR16 pAssignmentStrings[] =
L"Lekarz", // administering medical aid
L"Pacjent", // getting medical aid
L"Naprawa", // repairing
L"Fortify", // build structures according to external layout // TODO.Translate
};
@@ -2569,6 +2570,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Lekarz",
L"Pacjent",
L"Naprawa",
L"Fortify sector", // build structures according to external layout // TODO.Translate
};
@@ -2629,6 +2631,7 @@ STR16 pLongAssignmentStrings[] =
L"Lekarz",
L"Pacjent",
L"Naprawa",
L"Fortify sector", // build structures according to external layout // TODO.Translate
};
@@ -2749,6 +2752,7 @@ STR16 pAssignMenuStrings[] =
L"Kapuś", // anv: snitch actions
L"Szkolenie", // the merc is training
L"Get Item", // get items // TODO.Translate
L"Fortify", // fortify sector // TODO.Translate
L"Facility", // the merc is using/staffing a facility // TODO.Translate
L"Anuluj", // cancel this menu
};
@@ -8937,6 +8941,7 @@ STR16 szBackgroundText_Value[]=
L"Smoker",
L"Nonsmoker",
L" %s%d%% enemy CTH if crouched against thick cover in their direction\n",
L" %s%d%% building speed\n",
};
STR16 szBackgroundTitleText[] = // TODO.Translate
@@ -9806,7 +9811,7 @@ STR16 szTacticalCoverDialogString[]=
L"",
L"Roles", // TODO.Translate
L"",
L"Fortification", // TODO.Translate
L"Tracker",
L"",
@@ -9829,9 +9834,9 @@ STR16 szTacticalCoverDialogPrintString[]=
L"Showing merc view",
L"",
L"",
L"",
L"",
L"Display enemy role symbols", // TODO.Translate
L"Display planned fortifications",
L"Display enemy tracks",
L"",
L"Display trap network",
@@ -10883,4 +10888,15 @@ STR16 szEnemyHeliText[] = // TODO.Translate
L"SAM in %s fires at enemy helicopter in %s.",
};
STR16 szFortificationText[] =
{
L"No valid structure selected, nothing added to build plan.",
L"No gridno found to create items in %s - created items are lost.",
L"Structures could not be built in %s - people are in the way.",
L"Structures could not be built in %s - the following items are required:",
L"No fitting fortifications found for tileset %d: %s",
L"Tileset %d: %s",
};
#endif //POLISH
Utils/_RussianText.cpp
+20 -4
View File
@@ -2462,6 +2462,7 @@ STR16 pAssignmentStrings[] =
L"Медик", // administering medical aid
L"Пациент", // getting medical aid
L"Ремонт", // repairing
L"Fortify", // build structures according to external layout // TODO.Translate
};
@@ -2563,6 +2564,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Медик",
L"Пациент",
L"Ремонт",
L"Fortify sector", // build structures according to external layout // TODO.Translate
};
@@ -2623,6 +2625,7 @@ STR16 pLongAssignmentStrings[] =
L"Медик",
L"Пациент",
L"Ремонтирует",
L"Fortify sector", // build structures according to external layout // TODO.Translate
};
@@ -2743,6 +2746,7 @@ STR16 pAssignMenuStrings[] =
L"Осведомитель", // anv: snitch actions
L"Обучение", // the merc is training
L"Носильщик", // move items
L"Fortify", // fortify sector // TODO.Translate
L"Занятия", // the merc is using/staffing a facility
L"Отмена", // cancel this menu
};
@@ -8914,6 +8918,7 @@ STR16 szBackgroundText_Value[]=
L"Курит",
L"Не курит",
L" %s%d%% enemy CTH if crouched against thick cover in their direction\n",
L" %s%d%% building speed\n",
};
STR16 szBackgroundTitleText[] =
@@ -9837,7 +9842,7 @@ STR16 szTacticalCoverDialogString[]=
L"",
L"Задачи",
L"",
L"Fortification", // TODO.Translate
L"Слежение",
L"",
@@ -9860,9 +9865,9 @@ STR16 szTacticalCoverDialogPrintString[]=
L"Показывать что видит боец",
L"",
L"",
L"",
L"",
L"Display enemy role symbols", // TODO.Translate
L"Display planned fortifications",
L"Display enemy tracks",
L"",
L"Показать сеть ловушек",
@@ -10914,4 +10919,15 @@ STR16 szEnemyHeliText[] =
L"База ПВО в %s обстреляла вражеский вертолёт в %s.",
};
STR16 szFortificationText[] =
{
L"No valid structure selected, nothing added to build plan.",
L"No gridno found to create items in %s - created items are lost.",
L"Structures could not be built in %s - people are in the way.",
L"Structures could not be built in %s - the following items are required:",
L"No fitting fortifications found for tileset %d: %s",
L"Tileset %d: %s",
};
#endif //RUSSIAN