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

New Feature: strategic militia command allows ordering militia around in the map if someoen performs the STRATEGIC_MILITIA_MOVEMENT facility assignment.

Browse Source 
requires GameDir >= r1946

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6943 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-02-18 21:26:46 +00:00
parent e04bff6f61
commit cee17f5651
29 changed files with 643 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/Text.h
+4
View File
@@ -1807,6 +1807,10 @@ enum
STR_DIALOG_CREATURES_KILL_CIVILIANS,
STR_DIALOG_ENEMIES_ATTACK_UNCONCIOUSMERCS,
STR_DIALOG_CREATURES_ATTACK_UNCONCIOUSMERCS,
// Flugente: militia movement forbidden due to limited roaming
STR_MILITIAMOVEMENT_NO_LIMITEDROAMING,
TEXT_NUM_STRATEGIC_TEXT
};
Utils/_ChineseText.cpp
+17
View File
@@ -1844,6 +1844,13 @@ STR16 pAssignmentStrings[] =
L"战俘", // Prisoner of war - captured
L"伤员", // patient in a hospital
L"空车", // Vehicle is empty
L"Snitch", // facility: undercover prisoner (snitch) // TODO.Translate
L"Propag.", // facility: spread propaganda
L"Propag.", // facility: spread propaganda (globally)
L"Rumours", // facility: gather information
L"Propag.", // spread propaganda
L"Rumours", // gather information
L"Command", // militia movement orders
};
@@ -1939,6 +1946,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"搜集谣言", // facility: gather rumours
L"派发传单", // spread propaganda
L"搜集谣言", // gather information
L"Commanding Militia", // militia movement orders // TODO.Translate
};
@@ -1993,6 +2001,7 @@ STR16 pLongAssignmentStrings[] =
L"搜集谣言", // facility: gather rumours
L"派发传单", // spread propaganda
L"搜集谣言", // gather information
L"Commanding Militia", // militia movement orders // TODO.Translate
};
@@ -2784,6 +2793,8 @@ STR16 gpStrategicString[] =
//%s is the sector location -- ex: A9: Omerta
L"异形向你在分区%s的佣兵发起了攻击。你的佣兵中没人能进行战斗。",
// Flugente: militia movement forbidden due to limited roaming // TODO.Translate
L"Militia cannot move here (RESTRICT_ROAMING = TRUE).",
};
STR16 gpGameClockString[] =
@@ -7162,6 +7173,12 @@ STR16 gzFacilityAssignmentStrings[]=
L"训练领导",
L"训练爆破",
L"审讯俘虏", //L"Interrogate Prisoners",
L"Undercover Snitch", // TODO.Translate
// 36-40
L"Spread Propaganda",
L"Spread Propaganda", // spread propaganda (globally)
L"Gather Rumours",
L"Command Militia", // militia movement orders
};
STR16 Additional113Text[]=
{
Utils/_DutchText.cpp
+17
View File
@@ -1841,6 +1841,13 @@ STR16 pAssignmentStrings[] =
L"POW", // Prisoner of war - captured
L"Kliniek", // patient in a hospital
L"Leeg", // Vehicle is empty
L"Snitch", // facility: undercover prisoner (snitch) // TODO.Translate
L"Propag.", // facility: spread propaganda
L"Propag.", // facility: spread propaganda (globally)
L"Rumours", // facility: gather information
L"Propag.", // spread propaganda
L"Rumours", // gather information
L"Command", // militia movement orders
};
@@ -1936,6 +1943,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Gathering Rumours",// TODO.Translate // facility: gather rumours
L"Spreading Propaganda",// TODO.Translate // spread propaganda
L"Gathering Rumours",// TODO.Translate // gather information
L"Commanding Militia", // militia movement orders // TODO.Translate
};
@@ -1990,6 +1998,7 @@ STR16 pLongAssignmentStrings[] =
L"Gather Rumours",// TODO.Translate // facility: gather rumours
L"Spread Propaganda",// TODO.Translate // spread propaganda
L"Gather Rumours",// TODO.Translate // gather information
L"Commanding Militia", // militia movement orders // TODO.Translate
};
@@ -2780,6 +2789,8 @@ STR16 gpStrategicString[] =
//%s is the sector location -- ex: A9: Omerta
L"Beesten vallen je huurlingen aan in sector %s. Geen enkele huurling kan vechten!",
// Flugente: militia movement forbidden due to limited roaming // TODO.Translate
L"Militia cannot move here (RESTRICT_ROAMING = TRUE).",
};
STR16 gpGameClockString[] =
@@ -7170,6 +7181,12 @@ STR16 gzFacilityAssignmentStrings[]=
L"Trainer Leadership",
L"Trainer Explosives",
L"Interrogate Prisoners", // added by Flugente TODO.Translate
L"Undercover Snitch", // TODO.Translate
// 36-40
L"Spread Propaganda",
L"Spread Propaganda", // spread propaganda (globally)
L"Gather Rumours",
L"Command Militia", // militia movement orders
};
STR16 Additional113Text[]=
Utils/_EnglishText.cpp
+6
View File
@@ -1851,6 +1851,7 @@ STR16 pAssignmentStrings[] =
L"Rumours", // facility: gather information
L"Propag.", // spread propaganda
L"Rumours", // gather information
L"Command", // militia movement orders
};
@@ -1946,6 +1947,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Gathering Rumours", // facility: gather rumours
L"Spreading Propaganda", // spread propaganda
L"Gathering Rumours", // gather information
L"Commanding Militia", // militia movement orders
};
@@ -2000,6 +2002,7 @@ STR16 pLongAssignmentStrings[] =
L"Gather Rumours", // facility: gather rumours
L"Spread Propaganda", // spread propaganda
L"Gather Rumours", // gather information
L"Commanding Militia", // militia movement orders
};
@@ -2789,6 +2792,8 @@ STR16 gpStrategicString[] =
//%s is the sector location -- ex: A9: Omerta
L"Creatures attack your mercs in sector %s. None of your mercs are able to fight!",
// Flugente: militia movement forbidden due to limited roaming
L"Militia cannot move here (RESTRICT_ROAMING = TRUE).",
};
STR16 gpGameClockString[] =
@@ -7170,6 +7175,7 @@ STR16 gzFacilityAssignmentStrings[]=
L"Spread Propaganda",
L"Spread Propaganda", // spread propaganda (globally)
L"Gather Rumours",
L"Command Militia", // militia movement orders
};
STR16 Additional113Text[]=
{
Utils/_FrenchText.cpp
+17
View File
@@ -1848,6 +1848,13 @@ STR16 pAssignmentStrings[] =
L"Capturé(e)", // Prisoner of war - captured
L"Hôpital", // patient in a hospital
L"Vide", // Vehicle is empty
L"Snitch", // facility: undercover prisoner (snitch) // TODO.Translate
L"Propag.", // facility: spread propaganda
L"Propag.", // facility: spread propaganda (globally)
L"Rumours", // facility: gather information
L"Propag.", // spread propaganda
L"Rumours", // gather information
L"Command", // militia movement orders
};
@@ -1943,6 +1950,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Gathering Rumours",// TODO.Translate // facility: gather rumours
L"Spreading Propaganda",// TODO.Translate // spread propaganda
L"Gathering Rumours",// TODO.Translate // gather information
L"Commanding Militia", // militia movement orders // TODO.Translate
};
@@ -1997,6 +2005,7 @@ STR16 pLongAssignmentStrings[] =
L"Gather Rumours",// TODO.Translate // facility: gather rumours
L"Spread Propaganda",// TODO.Translate // spread propaganda
L"Gather Rumours",// TODO.Translate // gather information
L"Commanding Militia", // militia movement orders // TODO.Translate
};
@@ -2789,6 +2798,8 @@ STR16 gpStrategicString[] =
//%s is the sector location -- ex: A9: Omerta
L"Les créatures attaquent vos mercenaires dans le secteur %s. Aucun de vos hommes ne peut combattre !",
// Flugente: militia movement forbidden due to limited roaming // TODO.Translate
L"Militia cannot move here (RESTRICT_ROAMING = TRUE).",
};
STR16 gpGameClockString[] =
@@ -7162,6 +7173,12 @@ STR16 gzFacilityAssignmentStrings[]=
L"Entraîneur Commandement",
L"Entraîneur Explosif",
L"Interroger prisonnier", // added by Flugente
L"Undercover Snitch", // TODO.Translate
// 36-40
L"Spread Propaganda",
L"Spread Propaganda", // spread propaganda (globally)
L"Gather Rumours",
L"Command Militia", // militia movement orders
};
STR16 Additional113Text[]=
{
Utils/_GermanText.cpp
+17
View File
@@ -1853,6 +1853,13 @@ STR16 pAssignmentStrings[] =
L"Gefangen", // Prisoner of war - captured
L"Hospital", // patient in a hospital
L"Leer", //Vehicle is empty
L"Snitch", // facility: undercover prisoner (snitch) // TODO.Translate
L"Propag.", // facility: spread propaganda
L"Propag.", // facility: spread propaganda (globally)
L"Rumours", // facility: gather information
L"Propag.", // spread propaganda
L"Rumours", // gather information
L"Command", // militia movement orders
};
STR16 pMilitiaString[] =
@@ -1944,6 +1951,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Gathering Rumours",// TODO.Translate // facility: gather rumours
L"Spreading Propaganda",// TODO.Translate // spread propaganda
L"Gathering Rumours",// TODO.Translate // gather information
L"Commanding Militia", // militia movement orders // TODO.Translate
};
// refer to above for comments
@@ -1996,6 +2004,7 @@ STR16 pLongAssignmentStrings[] =
L"Gather Rumours",// TODO.Translate // facility: gather rumours
L"Spread Propaganda",// TODO.Translate // spread propaganda
L"Gather Rumours",// TODO.Translate // gather information
L"Commanding Militia", // militia movement orders // TODO.Translate
};
// the contract options
@@ -2789,6 +2798,8 @@ STR16 gpStrategicString[] =
//%s is the sector -- ex: A9
L"Monster attackieren Ihre Söldner im Sektor %s. Alle Söldner sind bewusstlos!",
// Flugente: militia movement forbidden due to limited roaming // TODO.Translate
L"Militia cannot move here (RESTRICT_ROAMING = TRUE).",
};
STR16 gpGameClockString[] =
@@ -6987,6 +6998,12 @@ STR16 gzFacilityAssignmentStrings[]=
L"Trainer Führungsqualität",
L"Trainer Sprengstoff",
L"Gefangene verhören", // added by Flugente
L"Undercover Snitch", // TODO.Translate
// 36-40
L"Spread Propaganda",
L"Spread Propaganda", // spread propaganda (globally)
L"Gather Rumours",
L"Command Militia", // militia movement orders
};
STR16 Additional113Text[]=
Utils/_ItalianText.cpp
+17
View File
@@ -1837,6 +1837,13 @@ STR16 pAssignmentStrings[] =
L"PDG", // Prisoner of war - captured
L"Ospedale", // patient in a hospital
L"Vuoto", // Vehicle is empty
L"Snitch", // facility: undercover prisoner (snitch) // TODO.Translate
L"Propag.", // facility: spread propaganda
L"Propag.", // facility: spread propaganda (globally)
L"Rumours", // facility: gather information
L"Propag.", // spread propaganda
L"Rumours", // gather information
L"Command", // militia movement orders
};
@@ -1932,6 +1939,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Gathering Rumours",// TODO.Translate // facility: gather rumours
L"Spreading Propaganda",// TODO.Translate // spread propaganda
L"Gathering Rumours",// TODO.Translate // gather information
L"Commanding Militia", // militia movement orders // TODO.Translate
};
@@ -1986,6 +1994,7 @@ STR16 pLongAssignmentStrings[] =
L"Gather Rumours",// TODO.Translate // facility: gather rumours
L"Spread Propaganda",// TODO.Translate // spread propaganda
L"Gather Rumours",// TODO.Translate // gather information
L"Commanding Militia", // militia movement orders // TODO.Translate
};
@@ -2776,6 +2785,8 @@ STR16 gpStrategicString[] =
//%s is the sector location -- ex: A9: Omerta
L"I nemici attaccano i vostri mercenari nel settore %s. Nessuno dei vostri mercenari è in grado di combattere!",
// Flugente: militia movement forbidden due to limited roaming // TODO.Translate
L"Militia cannot move here (RESTRICT_ROAMING = TRUE).",
};
STR16 gpGameClockString[] =
@@ -7161,6 +7172,12 @@ STR16 gzFacilityAssignmentStrings[]=
L"Trainer Leadership",
L"Trainer Explosives",
L"Interrogate Prisoners", // added by Flugente TODO.Translate
L"Undercover Snitch", // TODO.Translate
// 36-40
L"Spread Propaganda",
L"Spread Propaganda", // spread propaganda (globally)
L"Gather Rumours",
L"Command Militia", // militia movement orders
};
STR16 Additional113Text[]=
Utils/_PolishText.cpp
+17
View File
@@ -1853,6 +1853,13 @@ STR16 pAssignmentStrings[] =
L"Jeniec", // Prisoner of war - captured
L"Szpital", // patient in a hospital
L"Pusty", // Vehicle is empty
L"Snitch", // facility: undercover prisoner (snitch) // TODO.Translate
L"Propag.", // facility: spread propaganda
L"Propag.", // facility: spread propaganda (globally)
L"Rumours", // facility: gather information
L"Propag.", // spread propaganda
L"Rumours", // gather information
L"Command", // militia movement orders
};
@@ -1948,6 +1955,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Zbiera plotki", // facility: gather rumours
L"Szerzy propagandę", // spread propaganda
L"Zbiera plotki", // gather information
L"Commanding Militia", // militia movement orders // TODO.Translate
};
@@ -2002,6 +2010,7 @@ STR16 pLongAssignmentStrings[] =
L"Zbieraj plotki", // facility: gather rumours
L"Szerz propagandę", // spread propaganda
L"Zbieraj plotki", // gather information
L"Commanding Militia", // militia movement orders // TODO.Translate
};
@@ -2790,6 +2799,8 @@ STR16 gpStrategicString[] =
//%c%d is the sector -- ex: A9
L"Stworzenia zatakowały twoich najemników w sektorze %s. Żaden z twoich najemników nie może walczyć!",
// Flugente: militia movement forbidden due to limited roaming // TODO.Translate
L"Militia cannot move here (RESTRICT_ROAMING = TRUE).",
};
STR16 gpGameClockString[] =
@@ -7178,6 +7189,12 @@ STR16 gzFacilityAssignmentStrings[]=
L"Instruktor um. dowodzenia",
L"Instruktor zn. mat. wybuchowych",
L"Interrogate Prisoners", // added by Flugente TODO.Translate
L"Undercover Snitch", // TODO.Translate
// 36-40
L"Spread Propaganda",
L"Spread Propaganda", // spread propaganda (globally)
L"Gather Rumours",
L"Command Militia", // militia movement orders
};
STR16 Additional113Text[]=
Utils/_RussianText.cpp
+17
View File
@@ -1845,6 +1845,13 @@ STR16 pAssignmentStrings[] =
L"В плену", // Prisoner of war - captured
L"Госпиталь", // patient in a hospital
L"Пуст", // Vehicle is empty
L"Snitch", // facility: undercover prisoner (snitch) // TODO.Translate
L"Propag.", // facility: spread propaganda
L"Propag.", // facility: spread propaganda (globally)
L"Rumours", // facility: gather information
L"Propag.", // spread propaganda
L"Rumours", // gather information
L"Command", // militia movement orders
};
@@ -1940,6 +1947,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Gathering Rumours",// TODO.Translate // facility: gather rumours
L"Spreading Propaganda",// TODO.Translate // spread propaganda
L"Gathering Rumours",// TODO.Translate // gather information
L"Commanding Militia", // militia movement orders // TODO.Translate
};
@@ -1994,6 +2002,7 @@ STR16 pLongAssignmentStrings[] =
L"Gather Rumours",// TODO.Translate // facility: gather rumours
L"Spread Propaganda",// TODO.Translate // spread propaganda
L"Gather Rumours",// TODO.Translate // gather information
L"Commanding Militia", // militia movement orders // TODO.Translate
};
@@ -2783,6 +2792,8 @@ STR16 gpStrategicString[] =
//%s is the sector location -- ex: A9: Omerta
L"Твари атаковали ваших наемников в секторе %s. Ни один из ваших бойцов не в состоянии сражаться!",
// Flugente: militia movement forbidden due to limited roaming // TODO.Translate
L"Militia cannot move here (RESTRICT_ROAMING = TRUE).",
};
STR16 gpGameClockString[] =
@@ -7162,6 +7173,12 @@ STR16 gzFacilityAssignmentStrings[]=
L"Тренер на Лидерство",
L"Тренер на Взрывчатку",
L"Interrogate Prisoners", // added by Flugente TODO.Translate
L"Undercover Snitch", // TODO.Translate
// 36-40
L"Spread Propaganda",
L"Spread Propaganda", // spread propaganda (globally)
L"Gather Rumours",
L"Command Militia", // militia movement orders
};
STR16 Additional113Text[]=
{
Utils/_TaiwaneseText.cpp
+17
View File
@@ -1845,6 +1845,13 @@ STR16 pAssignmentStrings[] =
L"POW", // Prisoner of war - captured
L"Hospital", // patient in a hospital
L"Empty", // Vehicle is empty
L"Snitch", // facility: undercover prisoner (snitch) // TODO.Translate
L"Propag.", // facility: spread propaganda
L"Propag.", // facility: spread propaganda (globally)
L"Rumours", // facility: gather information
L"Propag.", // spread propaganda
L"Rumours", // gather information
L"Command", // militia movement orders
};
@@ -1940,6 +1947,7 @@ STR16 pPersonnelAssignmentStrings[] =
L"Gathering Rumours",// TODO.Translate // facility: gather rumours
L"Spreading Propaganda",// TODO.Translate // spread propaganda
L"Gathering Rumours",// TODO.Translate // gather information
L"Commanding Militia", // militia movement orders // TODO.Translate
};
@@ -1994,6 +2002,7 @@ STR16 pLongAssignmentStrings[] =
L"Gather Rumours",// TODO.Translate // facility: gather rumours
L"Spread Propaganda",// TODO.Translate // spread propaganda
L"Gather Rumours",// TODO.Translate // gather information
L"Commanding Militia", // militia movement orders // TODO.Translate
};
@@ -2785,6 +2794,8 @@ STR16 gpStrategicString[] =
//%s is the sector location -- ex: A9: Omerta
L"Creatures attack your mercs in sector %s. None of your mercs are able to fight!",
// Flugente: militia movement forbidden due to limited roaming // TODO.Translate
L"Militia cannot move here (RESTRICT_ROAMING = TRUE).",
};
STR16 gpGameClockString[] =
@@ -7170,6 +7181,12 @@ STR16 gzFacilityAssignmentStrings[]=
L"Trainer Leadership",
L"Trainer Explosives",
L"Interrogate Prisoners", // added by Flugente TODO.Translate
L"Undercover Snitch", // TODO.Translate
// 36-40
L"Spread Propaganda",
L"Spread Propaganda", // spread propaganda (globally)
L"Gather Rumours",
L"Command Militia", // militia movement orders
};
STR16 Additional113Text[]=