read the production icons from sequences

this allows d2k to read them from DATA.R8 without trouble
2013-08-16 10:03:05 +02:00
parent b73ca27a8f
commit 376a6c7a5d
46 changed files with 862 additions and 425 deletions
--- a/mods/d2k/rules/aircraft.yaml
+++ b/mods/d2k/rules/aircraft.yaml
@@ -5,7 +5,6 @@
 	Tooltip:
 		Name: Carryall
 		Description: Fast drop ship.\n  Unarmed
-		Icon: carryallicon
 	Health:
 		HP: 250
 	Armor: 
@@ -17,7 +16,7 @@
 		ROT: 4
 		Speed: 30
 		LandableTerrainTypes: Sand, Rock, Transition, Spice, Dune
-		RepairBuildings: repair
+		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: starporta,starporto,starporth
 		LandAltitude: 800
 	RenderUnit:
@@ -42,7 +41,7 @@ FRIGATE:
 	Plane:
 		ROT: 5
 		Speed: 50
-		RepairBuildings: repair
+		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: starporta,starporto,starporth
 	Health:
 		HP: 500
@@ -85,7 +84,7 @@ ORNI:
 		InitialFacing: 20
 		ROT: 6
 		Speed: 40
-		RepairBuildings: repair
+		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: starporta,starporto,starporth
 	RenderUnit:
 	WithShadow:
@@ -108,7 +107,7 @@ ORNI.bomber:
 	Plane:
 		ROT: 5
 		Speed: 50
-		RepairBuildings: repair
+		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: starporta,starporto,starporth
 	LimitedAmmo:
 		Ammo: 5
@@ -137,7 +136,7 @@ CARRYALL.infantry:
 	Plane:
 		ROT: 4
 		Speed: 40
-		RepairBuildings: repair
+		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: starporta,starporto,starporth
 	RenderUnit:
 		Image: carryall
@@ -169,7 +168,7 @@ CARRYALL.Husk:
 	Helicopter:
 		ROT: 4
 		Speed: 30
-		RepairBuildings: repair
+		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: starporta,starporto,starporth
 	RenderUnit:
 		Image: carryall
@@ -182,7 +181,7 @@ ORNI.Husk:
 	Helicopter:
 		ROT: 6
 		Speed: 40
-		RepairBuildings: repair
+		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: starporta,starporto,starporth
 	RenderUnit:
 		Image: orni
@@ -195,7 +194,7 @@ ORNI.bomber.Husk:
 	Plane:
 		ROT: 5
 		Speed: 50
-		RepairBuildings: repair
+		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: starporta,starporto,starporth
 	RenderUnit:
 		Image: orni
@@ -208,7 +207,7 @@ CARRYALL.infantry.Husk:
 	Plane:
 		ROT: 4
 		Speed: 40
-		RepairBuildings: repair
+		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: starporta,starporto,starporth
 	RenderUnit:
 		Image: carryall
@@ -221,7 +220,7 @@ BADR.Husk:
 	Plane:
 		ROT: 4
 		Speed: 40
-		RepairBuildings: repair
+		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: starporta,starporto,starporth
 	RenderUnit:
 		Image: carryall
--- a/mods/d2k/rules/atreides.yaml
+++ b/mods/d2k/rules/atreides.yaml
@@ -22,6 +22,15 @@ BARRA:
 	Buildable:
 		Owner: atreides

+REPAIRA:
+	Inherits: ^REPAIR
+	Buildable:
+		Owner: atreides
+
+RESEARCHA:
+	Inherits: ^RESEARCH
+	Buildable:
+		Owner: atreides

 HIGHTECHA:
 	Inherits: ^HIGHTECH
@@ -92,21 +101,6 @@ MCVA.starport:
 	Valued:
 		Cost: 2500

-TRIKEA:
-	Inherits: ^TRIKE
-	Buildable:
-		Owner: atreides, harkonnen
-	RenderUnit:
-		Image: TRIKE
-
-TRIKEA.starport:
-	Inherits: TRIKEA
-	Buildable:
-		Owner: atreides, harkonnen, ordos
-		Queue: Starport
-	Valued:
-		Cost: 315
-
 CARRYALLA:
 	Inherits: ^CARRYALL
 	RenderUnit:
@@ -119,8 +113,6 @@ CARRYALLA.starport:

 COMBATA:
 	Inherits: ^COMBAT
-	Tooltip:
-		Icon: combataicon
 	Buildable:
 		Owner: atreides
 	RevealsShroud:
@@ -141,8 +133,6 @@ COMBATA:

 COMBATA.Husk:
 	Inherits: ^COMBAT.Husk
-	Tooltip:
-		Icon: combataicon
 	RenderUnit:
 		Image: COMBATA

@@ -166,7 +156,6 @@ SONICTANK:
 	Tooltip:
 		Name: Sonic Tank
 		Description: Fires sonic shocks\n  Strong vs Infantry, Vehicles\n  Weak vs Artillery, Aircraft
-		Icon: sonictankicon
 	Selectable:
 		Bounds: 30,30
 	Health:
@@ -193,8 +182,6 @@ SONICTANK:

 SONICTANK.Husk:
 	Inherits: ^Husk
-	Tooltip:
-		Icon: sonictankicon
 	RenderUnit:
 		Image: SONICTANK

--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -32,6 +32,7 @@
 	DebugMuzzlePositions:
 	Guard:
 	Guardable:
+	RenderUnit:
 	BodyOrientation:
 	UpdatesPlayerStatistics:

@@ -65,10 +66,11 @@
 		Types:Tank
 	GivesBounty:
 	Repairable:
-		RepairBuildings: repair
+		RepairBuildings: repaira,repairo,repairh
 	DebugMuzzlePositions:
 	Guard:
 	Guardable:
+	RenderUnit:
 	BodyOrientation:
 	UpdatesPlayerStatistics:

--- a/mods/d2k/rules/harkonnen.yaml
+++ b/mods/d2k/rules/harkonnen.yaml
@@ -23,6 +23,16 @@ BARRH:
 		Owner: harkonnen
 	-RepairsUnits:

+REPAIRH:
+	Inherits: ^REPAIR
+	Buildable:
+		Owner: harkonnen
+
+RESEARCHH:
+	Inherits: ^RESEARCH
+	Buildable:
+		Owner: harkonnen
+
 SILOH:
 	Inherits: ^SILO
 	Buildable:
@@ -97,38 +107,6 @@ MCVH.starport:
 	Valued:
 		Cost: 2500

-#TRIKEH:
-#	Inherits: ^TRIKE
-#	Buildable:
-#		Owner: harkonnen
-#	Valued:
-#		Cost: 250
-#	Tooltip:
-#		Name: Scout Quad
-#		Description: Heavy Scout\n Strong vs Infantry
-#		Icon: quadicon
-#	Health:
-#		HP: 125
-#	Mobile:
-#		ROT: 9
-#		Speed: 11
-#	Armament:
-#		Weapon: M60mg
-#		LocalOffset: 43,0,128
-#	AttackFrontal:
-#	RenderUnit:
-#		Image: QUAD
-
-#TRIKEH.starport:
-#	Inherits: ^TRIKE
-#	Buildable:
-#		Owner: harkonnen
-#		Queue: Starport
-#	Valued:
-#		Cost: 149
-#	RenderUnit:
-#		Image: TRIKE
-
 CARRYALLH:
 	Inherits: ^CARRYALL
 	RenderUnit:
@@ -139,16 +117,8 @@ CARRYALLH.starport:
 	Valued:
 		Cost: 1500

-QUADH:
-	Inherits: QUAD
-	Buildable:
-		-Prerequisites:
-		Owner: harkonnen
-
 COMBATH:
 	Inherits: ^COMBAT
-	Tooltip:
-		Icon: combathicon
 	Buildable:
 		Owner: harkonnen
 	Mobile:
@@ -166,8 +136,6 @@ COMBATH:

 COMBATH.Husk:
 	Inherits: ^COMBAT.Husk
-	Tooltip:
-		Icon: combathicon
 	RenderUnit:
 		Image: COMBATH

@@ -183,7 +151,7 @@ DEVAST:
 	Buildable:
 		Queue: Armor
 		BuildPaletteOrder: 100
-		Prerequisites: Ix
+		Prerequisites: Research
 		Owner: harkonnen
 		Hotkey: d
 	Valued:
@@ -191,7 +159,6 @@ DEVAST:
 	Tooltip:
 		Name: Devastator
 		Description: Super Heavy Tank\n  Strong vs Tanks\n  Weak vs Artillery, Aircraft
-		Icon: devasticon
 	Health:
 		HP: 650
 	Armor:
@@ -220,8 +187,6 @@ DEVAST.Husk:
 	Inherits: ^Husk
 	Health:
 		HP: 125
-	Tooltip:
-		Icon: devasticon
 	RenderUnit:
 		Image: DEVAST

--- a/mods/d2k/rules/infantry.yaml
+++ b/mods/d2k/rules/infantry.yaml
@@ -91,7 +91,6 @@ MEDIC:
 	Tooltip:
 		Name: Medic
 		Description: Heals nearby infantry\n  Strong vs Nothing\n  Weak vs Everything
-		Icon: thumpericon
 	Selectable:
 		Bounds: 12,17,0,0
 		Voice: EngineerVoice
@@ -108,59 +107,4 @@ MEDIC:
 		PipType: Blue
 	-AutoTarget:
 	AttackMove:
-		JustMove: true
-	RenderInfantry:
-		Image: THUMPER
-
-
-#THUMPER:
-#	Inherits: ^Infantry
-#	Buildable:
-#		Queue: Infantry
-#		BuildPaletteOrder: 50
-#		Owner: atreides,harkonnen,ordos
-#	Valued:
-#		Cost: 400
-#	Tooltip:
-#		Name: Thumper
-#		Description: Attracts sandsworm through vibrations\n  Strong vs Nothing\n  Weak vs Everything
-#	Selectable:
-#		Bounds: 12,17,0,0
-#	Health:
-#		HP: 25
-#	Mobile:
-#		Speed: 4
-#	Passenger:
-#	-AutoTarget:
-#	AttackMove:
-#		JustMove: true
-#	Transforms:
-#		IntoActor: thumping
-#		Offset:1,1
-#		Facing: 1
-#
-#THUMPING:
-#	Inherits: ^Building
-#	Building:
-#		Power: 0
-#		Footprint: x
-#		Dimensions: 1,1
-#		TerrainTypes: Sand, Dune
-#	Health:
-#		HP: 25
-#	Armor:
-#		Type: None
-#	RevealsShroud:
-#		Range: 5
-#	Valued:
-#		Cost: 400
-#	Tooltip:
-#		Name: Thumper
-#	-Capturable:
-#	-CapturableBar:
-#	-Sellable:
-#	-GivesBuildableArea:
-#	FreeActor:
-#		Actor: SANDWORM
-#		SpawnOffset: 1,2
-#		Facing: 1
+		JustMove: true
--- a/mods/d2k/rules/ordos.yaml
+++ b/mods/d2k/rules/ordos.yaml
@@ -22,6 +22,16 @@ BARRO:
 	Buildable:
 		Owner: ordos

+REPAIRO:
+	Inherits: ^REPAIR
+	Buildable:
+		Owner: ordos
+
+RESEARCHO:
+	Inherits: ^RESEARCH
+	Buildable:
+		Owner: ordos
+
 SILOO:
 	Inherits: ^SILO
 	Buildable:
@@ -93,8 +103,6 @@ MCVO.starport:

 COMBATO:
 	Inherits: ^COMBAT
-	Tooltip:
-		Icon: combatoicon
 	Buildable:
 		Owner: ordos
 	RevealsShroud:
@@ -113,8 +121,6 @@ COMBATO:

 COMBATO.Husk:
 	Inherits: ^COMBAT.Husk
-	Tooltip:
-		Icon: combatoicon
 	RenderUnit:
 		Image: COMBATO

@@ -125,31 +131,44 @@ COMBATO.starport:
 	Valued:
 		Cost: 875

-TRIKEO:
-	Inherits: ^TRIKE
+RAIDER:
+	Inherits: ^Vehicle
 	Buildable:
+		Queue: Vehicle
+		BuildPaletteOrder: 10
+		Hotkey: w
 		Owner: ordos
 	Valued:
 		Cost: 300
 	Tooltip:
 		Name: Raider Trike
 		Description: Improved Scout\n Strong vs Infantry, Light Vehicles
-		Icon: raidericon
+	Selectable:
+		Bounds: 24,24
 	Health:
 		HP: 110
+	Armor:
+		Type: Light
 	Mobile:
 		ROT: 10
 		Speed: 14
+	RevealsShroud:
+		Range: 7
 	RenderUnit:
-		Image: RAIDER
+	WithMuzzleFlash:
 	Armament:
 		Weapon: HMGo
 		LocalOffset: 256,0,128
 	AttackFrontal:
+	AutoTarget:
+	Explodes:
+		Weapon: UnitExplodeTiny
+		EmptyWeapon: UnitExplodeTiny

-STEALTHTRIKE:
-	Inherits: ^TRIKE
+STEALTHRAIDER:
+	Inherits: ^Vehicle
 	Buildable:
+		Queue: Vehicle
 		Prerequisites: Hitech
 		Owner: ordos
 		BuildPaletteOrder: 30
@@ -158,18 +177,26 @@ STEALTHTRIKE:
 	Tooltip:
 		Name: Stealth Raider Trike
 		Description: Invisible Raider Trike\n Strong vs Infantry, Light Vehicles
-		Icon: raidersicon
+	Selectable:
+		Bounds: 24,24
 	Health:
 		HP: 110
+	Armor:
+		Type: Light
 	Mobile:
 		ROT: 10
 		Speed: 14
+	RevealsShroud:
+		Range: 7
 	RenderUnit:
-		Image: RAIDER
+	WithMuzzleFlash:
 	Armament:
 		Weapon: HMGo
 		LocalOffset: 256,0,128
 	AttackFrontal:
+	Explodes:
+		Weapon: UnitExplodeTiny
+		EmptyWeapon: UnitExplodeTiny
 	Cloak:
 		InitialDelay: 45
 		CloakDelay: 90
@@ -178,16 +205,6 @@ STEALTHTRIKE:
 	AutoTarget:
 		InitialStance: HoldFire

-#TRIKEO.starport:
-#	Inherits: ^TRIKE
-#	Buildable:
-#		Queue: Starport
-#		Owner: ordos
-#	RenderUnit:
-#		Image: TRIKE
-#	Valued:
-#		Cost: 149
-
 CARRYALLO:
 	Inherits: ^CARRYALL
 	RenderUnit:
@@ -205,7 +222,6 @@ DEVIATORTANK:
 	Tooltip:
 		Name: Deviator
 		Description: Causes no actual damage\nFires a warhead which changes allegiances\n but does not effect buildings or tanks
-		Icon: deviatortankicon
 	Buildable:
 		Queue: Armor
 		BuildPaletteOrder: 50
@@ -238,8 +254,6 @@ DEVIATORTANK:

 DEVIATORTANK.Husk:
 	Inherits: ^Husk
-	Tooltip:
-		Icon: deviatortankicon
 	RenderUnit:
 		Image: DEVIATORTANK

--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -330,12 +330,15 @@
 		Prerequisite: Starport

 WALL:
+	Inherits: ^WALL
+	Buildable:
+		Owner:
+
+^WALL:
 	Buildable:
 		Queue: Building
 		Prerequisites: Barracks
-		Owner: atreides, harkonnen, ordos
 		BuildPaletteOrder: 60
-		#Hotkey: g
 	SoundOnDamageTransition:
 		DamagedSound:
 		DestroyedSound: EXPLSML4.WAV
@@ -346,7 +349,6 @@ WALL:
 	Tooltip:
 		Name: Concrete Wall
 		Description: Stop units and blocks enemy fire.
-		Icon: wallaicon
 	AppearsOnRadar:
 	Building:
 		BuildSounds: CHUNG.WAV
@@ -361,15 +363,14 @@ WALL:
 		CrushClasses: Concretewall
 	LineBuild:
 		Range: 8
-	#SelectionDecorations:
-	#Selectable:
-	#	Priority: 1
+#	SelectionDecorations:
+#	Selectable:
+#		Priority: 1
 	TargetableBuilding:
 		TargetTypes: Ground, C4
 	RenderBuildingWall:
 		HasMakeAnimation: false
 		Image: walla
-	#GivesExperience:
 	EditorAppearance:
 		RelativeToTopLeft: yes
 	AutoTargetIgnore:
@@ -379,12 +380,11 @@ WALL:
 	Guardable:
 	BodyOrientation:

-GUNTOWER:
+^GUNTOWER:
 	Inherits: ^Building
 	Buildable:
 		Queue: Building
 		Prerequisites: Barracks
-		Owner: atreides, harkonnen, ordos
 		BuildPaletteOrder: 90
 		Hotkey: g
 	Valued:
@@ -392,7 +392,6 @@ GUNTOWER:
 	Tooltip:
 		Name: Gun Tower
 		Description: Defensive structure\n  Strong vs Tanks\n  Weak vs Infantry, Aircraft
-		Icon: guntoweraicon
 	Building:
 		Power: -20
 		Adjacent: 4
@@ -421,26 +420,15 @@ GUNTOWER:
 		LocalOffset: 469,0,299
 	AttackTurreted:
 	AutoTarget:
-	LeavesHusk:
-		HuskActor: Guntower.Husk
 	RenderDetectionCircle:
 	DetectCloaked:
 		Range: 5

-GUNTOWER.Husk:
-	Inherits: ^TowerHusk
-	Tooltip:
-		Name: Destroyed Tower
-		Icon: guntoweraicon
-	RenderUnit:
-		Image: guntowera
-
-ROCKETTOWER:
+^ROCKETTOWER:
 	Inherits: ^Building
 	Buildable:
 		Queue: Building
 		Prerequisites: Outpost
-		Owner: atreides, harkonnen, ordos
 		BuildPaletteOrder: 120
 		Hotkey: m
 	Valued:
@@ -448,7 +436,6 @@ ROCKETTOWER:
 	Tooltip:
 		Name: Rocket Tower
 		Description: Defensive structure\n  Strong vs Infantry, Aircraft\n  Weak vs Tanks\n\n  Requires power to operate
-		Icon: rockettoweraicon
 	Building:
 		Power: -30
 		Adjacent: 4
@@ -467,7 +454,6 @@ ROCKETTOWER:
 	RenderRangeCircle:
 	RenderBuilding:
 		HasMakeAnimation: false
-		Image: rockettowera
 	WithTurret:
 	Armament:
 		Weapon: TowerMissile
@@ -479,26 +465,15 @@ ROCKETTOWER:
 	AutoTarget:
 	RequiresPower:
 	CanPowerDown:
-	LeavesHusk:
-		HuskActor: Rockettower.Husk
 	RenderDetectionCircle:
 	DetectCloaked:
 		Range: 6

-ROCKETTOWER.Husk:
-	Inherits: ^TowerHusk
-	Tooltip:
-		Name: Destroyed Tower
-		Icon: rockettoweraicon
-	RenderUnit:
-		Image: rockettowera
-
-REPAIR:
+^REPAIR:
 	Inherits: ^Building
 	Buildable:
 		Queue: Building
 		Prerequisites: Heavy
-		Owner: atreides, harkonnen, ordos
 		BuildPaletteOrder: 130
 		Hotkey: e
 	Valued:
@@ -506,7 +481,6 @@ REPAIR:
 	Tooltip:
 		Name: Repair Pad
 		Description: Repairs vehicles\n Allows construction of MCVs
-		Icon: repairaicon
 	Building:
 		Power: -10
 		Footprint: =x= =x= ===
@@ -523,8 +497,8 @@ REPAIR:
 		ValuePercentage: 50
 	RallyPoint:
 		RallyPoint: 1,3
-	RenderBuilding:
-		Image: repaira
+	ProvidesCustomPrerequisite:
+		Prerequisite: Repair

 ^HIGHTECH:
 	Inherits: ^Building
@@ -554,12 +528,11 @@ REPAIR:
 	ProvidesCustomPrerequisite:
 		Prerequisite: Hitech

-RESEARCH:
+^RESEARCH:
 	Inherits: ^Building
 	Buildable:
 		Queue: Building
 		Prerequisites: Hitech
-		Owner: atreides, harkonnen, ordos
 		BuildPaletteOrder: 140
 		Hotkey: v
 	Selectable:
@@ -569,7 +542,6 @@ RESEARCH:
 	Tooltip:
 		Name: IX Research Center
 		Description: Unlocks experimental tanks\n  Special Ability: Carryall Combat Drop
-		Icon: researchaicon
 	ParatroopersPower:
 		Image: carryallicon
 		UnitType: carryall.infantry
@@ -593,14 +565,12 @@ RESEARCH:
 	RevealsShroud:
 		Range: 4
 	ProvidesCustomPrerequisite:
-		Prerequisite: Ix
-	RenderBuilding:
-		Image: researcha
+		Prerequisite: Research

 ^PALACE:
 	Inherits: ^Building
 	Buildable:
-		Prerequisites: Ix
+		Prerequisites: Research
 		Queue: Building
 		BuildPaletteOrder: 150
 		Hotkey: p
@@ -626,7 +596,7 @@ RESEARCH:
 	DetectCloaked:
 		Range: 4
 	ProvidesCustomPrerequisite:
-		Prerequisite: TPal
+		Prerequisite: Palace

 SIETCH:
 	Inherits: ^Building
@@ -689,6 +659,10 @@ HITECH:
 	Tooltip:
 		Name: High-Tech Facility

-IX:
+REPAIR:
 	Tooltip:
-		Name: IX Research Center
+		Name: Repair Pad
+
+RESEARCH:
+	Tooltip:
+		Name: Ix Research Center
--- a/mods/d2k/rules/system.yaml
+++ b/mods/d2k/rules/system.yaml
@@ -117,9 +117,7 @@ Player:
 			fremen: 0.5%
 			sardaukar: 1.5%
 			harvester: 0.1%
-			trikea.starport: 5%
-			#trikeh.starport: 5%
-			#trikeo.starport: 5%
+			trike.starport: 5%
 			quad.starport: 7.5%
 			siegetank.starport: 5%
 			missiletank.starport: 7.5%
@@ -129,9 +127,7 @@ Player:
 			sonictank: 10%
 			devast: 10%
 			deviatortank: 7.5%
-			trikea: 10%
-			#trikeh: 10%
-			trikeo: 10%
+			trike: 10%
 			quad: 15%
 			siegetank: 10%
 			missiletank: 15%
@@ -180,9 +176,7 @@ Player:
 			fremen: 0.25%
 			sardaukar: 1%
 			harvester: 0.1%
-			trikea.starport: 7.5%
-			#trikeh.starport: 7.5%
-			#trikeo.starport: 7.5%
+			trike.starport: 7.5%
 			quad.starport: 12.5%
 			siegetank.starport: 5%
 			missiletank.starport: 7.5%
@@ -192,9 +186,8 @@ Player:
 			sonictank: 10%
 			devast: 10%
 			deviatortank: 7.5%
-			trikea: 15%
-			#trikeh: 15%
-			trikeo: 15%
+			trike: 15%
+			raider: 15%
 			quad: 25%
 			siegetank: 10%
 			missiletank: 15%
@@ -241,9 +234,7 @@ Player:
 			fremen: 1%
 			sardaukar: 3%
 			harvester: 0.1%
-			trikea.starport: 5%
-			#trikeh.starport: 5%
-			#trikeo.starport: 5%
+			trike.starport: 5%
 			quad.starport: 7.5%
 			siegetank.starport: 5%
 			missiletank.starport: 7.5%
@@ -253,9 +244,8 @@ Player:
 			sonictank: 10%
 			devast: 10%
 			deviatortank: 7.5%
-			trikea: 10%
-			#trikeh: 10%
-			trikeo: 10%
+			trike: 10%
+			raider: 10%
 			quad: 15%
 			siegetank: 10%
 			missiletank: 15%
@@ -413,12 +403,12 @@ CRATE:
 		Amount: 1500
 		SelectionShares: 25
 		UseCashTick: yes
-	GiveUnitCrateAction@TrikeA:
+	GiveUnitCrateAction@Trike:
 		SelectionShares: 20
-		Unit: trikea
-	GiveUnitCrateAction@TrikeO:
+		Unit: trike
+	GiveUnitCrateAction@Raider:
 		SelectionShares: 15
-		Unit: trikeo
+		Unit: raider
 	GiveUnitCrateAction@Quad:
 		SelectionShares: 40
 		Unit: quad
@@ -437,9 +427,9 @@ CRATE:
 	GiveUnitCrateAction@MissileTank:
 		SelectionShares: 10
 		Unit: missiletank
-	GiveUnitCrateAction@StealthTrike:
+	GiveUnitCrateAction@StealthRaider:
 		SelectionShares: 7
-		Unit: stealthtrike
+		Unit: stealthraider
 	GiveUnitCrateAction@Fremen:
 		SelectionShares: 5
 		Unit: fremen
--- a/mods/d2k/rules/vehicles.yaml
+++ b/mods/d2k/rules/vehicles.yaml
@@ -10,7 +10,6 @@
 	Tooltip:
 		Name: Mobile Construction Vehicle
 		Description: Deploys into another Construction Yard\n  Unarmed
-		Icon: mcvicon
 	Selectable:
 		Priority: 3
 		Bounds: 42,42
@@ -40,7 +39,6 @@ MCV.Husk:
 		HP: 175
 	Tooltip:
 		Name: Destroyed Mobile Construction Vehicle
-		Icon: missiletankicon
 	RenderUnit:
 		Image: DMCV

@@ -57,7 +55,6 @@ HARVESTER:
 	Tooltip:
 		Name: Spice Harvester
 		Description: Collects Spice for processing\n  Unarmed
-		Icon: harvestericon
 	Selectable:
 		Priority: 7
 		Bounds: 42,42
@@ -96,7 +93,6 @@ HARVESTER.Husk:
 		HP: 150
 	Tooltip:
 		Name: Destroyed Spice Harvester
-		Icon: harvestericon
 	RenderUnit:
 		Image: HARVESTER

@@ -108,18 +104,18 @@ HARVESTER.starport:
 	Valued:
 		Cost: 1500

-^TRIKE:
+TRIKE:
 	Inherits: ^Vehicle
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 10
 		Hotkey: w
+		Owner: atreides, harkonnen
 	Valued:
 		Cost: 250
 	Tooltip:
 		Name: Scout Trike
 		Description: Fast Scout\n Strong vs Infantry
-		Icon: trikeicon
 	Selectable:
 		Bounds: 24,24
 	Health:
@@ -141,18 +137,28 @@ HARVESTER.starport:
 	Explodes:
 		Weapon: UnitExplodeTiny
 		EmptyWeapon: UnitExplodeTiny
-	#Cargo:
-	#	Types: Infantry
-	#	MaxWeight: 1
-	#	PipCount: 1
-	#	UnloadFacing: 220
+#	Cargo:
+#		Types: Infantry
+#		MaxWeight: 1
+#		PipCount: 1
+#		UnloadFacing: 220
+
+TRIKE.starport:
+	Inherits: TRIKE
+	Buildable:
+		Owner: atreides, harkonnen, ordos
+		Queue: Starport
+	Valued:
+		Cost: 315
+	RenderUnit:
+		Image: TRIKE

 QUAD:
 	Inherits: ^Vehicle
 	Buildable:
 		Queue: Vehicle
 		Prerequisites: Light,Outpost
-		Owner: atreides, ordos
+		Owner: atreides, ordos, harkonnen
 		BuildPaletteOrder: 20
 		Hotkey: q
 	Valued:
@@ -160,7 +166,6 @@ QUAD:
 	Tooltip:
 		Name: Missile Quad
 		Description: Missile Scout\n Strong vs Vehicles\n  Weak vs Infantry
-		Icon: quadicon
 	Health:
 		HP: 125
 	Armor: 
@@ -170,8 +175,6 @@ QUAD:
 		Speed: 9
 	RevealsShroud:
 		Range: 8
-	RenderUnit:
-		Image: QUAD
 	Armament:
 		Weapon: QuadRockets
 		LocalOffset: 128,0,85#-4
@@ -190,6 +193,8 @@ QUAD.starport:
 		Queue: Starport
 	Valued:
 		Cost: 500
+	RenderUnit:
+		Image: QUAD

 ^COMBAT:
 	Inherits: ^Tank
@@ -250,7 +255,6 @@ SIEGETANK:
 	Tooltip:
 		Name: Siege Tank
 		Description: Siege Artillery\n  Strong vs Infantry, Buildings\n  Weak vs Tanks, Aircraft
-		Icon: siegetankicon
 	Health:
 		HP: 120
 	Armor:
@@ -286,7 +290,6 @@ SIEGETANK:
 SIEGETANK.Husk:
 	Inherits: ^Husk
 	Tooltip:
-		Icon: siegetankicon
 	ThrowsParticle@turret:
 		Anim: turret
 	RenderUnit:
@@ -306,7 +309,6 @@ MISSILETANK:
 	Tooltip:
 		Name: Rocket Tank
 		Description: Rocket Artillery\n  Strong vs Vehicles, Buildings\n  Weak vs Infantry, Aircraft
-		Icon: missiletankicon
 	Buildable:
 		Queue: Armor
 		Prerequisites: Hitech
@@ -341,8 +343,6 @@ MISSILETANK:

 MISSILETANK.Husk:
 	Inherits: ^Husk
-	Tooltip:
-		Icon: missiletankicon
 	RenderUnit:
 		Image: MISSILETANK

--- a/mods/d2k/sequences/infantry.yaml
+++ b/mods/d2k/sequences/infantry.yaml
@@ -65,6 +65,9 @@ rifle:
 		Start: 430
 		Length: 12
 		Tick: 1600
+	icon: DATA.R8
+		Start: 4011
+		Offset: -30,-24

 bazooka:
 	stand: DATA.R8
@@ -133,6 +136,9 @@ bazooka:
 		Start: 668
 		Length: 26
 		Tick: 1600
+	icon: DATA.R8
+		Start: 4012
+		Offset: -30,-24

 engineer:
 	stand: DATA.R8
@@ -171,8 +177,11 @@ engineer:
 		Start: 1376
 		Length: 26
 		Tick: 1600
+	icon: DATA.R8
+		Start: 4013
+		Offset: -30,-24

-thumper:
+medic: # actually thumper
 	stand: DATA.R8
 		Start: 1402
 		Facings: -8
@@ -213,6 +222,9 @@ thumper:
 		Start: 1577
 		Length: 26
 		Tick: 1600
+	icon: DATA.R8
+		Start: 4014
+		Offset: -30,-24

 thumping:
 	idle: DATA.R8
@@ -226,6 +238,9 @@ thumping:
 		Start: 1458
 		Length: 5
 		Tick: 150
+	icon: DATA.R8
+		Frames: 4014
+		Offset: -30,-24

 fremen:
 	stand: DATA.R8
@@ -291,6 +306,9 @@ fremen:
 		Start: 904
 		Length: 26
 		Tick: 1600
+	icon: DATA.R8
+		Start: 4032
+		Offset: -30,-24

 saboteur:
 	stand: DATA.R8
@@ -350,6 +368,9 @@ saboteur:
 		Start: 2359
 		Length: 26
 		Tick: 1600
+	icon: DATA.R8
+		Start: 4034
+		Offset: -30,-24

 sardaukar:
 	stand: DATA.R8
@@ -415,3 +436,6 @@ sardaukar:
 		Start: 1140
 		Length: 26
 		Tick: 1600
+	icon: DATA.R8
+		Start: 4015
+		Offset: -30,-24
--- a/mods/d2k/sequences/structures.yaml
+++ b/mods/d2k/sequences/structures.yaml
@@ -15,6 +15,9 @@ walla:
 		Frames: 2543, 2546, 2544, 2554, 2547, 2548, 2558, 2551, 2545, 2555, 2549, 2550, 2556, 2552, 2553, 2557
 		Length: 16
 		Offset: -16,16
+	icon: DATA.R8
+		Start: 4063
+		Offset: -30,-24

 wallh:
 	idle: DATA.R8
@@ -33,6 +36,9 @@ wallh:
 		Frames: 2703, 2706, 2704, 2714, 2707, 2708, 2718, 2711, 2705, 2715, 2709, 2710, 2716, 2712, 2713, 2717
 		Length: 16
 		Offset: -16,16
+	icon: DATA.R8
+		Start: 4064
+		Offset: -30,-24

 wallo:
 	idle: DATA.R8
@@ -51,6 +57,9 @@ wallo:
 		Frames: 2863, 2866, 2864, 2874, 2867, 2868, 2878, 2871, 2865, 2875, 2869, 2870, 2876, 2872, 2873, 2877
 		Length: 16
 		Offset: -16,16
+	icon: DATA.R8
+		Start: 4065
+		Offset: -30,-24

 guntowera:
 	idle: DATA.R8
@@ -73,6 +82,9 @@ guntowera:
 		Start: 2589
 		Facings: -32
 		Offset: -24,24
+	icon: DATA.R8
+		Start: 4069
+		Offset: -30,-24

 guntowerh:
 	idle: DATA.R8
@@ -95,6 +107,9 @@ guntowerh:
 		Start: 2749
 		Facings: -32
 		Offset: -24,24
+	icon: DATA.R8
+		Frames: 4070
+		Offset: -30,-24

 guntowero:
 	idle: DATA.R8
@@ -117,6 +132,9 @@ guntowero:
 		Start: 2909
 		Facings: -32
 		Offset: -24,24
+	icon: DATA.R8
+		Start: 4071
+		Offset: -30,-24

 rockettowera:
 	idle: DATA.R8
@@ -139,6 +157,9 @@ rockettowera:
 		Start: 2637
 		Facings: -32
 		Offset: -24,24
+	icon: DATA.R8
+		Start: 4075
+		Offset: -30,-24

 rockettowerh:
 	idle: DATA.R8
@@ -161,6 +182,9 @@ rockettowerh:
 		Start: 2828
 		Facings: -32
 		Offset: -24,24
+	icon: DATA.R8
+		Start: 4076
+		Offset: -30,-24

 rockettowero:
 	idle: DATA.R8
@@ -183,6 +207,9 @@ rockettowero:
 		Start: 2988
 		Facings: -32
 		Offset: -24,24
+	icon: DATA.R8
+		Start: 4077
+		Offset: -30,-24

 conyarda:
 	idle: DATA.R8
@@ -206,6 +233,9 @@ conyarda:
 	bib: bib3x # TODO: read this from BLOXBAT.R8
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4046
+		Offset: -30,-24

 repaira:
 	make: DATA.R8 # TODO: overlay
@@ -231,6 +261,9 @@ repaira:
 		Start: 2572
 		Offset: -48,48
 		ZOffset: -1c511
+	icon: DATA.R8
+		Start: 4096
+		Offset: -30,-24

 repairh:
 	make: DATA.R8 # TODO: overlay
@@ -256,6 +289,9 @@ repairh:
 		Start: 2732
 		Offset: -48,48
 		ZOffset: -1c511
+	icon: DATA.R8
+		Start: 4097
+		Offset: -30,-24

 repairo:
 	make: DATA.R8 # TODO: overlay
@@ -281,6 +317,9 @@ repairo:
 		Start: 2892
 		Offset: -48,48
 		ZOffset: -1c511
+	icon: DATA.R8
+		Start: 4098
+		Offset: -30,-24

 starporta:
 	idle: DATA.R8
@@ -307,6 +346,9 @@ starporta:
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4092
+		Offset: -30,-24

 pwra:
 	idle: DATA.R8
@@ -326,6 +368,9 @@ pwra:
 	bib: bib2x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4056
+		Offset: -30,-24

 barra:
 	idle: DATA.R8
@@ -341,6 +386,9 @@ barra:
 	bib: bib2x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4059
+		Offset: -30,-24

 radara:
 	idle: DATA.R8
@@ -360,6 +408,9 @@ radara:
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4072
+		Offset: -30,-24

 refa:
 	idle: DATA.R8
@@ -382,6 +433,9 @@ refa:
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4066
+		Offset: -30,-24

 siloa:
 	idle: DATA.R8
@@ -396,6 +450,9 @@ siloa:
 		Start: 4313
 		Length: 14
 		Offset: -16,16
+	icon: DATA.R8
+		Start: 4084
+		Offset: -30,-24

 hightecha:
 	idle: DATA.R8
@@ -415,6 +472,9 @@ hightecha:
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4078
+		Offset: -30,-24

 researcha:
 	idle: DATA.R8
@@ -434,6 +494,9 @@ researcha:
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4099
+		Offset: -30,-24

 researchh:
 	idle: DATA.R8
@@ -453,6 +516,9 @@ researchh:
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4100
+		Offset: -30,-24

 researcho:
 	idle: DATA.R8
@@ -472,6 +538,9 @@ researcho:
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4101
+		Offset: -30,-24

 palacea:
 	idle: DATA.R8
@@ -487,6 +556,9 @@ palacea:
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4102
+		Offset: -30,-24

 lighta:
 	idle: DATA.R8
@@ -521,6 +593,9 @@ lighta:
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4081
+		Offset: -30,-24

 heavya:
 	idle: DATA.R8
@@ -555,6 +630,9 @@ heavya:
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4087
+		Offset: -30,-24

 conyardh:
 	idle: DATA.R8
@@ -578,6 +656,9 @@ conyardh:
 	bib: bib3x # TODO: read this from BLOXBAT.R8
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4047
+		Offset: -30,-24

 starporth:
 	idle: DATA.R8
@@ -605,6 +686,9 @@ starporth:
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4093
+		Offset: -30,-24

 pwrh:
 	idle: DATA.R8
@@ -624,6 +708,9 @@ pwrh:
 	bib: bib2x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4057
+		Offset: -30,-24

 barrh:
 	idle: DATA.R8
@@ -639,6 +726,9 @@ barrh:
 	bib: bib2x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4060
+		Offset: -30,-24

 radarh:
 	idle: DATA.R8
@@ -658,6 +748,9 @@ radarh:
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4073
+		Offset: -30,-24

 refh:
 	idle: DATA.R8
@@ -680,6 +773,9 @@ refh:
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4067
+		Offset: -30,-24

 siloh:
 	idle: DATA.R8
@@ -694,6 +790,9 @@ siloh:
 		Start: 4313
 		Length: 14
 		Offset: -16,16
+	icon: DATA.R8
+		Start: 4085
+		Offset: -30,-24

 hightechh:
 	idle: DATA.R8
@@ -713,6 +812,9 @@ hightechh:
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4079
+		Offset: -30,-24

 palaceh:
 	idle: DATA.R8
@@ -736,6 +838,9 @@ palaceh:
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4103
+		Offset: -30,-24

 lighth:
 	idle: DATA.R8
@@ -770,6 +875,9 @@ lighth:
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4082
+		Offset: -30,-24

 heavyh:
 	idle: DATA.R8
@@ -804,6 +912,9 @@ heavyh:
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4088
+		Offset: -30,-24

 conyardo:
 	idle: DATA.R8
@@ -827,6 +938,9 @@ conyardo:
 	bib: bib3x # TODO: read this from BLOXBAT.R8
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4048
+		Offset: -30,-24

 starporto:
 	idle: DATA.R8
@@ -853,6 +967,9 @@ starporto:
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4094
+		Offset: -30,-24

 pwro:
 	idle: DATA.R8
@@ -873,6 +990,9 @@ pwro:
 	bib: bib2x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4058
+		Offset: -30,-24

 barro:
 	idle: DATA.R8
@@ -888,6 +1008,9 @@ barro:
 	bib: bib2x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4061
+		Offset: -30,-24

 radaro:
 	idle: DATA.R8
@@ -907,6 +1030,9 @@ radaro:
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4074
+		Offset: -30,-24

 refo:
 	idle: DATA.R8
@@ -929,6 +1055,9 @@ refo:
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4068
+		Offset: -30,-24

 siloo:
 	idle: DATA.R8
@@ -943,6 +1072,9 @@ siloo:
 		Start: 4313
 		Length: 14
 		Offset: -16,16
+	icon: DATA.R8
+		Start: 4086
+		Offset: -30,-24

 hightecho:
 	idle: DATA.R8
@@ -962,6 +1094,9 @@ hightecho:
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4080
+		Offset: -30,-24

 palaceo:
 	idle: DATA.R8
@@ -977,6 +1112,9 @@ palaceo:
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4104
+		Offset: -30,-24

 lighto:
 	idle: DATA.R8
@@ -1007,6 +1145,9 @@ lighto:
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4083
+		Offset: -30,-24

 heavyo:
 	idle: DATA.R8
@@ -1041,6 +1182,9 @@ heavyo:
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4089
+		Offset: -30,-24

 palacec: # TODO: unused
 	idle: DATA.R8
@@ -1052,6 +1196,8 @@ palacec: # TODO: unused
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: palacecicon
+		Start: 0

 starportc: # TODO: unused
 	idle: DATA.R8
@@ -1078,6 +1224,9 @@ starportc: # TODO: unused
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8 # TODO: blank
+		Start: 4020
+		Offset: -30,-24

 heavyc: # TODO: unused
 	idle: DATA.R8
@@ -1112,6 +1261,9 @@ heavyc: # TODO: unused
 	bib: bib3x
 		Start: 0
 		Length: *
+	icon: DATA.R8 # TODO: blank
+		Start: 4020
+		Offset: -30,-24

 conyardc: # TODO: unused
 	idle: DATA.R8
@@ -1135,8 +1287,17 @@ conyardc: # TODO: unused
 	bib: bib3x # TODO: read this from BLOXBAT.R8
 		Start: 0
 		Length: *
+	icon: DATA.R8
+		Start: 4049
+		Offset: -30,-24

 plates: # TODO: unused
 	idle: DATA.R8
 		Start: 3008
 		Length: 6
+	4-plates-icon: DATA.R8
+		Start: 4050
+		Offset: -30,-24
+	6-plates-icon: DATA.R8
+		Start: 4053
+		Offset: -30,-24
--- a/mods/d2k/sequences/vehicles.yaml
+++ b/mods/d2k/sequences/vehicles.yaml
@@ -2,6 +2,9 @@ dmcv:
 	idle: DATA.R8
 		Start: 1795
 		Facings: -32
+	icon: DATA.R8
+		Start: 4023
+		Offset: -30,-24

 harvester:
 	idle: DATA.R8
@@ -19,6 +22,9 @@ harvester:
 	dock-loop: DATA.R8
 		Start: 3380
 		Length: 1
+	icon: DATA.R8
+		Start: 4019
+		Offset: -30,-24

 trike:
 	idle: DATA.R8
@@ -30,6 +36,9 @@ trike:
 	muzzle: DATA.R8
 		Start: 3839
 		Facings: -32
+	icon: DATA.R8
+		Start: 4041
+		Offset: -30,-24

 quad:
 	idle: DATA.R8
@@ -41,6 +50,9 @@ quad:
 	muzzle: DATA.R8
 		Start: 3839
 		Facings: -32
+	icon: DATA.R8
+		Start: 4018
+		Offset: -30,-24

 siegetank:
 	idle: DATA.R8
@@ -49,16 +61,25 @@ siegetank:
 	turret: DATA.R8
 		Start: 1891
 		Facings: -32
+	icon: DATA.R8
+		Start: 4026
+		Offset: -30,-24

 missiletank:
 	idle: DATA.R8
 		Start: 1603
 		Facings: -32
+	icon: DATA.R8
+		Start: 4024
+		Offset: -30,-24

 sonictank:
 	idle: DATA.R8
 		Start: 1827
 		Facings: -32
+	icon: DATA.R8
+		Start: 4027
+		Offset: -30,-24

 combata:
 	idle: DATA.R8
@@ -67,6 +88,9 @@ combata:
 	turret: DATA.R8
 		Start: 1859
 		Facings: -32
+	icon: DATA.R8
+		Start: 4020
+		Offset: -30,-24

 combath:
 	idle: DATA.R8
@@ -75,6 +99,9 @@ combath:
 	turret: DATA.R8
 		Start: 2115
 		Facings: -32
+	icon: DATA.R8
+		Start: 4021
+		Offset: -30,-24

 devast:
 	idle: DATA.R8
@@ -84,6 +111,9 @@ devast:
 		Start: 3807
 		Length: 1
 		Facings: -32
+	icon: DATA.R8
+		Start: 4028
+		Offset: -30,-24

 combato:
 	idle: DATA.R8
@@ -92,6 +122,9 @@ combato:
 	turret: DATA.R8
 		Start: 2485
 		Facings: -32
+	icon: DATA.R8
+		Start: 4022
+		Offset: -30,-24

 raider:
 	idle: DATA.R8
@@ -103,8 +136,27 @@ raider:
 	muzzle: DATA.R8
 		Start: 3839
 		Facings: -32
+	icon: DATA.R8
+		Start: 4017
+		Offset: -30,-24
+
+stealthraider:
+	idle: DATA.R8
+		Start: 2421
+		Facings: -32
+	unload: DATA.R8
+		Start: 2421
+		Facings: -32
+	muzzle: DATA.R8
+		Start: 3839
+		Facings: -32
+	icon: raidersicon
+		Start: 0

 deviatortank:
 	idle: DATA.R8
 		Start: 2389
 		Facings: -32
+	icon: DATA.R8
+		Start: 4025
+		Offset: -30,-24