From aa6ba459d8d21ee2e8129f5139ed46dc2978cdb5 Mon Sep 17 00:00:00 2001 From: fatherbushido Date: Tue, 3 Jan 2017 16:24:52 +0000 Subject: [PATCH] Fix identation issues, line endings and remove a not working entry in templates. Refs 83680b0dee. Refs #4440. This was SVN commit r19103. --- .../templates/formations/column_closed.xml | 2 +- .../templates/formations/phalanx.xml | 2 +- .../templates/formations/syntagma.xml | 2 +- .../simulation/templates/formations/wedge.xml | 2 +- .../simulation/templates/gaia/fauna_boar.xml | 2 +- .../templates/gaia/fauna_peacock.xml | 4 +- .../templates/gaia/fauna_pig_flaming.xml | 4 +- .../templates/structures/brit_dock.xml | 2 +- .../templates/structures/cart_apartment.xml | 52 +++++++++---------- .../templates/structures/cart_farmstead.xml | 2 +- .../templates/structures/cart_fortress.xml | 2 +- .../templates/structures/cart_s_wall_gate.xml | 12 ++--- .../templates/structures/cart_s_wall_long.xml | 52 +++++++++---------- .../structures/cart_s_wall_medium.xml | 24 ++++----- .../structures/cart_s_wall_short.xml | 24 ++++----- .../structures/cart_s_wall_tower.xml | 24 ++++----- .../templates/structures/cart_wall_gate.xml | 2 +- .../structures/cart_wallset_short.xml | 38 +++++++------- .../templates/structures/ptol_library.xml | 2 +- .../templates/structures/rome_wonder.xml | 4 +- .../templates/units/brit_hero_boudicca.xml | 15 ++---- .../units/brit_hero_boudicca_sword.xml | 19 ++----- .../units/brit_hero_cunobelin_infantry.xml | 26 +++++----- .../templates/units/mace_hero_philip_pike.xml | 30 +++++------ .../units/ptol_champion_infantry_pikeman.xml | 4 +- 25 files changed, 164 insertions(+), 188 deletions(-) diff --git a/binaries/data/mods/public/simulation/templates/formations/column_closed.xml b/binaries/data/mods/public/simulation/templates/formations/column_closed.xml index 2426c6bd5e..4af265486c 100644 --- a/binaries/data/mods/public/simulation/templates/formations/column_closed.xml +++ b/binaries/data/mods/public/simulation/templates/formations/column_closed.xml @@ -5,7 +5,7 @@ Forced March 0.75 1.0 - 1.20 + 1.20 3 3 diff --git a/binaries/data/mods/public/simulation/templates/formations/phalanx.xml b/binaries/data/mods/public/simulation/templates/formations/phalanx.xml index 282569e605..ee4b1d527a 100644 --- a/binaries/data/mods/public/simulation/templates/formations/phalanx.xml +++ b/binaries/data/mods/public/simulation/templates/formations/phalanx.xml @@ -11,7 +11,7 @@ 5 20 8 - 0.9 + 0.9 1..2,1..-1: phalanx_idle; diff --git a/binaries/data/mods/public/simulation/templates/formations/syntagma.xml b/binaries/data/mods/public/simulation/templates/formations/syntagma.xml index 378d8bdc4f..339b54fb74 100644 --- a/binaries/data/mods/public/simulation/templates/formations/syntagma.xml +++ b/binaries/data/mods/public/simulation/templates/formations/syntagma.xml @@ -29,7 +29,7 @@ 4..8,1..-1: syntagma_back_run - 0.85 + 0.85 0.15 diff --git a/binaries/data/mods/public/simulation/templates/formations/wedge.xml b/binaries/data/mods/public/simulation/templates/formations/wedge.xml index 6e54b1b020..7f9fabb05e 100644 --- a/binaries/data/mods/public/simulation/templates/formations/wedge.xml +++ b/binaries/data/mods/public/simulation/templates/formations/wedge.xml @@ -7,7 +7,7 @@ Wedge triangle true - 1.25 + 1.25 0.25 1.1 1.1 diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml index bb8ab4be89..7c545635a6 100644 --- a/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml +++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml @@ -15,7 +15,7 @@ gaia - Wild Boar + Wild Boar Sus scrofa gaia/fauna_boar.png diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml index d700c968f3..8e028d59d9 100644 --- a/binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml +++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml @@ -11,7 +11,7 @@ gaia - Peacock + Peacock Pavo cristatus gaia/fauna_peacock.png @@ -37,7 +37,7 @@ - domestic + domestic 4.0 12.0 2000 diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_pig_flaming.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_pig_flaming.xml index e1b6986a67..3dd650727b 100644 --- a/binaries/data/mods/public/simulation/templates/gaia/fauna_pig_flaming.xml +++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_pig_flaming.xml @@ -15,7 +15,7 @@ - Flaming Pig + Flaming Pig Sus scrofa domesticus igne units/flaming_pig.png @@ -35,4 +35,4 @@ fauna/pig_flaming.xml - \ No newline at end of file + diff --git a/binaries/data/mods/public/simulation/templates/structures/brit_dock.xml b/binaries/data/mods/public/simulation/templates/structures/brit_dock.xml index 23ffd7599c..bf420fe9b3 100644 --- a/binaries/data/mods/public/simulation/templates/structures/brit_dock.xml +++ b/binaries/data/mods/public/simulation/templates/structures/brit_dock.xml @@ -1,4 +1,4 @@ - + 2 diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_apartment.xml b/binaries/data/mods/public/simulation/templates/structures/cart_apartment.xml index 1730df2259..55a4e06409 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_apartment.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_apartment.xml @@ -1,26 +1,26 @@ - - - - 15 - 75 - - 225 - - - - Apartment Building - ? - - - 9 - - - 1500 - - - 30 - - - structures/carthaginians/apartment.xml - - + + + + 15 + 75 + + 225 + + + + Apartment Building + ? + + + 9 + + + 1500 + + + 30 + + + structures/carthaginians/apartment.xml + + diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_farmstead.xml b/binaries/data/mods/public/simulation/templates/structures/cart_farmstead.xml index 2e782a03cf..ff0557b625 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_farmstead.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_farmstead.xml @@ -1,4 +1,4 @@ - + diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml b/binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml index 9d362633e3..f71ee93656 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_fortress.xml @@ -1,4 +1,4 @@ - + diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_gate.xml b/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_gate.xml index 46da390da4..9342a8eb8e 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_gate.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_gate.xml @@ -1,6 +1,6 @@ - - - - cart - - + + + + cart + + diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_long.xml b/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_long.xml index b84ced9555..ddfe29f521 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_long.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_long.xml @@ -1,26 +1,26 @@ - - - - cart - structures/cart_wallset_short - Low Wall - Stone Wall - - - - structures/cart_s_wall_gate - - 0 - 20 - - - - - - structures/carthaginians/short_wall_long.xml - structures/fndn_1x3pal.xml - - - 11.0 - - + + + + cart + structures/cart_wallset_short + Low Wall + Stone Wall + + + + structures/cart_s_wall_gate + + 0 + 20 + + + + + + structures/carthaginians/short_wall_long.xml + structures/fndn_1x3pal.xml + + + 11.0 + + diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_medium.xml b/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_medium.xml index e726fc9539..92be53d63b 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_medium.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_medium.xml @@ -1,12 +1,12 @@ - - - - cart - structures/cart_wallset_short - Low Wall - Stone Wall - - - structures/carthaginians/short_wall_medium.xml - - + + + + cart + structures/cart_wallset_short + Low Wall + Stone Wall + + + structures/carthaginians/short_wall_medium.xml + + diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_short.xml b/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_short.xml index 281820366b..0385d607d6 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_short.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_short.xml @@ -1,12 +1,12 @@ - - - - cart - structures/cart_wallset_short - Low Wall - Stone Wall - - - structures/carthaginians/short_wall_short.xml - - + + + + cart + structures/cart_wallset_short + Low Wall + Stone Wall + + + structures/carthaginians/short_wall_short.xml + + diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_tower.xml b/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_tower.xml index ab3a14b17a..9fc5893136 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_s_wall_tower.xml @@ -1,12 +1,12 @@ - - - - cart - structures/cart_wallset_short - Low Wall - Stone Wall - - - structures/carthaginians/short_wall_tower.xml - - + + + + cart + structures/cart_wallset_short + Low Wall + Stone Wall + + + structures/carthaginians/short_wall_tower.xml + + diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_wall_gate.xml b/binaries/data/mods/public/simulation/templates/structures/cart_wall_gate.xml index 6e6659c7b5..c8332a7389 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_wall_gate.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_wall_gate.xml @@ -1,4 +1,4 @@ - + diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_wallset_short.xml b/binaries/data/mods/public/simulation/templates/structures/cart_wallset_short.xml index 6dc9ca8b0d..dca4207a91 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_wallset_short.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_wallset_short.xml @@ -1,19 +1,19 @@ - - - - cart - Low Wall - The Carthaginians built what are referred to as "triple walls" to fortify some of their cities; as triple walls aren't a practical construct for 0 A.D, the construction of the inner wall is to be used. This wall served not only as a defensive structure but had barracks and stables integrated right into it, and raised towers at intervals. Fodder for elephants and horses, and arms were stored onsite. The ground level consisted of housing for elephants, the second level for horses, and the third level as barracks for the troops. In Carthage alone, 200 elephants, a thousand horses and 15,000~30,000 troops could be housed within the city walls. As shown in the reference drawing, there was also a ditch at the base in front of the wall. These walls were typically built of large blocks of sandstone hewn from deposits nearby, and were never breached by invaders. - phase_village - structures/palisade_wall.png - - - - structures/cart_s_wall_tower - structures/cart_s_wall_gate - structures/cart_s_wall_long - structures/cart_s_wall_medium - structures/cart_s_wall_short - - - + + + + cart + Low Wall + The Carthaginians built what are referred to as "triple walls" to fortify some of their cities; as triple walls aren't a practical construct for 0 A.D, the construction of the inner wall is to be used. This wall served not only as a defensive structure but had barracks and stables integrated right into it, and raised towers at intervals. Fodder for elephants and horses, and arms were stored onsite. The ground level consisted of housing for elephants, the second level for horses, and the third level as barracks for the troops. In Carthage alone, 200 elephants, a thousand horses and 15,000~30,000 troops could be housed within the city walls. As shown in the reference drawing, there was also a ditch at the base in front of the wall. These walls were typically built of large blocks of sandstone hewn from deposits nearby, and were never breached by invaders. + phase_village + structures/palisade_wall.png + + + + structures/cart_s_wall_tower + structures/cart_s_wall_gate + structures/cart_s_wall_long + structures/cart_s_wall_medium + structures/cart_s_wall_short + + + diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_library.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_library.xml index 8adfc43e13..2250db6094 100644 --- a/binaries/data/mods/public/simulation/templates/structures/ptol_library.xml +++ b/binaries/data/mods/public/simulation/templates/structures/ptol_library.xml @@ -1,4 +1,4 @@ - + ptol diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_wonder.xml b/binaries/data/mods/public/simulation/templates/structures/rome_wonder.xml index 5704a8fa89..40cc2172f9 100644 --- a/binaries/data/mods/public/simulation/templates/structures/rome_wonder.xml +++ b/binaries/data/mods/public/simulation/templates/structures/rome_wonder.xml @@ -1,8 +1,6 @@ - - epic_temple_heal - + epic_temple_heal 12.0 diff --git a/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml b/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml index b50fd1a718..2cac074498 100644 --- a/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml +++ b/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml @@ -1,8 +1,6 @@ - - brit_hero_boudicca - + brit_hero_boudicca 5.0 @@ -11,18 +9,11 @@ brit Female Chariot Boudicca (Chariot) - Boadicea - female + Boadicea + female Ammianus Marcellinus described how difficult it would be for a band of foreigners to deal with a Celt if he called in the help of his wife. For she was stronger than he was and could rain blows and kicks upon the assailants equal in force to the shots of a catapult. Boudicca, queen of the Iceni, was said to be 'very tall and terrifying in appearance; her voice was very harsh and a great mass of red hair fell over her shoulders. She wore a tunic of many colors over which a thick cloak was fastened by a brooch. units/celt_hero_boudicca.png - - - units/brit_hero_boudicca_sword - Unmount Boudicca so she can fight with a sword. - - - units/celts/boudicca_chariot.xml diff --git a/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml b/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml index 2ada081830..eb96135383 100644 --- a/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml +++ b/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml @@ -1,27 +1,14 @@ - - brit_hero_boudicca - + brit_hero_boudicca brit Boudicca (Sword) - Boadicea - female - Female Guerilla + Boadicea + female Ammianus Marcellinus described how difficult it would be for a band of foreigners to deal with a Celt if he called in the help of his wife. For she was stronger than he was and could rain blows and kicks upon the assailants equal in force to the shots of a catapult. Boudicca, queen of the Iceni, was said to be 'very tall and terrifying in appearance; her voice was very harsh and a great mass of red hair fell over her shoulders. She wore a tunic of many colors over which a thick cloak was fastened by a brooch. units/celt_hero_boudicca.png - - - units/brit_hero_boudicca - Mount Boudicca onto her mighty chariot. - - 10 - - - - units/celts/boudicca.xml diff --git a/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin_infantry.xml b/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin_infantry.xml index c73e44721c..7b126c3d6f 100644 --- a/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin_infantry.xml +++ b/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin_infantry.xml @@ -1,13 +1,13 @@ - - - brit_hero_cunobelin - - brit - Cunobelin - Cunobelin was a powerful ruler centered in the territory around modern day London. Ruling the Catuvellauni from Camulodunum, he was a warrior king who conquered a neighboring tribe and was referred to by the Romans as the King of the Britons. Eventually Cunobelin retired to become the arch-druid of Siluria, but was taken to Rome with his son upon Caratacos's capture. According to legend, the Apostle Paul baptized Cunobelin into Christianity before he died in Italy. - units/celt_hero_cunobelin.png - - - units/celts/cunobelin.xml - - + + + brit_hero_cunobelin + + brit + Cunobelin + Cunobelin was a powerful ruler centered in the territory around modern day London. Ruling the Catuvellauni from Camulodunum, he was a warrior king who conquered a neighboring tribe and was referred to by the Romans as the King of the Britons. Eventually Cunobelin retired to become the arch-druid of Siluria, but was taken to Rome with his son upon Caratacos's capture. According to legend, the Apostle Paul baptized Cunobelin into Christianity before he died in Italy. + units/celt_hero_cunobelin.png + + + units/celts/cunobelin.xml + + diff --git a/binaries/data/mods/public/simulation/templates/units/mace_hero_philip_pike.xml b/binaries/data/mods/public/simulation/templates/units/mace_hero_philip_pike.xml index a1f8e68916..2b7e3bd70a 100644 --- a/binaries/data/mods/public/simulation/templates/units/mace_hero_philip_pike.xml +++ b/binaries/data/mods/public/simulation/templates/units/mace_hero_philip_pike.xml @@ -1,15 +1,15 @@ - - - mace_hero_philip - - mace - greek - Philip II of Macedon - Phílippos B' ho Makedṓn - The king of Macedonia (359 BC - 336 BC), he carried out vast monetary and military reforms in order to make his kingdom the most powerful force in the Greek world. Greatly enlarged the size of Macedonia by conquering much of Thrace and subduing the Greeks. Murdered in Aegae while planning a campaign against Persia. - units/hele_hero_philip.png - - - units/macedonians/philip.xml - - + + + mace_hero_philip + + mace + greek + Philip II of Macedon + Phílippos B' ho Makedṓn + The king of Macedonia (359 BC - 336 BC), he carried out vast monetary and military reforms in order to make his kingdom the most powerful force in the Greek world. Greatly enlarged the size of Macedonia by conquering much of Thrace and subduing the Greeks. Murdered in Aegae while planning a campaign against Persia. + units/hele_hero_philip.png + + + units/macedonians/philip.xml + + diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_champion_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/units/ptol_champion_infantry_pikeman.xml index 9000ab5756..ad6f5c7eda 100644 --- a/binaries/data/mods/public/simulation/templates/units/ptol_champion_infantry_pikeman.xml +++ b/binaries/data/mods/public/simulation/templates/units/ptol_champion_infantry_pikeman.xml @@ -2,8 +2,8 @@ ptol - greek - Royal Guard Infantry + greek + Royal Guard Infantry Phalangitès Agema Unlike their rivals the Seleucids, the Ptolemies maintained a relatively small force of full-time soldiers to act as a Royal Guard around the sovereign. These were drawn from the Macedonian and Greek kleruchs, settled in Egypt by the first Ptolemy. This consisted of a lance-armed (xystophoroi) cavalry Royal Guard (possibly Hetairoi) 700 strong; and an infantry Royal Guard (Basilikon Agema) 3,000 strong. The infantry guard were phalangites, though a 1,000 man unit within the Agema may have been able to fight as more traditional hypaspists or as thorakitai (spear or spear-and-javelin armed, fast moving heavy infantry). units/ptol_champion_infantry.png