Ticket #1696: progress_1696_IV.patch

binaries/data/mods/public/simulation/data/placeablesFilter.json

@@ +1 @@
+ {
+   "templates": [
+     {"directory": "campaigns", "file": "*.xml"},
+     {"directory": "gaia", "file": "*.xml"},
+     {"directory": "other", "file": "*.xml"},
+     {"directory": "structures", "file": "*.xml"},
+     {"directory": "units", "file": "*.xml"},
+     {"directory": "special", "file": "trigger_point*.xml"},
+     {"directory": "special", "file": "territory*.xml"}
+   ]
+ }
+ No newline at end of file

binaries/data/mods/public/simulation/templates/special_units/athen_mechanical_siege_lithobolos_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_onager">
+  <Identity>
+    <Civ>athen</Civ>
+    <SpecificName>Lithóbolos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.5"/>
+  </Obstruction>
+  <Vision>
+    <Range>88</Range>
+  </Vision>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/athen_mechanical_siege_oxybeles_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_ballista">
+  <Identity>
+    <Civ>athen</Civ>
+    <SpecificName>Oxybelḗs</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.0"/>
+  </Obstruction>
+  <Vision>
+    <Range>77</Range>
+  </Vision>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/cart_mechanical_siege_ballista_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_onager">
+  <Identity>
+    <Civ>cart</Civ>
+    <SpecificName>Ballista</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.5"/>
+  </Obstruction>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/cart_mechanical_siege_oxybeles_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_ballista">
+  <Identity>
+    <Civ>cart</Civ>
+    <SpecificName>Oxybeles</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.0"/>
+  </Obstruction>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/hele_mechanical_siege_lithobolos_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_onager">
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Lithóbolos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.5"/>
+  </Obstruction>
+  <Vision>
+    <Range>88</Range>
+  </Vision>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/hele_mechanical_siege_oxybeles_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_ballista">
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Oxybelḗs</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.0"/>
+  </Obstruction>
+  <Vision>
+    <Range>77</Range>
+  </Vision>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/mace_mechanical_siege_lithobolos_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_onager">
+  <Identity>
+    <Civ>mace</Civ>
+    <SpecificName>Lithóbolos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.5"/>
+  </Obstruction>
+  <Vision>
+    <Range>88</Range>
+  </Vision>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/mace_mechanical_siege_oxybeles_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_ballista">
+  <Identity>
+    <Civ>mace</Civ>
+    <SpecificName>Oxybelḗs</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.0"/>
+  </Obstruction>
+  <Vision>
+    <Range>77</Range>
+  </Vision>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/ptol_mechanical_siege_lithobolos_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_onager">
+  <Identity>
+    <Civ>ptol</Civ>
+    <SpecificName>Lithóbolos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.5"/>
+  </Obstruction>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/ptol_mechanical_siege_polybolos_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_ballista">
+  <Identity>
+    <Civ>ptol</Civ>
+    <SpecificName>Polybolos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.0"/>
+  </Obstruction>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/rome_mechanical_siege_ballista_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_onager">
+  <Attack>
+    <Ranged>
+      <MaxRange>76</MaxRange>
+      <MinRange>16.0</MinRange>
+      <ProjectileSpeed>22.0</ProjectileSpeed>
+      <RepeatTime>6000</RepeatTime>
+      <Splash>
+        <Shape>Circular</Shape>
+        <Range>10</Range>
+        <FriendlyFire>true</FriendlyFire>
+        <Hack>40.0</Hack>
+        <Pierce>0.0</Pierce>
+        <Crush>40.0</Crush>
+      </Splash>
+    </Ranged>
+  </Attack>
+  <Cost>
+    <BuildTime>40</BuildTime>
+    <Resources>
+      <wood>300</wood>
+      <stone>100</stone>
+    </Resources>
+  </Cost>
+  <Footprint replace="">
+    <Square width="10.0" depth="10.0"/>
+    <Height>5.0</Height>
+  </Footprint>
+  <Identity>
+    <Civ>rome</Civ>
+    <SpecificName>Ballista</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.5"/>
+  </Obstruction>
+  <Vision>
+    <Range>88</Range>
+  </Vision>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/rome_mechanical_siege_scorpio_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_ballista">
+  <Attack>
+    <Ranged>
+      <Hack>0.0</Hack>
+      <Pierce>40.0</Pierce>
+      <Crush>20.0</Crush>
+      <MaxRange>56</MaxRange>
+      <MinRange>4.0</MinRange>
+      <ProjectileSpeed>64.0</ProjectileSpeed>
+      <RepeatTime>2500</RepeatTime>
+    </Ranged>
+  </Attack>
+  <Cost>
+    <BuildTime>15</BuildTime>
+    <Resources>
+      <wood>90</wood>
+    </Resources>
+  </Cost>
+  <Footprint replace="">
+    <Square width="5.0" depth="5.0"/>
+    <Height>3.0</Height>
+  </Footprint>
+  <Health>
+    <Max>150</Max>
+  </Health>
+  <Identity>
+    <Civ>rome</Civ>
+    <SpecificName>Scorpio</SpecificName>
+  </Identity>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/sele_mechanical_siege_lithobolos_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_onager">
+  <Identity>
+    <Civ>sele</Civ>
+    <SpecificName>Lithóbolos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.5"/>
+  </Obstruction>
+  <Vision>
+    <Range>88</Range>
+  </Vision>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/spart_mechanical_siege_oxybeles_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_ballista">
+  <Identity>
+    <Civ>spart</Civ>
+    <SpecificName>Oxybelḗs</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.0"/>
+  </Obstruction>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/athen_mechanical_siege_lithobolos_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_onager">
+  <Identity>
+    <Civ>athen</Civ>
+    <SpecificName>Lithóbolos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.5"/>
+  </Obstruction>
+  <Vision>
+    <Range>88</Range>
+  </Vision>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/athen_mechanical_siege_oxybeles_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_ballista">
+  <Identity>
+    <Civ>athen</Civ>
+    <SpecificName>Oxybelḗs</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.0"/>
+  </Obstruction>
+  <Vision>
+    <Range>77</Range>
+  </Vision>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/cart_mechanical_siege_ballista_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_onager">
+  <Identity>
+    <Civ>cart</Civ>
+    <SpecificName>Ballista</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.5"/>
+  </Obstruction>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/cart_mechanical_siege_oxybeles_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_ballista">
+  <Identity>
+    <Civ>cart</Civ>
+    <SpecificName>Oxybeles</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.0"/>
+  </Obstruction>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/hele_mechanical_siege_lithobolos_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_onager">
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Lithóbolos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.5"/>
+  </Obstruction>
+  <Vision>
+    <Range>88</Range>
+  </Vision>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/hele_mechanical_siege_oxybeles_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_ballista">
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Oxybelḗs</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.0"/>
+  </Obstruction>
+  <Vision>
+    <Range>77</Range>
+  </Vision>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/mace_mechanical_siege_lithobolos_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_onager">
+  <Identity>
+    <Civ>mace</Civ>
+    <SpecificName>Lithóbolos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.5"/>
+  </Obstruction>
+  <Vision>
+    <Range>88</Range>
+  </Vision>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/mace_mechanical_siege_oxybeles_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_ballista">
+  <Identity>
+    <Civ>mace</Civ>
+    <SpecificName>Oxybelḗs</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.0"/>
+  </Obstruction>
+  <Vision>
+    <Range>77</Range>
+  </Vision>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/ptol_mechanical_siege_lithobolos_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_onager">
+  <Identity>
+    <Civ>ptol</Civ>
+    <SpecificName>Lithóbolos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.5"/>
+  </Obstruction>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/ptol_mechanical_siege_polybolos_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_ballista">
+  <Identity>
+    <Civ>ptol</Civ>
+    <SpecificName>Polybolos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.0"/>
+  </Obstruction>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/rome_mechanical_siege_ballista_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_onager">
+  <Attack>
+    <Ranged>
+      <MaxRange>76</MaxRange>
+      <MinRange>16.0</MinRange>
+      <ProjectileSpeed>22.0</ProjectileSpeed>
+      <RepeatTime>6000</RepeatTime>
+      <Splash>
+        <Shape>Circular</Shape>
+        <Range>10</Range>
+        <FriendlyFire>true</FriendlyFire>
+        <Hack>40.0</Hack>
+        <Pierce>0.0</Pierce>
+        <Crush>40.0</Crush>
+      </Splash>
+    </Ranged>
+  </Attack>
+  <Cost>
+    <BuildTime>40</BuildTime>
+    <Resources>
+      <wood>300</wood>
+      <stone>100</stone>
+    </Resources>
+  </Cost>
+  <Footprint replace="">
+    <Square width="10.0" depth="10.0"/>
+    <Height>5.0</Height>
+  </Footprint>
+  <Identity>
+    <Civ>rome</Civ>
+    <SpecificName>Ballista</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.5"/>
+  </Obstruction>
+  <Vision>
+    <Range>88</Range>
+  </Vision>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/rome_mechanical_siege_scorpio_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_ballista">
+  <Attack>
+    <Ranged>
+      <Hack>0.0</Hack>
+      <Pierce>40.0</Pierce>
+      <Crush>20.0</Crush>
+      <MaxRange>56</MaxRange>
+      <MinRange>4.0</MinRange>
+      <ProjectileSpeed>64.0</ProjectileSpeed>
+      <RepeatTime>2500</RepeatTime>
+    </Ranged>
+  </Attack>
+  <Cost>
+    <BuildTime>15</BuildTime>
+    <Resources>
+      <wood>90</wood>
+    </Resources>
+  </Cost>
+  <Footprint replace="">
+    <Square width="5.0" depth="5.0"/>
+    <Height>3.0</Height>
+  </Footprint>
+  <Health>
+    <Max>150</Max>
+  </Health>
+  <Identity>
+    <Civ>rome</Civ>
+    <SpecificName>Scorpio</SpecificName>
+  </Identity>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/sele_mechanical_siege_lithobolos_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_onager">
+  <Identity>
+    <Civ>sele</Civ>
+    <SpecificName>Lithóbolos</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.5"/>
+  </Obstruction>
+  <Vision>
+    <Range>88</Range>
+  </Vision>
+</Entity>

binaries/data/mods/public/simulation/templates/special_units/spart_mechanical_siege_oxybeles_common.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_mechanical_siege_ballista">
+  <Identity>
+    <Civ>spart</Civ>
+    <SpecificName>Oxybelḗs</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Unit radius="3.0"/>
+  </Obstruction>
+</Entity>

binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_lithobolos_common.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_onager">
-  <Identity>
-    <Civ>athen</Civ>
-    <SpecificName>Lithóbolos</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Unit radius="3.5"/>
-  </Obstruction>
-  <Vision>
-    <Range>88</Range>
-  </Vision>
-</Entity>

binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_lithobolos_packed.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/athen_mechanical_siege_lithobolos_common">
-  <Identity>
-    <Icon>units/hele_mechanical_siege_lithobolos_packed.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/athen_mechanical_siege_lithobolos_unpacked</Entity>
-    <Time>10000</Time>
-    <State>packed</State>
-  </Pack>
-  <VisualActor>
-    <Actor>units/athenians/siege_rock_packed.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_lithobolos_packed.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/athen_mechanical_siege_lithobolos_common">
+  <Identity>
+    <Icon>units/hele_mechanical_siege_lithobolos_packed.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/athen_mechanical_siege_lithobolos_unpacked</Entity>
+    <Time>10000</Time>
+    <State>packed</State>
+  </Pack>
+  <VisualActor>
+    <Actor>units/athenians/siege_rock_packed.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_lithobolos_unpacked.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/athen_mechanical_siege_lithobolos_common">
-  <Identity>
-    <Icon>units/hele_mechanical_siege_lithobolos.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/athen_mechanical_siege_lithobolos_packed</Entity>
-    <Time>10000</Time>
-    <State>unpacked</State>
-  </Pack>
-  <UnitMotion>
-    <WalkSpeed>0.001</WalkSpeed>
-    <Run>
-      <Speed>0.001</Speed>
-    </Run>
-  </UnitMotion>
-  <VisualActor>
-    <Actor>units/athenians/siege_rock.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_lithobolos_unpacked.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/athen_mechanical_siege_lithobolos_common">
+  <Identity>
+    <Icon>units/hele_mechanical_siege_lithobolos.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/athen_mechanical_siege_lithobolos_packed</Entity>
+    <Time>10000</Time>
+    <State>unpacked</State>
+  </Pack>
+  <UnitMotion>
+    <WalkSpeed>0.001</WalkSpeed>
+    <Run>
+      <Speed>0.001</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>units/athenians/siege_rock.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_oxybeles_common.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ballista">
-  <Identity>
-    <Civ>athen</Civ>
-    <SpecificName>Oxybelḗs</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Unit radius="3.0"/>
-  </Obstruction>
-  <Vision>
-    <Range>77</Range>
-  </Vision>
-</Entity>

binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_oxybeles_packed.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/athen_mechanical_siege_oxybeles_common">
-  <Identity>
-    <Icon>units/hele_mechanical_siege_oxybeles_packed.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/athen_mechanical_siege_oxybeles_unpacked</Entity>
-    <Time>10000</Time>
-    <State>packed</State>
-  </Pack>
-  <VisualActor>
-    <Actor>units/athenians/siege_spear_packed.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_oxybeles_packed.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/athen_mechanical_siege_oxybeles_common">
+  <Identity>
+    <Icon>units/hele_mechanical_siege_oxybeles_packed.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/athen_mechanical_siege_oxybeles_unpacked</Entity>
+    <Time>10000</Time>
+    <State>packed</State>
+  </Pack>
+  <VisualActor>
+    <Actor>units/athenians/siege_spear_packed.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_oxybeles_unpacked.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/athen_mechanical_siege_oxybeles_common">
-  <Identity>
-    <Icon>units/hele_mechanical_siege_oxybeles.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/athen_mechanical_siege_oxybeles_packed</Entity>
-    <Time>10000</Time>
-    <State>unpacked</State>
-  </Pack>
-  <UnitMotion>
-    <WalkSpeed>0.001</WalkSpeed>
-    <Run>
-      <Speed>0.001</Speed>
-    </Run>
-  </UnitMotion>
-  <VisualActor>
-    <Actor>units/athenians/siege_spear.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/athen_mechanical_siege_oxybeles_unpacked.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/athen_mechanical_siege_oxybeles_common">
+  <Identity>
+    <Icon>units/hele_mechanical_siege_oxybeles.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/athen_mechanical_siege_oxybeles_packed</Entity>
+    <Time>10000</Time>
+    <State>unpacked</State>
+  </Pack>
+  <UnitMotion>
+    <WalkSpeed>0.001</WalkSpeed>
+    <Run>
+      <Speed>0.001</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>units/athenians/siege_spear.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_ballista_common.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_onager">
-  <Identity>
-    <Civ>cart</Civ>
-    <SpecificName>Ballista</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Unit radius="3.5"/>
-  </Obstruction>
-</Entity>

binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_ballista_packed.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/cart_mechanical_siege_ballista_common">
-  <Identity>
-    <Icon>units/cart_mechanical_siege_ballista_packed.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/cart_mechanical_siege_ballista_unpacked</Entity>
-    <Time>10000</Time>
-    <State>packed</State>
-  </Pack>
-  <VisualActor>
-    <Actor>units/carthaginians/siege_rock_packed.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_ballista_packed.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/cart_mechanical_siege_ballista_common">
+  <Identity>
+    <Icon>units/cart_mechanical_siege_ballista_packed.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/cart_mechanical_siege_ballista_unpacked</Entity>
+    <Time>10000</Time>
+    <State>packed</State>
+  </Pack>
+  <VisualActor>
+    <Actor>units/carthaginians/siege_rock_packed.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_ballista_unpacked.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/cart_mechanical_siege_ballista_common">
-  <Identity>
-    <Icon>units/cart_mechanical_siege_ballista.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/cart_mechanical_siege_ballista_packed</Entity>
-    <Time>10000</Time>
-    <State>unpacked</State>
-  </Pack>
-  <UnitMotion>
-    <WalkSpeed>0.001</WalkSpeed>
-    <Run>
-      <Speed>0.001</Speed>
-    </Run>
-  </UnitMotion>
-  <VisualActor>
-    <Actor>units/carthaginians/siege_rock.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_ballista_unpacked.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/cart_mechanical_siege_ballista_common">
+  <Identity>
+    <Icon>units/cart_mechanical_siege_ballista.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/cart_mechanical_siege_ballista_packed</Entity>
+    <Time>10000</Time>
+    <State>unpacked</State>
+  </Pack>
+  <UnitMotion>
+    <WalkSpeed>0.001</WalkSpeed>
+    <Run>
+      <Speed>0.001</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>units/carthaginians/siege_rock.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_oxybeles_common.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ballista">
-  <Identity>
-    <Civ>cart</Civ>
-    <SpecificName>Oxybeles</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Unit radius="3.0"/>
-  </Obstruction>
-</Entity>

binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_oxybeles_packed.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/cart_mechanical_siege_oxybeles_common">
-  <Identity>
-    <Icon>units/hele_mechanical_siege_oxybeles_packed.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/cart_mechanical_siege_oxybeles_unpacked</Entity>
-    <Time>10000</Time>
-    <State>packed</State>
-  </Pack>
-  <VisualActor>
-    <Actor>units/carthaginians/siege_spear_packed.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_oxybeles_packed.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/cart_mechanical_siege_oxybeles_common">
+  <Identity>
+    <Icon>units/hele_mechanical_siege_oxybeles_packed.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/cart_mechanical_siege_oxybeles_unpacked</Entity>
+    <Time>10000</Time>
+    <State>packed</State>
+  </Pack>
+  <VisualActor>
+    <Actor>units/carthaginians/siege_spear_packed.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_oxybeles_unpacked.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/cart_mechanical_siege_oxybeles_common">
-  <Identity>
-    <Icon>units/cart_mechanical_siege_oxybeles.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/cart_mechanical_siege_oxybeles_packed</Entity>
-    <Time>10000</Time>
-    <State>unpacked</State>
-  </Pack>
-  <UnitMotion>
-    <WalkSpeed>0.001</WalkSpeed>
-    <Run>
-      <Speed>0.001</Speed>
-    </Run>
-  </UnitMotion>
-  <VisualActor>
-    <Actor>units/carthaginians/siege_spear.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/cart_mechanical_siege_oxybeles_unpacked.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/cart_mechanical_siege_oxybeles_common">
+  <Identity>
+    <Icon>units/cart_mechanical_siege_oxybeles.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/cart_mechanical_siege_oxybeles_packed</Entity>
+    <Time>10000</Time>
+    <State>unpacked</State>
+  </Pack>
+  <UnitMotion>
+    <WalkSpeed>0.001</WalkSpeed>
+    <Run>
+      <Speed>0.001</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>units/carthaginians/siege_spear.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_lithobolos_common.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_onager">
-  <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Lithóbolos</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Unit radius="3.5"/>
-  </Obstruction>
-  <Vision>
-    <Range>88</Range>
-  </Vision>
-</Entity>

binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_lithobolos_packed.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/hele_mechanical_siege_lithobolos_common">
-  <Identity>
-    <Icon>units/hele_mechanical_siege_lithobolos_packed.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/hele_mechanical_siege_lithobolos_unpacked</Entity>
-    <Time>10000</Time>
-    <State>packed</State>
-  </Pack>
-  <VisualActor>
-    <Actor>units/hellenes/siege_rock_packed.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_lithobolos_packed.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/hele_mechanical_siege_lithobolos_common">
+  <Identity>
+    <Icon>units/hele_mechanical_siege_lithobolos_packed.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/hele_mechanical_siege_lithobolos_unpacked</Entity>
+    <Time>10000</Time>
+    <State>packed</State>
+  </Pack>
+  <VisualActor>
+    <Actor>units/hellenes/siege_rock_packed.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_lithobolos_unpacked.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/hele_mechanical_siege_lithobolos_common">
-  <Identity>
-    <Icon>units/hele_mechanical_siege_lithobolos.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/hele_mechanical_siege_lithobolos_packed</Entity>
-    <Time>10000</Time>
-    <State>unpacked</State>
-  </Pack>
-  <UnitMotion>
-    <WalkSpeed>0.001</WalkSpeed>
-    <Run>
-      <Speed>0.001</Speed>
-    </Run>
-  </UnitMotion>
-  <VisualActor>
-    <Actor>units/hellenes/siege_rock.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_lithobolos_unpacked.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/hele_mechanical_siege_lithobolos_common">
+  <Identity>
+    <Icon>units/hele_mechanical_siege_lithobolos.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/hele_mechanical_siege_lithobolos_packed</Entity>
+    <Time>10000</Time>
+    <State>unpacked</State>
+  </Pack>
+  <UnitMotion>
+    <WalkSpeed>0.001</WalkSpeed>
+    <Run>
+      <Speed>0.001</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>units/hellenes/siege_rock.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_oxybeles_common.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ballista">
-  <Identity>
-    <Civ>hele</Civ>
-    <SpecificName>Oxybelḗs</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Unit radius="3.0"/>
-  </Obstruction>
-  <Vision>
-    <Range>77</Range>
-  </Vision>
-</Entity>

binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_oxybeles_packed.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/hele_mechanical_siege_oxybeles_common">
-  <Identity>
-    <Icon>units/hele_mechanical_siege_oxybeles_packed.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/hele_mechanical_siege_oxybeles_unpacked</Entity>
-    <Time>10000</Time>
-    <State>packed</State>
-  </Pack>
-  <VisualActor>
-    <Actor>units/hellenes/siege_spear_packed.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_oxybeles_packed.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/hele_mechanical_siege_oxybeles_common">
+  <Identity>
+    <Icon>units/hele_mechanical_siege_oxybeles_packed.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/hele_mechanical_siege_oxybeles_unpacked</Entity>
+    <Time>10000</Time>
+    <State>packed</State>
+  </Pack>
+  <VisualActor>
+    <Actor>units/hellenes/siege_spear_packed.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_oxybeles_unpacked.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/hele_mechanical_siege_oxybeles_common">
-  <Identity>
-    <Icon>units/hele_mechanical_siege_oxybeles.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/hele_mechanical_siege_oxybeles_packed</Entity>
-    <Time>10000</Time>
-    <State>unpacked</State>
-  </Pack>
-  <UnitMotion>
-    <WalkSpeed>0.001</WalkSpeed>
-    <Run>
-      <Speed>0.001</Speed>
-    </Run>
-  </UnitMotion>
-  <VisualActor>
-    <Actor>units/hellenes/siege_spear.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/hele_mechanical_siege_oxybeles_unpacked.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/hele_mechanical_siege_oxybeles_common">
+  <Identity>
+    <Icon>units/hele_mechanical_siege_oxybeles.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/hele_mechanical_siege_oxybeles_packed</Entity>
+    <Time>10000</Time>
+    <State>unpacked</State>
+  </Pack>
+  <UnitMotion>
+    <WalkSpeed>0.001</WalkSpeed>
+    <Run>
+      <Speed>0.001</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>units/hellenes/siege_spear.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_lithobolos_common.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_onager">
-  <Identity>
-    <Civ>mace</Civ>
-    <SpecificName>Lithóbolos</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Unit radius="3.5"/>
-  </Obstruction>
-  <Vision>
-    <Range>88</Range>
-  </Vision>
-</Entity>

binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_lithobolos_packed.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace_mechanical_siege_lithobolos_common">
-  <Identity>
-    <Icon>units/hele_mechanical_siege_lithobolos_packed.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/mace_mechanical_siege_lithobolos_unpacked</Entity>
-    <Time>10000</Time>
-    <State>packed</State>
-  </Pack>
-  <VisualActor>
-    <Actor>units/hellenes/siege_rock_packed.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_lithobolos_packed.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/mace_mechanical_siege_lithobolos_common">
+  <Identity>
+    <Icon>units/hele_mechanical_siege_lithobolos_packed.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/mace_mechanical_siege_lithobolos_unpacked</Entity>
+    <Time>10000</Time>
+    <State>packed</State>
+  </Pack>
+  <VisualActor>
+    <Actor>units/hellenes/siege_rock_packed.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_lithobolos_unpacked.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace_mechanical_siege_lithobolos_common">
-  <Identity>
-    <Icon>units/hele_mechanical_siege_lithobolos.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/mace_mechanical_siege_lithobolos_packed</Entity>
-    <Time>10000</Time>
-    <State>unpacked</State>
-  </Pack>
-  <UnitMotion>
-    <WalkSpeed>0.001</WalkSpeed>
-    <Run>
-      <Speed>0.001</Speed>
-    </Run>
-  </UnitMotion>
-  <VisualActor>
-    <Actor>units/hellenes/siege_rock.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_lithobolos_unpacked.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/mace_mechanical_siege_lithobolos_common">
+  <Identity>
+    <Icon>units/hele_mechanical_siege_lithobolos.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/mace_mechanical_siege_lithobolos_packed</Entity>
+    <Time>10000</Time>
+    <State>unpacked</State>
+  </Pack>
+  <UnitMotion>
+    <WalkSpeed>0.001</WalkSpeed>
+    <Run>
+      <Speed>0.001</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>units/hellenes/siege_rock.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_oxybeles_common.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ballista">
-  <Identity>
-    <Civ>mace</Civ>
-    <SpecificName>Oxybelḗs</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Unit radius="3.0"/>
-  </Obstruction>
-  <Vision>
-    <Range>77</Range>
-  </Vision>
-</Entity>

binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_oxybeles_packed.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace_mechanical_siege_oxybeles_common">
-  <Identity>
-    <Icon>units/hele_mechanical_siege_oxybeles_packed.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/mace_mechanical_siege_oxybeles_unpacked</Entity>
-    <Time>10000</Time>
-    <State>packed</State>
-  </Pack>
-  <VisualActor>
-    <Actor>units/hellenes/siege_spear_packed.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_oxybeles_packed.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/mace_mechanical_siege_oxybeles_common">
+  <Identity>
+    <Icon>units/hele_mechanical_siege_oxybeles_packed.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/mace_mechanical_siege_oxybeles_unpacked</Entity>
+    <Time>10000</Time>
+    <State>packed</State>
+  </Pack>
+  <VisualActor>
+    <Actor>units/hellenes/siege_spear_packed.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_oxybeles_unpacked.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace_mechanical_siege_oxybeles_common">
-  <Identity>
-    <Icon>units/hele_mechanical_siege_oxybeles.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/mace_mechanical_siege_oxybeles_packed</Entity>
-    <Time>10000</Time>
-    <State>unpacked</State>
-  </Pack>
-  <UnitMotion>
-    <WalkSpeed>0.001</WalkSpeed>
-    <Run>
-      <Speed>0.001</Speed>
-    </Run>
-  </UnitMotion>
-  <VisualActor>
-    <Actor>units/hellenes/siege_spear.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/mace_mechanical_siege_oxybeles_unpacked.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/mace_mechanical_siege_oxybeles_common">
+  <Identity>
+    <Icon>units/hele_mechanical_siege_oxybeles.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/mace_mechanical_siege_oxybeles_packed</Entity>
+    <Time>10000</Time>
+    <State>unpacked</State>
+  </Pack>
+  <UnitMotion>
+    <WalkSpeed>0.001</WalkSpeed>
+    <Run>
+      <Speed>0.001</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>units/hellenes/siege_spear.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/ptol_mechanical_siege_lithobolos_common.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_onager">
-  <Identity>
-    <Civ>ptol</Civ>
-    <SpecificName>Lithóbolos</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Unit radius="3.5"/>
-  </Obstruction>
-</Entity>

binaries/data/mods/public/simulation/templates/units/ptol_mechanical_siege_lithobolos_packed.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace_mechanical_siege_lithobolos_common">
-  <Identity>
-    <Icon>units/hele_mechanical_siege_lithobolos_packed.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/mace_mechanical_siege_lithobolos_unpacked</Entity>
-    <Time>10000</Time>
-    <State>packed</State>
-  </Pack>
-  <VisualActor>
-    <Actor>units/hellenes/siege_rock_packed.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/ptol_mechanical_siege_lithobolos_packed.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/mace_mechanical_siege_lithobolos_common">
+  <Identity>
+    <Icon>units/hele_mechanical_siege_lithobolos_packed.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/mace_mechanical_siege_lithobolos_unpacked</Entity>
+    <Time>10000</Time>
+    <State>packed</State>
+  </Pack>
+  <VisualActor>
+    <Actor>units/hellenes/siege_rock_packed.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/ptol_mechanical_siege_lithobolos_unpacked.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace_mechanical_siege_lithobolos_common">
-  <Identity>
-    <Icon>units/hele_mechanical_siege_lithobolos.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/mace_mechanical_siege_lithobolos_packed</Entity>
-    <Time>10000</Time>
-    <State>unpacked</State>
-  </Pack>
-  <UnitMotion>
-    <WalkSpeed>0.001</WalkSpeed>
-    <Run>
-      <Speed>0.001</Speed>
-    </Run>
-  </UnitMotion>
-  <VisualActor>
-    <Actor>units/hellenes/siege_rock.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/ptol_mechanical_siege_lithobolos_unpacked.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/mace_mechanical_siege_lithobolos_common">
+  <Identity>
+    <Icon>units/hele_mechanical_siege_lithobolos.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/mace_mechanical_siege_lithobolos_packed</Entity>
+    <Time>10000</Time>
+    <State>unpacked</State>
+  </Pack>
+  <UnitMotion>
+    <WalkSpeed>0.001</WalkSpeed>
+    <Run>
+      <Speed>0.001</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>units/hellenes/siege_rock.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/ptol_mechanical_siege_polybolos_common.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ballista">
-  <Identity>
-    <Civ>ptol</Civ>
-    <SpecificName>Polybolos</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Unit radius="3.0"/>
-  </Obstruction>
-</Entity>

binaries/data/mods/public/simulation/templates/units/ptol_mechanical_siege_polybolos_packed.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/ptol_mechanical_siege_polybolos_common">
-  <Identity>
-    <Icon>units/hele_mechanical_siege_oxybeles_packed.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/ptol_mechanical_siege_polybolos_unpacked</Entity>
-    <Time>10000</Time>
-    <State>packed</State>
-  </Pack>
-  <VisualActor>
-    <Actor>units/hellenes/siege_spear_packed.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/ptol_mechanical_siege_polybolos_packed.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/ptol_mechanical_siege_polybolos_common">
+  <Identity>
+    <Icon>units/hele_mechanical_siege_oxybeles_packed.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/ptol_mechanical_siege_polybolos_unpacked</Entity>
+    <Time>10000</Time>
+    <State>packed</State>
+  </Pack>
+  <VisualActor>
+    <Actor>units/hellenes/siege_spear_packed.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/ptol_mechanical_siege_polybolos_unpacked.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/ptol_mechanical_siege_polybolos_common">
-  <Identity>
-    <Icon>units/hele_mechanical_siege_oxybeles.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/ptol_mechanical_siege_polybolos_packed</Entity>
-    <Time>10000</Time>
-    <State>unpacked</State>
-  </Pack>
-  <UnitMotion>
-    <WalkSpeed>0.001</WalkSpeed>
-    <Run>
-      <Speed>0.001</Speed>
-    </Run>
-  </UnitMotion>
-  <VisualActor>
-    <Actor>units/hellenes/siege_spear.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/ptol_mechanical_siege_polybolos_unpacked.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/ptol_mechanical_siege_polybolos_common">
+  <Identity>
+    <Icon>units/hele_mechanical_siege_oxybeles.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/ptol_mechanical_siege_polybolos_packed</Entity>
+    <Time>10000</Time>
+    <State>unpacked</State>
+  </Pack>
+  <UnitMotion>
+    <WalkSpeed>0.001</WalkSpeed>
+    <Run>
+      <Speed>0.001</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>units/hellenes/siege_spear.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_ballista_common.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_onager">
-  <Attack>
-    <Ranged>
-      <MaxRange>76</MaxRange>
-      <MinRange>16.0</MinRange>
-      <ProjectileSpeed>22.0</ProjectileSpeed>
-      <RepeatTime>6000</RepeatTime>
-      <Splash>
-        <Shape>Circular</Shape>
-        <Range>10</Range>
-        <FriendlyFire>true</FriendlyFire>
-        <Hack>40.0</Hack>
-        <Pierce>0.0</Pierce>
-        <Crush>40.0</Crush>
-      </Splash>
-    </Ranged>
-  </Attack>
-  <Cost>
-    <BuildTime>40</BuildTime>
-    <Resources>
-      <wood>300</wood>
-      <stone>100</stone>
-    </Resources>
-  </Cost>
-  <Footprint replace="">
-    <Square width="10.0" depth="10.0"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <Identity>
-    <Civ>rome</Civ>
-    <SpecificName>Ballista</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Unit radius="3.5"/>
-  </Obstruction>
-  <Vision>
-    <Range>88</Range>
-  </Vision>
-</Entity>

binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_ballista_packed.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/rome_mechanical_siege_ballista_common">
-  <Identity>
-    <Icon>units/rome_mechanical_siege_ballista_packed.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/rome_mechanical_siege_ballista_unpacked</Entity>
-    <Time>10000</Time>
-    <State>packed</State>
-  </Pack>
-  <VisualActor>
-    <Actor>units/romans/siege_rock_packed.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_ballista_packed.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/rome_mechanical_siege_ballista_common">
+  <Identity>
+    <Icon>units/rome_mechanical_siege_ballista_packed.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/rome_mechanical_siege_ballista_unpacked</Entity>
+    <Time>10000</Time>
+    <State>packed</State>
+  </Pack>
+  <VisualActor>
+    <Actor>units/romans/siege_rock_packed.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_ballista_unpacked.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/rome_mechanical_siege_ballista_common">
-  <Identity>
-    <Icon>units/rome_mechanical_siege_ballista.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/rome_mechanical_siege_ballista_packed</Entity>
-    <Time>10000</Time>
-    <State>unpacked</State>
-  </Pack>
-  <Sound>
-    <SoundGroups>
-      <attack>attack/siege/ballist_rome_attack.xml</attack>
-    </SoundGroups>
-  </Sound>
-  <UnitMotion>
-    <WalkSpeed>0.001</WalkSpeed>
-    <Run>
-      <Speed>0.001</Speed>
-    </Run>
-  </UnitMotion>
-  <VisualActor>
-    <Actor>units/romans/siege_rock.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_ballista_unpacked.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/rome_mechanical_siege_ballista_common">
+  <Identity>
+    <Icon>units/rome_mechanical_siege_ballista.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/rome_mechanical_siege_ballista_packed</Entity>
+    <Time>10000</Time>
+    <State>unpacked</State>
+  </Pack>
+  <Sound>
+    <SoundGroups>
+      <attack>attack/siege/ballist_rome_attack.xml</attack>
+    </SoundGroups>
+  </Sound>
+  <UnitMotion>
+    <WalkSpeed>0.001</WalkSpeed>
+    <Run>
+      <Speed>0.001</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>units/romans/siege_rock.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_scorpio_common.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ballista">
-  <Attack>
-    <Ranged>
-      <Hack>0.0</Hack>
-      <Pierce>40.0</Pierce>
-      <Crush>20.0</Crush>
-      <MaxRange>56</MaxRange>
-      <MinRange>4.0</MinRange>
-      <ProjectileSpeed>64.0</ProjectileSpeed>
-      <RepeatTime>2500</RepeatTime>
-    </Ranged>
-  </Attack>
-  <Cost>
-    <BuildTime>15</BuildTime>
-    <Resources>
-      <wood>90</wood>
-    </Resources>
-  </Cost>
-  <Footprint replace="">
-    <Square width="5.0" depth="5.0"/>
-    <Height>3.0</Height>
-  </Footprint>
-  <Health>
-    <Max>150</Max>
-  </Health>
-  <Identity>
-    <Civ>rome</Civ>
-    <SpecificName>Scorpio</SpecificName>
-  </Identity>
-</Entity>

binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_scorpio_packed.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/rome_mechanical_siege_scorpio_common">
-  <Identity>
-    <Icon>units/rome_mechanical_siege_scorpio_packed.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/rome_mechanical_siege_scorpio_unpacked</Entity>
-    <Time>10000</Time>
-    <State>packed</State>
-  </Pack>
-  <VisualActor>
-    <Actor>units/romans/siege_scorpio_packed.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_scorpio_packed.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/rome_mechanical_siege_scorpio_common">
+  <Identity>
+    <Icon>units/rome_mechanical_siege_scorpio_packed.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/rome_mechanical_siege_scorpio_unpacked</Entity>
+    <Time>10000</Time>
+    <State>packed</State>
+  </Pack>
+  <VisualActor>
+    <Actor>units/romans/siege_scorpio_packed.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_scorpio_unpacked.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/rome_mechanical_siege_scorpio_common">
-  <Identity>
-    <Icon>units/rome_mechanical_siege_scorpio.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/rome_mechanical_siege_scorpio_packed</Entity>
-    <Time>10000</Time>
-    <State>unpacked</State>
-  </Pack>
-  <UnitMotion>
-    <WalkSpeed>0.001</WalkSpeed>
-    <Run>
-      <Speed>0.001</Speed>
-    </Run>
-  </UnitMotion>
-  <VisualActor>
-    <Actor>units/romans/siege_scorpio.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/rome_mechanical_siege_scorpio_unpacked.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/rome_mechanical_siege_scorpio_common">
+  <Identity>
+    <Icon>units/rome_mechanical_siege_scorpio.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/rome_mechanical_siege_scorpio_packed</Entity>
+    <Time>10000</Time>
+    <State>unpacked</State>
+  </Pack>
+  <UnitMotion>
+    <WalkSpeed>0.001</WalkSpeed>
+    <Run>
+      <Speed>0.001</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>units/romans/siege_scorpio.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/sele_mechanical_siege_lithobolos_common.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_onager">
-  <Identity>
-    <Civ>sele</Civ>
-    <SpecificName>Lithóbolos</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Unit radius="3.5"/>
-  </Obstruction>
-  <Vision>
-    <Range>88</Range>
-  </Vision>
-</Entity>

binaries/data/mods/public/simulation/templates/units/sele_mechanical_siege_lithobolos_packed.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/sele_mechanical_siege_lithobolos_common">
-  <Identity>
-    <Icon>units/hele_mechanical_siege_lithobolos_packed.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/sele_mechanical_siege_lithobolos_unpacked</Entity>
-    <Time>10000</Time>
-    <State>packed</State>
-  </Pack>
-  <VisualActor>
-    <Actor>units/hellenes/siege_rock_packed.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/sele_mechanical_siege_lithobolos_packed.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/sele_mechanical_siege_lithobolos_common">
+  <Identity>
+    <Icon>units/hele_mechanical_siege_lithobolos_packed.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/sele_mechanical_siege_lithobolos_unpacked</Entity>
+    <Time>10000</Time>
+    <State>packed</State>
+  </Pack>
+  <VisualActor>
+    <Actor>units/hellenes/siege_rock_packed.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/sele_mechanical_siege_lithobolos_unpacked.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/sele_mechanical_siege_lithobolos_common">
-  <Identity>
-    <Icon>units/hele_mechanical_siege_lithobolos.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/sele_mechanical_siege_lithobolos_packed</Entity>
-    <Time>10000</Time>
-    <State>unpacked</State>
-  </Pack>
-  <UnitMotion>
-    <WalkSpeed>0.001</WalkSpeed>
-    <Run>
-      <Speed>0.001</Speed>
-    </Run>
-  </UnitMotion>
-  <VisualActor>
-    <Actor>units/hellenes/siege_rock.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/sele_mechanical_siege_lithobolos_unpacked.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/sele_mechanical_siege_lithobolos_common">
+  <Identity>
+    <Icon>units/hele_mechanical_siege_lithobolos.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/sele_mechanical_siege_lithobolos_packed</Entity>
+    <Time>10000</Time>
+    <State>unpacked</State>
+  </Pack>
+  <UnitMotion>
+    <WalkSpeed>0.001</WalkSpeed>
+    <Run>
+      <Speed>0.001</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>units/hellenes/siege_rock.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/spart_mechanical_siege_oxybeles_common.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_mechanical_siege_ballista">
-  <Identity>
-    <Civ>spart</Civ>
-    <SpecificName>Oxybelḗs</SpecificName>
-  </Identity>
-  <Obstruction>
-    <Unit radius="3.0"/>
-  </Obstruction>
-</Entity>

binaries/data/mods/public/simulation/templates/units/spart_mechanical_siege_oxybeles_packed.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/spart_mechanical_siege_oxybeles_common">
-  <Identity>
-    <Icon>units/hele_mechanical_siege_oxybeles_packed.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/spart_mechanical_siege_oxybeles_unpacked</Entity>
-    <Time>10000</Time>
-    <State>packed</State>
-  </Pack>
-  <VisualActor>
-    <Actor>units/athenians/siege_spear_packed.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/spart_mechanical_siege_oxybeles_packed.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/spart_mechanical_siege_oxybeles_common">
+  <Identity>
+    <Icon>units/hele_mechanical_siege_oxybeles_packed.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/spart_mechanical_siege_oxybeles_unpacked</Entity>
+    <Time>10000</Time>
+    <State>packed</State>
+  </Pack>
+  <VisualActor>
+    <Actor>units/athenians/siege_spear_packed.xml</Actor>
+  </VisualActor>
+</Entity>

binaries/data/mods/public/simulation/templates/units/spart_mechanical_siege_oxybeles_unpacked.xml

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/spart_mechanical_siege_oxybeles_common">
-  <Identity>
-    <Icon>units/hele_mechanical_siege_oxybeles.png</Icon>
-  </Identity>
-  <Pack>
-    <Entity>units/spart_mechanical_siege_oxybeles_packed</Entity>
-    <Time>10000</Time>
-    <State>unpacked</State>
-  </Pack>
-  <UnitMotion>
-    <WalkSpeed>0.001</WalkSpeed>
-    <Run>
-      <Speed>0.001</Speed>
-    </Run>
-  </UnitMotion>
-  <VisualActor>
-    <Actor>units/athenians/siege_spear.xml</Actor>
-  </VisualActor>
-</Entity>

binaries/data/mods/public/simulation/templates/units/spart_mechanical_siege_oxybeles_unpacked.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="special_units/spart_mechanical_siege_oxybeles_common">
+  <Identity>
+    <Icon>units/hele_mechanical_siege_oxybeles.png</Icon>
+  </Identity>
+  <Pack>
+    <Entity>units/spart_mechanical_siege_oxybeles_packed</Entity>
+    <Time>10000</Time>
+    <State>unpacked</State>
+  </Pack>
+  <UnitMotion>
+    <WalkSpeed>0.001</WalkSpeed>
+    <Run>
+      <Speed>0.001</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>units/athenians/siege_spear.xml</Actor>
+  </VisualActor>
+</Entity>

source/ps/TemplateLoader.cpp

@@ -191 +191 @@
     return INFO::OK;
 }
 
+std::vector<std::string> CTemplateLoader::FindPlaceableTemplates(const std::string& path, bool includeSubdirectories, ETemplatesType templatesType, ScriptInterface& scriptInterface)
+{
+    
+    std::vector<std::string> templates;
+    Status ok;
+    VfsPath templatePath;
+
+
+    if (templatesType == SIMULATION_TEMPLATES || templatesType == ALL_TEMPLATES)
+    {
+        CScriptValRooted placeablesFilter = scriptInterface.ReadJSONFile("simulation/data/placeablesFilter.json");
+        
+        std::vector<CScriptValRooted> folders;
+        if (scriptInterface.GetProperty(placeablesFilter.get(), "templates", folders))
+        {
+            templatePath = VfsPath(TEMPLATE_ROOT) / path;
+            //I have every object inside, just run for each
+            for (std::vector<CScriptValRooted>::iterator iterator = folders.begin(); iterator != folders.end();++iterator)
+            {
+                jsval val = (*iterator).get();
+                std::string directoryPath;
+                std::wstring fileFilter;
+                scriptInterface.GetProperty(val, "directory", directoryPath);
+                scriptInterface.GetProperty(val, "file", fileFilter);
+                
+                VfsPaths filenames;
+                if (vfs::GetPathnames(g_VFS, templatePath / (directoryPath + "/"), fileFilter.c_str(), filenames) != INFO::OK)
+                    continue;
+                
+                for (VfsPaths::iterator it = filenames.begin(); it != filenames.end(); ++it)
+                {
+                    VfsPath filename = *it;
+                    // Strip the .xml extension
+                    VfsPath pathstem = filename.ChangeExtension(L"");
+                    // Strip the root from the path
+                    std::wstring name = pathstem.string().substr(ARRAY_SIZE(TEMPLATE_ROOT) - 1);
+
+                    templates.push_back(std::string(name.begin(), name.end()));
+                }
+                
+            }
+            
+        }
+    }
+
+    if (templatesType == ACTOR_TEMPLATES || templatesType == ALL_TEMPLATES)
+    {
+        templatePath = VfsPath(ACTOR_ROOT) / path;
+        if (includeSubdirectories)
+            ok = vfs::ForEachFile(g_VFS, templatePath, AddActorToTemplates, (uintptr_t)&templates, L"*.xml", vfs::DIR_RECURSIVE);
+        else
+            ok = vfs::ForEachFile(g_VFS, templatePath, AddActorToTemplates, (uintptr_t)&templates, L"*.xml");
+        WARN_IF_ERR(ok);
+    }
+
+    if (templatesType != SIMULATION_TEMPLATES && templatesType != ACTOR_TEMPLATES && templatesType != ALL_TEMPLATES)
+        LOGERROR(L"Undefined template type (valid: all, simulation, actor)");
+
+    return templates;
+}
+
 std::vector<std::string> CTemplateLoader::FindTemplates(const std::string& path, bool includeSubdirectories, ETemplatesType templatesType)
 {
     std::vector<std::string> templates;

source/ps/TemplateLoader.h

@@ -19 +19 @@
 #define INCLUDED_TEMPLATELOADER
 
 #include "simulation2/system/ParamNode.h"
+#include "scriptinterface/ScriptInterface.h"
 
 enum ETemplatesType
 {
@@ -55 +56 @@
      */
     std::vector<std::string> FindTemplates(const std::string& path, bool includeSubdirectories, ETemplatesType templatesType);
 
+    std::vector<std::string> FindPlaceableTemplates(const std::string& path, bool includeSubdirectories, ETemplatesType templatesType, ScriptInterface& scriptInterface);
+
 private:
     /**
      * (Re)loads the given template, regardless of whether it exists already,

source/simulation2/components/CCmpTemplateManager.cpp

@@ -130 +130 @@
 
     virtual std::vector<std::string> FindAllTemplates(bool includeActors);
 
+    virtual std::vector<std::string> FindAllPlaceableTemplates(bool includeActors);
+
     virtual std::vector<entity_id_t> GetEntitiesUsingTemplate(std::string templateName);
 
 private:
@@ -232 +234 @@
     return m_templateLoader.FindTemplates("", true, templatesType);
 }
 
+std::vector<std::string> CCmpTemplateManager::FindAllPlaceableTemplates(bool includeActors)
+{
+    ScriptInterface& scriptInterface = this->GetSimContext().GetScriptInterface();
+
+    ETemplatesType templatesType = includeActors ? ALL_TEMPLATES : SIMULATION_TEMPLATES;
+    return m_templateLoader.FindPlaceableTemplates("", true, templatesType, scriptInterface);
+}
+
 /**
  * Get the list of entities using the specified template
  */

source/simulation2/components/ICmpTemplateManager.h

@@ -99 +99 @@
      */
     virtual std::vector<std::string> FindAllTemplates(bool includeActors) = 0;
 
+    virtual std::vector<std::string> FindAllPlaceableTemplates(bool includeActors) = 0;
+
     /**
      * Permanently disable XML validation (intended solely for test cases).
      */

source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp

@@ -68 +68 @@
     CmpPtr<ICmpTemplateManager> cmpTemplateManager(*g_Game->GetSimulation2(), SYSTEM_ENTITY);
     if (cmpTemplateManager)
     {
-        std::vector<std::string> names = cmpTemplateManager->FindAllTemplates(true);
+        std::vector<std::string> names = cmpTemplateManager->FindAllPlaceableTemplates(true);
 
         for (std::vector<std::string>::iterator it = names.begin(); it != names.end(); ++it)
         {