From 30b83db67b1d310f1428f143fedaaff4be77acdf Mon Sep 17 00:00:00 2001
From: Acumen <stuart@wildfiregames.com>
Date: Wed, 18 Jan 2006 03:31:21 +0000
Subject: [PATCH] Moved Run up to affect other units. Also added an Iberian
 house, which for some reason went AWOL during the entity revision.

This was SVN commit r3368.
---
 .../entities/structures/iber_house.xml        | 22 +++++++++++++++++++
 .../entities/template_entity_script.js        |  2 +-
 .../mods/official/entities/template_unit.xml  | 13 +++++++----
 .../entities/template_unit_cavalry.xml        | 12 ++++++++++
 .../entities/template_unit_infantry.xml       |  2 +-
 .../template_unit_infantry_melee_spearman.xml |  2 +-
 .../units/celt_infantry_spearman_b.xml        |  9 --------
 7 files changed, 46 insertions(+), 16 deletions(-)
 create mode 100644 binaries/data/mods/official/entities/structures/iber_house.xml

diff --git a/binaries/data/mods/official/entities/structures/iber_house.xml b/binaries/data/mods/official/entities/structures/iber_house.xml
new file mode 100644
index 0000000000..bf667cdb49
--- /dev/null
+++ b/binaries/data/mods/official/entities/structures/iber_house.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+
+<Entity
+	Parent="template_structure_civic_house"
+>
+	<Traits>
+	
+		<Id>
+
+			<Specific>Casa</Specific>
+
+			<Civ>Iberians</Civ>
+
+			<History>Iberian structures of the time were typically built either entirely of stone or with stone stub walls with 'adobe' up to the roof lines above them. Roofs were then, depending on the economic status of individuals, covered with a composite of mud and binding vegetable and waterproofing asphaltic materials, or slate stone, or in many cases in the region, with so-called Spanish roofing tiles.</History>
+		
+		</Id>
+
+	</Traits>
+
+	<Actor>structures/iberians/house.xml</Actor>
+
+</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/template_entity_script.js b/binaries/data/mods/official/entities/template_entity_script.js
index 60ea3d59b9..0cf66ddf49 100644
--- a/binaries/data/mods/official/entities/template_entity_script.js
+++ b/binaries/data/mods/official/entities/template_entity_script.js
@@ -48,7 +48,7 @@ function entityInit()
 	if (this.traits.health && this.traits.health.max)
 		this.traits.health.curr = this.traits.health.max
 
-	// If entity has health, set current to same.
+	// If entity has stamina, set current to same.
 	if (this.traits.stamina && this.traits.stamina.max)
 		this.traits.stamina.curr = this.traits.stamina.max
 
diff --git a/binaries/data/mods/official/entities/template_unit.xml b/binaries/data/mods/official/entities/template_unit.xml
index a70cad4f02..e99514f7a6 100644
--- a/binaries/data/mods/official/entities/template_unit.xml
+++ b/binaries/data/mods/official/entities/template_unit.xml
@@ -50,18 +50,23 @@
 	</Traits>
 
 	<Actions>
+	
 		<Move>
 			<Speed>5.0</Speed>
 			<TurningRadius>0.0</TurningRadius>
+			
 			<Run>
-				<Speed>0.0</Speed>
+				<Speed>15.0</Speed>
+				<Range>50.0</Range>
+				<RangeMin>10.0</RangeMin>
+
 				<Regen_Rate>10.0</Regen_Rate>
 				<Decay_Rate>5.0</Decay_Rate>
-			</Run>
+			</Run>			
 		</Move>
-
+		
 		<Patrol />
+		
 	</Actions>
-
 	
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/template_unit_cavalry.xml b/binaries/data/mods/official/entities/template_unit_cavalry.xml
index 95f0d32d4d..39b1a8f42f 100644
--- a/binaries/data/mods/official/entities/template_unit_cavalry.xml
+++ b/binaries/data/mods/official/entities/template_unit_cavalry.xml
@@ -61,10 +61,22 @@
  			<Range>2.0</Range>
 			<Speed>3000</Speed>
  		</Gather>
+		
+		<Loot>
+			<Resources />
+			<XP />
+		</Loot>		
 
 		<Move>
 			<Speed>10.0</Speed>
 			<TurningRadius>1.0</TurningRadius>
+			
+			<Run>
+				<Speed>30.0</Speed>
+				<Range>100.0</Range>
+				<RangeMin>10.0</RangeMin>
+			</Run>
+			
 		</Move>
 		
 	</Actions>
diff --git a/binaries/data/mods/official/entities/template_unit_infantry.xml b/binaries/data/mods/official/entities/template_unit_infantry.xml
index 32339babaa..9cbff2f576 100644
--- a/binaries/data/mods/official/entities/template_unit_infantry.xml
+++ b/binaries/data/mods/official/entities/template_unit_infantry.xml
@@ -84,7 +84,7 @@
  			<Range>2.0</Range>
 			<Speed>3000</Speed>
  		</Gather>
-
+		
 		<Loot>
 			<Resources />
 			<XP />
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 aa7a78a2d9..0dc043da1f 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
@@ -18,5 +18,5 @@
 		</Id>
 		
 	</Traits>
-
+	
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/celt_infantry_spearman_b.xml b/binaries/data/mods/official/entities/units/celt_infantry_spearman_b.xml
index d694c89010..2f073619a4 100644
--- a/binaries/data/mods/official/entities/units/celt_infantry_spearman_b.xml
+++ b/binaries/data/mods/official/entities/units/celt_infantry_spearman_b.xml
@@ -16,15 +16,6 @@
 		</Id>
 		
 	</Traits>
-	<Actions>
-		<Move>
-			<Run>
-				<Speed>15.0</Speed>
-				<Range>50.0</Range>
-				<RangeMin>10.0</RangeMin>
-			</Run>
-		</Move>
-	</Actions>
 
 	<Actor>units/celts/infantry_spearman_b.xml</Actor>