From d4e410f6295e9ea8f03a86906a51dfd51dc23a9e Mon Sep 17 00:00:00 2001 From: Wanne Date: Sun, 19 Nov 2006 18:47:12 +0000 Subject: [PATCH] - fix: RUNTIME-ERROR after starting the game. The problem occured in ArmyComposition.xml in the comment block. "--" is not allowed in the comment block. Strange, don't ask me why ;-) git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@591 4f8fa57e-7814-0410-bad4-adc449f26b7c --- .../TableData/Army/ArmyComposition.xml | 56 +++++++++---------- .../Data/TableData/Army/ArmyComposition.xml | 56 +++++++++---------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/gamedir/Data-1.13/TableData/Army/ArmyComposition.xml b/gamedir/Data-1.13/TableData/Army/ArmyComposition.xml index f4941d33a..eea47c2ad 100644 --- a/gamedir/Data-1.13/TableData/Army/ArmyComposition.xml +++ b/gamedir/Data-1.13/TableData/Army/ArmyComposition.xml @@ -28,34 +28,34 @@ Fields index: Indexes reference in original JA2: -Index Short name Desription -0 QUEEN_DEFENCE, //The most important sector, the queen's palace. -1 MEDUNA_DEFENCE, //The town surrounding the queen's palace. -2 MEDUNA_SAMSITE, //A sam site within Meduna (higher priority) -3 LEVEL1_DEFENCE, //The sectors immediately adjacent to Meduna (defence and spawning area) -4 LEVEL2_DEFENCE, //Two sectors away from Meduna (defence and spawning area) -5 LEVEL3_DEFENCE, //Three sectors away from Meduna (defence and spawning area) -6 ORTA_DEFENCE, //The top secret military base containing lots of elites -7 EAST_GRUMM_DEFENCE, //The most-industrial town in Arulco (more mine income) -8 WEST_GRUMM_DEFENCE, //The most-industrial town in Arulco (more mine income) -9 GRUMM_MINE, -10 OMERTA_WELCOME_WAGON, //Small force that greets the player upon arrival in game. -11 BALIME_DEFENCE, //Rich town, paved roads, close to Meduna (in queen's favor) -12 TIXA_PRISON, //Prison, well defended, but no point in retaking -13 TIXA_SAMSITE, //The central-most sam site (important for queen to keep) -14 ALMA_DEFENCE, //The military town of Meduna. Also very important for queen. -15 ALMA_MINE, //Mine income AND administrators -16 CAMBRIA_DEFENCE, //Medical town, large, central. -17 CAMBRIA_MINE, -18 CHITZENA_DEFENCE, //Small town, small mine, far away. -19 CHITZENA_MINE, -20 CHITZENA_SAMSITE, //Sam site near Chitzena. -21 DRASSEN_AIRPORT, //Very far away, a supply depot of little importance. -22 DRASSEN_DEFENCE, //Medium town, normal. -23 DRASSEN_MINE, -24 DRASSEN_SAMSITE, //Sam site near Drassen (least importance to queen of all samsites) -25 ROADBLOCK, //General outside city roadblocks -- enhance chance of ambush? -26 SANMONA_SMALL +Index Short name Desription +0 QUEEN_DEFENCE The most important sector, the queen's palace. +1 MEDUNA_DEFENCE The town surrounding the queen's palace. +2 MEDUNA_SAMSITE A sam site within Meduna (higher priority) +3 LEVEL1_DEFENCE The sectors immediately adjacent to Meduna (defence and spawning area) +4 LEVEL2_DEFENCE Two sectors away from Meduna (defence and spawning area) +5 LEVEL3_DEFENCE Three sectors away from Meduna (defence and spawning area) +6 ORTA_DEFENCE The top secret military base containing lots of elites +7 EAST_GRUMM_DEFENCE The most-industrial town in Arulco (more mine income) +8 WEST_GRUMM_DEFENCE The most-industrial town in Arulco (more mine income) +9 GRUMM_MINE +10 OMERTA_WELCOME_WAGON Small force that greets the player upon arrival in game. +11 BALIME_DEFENCE Rich town, paved roads, close to Meduna (in queen's favor) +12 TIXA_PRISON Prison, well defended, but no point in retaking +13 TIXA_SAMSITE The central-most sam site (important for queen to keep) +14 ALMA_DEFENCE The military town of Meduna. Also very important for queen. +15 ALMA_MINE Mine income AND administrators +16 CAMBRIA_DEFENCE Medical town, large, central. +17 CAMBRIA_MINE +18 CHITZENA_DEFENCE Small town, small mine, far away. +19 CHITZENA_MINE +20 CHITZENA_SAMSITE Sam site near Chitzena. +21 DRASSEN_AIRPORT Very far away, a supply depot of little importance. +22 DRASSEN_DEFENCE Medium town, normal. +23 DRASSEN_MINE +24 DRASSEN_SAMSITE Sam site near Drassen (least importance to queen of all samsites) +25 ROADBLOCK General outside city roadblocks - enhance chance of ambush? +26 SANMONA_SMALL Army composition soldier count calculation: diff --git a/gamedir/Data/TableData/Army/ArmyComposition.xml b/gamedir/Data/TableData/Army/ArmyComposition.xml index f4941d33a..eea47c2ad 100644 --- a/gamedir/Data/TableData/Army/ArmyComposition.xml +++ b/gamedir/Data/TableData/Army/ArmyComposition.xml @@ -28,34 +28,34 @@ Fields index: Indexes reference in original JA2: -Index Short name Desription -0 QUEEN_DEFENCE, //The most important sector, the queen's palace. -1 MEDUNA_DEFENCE, //The town surrounding the queen's palace. -2 MEDUNA_SAMSITE, //A sam site within Meduna (higher priority) -3 LEVEL1_DEFENCE, //The sectors immediately adjacent to Meduna (defence and spawning area) -4 LEVEL2_DEFENCE, //Two sectors away from Meduna (defence and spawning area) -5 LEVEL3_DEFENCE, //Three sectors away from Meduna (defence and spawning area) -6 ORTA_DEFENCE, //The top secret military base containing lots of elites -7 EAST_GRUMM_DEFENCE, //The most-industrial town in Arulco (more mine income) -8 WEST_GRUMM_DEFENCE, //The most-industrial town in Arulco (more mine income) -9 GRUMM_MINE, -10 OMERTA_WELCOME_WAGON, //Small force that greets the player upon arrival in game. -11 BALIME_DEFENCE, //Rich town, paved roads, close to Meduna (in queen's favor) -12 TIXA_PRISON, //Prison, well defended, but no point in retaking -13 TIXA_SAMSITE, //The central-most sam site (important for queen to keep) -14 ALMA_DEFENCE, //The military town of Meduna. Also very important for queen. -15 ALMA_MINE, //Mine income AND administrators -16 CAMBRIA_DEFENCE, //Medical town, large, central. -17 CAMBRIA_MINE, -18 CHITZENA_DEFENCE, //Small town, small mine, far away. -19 CHITZENA_MINE, -20 CHITZENA_SAMSITE, //Sam site near Chitzena. -21 DRASSEN_AIRPORT, //Very far away, a supply depot of little importance. -22 DRASSEN_DEFENCE, //Medium town, normal. -23 DRASSEN_MINE, -24 DRASSEN_SAMSITE, //Sam site near Drassen (least importance to queen of all samsites) -25 ROADBLOCK, //General outside city roadblocks -- enhance chance of ambush? -26 SANMONA_SMALL +Index Short name Desription +0 QUEEN_DEFENCE The most important sector, the queen's palace. +1 MEDUNA_DEFENCE The town surrounding the queen's palace. +2 MEDUNA_SAMSITE A sam site within Meduna (higher priority) +3 LEVEL1_DEFENCE The sectors immediately adjacent to Meduna (defence and spawning area) +4 LEVEL2_DEFENCE Two sectors away from Meduna (defence and spawning area) +5 LEVEL3_DEFENCE Three sectors away from Meduna (defence and spawning area) +6 ORTA_DEFENCE The top secret military base containing lots of elites +7 EAST_GRUMM_DEFENCE The most-industrial town in Arulco (more mine income) +8 WEST_GRUMM_DEFENCE The most-industrial town in Arulco (more mine income) +9 GRUMM_MINE +10 OMERTA_WELCOME_WAGON Small force that greets the player upon arrival in game. +11 BALIME_DEFENCE Rich town, paved roads, close to Meduna (in queen's favor) +12 TIXA_PRISON Prison, well defended, but no point in retaking +13 TIXA_SAMSITE The central-most sam site (important for queen to keep) +14 ALMA_DEFENCE The military town of Meduna. Also very important for queen. +15 ALMA_MINE Mine income AND administrators +16 CAMBRIA_DEFENCE Medical town, large, central. +17 CAMBRIA_MINE +18 CHITZENA_DEFENCE Small town, small mine, far away. +19 CHITZENA_MINE +20 CHITZENA_SAMSITE Sam site near Chitzena. +21 DRASSEN_AIRPORT Very far away, a supply depot of little importance. +22 DRASSEN_DEFENCE Medium town, normal. +23 DRASSEN_MINE +24 DRASSEN_SAMSITE Sam site near Drassen (least importance to queen of all samsites) +25 ROADBLOCK General outside city roadblocks - enhance chance of ambush? +26 SANMONA_SMALL Army composition soldier count calculation: