Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml
@@ -4,38 +4,29 @@
     <Ranged>
       <AttackName>Stone</AttackName>
       <Damage>
-        <Pierce>35</Pierce>
-        <Crush>25</Crush>
+        <Crush>90</Crush>
       </Damage>
-      <MaxRange>78</MaxRange>
-      <MinRange>20</MinRange>
+      <MaxRange>80</MaxRange>
+      <MinRange>40</MinRange>
       <ElevationBonus>15</ElevationBonus>
       <PrepareTime>4500</PrepareTime>
       <RepeatTime>5000</RepeatTime>
       <Projectile>
         <Speed>40.0</Speed>
-        <Spread>2.5</Spread>
-        <Gravity>19.81</Gravity>
-        <LaunchPoint y="3.2"/>
+        <Spread>6.0</Spread>
+        <Gravity>9.81</Gravity>
+        <FriendlyFire>false</FriendlyFire>
+        <LaunchPoint y="3"/>
         <ActorName>props/units/weapons/tower_artillery_projectile.xml</ActorName>
         <ImpactActorName>props/units/weapons/tower_artillery_projectile_impact.xml</ImpactActorName>
         <ImpactAnimationLifetime>0.3</ImpactAnimationLifetime>
       </Projectile>
-      <Splash>
-        <Shape>Circular</Shape>
-        <Range>7</Range>
-        <FriendlyFire>false</FriendlyFire>
-        <Damage>
-          <Hack>0.0</Hack>
-          <Pierce>25.0</Pierce>
-          <Crush>5.0</Crush>
-        </Damage>
-      </Splash>
+      <PreferredClasses datatype="tokens">-Human !Organic</PreferredClasses>
     </Ranged>
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>1</DefaultArrowCount>
-    <GarrisonArrowMultiplier>0.2</GarrisonArrowMultiplier>
+    <GarrisonArrowMultiplier>0</GarrisonArrowMultiplier>
   </BuildingAI>
   <Cost>
     <BuildTime>200</BuildTime>
Index: binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
@@ -4,37 +4,27 @@
     <Ranged>
       <AttackName>Bolt</AttackName>
       <Damage>
-        <Pierce>55</Pierce>
-        <Crush>5</Crush>
+        <Pierce>100</Pierce>
       </Damage>
-      <MaxRange>84</MaxRange>
-      <MinRange>15</MinRange>
+      <MaxRange>90</MaxRange>
+      <MinRange>30</MinRange>
       <ElevationBonus>15</ElevationBonus>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>4000</RepeatTime>
       <Projectile>
-        <Speed>125.0</Speed>
-        <Spread>0.5</Spread>
-        <Gravity>49.81</Gravity>
-        <LaunchPoint y="3.2"/>
+        <Speed>150.0</Speed>
+        <Spread>1.0</Spread>
+        <Gravity>9.81</Gravity>
+        <FriendlyFire>false</FriendlyFire>
+        <LaunchPoint y="3"/>
         <ImpactActorName>props/units/weapons/tower_artillery_projectile_impact.xml</ImpactActorName>
         <ImpactAnimationLifetime>0.1</ImpactAnimationLifetime>
       </Projectile>
-      <Splash>
-        <Shape>Linear</Shape>
-        <Range>4</Range>
-        <FriendlyFire>false</FriendlyFire>
-        <Damage>
-          <Hack>0.0</Hack>
-          <Pierce>12.0</Pierce>
-          <Crush>0.0</Crush>
-        </Damage>
-      </Splash>
     </Ranged>
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>1</DefaultArrowCount>
-    <GarrisonArrowMultiplier>0.2</GarrisonArrowMultiplier>
+    <GarrisonArrowMultiplier>0</GarrisonArrowMultiplier>
   </BuildingAI>
   <Cost>
     <BuildTime>200</BuildTime>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
@@ -4,11 +4,9 @@
     <Melee>
       <AttackName>Fire</AttackName>
       <Damage>
-        <Hack>10.0</Hack>
-        <Pierce>10.0</Pierce>
-        <Crush>10.0</Crush>
+        <Fire>30</Fire>
       </Damage>
-      <MaxRange>8.0</MaxRange>
+      <MaxRange>12</MaxRange>
       <PrepareTime>50</PrepareTime>
       <RepeatTime>100</RepeatTime>
       <RestrictedClasses datatype="tokens">!Ship</RestrictedClasses>
@@ -25,9 +23,7 @@
     <Range>30</Range>
     <FriendlyFire>true</FriendlyFire>
     <Damage>
-      <Hack>300.0</Hack>
-      <Pierce>300.0</Pierce>
-      <Crush>300.0</Crush>
+      <Fire>900</Fire>
     </Damage>
   </DeathDamage>
   <GarrisonHolder disable=""/>
Index: binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
@@ -4,28 +4,18 @@
     <Ranged>
       <AttackName>Stone</AttackName>
       <Damage>
-        <Hack>0.0</Hack>
-        <Pierce>10.0</Pierce>
-        <Crush>100.0</Crush>
+        <Hack>0</Hack>
+        <Pierce>0</Pierce>
+        <Crush>150</Crush>
       </Damage>
-      <MaxRange>72.0</MaxRange>
-      <MinRange>10.0</MinRange>
+      <MaxRange>80</MaxRange>
+      <MinRange>40</MinRange>
       <PrepareTime>2000</PrepareTime>
       <RepeatTime>5000</RepeatTime>
       <Delay>0</Delay>
-      <Splash>
-        <Shape>Circular</Shape>
-        <Range>10</Range>
-        <FriendlyFire>false</FriendlyFire>
-        <Damage>
-          <Hack>0.0</Hack>
-          <Pierce>15.0</Pierce>
-          <Crush>35.0</Crush>
-        </Damage>
-      </Splash>
       <Projectile>
-        <Speed>37.5</Speed>
-        <Spread>4.0</Spread>
+        <Speed>40.0</Speed>
+        <Spread>6.0</Spread>
         <Gravity>9.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
Index: binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
@@ -4,33 +4,31 @@
     <Ranged>
       <AttackName>Bolt</AttackName>
       <Damage>
-        <Hack>0.0</Hack>
-        <Pierce>150.0</Pierce>
-        <Crush>25.0</Crush>
+        <Hack>0</Hack>
+        <Pierce>240</Pierce>
+        <Crush>0</Crush>
       </Damage>
-      <MaxRange>80.0</MaxRange>
-      <MinRange>26.0</MinRange>
+      <MaxRange>90</MaxRange>
+      <MinRange>15</MinRange>
       <PrepareTime>5000</PrepareTime>
       <RepeatTime>6000</RepeatTime>
       <Delay>0</Delay>
-      <Splash>
-        <Shape>Linear</Shape>
-        <Range>8.0</Range>
-        <FriendlyFire>false</FriendlyFire>
-        <Damage>
-          <Hack>0.0</Hack>
-          <Pierce>75.0</Pierce>
-          <Crush>5.0</Crush>
-        </Damage>
-      </Splash>
       <Projectile>
         <Speed>150.0</Speed>
-        <Spread>2.0</Spread>
+        <Spread>1.0</Spread>
         <Gravity>9.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
-      <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
+      <PreferredClasses datatype="tokens">Human</PreferredClasses>
+      <Splash>
+        <Shape>Linear</Shape>
+        <Range>9</Range>
+        <FriendlyFire>false</FriendlyFire>
+        <Damage>
+          <Pierce>80</Pierce>
+        </Damage>
+      </Splash>
     </Ranged>
   </Attack>
   <Capturable>
Index: binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
@@ -4,34 +4,24 @@
     <Ranged>
       <AttackName>Stone</AttackName>
       <Damage>
-        <Hack>0.0</Hack>
-        <Pierce>10.0</Pierce>
-        <Crush>100.0</Crush>
+        <Hack>0</Hack>
+        <Pierce>0</Pierce>
+        <Crush>210</Crush>
       </Damage>
-      <MaxRange>80.0</MaxRange>
-      <MinRange>26.0</MinRange>
+      <MaxRange>80</MaxRange>
+      <MinRange>40</MinRange>
       <PrepareTime>6000</PrepareTime>
       <RepeatTime>7000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>37.5</Speed>
-        <Spread>4.0</Spread>
+        <Speed>40.0</Speed>
+        <Spread>6.0</Spread>
         <Gravity>9.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
         <ImpactActorName>props/units/weapons/rock_explosion.xml</ImpactActorName>
         <ImpactAnimationLifetime>0.1</ImpactAnimationLifetime>
       </Projectile>
-      <Splash>
-        <Shape>Circular</Shape>
-        <Range>10</Range>
-        <FriendlyFire>false</FriendlyFire>
-        <Damage>
-          <Hack>0.0</Hack>
-          <Pierce>15.0</Pierce>
-          <Crush>35.0</Crush>
-        </Damage>
-      </Splash>
       <PreferredClasses datatype="tokens">Structure</PreferredClasses>
     </Ranged>
   </Attack>
Index: binaries/data/mods/public/simulation/templates/units/rome/siege_ballista_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome/siege_ballista_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/rome/siege_ballista_packed.xml
@@ -3,16 +3,8 @@
   <Attack>
     <Ranged>
       <Damage>
-        <Pierce op="mul">1.1</Pierce>
         <Crush op="mul">1.1</Crush>
       </Damage>
-      <MaxRange op="add">8</MaxRange>
-      <Splash>
-        <Damage>
-          <Pierce op="mul">1.1</Pierce>
-          <Crush op="mul">1.1</Crush>
-        </Damage>
-      </Splash>
     </Ranged>
   </Attack>
   <Footprint replace="">
Index: binaries/data/mods/public/simulation/templates/units/rome/siege_onager.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome/siege_onager.xml
+++ binaries/data/mods/public/simulation/templates/units/rome/siege_onager.xml
@@ -2,20 +2,13 @@
 <Entity parent="template_unit_siege_stonethrower">
   <Attack>
     <Ranged>
-      <MaxRange>76</MaxRange>
-      <MinRange>26.0</MinRange>
+      <Damage>
+        <Crush>150</Crush>
+      </Damage>
+      <MaxRange>75</MaxRange>
+      <MinRange>25</MinRange>
       <PrepareTime>3700</PrepareTime>
       <RepeatTime>5000</RepeatTime>
-      <Splash>
-        <Shape>Circular</Shape>
-        <Range>10</Range>
-        <FriendlyFire>false</FriendlyFire>
-        <Damage>
-          <Hack>40.0</Hack>
-          <Pierce>0.0</Pierce>
-          <Crush>40.0</Crush>
-        </Damage>
-      </Splash>
       <Projectile>
         <Speed>37.5</Speed>
         <Gravity>9.81</Gravity>
Index: binaries/data/mods/public/simulation/templates/units/rome/siege_scorpio_packed.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/rome/siege_scorpio_packed.xml
+++ binaries/data/mods/public/simulation/templates/units/rome/siege_scorpio_packed.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_siege_boltshooter">
-  <Attack>
-    <Ranged>
-      <Damage>
-        <Pierce op="mul">1.2</Pierce>
-        <Crush op="mul">0.5</Crush>
-      </Damage>
-      <MaxRange op="add">8</MaxRange>
-    </Ranged>
-  </Attack>
   <Footprint replace="">
     <Square width="5.0" depth="5.0"/>
     <Height>3.0</Height>
Index: binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml
+++ binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml
@@ -4,12 +4,10 @@
     <Ranged>
       <AttackName>Fire</AttackName>
       <Damage>
-        <Hack>50.0</Hack>
-        <Pierce>0.0</Pierce>
-        <Crush>50.0</Crush>
+        <Fire>100</Fire>
       </Damage>
-      <MaxRange>12</MaxRange>
-      <MinRange>8.0</MinRange>
+      <MaxRange>15</MaxRange>
+      <MinRange>10</MinRange>
       <PrepareTime>2000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Delay>0</Delay>
@@ -34,9 +32,7 @@
     <Range>20</Range>
     <FriendlyFire>true</FriendlyFire>
     <Damage>
-      <Hack>200.0</Hack>
-      <Pierce>200.0</Pierce>
-      <Crush>200.0</Crush>
+      <Fire>600</Fire>
     </Damage>
   </DeathDamage>
   <Footprint replace="">