From 644a9388eec7be92169bc4c06d464dd22476506f Mon Sep 17 00:00:00 2001
From: Acumen <stuart@wildfiregames.com>
Date: Sun, 27 Mar 2005 10:29:48 +0000
Subject: [PATCH] Fix to make first "official" randomised entity ... Iberian
 house now points to an actor that contains its three variants. Replaced the
 houses in the ph2 map.

This was SVN commit r2064.
---
 .../entities/structures/{iber_ho_1.xml => iber_ho.xml}   | 4 ++--
 .../data/mods/official/entities/structures/iber_ho_2.xml | 9 ---------
 .../data/mods/official/entities/structures/iber_ho_3.xml | 9 ---------
 binaries/data/mods/official/maps/scenarios/ph2.pmp       | 4 ++--
 binaries/data/mods/official/maps/scenarios/ph2.xml       | 4 ++--
 5 files changed, 6 insertions(+), 24 deletions(-)
 rename binaries/data/mods/official/entities/structures/{iber_ho_1.xml => iber_ho.xml} (90%)
 delete mode 100644 binaries/data/mods/official/entities/structures/iber_ho_2.xml
 delete mode 100644 binaries/data/mods/official/entities/structures/iber_ho_3.xml

diff --git a/binaries/data/mods/official/entities/structures/iber_ho_1.xml b/binaries/data/mods/official/entities/structures/iber_ho.xml
similarity index 90%
rename from binaries/data/mods/official/entities/structures/iber_ho_1.xml
rename to binaries/data/mods/official/entities/structures/iber_ho.xml
index e6fef5f8dc..112f206b68 100644
--- a/binaries/data/mods/official/entities/structures/iber_ho_1.xml
+++ b/binaries/data/mods/official/entities/structures/iber_ho.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity Tag="iber_ho_1" Parent="ho">
+<Entity Tag="iber_ho" Parent="ho">
 	<Traits>
 		<Id
 			civ_code="iber"
@@ -11,5 +11,5 @@
 			history="Iberians structures of the time were typically built either entirely of stone or with stone stub walls with 'adobe' raising them on 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. Some house roofs were constructed at an angle to allow any rainfall to run right over the occupant's front door. The adobe walls would have been plastered and 'whitewashed' for all but the most humble or neglected of abode."
 		/>
 	</Traits>
-	<Actor>structures/iber_ho_a.xml</Actor>
+	<Actor>structures/iber_ho.xml</Actor>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/structures/iber_ho_2.xml b/binaries/data/mods/official/entities/structures/iber_ho_2.xml
deleted file mode 100644
index 47291a119b..0000000000
--- a/binaries/data/mods/official/entities/structures/iber_ho_2.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-
-<Entity Tag="iber_ho_2" Parent="iber_ho_1">
-	<Traits>
-		<Id
-		/>
-	</Traits>
-	<Actor>structures/iber_ho_b.xml</Actor>
-</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/structures/iber_ho_3.xml b/binaries/data/mods/official/entities/structures/iber_ho_3.xml
deleted file mode 100644
index 3e561d647a..0000000000
--- a/binaries/data/mods/official/entities/structures/iber_ho_3.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
-
-<Entity Tag="iber_ho_3" Parent="iber_ho_1">
-	<Traits>
-		<Id
-		/>
-	</Traits>
-	<Actor>structures/iber_ho_c.xml</Actor>
-</Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/maps/scenarios/ph2.pmp b/binaries/data/mods/official/maps/scenarios/ph2.pmp
index 057096253c..3383abe369 100644
--- a/binaries/data/mods/official/maps/scenarios/ph2.pmp
+++ b/binaries/data/mods/official/maps/scenarios/ph2.pmp
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:938a385d0bc4bbc924339596860ec675dad761da5895b84a45b51299b547353b
-size 445415
+oid sha256:b27aeb13ab1e90bf3a32cf68fe88d7fd531997074398cc78af81b1a032daf15b
+size 445280
diff --git a/binaries/data/mods/official/maps/scenarios/ph2.xml b/binaries/data/mods/official/maps/scenarios/ph2.xml
index f51fea7646..fd59baee56 100644
--- a/binaries/data/mods/official/maps/scenarios/ph2.xml
+++ b/binaries/data/mods/official/maps/scenarios/ph2.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:192407849e2c911adaa80bfd05cb81c41e9b15dfb17926ca26d4a08c431a0bec
-size 22309
+oid sha256:cabfd3f837b2fd6c2567d26eb97b614fcec38fa040a14edddf60382804329ce9
+size 8408