Rename generic ballista template to boltshooter and onager to stonethrower to avoid ambiguity. Remove template_unit_mechanical.xml and remove '_mechanical' from ship and siege template paths.

The template tree included 'template_unit_mechanical.xml', which had two
children, '*_ship.xml' and '*_siege.xml'.
This template did little and implied a relevant common ancestor to ship
and siege units. As organic units do not descend from a generic
'Organic', this was not necessary.

This commit removes this template and the '_mechanical' bit from
children templates to simplify.

Additionally, this renames:
 - template_unit_mechanical_siege_ballista.xml to
template_unit_siege_boltshooter.xml
 - template_unit_mechanical_siege_onager.xml to
template_unit_siege_stonethrower.xml
This helps avoid ambiguity, as our Roman ballista for example throws
stones (even if it is a torsion engine), and 'ballista' refers to a bolt
shooter in Age of Empires 1 (and in AoE 2 for the Elephant Ballista,
confusingly not named a scorpion like other bolt shooters in that game).

Patch By: Nescio
Reviewers: Wraitii

Subscribers: Itms, O14 Maps, wraitii, elexis, Vulcan, Stan

Differential Revision: https://code.wildfiregames.com/D1760
This was SVN commit r22204.
This commit is contained in:
wraitii 2019-04-21 17:04:15 +00:00
parent 0ed704e791
commit d3a73f0611
126 changed files with 254 additions and 252 deletions

View file

@ -167,7 +167,7 @@
},
"athen": {
"temple": "structures/athen_temple",
"oxybeles": "units/athen_mechanical_siege_oxybeles_unpacked"
"oxybeles": "units/athen_siege_oxybeles_unpacked"
}
},
"actors": {

View file

@ -92,7 +92,7 @@ const oKushChampions = [
"units/kush_champion_infantry_amun",
"units/kush_champion_infantry_apedemak"
];
const oPtolSiege = ["units/ptol_mechanical_siege_lithobolos_unpacked", "units/ptol_mechanical_siege_polybolos_unpacked"];
const oPtolSiege = ["units/ptol_siege_lithobolos_unpacked", "units/ptol_siege_polybolos_unpacked"];
const oTriggerPointCityPath = "trigger/trigger_point_A";
const oTriggerPointAttackerPatrol = "trigger/trigger_point_B";

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9fa534f3f59793536138313a502fbf749ee863c503fb5428589e7b741cfcf4d1
size 20701
oid sha256:e80aebd29e1834486ee851b551b8d4be4f28684a07dd1b35ed384cd0a846ef93
size 20690

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ab5bff566302ce9cc2900b984b7cffe070327ca51f77baf03ea064003db26206
size 7697
oid sha256:63a86f6a138af5c4cb9feee63ddc23308fc2e4dfa6cbabe7a33b881b49797513
size 7686

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:24f84d31ee82a711058bf25e2f2832586914f3aff5f5ea5353f637bf7c968c9a
size 682226
oid sha256:af8c5956517d86da7083fbfbad29cc519f512f6cfcef31bc2c2bae47afd804cd
size 682204

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0b94bd92d6f7f6e5e1fd30ccc6f0aa4e35c2e9945ded2ed907ab0a3368b1470e
size 683824
oid sha256:2b48f391c3d610fbcc56be4884a7e7282368c5c0b2368eea7f46bf07210fdd27
size 683803

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:57b783ba48c822dafe2b99acc169e75093d09bd05570a263a719fec4f99fdf3e
size 113978
oid sha256:a6d688fa452f4c75ffc249c185b3b73c427619b6aa1ffd608336890a102aad24
size 113945

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:90beddab6a9d095219707adb348226dcdfabb0364bb5556eac83f1d7bf2a823b
size 421156
oid sha256:28cbebb7514bfc181d95fc15b1b2e811dd4ce0b3fa498cddfe5212f6c4410bd0
size 421145

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bef0dc7bd1d6ee1618966507a5712089de67492315b337cc1939395966c22284
size 318154
oid sha256:2c95247e3defb597ea778a44d0e388bb6b739dd5460b2dd7638c05e9ac7d9f74
size 318110

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dbe920c9c294bfecd994fe633bafd92c83c55dd8c93d1b37a8a28382eaee6c43
size 478028
oid sha256:dc7e7371f21be3ebf951cebb8abf8d92b4fef9e6272fbe9e22c8d20f08ee853f
size 477973

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:478e885b73f4ff96aa667cac6eb23a7798d47632875fce9ccbbc36372417e629
size 382419
oid sha256:b43cb2f1ee557c8d4082c10369d06b8ee33a1f6d354776eaf46d0d53a7ab9cdd
size 382397

View file

@ -345,7 +345,7 @@ Trigger.prototype.tutorialGoals = [
},
"OnTrainingQueued": function(msg)
{
if (msg.unitTemplate == "units/spart_mechanical_siege_ram")
if (msg.unitTemplate == "units/spart_siege_ram")
++this.ramCount;
if (this.IsDone())
{

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_trireme">
<Entity parent="template_unit_ship_trireme">
<Identity>
<Civ>skirm</Civ>
</Identity>

View file

@ -19,12 +19,12 @@
units/{civ}_hero_demetrius
units/{civ}_champion_infantry_a
units/{civ}_champion_cavalry
-units/{civ}_mechanical_siege_ballista_packed
-units/{civ}_mechanical_siege_scorpio_packed
-units/{civ}_mechanical_siege_oxybeles_packed
-units/{civ}_mechanical_siege_lithobolos_packed
-units/{civ}_mechanical_siege_ram
-units/{civ}_mechanical_siege_tower
-units/{civ}_siege_ballista_packed
-units/{civ}_siege_scorpio_packed
-units/{civ}_siege_oxybeles_packed
-units/{civ}_siege_lithobolos_packed
-units/{civ}_siege_ram
-units/{civ}_siege_tower
</Entities>
<Technologies datatype="tokens">
successors/upgrade_mace_silvershields

View file

@ -13,12 +13,12 @@
units/{civ}_champion_infantry
units/{civ}_champion_maiden
units/{civ}_champion_chariot
-units/{civ}_mechanical_siege_ballista_packed
-units/{civ}_mechanical_siege_scorpio_packed
-units/{civ}_mechanical_siege_oxybeles_packed
-units/{civ}_mechanical_siege_lithobolos_packed
-units/{civ}_mechanical_siege_ram
-units/{civ}_mechanical_siege_tower
-units/{civ}_siege_ballista_packed
-units/{civ}_siege_scorpio_packed
-units/{civ}_siege_oxybeles_packed
-units/{civ}_siege_lithobolos_packed
-units/{civ}_siege_ram
-units/{civ}_siege_tower
</Entities>
<Technologies datatype="tokens">
attack_soldiers_will

View file

@ -95,12 +95,12 @@
units/{civ}_infantry_spearman_a
units/{civ}_infantry_javelinist_b
units/{civ}_cavalry_spearman_b
units/{civ}_mechanical_siege_ballista_packed
units/{civ}_mechanical_siege_scorpio_packed
units/{civ}_mechanical_siege_oxybeles_packed
units/{civ}_mechanical_siege_lithobolos_packed
units/{civ}_mechanical_siege_ram
units/{civ}_mechanical_siege_tower
units/{civ}_siege_ballista_packed
units/{civ}_siege_scorpio_packed
units/{civ}_siege_oxybeles_packed
units/{civ}_siege_lithobolos_packed
units/{civ}_siege_ram
units/{civ}_siege_tower
</Entities>
</ProductionQueue>
<Sound>

View file

@ -85,13 +85,13 @@
<ProductionQueue>
<BatchTimeModifier>0.8</BatchTimeModifier>
<Entities datatype="tokens">
units/{civ}_mechanical_siege_ballista_packed
units/{civ}_mechanical_siege_scorpio_packed
units/{civ}_mechanical_siege_oxybeles_packed
units/{civ}_mechanical_siege_lithobolos_packed
units/{civ}_mechanical_siege_polybolos_packed
units/{civ}_mechanical_siege_ram
units/{civ}_mechanical_siege_tower
units/{civ}_siege_ballista_packed
units/{civ}_siege_scorpio_packed
units/{civ}_siege_oxybeles_packed
units/{civ}_siege_lithobolos_packed
units/{civ}_siege_polybolos_packed
units/{civ}_siege_ram
units/{civ}_siege_tower
</Entities>
<Technologies datatype="tokens">
attack_soldiers_will

View file

@ -37,13 +37,13 @@
<ProductionQueue>
<BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens">
units/{civ}_mechanical_siege_ballista_packed
units/{civ}_mechanical_siege_scorpio_packed
units/{civ}_mechanical_siege_oxybeles_packed
units/{civ}_mechanical_siege_lithobolos_packed
units/{civ}_mechanical_siege_polybolos_packed
units/{civ}_mechanical_siege_ram
units/{civ}_mechanical_siege_tower
units/{civ}_siege_ballista_packed
units/{civ}_siege_scorpio_packed
units/{civ}_siege_oxybeles_packed
units/{civ}_siege_lithobolos_packed
units/{civ}_siege_polybolos_packed
units/{civ}_siege_ram
units/{civ}_siege_tower
</Entities>
<Technologies datatype="tokens">
siege_attack

View file

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit">
<Decay>
<DelayTime>0.0</DelayTime>
<SinkRate>0.0</SinkRate>
<SinkAccel>2.0</SinkAccel>
</Decay>
<Health>
<Unhealable>true</Unhealable>
</Health>
<Identity>
<GenericName>Mechanical</GenericName>
<VisibleClasses datatype="tokens">Mechanical</VisibleClasses>
</Identity>
<Loot>
<xp>60</xp>
<food>0</food>
<wood>50</wood>
<stone>0</stone>
<metal>25</metal>
</Loot>
<Repairable>
<RepairTimeRatio>4.0</RepairTimeRatio>
</Repairable>
<UnitMotion>
<RunMultiplier>1</RunMultiplier>
</UnitMotion>
</Entity>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical">
<Entity parent="template_unit">
<Armour>
<Hack>5</Hack>
<Pierce>10</Pierce>
@ -27,18 +27,29 @@
<MaxSpawnDistance>10</MaxSpawnDistance>
</Footprint>
<Health>
<Unhealable>true</Unhealable>
<Max>200</Max>
</Health>
<Identity>
<GenericName>Ship</GenericName>
<Formations disable=""/>
<VisibleClasses datatype="tokens">Ship</VisibleClasses>
<VisibleClasses datatype="tokens">Mechanical Ship</VisibleClasses>
</Identity>
<Loot>
<xp>60</xp>
<food>0</food>
<wood>50</wood>
<stone>0</stone>
<metal>25</metal>
</Loot>
<Position>
<Floating>true</Floating>
<FloatDepth>0.0</FloatDepth>
<TurnRate>3.0</TurnRate>
</Position>
<Repairable>
<RepairTimeRatio>4.0</RepairTimeRatio>
</Repairable>
<ResourceGatherer>
<MaxDistance>4.0</MaxDistance>
<BaseSpeed>1.0</BaseSpeed>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship">
<Entity parent="template_unit_ship">
<Attack>
<Ranged>
<Hack>0.0</Hack>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship">
<Entity parent="template_unit_ship">
<Attack>
<Melee>
<Hack>10.0</Hack>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship">
<Entity parent="template_unit_ship">
<Armour>
<Hack>2</Hack>
<Pierce>5</Pierce>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship">
<Entity parent="template_unit_ship">
<Armour>
<Hack>2</Hack>
<Pierce>5</Pierce>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship">
<Entity parent="template_unit_ship">
<Attack>
<Ranged>
<Hack>0.0</Hack>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship">
<Entity parent="template_unit_ship">
<Attack>
<Ranged>
<Hack>0.0</Hack>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical">
<Entity parent="template_unit">
<Armour>
<Hack>1</Hack>
<Pierce>50</Pierce>
@ -13,14 +13,32 @@
<Cost>
<Population>3</Population>
</Cost>
<Decay>
<DelayTime>0.0</DelayTime>
<SinkRate>0.0</SinkRate>
<SinkAccel>2.0</SinkAccel>
</Decay>
<Health>
<Unhealable>true</Unhealable>
</Health>
<Identity>
<VisibleClasses datatype="tokens">Siege</VisibleClasses>
<VisibleClasses datatype="tokens">Mechanical Siege</VisibleClasses>
<GenericName>Siege</GenericName>
<RequiredTechnology>phase_city</RequiredTechnology>
</Identity>
<Loot>
<xp>60</xp>
<food>0</food>
<wood>50</wood>
<stone>0</stone>
<metal>25</metal>
</Loot>
<Position>
<Anchor>pitch-roll</Anchor>
</Position>
<Repairable>
<RepairTimeRatio>4.0</RepairTimeRatio>
</Repairable>
<Sound>
<SoundGroups>
<select>attack/siege/siege_select.xml</select>
@ -38,5 +56,6 @@
</UnitAI>
<UnitMotion>
<PassabilityClass>large</PassabilityClass>
<RunMultiplier>1</RunMultiplier>
</UnitMotion>
</Entity>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_siege">
<Entity parent="template_unit_siege">
<Attack>
<Ranged>
<Hack>0.0</Hack>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_siege">
<Entity parent="template_unit_siege">
<Attack>
<Melee>
<Hack>0.0</Hack>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_siege">
<Entity parent="template_unit_siege">
<Attack>
<Ranged>
<Hack>0.0</Hack>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_siege">
<Entity parent="template_unit_siege">
<Attack>
<Ranged>
<Hack>0.0</Hack>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_bireme">
<Entity parent="template_unit_ship_bireme">
<Identity>
<Civ>athen</Civ>
<GenericName>Penteconter</GenericName>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_fishing">
<Entity parent="template_unit_ship_fishing">
<Identity>
<Civ>athen</Civ>
<SpecificName>Ploîon Halieutikón</SpecificName>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_merchant">
<Entity parent="template_unit_ship_merchant">
<Footprint>
<Square width="8.0" depth="24.0"/>
<Height>8.0</Height>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_trireme">
<Entity parent="template_unit_ship_trireme">
<Identity>
<Civ>athen</Civ>
<SpecificName>Triḗrēs Athēnaía</SpecificName>

View file

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_siege_onager">
<Entity parent="template_unit_siege_stonethrower">
<Identity>
<Civ>athen</Civ>
<SpecificName>Lithobólos</SpecificName>
<Icon>units/hele_mechanical_siege_lithobolos_packed.png</Icon>
<Icon>units/hele_siege_lithobolos_packed.png</Icon>
</Identity>
<Pack>
<Entity>units/athen_mechanical_siege_lithobolos_unpacked</Entity>
<Entity>units/athen_siege_lithobolos_unpacked</Entity>
<State>packed</State>
</Pack>
<VisualActor>

View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="units/sele_mechanical_siege_lithobolos_packed">
<Entity parent="units/athen_siege_lithobolos_packed">
<Identity>
<Icon>units/hele_mechanical_siege_lithobolos.png</Icon>
<Icon>units/hele_siege_lithobolos.png</Icon>
</Identity>
<Pack>
<Entity>units/sele_mechanical_siege_lithobolos_packed</Entity>
<Entity>units/athen_siege_lithobolos_packed</Entity>
<State>unpacked</State>
</Pack>
<UnitMotion>

View file

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_siege_ballista">
<Entity parent="template_unit_siege_boltshooter">
<Identity>
<Civ>athen</Civ>
<SpecificName>Oxybelḗs</SpecificName>
<Icon>units/hele_mechanical_siege_oxybeles_packed.png</Icon>
<Icon>units/hele_siege_oxybeles_packed.png</Icon>
</Identity>
<Pack>
<Entity>units/athen_mechanical_siege_oxybeles_unpacked</Entity>
<Entity>units/athen_siege_oxybeles_unpacked</Entity>
<State>packed</State>
</Pack>
<VisualActor>

View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="units/mace_mechanical_siege_oxybeles_packed">
<Entity parent="units/athen_siege_oxybeles_packed">
<Identity>
<Icon>units/hele_mechanical_siege_oxybeles.png</Icon>
<Icon>units/hele_siege_oxybeles.png</Icon>
</Identity>
<Pack>
<Entity>units/mace_mechanical_siege_oxybeles_packed</Entity>
<Entity>units/athen_siege_oxybeles_packed</Entity>
<State>unpacked</State>
</Pack>
<UnitMotion>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_fishing">
<Entity parent="template_unit_ship_fishing">
<Identity>
<Civ>brit</Civ>
<SpecificName>Manea</SpecificName>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_merchant">
<Entity parent="template_unit_ship_merchant">
<Footprint>
<Square width="12.0" depth="24.0"/>
<Height>6.0</Height>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_trireme">
<Entity parent="template_unit_ship_trireme">
<Cost>
<BuildTime>40</BuildTime>
</Cost>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_siege_ram">
<Entity parent="template_unit_siege_ram">
<Footprint replace="">
<Square width="6.75" depth="10.0"/>
<Height>3.0</Height>
@ -7,7 +7,7 @@
<Identity>
<Civ>brit</Civ>
<SpecificName>Reithe</SpecificName>
<Icon>units/celt_mechanical_siege_ram.png</Icon>
<Icon>units/celt_siege_ram.png</Icon>
</Identity>
<VisualActor>
<Actor>structures/celts/siege_ram.xml</Actor>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_bireme">
<Entity parent="template_unit_ship_bireme">
<Footprint>
<Square width="8.0" depth="31.0"/>
<Height>10.0</Height>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_fishing">
<Entity parent="template_unit_ship_fishing">
<Identity>
<Civ>cart</Civ>
<SpecificName>Noon-Mašōt</SpecificName>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_merchant">
<Entity parent="template_unit_ship_merchant">
<Footprint>
<Square width="8.0" depth="24.0"/>
<Height>8.0</Height>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_quinquereme">
<Entity parent="template_unit_ship_quinquereme">
<Identity>
<Civ>cart</Civ>
<GenericName>Quinquereme</GenericName>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_trireme">
<Entity parent="template_unit_ship_trireme">
<Identity>
<Civ>cart</Civ>
<GenericName>Trireme</GenericName>

View file

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_siege_onager">
<Entity parent="template_unit_siege_stonethrower">
<Identity>
<Civ>cart</Civ>
<SpecificName>Ballista</SpecificName>
<Icon>units/cart_mechanical_siege_ballista_packed.png</Icon>
<Icon>units/cart_siege_ballista_packed.png</Icon>
</Identity>
<Pack>
<Entity>units/cart_mechanical_siege_ballista_unpacked</Entity>
<Entity>units/cart_siege_ballista_unpacked</Entity>
<State>packed</State>
</Pack>
<VisualActor>

View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="units/cart_mechanical_siege_ballista_packed">
<Entity parent="units/cart_siege_ballista_packed">
<Identity>
<Icon>units/cart_mechanical_siege_ballista.png</Icon>
<Icon>units/cart_siege_ballista.png</Icon>
</Identity>
<Pack>
<Entity>units/cart_mechanical_siege_ballista_packed</Entity>
<Entity>units/cart_siege_ballista_packed</Entity>
<State>unpacked</State>
</Pack>
<UnitMotion>

View file

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_siege_ballista">
<Entity parent="template_unit_siege_boltshooter">
<Identity>
<Civ>cart</Civ>
<SpecificName>Oxybelḗs</SpecificName>
<Icon>units/hele_mechanical_siege_oxybeles_packed.png</Icon>
<Icon>units/hele_siege_oxybeles_packed.png</Icon>
</Identity>
<Pack>
<Entity>units/cart_mechanical_siege_oxybeles_unpacked</Entity>
<Entity>units/cart_siege_oxybeles_unpacked</Entity>
<State>packed</State>
</Pack>
<VisualActor>

View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="units/cart_mechanical_siege_oxybeles_packed">
<Entity parent="units/cart_siege_oxybeles_packed">
<Identity>
<Icon>units/cart_mechanical_siege_oxybeles.png</Icon>
<Icon>units/cart_siege_oxybeles.png</Icon>
</Identity>
<Pack>
<Entity>units/cart_mechanical_siege_oxybeles_packed</Entity>
<Entity>units/cart_siege_oxybeles_packed</Entity>
<State>unpacked</State>
</Pack>
<UnitMotion>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_fishing">
<Entity parent="template_unit_ship_fishing">
<Identity>
<Civ>gaul</Civ>
<SpecificName>Lembus</SpecificName>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_merchant">
<Entity parent="template_unit_ship_merchant">
<Footprint>
<Square width="12.0" depth="24.0"/>
<Height>6.0</Height>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_trireme">
<Entity parent="template_unit_ship_trireme">
<Cost>
<BuildTime>40</BuildTime>
</Cost>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_siege_ram">
<Entity parent="template_unit_siege_ram">
<Footprint replace="">
<Square width="6.75" depth="10.0"/>
<Height>3.0</Height>
@ -7,7 +7,7 @@
<Identity>
<Civ>gaul</Civ>
<SpecificName>Reithe</SpecificName>
<Icon>units/celt_mechanical_siege_ram.png</Icon>
<Icon>units/celt_siege_ram.png</Icon>
</Identity>
<VisualActor>
<Actor>structures/celts/siege_ram.xml</Actor>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_fire">
<Entity parent="template_unit_ship_fire">
<Identity>
<Civ>iber</Civ>
<SpecificName>Iberian Fire Ship</SpecificName>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_fishing">
<Entity parent="template_unit_ship_fishing">
<Identity>
<Civ>iber</Civ>
<SpecificName>Arrantza Ontzi</SpecificName>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_merchant">
<Entity parent="template_unit_ship_merchant">
<Footprint>
<Square width="8.0" depth="24.0"/>
<Height>8.0</Height>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_trireme">
<Entity parent="template_unit_ship_trireme">
<Cost>
<BuildTime>40</BuildTime>
</Cost>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_siege_ram">
<Entity parent="template_unit_siege_ram">
<Footprint replace="">
<Square width="6.75" depth="9.0"/>
<Height>3.0</Height>
@ -7,7 +7,7 @@
<Identity>
<Civ>iber</Civ>
<SpecificName>Ahariburu</SpecificName>
<Icon>units/iber_mechanical_siege_ram.png</Icon>
<Icon>units/iber_siege_ram.png</Icon>
</Identity>
<VisualActor>
<Actor>structures/iberians/siege_ram.xml</Actor>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_bireme">
<Entity parent="template_unit_ship_bireme">
<Identity>
<Civ>kush</Civ>
<Icon>units/ptol_ship_bireme.png</Icon>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_fishing">
<Entity parent="template_unit_ship_fishing">
<Identity>
<Civ>kush</Civ>
<GenericName>Fishing Boat</GenericName>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_merchant">
<Entity parent="template_unit_ship_merchant">
<Footprint>
<Square width="8.0" depth="24.0"/>
<Height>8.0</Height>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_trireme">
<Entity parent="template_unit_ship_trireme">
<Cost>
<Resources>
<wood op="add">50</wood>

View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_siege_tower">
<Entity parent="template_unit_siege_tower">
<Identity>
<Civ>kush</Civ>
<GenericName>Kushite Siege Tower</GenericName>
<SpecificName>iwn n ms</SpecificName>
<Icon>units/hele_mechanical_siege_tower.png</Icon>
<Icon>units/hele_siege_tower.png</Icon>
</Identity>
<VisualActor>
<Actor>structures/hellenes/siege_tower.xml</Actor>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_bireme">
<Entity parent="template_unit_ship_bireme">
<Identity>
<Civ>mace</Civ>
<SpecificName>Hemiolos</SpecificName>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_fishing">
<Entity parent="template_unit_ship_fishing">
<Identity>
<Civ>mace</Civ>
<SpecificName>Ploîon Halieutikón</SpecificName>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_merchant">
<Entity parent="template_unit_ship_merchant">
<Footprint>
<Square width="8.0" depth="24.0"/>
<Height>8.0</Height>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_trireme">
<Entity parent="template_unit_ship_trireme">
<Identity>
<Civ>mace</Civ>
<SpecificName>Triḗrēs Athēnaía</SpecificName>

View file

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_siege_onager">
<Entity parent="template_unit_siege_stonethrower">
<Identity>
<Civ>mace</Civ>
<SpecificName>Lithobólos</SpecificName>
<Icon>units/hele_mechanical_siege_lithobolos_packed.png</Icon>
<Icon>units/hele_siege_lithobolos_packed.png</Icon>
</Identity>
<Pack>
<Entity>units/mace_mechanical_siege_lithobolos_unpacked</Entity>
<Entity>units/mace_siege_lithobolos_unpacked</Entity>
<State>packed</State>
</Pack>
<VisualActor>

View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="units/mace_mechanical_siege_lithobolos_packed">
<Entity parent="units/mace_siege_lithobolos_packed">
<Identity>
<Icon>units/hele_mechanical_siege_lithobolos.png</Icon>
<Icon>units/hele_siege_lithobolos.png</Icon>
</Identity>
<Pack>
<Entity>units/mace_mechanical_siege_lithobolos_packed</Entity>
<Entity>units/mace_siege_lithobolos_packed</Entity>
<State>unpacked</State>
</Pack>
<UnitMotion>

View file

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_siege_ballista">
<Entity parent="template_unit_siege_boltshooter">
<Identity>
<Civ>mace</Civ>
<SpecificName>Oxybelḗs</SpecificName>
<Icon>units/hele_mechanical_siege_oxybeles_packed.png</Icon>
<Icon>units/hele_siege_oxybeles_packed.png</Icon>
</Identity>
<Pack>
<Entity>units/mace_mechanical_siege_oxybeles_unpacked</Entity>
<Entity>units/mace_siege_oxybeles_unpacked</Entity>
<State>packed</State>
</Pack>
<VisualActor>

View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="units/athen_mechanical_siege_oxybeles_packed">
<Entity parent="units/mace_siege_oxybeles_packed">
<Identity>
<Icon>units/hele_mechanical_siege_oxybeles.png</Icon>
<Icon>units/hele_siege_oxybeles.png</Icon>
</Identity>
<Pack>
<Entity>units/athen_mechanical_siege_oxybeles_packed</Entity>
<Entity>units/mace_siege_oxybeles_packed</Entity>
<State>unpacked</State>
</Pack>
<UnitMotion>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_siege_ram">
<Entity parent="template_unit_siege_ram">
<Footprint replace="">
<Square width="8.0" depth="12.0"/>
<Height>3.0</Height>
@ -7,7 +7,7 @@
<Identity>
<Civ>mace</Civ>
<SpecificName>Poliorkitikós Kriós</SpecificName>
<Icon>units/mace_mechanical_siege_ram.png</Icon>
<Icon>units/mace_siege_ram.png</Icon>
</Identity>
<VisualActor>
<Actor>structures/macedonians/siege_ram.xml</Actor>

View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_siege_tower">
<Entity parent="template_unit_siege_tower">
<Identity>
<Civ>mace</Civ>
<SpecificName>Helépolis</SpecificName>
<Icon>units/hele_mechanical_siege_tower.png</Icon>
<Icon>units/hele_siege_tower.png</Icon>
</Identity>
<VisualActor>
<Actor>structures/hellenes/siege_tower.xml</Actor>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_bireme">
<Entity parent="template_unit_ship_bireme">
<Identity>
<Civ>maur</Civ>
<SpecificName>Yudhpot</SpecificName>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_fishing">
<Entity parent="template_unit_ship_fishing">
<Footprint>
<Square width="7.0" depth="17.0"/>
<Height>4.0</Height>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_merchant">
<Entity parent="template_unit_ship_merchant">
<Footprint>
<Square width="12.0" depth="28.0"/>
<Height>6.0</Height>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_trireme">
<Entity parent="template_unit_ship_trireme">
<Cost>
<BuildTime>40</BuildTime>
</Cost>

View file

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_siege_ram">
<Entity parent="template_unit_siege_ram">
<Footprint replace="">
<Square width="8.0" depth="12.0"/>
<Height>3.0</Height>
</Footprint>
<Identity>
<Civ>maur</Civ>
<Icon>units/maur_mechanical_siege_ram.png</Icon>
<Icon>units/maur_siege_ram.png</Icon>
</Identity>
<VisualActor>
<Actor>structures/mauryas/siege_ram.xml</Actor>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_bireme">
<Entity parent="template_unit_ship_bireme">
<Footprint>
<Square width="8.0" depth="28.0"/>
<Height>10.0</Height>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_bireme">
<Entity parent="template_unit_ship_bireme">
<Footprint>
<Square width="7.0" depth="37.0"/>
<Height>8.0</Height>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_fishing">
<Entity parent="template_unit_ship_fishing">
<Identity>
<Civ>pers</Civ>
<Lang>persian</Lang>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_merchant">
<Entity parent="template_unit_ship_merchant">
<Footprint>
<Square width="6.0" depth="25.0"/>
<Height>8.0</Height>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_trireme">
<Entity parent="template_unit_ship_trireme">
<Footprint>
<Square width="9.0" depth="42.0"/>
<Height>8.0</Height>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_siege_ram">
<Entity parent="template_unit_siege_ram">
<Attack>
<Melee>
<Crush op="mul">1.2</Crush>
@ -17,7 +17,7 @@
<Lang>persian</Lang>
<GenericName>Assyrian Siege Ram</GenericName>
<SpecificName>Athuriya Hamaranakuba</SpecificName>
<Icon>units/pers_mechanical_siege_ram.png</Icon>
<Icon>units/pers_siege_ram.png</Icon>
</Identity>
<VisualActor>
<Actor>structures/persians/siege_ram.xml</Actor>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_quinquereme">
<Entity parent="template_unit_ship_quinquereme">
<Cost>
<Population>5</Population>
<BuildTime>60</BuildTime>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_bireme">
<Entity parent="template_unit_ship_bireme">
<Identity>
<Civ>ptol</Civ>
<GenericName>Bireme</GenericName>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_fishing">
<Entity parent="template_unit_ship_fishing">
<Identity>
<Civ>ptol</Civ>
<SpecificName>Ploîon Halieutikón</SpecificName>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_merchant">
<Entity parent="template_unit_ship_merchant">
<Footprint>
<Square width="8.0" depth="24.0"/>
<Height>8.0</Height>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_quinquereme">
<Entity parent="template_unit_ship_quinquereme">
<Identity>
<Civ>ptol</Civ>
<SpecificName>Octḗrēs</SpecificName>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_trireme">
<Entity parent="template_unit_ship_trireme">
<Identity>
<Civ>ptol</Civ>
<SpecificName>Pentḗrēs</SpecificName>

View file

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_siege_onager">
<Entity parent="template_unit_siege_stonethrower">
<Identity>
<Civ>ptol</Civ>
<SpecificName>Lithobólos</SpecificName>
<Icon>units/hele_mechanical_siege_lithobolos_packed.png</Icon>
<Icon>units/hele_siege_lithobolos_packed.png</Icon>
</Identity>
<Pack>
<Entity>units/ptol_mechanical_siege_lithobolos_unpacked</Entity>
<Entity>units/ptol_siege_lithobolos_unpacked</Entity>
<State>packed</State>
</Pack>
<VisualActor>

View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="units/ptol_mechanical_siege_lithobolos_packed">
<Entity parent="units/ptol_siege_lithobolos_packed">
<Identity>
<Icon>units/hele_mechanical_siege_lithobolos.png</Icon>
<Icon>units/hele_siege_lithobolos.png</Icon>
</Identity>
<Pack>
<Entity>units/ptol_mechanical_siege_lithobolos_packed</Entity>
<Entity>units/ptol_siege_lithobolos_packed</Entity>
<State>unpacked</State>
</Pack>
<UnitMotion>

View file

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_siege_ballista">
<Entity parent="template_unit_siege_boltshooter">
<Identity>
<Civ>ptol</Civ>
<SpecificName>Polybolos</SpecificName>
<Icon>units/hele_mechanical_siege_oxybeles_packed.png</Icon>
<Icon>units/hele_siege_oxybeles_packed.png</Icon>
</Identity>
<Pack>
<Entity>units/ptol_mechanical_siege_polybolos_unpacked</Entity>
<Entity>units/ptol_siege_polybolos_unpacked</Entity>
<State>packed</State>
</Pack>
<VisualActor>

View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="units/ptol_mechanical_siege_polybolos_packed">
<Entity parent="units/ptol_siege_polybolos_packed">
<Identity>
<Icon>units/hele_mechanical_siege_oxybeles.png</Icon>
<Icon>units/hele_siege_oxybeles.png</Icon>
</Identity>
<Pack>
<Entity>units/ptol_mechanical_siege_polybolos_packed</Entity>
<Entity>units/ptol_siege_polybolos_packed</Entity>
<State>unpacked</State>
</Pack>
<UnitMotion>

View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_siege_tower">
<Entity parent="template_unit_siege_tower">
<Identity>
<Civ>ptol</Civ>
<SpecificName>Helépolis</SpecificName>
<Icon>units/hele_mechanical_siege_tower.png</Icon>
<Icon>units/hele_siege_tower.png</Icon>
</Identity>
<VisualActor>
<Actor>structures/ptolemies/siege_tower.xml</Actor>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_bireme">
<Entity parent="template_unit_ship_bireme">
<Identity>
<Civ>rome</Civ>
<SpecificName>Liburna</SpecificName>

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_mechanical_ship_fishing">
<Entity parent="template_unit_ship_fishing">
<Identity>
<Civ>rome</Civ>
<SpecificName>Navicula Piscatoria</SpecificName>

Some files were not shown because too many files have changed in this diff Show more