From 418bb349077dfad39e2bc3ad110ae65f338c11fa Mon Sep 17 00:00:00 2001
From: ROBOT <allen@wildfiregames.com>
Date: Sat, 21 Jun 2008 10:03:36 +0000
Subject: [PATCH] I am going to start over on individual units. I removed the
 natural speed and I am working on a more in between of real and gameplay.

This was SVN commit r6088.
---
 .../entities/template_unit_cavalry.xml        |  4 +-
 .../template_unit_cavalry_melee_spearman.xml  | 10 +-
 .../template_unit_cavalry_melee_swordsman.xml | 11 ++-
 .../template_unit_cavalry_ranged_archer.xml   | 11 ++-
 ...emplate_unit_cavalry_ranged_javelinist.xml | 12 ++-
 .../entities/template_unit_hero_cavalry.xml   | 97 +++++++++++++++++++
 .../entities/template_unit_hero_infantry.xml  | 83 ++++++++++++++++
 .../entities/template_unit_hero_ranged.xml    | 10 +-
 .../template_unit_infantry_melee_spearman.xml | 16 +--
 ...template_unit_infantry_melee_swordsman.xml |  8 +-
 ...mplate_unit_infantry_ranged_javelinist.xml | 12 ++-
 .../template_unit_infantry_ranged_slinger.xml |  8 +-
 .../template_unit_mechanical_siege.xml        |  2 +-
 ...emplate_unit_mechanical_siege_ballista.xml | 39 ++++++--
 .../template_unit_mechanical_siege_onager.xml | 41 +++++---
 .../template_unit_mechanical_siege_ram.xml    | 59 ++++++-----
 .../entities/template_unit_super_cavalry.xml  | 12 ++-
 .../entities/template_unit_super_infantry.xml |  8 +-
 .../entities/template_unit_super_ranged.xml   | 10 +-
 .../entities/template_unit_support.xml        |  4 +-
 .../template_unit_support_female_citizen.xml  | 16 ++-
 .../entities/template_unit_support_healer.xml |  4 +-
 .../entities/template_unit_support_trader.xml |  5 +-
 23 files changed, 386 insertions(+), 96 deletions(-)
 create mode 100644 binaries/data/mods/official/entities/template_unit_hero_cavalry.xml
 create mode 100644 binaries/data/mods/official/entities/template_unit_hero_infantry.xml

diff --git a/binaries/data/mods/official/entities/template_unit_cavalry.xml b/binaries/data/mods/official/entities/template_unit_cavalry.xml
index abdbb0853d..b765636029 100644
--- a/binaries/data/mods/official/entities/template_unit_cavalry.xml
+++ b/binaries/data/mods/official/entities/template_unit_cavalry.xml
@@ -74,11 +74,11 @@
 		</Loot>		
 
 		<Move>
-			<Speed>11.5</Speed>
+			<Speed>4.65</Speed>
 			<TurningRadius>5.0</TurningRadius>
 			
 			<Run>
-				<Speed>22.0</Speed>
+				<Speed>27.9</Speed>
 				<Range>600.0</Range>
 				<RangeMin>5.0</RangeMin>
 			</Run>
diff --git a/binaries/data/mods/official/entities/template_unit_cavalry_melee_spearman.xml b/binaries/data/mods/official/entities/template_unit_cavalry_melee_spearman.xml
index aed0c89601..fb2d1d133d 100644
--- a/binaries/data/mods/official/entities/template_unit_cavalry_melee_spearman.xml
+++ b/binaries/data/mods/official/entities/template_unit_cavalry_melee_spearman.xml
@@ -39,17 +39,23 @@
  				<Hack>15.0</Hack>
  				<Pierce>5.0</Pierce>
  				<Crush>0.0</Crush>
+				<Range>3.6</Range>
 			<Charge>
 				<Hack>45.0</Hack>
 				<Pierce>15.0</Pierce>
+				<Range>3.6</Range>
 			</Charge>		
 			</Melee>
  		</Attack>
 
 		<Move>
-			<Speed>13.0</Speed>
+
+			<Speed>11.0</Speed>
+
 			<Run>
-				<Speed>25.0</Speed>
+
+				<Speed>29.7</Speed>
+
 			</Run>
 		</Move>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_cavalry_melee_swordsman.xml b/binaries/data/mods/official/entities/template_unit_cavalry_melee_swordsman.xml
index b6f2df081a..4866f0b96b 100644
--- a/binaries/data/mods/official/entities/template_unit_cavalry_melee_swordsman.xml
+++ b/binaries/data/mods/official/entities/template_unit_cavalry_melee_swordsman.xml
@@ -29,23 +29,28 @@
 		<Health>
 			<Max>160</Max>
 		</Health>
-
 	</Traits>
 
 	<Actions>
  		<Attack>
 			<Melee>
  				<Hack>17.0</Hack>
+				<Range>3.6</Range>
 			</Melee>
 			<Charge>
 				<Hack>51.0</Hack>
+				<Range>3.6</Range>
 			</Charge>		
  		</Attack>
 
 		<Move>
-			<Speed>13.0</Speed>
+
+			<Speed>11.0</Speed>
+
 			<Run>
-				<Speed>25.0</Speed>
+
+				<Speed>29.7</Speed>
+
 			</Run>
 		</Move>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_cavalry_ranged_archer.xml b/binaries/data/mods/official/entities/template_unit_cavalry_ranged_archer.xml
index 653aa3fbd1..3ab7805b0f 100644
--- a/binaries/data/mods/official/entities/template_unit_cavalry_ranged_archer.xml
+++ b/binaries/data/mods/official/entities/template_unit_cavalry_ranged_archer.xml
@@ -36,13 +36,18 @@
  				<Hack>0.0</Hack>
  				<Pierce>40.0</Pierce>
  				<Crush>0.0</Crush>
+				<Range>56.0</Range>
 			</Ranged>
  		</Attack>
 
-		<Move>
-			<Speed>14.0</Speed>
+
+	<Move>
+			<Speed>12.0</Speed>
+
 			<Run>
-				<Speed>25.0</Speed>
+
+				<Speed>32.4</Speed>
+
 			</Run>
 		</Move>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_cavalry_ranged_javelinist.xml b/binaries/data/mods/official/entities/template_unit_cavalry_ranged_javelinist.xml
index 5a4ea91bb5..4efdea8392 100644
--- a/binaries/data/mods/official/entities/template_unit_cavalry_ranged_javelinist.xml
+++ b/binaries/data/mods/official/entities/template_unit_cavalry_ranged_javelinist.xml
@@ -30,21 +30,27 @@
 		</Health>
 	</Traits>
 
-	<Actions>
+<Actions>
  		<Attack>
 			<Ranged>
  				<Hack>0.0</Hack>
  				<Pierce>30.0</Pierce>
  				<Crush>0.0</Crush>
+				<Range>40.0</Range>
 			</Ranged>
  		</Attack>
 
 		<Move>
-			<Speed>14.0</Speed>
+
+			<Speed>12.0</Speed>
+
 			<Run>
-				<Speed>25.0</Speed>
+
+				<Speed>32.4</Speed>
+
 			</Run>
 		</Move>
 	</Actions>
+
 	
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/template_unit_hero_cavalry.xml b/binaries/data/mods/official/entities/template_unit_hero_cavalry.xml
new file mode 100644
index 0000000000..7da66a151d
--- /dev/null
+++ b/binaries/data/mods/official/entities/template_unit_hero_cavalry.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity	Parent="template_unit_super_cavalry">
+	<Traits>
+	
+		<Id>
+			<Generic>Hero</Generic>
+
+			<Classes>Hero, Military, Organic</Classes>
+		
+		</Id>
+		
+		<Creation>
+			<Resource>
+ 				<Food>150</Food>
+				<Metal>300</Metal>
+ 			</Resource>
+		</Creation>
+		
+		<Population>
+			<Rem>2</Rem>
+		</Population>
+		
+		<Vision>
+			<Los>17</Los>
+		</Vision>
+			<Auras>
+			<Trample>
+				<Radius>3</Radius>
+				<Speed>1000</Speed>
+				<Duration>3</Duration>
+				
+				<Crush>13.0</Crush>
+				<Hack>13.0</Hack>
+				<Pierce>0.0</Pierce>
+				
+				<r>1.0</r>
+				<g>0.1</g>
+				<b>0.2</b>
+				<a>0.5</a>
+			</Trample>
+		<Armour>
+			<Hack>7.0</Hack>
+			<Pierce>12.0</Pierce>
+			<Crush>12.0</Crush>
+		</Armour>	
+
+		<Health>
+			<Max>300</Max>
+			<RegenRate>0.2</RegenRate>
+		</Health>		
+
+		<Loot>
+			<Xp>1000</Xp>
+			<Food>10</Food>
+			<wood>10</wood>
+			<Stone>10</Stone>
+			<Metal>100</Metal>
+		</Loot>		
+
+		<MiniMap>
+			<Type>Hero</Type>
+		</MiniMap>
+
+	</Traits>
+
+	<Actions>
+		<Attack>
+			<Melee>
+				<Hack>45.0</Hack>
+				<Pierce>0.0</Pierce>
+				<Crush>0.0</Crush>
+				<Range>3.6</Range>
+				<Speed>1500</Speed>
+			</Melee>
+			<Charge>
+				<Hack>135.0</Hack>
+				<Pierce>0.0</Pierce>
+				<Crush>0.0</Crush>
+				<Range>3.6</Range>
+				<Speed>1500</Speed>
+			</Charge>
+		</Attack>
+		<Move>
+			<Speed>11.0</Speed>
+			<Run>
+				<Speed>29.7</Speed>
+			</Run>
+		</Move>		
+	</Actions>
+
+	<SoundGroups>
+		<Melee>audio/attack/weapon/sword.xml</Melee>
+		<Death>audio/actor/human/death/death.xml</Death>
+	</SoundGroups>	
+	
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/template_unit_hero_infantry.xml b/binaries/data/mods/official/entities/template_unit_hero_infantry.xml
new file mode 100644
index 0000000000..38fd279053
--- /dev/null
+++ b/binaries/data/mods/official/entities/template_unit_hero_infantry.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity	Parent="template_unit_super_infantry">
+	<Traits>
+	
+		<Id>
+			<Generic>Hero</Generic>
+
+			<Classes>Hero, Military, Organic</Classes>
+		
+		</Id>
+		
+		<Creation>
+			<Resource>
+ 				<Food>100</Food>
+				<Metal>250</Metal>
+ 			</Resource>
+		</Creation>
+		
+		<Population>
+			<Rem>1</Rem>
+		</Population>
+		
+		<Vision>
+			<Los>15</Los>
+		</Vision>
+		
+		<Armour>
+			<Hack>7.0</Hack>
+			<Pierce>12.0</Pierce>
+			<Crush>12.0</Crush>
+		</Armour>	
+
+		<Health>
+			<Max>250</Max>
+			<RegenRate>0.2</RegenRate>
+		</Health>		
+
+		<Loot>
+			<Xp>1000</Xp>
+			<Food>10</Food>
+			<wood>10</wood>
+			<Stone>10</Stone>
+			<Metal>100</Metal>
+		</Loot>		
+
+		<MiniMap>
+			<Type>Hero</Type>
+		</MiniMap>
+
+	</Traits>
+
+	<Actions>
+		<Attack>
+			<Melee>
+				<Hack>40.0</Hack>
+				<Pierce>0.0</Pierce>
+				<Crush>0.0</Crush>
+				<Range>5.0</Range>
+				<Speed>1500</Speed>
+			</Melee>
+			<Charge>
+				<Hack>120.0</Hack>
+				<Pierce>0.0</Pierce>
+				<Crush>0.0</Crush>
+				<Range>5.0</Range>
+				<Speed>1500</Speed>
+			</Charge>
+		</Attack>
+		<Move>
+			<Speed>6.5</Speed>
+			<Run>
+				<Speed>17.55</Speed>
+			</Run>
+		</Move>		
+	</Actions>
+
+	<SoundGroups>
+		<Melee>audio/attack/weapon/sword.xml</Melee>
+		<Death>audio/actor/human/death/death.xml</Death>
+	</SoundGroups>	
+	
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/template_unit_hero_ranged.xml b/binaries/data/mods/official/entities/template_unit_hero_ranged.xml
index e5beafa375..c8cc270b68 100644
--- a/binaries/data/mods/official/entities/template_unit_hero_ranged.xml
+++ b/binaries/data/mods/official/entities/template_unit_hero_ranged.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity	Parent="template_unit">
+<Entity	Parent="template_unit_super_ranged">
 	<Traits>
 	
 		<Id>
@@ -62,9 +62,13 @@
 			</Ranged>			
 		</Attack>
 		<Move>
-			<Speed>10.0</Speed>
+
+			<Speed>8.0</Speed>
+
 			<Run>
-				<Speed>20.0</Speed>
+
+				<Speed>21.6</Speed>
+
 			</Run>
 		</Move>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_infantry_melee_spearman.xml b/binaries/data/mods/official/entities/template_unit_infantry_melee_spearman.xml
index bf8d75337e..3557303fcf 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry_melee_spearman.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry_melee_spearman.xml
@@ -44,19 +44,23 @@
 	<Actions>
  		<Attack>
 			<Melee>
- 				<Hack>10.0</Hack>
- 				<Pierce>15.0</Pierce>
+ 				<Hack>15.0</Hack>
+ 				<Pierce>5.0</Pierce>
 			</Melee>
 			<Charge>
-				<Hack>20.0</Hack>
-				<Pierce>30.0</Pierce>
+				<Hack>30.0</Hack>
+				<Pierce>10.0</Pierce>
 			</Charge>		
  		</Attack>
 
 		<Move>
-			<Speed>8.0</Speed>
+
+			<Speed>6.0</Speed>
+
 			<Run>
-				<Speed>16.0</Speed>
+
+				<Speed>16.2</Speed>
+
 			</Run>
 		</Move>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_infantry_melee_swordsman.xml b/binaries/data/mods/official/entities/template_unit_infantry_melee_swordsman.xml
index 2c4e1153ab..6363cd011d 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry_melee_swordsman.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry_melee_swordsman.xml
@@ -52,9 +52,13 @@
  		</Attack>
 
 		<Move>
-			<Speed>8.5</Speed>
+
+			<Speed>6.5</Speed>
+
 			<Run>
-				<Speed>16.5</Speed>
+
+				<Speed>17.55</Speed>
+
 			</Run>
 		</Move>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_infantry_ranged_javelinist.xml b/binaries/data/mods/official/entities/template_unit_infantry_ranged_javelinist.xml
index c375b17e51..8d266aefe0 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry_ranged_javelinist.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry_ranged_javelinist.xml
@@ -40,20 +40,24 @@
  		<Attack>
 			<Ranged>
  				<Hack>0.0</Hack>
- 				<Pierce>50.0</Pierce>
+ 				<Pierce>45.0</Pierce>
  				<Crush>0.0</Crush>
 
 				<MinRange>16.0</MinRange>
-				<Range>32</Range>
+				<Range>30</Range>
 				<Speed>1500</Speed>
 				<ProjectileSpeed>30.0</ProjectileSpeed>
 			</Ranged>
  		</Attack>
 
 		<Move>
-			<Speed>9.0</Speed>
+
+			<Speed>8.0</Speed>
+
 			<Run>
-				<Speed>20.0</Speed>
+
+				<Speed>21.6</Speed>
+
 			</Run>
 		</Move>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_infantry_ranged_slinger.xml b/binaries/data/mods/official/entities/template_unit_infantry_ranged_slinger.xml
index b14fb0c517..63afdeaa9c 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry_ranged_slinger.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry_ranged_slinger.xml
@@ -54,9 +54,13 @@
  		</Attack>
 
 		<Move>
-			<Speed>10.0</Speed>
+
+			<Speed>8.5</Speed>
+
 			<Run>
-				<Speed>20.0</Speed>
+
+				<Speed>22.95</Speed>
+
 			</Run>
 		</Move>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_mechanical_siege.xml b/binaries/data/mods/official/entities/template_unit_mechanical_siege.xml
index af2b6535f0..243f723f44 100644
--- a/binaries/data/mods/official/entities/template_unit_mechanical_siege.xml
+++ b/binaries/data/mods/official/entities/template_unit_mechanical_siege.xml
@@ -14,7 +14,7 @@
 		</Id>
 
 		<Population>
-			<Rem>4</Rem>
+			<Rem>3</Rem>
 		</Population>
 		
  		<Anchor>
diff --git a/binaries/data/mods/official/entities/template_unit_mechanical_siege_ballista.xml b/binaries/data/mods/official/entities/template_unit_mechanical_siege_ballista.xml
index a474a2b1bd..93be1823a7 100644
--- a/binaries/data/mods/official/entities/template_unit_mechanical_siege_ballista.xml
+++ b/binaries/data/mods/official/entities/template_unit_mechanical_siege_ballista.xml
@@ -7,36 +7,55 @@
 	
 		<Id>
 
-
+			<Generic>Siege Ballista</Generic>
+			
 			<Icon_Cell>37</Icon_Cell>
 
 			<Classes>Ranged</Classes>
 		
 		</Id>
 
-			<Creation>
+				<Creation>
 				<Resource>
- 				<Wood>100</Wood>
-				<Metal>100</Metal>
+ 				<Wood>190</Wood>
+				<Stone>100</Stone>
  			</Resource>
 		</Creation>
 		<Armour>
-			<Hack>60.0</Hack>
-			<Pierce>140.0</Pierce>
-			<Crush>40.0</Crush>
+			<Hack>4.0</Hack>
+			<Pierce>4.0</Pierce>
+			<Crush>2.0</Crush>
 		</Armour>
+		<Health>
+			<Max>180</Max>
+		</Health>
+		
+		<Vision>
+			<Los>15</Los>
+		</Vision>
+		
+		
 	</Traits>
-	
+
 
 
 	<Actions>
  		<Attack>
 			<Ranged>
  				<Hack>0.0</Hack>
- 				<Pierce>180.0</Pierce>
- 				<Crush>60.0</Crush>
+ 				<Pierce>35.0</Pierce>
+ 				<Crush>30.0</Crush>
+				<Range>54</Range>
+				<Speed>1500</Speed>
+				<ProjectileSpeed>30.0</ProjectileSpeed>
 			</Ranged>
  		</Attack>
+		<Move>
+			<Speed>5.75</Speed>
+			<Run>
+				<Speed>5.9</Speed>
+			</Run>
+		</Move>
 	</Actions>
 
 
diff --git a/binaries/data/mods/official/entities/template_unit_mechanical_siege_onager.xml b/binaries/data/mods/official/entities/template_unit_mechanical_siege_onager.xml
index 7d1b5acb6c..b61b5cc4c6 100644
--- a/binaries/data/mods/official/entities/template_unit_mechanical_siege_onager.xml
+++ b/binaries/data/mods/official/entities/template_unit_mechanical_siege_onager.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_unit_mechanical_siege"
->
+<Entity	Parent="template_unit_mechanical_siege">
 	<Traits>
 	
 		<Id>
 		
+			<Generic>Siege Onager</Generic>
+		
 			<Icon_Cell>35</Icon_Cell>
 
 			<Classes>Ranged</Classes>
@@ -14,16 +14,24 @@
 		</Id>
 			<Creation>
 				<Resource>
- 				<Wood>200</Wood>
-				<Metal>150</Metal>
-				<Stone>75</Stone>
+ 				<Wood>330</Wood>
+				<Stone>80</Stone>
  			</Resource>
 		</Creation>
 		<Armour>
-			<Hack>20.0</Hack>
-			<Pierce>80.0</Pierce>
-			<Crush>150.0</Crush>
+			<Hack>4.0</Hack>
+			<Pierce>6.0</Pierce>
+			<Crush>4.0</Crush>
 		</Armour>
+		<Health>
+			<Max>250</Max>
+		</Health>
+		
+		<Vision>
+			<Los>20</Los>
+		</Vision>
+		
+		
 	</Traits>
 
 
@@ -31,11 +39,20 @@
 	<Actions>
  		<Attack>
 			<Ranged>
- 				<Hack>80.0</Hack>
- 				<Pierce>200.0</Pierce>
- 				<Crush>85.0</Crush>
+ 				<Hack>35.0</Hack>
+ 				<Pierce>0.0</Pierce>
+ 				<Crush>40.0</Crush>
+				<Range>72</Range>
+				<Speed>1500</Speed>
+				<ProjectileSpeed>20.0</ProjectileSpeed>
 			</Ranged>
  		</Attack>
+		<Move>
+			<Speed>4.75</Speed>
+			<Run>
+				<Speed>4.9</Speed>
+			</Run>
+		</Move>
 	</Actions>
 
 
diff --git a/binaries/data/mods/official/entities/template_unit_mechanical_siege_ram.xml b/binaries/data/mods/official/entities/template_unit_mechanical_siege_ram.xml
index b3f6032a23..0c99141faf 100644
--- a/binaries/data/mods/official/entities/template_unit_mechanical_siege_ram.xml
+++ b/binaries/data/mods/official/entities/template_unit_mechanical_siege_ram.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_unit_mechanical_siege"
->
+<Entity	Parent="template_unit_mechanical_siege">
 	<Traits>
 	
 		<Id>
 		
+			<Generic>Siege Ram</Generic>
+		
 			<Icon_Cell>36</Icon_Cell>
 
 			<Classes>Melee</Classes>
@@ -14,15 +14,24 @@
 		</Id>
 			<Creation>
 				<Resource>
- 				<Wood>300</Wood>
-				<Metal>175</Metal>
+ 				<Wood>260</Wood>
+				<Metal>60</Metal>
  			</Resource>
 		</Creation>
 		<Armour>
-			<Hack>30.0</Hack>
-			<Pierce>70.0</Pierce>
-			<Crush>70.0</Crush>
+			<Hack>5.0</Hack>
+			<Pierce>20.0</Pierce>
+			<Crush>6.0</Crush>
 		</Armour>
+		
+		<Health>
+			<Max>200</Max>
+		</Health>
+		
+		<Vision>
+			<Los>12</Los>
+		</Vision>
+		
 	</Traits>
 	
 
@@ -30,27 +39,31 @@
 
 	<Actions>
  		<Attack>
-			<Ranged>
- 				<Hack>80.0</Hack>
- 				<Pierce>120.0</Pierce>
- 				<Crush>250.0</Crush>
-			</Ranged>
- 		</Attack>
-	</Actions>
-
-
-
-	<Actions>
-		<Attack>
+			<Melee>
+ 				<Hack>0.0</Hack>
+ 				<Pierce>0.0</Pierce>
+ 				<Crush>65.0</Crush>
+				<Range>5.0</Range>
+				<Speed>1500</Speed>
+			</Melee>
 			<Charge>
 				<Hack>0.0</Hack>
 				<Pierce>0.0</Pierce>
-				<Crush>100.0</Crush>
+				<Crush>130.0</Crush>
 				
-				<Range>2.0</Range>
+				<Range>5.0</Range>
 				<Speed>1500</Speed>
 			</Charge>	
-		</Attack>
+ 		</Attack>
+		
+		
+		<Move>
+			<Speed>3.0</Speed>
+			<Run>
+				<Speed>8.1</Speed>
+			</Run>
+		</Move>
+		
 	</Actions>	
 
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/template_unit_super_cavalry.xml b/binaries/data/mods/official/entities/template_unit_super_cavalry.xml
index d41a201cca..954123ea03 100644
--- a/binaries/data/mods/official/entities/template_unit_super_cavalry.xml
+++ b/binaries/data/mods/official/entities/template_unit_super_cavalry.xml
@@ -62,19 +62,23 @@
 				<Hack>35.0</Hack>
 				<Pierce>0.0</Pierce>
 				<Crush>0.0</Crush>
-				<Range>5.0</Range>
+				<Range>4.8</Range>
 				<Speed>1500</Speed>
 			</Melee>
 			<Charge>
 				<Hack>105.0</Hack>
-				<Range>5.0</Range>
+				<Range>4.8</Range>
 				<Speed>1500</Speed>
 			</Charge>		
  		</Attack>
 		<Move>
-			<Speed>13.0</Speed>
+
+			<Speed>11.0</Speed>
+
 			<Run>
-				<Speed>25.0</Speed>
+
+				<Speed>29.7</Speed>
+
 			</Run>
 		</Move>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_super_infantry.xml b/binaries/data/mods/official/entities/template_unit_super_infantry.xml
index d4cbe1cd22..557a702b29 100644
--- a/binaries/data/mods/official/entities/template_unit_super_infantry.xml
+++ b/binaries/data/mods/official/entities/template_unit_super_infantry.xml
@@ -56,9 +56,13 @@
 			</Charge>		
  		</Attack>
 		<Move>
-			<Speed>8.5</Speed>
+
+			<Speed>6.5</Speed>
+
 			<Run>
-				<Speed>16.5</Speed>
+
+				<Speed>17.55</Speed>
+
 			</Run>
 		</Move>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_super_ranged.xml b/binaries/data/mods/official/entities/template_unit_super_ranged.xml
index e2ede1b8a5..249a8b189a 100644
--- a/binaries/data/mods/official/entities/template_unit_super_ranged.xml
+++ b/binaries/data/mods/official/entities/template_unit_super_ranged.xml
@@ -20,7 +20,7 @@
 			<Crush>10.0</Crush>
 		</Armour>
 		<Health>
-			<Max>170</Max>
+			<Max>100</Max>
 		</Health>
 		
 		<Vision>
@@ -46,9 +46,13 @@
 			</Ranged>
 		</Attack>
 		<Move>
-			<Speed>10.0</Speed>
+
+			<Speed>8.0</Speed>
+
 			<Run>
-				<Speed>20.0</Speed>
+
+				<Speed>21.6</Speed>
+
 			</Run>
 		</Move>
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_support.xml b/binaries/data/mods/official/entities/template_unit_support.xml
index 319d4eea62..3835559667 100644
--- a/binaries/data/mods/official/entities/template_unit_support.xml
+++ b/binaries/data/mods/official/entities/template_unit_support.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_unit"
->
+<Entity	Parent="template_unit">
 	<Traits>
 	
 		<Id>
diff --git a/binaries/data/mods/official/entities/template_unit_support_female_citizen.xml b/binaries/data/mods/official/entities/template_unit_support_female_citizen.xml
index bb079eebb2..2ff7e32064 100644
--- a/binaries/data/mods/official/entities/template_unit_support_female_citizen.xml
+++ b/binaries/data/mods/official/entities/template_unit_support_female_citizen.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_unit_support"
->
+<Entity	Parent="template_unit_support">
 	<Traits>
 	
 		<Id>
@@ -49,6 +47,10 @@
 			<RegenRate>0.4</RegenRate>
 		</Health>	
 	
+	<Vision>
+			<Los>11</Los>
+		</Vision>
+	
 	</Traits>
 
 	<Actions>
@@ -94,11 +96,15 @@
 		</Build>
 
 		<Move>
-			<Speed>6.0</Speed>
+
+			<Speed>3.5</Speed>
+
 			<TurningRadius>0.8</TurningRadius>
 			
 			<Run>
-				<Speed>12.0</Speed>
+
+				<Speed>9.45</Speed>
+
 				<Range>50.0</Range>
 				<RangeMin>0.0</RangeMin>
 			</Run>			
diff --git a/binaries/data/mods/official/entities/template_unit_support_healer.xml b/binaries/data/mods/official/entities/template_unit_support_healer.xml
index 19a7916aba..5fb126a105 100644
--- a/binaries/data/mods/official/entities/template_unit_support_healer.xml
+++ b/binaries/data/mods/official/entities/template_unit_support_healer.xml
@@ -50,7 +50,9 @@
 	
 	<Actions>
 		<Move>
-			<Speed>7.5</Speed>
+
+			<Speed>5.5</Speed>
+
 			<TurningRadius>0.8</TurningRadius>
 		</Move>
 	</Actions>	
diff --git a/binaries/data/mods/official/entities/template_unit_support_trader.xml b/binaries/data/mods/official/entities/template_unit_support_trader.xml
index 83641ba02d..25c200e22d 100644
--- a/binaries/data/mods/official/entities/template_unit_support_trader.xml
+++ b/binaries/data/mods/official/entities/template_unit_support_trader.xml
@@ -38,14 +38,15 @@
 
 		<Health>
 			<Max>100</Max>
-			<RegenRate>0.2</RegenRate>
 		</Health>		
 
 	</Traits>
 	
 	<Actions>
 		<Move>
-			<Speed>12.0</Speed>
+
+			<Speed>10.0</Speed>
+
 		</Move>
 	</Actions>