From dcb00048e0830d881409e1f69053c22ee76d3a97 Mon Sep 17 00:00:00 2001
From: Acumen <stuart@wildfiregames.com>
Date: Sun, 28 Nov 2004 19:09:40 +0000
Subject: [PATCH] Added support for unit icon sheets.

This was SVN commit r1419.
---
 .../units/combat_dude_carthaginian.xml        |  1 +
 .../entities/units/combat_dude_iberian.xml    |  1 +
 .../entities/units/combat_dude_roman.xml      |  7 ++--
 .../official/entities/units/hele_csw_b1.xml   | 14 ++++----
 .../official/entities/units/hele_fem_b1.xml   | 13 ++++----
 .../official/entities/units/hele_isp_u1.xml   | 32 +++++--------------
 .../official/entities/units/template_unit.xml |  2 ++
 .../units/template_unit_cavalry_melee_csp.xml |  2 ++
 .../units/template_unit_cavalry_melee_csw.xml |  2 ++
 .../template_unit_cavalry_ranged_car.xml      |  2 ++
 .../template_unit_cavalry_ranged_cjv.xml      |  2 ++
 .../template_unit_infantry_melee_isp.xml      |  2 ++
 .../template_unit_infantry_melee_isw.xml      |  2 ++
 .../template_unit_infantry_ranged_iar.xml     |  2 ++
 .../template_unit_infantry_ranged_ijv.xml     |  2 ++
 .../template_unit_infantry_ranged_isl.xml     |  2 ++
 .../template_unit_mechanical_ship_bir.xml     |  2 ++
 .../template_unit_mechanical_ship_mer.xml     |  2 ++
 .../template_unit_mechanical_ship_qui.xml     |  2 ++
 .../template_unit_mechanical_ship_tri.xml     |  2 ++
 .../template_unit_mechanical_siege_bal.xml    |  2 ++
 .../template_unit_mechanical_siege_ong.xml    |  2 ++
 .../template_unit_mechanical_siege_ram.xml    |  2 ++
 .../units/template_unit_superunit_scu.xml     |  2 ++
 .../units/template_unit_superunit_siu.xml     |  2 ++
 .../units/template_unit_superunit_ssu.xml     |  2 ++
 .../units/template_unit_support_fem.xml       |  2 ++
 .../units/template_unit_support_med.xml       |  2 ++
 .../units/template_unit_support_trd.xml       |  2 ++
 29 files changed, 75 insertions(+), 39 deletions(-)

diff --git a/binaries/data/mods/official/entities/units/combat_dude_carthaginian.xml b/binaries/data/mods/official/entities/units/combat_dude_carthaginian.xml
index 8a4438b80e..55dbfe28f7 100755
--- a/binaries/data/mods/official/entities/units/combat_dude_carthaginian.xml
+++ b/binaries/data/mods/official/entities/units/combat_dude_carthaginian.xml
@@ -11,6 +11,7 @@
 			specific="Dude"
 			ranked="Basic Dude"
 			icon="unit_dude"
+			icon_cell=""
 			rollover="Carthaginian Dudes have strong armour, but weaker attack than the other dudes."
 			history="Carthaginian Dude is actually a spy from foreign powers seeking to infiltrate the 0 A.D. development team. Fortunately, the abbreviation of 'Carthaginian' to 'Kart' so confused the Dude that he now spends his days wandering through the Pyrogenesian wastes postulating an entirely new system of philosophy in an effort to understand this seemingly inexplicable act."
 		/>
diff --git a/binaries/data/mods/official/entities/units/combat_dude_iberian.xml b/binaries/data/mods/official/entities/units/combat_dude_iberian.xml
index aa80293692..fbd756a20b 100755
--- a/binaries/data/mods/official/entities/units/combat_dude_iberian.xml
+++ b/binaries/data/mods/official/entities/units/combat_dude_iberian.xml
@@ -11,6 +11,7 @@
 			specific="Dude"
 			ranked="Basic Dude"
 			icon="unit_dude"
+			icon_cell=""
 			rollover="Iberian Dudes have average attack and armour."
 			history="After a troubled childhood, Brad Jones took up a career as a stunt double for computer-generated characters. Some time later, he was invited on to the team by Jason Bishop, and can currently be seen playing Iberian Dude in the latest round of combat tests."
 		/>
diff --git a/binaries/data/mods/official/entities/units/combat_dude_roman.xml b/binaries/data/mods/official/entities/units/combat_dude_roman.xml
index d3777836d2..6d83b75271 100755
--- a/binaries/data/mods/official/entities/units/combat_dude_roman.xml
+++ b/binaries/data/mods/official/entities/units/combat_dude_roman.xml
@@ -6,14 +6,17 @@
 		<Id
 			civ_code="rome"
 			civ="Pre-Imperial Roman"
+			personal1="rome_male_names_1st.csv"
+			personal2="rome_male_names_2nd.csv"
 			internal_only="false"
 
 			specific="Dude"
 			ranked="Basic Dude"
+
 			personal="Vercinius Testiuso"
-			personal1="rome_male_names_1st.csv"
-			personal2="rome_male_names_2nd.csv"
 			icon="unit_dude"
+			icon_cell=""
+
 			rollover="Roman Dudes deal more damage, but have less armour compared to other Dudes."
 			history="The Dude has little history, since he's only been in the game for a few months."
 		/>
diff --git a/binaries/data/mods/official/entities/units/hele_csw_b1.xml b/binaries/data/mods/official/entities/units/hele_csw_b1.xml
index eb46429e9a..aa901ac5bb 100755
--- a/binaries/data/mods/official/entities/units/hele_csw_b1.xml
+++ b/binaries/data/mods/official/entities/units/hele_csw_b1.xml
@@ -3,17 +3,17 @@
 <Entity Tag="hele_csw_b1" Parent="csw">
 	<Traits>
 		<Id
-			civ="hele"
-			class2="Cavalry"
-			class3="Melee"
-			generic="Cavalry Swordsman"
-			specific="Hyppikon"
-			ranked="Basic Hyppikon"
+			civ_code="hele"
+			civ="Hellenes"
 			personal1="hele_male_names_1st.csv"
 			personal2="hele_male_names_2nd.csv"
+			internal_only="false"
 			icon="sheet_hele"
+
+			specific="Hyppikon"
+			ranked="Basic Hyppikon"
+
 			rollover="Cavalry were made up of the upper class since they were the only ones who could afford horses. Initially they were missile troops who avoided close combat, throwing javelins and spears at enemy troops. Later on thanks to developments by the Macedonians they began to close with enemy troops to use their swords. As with all ancient horsemen the Hyppikon did not have stirrups or a saddle."
-			type="UnitCavalry, UnitCitizenSoldier, UnitMelee, UnitMilitary, UnitMounted, UnitNonMechanical, UnitSwordsman, UnitWorker, CavSword"
 		/>
 	</Traits>
 	<Actions>
diff --git a/binaries/data/mods/official/entities/units/hele_fem_b1.xml b/binaries/data/mods/official/entities/units/hele_fem_b1.xml
index 991af41141..89f9597ce8 100755
--- a/binaries/data/mods/official/entities/units/hele_fem_b1.xml
+++ b/binaries/data/mods/official/entities/units/hele_fem_b1.xml
@@ -3,15 +3,16 @@
 <Entity Tag="hele_fem_b1" Parent="fem">
 	<Traits>
 		<Id
-			civ="hele"
-			class2="Support"
-			generic="Female Citizen"
-			specific="Ghune"
+			civ_code="hele"
+			civ="Hellenes"
 			personal1="hele_fem_names_1st.csv"
 			personal2="hele_fem_names_2nd.csv"
-			icon="unit_dudette"
+			internal_only="false"
+			icon="sheet_hele"
+
+			specific="Ghune"
+
 			rollover="Greek women were kept under tight control by their husbands, rarely leaving the home for anything beyond the necessities of daily life. They could not own anything or be involved in any business or legal transaction. They acted as household cook, nurse, seamstress, and early educator to young children. Spartan women were an exception to the normal code of conduct and enjoyed many freedoms."
-			type="UnitFoot, UnitSupport, UnitWorker"
 		/>
 	</Traits>
 	<Actor>The Dudette</Actor>
diff --git a/binaries/data/mods/official/entities/units/hele_isp_u1.xml b/binaries/data/mods/official/entities/units/hele_isp_u1.xml
index 79f8f093fb..a6698b3c64 100755
--- a/binaries/data/mods/official/entities/units/hele_isp_u1.xml
+++ b/binaries/data/mods/official/entities/units/hele_isp_u1.xml
@@ -3,39 +3,23 @@
 <Entity Tag="hele_isp_u1" Parent="isp">
 	<Traits>
 		<Id
-			civ="hele"
-			class2="Infantry"
-			class3="Melee"
-			generic="Infantry Spearman"
-			specific="Hoplite"
-			ranked="Ultimate Hoplite"
+			civ_code="hele"
+			civ="Hellenes"
 			personal1="hele_male_names_1st.csv"
 			personal2="hele_male_names_2nd.csv"
-			icon="unit_dude"
+			internal_only="false"
+			icon="sheet_hele"
+
+			specific="Hoplite"
+			ranked="Ultimate Hoplite"
+
 			rollover="Hoplites were the very symbol of Hellenistic prestige and citizenship, armed with a spear and a large round, bronze-coated shield known as a hoplon. Armor was heavy, with bronze helmets and a cuirass of either bronze or linen, in addition to greaves. Hoplites fought in a tight formation called a phalanx, guarding each other with their shields while they attacked the enemy with their spear or a short iron sword."
-			type="UnitSpearman, UnitNonMechanical, UnitMilitary, UnitCitizenSoldier"
 		/>
 		<Health
 			hitpoints="250"
 			hpcurr="10"
 		/>
 	</Traits>
-	<Event On="Initialize">
-	<![CDATA[
-	    // PASAP wander-between-houses script
-	    
-	    houses = entities.subset( "this.template.tag == \"House\"" );
-	    while( houses.length )
-	    {
-			index = Math.floor( Math.random() * houses.length );
-			house = houses[index];
-			console.write( house.position ); 
-			this.orderQueued( 4 /* patrol */, house.position.x, house.position.z );
-			houses.remove( index );
-		}
-		console.write( "A new Dude has entered your dungeon." );
-	]]>	
-	</Event>
 		
 	<Actor>The Spartan</Actor>
 </Entity>
diff --git a/binaries/data/mods/official/entities/units/template_unit.xml b/binaries/data/mods/official/entities/units/template_unit.xml
index fe1bda1c36..58a39387a7 100755
--- a/binaries/data/mods/official/entities/units/template_unit.xml
+++ b/binaries/data/mods/official/entities/units/template_unit.xml
@@ -8,6 +8,8 @@
 			internal_only="true"
 			version="0.1 pasap2"
 
+			personal=""
+
 			class1="Unit"
 			type.unit="true"
 			type.unit.group="true"
diff --git a/binaries/data/mods/official/entities/units/template_unit_cavalry_melee_csp.xml b/binaries/data/mods/official/entities/units/template_unit_cavalry_melee_csp.xml
index f992de6d82..68adf56a5d 100755
--- a/binaries/data/mods/official/entities/units/template_unit_cavalry_melee_csp.xml
+++ b/binaries/data/mods/official/entities/units/template_unit_cavalry_melee_csp.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Cavalry Spearman"
 
+			icon_cell="16"
+
 			type.unit.mounted.spear="true"
 			type.unit.weapon.spear="true"
 		/>
diff --git a/binaries/data/mods/official/entities/units/template_unit_cavalry_melee_csw.xml b/binaries/data/mods/official/entities/units/template_unit_cavalry_melee_csw.xml
index 54faca6095..c44ebb8573 100755
--- a/binaries/data/mods/official/entities/units/template_unit_cavalry_melee_csw.xml
+++ b/binaries/data/mods/official/entities/units/template_unit_cavalry_melee_csw.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Cavalry Swordsman"
 
+			icon_cell="19"
+
 			type.unit.mounted.sword="true"
 			type.unit.weapon.sword="true"
 		/>
diff --git a/binaries/data/mods/official/entities/units/template_unit_cavalry_ranged_car.xml b/binaries/data/mods/official/entities/units/template_unit_cavalry_ranged_car.xml
index dac72ac106..72171ca9ca 100755
--- a/binaries/data/mods/official/entities/units/template_unit_cavalry_ranged_car.xml
+++ b/binaries/data/mods/official/entities/units/template_unit_cavalry_ranged_car.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Cavalry Archer"
 
+			icon_cell="25"
+
 			type.unit.mounted.bow="true"
 			type.unit.weapon.bow="true"
 		/>
diff --git a/binaries/data/mods/official/entities/units/template_unit_cavalry_ranged_cjv.xml b/binaries/data/mods/official/entities/units/template_unit_cavalry_ranged_cjv.xml
index de36e1223c..6b155ddc8c 100755
--- a/binaries/data/mods/official/entities/units/template_unit_cavalry_ranged_cjv.xml
+++ b/binaries/data/mods/official/entities/units/template_unit_cavalry_ranged_cjv.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Cavalry Javelinist"
 
+			icon_cell="22"
+
 			type.unit.mounted.javelin="true"
 			type.unit.weapon.javelin="true"
 		/>
diff --git a/binaries/data/mods/official/entities/units/template_unit_infantry_melee_isp.xml b/binaries/data/mods/official/entities/units/template_unit_infantry_melee_isp.xml
index 1567184c27..903b42add0 100755
--- a/binaries/data/mods/official/entities/units/template_unit_infantry_melee_isp.xml
+++ b/binaries/data/mods/official/entities/units/template_unit_infantry_melee_isp.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Infantry Spearman"
 
+			icon_cell="4"
+
 			type.unit.foot.spear="true"
 			type.unit.weapon.spear="true"
 		/>
diff --git a/binaries/data/mods/official/entities/units/template_unit_infantry_melee_isw.xml b/binaries/data/mods/official/entities/units/template_unit_infantry_melee_isw.xml
index 686528b8fa..c2c38c6918 100755
--- a/binaries/data/mods/official/entities/units/template_unit_infantry_melee_isw.xml
+++ b/binaries/data/mods/official/entities/units/template_unit_infantry_melee_isw.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Infantry Swordsman"
 
+			icon_cell="1"
+
 			type.unit.foot.sword="true"
 			type.unit.weapon.sword="true"
 		/>
diff --git a/binaries/data/mods/official/entities/units/template_unit_infantry_ranged_iar.xml b/binaries/data/mods/official/entities/units/template_unit_infantry_ranged_iar.xml
index a02530bfc2..84dd4317be 100755
--- a/binaries/data/mods/official/entities/units/template_unit_infantry_ranged_iar.xml
+++ b/binaries/data/mods/official/entities/units/template_unit_infantry_ranged_iar.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Infantry Archer"
 
+			icon_cell="10"
+
 			type.unit.foot.bow="true"
 			type.unit.weapon.bow="true"
 		/>
diff --git a/binaries/data/mods/official/entities/units/template_unit_infantry_ranged_ijv.xml b/binaries/data/mods/official/entities/units/template_unit_infantry_ranged_ijv.xml
index e81edbbfbe..2c452245d6 100755
--- a/binaries/data/mods/official/entities/units/template_unit_infantry_ranged_ijv.xml
+++ b/binaries/data/mods/official/entities/units/template_unit_infantry_ranged_ijv.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Infantry Javelinist"
 
+			icon_cell="7"
+
 			type.unit.foot.javelin="true"
 			type.unit.weapon.javelin="true"
 		/>
diff --git a/binaries/data/mods/official/entities/units/template_unit_infantry_ranged_isl.xml b/binaries/data/mods/official/entities/units/template_unit_infantry_ranged_isl.xml
index 5826322d0e..49e2026055 100755
--- a/binaries/data/mods/official/entities/units/template_unit_infantry_ranged_isl.xml
+++ b/binaries/data/mods/official/entities/units/template_unit_infantry_ranged_isl.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Infantry Slinger"
 
+			icon_cell="13"
+
 			type.unit.foot.sling="true"
 			type.unit.weapon.sling="true"
 		/>
diff --git a/binaries/data/mods/official/entities/units/template_unit_mechanical_ship_bir.xml b/binaries/data/mods/official/entities/units/template_unit_mechanical_ship_bir.xml
index 3bbb564f37..ab1f465145 100755
--- a/binaries/data/mods/official/entities/units/template_unit_mechanical_ship_bir.xml
+++ b/binaries/data/mods/official/entities/units/template_unit_mechanical_ship_bir.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Bireme"
 
+			icon_cell="40"
+
 			type.unit.group.warship="true"
 		/>
 	</Traits>
diff --git a/binaries/data/mods/official/entities/units/template_unit_mechanical_ship_mer.xml b/binaries/data/mods/official/entities/units/template_unit_mechanical_ship_mer.xml
index d50ff0f0f0..5c0224fc13 100755
--- a/binaries/data/mods/official/entities/units/template_unit_mechanical_ship_mer.xml
+++ b/binaries/data/mods/official/entities/units/template_unit_mechanical_ship_mer.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Merchant Ship"
 
+			icon_cell="39"
+
 			type.unit.group.military="false"
 			type.unit.group.trade="true"
 		/>
diff --git a/binaries/data/mods/official/entities/units/template_unit_mechanical_ship_qui.xml b/binaries/data/mods/official/entities/units/template_unit_mechanical_ship_qui.xml
index 3477127f55..30367af99e 100755
--- a/binaries/data/mods/official/entities/units/template_unit_mechanical_ship_qui.xml
+++ b/binaries/data/mods/official/entities/units/template_unit_mechanical_ship_qui.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Quinquereme"
 
+			icon_cell="42"
+
 			type.unit.group.warship="true"
 		/>
 	</Traits>
diff --git a/binaries/data/mods/official/entities/units/template_unit_mechanical_ship_tri.xml b/binaries/data/mods/official/entities/units/template_unit_mechanical_ship_tri.xml
index 2a7f86c004..6d9ba604bc 100755
--- a/binaries/data/mods/official/entities/units/template_unit_mechanical_ship_tri.xml
+++ b/binaries/data/mods/official/entities/units/template_unit_mechanical_ship_tri.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Trireme"
 
+			icon_cell="41"
+
 			type.unit.group.warship="true"
 		/>
 	</Traits>
diff --git a/binaries/data/mods/official/entities/units/template_unit_mechanical_siege_bal.xml b/binaries/data/mods/official/entities/units/template_unit_mechanical_siege_bal.xml
index 1d63f7dede..ed321a1e91 100755
--- a/binaries/data/mods/official/entities/units/template_unit_mechanical_siege_bal.xml
+++ b/binaries/data/mods/official/entities/units/template_unit_mechanical_siege_bal.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Ballista"
 
+			icon_cell="38"
+
 			type.unit.attack.ranged="true"
 		/>
 	</Traits>
diff --git a/binaries/data/mods/official/entities/units/template_unit_mechanical_siege_ong.xml b/binaries/data/mods/official/entities/units/template_unit_mechanical_siege_ong.xml
index 857d1c89ae..8a1b205969 100755
--- a/binaries/data/mods/official/entities/units/template_unit_mechanical_siege_ong.xml
+++ b/binaries/data/mods/official/entities/units/template_unit_mechanical_siege_ong.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Onager"
 
+			icon_cell="36"
+
 			type.unit.attack.ranged="true"
 		/>
 	</Traits>
diff --git a/binaries/data/mods/official/entities/units/template_unit_mechanical_siege_ram.xml b/binaries/data/mods/official/entities/units/template_unit_mechanical_siege_ram.xml
index 7f23340ab2..edd677b598 100755
--- a/binaries/data/mods/official/entities/units/template_unit_mechanical_siege_ram.xml
+++ b/binaries/data/mods/official/entities/units/template_unit_mechanical_siege_ram.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Ram"
 
+			icon_cell="37"
+
 			type.unit.attack.melee="true"
 		/>
 	</Traits>
diff --git a/binaries/data/mods/official/entities/units/template_unit_superunit_scu.xml b/binaries/data/mods/official/entities/units/template_unit_superunit_scu.xml
index 9b94e28631..4d78524a21 100755
--- a/binaries/data/mods/official/entities/units/template_unit_superunit_scu.xml
+++ b/binaries/data/mods/official/entities/units/template_unit_superunit_scu.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Super Cavalry Unit"
 
+			icon_cell="44"
+
 			class3="Super Cavalry Unit"
 
 			type.unit.material.organic="true"
diff --git a/binaries/data/mods/official/entities/units/template_unit_superunit_siu.xml b/binaries/data/mods/official/entities/units/template_unit_superunit_siu.xml
index 9375d0fca0..bd1aa68944 100755
--- a/binaries/data/mods/official/entities/units/template_unit_superunit_siu.xml
+++ b/binaries/data/mods/official/entities/units/template_unit_superunit_siu.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Super Infantry Unit"
 
+			icon_cell="43"
+
 			class3="Super Infantry Unit"
 
 			type.unit.material.organic="true"
diff --git a/binaries/data/mods/official/entities/units/template_unit_superunit_ssu.xml b/binaries/data/mods/official/entities/units/template_unit_superunit_ssu.xml
index 160b3e2350..426d5635c2 100755
--- a/binaries/data/mods/official/entities/units/template_unit_superunit_ssu.xml
+++ b/binaries/data/mods/official/entities/units/template_unit_superunit_ssu.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Super Siege Unit"
 
+			icon_cell="44"
+
 			class3="Super Siege Unit"
 
 			type.unit.material.mechanical="true"
diff --git a/binaries/data/mods/official/entities/units/template_unit_support_fem.xml b/binaries/data/mods/official/entities/units/template_unit_support_fem.xml
index f753aae25e..5de348969d 100755
--- a/binaries/data/mods/official/entities/units/template_unit_support_fem.xml
+++ b/binaries/data/mods/official/entities/units/template_unit_support_fem.xml
@@ -4,6 +4,8 @@
 	<Traits>
 		<Id
 			generic="Female Citizen"
+
+			icon_cell="33"
 		/>
 	</Traits>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/template_unit_support_med.xml b/binaries/data/mods/official/entities/units/template_unit_support_med.xml
index 4b30a00f5d..960a711e36 100755
--- a/binaries/data/mods/official/entities/units/template_unit_support_med.xml
+++ b/binaries/data/mods/official/entities/units/template_unit_support_med.xml
@@ -4,6 +4,8 @@
 	<Traits>
 		<Id
 			generic="Healer"
+
+			icon_cell="34"
 		/>
 	</Traits>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/template_unit_support_trd.xml b/binaries/data/mods/official/entities/units/template_unit_support_trd.xml
index 71ee7e6b97..cc836a0454 100755
--- a/binaries/data/mods/official/entities/units/template_unit_support_trd.xml
+++ b/binaries/data/mods/official/entities/units/template_unit_support_trd.xml
@@ -5,6 +5,8 @@
 		<Id
 			generic="Trader"
 
+			icon_cell="35"
+
 			type.unit.group.trade="true"
 		/>
 	</Traits>