merge Dune 2000 "Rounded Edges" mod

Changes include: - bibs have been removed - building offset and selection boxes adapted - units and turrets leave husks - siege tank barrel won't rotate anymore - AI capable of building all units using all queues - bullet traces - windtrap animations - unit balance (mix of Dune II, Dune 2000 and Red Alert) - repair pad animation - no more obsessive "silos needed" - defense building queue → heavy armor queue - medics (using thumper graphics) - no buildable aircrafts anymore - harvesting has been slowed down
2012-11-17 13:02:20 +01:00
parent 7d4399d7cc
commit 96a088f998
101 changed files with 1797 additions and 1414 deletions
--- a/3
+++ b/3
@@ -20,9 +20,10 @@ Also thanks to:
 	* Igor Popov		(ihptru)
 	* James Dunne		(jsd)
 	* Jeff Harris		(jeff_1amstudios)
+	* Jes			(-Jes-)
 	* Joakim Lindberg	(booom3)
 	* Kenny Hoxworth	(hoxworth)
-	* Kyrre Soerensen   (zypres)
+	* Kyrre Soerensen	(zypres)
 	* Lawrence Wang
 	* Mark Olson		(markolson)
 	* Matthew Gatland	(mgatland)
--- a/mods/d2k/bits/90mm.shp
+++ b/mods/d2k/bits/90mm.shp
--- a/mods/d2k/bits/POWRDN1.aud
+++ b/mods/d2k/bits/POWRDN1.aud
--- a/mods/d2k/bits/POWRUP1.aud
+++ b/mods/d2k/bits/POWRUP1.aud
--- a/mods/d2k/bits/barra.shp
+++ b/mods/d2k/bits/barra.shp
--- a/mods/d2k/bits/barraicon.shp
+++ b/mods/d2k/bits/barraicon.shp
--- a/mods/d2k/bits/barramake.shp
+++ b/mods/d2k/bits/barramake.shp
--- a/mods/d2k/bits/barrh.shp
+++ b/mods/d2k/bits/barrh.shp
--- a/mods/d2k/bits/barrhicon.shp
+++ b/mods/d2k/bits/barrhicon.shp
--- a/mods/d2k/bits/barro.shp
+++ b/mods/d2k/bits/barro.shp
--- a/mods/d2k/bits/barroicon.shp
+++ b/mods/d2k/bits/barroicon.shp
--- a/mods/d2k/bits/bazook2.aud
+++ b/mods/d2k/bits/bazook2.aud
--- a/mods/d2k/bits/bazooka.shp
+++ b/mods/d2k/bits/bazooka.shp
--- a/mods/d2k/bits/deathhandmissile.shp
+++ b/mods/d2k/bits/deathhandmissile.shp
--- a/mods/d2k/bits/fire1.shp
+++ b/mods/d2k/bits/fire1.shp
--- a/mods/d2k/bits/fire2.shp
+++ b/mods/d2k/bits/fire2.shp
--- a/mods/d2k/bits/fire3.shp
+++ b/mods/d2k/bits/fire3.shp
--- a/mods/d2k/bits/fire4.shp
+++ b/mods/d2k/bits/fire4.shp
--- a/mods/d2k/bits/frigate.shp
+++ b/mods/d2k/bits/frigate.shp
--- a/mods/d2k/bits/guntower.shp
+++ b/mods/d2k/bits/guntower.shp
--- a/mods/d2k/bits/gunturret.shp
+++ b/mods/d2k/bits/gunturret.shp
--- a/mods/d2k/bits/harvester.shp
+++ b/mods/d2k/bits/harvester.shp
--- a/mods/d2k/bits/heavya.shp
+++ b/mods/d2k/bits/heavya.shp
--- a/mods/d2k/bits/heavyaicon.shp
+++ b/mods/d2k/bits/heavyaicon.shp
--- a/mods/d2k/bits/heavyc.shp
+++ b/mods/d2k/bits/heavyc.shp
--- a/mods/d2k/bits/heavyh.shp
+++ b/mods/d2k/bits/heavyh.shp
--- a/mods/d2k/bits/heavyhicon.shp
+++ b/mods/d2k/bits/heavyhicon.shp
--- a/mods/d2k/bits/heavymake.shp
+++ b/mods/d2k/bits/heavymake.shp
--- a/mods/d2k/bits/heavyo.shp
+++ b/mods/d2k/bits/heavyo.shp
--- a/mods/d2k/bits/heavyoicon.shp
+++ b/mods/d2k/bits/heavyoicon.shp
--- a/mods/d2k/bits/highmake.shp
+++ b/mods/d2k/bits/highmake.shp
--- a/mods/d2k/bits/hightecha.shp
+++ b/mods/d2k/bits/hightecha.shp
--- a/mods/d2k/bits/hightechaicon.shp
+++ b/mods/d2k/bits/hightechaicon.shp
--- a/mods/d2k/bits/hightechh.shp
+++ b/mods/d2k/bits/hightechh.shp
--- a/mods/d2k/bits/hightechhicon.shp
+++ b/mods/d2k/bits/hightechhicon.shp
--- a/mods/d2k/bits/hightecho.shp
+++ b/mods/d2k/bits/hightecho.shp
--- a/mods/d2k/bits/hightechoicon.shp
+++ b/mods/d2k/bits/hightechoicon.shp
--- a/mods/d2k/bits/lighta.shp
+++ b/mods/d2k/bits/lighta.shp
--- a/mods/d2k/bits/lightaicon.shp
+++ b/mods/d2k/bits/lightaicon.shp
--- a/mods/d2k/bits/lighth.shp
+++ b/mods/d2k/bits/lighth.shp
--- a/mods/d2k/bits/lighthicon.shp
+++ b/mods/d2k/bits/lighthicon.shp
--- a/mods/d2k/bits/lightmake.shp
+++ b/mods/d2k/bits/lightmake.shp
--- a/mods/d2k/bits/lighto.shp
+++ b/mods/d2k/bits/lighto.shp
--- a/mods/d2k/bits/lightoicon.shp
+++ b/mods/d2k/bits/lightoicon.shp
--- a/mods/d2k/bits/palacea.shp
+++ b/mods/d2k/bits/palacea.shp
--- a/mods/d2k/bits/palaceaicon.shp
+++ b/mods/d2k/bits/palaceaicon.shp
--- a/mods/d2k/bits/palacec.shp
+++ b/mods/d2k/bits/palacec.shp
--- a/mods/d2k/bits/palaceh.shp
+++ b/mods/d2k/bits/palaceh.shp
--- a/mods/d2k/bits/palacehicon.shp
+++ b/mods/d2k/bits/palacehicon.shp
--- a/mods/d2k/bits/palaceo.shp
+++ b/mods/d2k/bits/palaceo.shp
--- a/mods/d2k/bits/palaceoicon.shp
+++ b/mods/d2k/bits/palaceoicon.shp
--- a/mods/d2k/bits/parach.shp
+++ b/mods/d2k/bits/parach.shp
--- a/mods/d2k/bits/pwra.shp
+++ b/mods/d2k/bits/pwra.shp
--- a/mods/d2k/bits/pwraicon.shp
+++ b/mods/d2k/bits/pwraicon.shp
--- a/mods/d2k/bits/pwrh.shp
+++ b/mods/d2k/bits/pwrh.shp
--- a/mods/d2k/bits/pwrhicon.shp
+++ b/mods/d2k/bits/pwrhicon.shp
--- a/mods/d2k/bits/pwro.shp
+++ b/mods/d2k/bits/pwro.shp
--- a/mods/d2k/bits/pwroicon.shp
+++ b/mods/d2k/bits/pwroicon.shp
--- a/mods/d2k/bits/radaraicon.shp
+++ b/mods/d2k/bits/radaraicon.shp
--- a/mods/d2k/bits/radarhicon.shp
+++ b/mods/d2k/bits/radarhicon.shp
--- a/mods/d2k/bits/radaroicon.shp
+++ b/mods/d2k/bits/radaroicon.shp
--- a/mods/d2k/bits/refa.shp
+++ b/mods/d2k/bits/refa.shp
--- a/mods/d2k/bits/refaicon.shp
+++ b/mods/d2k/bits/refaicon.shp
--- a/mods/d2k/bits/refh.shp
+++ b/mods/d2k/bits/refh.shp
--- a/mods/d2k/bits/refhicon.shp
+++ b/mods/d2k/bits/refhicon.shp
--- a/mods/d2k/bits/refmake.shp
+++ b/mods/d2k/bits/refmake.shp
--- a/mods/d2k/bits/refo.shp
+++ b/mods/d2k/bits/refo.shp
--- a/mods/d2k/bits/refoicon.shp
+++ b/mods/d2k/bits/refoicon.shp
--- a/mods/d2k/bits/repair.shp
+++ b/mods/d2k/bits/repair.shp
--- a/mods/d2k/bits/repairicon.shp
+++ b/mods/d2k/bits/repairicon.shp
--- a/mods/d2k/bits/research.shp
+++ b/mods/d2k/bits/research.shp
--- a/mods/d2k/bits/researchicon.shp
+++ b/mods/d2k/bits/researchicon.shp
--- a/mods/d2k/bits/rifle.aud
+++ b/mods/d2k/bits/rifle.aud
--- a/mods/d2k/bits/rifledeath.shp
+++ b/mods/d2k/bits/rifledeath.shp
--- a/mods/d2k/bits/rockettower.shp
+++ b/mods/d2k/bits/rockettower.shp
--- a/mods/d2k/bits/rocketturret.shp
+++ b/mods/d2k/bits/rocketturret.shp
--- a/mods/d2k/bits/turret1.aud
+++ b/mods/d2k/bits/turret1.aud
--- a/mods/d2k/bits/vulcan.aud
+++ b/mods/d2k/bits/vulcan.aud
--- a/mods/d2k/bits/wall.shp
+++ b/mods/d2k/bits/wall.shp
--- a/mods/d2k/bits/wtrpmake.shp
+++ b/mods/d2k/bits/wtrpmake.shp
--- a/mods/d2k/chrome.yaml
+++ b/mods/d2k/chrome.yaml
@@ -127,19 +127,19 @@ digits-ordos: chrome-ordos.png

 tabs-selected: tabs.png
 	atreides-Building: 0,0,27,41
-	atreides-Defense: 0,40,27,41
+	atreides-Armor: 0,40,27,41
 	atreides-Infantry: 0,80,27,41
 	atreides-Vehicle: 0,120,27,41
 	atreides-Aircraft: 0,160,27,41
 	atreides-Starport: 0,200,27,41
 	harkonnen-Building: 80,0,27,41
-	harkonnen-Defense: 80,40,27,41
+	harkonnen-Armor: 80,40,27,41
 	harkonnen-Infantry: 80,80,27,41
 	harkonnen-Vehicle: 80,120,27,41
 	harkonnen-Aircraft: 80,160,27,41
 	harkonnen-Starport: 80,200,27,41
 	ordos-Building: 160,0,27,41
-	ordos-Defense: 160,40,27,41
+	ordos-Armor: 160,40,27,41
 	ordos-Infantry: 160,80,27,41
 	ordos-Vehicle: 160,120,27,41
 	ordos-Aircraft: 160,160,27,41
@@ -147,19 +147,19 @@ tabs-selected: tabs.png

 tabs-ready: tabs.png
 	atreides-Building: 27,0,27,41
-	atreides-Defense: 27,40,27,41
+	atreides-Armor: 27,40,27,41
 	atreides-Infantry: 27,80,27,41
 	atreides-Vehicle: 27,120,27,41
 	atreides-Aircraft: 27,160,27,41
 	atreides-Starport: 27,200,27,41
 	harkonnen-Building: 107,0,27,41
-	harkonnen-Defense: 107,40,27,41
+	harkonnen-Armor: 107,40,27,41
 	harkonnen-Infantry: 107,80,27,41
 	harkonnen-Vehicle: 107,120,27,41
 	harkonnen-Aircraft: 107,160,27,41
 	harkonnen-Starport: 107,200,27,41
 	ordos-Building: 187,0,27,41
-	ordos-Defense: 187,40,27,41
+	ordos-Armor: 187,40,27,41
 	ordos-Infantry: 187,80,27,41
 	ordos-Vehicle: 187,120,27,41
 	ordos-Aircraft: 187,160,27,41
@@ -167,19 +167,19 @@ tabs-ready: tabs.png

 tabs-normal: tabs.png
 	atreides-Building: 54,0,27,41
-	atreides-Defense: 54,40,27,41
+	atreides-Armor: 54,40,27,41
 	atreides-Infantry: 54,80,27,41
 	atreides-Vehicle: 54,120,27,41
 	atreides-Aircraft: 54,160,27,41
 	atreides-Starport: 54,200,27,41
 	harkonnen-Building: 134,0,27,41
-	harkonnen-Defense: 134,40,27,41
+	harkonnen-Armor: 134,40,27,41
 	harkonnen-Infantry: 134,80,27,41
 	harkonnen-Vehicle: 134,120,27,41
 	harkonnen-Aircraft: 134,160,27,41
 	harkonnen-Starport: 134,200,27,41
 	ordos-Building: 214,0,27,41
-	ordos-Defense: 214,40,27,41
+	ordos-Armor: 214,40,27,41
 	ordos-Infantry: 214,80,27,41
 	ordos-Vehicle: 214,120,27,41
 	ordos-Aircraft: 214,160,27,41
--- a/mods/d2k/cursors.yaml
+++ b/mods/d2k/cursors.yaml
@@ -1,4 +1,4 @@
-ShadowIndex: 1
+ShadowIndex: 1

 Palettes:
 	cursor: cursor.pal
@@ -189,6 +189,16 @@ Cursors:
 			length: 8
 			x: 12
 			y: 12
+		heal:
+			start:72
+			length: 8
+			x: 12
+			y: 12
+		heal-minimap:
+			start:72
+			length: 8
+			x: 12
+			y: 12

 # Cursors that need minimap variants
 		deploy:
--- a/mods/d2k/maps/DeathDepths.oramap
+++ b/mods/d2k/maps/DeathDepths.oramap
--- a/mods/d2k/maps/DeathDepths2.oramap
+++ b/mods/d2k/maps/DeathDepths2.oramap
--- a/mods/d2k/maps/blank.oramap
+++ b/mods/d2k/maps/blank.oramap
--- a/mods/d2k/maps/the-duell.oramap
+++ b/mods/d2k/maps/the-duell.oramap
--- a/mods/d2k/maps/venac-ditch.oramap
+++ b/mods/d2k/maps/venac-ditch.oramap
--- a/mods/d2k/rules/aircraft.yaml
+++ b/mods/d2k/rules/aircraft.yaml
@@ -1,8 +1,5 @@
 ^CARRYALL:
 	Inherits: ^Helicopter
-	Buildable:
-		Queue: Aircraft
-		BuildPaletteOrder: 110
 	Valued:
 		Cost: 1200
 	Tooltip:
@@ -10,19 +7,25 @@
 		Description: Fast drop ship.\n  Unarmed
 		Icon: carryallicon
 	Health:
-		HP: 500
+		HP: 250
 	Armor: 
 		Type: Light
 	RevealsShroud:
 		Range: 12
 	Helicopter:
 		InitialFacing: 0
-		ROT: 5
-		Speed: 18
+		ROT: 4
+		Speed: 20
 		LandableTerrainTypes: Sand, Rock, Transition, Spice, Dune
-		RepairBuildings: repaira,repairo,repairh
+		RepairBuildings: repair
 		RearmBuildings: starporta,starporto,starporth
 		MinimalLandAltitude: 25
+	SmokeTrailWhenDamaged@0:
+		Offset: 15, -12
+		Interval: 3
+	SmokeTrailWhenDamaged@1:
+		Offset: -15, -12
+		Interval: 3
 	RenderUnit:
 	RenderCargo:
 		RelativeAltitude: 20
@@ -35,7 +38,7 @@
 	FallsToEarth:
 		Spins: no
 		Moves: yes
-		Explosion: UnitExplode
+		Explosion: UnitExplodeScale

 FRIGATE:
 	ParaDrop:
@@ -46,18 +49,20 @@ FRIGATE:
 		Description: Supply spacecraft
 	Plane:
 		ROT: 5
-		Speed: 35
-		RepairBuildings: repaira,repairo,repairh
+		Speed: 30
+		RepairBuildings: repair
 		RearmBuildings: starporta,starporto,starporth
 	Health:
-		HP: 25
+		HP: 500
+	-TargetableAircraft:
+	-AppearsOnRadar:
 	Armor:
 		Type: Heavy
 	RenderUnit:
 		Image: frigate
 	WithShadow:
 	Cargo:
-		MaxWeight: 10
+		MaxWeight: 20
 		PipCount: 10
 	Invulnerable:
 	-Selectable:
@@ -66,12 +71,6 @@ FRIGATE:

 ORNI:
 	Inherits: ^Helicopter
-	Buildable:
-		Queue: Aircraft
-		BuildPaletteOrder: 90
-		Prerequisites: researcha
-		BuiltAt: hightecha
-		Owner: atreides
 	Valued:
 		Cost: 1000
 	Tooltip:
@@ -90,9 +89,9 @@ ORNI:
 	Helicopter:
 		LandWhenIdle: false
 		InitialFacing: 20
-		ROT: 4
-		Speed: 20
-		RepairBuildings: repaira,repairo,repairh
+		ROT: 6
+		Speed: 30
+		RepairBuildings: repair
 		RearmBuildings: starporta,starporto,starporth
 	RenderUnit:
 	WithShadow:
@@ -100,8 +99,8 @@ ORNI:
 		Bounds: 38,32,0,0
 	FallsToEarth:
 		Spins: no
-		Moves: no
-		Explosion: UnitExplode
+		Moves: yes
+		Explosion: UnitExplodeScale
 	SmokeTrailWhenDamaged:
 		Offset: 0,-10

@@ -111,16 +110,16 @@ ORNI.bomber:
 		Weapon: Napalm
 	Inherits: ^Plane
 	Health:
-		HP: 60
+		HP: 100
 	Armor:
 		Type: Light
 	Plane:
 		ROT: 5
-		Speed: 25
-		RepairBuildings: repaira,repairo,repairh
+		Speed: 35
+		RepairBuildings: repair
 		RearmBuildings: starporta,starporto,starporth
 	LimitedAmmo:
-		Ammo: 8
+		Ammo: 5
 	RenderUnit:
 		Image: orni
 	WithShadow:
@@ -131,23 +130,29 @@ ORNI.bomber:
 	FallsToEarth:
 		Spins: no
 		Moves: yes
-		Explosion: UnitExplode
+		Explosion: UnitExplodeScale
 	SmokeTrailWhenDamaged:
 		Offset: 0,-10

 CARRYALL.infantry:
 	ParaDrop:
-		LZRange: 4
+		LZRange: 5
 	Inherits: ^Plane
 	Health:
-		HP: 60
+		HP: 200
 	Armor:
 		Type: Light
 	Plane:
-		ROT: 5
+		ROT: 4
 		Speed: 25
-		RepairBuildings: repaira,repairo,repairh
+		RepairBuildings: repair
 		RearmBuildings: starporta,starporto,starporth
+	SmokeTrailWhenDamaged@0:
+		Offset: 15, -12
+		Interval: 3
+	SmokeTrailWhenDamaged@1:
+		Offset: -15, -12
+		Interval: 3
 	RenderUnit:
 		Image: carryall
 	WithShadow:
@@ -161,4 +166,11 @@ CARRYALL.infantry:
 	FallsToEarth:
 		Spins: no
 		Moves: yes
-		Explosion: UnitExplode
+		Explosion: UnitExplodeScale
+
+BADR:
+	Inherits: CARRYALL.infantry
+	ParaDrop:
+		LZRange: 4
+	Tooltip:
+		Name: Crate Carryall
--- a/mods/d2k/rules/atreides.yaml
+++ b/mods/d2k/rules/atreides.yaml
@@ -13,24 +13,6 @@ PWRA:
 		Prerequisites: conyarda
 		Owner: atreides

-GUNTOWERA:
-	Inherits: ^GUNTOWER
-	Buildable:
-		Prerequisites: conyarda
-		Owner: atreides
-
-ROCKETTOWERA:
-	Inherits: ^ROCKETTOWER
-	Buildable:
-		Prerequisites: radara
-		Owner: atreides
-
-WALLA:
-	Inherits: ^WALL
-	Buildable:
-		Prerequisites: conyarda
-		Owner: atreides
-
 REFA:
 	Inherits: ^REFINERY
 	Buildable:
@@ -38,111 +20,32 @@ REFA:
 		Owner: atreides
 	RenderBuildingWarFactory:
 		Image: REFA
-	FreeActor:
-		Actor: HARVESTERA
-		InitialActivity: FindResources
-		SpawnOffset: 1,2
-		Facing: 64
-
-HARVESTERA:
-	Inherits: ^HARVESTER
-	Buildable:
-		Prerequisites: heavya,refa
-		Owner: atreides
-		BuiltAt: heavya
-	RenderUnit:
-		Image: HARVESTER
-
-HARVESTERA.starport:
-	Inherits: HARVESTERA
-	Buildable:
-		Queue: Starport
-		BuiltAt: starporta
-	Valued:
-		Cost: 895

 TRIKEA:
 	Inherits: ^TRIKE
 	Buildable:
-		Prerequisites: lighta
-		Owner: atreides
-		BuiltAt: lighta
+		Prerequisites: Light Factory#lighta
+		Owner: atreides, harkonnen
+		BuiltAt: lighta, lighth
 	RenderUnit:
 		Image: TRIKE

 TRIKEA.starport:
 	Inherits: TRIKEA
 	Buildable:
+		Owner: atreides, harkonnen, ordos
 		Queue: Starport
-		BuiltAt: starporta
+		BuiltAt: starporta, starporth, starporto
 	Valued:
 		Cost: 149

-QUADA:
-	Inherits: ^QUAD
-	Buildable:
-		Prerequisites: lighta
-		Owner: atreides
-		BuiltAt: lighta
-	RenderUnit:
-		Image: QUAD
-
-QUADA.starport:
-	Inherits: QUADA
-	Buildable:
-		Queue: Starport
-		BuiltAt: starporta
-	Valued:
-		Cost: 295
-
-SIEGETANKA:
-	Inherits: ^SIEGETANK
-	Buildable:
-		Prerequisites: heavya, radara
-		Owner: atreides
-		BuiltAt: heavya
-	RenderUnitTurreted:
-		Image: SIEGETANK
-
-SIEGETANKA.starport:
-	Inherits: SIEGETANKA
-	Buildable:
-		Queue: Starport
-		BuiltAt: starporta
-	Valued:
-		Cost: 495
-
-MISSILETANKA:
-	Inherits: ^MISSILETANK
-	Buildable:
-		Prerequisites: heavya
-		Owner: atreides
-		BuiltAt: heavya
-	RenderUnit:
-		Image: MISSILETANK
-
-MISSILETANKA.starport:
-	Inherits: MISSILETANKA
-	Buildable:
-		Queue: Starport
-		BuiltAt: starporta
-	Valued:
-		Cost: 599
-
 CARRYALLA:
 	Inherits: ^CARRYALL
-	Buildable:
-		Prerequisites: hightecha
-		BuiltAt: hightecha
-		Owner: atreides
 	RenderUnit:
 		Image: CARRYALL

 CARRYALLA.starport:
 	Inherits: CARRYALLA
-	Buildable:
-		Queue: Starport
-		BuiltAt: starporta
 	Valued:
 		Cost: 999

@@ -159,22 +62,16 @@ HIGHTECHA:
 		Prerequisites: radara
 		Owner: atreides

-RESEARCHA:
-	Inherits: ^RESEARCH
-	Buildable:
-		Prerequisites: radara,heavya
-		Owner: atreides
-
 PALACEA:
 	Inherits: ^PALACE
 	Buildable:
-		Prerequisites: researcha
+		Prerequisites: hightecha
 		Owner: atreides
 	AirstrikePower:
 		Image: orniicon
 		Description: Air Strike
 		ChargeTime: 180
-		LongDesc: Ornithopter drops a load of parachuted\nbombs on your target.
+		LongDesc: Ornithopter drops a load of parachuted\nbombs on your target
 		UnitType: orni.bomber
 		SelectTargetSound: 
 		FlareType:
@@ -213,23 +110,17 @@ RADARA:
 STARPORTA:
 	Inherits: ^STARPORT
 	Buildable:
-		Prerequisites: radara
-		Owner: atreides
-
-REPAIRA:
-	Inherits: ^REPAIR
-	Buildable:
-		Prerequisites: heavya
+		Prerequisites: heavya,hightecha
 		Owner: atreides

 MCVA:
 	Inherits: ^MCV
 	Buildable:
-		Prerequisites: heavya,repaira
+		Prerequisites: heavya,repair
 		Owner: atreides
 		BuiltAt: heavya
 	Transforms:
-		Facing: 10
+		Facing: 16
 		IntoActor: conyarda
 		Offset:-1,-1
 		NoTransformSounds: AI_DPLOY.AUD
@@ -252,8 +143,22 @@ COMBATA:
 		Prerequisites: heavya
 		Owner: atreides
 		BuiltAt: heavya
+	AttackTurreted:
+		PrimaryWeapon: 90mma
+		PrimaryRecoil: 4
+		PrimaryRecoilRecovery: 0.8
+		PrimaryLocalOffset: 0,-2,0,-3,0
 	RenderUnitTurreted:
 		Image: COMBATA
+	LeavesHusk:
+		HuskActor: Combata.Husk
+
+COMBATA.Husk:
+	Inherits: ^COMBAT.Husk
+	Tooltip:
+		Icon: combataicon
+	RenderUnit:
+		Image: COMBATA

 COMBATA.starport:
 	Inherits: COMBATA
@@ -261,38 +166,53 @@ COMBATA.starport:
 		Queue: Starport
 		BuiltAt: starporta
 	Valued:
-		Cost: 595
+		Cost: 489

 SONICTANK:
 	Inherits: ^Vehicle
 	Buildable:
-		Queue: Vehicle
+		Queue: Armor
 		BuildPaletteOrder: 100
-		Prerequisites: heavya,researcha
+		Prerequisites: heavya,research
 		Owner: atreides
 		BuiltAt: heavya
+		Hotkey: o
 	Valued:
-		Cost: 1500
+		Cost: 1100
 	Tooltip:
 		Name: Sonic Tank
-		Description: Fires a sound wave\n Strong vs Infantry.\n Weak vs Tanks
+		Description: Fires sonic shocks\n  Strong vs Infantry, Vehicles\n  Weak vs Artillery, Aircraft
 		Icon: sonictankicon
 	Selectable:
 		Bounds: 30,30
 	Health:
-		HP: 150
+		HP: 130
 	Armor:
 		Type: Light
 	Mobile:
-		Speed: 8
+		ROT: 3
+		Speed: 7
 	RevealsShroud:
-		Range: 7
+		Range: 6
 	RenderUnit:
 		Image: SONICTANK
 	AttackFrontal:
 		PrimaryWeapon: TTankZap
-		PrimaryOffset: 0,0,0,-5
+		PrimaryLocalOffset: 0,-15,0,-10,0
 	AutoTarget:
+		InitialStance: Defend
+	Explodes:
+		Weapon: UnitExplodeSmall
+		EmptyWeapon: UnitExplodeSmall
+	LeavesHusk:
+		HuskActor: Sonictank.Husk
+
+SONICTANK.Husk:
+	Inherits: ^Husk
+	Tooltip:
+		Icon: sonictankicon
+	RenderUnit:
+		Image: SONICTANK

 FREMEN:
 	Inherits: ^Infantry
@@ -300,31 +220,32 @@ FREMEN:
 		Cost: 800
 	Tooltip:
 		Name: Fremen
-		Description: Elite sniper infantry unit.\n  Strong vs Infantry\n  Weak vs Vehicles\n  Special Ability: Invisible
+		Description: Elite sniper infantry unit\n  Strong vs Infantry\n  Weak vs Vehicles\n  Special Ability: Invisible
 	Buildable:
 		Queue: Infantry
-		BuildPaletteOrder: 50
+		BuildPaletteOrder: 85
 		Owner: atreides
 		Prerequisites: palacea
+		Hotkey: f
 	Selectable:
 		Bounds: 12,17,0,0
 		Voice: FremenVoice
 	Mobile:
 		Speed: 5
 	Health:
-		HP: 200
+		HP: 70
 	Passenger:
 	RevealsShroud:
-		Range: 6
+		Range: 7
 	AutoTarget:
-		ScanRadius: 5
+		ScanRadius: 7
 	AttackFrontal:
 		PrimaryWeapon: Sniper
 	RenderInfantryProne:
 	-RenderInfantry:
 	TakeCover:
 	Cloak:
-		InitialDelay: 125
-		CloakDelay: 125
-		CloakSound: STEALTH1.aud
-		UncloakSound: STEALTH2.aud
+		InitialDelay: 250
+		CloakDelay: 250
+		CloakSound: 
+		UncloakSound: 
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -1,15 +1,15 @@
 ^Vehicle:
 	AppearsOnRadar:
 	Mobile:
-		Crushes: crate, worm
+		Crushes: crate
 		TerrainSpeeds:
 			Sand: 80
-			Rock: 90
+			Rock: 80
 			Transition: 85
 			Concrete: 100
 			Spice: 70
 			SpiceBlobs: 70
-			Dune: 40
+			Dune: 50
 		ROT: 5
 	SelectionDecorations:
 	Selectable: 
@@ -35,14 +35,16 @@
 	ProximityCaptor:
 		Types:Vehicle
 	GivesBounty:
-	WithSmoke:
+	#WithSmoke:
 	Repairable:
-		RepairBuildings: repaira,repairh,repairo
+		RepairBuildings: repair
+	DetectCloaked:
+		Range: 1

 ^Tank:
 	AppearsOnRadar:
 	Mobile:
-		Crushes: crate, worm
+		Crushes: crate
 		TerrainSpeeds:
 			Sand: 80
 			Rock: 90
@@ -76,9 +78,41 @@
 	ProximityCaptor:
 		Types:Tank
 	GivesBounty:
-	WithSmoke:
+	#WithSmoke:
 	Repairable:
-		RepairBuildings: repaira,repairh,repairo
+		RepairBuildings: repair
+
+^Husk:
+	Health:
+		HP: 75
+	Armor: 
+		Type: Light
+	Husk:
+	HiddenUnderFog:
+	AppearsOnRadar:
+	Burns:
+		Interval: 7
+	ProximityCaptor:
+		Types:Husk
+	Tooltip:
+		Name: Destroyed Tank
+
+^TowerHusk:
+	Health:
+		HP: 125
+	Armor: 
+		Type: Concrete
+	Husk:
+	AppearsOnRadar:
+	HiddenUnderFog:
+	Burns:
+		Interval: 7
+	EditorAppearance:
+		RelativeToTopLeft: yes
+	Tooltip:
+		Name: Destroyed Tower
+	ProximityCaptor:
+		Types:Husk

 ^Infantry:
 	AppearsOnRadar:
@@ -96,10 +130,10 @@
 			Rock: 90
 			Transition: 85
 			Concrete: 100
-			Spice: 70
+			Spice: 80
 			SpiceBlobs: 70
-			Dune: 40
-			Rough: 60
+			Dune: 60
+			Rough: 65
 	SelectionDecorations:
 	Selectable:
 		Voice: InfantryVoice
@@ -107,6 +141,7 @@
 		TargetTypes: Ground
 	RenderInfantry:
 	AutoTarget:
+		InitialStance: Defend
 	AttackMove:
 	Passenger:
 		CargoType: Infantry
@@ -128,7 +163,12 @@
 		Types:Infantry
 	GivesBounty:
 	CrushableInfantry:
-		CrushSound:
+		CrushSound: squishy2.aud
+	RepairableNear:
+		Buildings: barra, barro
+		CloseEnough: 1
+	DetectCloaked:
+		Range: 2

 ^Plane:
 	AppearsOnRadar:
@@ -167,7 +207,7 @@
 	AppearsOnRadar:
 	SelectionDecorations:
 	Selectable:
-		Priority: 3
+		Priority: 2
 	TargetableBuilding:
 		TargetTypes: Ground
 	Building:
@@ -176,6 +216,7 @@
 		TerrainTypes: Rock, Concrete
 		BuildSounds: BUILD1.aud
 		SellSounds: BUILD1.aud
+		Adjacent: 3
 	GivesBuildableArea:
 	Capturable:
 	CapturableBar:
@@ -186,10 +227,10 @@
 	WithBuildingExplosion:
 	RepairableBuilding:
 	EmitInfantryOnSell:
-		ActorTypes: rifle,rifle,rifle,bazooka,bazooka,engineer
+		ActorTypes: rifle,rifle,rifle,rifle,rifle,bazooka,bazooka,bazooka,engineer
 	MustBeDestroyed:
 	GivesExperience:
-#	FrozenUnderFog:
+	FrozenUnderFog:
 	CaptureNotification@Atreides:
 		Race: atreides
 		Notification: AI_CAPT.AUD
@@ -210,7 +251,7 @@
 		Notification: OI_BLOST.AUD
 	EditorAppearance:
 		RelativeToTopLeft: yes
-	AutoTargetIgnore:
+	#AutoTargetIgnore:
 	ShakeOnDeath:
 	ProximityCaptor:
 		Types:Building
--- a/mods/d2k/rules/harkonnen.yaml
+++ b/mods/d2k/rules/harkonnen.yaml
@@ -20,106 +20,49 @@ REFH:
 		Owner: harkonnen
 	RenderBuildingWarFactory:
 		Image: REFH
-	FreeActor:
-		Actor: HARVESTERH
-		InitialActivity: FindResources
-		SpawnOffset: 1,2
-		Facing: 64

-HARVESTERH:
-	Inherits: ^HARVESTER
-	Buildable:
-		Prerequisites: heavyh,refh
-		Owner: harkonnen
-	RenderUnit:
-		Image: HARVESTER
+#TRIKEH:
+#	Inherits: ^TRIKE
+#	Buildable:
+#		Prerequisites: lighth
+#		Owner: harkonnen
+#		BuiltAt: lighth
+#	Valued:
+#		Cost: 250
+#	Tooltip:
+#		Name: Scout Quad
+#		Description: Heavy Scout\n Strong vs Infantry
+#		Icon: quadicon
+#	Health:
+#		HP: 125
+#	Mobile:
+#		ROT: 9
+#		Speed: 11
+#	AttackFrontal:
+#		PrimaryWeapon: M60mg
+#		PrimaryLocalOffset: 0,-1,0,-3,0
+#	RenderUnit:
+#		Image: QUAD

-HARVESTERH.starport:
-	Inherits: HARVESTERH
-	Buildable:
-		Queue: Starport
-		BuiltAt: starporth
-	Valued:
-		Cost: 895
-
-TRIKEH:
-	Inherits: ^TRIKE
-	Buildable:
-		Prerequisites: lighth
-		Owner: harkonnen
-	RenderUnit:
-		Image: TRIKE
-
-TRIKEH.starport:
-	Inherits: TRIKEH
-	Buildable:
-		Queue: Starport
-		BuiltAt: starporth
-	Valued:
-		Cost: 149
-
-QUADH:
-	Inherits: ^QUAD
-	Buildable:
-		Prerequisites: lighth
-		Owner: harkonnen
-	RenderUnit:
-		Image: QUAD
-
-QUADH.starport:
-	Inherits: QUADH
-	Buildable:
-		Queue: Starport
-		BuiltAt: starporth
-	Valued:
-		Cost: 295
-
-SIEGETANKH:
-	Inherits: ^SIEGETANK
-	Buildable:
-		Prerequisites: heavyh, radarh
-		Owner: harkonnen
-	RenderUnitTurreted:
-		Image: SIEGETANK
-
-SIEGETANKH.starport:
-	Inherits: SIEGETANKH
-	Buildable:
-		Queue: Starport
-		BuiltAt: starporta
-	Valued:
-		Cost: 495
-
-MISSILETANKH:
-	Inherits: ^MISSILETANK
-	Buildable:
-		Prerequisites: heavyh
-		Owner: harkonnen
-	RenderUnit:
-		Image: MISSILETANK
-
-MISSILETANKH.starport:
-	Inherits: MISSILETANKH
-	Buildable:
-		Queue: Starport
-		BuiltAt: starporth
-	Valued:
-		Cost: 599
+#TRIKEH.starport:
+#	Inherits: ^TRIKE
+#	Buildable:
+#		Prerequisites: lighth
+#		Owner: harkonnen
+#		Queue: Starport
+#		BuiltAt: starporth
+#	Valued:
+#		Cost: 149
+#	RenderUnit:
+#		Image: TRIKE

 CARRYALLH:
 	Inherits: ^CARRYALL
-	Buildable:
-		Prerequisites: hightechh
-		BuiltAt: hightechh
-		Owner: harkonnen
 	RenderUnit:
 		Image: CARRYALL

 CARRYALLH.starport:
 	Inherits: CARRYALLH
-	Buildable:
-		Queue: Starport
-		BuiltAt: starporth
 	Valued:
 		Cost: 999

@@ -128,24 +71,7 @@ BARRH:
 	Buildable:
 		Prerequisites: pwrh
 		Owner: harkonnen
-
-GUNTOWERH:
-	Inherits: ^GUNTOWER
-	Buildable:
-		Prerequisites: conyardh
-		Owner: harkonnen
-
-ROCKETTOWERH:
-	Inherits: ^ROCKETTOWER
-	Buildable:
-		Prerequisites: radarh
-		Owner: harkonnen
-
-WALLH:
-	Inherits: ^WALL
-	Buildable:
-		Prerequisites: conyardh
-		Owner: harkonnen
+	-RepairsUnits:

 HIGHTECHH:
 	Inherits: ^HIGHTECH
@@ -153,28 +79,24 @@ HIGHTECHH:
 		Prerequisites: radarh
 		Owner: harkonnen

-RESEARCHH:
-	Inherits: ^RESEARCH
-	Buildable:
-		Prerequisites: radarh,heavyh
-		Owner: harkonnen
-
 PALACEH:
 	Inherits: ^PALACE
 	Buildable:
-		Prerequisites: researchh
+		Prerequisites: hightechh
 		Owner: harkonnen
+	Tooltip:
+		Description: Provides elite infantry\n  Special Ability: Death Hand Missile
 	NukePower:
 		Image: deathhandicon
 		ChargeTime: 540
 		Description: Death Hand
-		LongDesc: Launches a nuclear missile at a target location.
+		LongDesc: Launches a nuclear missile at a target location
 		BeginChargeSound: HI_PREP.AUD
 		EndChargeSound: HI_DHRDY.AUD
 		SelectTargetSound: 
-		LaunchSound: HI_LAUNC.AUD
+		LaunchSound:
 		MissileWeapon: atomic
-		SpawnOffset: 10,0
+		SpawnOffset: 28,12
 	CanPowerDown:
 	RequiresPower:
 	SupportPowerChargeBar:
@@ -210,22 +132,17 @@ RADARH:
 STARPORTH:
 	Inherits: ^STARPORT
 	Buildable:
-		Prerequisites: radarh
-		Owner: harkonnen
-
-REPAIRH:
-	Inherits: ^REPAIR
-	Buildable:
-		Prerequisites: heavyh
+		Prerequisites: radarh,hightechh
 		Owner: harkonnen

 MCVH:
 	Inherits: ^MCV
 	Buildable:
-		Prerequisites: heavyh,repairh
+		Prerequisites: heavyh,repair
 		Owner: harkonnen
+		BuiltAt: heavyh
 	Transforms:
-		Facing: 10
+		Facing: 16
 		IntoActor: conyardh
 		Offset:-1,-1
 		NoTransformSounds: HI_DPLOY.AUD
@@ -247,8 +164,20 @@ COMBATH:
 	Buildable:
 		Prerequisites: heavyh
 		Owner: harkonnen
+		BuiltAt: heavyh
+	Health:
+		HP: 400
 	RenderUnitTurreted:
 		Image: COMBATH
+	LeavesHusk:
+		HuskActor: Combath.Husk
+
+COMBATH.Husk:
+	Inherits: ^COMBAT.Husk
+	Tooltip:
+		Icon: combathicon
+	RenderUnit:
+		Image: COMBATH

 COMBATH.starport:
 	Inherits: COMBATH
@@ -256,61 +185,76 @@ COMBATH.starport:
 		Queue: Starport
 		BuiltAt: starporth
 	Valued:
-		Cost: 595
+		Cost: 489

 DEVAST:
 	Inherits: ^Tank
 	Buildable:
-		Queue: Vehicle
+		Queue: Armor
 		BuildPaletteOrder: 100
-		Prerequisites: repairh,researchh
+		Prerequisites: heavyh,research
 		Owner: harkonnen
+		BuiltAt: heavyh
+		Hotkey: d
 	Valued:
-		Cost: 1800
+		Cost: 1200
 	Tooltip:
 		Name: Devastator
-		Description: Big and slow tank.\n  Strong vs Tanks\n  Weak vs Infantry, Aircraft
+		Description: Super Heavy Tank\n  Strong vs Tanks\n  Weak vs Artillery, Aircraft
+		Icon: devasticon
 	Health:
-		HP: 900
+		HP: 650
 	Armor:
 		Type: Heavy
 	Mobile:
-		Speed: 3
+		ROT: 3
+		Speed: 4
 		Crushes: crate, infantry
 	RevealsShroud:
-		Range: 6
+		Range: 7
 	RenderUnit:
 	AttackFrontal:
 		PrimaryWeapon: 120mm
-		PrimaryLocalOffset: -4,-5,0,0,0, 4,-5,0,0,0
-		PrimaryRecoil: 4
-		PrimaryRecoilRecovery: 0.7
+		PrimaryLocalOffset: 5,-16,0,-2,0, -4,-16,0,-2,0
 	AutoTarget:
+		InitialStance: Defend
 	Explodes:
-		Weapon: UnitExplodeSmall
-		EmptyWeapon: UnitExplodeSmall
-	LeavesHusk:
+		Weapon: UnitExplodeScale
+		EmptyWeapon: UnitExplodeScale
 	Selectable:
 		Bounds: 44,38,0,0
+	LeavesHusk:
+		HuskActor: Devast.Husk
+
+DEVAST.Husk:
+	Inherits: ^Husk
+	Health:
+		HP: 125
+	Tooltip:
+		Icon: devasticon
+	RenderUnit:
+		Image: DEVAST

 SARDAUKAR:
 	Inherits: ^Infantry
 	Buildable:
 		Queue: Infantry
-		BuildPaletteOrder: 110
+		BuildPaletteOrder: 80
 		Prerequisites: palaceh
 		Owner: harkonnen
+		Hotkey: d
 	Valued:
-		Cost: 800
+		Cost: 400
 	Tooltip:
 		Name: Sardaukar
-		Description: Heavy infantry.
+		Description: Elite asssault infantry\n  Strong vs Infantry, Vehicles\n  Weak vs Artillery
 	Selectable:
 		Bounds: 12,17,0,0
+		Voice: GenericVoice
 	Health:
-		HP: 150
+		HP: 80
 	Mobile:
-		Speed: 5
+		Speed: 4
 	RevealsShroud:
 		Range: 6
 	TakeCover:
@@ -318,5 +262,4 @@ SARDAUKAR:
 	RenderInfantryProne:
 	AttackFrontal:
 		PrimaryWeapon: Vulcan
-		SecondaryWeapon: Dragon
-		PrimaryOffset: 0,0,0,-13
+		SecondaryWeapon: Slung
--- a/mods/d2k/rules/infantry.yaml
+++ b/mods/d2k/rules/infantry.yaml
@@ -4,22 +4,24 @@ RIFLE:
 		Queue: Infantry
 		BuildPaletteOrder: 10
 		Owner: atreides,harkonnen,ordos
+		Hotkey: r
 	Valued:
 		Cost: 100
 	Tooltip:
 		Name: Rifleman
-		Description: General-purpose infantry.\n  Strong vs Infantry\n  Weak vs Vehicles
+		Description: General-purpose infantry\n  Strong vs Infantry\n  Weak vs Vehicles, Artillery
 	Selectable:
 		Bounds: 12,17,0,0
 	Health:
 		HP: 50
 	Mobile:
-		Speed: 4
+		Speed: 5
 	AttackFrontal:
 		PrimaryWeapon: M1Carbine
 	TakeCover:
 	-RenderInfantry:
 	RenderInfantryProne:
+		IdleAnimations: idle1,idle2

 ENGINEER:
 	Inherits: ^Infantry
@@ -27,22 +29,24 @@ ENGINEER:
 		Queue: Infantry
 		BuildPaletteOrder: 50
 		Owner: atreides,harkonnen,ordos
+		Hotkey: e
 	Valued:
 		Cost: 500
 	Tooltip:
 		Name: Engineer
-		Description: Infiltrates and captures enemy structures.\n  Strong vs Nothing\n  Weak vs Everything
+		Description: Infiltrates and captures enemy structures\n  Strong vs Nothing\n  Weak vs Everything
 	Selectable:
 		Bounds: 12,17,0,0
 		Voice: EngineerVoice
 	Health:
 		HP: 25
 	Mobile:
-		Speed: 4
+		Speed: 5
 	Passenger:
+		PipType: Yellow
 	EngineerRepair:
 	Captures:
-	TakeCover:
+	#TakeCover:
 	-AutoTarget:
 	AttackMove:
 		JustMove: true
@@ -53,17 +57,18 @@ BAZOOKA:
 		Queue: Infantry
 		BuildPaletteOrder: 20
 		Owner: atreides,harkonnen,ordos
+		Hotkey: t
 	Valued:
-		Cost: 300
+		Cost: 250
 	Tooltip:
 		Name: Trooper
-		Description: Anti-tank/Anti-aircraft infantry.\n  Strong vs Tanks, Aircraft\n  Weak vs Infantry
+		Description: Anti-tank/Anti-aircraft infantry\n  Strong vs Tanks, Aircraft\n  Weak vs Infantry, Artillery
 	Selectable:
 		Bounds: 12,17,0,0
 	Health:
 		HP: 45
 	Mobile:
-		Speed: 3
+		Speed: 4
 	AttackFrontal:
 		PrimaryWeapon: RedEye
 		SecondaryWeapon: Dragon
@@ -71,6 +76,40 @@ BAZOOKA:
 	TakeCover:
 	-RenderInfantry:
 	RenderInfantryProne:
+		IdleAnimations: idle1,idle2
+
+MEDIC:
+	Inherits: ^Infantry
+	Buildable:
+		Queue: Infantry
+		BuildPaletteOrder: 60
+		Owner: atreides,ordos
+		Prerequisites: research
+		Hotkey: m
+	Valued:
+		Cost: 500
+	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
+	Health:
+		HP: 60
+	Mobile:
+		Speed: 4
+	AutoHeal:
+	AttackMedic:
+		PrimaryWeapon: Heal
+	Passenger:
+		PipType: Blue
+	-AutoTarget:
+	#AttackMove:
+		#JustMove: true
+	RenderInfantry:
+		Image: THUMPER
+

 #THUMPER:
 #	Inherits: ^Infantry
@@ -82,7 +121,7 @@ BAZOOKA:
 #		Cost: 400
 #	Tooltip:
 #		Name: Thumper
-#		Description: Attracts sandsworm through vibrations.\n  Strong vs Nothing\n  Weak vs Everything
+#		Description: Attracts sandsworm through vibrations\n  Strong vs Nothing\n  Weak vs Everything
 #	Selectable:
 #		Bounds: 12,17,0,0
 #	Health:
--- a/mods/d2k/rules/ordos.yaml
+++ b/mods/d2k/rules/ordos.yaml
@@ -20,11 +20,6 @@ REFO:
 		Owner: ordos
 	RenderBuildingWarFactory:
 		Image: REFO
-	FreeActor:
-		Actor: HARVESTERO
-		InitialActivity: FindResources
-		SpawnOffset: 1,2
-		Facing: 64

 BARRO:
 	Inherits: ^BARRACKS
@@ -32,51 +27,24 @@ BARRO:
 		Prerequisites: pwro
 		Owner: ordos

-GUNTOWERO:
-	Inherits: ^GUNTOWER
-	Buildable:
-		Prerequisites: conyardo
-		Owner: ordos
-
-ROCKETTOWERO:
-	Inherits: ^ROCKETTOWER
-	Buildable:
-		Prerequisites: radaro
-		Owner: ordos
-
-WALLO:
-	Inherits: ^WALL
-	Buildable:
-		Prerequisites: conyardo
-		Owner: ordos
-
 HIGHTECHO:
 	Inherits: ^HIGHTECH
 	Buildable:
 		Prerequisites: radaro
 		Owner: ordos

-RESEARCHO:
-	Inherits: ^RESEARCH
-	Buildable:
-		Prerequisites: radaro,heavyo
-		Owner: ordos
-
 PALACEO:
 	Inherits: ^PALACE
 	Buildable:
-		Prerequisites: researcho
+		Prerequisites: hightecho
 		Owner: ordos
-	ParatroopersPower:
-		Image: carryallicon
-		UnitType: carryall.infantry
-		FlareTime: 0
-		ChargeTime: 360
-		Description: Paratroopers
-		LongDesc: A Carryall drops a squad of Infantry \nanywhere on the map
-		Prerequisites: HIGHTECHO
-		DropItems: RIFLE, RIFLE, ENGINEER, BAZOOKA, BAZOOKA
-		SelectTargetSound:
+	AirstrikePower:
+		Image: orniicon
+		Description: Air Strike
+		ChargeTime: 180
+		LongDesc: Ornithopter drops a load of parachuted\nbombs on your target
+		UnitType: orni.bomber
+		SelectTargetSound: 
 		FlareType:
 	CanPowerDown:
 	RequiresPower:
@@ -113,22 +81,17 @@ RADARO:
 STARPORTO:
 	Inherits: ^STARPORT
 	Buildable:
-		Prerequisites: radaro
-		Owner: ordos
-
-REPAIRO:
-	Inherits: ^REPAIR
-	Buildable:
-		Prerequisites: heavyo
+		Prerequisites: radaro,hightecho
 		Owner: ordos

 MCVO:
 	Inherits: ^MCV
 	Buildable:
-		Prerequisites: heavyo,repairo
+		Prerequisites: heavyo,repair
 		Owner: ordos
+		BuiltAt: heavyo
 	Transforms:
-		Facing: 10
+		Facing: 16
 		IntoActor: conyardo
 		Offset:-1,-1
 		NoTransformSounds: OI_DPLOY.AUD
@@ -143,22 +106,6 @@ MCVO.starport:
 	Valued:
 		Cost: 1499

-HARVESTERO:
-	Inherits: ^HARVESTER
-	Buildable:
-		Prerequisites: heavyo,refo
-		Owner: ordos
-	RenderUnit:
-		Image: HARVESTER
-
-HARVESTERO.starport:
-	Inherits: HARVESTERO
-	Buildable:
-		Queue: Starport
-		BuiltAt: starporto
-	Valued:
-		Cost: 895
-
 COMBATO:
 	Inherits: ^COMBAT
 	Tooltip:
@@ -166,8 +113,23 @@ COMBATO:
 	Buildable:
 		Prerequisites: heavyo
 		Owner: ordos
+		BuiltAt: heavyo
+	Mobile:
+		Speed: 9
+		Crushes: crate, infantry
+	Turreted:
+		ROT: 7
 	RenderUnitTurreted:
 		Image: COMBATO
+	LeavesHusk:
+		HuskActor: Combato.Husk
+
+COMBATO.Husk:
+	Inherits: ^COMBAT.Husk
+	Tooltip:
+		Icon: combatoicon
+	RenderUnit:
+		Image: COMBATO

 COMBATO.starport:
 	Inherits: COMBATO
@@ -175,164 +137,125 @@ COMBATO.starport:
 		Queue: Starport
 		BuiltAt: starporto
 	Valued:
-		Cost: 595
+		Cost: 489

-RAIDER:
-	Inherits: ^Vehicle
+TRIKEO:
+	Inherits: ^TRIKE
 	Buildable:
-		Queue: Vehicle
-		BuildPaletteOrder: 15
 		Prerequisites: lighto
 		Owner: ordos
+		BuiltAt: lighto
 	Valued:
-		Cost: 200
+		Cost: 250
 	Tooltip:
-		Name: Raider
-		Description: Weak Scout.\n Decent vs. Infantry
-	Selectable:
-		Bounds: 24,24
+		Name: Raider Trike
+		Description: Improved Scout\n Strong vs Infantry
+		Icon: raidericon
 	Health:
-		HP: 125
-	Armor:
-		Type: Light
+		HP: 100
 	Mobile:
 		ROT: 10
-		Speed: 15
-	RevealsShroud:
-		Range: 8
+		Speed: 14
 	RenderUnit:
+		Image: RAIDER
 	AttackFrontal:
-		PrimaryWeapon: M60mg
-		PrimaryOffset: 0,0,0,-4
-		SecondaryWeapon: M60mg
-		SecondaryOffset: 0,0,0,-4
-	AutoTarget:
-	Cargo:
-		Types: Infantry
-		MaxWeight: 1
-		PipCount: 1
-		UnloadFacing: 220
+		PrimaryWeapon: M60mgo
+		PrimaryOffset: 0,-6,0,-3
+		#PrimaryLocalOffset: 1,0,0,-3,0, -1,0,0,-3,0

-QUADO:
-	Inherits: ^QUAD
-	Buildable:
-		Prerequisites: lighto
-		Owner: ordos
-	RenderUnit:
-		Image: QUAD

-QUADO.starport:
-	Inherits: QUADO
-	Buildable:
-		Queue: Starport
-		BuiltAt: starporto
-	Valued:
-		Cost: 295

-SIEGETANKO:
-	Inherits: ^SIEGETANK
-	Buildable:
-		Prerequisites: heavyo, radaro
-		Owner: ordos
-	RenderUnitTurreted:
-		Image: SIEGETANK
-
-SIEGETANKO.starport:
-	Inherits: SIEGETANKO
-	Buildable:
-		Queue: Starport
-		BuiltAt: starporto
-	Valued:
-		Cost: 495
-
-MISSILETANKO:
-	Inherits: ^MISSILETANK
-	Buildable:
-		Prerequisites: heavyo
-		Owner: ordos
-	RenderUnit:
-		Image: MISSILETANK
-
-MISSILETANKO.starport:
-	Inherits: MISSILETANKO
-	Buildable:
-		Queue: Starport
-		BuiltAt: starporto
-	Valued:
-		Cost: 599
+#TRIKEO.starport:
+#	Inherits: ^TRIKE
+#	Buildable:
+#		Queue: Starport
+#		Prerequisites: lighto
+#		Owner: ordos
+#		BuiltAt: starporto
+#	RenderUnit:
+#		Image: TRIKE
+#	Valued:
+#		Cost: 149

 CARRYALLO:
 	Inherits: ^CARRYALL
-	Buildable:
-		Prerequisites: hightecho
-		BuiltAt: hightecho
-		Owner: ordos
 	RenderUnit:
 		Image: CARRYALL

 CARRYALLO.starport:
 	Inherits: CARRYALLO
-	Buildable:
-		Queue: Starport
-		BuiltAt: starporto
 	Valued:
 		Cost: 999

 DEVIATORTANK:
 	Inherits: ^Tank
 	Valued:
-		Cost: 800
+		Cost: 1000
 	Tooltip:
 		Name: Deviator
-		Description: Will cause no actual damage.\nFires a warhead which changes allegiances\n but does not effect buildings or tanks.
+		Description: Causes no actual damage\nFires a warhead which changes allegiances\n but does not effect buildings or tanks
+		Icon: deviatortankicon
 	Buildable:
-		Queue: Vehicle
+		Queue: Armor
 		BuildPaletteOrder: 50
-		Prerequisites: heavyo,researcho
+		Prerequisites: heavyo,research
 		Owner: ordos
+		BuiltAt: heavyo
+		Hotkey: d
 	Mobile:
+		ROT: 3
 		Speed: 6
 	Health:
-		HP: 150
+		HP: 125
 	Armor:
 		Type: Light
 	RevealsShroud:
-		Range: 6
+		Range: 5
 	RenderUnit:
 	AttackLoyalty:
 		PrimaryWeapon: FakeMissile
-		PrimaryLocalOffset: -7,2,0,0,25, 7,2,0,0,-25
-		PrimaryRecoil: 1
+		PrimaryLocalOffset: 0,7,0,-2,0 #7
 	AutoTarget:
+		InitialStance: Defend
+	Explodes:
+		Weapon: UnitExplodeSmall
+		EmptyWeapon: UnitExplodeSmall
 	Selectable:
 		Bounds: 30,30
+	LeavesHusk:
+		HuskActor: Deviatortank.Husk
+
+DEVIATORTANK.Husk:
+	Inherits: ^Husk
+	Tooltip:
+		Icon: deviatortankicon
+	RenderUnit:
+		Image: DEVIATORTANK

 SABOTEUR:
 	Inherits: ^Infantry
 	Buildable:
 		Queue: Infantry
-		BuildPaletteOrder: 110
+		BuildPaletteOrder: 100
 		Prerequisites: palaceo
 		Owner: ordos
+		Hotkey: b
 	Valued:
 		Cost: 800
 	Tooltip:
 		Name: Saboteur
-		Description: Sneaky infantry, armed with explosives.\n  Strong vs Buildings\n  Weak vs Everything\n  Special Ability: destroy buildings
+		Description: Sneaky infantry, armed with explosives\n  Strong vs Buildings\n  Weak vs Everything\n  Special Ability: destroy buildings
 	Selectable:
 		Voice: SaboteurVoice
 		Bounds: 12,17,0,0
 	Health:
 		HP: 100
 	Mobile:
-		Speed: 5
+		Speed: 6
 	RevealsShroud:
-		Range: 6
+		Range: 7
 	C4Demolition:
 		C4Delay: 45
-	TakeCover:
-	-RenderInfantry:
-	RenderInfantryProne:
 	-AutoTarget:
 	AttackMove:
 		JustMove: true
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -4,15 +4,17 @@
 		Power: 0
 		Footprint: xxx xxx
 		Dimensions: 3,2
+		Adjacent: 4
+	Selectable:
+		Bounds: 96,64
 	Health:
 		HP: 1000
 	Armor:
 		Type: Concrete
 	RevealsShroud:
-		Range: 5
-	Bib:
+		Range: 6
 	Production:
-		Produces: Building,Defense
+		Produces: Building
 	Valued:
 		Cost: 2500
 	Tooltip:
@@ -28,8 +30,10 @@
 		Queue: Building
 		BuildPaletteOrder: 0
 		Hotkey: w
+	Selectable:
+		Bounds: 64,64
 	Valued:
-		Cost: 300
+		Cost: 400
 	Tooltip:
 		Name: Windtrap
 		Description: Provides power for other structures
@@ -43,22 +47,23 @@
 		Type: Wood
 	RevealsShroud:
 		Range: 4
-	Bib:

 ^BARRACKS:
 	Inherits: ^Building
 	Buildable:
 		Queue: Building
-		BuildPaletteOrder: 20
+		BuildPaletteOrder: 15
 		Hotkey: b
+	Selectable:
+		Bounds: 64,64
 	Valued:
-		Cost: 400
+		Cost: 500
 	Tooltip:
 		Name: Barracks
 		Description: Trains infantry
 	Building:
 		Power: -20
-		Footprint: xx xx
+		Footprint: =x xx
 		Dimensions: 2,2
 	Health:
 		HP: 800
@@ -66,31 +71,38 @@
 		Type: Wood
 	RevealsShroud:
 		Range: 5
-	Bib:
 	RallyPoint:
+		RallyPoint: 1,3
 	Exit@1:
-		SpawnOffset: 5,20
+		SpawnOffset: 11,18
 		ExitCell: 0,2
 	Exit@2:
-		SpawnOffset: 10,-5
-		ExitCell: 0,2
+		SpawnOffset: 16,15
+		ExitCell: 1,2
 	Production:
 		Produces: Infantry
 	PrimaryBuilding:
 	ProductionBar:
+	ProvidesCustomPrerequisite:
+		Prerequisite: Barracks
+	RepairsUnits:
+		ValuePercentage: 0

 ^HIGHTECH:
 	Inherits: ^Building
 	Buildable:
 		Queue: Building
-		BuildPaletteOrder: 80
+		BuildPaletteOrder: 50
+		Hotkey: t
+	Selectable:
+		Bounds: 96,96
 	Valued:
 		Cost: 2000
 	Tooltip:
-		Name: High Tech Factory
-		Description: Produces Carryalls
+		Name: High Tech Facility
+		Description: Unlocks advanced technology
 	Building:
-		Power: -30
+		Power: -40
 		Footprint: _x_ xxx xxx
 		Dimensions: 3,3
 	Health:
@@ -99,74 +111,91 @@
 		Type: Wood
 	RevealsShroud:
 		Range: 4
-	Bib:
-	RallyPoint:
-	Exit@1:
-		SpawnOffset: 5,0
-		ExitCell: 1,1
-	Production:
-		Produces: Aircraft
-	PrimaryBuilding:
-	ProductionBar:
+	ProvidesCustomPrerequisite:
+		Prerequisite: High Tech Facility

-^RESEARCH:
+RESEARCH:
 	Inherits: ^Building
 	Buildable:
 		Queue: Building
-		BuildPaletteOrder: 90
+		Prerequisites: Outpost,High Tech Facility
+		Owner: atreides, harkonnen, ordos
+		BuildPaletteOrder: 65
+		Hotkey: v
+	Selectable:
+		Bounds: 96,64
 	Valued:
-		Cost: 2000
+		Cost: 2500
 	Tooltip:
 		Name: IX Research Center
-		Description: Provides advanced units
+		Description: Unlocks experimental tanks\n  Special Ability: Carryall Combat Drop
+	ParatroopersPower:
+		Image: carryallicon
+		UnitType: carryall.infantry
+		FlareTime: 0
+		ChargeTime: 360
+		Description: Paratroopers
+		LongDesc: A Carryall drops a squad of Infantry \nanywhere on the map
+		Prerequisites: HIGHTECHO
+		DropItems: RIFLE, RIFLE, BAZOOKA, BAZOOKA, ENGINEER, BAZOOKA, RIFLE, RIFLE
+		SelectTargetSound:
+		FlareType:
 	Building:
-		Power: -30
-		Footprint: _x_ xxx xxx
-		Dimensions: 3,3
+		Power: -40
+		Footprint: xxx xxx
+		Dimensions: 3,2
 	Health:
 		HP: 1000
 	Armor:
 		Type: Wood
 	RevealsShroud:
 		Range: 4
-	Bib:

 ^PALACE:
 	Inherits: ^Building
 	Buildable:
 		Queue: Building
-		BuildPaletteOrder: 100
+		BuildPaletteOrder: 70
+		Hotkey: p
+	Selectable:
+		Bounds: 96,96
 	Valued:
-		Cost: 2000
+		Cost: 4000
 	Tooltip:
 		Name: Palace
-		Description: Provides advanced technology
+		Description: Unlocks elite infantry\n  Special Ability: Ornithopter Strike
 	Building:
-		Power: -30
-		Footprint: xxx xxx
-		Dimensions: 3,2
+		Power: -50
+		Footprint: _x_ xxx =xx
+		Dimensions: 3,3
 	Health:
 		HP: 2000
 	Armor:
 		Type: Concrete
 	RevealsShroud:
-		Range: 4
-	Bib:
-
+		Range: 8
+	ProvidesCustomPrerequisite:
+		Prerequisite: TPal
+	RenderDetectionCircle:
+	DetectCloaked:
+		Range: 2

 ^REFINERY:
 	Inherits: ^Building
 	Buildable:
 		Queue: Building
-		BuildPaletteOrder: 10
+		BuildPaletteOrder: 5
+		Hotkey: r
+	Selectable:
+		Bounds: 96,64
 	Valued:
-		Cost: 1400
+		Cost: 1500
 	Tooltip:
 		Name: Spice Refinery
-		Description: Harvesters unload spice here.
+		Description: Harvesters unload Spice here for processing
 	Building:
 		Power: -30
-		Footprint: xxx x==
+		Footprint: =xx xx=
 		Dimensions: 3,2
 	Health:
 		HP: 900
@@ -174,30 +203,38 @@
 		Type: Wood
 	RevealsShroud:
 		Range: 6
-	Bib:
 	-RenderBuilding:
 	OreRefinery:
 		DockOffset: 2,1
-		DockAngle: 144
+		DockAngle: 160
 	StoresOre:
-		PipColor: Green
-		PipCount: 20
-		Capacity: 2000
+		PipColor: green
+		PipCount: 10
+		Capacity: 3000
 	CustomSellValue:
-		Value: 600
+		Value: 500
+	ProvidesCustomPrerequisite:
+		Prerequisite: Spice Refinery
+	FreeActor:
+		Actor: HARVESTER
+		InitialActivity: FindResources
+		SpawnOffset: 2,1
+		Facing: 160

 ^SILO:
 	Inherits: ^Building
 	Buildable:
 		Queue: Building
-		BuildPaletteOrder: 15
+		BuildPaletteOrder: 10
+		Hotkey: i
 	Valued:
 		Cost: 150
 	Tooltip:
 		Name: Silo
 		Description: Stores excess harvested Spice
 	Building:
-		Power: 0
+		Power: -5
+		Adjacent: 4
 	-GivesBuildableArea:
 	Health:
 		HP: 300
@@ -209,7 +246,7 @@
 	RenderBuildingSilo:
 		FillSteps: 39
 	StoresOre:
-		PipColor: Green
+		PipColor: green
 		PipCount: 5
 		Capacity: 1500
 	-EmitInfantryOnSell:
@@ -218,15 +255,18 @@
 	Inherits: ^Building
 	Buildable:
 		Queue: Building
-		BuildPaletteOrder: 50
+		BuildPaletteOrder: 30
+		Hotkey: l
+	Selectable:
+		Bounds: 96,64
 	Valued:
 		Cost: 1000
 	Tooltip:
 		Name: Light Factory
-		Description: Produces light vehicles.
+		Description: Produces light vehicles
 	Building:
-		Power: -30
-		Footprint: xxx xxx
+		Power: -20
+		Footprint: xxx xx=
 		Dimensions: 3,2
 	Health:
 		HP: 750
@@ -234,30 +274,35 @@
 		Type: Wood
 	RevealsShroud:
 		Range: 4
-	Bib:
 	-RenderBuilding:
 	RallyPoint:
+		RallyPoint: 2,2
 	Exit@1:
-		SpawnOffset: 5,0
-		ExitCell: 1,1
+		SpawnOffset: 17,-7
+		ExitCell: 2,1
 	Production:
 		Produces: Vehicle
 	PrimaryBuilding:
 	ProductionBar:
+	ProvidesCustomPrerequisite:
+		Prerequisite: Light Factory

 ^HEAVY:
 	Inherits: ^Building
 	Buildable:
 		Queue: Building
-		BuildPaletteOrder: 60
+		BuildPaletteOrder: 35
+		Hotkey: h
+	Selectable:
+		Bounds: 96,96
 	Valued:
 		Cost: 2000
 	Tooltip:
 		Name: Heavy Factory
-		Description: Produces heavy vehicles.
+		Description: Produces heavy vehicles
 	Building:
 		Power: -30
-		Footprint: _x_ xxx xxx
+		Footprint: _x_ xxx =xx
 		Dimensions: 3,3
 	Health:
 		HP: 1500
@@ -265,17 +310,18 @@
 		Type: Wood
 	RevealsShroud:
 		Range: 4
-	Bib:
 	-RenderBuilding:
 	RallyPoint:
 		RallyPoint: 0,3
 	Exit@1:
-		SpawnOffset: -2,-2
+		SpawnOffset: 8,6
 		ExitCell: 0,2
 	Production:
-		Produces: Vehicle
+		Produces: Armor
 	PrimaryBuilding:
 	ProductionBar:
+	ProvidesCustomPrerequisite:
+		Prerequisite: Heavy Factory

 ^RADAR:
 	RequiresPower:
@@ -283,12 +329,15 @@
 	Inherits: ^Building
 	Buildable:
 		Queue: Building
-		BuildPaletteOrder: 30
+		BuildPaletteOrder: 20
+		Hotkey: o
+	Selectable:
+		Bounds: 96,64
 	Valued:
-		Cost: 1400
+		Cost: 1000
 	Tooltip:
 		Name: Outpost
-		Description: Provides a radar map of the battlefield.\n  Requires power to operate.
+		Description: Provides a radar map of the battlefield\n  Requires power to operate
 	Building:
 		Power: -40
 		Footprint: xxx xxx
@@ -299,56 +348,67 @@
 		Type: Wood
 	RevealsShroud:
 		Range: 10
-	Bib:
 	ProvidesRadar:
+	ProvidesCustomPrerequisite:
+		Prerequisite: Outpost
+	DetectCloaked:
+		Range: 2

 ^STARPORT:
 	Inherits: ^Building
 	Valued:
-		Cost: 2000
+		Cost: 3000
 	Tooltip:
 		Name: Starport
-		Description: Dropzone for cheap reinforcements
+		Description: Dropzone for cheap reinforcements\n  Requires power to operate
 	Buildable:
 		Queue: Building
-		BuildPaletteOrder: 40
+		BuildPaletteOrder: 60
+		Hotkey: c
 	Building:
-		Power: -30
-		Footprint: xxx xxx
-		Dimensions: 3,2
+		Power: -40
+		Footprint: xxx x=x =x=
+		Dimensions: 3,3
 	Health:
 		HP: 1000
 	Armor:
 		Type: Wood
 	RevealsShroud:
 		Range: 7
-	Bib:
 	RallyPoint:
-		RallyPoint: 2,2
+		RallyPoint: 1,3
 	BelowUnits:
 	Exit@1:
-		SpawnOffset: -24,0
-		ExitCell: 2,1
+		SpawnOffset: 0,-15
+		ExitCell: 2,2
+	Exit@2:
+		SpawnOffset: 0,-15
+		ExitCell: 0,2
 	ProductionAirdrop:
 		Produces: Starport
 		ActorType: frigate
 	ProductionBar:
 	PrimaryBuilding:
+	RequiresPower:
+	CanPowerDown:

-^WALL:
+WALL:
 	Buildable:
-		Queue: Defense
-		BuildPaletteOrder: 1000
+		Queue: Building
+		Prerequisites: Barracks
+		Owner: atreides, harkonnen, ordos
+		BuildPaletteOrder: 25
+		#Hotkey: g
 	SoundOnDamageTransition:
 		DamagedSound:
-		DestroyedSound:
+		DestroyedSound: CRMBLE2.aud
 	Valued:
 		Cost: 100
 	CustomSellValue:
 		Value: 0
 	Tooltip:
 		Name: Concrete Wall
-		Description: Stop units and blocks enemy fire.
+		Description: Stops units and blocks enemy fire
 		Icon: wallicon
 	AppearsOnRadar:
 	Building:
@@ -357,21 +417,21 @@
 		Adjacent: 7
 		TerrainTypes: Rock
 	Health:
-		HP: 500
+		HP: 300
 	Armor:
 		Type: Concrete
 	Wall:
 		CrushClasses: Concretewall
 	LineBuild:
 		Range: 8
-	SelectionDecorations:
-	Selectable:
-		Priority: 1
+	#SelectionDecorations:
+	#Selectable:
+	#	Priority: 1
 	TargetableBuilding:
 		TargetTypes: Ground
 	RenderBuildingWall:
 		HasMakeAnimation: false
-	GivesExperience:
+	#GivesExperience:
 	EditorAppearance:
 		RelativeToTopLeft: yes
 	AutoTargetIgnore:
@@ -379,100 +439,154 @@
 		Types:Wall
 	Sellable:

-^GUNTOWER:
-	Inherits: ^Building
-	Buildable:
-		Queue: Defense
-		BuildPaletteOrder: 40
-	Valued:
-		Cost: 600
-	Tooltip:
-		Name: Turret
-		Description: Anti-Armor base defense.\n  Strong vs Tanks\n  Weak vs Infantry, Aircraft
-		Icon: turreticon
-	Building:
-		Power: -20
-	-GivesBuildableArea:
-	Health:
-		HP: 400
-	Armor:
-		Type: Concrete
-	RevealsShroud:
-		Range: 7
-	RenderRangeCircle:
-	-RenderBuilding:
-	RenderBuildingSeparateTurret:
-		HasMakeAnimation: false
-	Turreted:
-		ROT: 12
-		InitialFacing: 50
-	AttackTurreted:
-		PrimaryWeapon: TurretGun
-	AutoTarget:
-	RequiresPower:
-	CanPowerDown:
-
-^ROCKETTOWER:
-	Inherits: ^Building
-	RequiresPower:
-	Valued:
-		Cost: 1000
-	Tooltip:
-		Name: Rocket Tower
-		Icon: rturreticon
-		Description: Anti-armor defensive structure.\n  Strong vs Light Vehicles, Tanks\n  Weak vs Infantry
-	Buildable:
-		Queue: Defense
-		BuildPaletteOrder: 60
-	Building:
-		Power: -40
-	-GivesBuildableArea:
-	Health:
-		HP: 800
-	Armor: 
-		Type: Concrete
-	RevealsShroud:
-		Range: 8
-	-RenderBuilding:
-	RenderBuildingSeparateTurret:
-		HasMakeAnimation: false
-	AttackTurreted:
-		PrimaryWeapon: TowerMissle
-		PrimaryOffset: 0,0,5,2
-		PrimaryLocalOffset: 7,-7,0,0,-25, -7,-7,0,0,25
-	Turreted:
-		ROT: 12
-		InitialFacing: 50
-	AutoTarget:
-	RenderRangeCircle:
-
-^REPAIR:
+GUNTOWER:
 	Inherits: ^Building
 	Buildable:
 		Queue: Building
-		BuildPaletteOrder: 70
+		Prerequisites: Outpost
+		Owner: atreides, harkonnen, ordos
+		BuildPaletteOrder: 40
+		Hotkey: g
+	Valued:
+		Cost: 600
+	Tooltip:
+		Name: Gun Tower
+		Description: Defensive structure\n  Strong vs Tanks\n  Weak vs Infantry, Aircraft
+		Icon: turreticon
+	Building:
+		Power: -20
+		Adjacent: 4
+	Selectable:
+		Bounds: 32,32
+		Priority: 3
+	-GivesBuildableArea:
+	Health:
+		HP: 500
+	Armor:
+		Type: Concrete
+	RevealsShroud:
+		Range: 6
+	RenderRangeCircle:
+	-RenderBuilding:
+	#-AutoTargetIgnore:
+	RenderBuildingSeparateTurret:
+	#	HasMakeAnimation: false
+	Turreted:
+		ROT: 6
+		InitialFacing: 128
+	AttackTurreted:
+		PrimaryWeapon: TurretGun
+		PrimaryLocalOffset: 0,-11,0,-7,0
+	AutoTarget:
+	LeavesHusk:
+		HuskActor: Guntower.Husk
+	RenderDetectionCircle:
+	DetectCloaked:
+		Range: 3
+
+GUNTOWER.Husk:
+	Inherits: ^TowerHusk
+	Tooltip:
+		Name: Destroyed Tower
+		Icon: turreticon
+	RenderUnit:
+		Image: GUNTOWER
+	ThrowsParticle@turret:
+		Anim: turret
+		Spread: 4,4
+		Speed: 6
+		AnimKey: turret
+
+ROCKETTOWER:
+	Inherits: ^Building
+	Buildable:
+		Queue: Building
+		Prerequisites: Outpost, High Tech Facility
+		Owner: atreides, harkonnen, ordos
+		BuildPaletteOrder: 55
+		Hotkey: m
+	Valued:
+		Cost: 800
+	Tooltip:
+		Name: Missile Tower
+		Icon: rturreticon
+		Description: Defensive structure\n  Strong vs Infantry, Aircraft\n  Weak vs Tanks\n\n  Requires power to operate
+	Building:
+		Power: -30
+		Adjacent: 4
+	Selectable:
+		Bounds: 32,32
+		Priority: 3
+	-GivesBuildableArea:
+	Health:
+		HP: 500
+	Armor: 
+		Type: Concrete
+	RevealsShroud:
+		Range: 6
+	RenderRangeCircle:
+	-RenderBuilding:
+	#-AutoTargetIgnore:
+	RenderBuildingSeparateTurret:
+	#	HasMakeAnimation: false
+	AttackTurreted:
+		PrimaryWeapon: TowerMissile
+		PrimaryLocalOffset: 14,-2,0,-11,0, -14,-2,0,-11,0
+	Turreted:
+		ROT: 8
+		InitialFacing: 128
+	AutoTarget:
+	RequiresPower:
+	CanPowerDown:
+	LeavesHusk:
+		HuskActor: Rockettower.Husk
+	RenderDetectionCircle:
+	DetectCloaked:
+		Range: 3
+
+ROCKETTOWER.Husk:
+	Inherits: ^TowerHusk
+	Tooltip:
+		Name: Destroyed Tower
+		Icon: rturreticon
+	RenderUnit:
+		Image: ROCKETTOWER
+	ThrowsParticle@turret:
+		Anim: turret
+		Spread: 4,4
+		Speed: 6
+		AnimKey: turret
+
+REPAIR:
+	Inherits: ^Building
+	Buildable:
+		Queue: Building
+		Prerequisites: Outpost
+		Owner: atreides, harkonnen, ordos
+		BuildPaletteOrder: 45
+		Hotkey: e
 	Valued:
 		Cost: 1000
 	Tooltip:
 		Name: Repair Pad
-		Description: Repairs vehicles and allows\n the construction of additional bases.
+		Description: Repairs vehicles\n Allows construction of MCVs
 	Building:
-		Power: -30
-		Footprint: xxx xxx
-		Dimensions: 3,2
-	Bib:
+		Power: -25
+		Footprint: =x= =x= ===
+		Dimensions: 3,3
 	Health:
-		HP: 800
+		HP: 500
 	Armor:
-		Type: Wood
+		Type: Concrete
 	RevealsShroud:
 		Range: 5
 	BelowUnits:
 	Reservable:
 	RepairsUnits:
-		Interval: 10
+		Interval: 15
+		ValuePercentage: 50
 	RallyPoint:
-		RallyPoint: 2,2
+		RallyPoint: 1,3

 SIETCH:
 	Inherits: ^Building
@@ -496,13 +610,14 @@ SIETCH:

 STARPORTC:
 	Inherits: ^STARPORT
-	ProductionAirdrop:
-		ReadyAudio:
 	-Buildable:

 PALACEC:
 	Inherits: ^PALACE
 	-Buildable:
+	Building:
+		Footprint: xxx xxx
+		Dimensions: 3,2

 HEAVYC:
 	Inherits: ^HEAVY
--- a/mods/d2k/rules/system.yaml
+++ b/mods/d2k/rules/system.yaml
@@ -7,27 +7,27 @@ Player:
 		QueuedAudio: Building
 		ReadyAudio: BuildingReady
 		BlockedAudio: NoRoom
-	ClassicProductionQueue@Defense:
-		Type: Defense
-		BuildSpeed: .4
+	ClassicProductionQueue@Infantry:
+		Type: Infantry
+		BuildSpeed: .5
 		LowPowerSlowdown: 3
-		QueuedAudio: Building
-		ReadyAudio: BuildingReady
 		BlockedAudio: NoRoom
 	ClassicProductionQueue@Vehicle:
 		Type: Vehicle
-		BuildSpeed: .4
+		BuildSpeed: .5
 		LowPowerSlowdown: 3
+		QueuedAudio: Building
 		BlockedAudio: NoRoom
-	ClassicProductionQueue@Infantry:
-		Type: Infantry
+	ClassicProductionQueue@Armor:
+		Type: Armor
 		BuildSpeed: .4
 		LowPowerSlowdown: 3
+		QueuedAudio: Building
 		BlockedAudio: NoRoom
 	ClassicProductionQueue@Starport:
 		Type: Starport
-		BuildSpeed: .4
-		LowPowerSlowdown: 3
+		BuildSpeed: .8
+		LowPowerSlowdown: 2
 		BlockedAudio: NoRoom
 		QueuedAudio: OrderPlaced
 		ReadyAudio:
@@ -35,23 +35,27 @@ Player:
 		Type: Aircraft
 		BuildSpeed: .4
 		LowPowerSlowdown: 3
+		QueuedAudio: Building
 		BlockedAudio: NoRoom
 	PlaceBuilding:
 	SupportPowerManager:
 	ConquestVictoryConditions:
 	PowerManager:
+		AdviceInterval: 650
 	AllyRepair:
 	PlayerResources:
 		InitialCash: 5000
+		AdviceInterval: 650
 	ActorGroupProxy:
 	DeveloperMode:
 	HackyAI@Omnius:
 		Name:Omnius
+		UnitQueues: Infantry, Vehicle, Armor, Starport
 		RallypointTestBuilding: conyarda
 		BuildingFractions:
-			refa: 25.1%
-			refh: 25.1%
-			refo: 25.1%
+			refa: 20.1%
+			refh: 20.1%
+			refo: 20.1%
 			barra: 0.1%
 			barrh: 0.1%
 			barro: 0.1%
@@ -61,31 +65,173 @@ Player:
 			heavya: 0.1%
 			heavyh: 0.1%
 			heavyo: 0.1%
-			researcha: 0.1%
-			researchh: 0.1%
-			researcho: 0.1%
-			repaira: 0.1%
-			repairh: 0.1%
-			repairo: 0.1%
 			radara: 0.1%
 			radaro: 0.1%
 			radarh: 0.1%
-			powra: 35%
-			powrh: 35%
-			powro: 35%
+			hightecha: 0.1%
+			hightechh: 0.1%
+			hightecho: 0.1%
+			starporta: 0.1%
+			starporth: 0.1%
+			starporto: 0.1%
+			research: 0.1%
+			guntower: 7%
+			rockettower: 7%
+			powra: 30%
+			powrh: 30%
+			powro: 30%
 		UnitsToBuild:
-			rifle: 30%
-			bazooka: 30%
-			trike: 30%
-			raider: 30%
-			quad: 40%
-			siege: 15%
-			combata: 70%
-			combath: 70%
-			combato: 70%
-			sonic: 25%
-			devast: 25%
-			deviator: 25%
+			rifle: 6%
+			bazooka: 5%
+			medic: 1%
+			fremen: 0.5%
+			sardaukar: 1.5%
+			harvester: 0.1%
+			trikea.starport: 5%
+			#trikeh.starport: 5%
+			#trikeo.starport: 5%
+			quad.starport: 7.5%
+			siegetank.starport: 5%
+			missiletank.starport: 7.5%
+			combata.starport: 15%
+			combath.starport: 15%
+			combato.starport: 15%
+			sonictank: 10%
+			devast: 10%
+			deviatortank: 7.5%
+			trikea: 10%
+			#trikeh: 10%
+			trikeo: 10%
+			quad: 15%
+			siegetank: 10%
+			missiletank: 15%
+			combata: 100%
+			combath: 100%
+			combato: 100%
+		SquadSize: 8
+	HackyAI@Vidius:
+		Name:Vidious
+		UnitQueues: Infantry, Vehicle, Armor, Starport
+		RallypointTestBuilding: conyarda
+		BuildingFractions:
+			refa: 20.1%
+			refh: 20.1%
+			refo: 20.1%
+			barra: 0.1%
+			barrh: 0.1%
+			barro: 0.1%
+			lighta: 0.1%
+			lighth: 0.1%
+			lighto: 0.1%
+			heavya: 0.1%
+			heavyh: 0.1%
+			heavyo: 0.1%
+			radara: 0.1%
+			radaro: 0.1%
+			radarh: 0.1%
+			hightecha: 0.1%
+			hightechh: 0.1%
+			hightecho: 0.1%
+			starporta: 0.1%
+			starporth: 0.1%
+			starporto: 0.1%
+			palacea: 0.1%
+			palaceh: 0.1%
+			palaceo: 0.1%
+			guntower: 5%
+			rockettower: 10%
+			powra: 32%
+			powrh: 32%
+			powro: 32%
+		UnitsToBuild:
+			rifle: 2%
+			bazooka: 2%
+			medic: 0.5%
+			fremen: 0.25%
+			sardaukar: 1%
+			harvester: 0.1%
+			trikea.starport: 7.5%
+			#trikeh.starport: 7.5%
+			#trikeo.starport: 7.5%
+			quad.starport: 12.5%
+			siegetank.starport: 5%
+			missiletank.starport: 7.5%
+			combata.starport: 15%
+			combath.starport: 15%
+			combato.starport: 15%
+			sonictank: 10%
+			devast: 10%
+			deviatortank: 7.5%
+			trikea: 15%
+			#trikeh: 15%
+			trikeo: 15%
+			quad: 25%
+			siegetank: 10%
+			missiletank: 15%
+			combata: 100%
+			combath: 100%
+			combato: 100%
+		SquadSize: 6
+	HackyAI@Gladius:
+		Name:Gladius
+		UnitQueues: Infantry, Vehicle, Armor, Starport
+		RallypointTestBuilding: conyarda
+		BuildingFractions:
+			refa: 20.1%
+			refh: 20.1%
+			refo: 20.1%
+			barra: 0.1%
+			barrh: 0.1%
+			barro: 0.1%
+			lighta: 0.1%
+			lighth: 0.1%
+			lighto: 0.1%
+			heavya: 0.1%
+			heavyh: 0.1%
+			heavyo: 0.1%
+			radara: 0.1%
+			radaro: 0.1%
+			radarh: 0.1%
+			hightecha: 0.1%
+			hightechh: 0.1%
+			hightecho: 0.1%
+			research: 0.1%
+			palacea: 0.1%
+			palaceh: 0.1%
+			palaceo: 0.1%
+			guntower: 10%
+			rockettower: 5%
+			powra: 30%
+			powrh: 30%
+			powro: 30%
+		UnitsToBuild:
+			rifle: 15%
+			bazooka: 13%
+			medic: 2%
+			fremen: 1%
+			sardaukar: 3%
+			harvester: 0.1%
+			trikea.starport: 5%
+			#trikeh.starport: 5%
+			#trikeo.starport: 5%
+			quad.starport: 7.5%
+			siegetank.starport: 5%
+			missiletank.starport: 7.5%
+			combata.starport: 15%
+			combath.starport: 15%
+			combato.starport: 15%
+			sonictank: 10%
+			devast: 10%
+			deviatortank: 7.5%
+			trikea: 10%
+			#trikeh: 10%
+			trikeo: 10%
+			quad: 15%
+			siegetank: 10%
+			missiletank: 15%
+			combata: 100%
+			combath: 100%
+			combato: 100%
 		SquadSize: 10
 	PlayerColorPalette:
 		BasePalette: d2k
@@ -176,9 +322,9 @@ World:
 		Palette: d2k
 		TerrainType: Spice
 		SpriteNames: spice1
-		ValuePerUnit: 35
+		ValuePerUnit: 50
 		Name: Spice
-		PipColor: Green
+		PipColor: green
 		AllowedTerrainTypes: Sand
 		AllowUnderActors: false
 	SmudgeLayer@rock:
@@ -213,98 +359,88 @@ CRATE:
 	Crate:
 		Lifetime: 120
 		TerrainTypes: Sand, Dune, Rock
-	GiveCashCrateAction:
+	GiveCashCrateAction@1:
 		Amount: 1000
-		SelectionShares: 50
+		SelectionShares: 40
+		UseCashTick: yes
+	GiveCashCrateAction@2:
+		Amount: 2000
+		SelectionShares: 15
+		UseCashTick: yes
+	GiveCashCrateAction@3:
+		Amount: 5000
+		SelectionShares: 5
 		UseCashTick: yes
 	LevelUpCrateAction:
 		SelectionShares: 40
 	ExplodeCrateAction@boom:
 		Weapon: CrateExplosion
-		SelectionShares: 5
+		SelectionShares: 10
 	ExplodeCrateAction@nuke:
 		Weapon: CrateNuke
 		SelectionShares: 5
 	HideMapCrateAction:
-		SelectionShares: 5
+		SelectionShares: 3
 		Effect: hide-map
 	RevealMapCrateAction:
-		SelectionShares: 1
+		SelectionShares: 2
 		Effect: reveal-map
 	GiveMcvCrateAction@Atreides:
-		SelectionShares: 2
+		SelectionShares: 3
 		NoBaseSelectionShares: 9001
 		Unit: mcva
 	GiveMcvCrateAction@Harkonnen:
-		SelectionShares: 2
+		SelectionShares: 3
 		NoBaseSelectionShares: 9001
 		Unit: mcvh
 	GiveMcvCrateAction@Ordos:
-		SelectionShares: 2
+		SelectionShares: 3
 		NoBaseSelectionShares: 9001
 		Unit: mcvo
 	GiveUnitCrateAction@TrikeA:
-		SelectionShares: 7
+		SelectionShares: 13#8
 		Unit: trikea
-	GiveUnitCrateAction@TrikeH:
-		SelectionShares: 7
-		Unit: trikeh
-	GiveUnitCrateAction@QuadA:
-		SelectionShares: 6
-		Unit: quada
-	GiveUnitCrateAction@QuadH:
-		SelectionShares: 6
-		Unit: quadh
-	GiveUnitCrateAction@QuadO:
-		SelectionShares: 6
-		Unit: quado
-	GiveUnitCrateAction@Raider:
-		SelectionShares: 6
-		Unit: raider
-	GiveUnitCrateAction@SiegeTankA:
-		SelectionShares: 6
-		Unit: siegetanka
-	GiveUnitCrateAction@SiegeTankH:
-		SelectionShares: 6
-		Unit: siegetankh
-	GiveUnitCrateAction@SiegeTankO:
-		SelectionShares: 6
-		Unit: siegetanko
-	GiveUnitCrateAction@MissileTankA:
-		SelectionShares: 6
-		Unit: missiletanka
-	GiveUnitCrateAction@MissileTankH:
-		SelectionShares: 6
-		Unit: missiletankh
-	GiveUnitCrateAction@MissileTankO:
-		SelectionShares: 6
-		Unit: missiletanko
-	GiveUnitCrateAction@CombatA:
+	#GiveUnitCrateAction@TrikeH:
+	#	SelectionShares: 6
+	#	Unit: trikeh
+	GiveUnitCrateAction@Quad:
+		SelectionShares: 18
+		Unit: quad
+	GiveUnitCrateAction@TrikeO:
 		SelectionShares: 5
+		Unit: trikeo
+	GiveUnitCrateAction@SiegeTank:
+		SelectionShares: 18
+		Unit: siegetank
+	GiveUnitCrateAction@MissileTank:
+		SelectionShares: 12
+		Unit: missiletank
+	GiveUnitCrateAction@CombatA:
+		SelectionShares: 6
 		Unit: combata
 	GiveUnitCrateAction@CombatH:
-		SelectionShares: 5
+		SelectionShares: 6
 		Unit: combath
 	GiveUnitCrateAction@CombatO:
-		SelectionShares: 5
+		SelectionShares: 6
 		Unit: combato
 	GiveUnitCrateAction@Fremen:
 		SelectionShares: 4
 		Unit: fremen
 	GiveUnitCrateAction@Sardaukar:
-		SelectionShares: 4
+		SelectionShares: 6
 		Unit: sardaukar
 	GiveUnitCrateAction@Saboteur:
-		SelectionShares: 4
+		SelectionShares: 2
 		Unit: saboteur
 	GiveUnitCrateAction@SonicTank:
 		SelectionShares: 3
 		Unit: sonictank
 	GiveUnitCrateAction@Devast:
-		SelectionShares: 3
+		SelectionShares: 4
 		Unit: devast
 	GiveUnitCrateAction@deviatortank:
-		SelectionShares: 3
+		SelectionShares: 2
 		Unit: deviatortank
 	RenderSimple:
 	BelowUnits:
@@ -335,6 +471,7 @@ SPICEBLOOM:
 		Name: Spice Bloom
 	SeedsResource:
 		ResourceType: Spice
+		Interval: 175
 	RadarColorFromTerrain:
 		Terrain: Spice

--- a/mods/d2k/rules/vehicles.yaml
+++ b/mods/d2k/rules/vehicles.yaml
@@ -1,13 +1,14 @@
 ^MCV:
 	Inherits: ^Vehicle
 	Buildable:
-		Queue: Vehicle
+		Queue: Armor
 		BuildPaletteOrder: 110
+		Hotkey: m
 	Valued:
 		Cost: 2000
 	Tooltip:
 		Name: Mobile Construction Vehicle
-		Description: Deploys into another Construction Yard.\n  Unarmed
+		Description: Deploys into another Construction Yard\n  Unarmed
 		Icon: mcvicon
 	Selectable:
 		Priority: 3
@@ -24,27 +25,47 @@
 	MustBeDestroyed:
 	BaseBuilding:
 	-AttackMove:
+	Explodes:
+		Weapon: UnitExplodeScale
+		EmptyWeapon: UnitExplodeScale
 	Transforms:
 		TransformSounds: BUILD1.aud
+	LeavesHusk:
+		HuskActor: MCV.Husk

-^HARVESTER:
+MCV.Husk:
+	Inherits: ^Husk
+	Health:
+		HP: 175
+	Tooltip:
+		Name: Destroyed Mobile Construction Vehicle
+		Icon: missiletankicon
+	RenderUnit:
+		Image: DMCV
+
+HARVESTER:
 	Inherits: ^Vehicle
 	Buildable:
-		Queue: Vehicle
+		Queue: Armor
+		Prerequisites: Heavy Factory,Spice Refinery
+		Owner: atreides, harkonnen, ordos
+		BuiltAt: heavya, heavyh, heavyo
 		BuildPaletteOrder: 10
+		Hotkey: h
 	Valued:
-		Cost: 1100
+		Cost: 1000
 	Tooltip:
 		Name: Spice Harvester
-		Description: Collects Spice for processing.\n  Unarmed
+		Description: Collects Spice for processing\n  Unarmed
 		Icon: harvestericon
 	Selectable:
 		Priority: 7
 		Bounds: 42,42
 	Harvester:
-		Capacity: 20
+		PipCount: 7
+		Capacity: 14
 		Resources: Spice
-		UnloadTicksPerBale: 1
+		UnloadTicksPerBale: 15
 		# How far away from our linked refinery to find resources (in cells):
 		SearchFromProcRadius: 24
 		# How far away from last harvest order location to find more resources (in cells):
@@ -57,163 +78,281 @@
 		Speed: 6
 		Crushes: crate, infantry
 	RenderUnit:
+		Image: HARVESTER
 	RevealsShroud:
 		Range: 4
+	Explodes:
+		Weapon: UnitExplodeScale
+		EmptyWeapon: UnitExplodeScale
 	-AttackMove:
+	LeavesHusk:
+		HuskActor: Harvester.Husk
+
+HARVESTER.Husk:
+	Inherits: ^Husk
+	Health:
+		HP: 150
+	Tooltip:
+		Name: Destroyed Spice Harvester
+		Icon: harvestericon
+	RenderUnit:
+		Image: HARVESTER
+
+HARVESTER.starport:
+	Inherits: HARVESTER
+	Buildable:
+		Queue: Starport
+		BuiltAt: starporta, starporth, starporto
+	Valued:
+		Cost: 895

 ^TRIKE:
 	Inherits: ^Vehicle
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 15
+		Hotkey: w
 	Valued:
-		Cost: 200
+		Cost: 250
 	Tooltip:
 		Name: Scout Trike
-		Description: Weak Scout.\n Decent vs. Infantry
+		Description: Fast Scout\n Strong vs Infantry
 		Icon: trikeicon
 	Selectable:
 		Bounds: 24,24
 	Health:
-		HP: 75
+		HP: 100
 	Armor:
 		Type: Light
 	Mobile:
-		ROT: 10
+		ROT: 9
 		Speed: 12
 	RevealsShroud:
 		Range: 8
 	RenderUnit:
+	WithMuzzleFlash:
 	AttackFrontal:
 		PrimaryWeapon: M60mg
-		PrimaryOffset: 0,0,0,-4
+		PrimaryOffset: 0,-6,0,-3
+		#PrimaryLocalOffset: 1,-1,0,-3,0, -1,-1,0,-3,0
 	AutoTarget:
-	Cargo:
-		Types: Infantry
-		MaxWeight: 1
-		PipCount: 1
-		UnloadFacing: 220
+		InitialStance: Defend
+	Explodes:
+		Weapon: UnitExplodeTiny
+		EmptyWeapon: UnitExplodeTiny
+	#Cargo:
+	#	Types: Infantry
+	#	MaxWeight: 1
+	#	PipCount: 1
+	#	UnloadFacing: 220

-^QUAD:
+QUAD:
 	Inherits: ^Vehicle
 	Buildable:
 		Queue: Vehicle
-		BuildPaletteOrder: 30
+		Prerequisites: Light Factory
+		Owner: atreides, harkonnen, ordos
+		BuiltAt: lighta, lighth, lighto
+		BuildPaletteOrder: 20
+		Hotkey: q
 	Valued:
 		Cost: 400
 	Tooltip:
-		Name: Quad
-		Description: Fast scout vehicle, armed with \nrockets.\n  Strong vs Vehicles\n  Weak vs Infantry
+		Name: Missile Quad
+		Description: Missile Scout\n Strong vs Vehicles\n  Weak vs Infantry
 		Icon: quadicon
 	Health:
-		HP: 120
+		HP: 125
 	Armor: 
 		Type: Light
 	Mobile:
-		ROT: 10
-		Speed: 12
+		ROT: 8
+		Speed: 10
 	RevealsShroud:
 		Range: 7
 	RenderUnit:
+		Image: QUAD
 	AttackFrontal:
 		PrimaryWeapon: QuadRockets
-		PrimaryOffset: 0,0,0,-2
-		PrimaryLocalOffset: -4,0,0,0,25, 4,0,0,0,-25
+		PrimaryLocalOffset: 0,-3,0,-2,0 #-4
 	AutoTarget:
+		InitialStance: Defend
+	Explodes:
+		Weapon: UnitExplodeTiny
+		EmptyWeapon: UnitExplodeTiny
 	Selectable:
 		Bounds: 24,24

+QUAD.starport:
+	Inherits: QUAD
+	Buildable:
+		Queue: Starport
+		BuiltAt: starporta, starporth, starporto
+	Valued:
+		Cost: 295
+
 ^COMBAT:
 	Inherits: ^Tank
 	Buildable:
-		Queue: Vehicle
-		BuildPaletteOrder: 60
+		Queue: Armor
+		BuildPaletteOrder: 25
+		Hotkey: c
 	Valued:
-		Cost: 850
+		Cost: 700
 	Tooltip:
 		Name: Combat Tank
-		Description: Main Battle Tank.\n  Strong vs Tanks, Light Vehicles\n  Weak vs Infantry, Aircraft
+		Description: Main Battle Tank\n  Strong vs Tanks\n  Weak vs Infantry, Aircraft\n \n  Atreides:     +Range\n  Harkonnen: +Health\n  Ordos:        +Speed
 	Health:
-		HP: 450
+		HP: 325
 	Armor:
 		Type: Heavy
 	Mobile:
-		Speed: 6
+		Speed: 7
 		Crushes: crate, infantry
 	RevealsShroud:
-		Range: 5
+		Range: 6
 	Turreted:
-		ROT: 5
+		ROT: 6
 	AttackTurreted:
+		AlignIdleTurrets: true
 		PrimaryWeapon: 90mm
-		PrimaryRecoil: 3
-		PrimaryRecoilRecovery: 0.9
+		PrimaryRecoil: 4
+		PrimaryRecoilRecovery: 0.8
+		PrimaryLocalOffset: 0,-2,0,-3,0
 	RenderUnitTurreted:
 	AutoTarget:
+		InitialStance: Defend
 	Explodes:
 		Weapon: UnitExplodeSmall
 		EmptyWeapon: UnitExplodeSmall
 	Selectable:
 		Bounds: 30,30

-^SIEGETANK:
+^COMBAT.Husk:
+	Inherits: ^Husk
+	Health:
+		HP: 100
+	ThrowsParticle@turret:
+		Anim: turret
+		Spread: 3,3
+		Speed: 6
+		AnimKey: turret
+
+SIEGETANK:
 	Inherits: ^Tank
 	Buildable:
-		Queue: Vehicle
-		BuildPaletteOrder: 80
+		Queue: Armor
+		Prerequisites: Heavy Factory,Outpost
+		Owner: atreides, harkonnen, ordos
+		BuiltAt: heavya, heavyh, heavyo
+		BuildPaletteOrder: 30
+		Hotkey: t
 	Valued:
-		Cost: 600
+		Cost: 850
 	Tooltip:
 		Name: Siege Tank
-		Description: Long-range artillery.\n  Strong vs Infantry, Buildings\n  Weak vs Tanks, Aircraft
+		Description: Siege Artillery\n  Strong vs Infantry, Buildings\n  Weak vs Tanks, Aircraft
 		Icon: siegetankicon
 	Health:
-		HP: 75
+		HP: 85
 	Armor:
 		Type: Light
 	Mobile:
-		Speed: 6
+		Speed: 5
+		ROT: 3
 		Crushes: crate, infantry
 	RevealsShroud:
 		Range: 5
 	Turreted:
-		ROT: 5
-	AttackTurreted:
+		ROT: 3
+	AttackFrontal:
 		PrimaryWeapon: 155mm
-		PrimaryRecoil: 3
-		PrimaryRecoilRecovery: 0.9
+		PrimaryRecoil: 7
+		PrimaryRecoilRecovery: 0.45
+		PrimaryLocalOffset: 0,-4,0,-7,0
 	RenderUnitTurreted:
+		Image: SIEGETANK
 	Explodes:
-		Weapon: UnitExplode
-		Chance: 75  
+		Weapon: UnitExplodeScale
+		EmptyWeapon: UnitExplodeScale
 	AutoTarget:
+		InitialStance: Defend
 	Selectable:
 		Bounds: 30,30
+	LeavesHusk:
+		HuskActor: Siegetank.Husk

-^MISSILETANK:
+SIEGETANK.Husk:
+	Inherits: ^Husk
+	Tooltip:
+		Icon: siegetankicon
+	ThrowsParticle@turret:
+		Anim: turret
+		Spread: 3,3
+		Speed: 6
+		AnimKey: turret
+	RenderUnit:
+		Image: SIEGETANK
+
+SIEGETANK.starport:
+	Inherits: SIEGETANK
+	Buildable:
+		Queue: Starport
+		BuiltAt: starporta, starporth, starporto
+	Valued:
+		Cost: 594
+
+MISSILETANK:
 	Inherits: ^Tank
 	Valued:
-		Cost: 800
+		Cost: 1000
 	Tooltip:
-		Name: Missile Tank
-		Description: Long range artillery.\n  Strong vs Infantry, Buildings\n  Weak vs Tanks, Aircraft
+		Name: Rocket Tank
+		Description: Rocket Artillery\n  Strong vs Vehicles, Buildings\n  Weak vs Infantry, Aircraft
 		Icon: missiletankicon
 	Buildable:
-		Queue: Vehicle
-		BuildPaletteOrder: 50
+		Queue: Armor
+		Prerequisites: Heavy Factory,High Tech Facility
+		Owner: atreides, harkonnen
+		BuiltAt: heavya, heavyh
+		BuildPaletteOrder: 40
+		Hotkey: r
 	Mobile:
 		Speed: 6
+		ROT: 3
 	Health:
-		HP: 120
+		HP: 110
 	Armor:
 		Type: Light
 	RevealsShroud:
 		Range: 6
 	RenderUnit:
+		Image: MISSILETANK
 	AttackFrontal:
 		PrimaryWeapon: 227mm
-		PrimaryOffset: 0,6,0,-3
-		PrimaryLocalOffset: 3,-5,0,0,0, -3,-5,0,0,0
+		PrimaryLocalOffset: 3,5,0,-4,0, -6,5,0,-4,0
 	AutoTarget:
+		InitialStance: Defend
+	Explodes:
+		Weapon: UnitExplodeScale
+		EmptyWeapon: UnitExplodeScale
 	Selectable:
-		Bounds: 30,30
+		Bounds: 30,30
+	LeavesHusk:
+		HuskActor: Missiletank.Husk
+
+MISSILETANK.Husk:
+	Inherits: ^Husk
+	Tooltip:
+		Icon: missiletankicon
+	RenderUnit:
+		Image: MISSILETANK
+
+MISSILETANK.starport:
+	Inherits: MISSILETANK
+	Buildable:
+		Queue: Starport
+		Owner: atreides, harkonnen, ordos
+		BuiltAt: starporta, starporth, starporto
+	Valued:
+		Cost: 699
--- a/mods/d2k/sequences.yaml
+++ b/mods/d2k/sequences.yaml
@@ -1,3 +1,13 @@
+90mm:
+	idle: 
+		Start: 0
+		Facings: 32
+
+laserfire:
+	idle: veh-hit2
+		Start: 0
+		Length: *
+
 dmcv:
 	idle:
 		Start: 0
@@ -8,9 +18,10 @@ harvester:
 		Start: 0
 		Facings: 32
 	harvest:
-		Start: 0
-		Length: 0
+		Start: 32
+		Length: 8
 		Facings: 8
+		Tick: 150
 	dock: unload
 		Start: 0
 		Length: 10
@@ -18,35 +29,7 @@ harvester:
 		Start: 10
 		Length: 1

-walla:
-	idle:
-		Start: 0
-		Length: 16
-	scratched-idle:
-		Start: 0
-		Length: 16
-	damaged-idle:
-		Start: 16
-		Length: 16
-	critical-idle:
-		Start: 16
-		Length: 16
-
-wallh:
-	idle:
-		Start: 0
-		Length: 16
-	scratched-idle:
-		Start: 0
-		Length: 16
-	damaged-idle:
-		Start: 16
-		Length: 16
-	critical-idle:
-		Start: 16
-		Length: 16
-
-wallo:
+wall:
 	idle:
 		Start: 0
 		Length: 16
@@ -73,7 +56,7 @@ orni:
 		Start: 0
 		Facings: 32
 		Length: 3
-		Tick: 160
+		Tick: 90

 trike:
 	idle:
@@ -82,11 +65,22 @@ trike:
 	unload:
 		Start: 0
 		Facings: 32
+	muzzle: minigun
+		Start: 0
+		Length: 6
+		Facings: 8

 quad:
 	idle:
 		Start: 0
 		Facings: 32
+	unload:
+		Start: 0
+		Facings: 32
+	muzzle: minigun
+		Start: 0
+		Length: 6
+		Facings: 8

 siegetank:
 	idle:
@@ -106,7 +100,7 @@ sonictank:
 		Start: 0
 		Facings: 32

-guntowera:
+guntower:
 	idle:
 		Start: 0
 		Facings: 1
@@ -122,11 +116,11 @@ guntowera:
 	damaged-recoil:
 		Start: 0
 		Facings: 1
-	turret: gunturreta
+	turret: gunturret
 		Start: 0
 		Facings: 32

-guntowerh:
+rockettower:
 	idle:
 		Start: 0
 		Facings: 1
@@ -142,86 +136,7 @@ guntowerh:
 	damaged-recoil:
 		Start: 0
 		Facings: 1
-	turret: gunturreth
-		Start: 0
-		Facings: 32
-
-guntowero:
-	idle:
-		Start: 0
-		Facings: 1
-	recoil:
-		Start: 0
-		Facings: 1
-	make: silomake
-		Start: 0
-		Length: *
-	damaged-idle:
-		Start: 0
-		Facings: 1
-	damaged-recoil:
-		Start: 0
-		Facings: 1
-	turret: gunturreto
-		Start: 0
-		Facings: 32
-
-rockettowera:
-	idle:
-		Start: 0
-		Facings: 1
-	recoil:
-		Start: 0
-		Facings: 1
-	make: silomake
-		Start: 0
-		Length: *
-	damaged-idle:
-		Start: 0
-		Facings: 1
-	damaged-recoil:
-		Start: 0
-		Facings: 1
-	turret: rocketturreta
-		Start: 0
-		Facings: 32
-
-rockettowerh:
-	idle:
-		Start: 0
-		Facings: 1
-	recoil:
-		Start: 0
-		Facings: 1
-	make: silomake
-		Start: 0
-		Length: *
-	damaged-idle:
-		Start: 0
-		Facings: 1
-	damaged-recoil:
-		Start: 0
-		Facings: 1
-	turret: rocketturreth
-		Start: 0
-		Facings: 32
-rockettowero:
-	idle:
-		Start: 0
-		Facings: 1
-	recoil:
-		Start: 0
-		Facings: 1
-	make: silomake
-		Start: 0
-		Length: *
-	damaged-idle:
-		Start: 0
-		Facings: 1
-	damaged-recoil:
-		Start: 0
-		Facings: 1
-	turret: rocketturreto
+	turret: rocketturret
 		Start: 0
 		Facings: 32

@@ -244,7 +159,7 @@ rifle:
 		Start: 8
 		Length: 6
 		Facings: 8
-		Tick: 120
+		Tick: 110
 	shoot:
 		Start: 56
 		Length: 5
@@ -258,7 +173,7 @@ rifle:
 		Start: 112
 		Length: 3
 		Facings: 8
-		Tick: 120
+		Tick: 110
 	standup-0:
 		Start: 96
 		Length: 1
@@ -270,27 +185,41 @@ rifle:
 		Facings: 8
 		Tick: 120
 	die1: rifledeath
-		Start: 0
-		Length: 5
-	die2: rifledeath
-		Start: 5
-		Length: 7
-	die3: rifledeath
 		Start: 12
-		Length: 7
+		Length: 12
+		Tick: 80
+	die2: rifledeath
+		Start: 12
+		Length: 12
+		Tick: 80
+	die3: rifledeath
+		Start: 36
+		Length: 12
+		Tick: 80
 	die4: rifledeath
-		Start: 19
-		Length: 7
+		Start: 24
+		Length: 12
+		Tick: 80
 	die5: rifledeath
-		Start: 26
-		Length: 7
+		Start: 0
+		Length: 12
+		Tick: 80
 	die6: rifledeath
-		Start: 26
-		Length: 7
+		Start: 12
+		Length: 12
+		Tick: 80
 	die-crushed: rifledeath
-		Start: 54
-		Length: 22
-		Tick: 1600
+		Start: 48
+		Length: 12
+		Tick: 160
+	idle1: rifledeath
+		Start: 60
+		Length: 8
+		Tick: 160
+	idle2: rifledeath
+		Start: 68
+		Length: 8
+		Tick: 160

 bazooka:
 	stand:
@@ -330,28 +259,42 @@ bazooka:
 		Length: 5
 		Facings: 8
 		Tick: 120
-	die1: rifledeath
-		Start: 0
-		Length: 5
-	die2: rifledeath
-		Start: 5
-		Length: 7
-	die3: rifledeath
-		Start: 12
-		Length: 7
-	die4: rifledeath
-		Start: 19
-		Length: 7
-	die5: rifledeath
-		Start: 26
-		Length: 7
-	die6: rifledeath
-		Start: 26
-		Length: 7
-	die-crushed: rifledeath
-		Start: 54
-		Length: 22
-		Tick: 1600
+	die1:
+		Start: 176
+		Length: 8
+		Tick: 120
+	die2:
+		Start: 184
+		Length: 8
+		Tick: 120
+	die3:
+		Start: 192
+		Length: 8
+		Tick: 120
+	die4:
+		Start: 200
+		Length: 8
+		Tick: 120
+	die5:
+		Start: 176
+		Length: 8
+		Tick: 120
+	die6:
+		Start: 184
+		Length: 8
+		Tick: 120
+	die-crushed:
+		Start: 208
+		Length: 8
+		Tick: 240
+	idle1:
+		Start: 216
+		Length: 8
+		Tick: 160
+	idle2:
+		Start: 224
+		Length: 8
+		Tick: 160

 engineer:
 	stand:
@@ -364,29 +307,35 @@ engineer:
 		Start: 8
 		Length: 6
 		Facings: 8
-		Tick: 120
+		Tick: 110
 	die1: rifledeath
-		Start: 0
-		Length: 5
-	die2: rifledeath
-		Start: 5
-		Length: 7
-	die3: rifledeath
 		Start: 12
-		Length: 7
+		Length: 12
+		Tick: 80
+	die2: rifledeath
+		Start: 12
+		Length: 12
+		Tick: 80
+	die3: rifledeath
+		Start: 36
+		Length: 12
+		Tick: 80
 	die4: rifledeath
-		Start: 19
-		Length: 7
+		Start: 24
+		Length: 12
+		Tick: 80
 	die5: rifledeath
-		Start: 26
-		Length: 7
+		Start: 0
+		Length: 12
+		Tick: 80
 	die6: rifledeath
-		Start: 26
-		Length: 7
+		Start: 12
+		Length: 12
+		Tick: 80
 	die-crushed: rifledeath
-		Start: 54
-		Length: 22
-		Tick: 1600
+		Start: 48
+		Length: 12
+		Tick: 160

 thumper:
 	stand:
@@ -400,28 +349,38 @@ thumper:
 		Length: 6
 		Facings: 8
 		Tick: 120
+	heal:
+		Start: 60
+		Length: 4
+		Tick: 480
 	die1: rifledeath
-		Start: 0
-		Length: 5
-	die2: rifledeath
-		Start: 5
-		Length: 7
-	die3: rifledeath
 		Start: 12
-		Length: 7
+		Length: 12
+		Tick: 80
+	die2: rifledeath
+		Start: 12
+		Length: 12
+		Tick: 80
+	die3: rifledeath
+		Start: 36
+		Length: 12
+		Tick: 80
 	die4: rifledeath
-		Start: 19
-		Length: 7
+		Start: 24
+		Length: 12
+		Tick: 80
 	die5: rifledeath
-		Start: 26
-		Length: 7
+		Start: 0
+		Length: 12
+		Tick: 80
 	die6: rifledeath
-		Start: 26
-		Length: 7
+		Start: 12
+		Length: 12
+		Tick: 80
 	die-crushed: rifledeath
-		Start: 54
-		Length: 22
-		Tick: 1600
+		Start: 48
+		Length: 12
+		Tick: 160

 thumping:
 	idle: thumper
@@ -448,28 +407,58 @@ fremen:
 		Length: 6
 		Facings: 8
 		Tick: 120
-	die1: rifledeath
-		Start: 0
+	shoot:
+		Start: 56
 		Length: 5
-	die2: rifledeath
-		Start: 5
-		Length: 7
-	die3: rifledeath
+		Facings: 8
+		Tick: 120
+	prone-stand:
+		Start: 104
+		Length: 1
+		Facings: 8
+	prone-run:
+		Start: 112
+		Length: 3
+		Facings: 8
+		Tick: 120
+	standup-0:
+		Start: 96
+		Length: 1
+		Facings: 8
+		Tick: 120
+	prone-shoot:
+		Start: 136
+		Length: 5
+		Facings: 8
+		Tick: 120
+	die1: rifledeath
 		Start: 12
-		Length: 7
+		Length: 12
+		Tick: 80
+	die2: rifledeath
+		Start: 12
+		Length: 12
+		Tick: 80
+	die3: rifledeath
+		Start: 36
+		Length: 12
+		Tick: 80
 	die4: rifledeath
-		Start: 19
-		Length: 7
+		Start: 24
+		Length: 12
+		Tick: 80
 	die5: rifledeath
-		Start: 26
-		Length: 7
+		Start: 0
+		Length: 12
+		Tick: 80
 	die6: rifledeath
-		Start: 26
-		Length: 7
+		Start: 12
+		Length: 12
+		Tick: 80
 	die-crushed: rifledeath
-		Start: 54
-		Length: 22
-		Tick: 1600
+		Start: 48
+		Length: 12
+		Tick: 160

 saboteur:
 	stand:
@@ -482,29 +471,35 @@ saboteur:
 		Start: 8
 		Length: 4
 		Facings: 8
-		Tick: 120
+		Tick: 100
 	die1: rifledeath
-		Start: 0
-		Length: 5
-	die2: rifledeath
-		Start: 5
-		Length: 7
-	die3: rifledeath
 		Start: 12
-		Length: 7
+		Length: 12
+		Tick: 80
+	die2: rifledeath
+		Start: 12
+		Length: 12
+		Tick: 80
+	die3: rifledeath
+		Start: 36
+		Length: 12
+		Tick: 80
 	die4: rifledeath
-		Start: 19
-		Length: 7
+		Start: 24
+		Length: 12
+		Tick: 80
 	die5: rifledeath
-		Start: 26
-		Length: 7
+		Start: 0
+		Length: 12
+		Tick: 80
 	die6: rifledeath
-		Start: 26
-		Length: 7
+		Start: 12
+		Length: 12
+		Tick: 80
 	die-crushed: rifledeath
-		Start: 54
-		Length: 22
-		Tick: 1600
+		Start: 48
+		Length: 12
+		Tick: 160

 sardaukar:
 	stand:
@@ -515,31 +510,61 @@ sardaukar:
 		Facings: 8
 	run:
 		Start: 8
-		Length: 4
+		Length: 6
+		Facings: 8
+		Tick: 120
+	shoot:
+		Start: 56
+		Length: 5
+		Facings: 8
+		Tick: 120
+	prone-stand:
+		Start: 104
+		Length: 1
+		Facings: 8
+	prone-run:
+		Start: 112
+		Length: 3
+		Facings: 8
+		Tick: 120
+	standup-0:
+		Start: 96
+		Length: 1
+		Facings: 8
+		Tick: 120
+	prone-shoot:
+		Start: 136
+		Length: 5
 		Facings: 8
 		Tick: 120
 	die1: rifledeath
-		Start: 0
-		Length: 5
-	die2: rifledeath
-		Start: 5
-		Length: 7
-	die3: rifledeath
 		Start: 12
-		Length: 7
+		Length: 12
+		Tick: 80
+	die2: rifledeath
+		Start: 12
+		Length: 12
+		Tick: 80
+	die3: rifledeath
+		Start: 36
+		Length: 12
+		Tick: 80
 	die4: rifledeath
-		Start: 19
-		Length: 7
+		Start: 24
+		Length: 12
+		Tick: 80
 	die5: rifledeath
-		Start: 26
-		Length: 7
+		Start: 0
+		Length: 12
+		Tick: 80
 	die6: rifledeath
-		Start: 26
-		Length: 7
+		Start: 12
+		Length: 12
+		Tick: 80
 	die-crushed: rifledeath
-		Start: 54
-		Length: 22
-		Tick: 1600
+		Start: 48
+		Length: 12
+		Tick: 160

 conyarda:
 	idle:
@@ -549,23 +574,31 @@ conyarda:
 		Length: *
 	damaged-idle:
 		Start: 1
-#	build: cranea
-#		Start: 0
-#		Length: 14
-#		Tick: 75
-#	damaged-build: cranea
-#		Start: 0
-#		Length: 14
-#		Tick: 75
+	#build: cranea
+	#	Start: 0
+	#	Length: 14
+	#	Tick: 75
+	#damaged-build: cranea
+	#	Start: 0
+	#	Length: 14
+	#	Tick: 75

-repaira:
+repair:
 	idle:
 		Start: 0
+	active:
+		Start: 0
+		Length: 10
+		Tick: 60
+	damaged-active:
+		Start: 10
+		Length: 10
+		Tick: 60
 	make: repairmake
 		Start: 0
 		Length: *
 	damaged-idle:
-		Start: 1
+		Start: 10

 starporta:
 	idle:
@@ -584,11 +617,13 @@ starporta:
 pwra:
 	idle:
 		Start: 0
+		Length: 6
+		Tick: 160
 	make: wtrpmake
 		Start: 0
 		Length: *
 	damaged-idle:
-		Start: 1
+		Start: 6

 barra:
 	idle:
@@ -648,14 +683,18 @@ hightecha:
 	damaged-idle:
 		Start: 1

-researcha:
+research:
 	idle:
 		Start: 0
+		Length: 20
+		Tick: 80
 	make: researchmake
 		Start: 0
 		Length: *
 	damaged-idle:
-		Start: 1
+		Start: 20
+		Length: 20
+		Tick: 80

 palacea:
 	idle:
@@ -724,15 +763,6 @@ conyardh:
 	damaged-idle:
 		Start: 1

-repairh:
-	idle:
-		Start: 0
-	make: repairmake
-		Start: 0
-		Length: *
-	damaged-idle:
-		Start: 1
-
 starporth:
 	idle:
 		Start: 0
@@ -750,11 +780,13 @@ starporth:
 pwrh:
 	idle:
 		Start: 0
+		Length: 6
+		Tick: 160
 	make: wtrpmake
 		Start: 0
 		Length: *
 	damaged-idle:
-		Start: 1
+		Start: 6

 barrh:
 	idle:
@@ -814,15 +846,6 @@ hightechh:
 	damaged-idle:
 		Start: 1

-researchh:
-	idle:
-		Start: 0
-	make: researchmake
-		Start: 0
-		Length: *
-	damaged-idle:
-		Start: 1
-
 palaceh:
 	idle:
 		Start: 0
@@ -830,8 +853,15 @@ palaceh:
 		Start: 0
 		Length: *
 	damaged-idle:
+		Start: 7
+	active:
 		Start: 1
-
+		Length: 6
+		Tick: 160
+	damaged-active:
+		Start: 8
+		Length: 6
+		Tick: 160

 lighth:
 	idle:
@@ -895,15 +925,6 @@ conyardo:
 	damaged-idle:
 		Start: 1

-repairo:
-	idle:
-		Start: 0
-	make: repairmake
-		Start: 0
-		Length: *
-	damaged-idle:
-		Start: 1
-
 starporto:
 	idle:
 		Start: 0
@@ -921,11 +942,13 @@ starporto:
 pwro:
 	idle:
 		Start: 0
+		Length: 6
+		Tick: 160
 	make: wtrpmake
 		Start: 0
 		Length: *
 	damaged-idle:
-		Start: 1
+		Start: 6

 barro:
 	idle:
@@ -985,15 +1008,6 @@ hightecho:
 	damaged-idle:
 		Start: 1

-researcho:
-	idle:
-		Start: 0
-	make: researchmake
-		Start: 0
-		Length: *
-	damaged-idle:
-		Start: 1
-
 palaceo:
 	idle:
 		Start: 0
@@ -1059,6 +1073,10 @@ raider:
 	unload:
 		Start: 0
 		Facings: 32
+	muzzle: minigun
+		Start: 0
+		Length: 6
+		Facings: 8

 deviatortank:
 	idle:
@@ -1145,9 +1163,14 @@ explosion:
 	napalm: napalm2
 		Start: 0
 		Length: *
+	napalm2: napalm2
+		Start: 0
+		Length: *
+		Tick: 60
 	nuke: atomsfx
 		Start: 0
 		Length: *
+		Tick: 60
 	med_splash: h2o_exp2
 		Start: 0
 		Length: *
@@ -1353,4 +1376,18 @@ plates:
 		Length: 6
 	critical-idle:
 		Start: 0
-		Length: 6
+		Length: 6
+
+fire:
+	1: fire1
+		Start: 0
+		Length: *
+	2: fire2
+		Start: 0
+		Length: *
+	3: fire3
+		Start: 0
+		Length: *
+	4: fire4
+		Start: 0
+		Length: *
--- a/mods/d2k/tilesets/arrakis.yaml
+++ b/mods/d2k/tilesets/arrakis.yaml
@@ -365,7 +365,7 @@ Templates:
 		Id: 28
 		Image: BASE28
 		Size: 2,2
-		Category: Rock
+		Category: Rock-Detail
 		PickAny: False
 		Tiles:
 			1: Rough
@@ -754,10 +754,10 @@ Templates:
 		Category: Rock-Detail
 		PickAny: False
 		Tiles:
-			3: Transition
-			2: Transition
-			0: Transition
-			1: Transition
+			3: Rough
+			2: Rough
+			0: Rough
+			1: Rough
 	Template@66:
 		Id: 66
 		Image: BASE66
@@ -998,7 +998,7 @@ Templates:
 		Category: Rock-Detail
 		PickAny: False
 		Tiles:
-			0: Rock
+			0: Rough
 	Template@93:
 		Id: 93
 		Image: BASE93
@@ -1020,9 +1020,9 @@ Templates:
 		PickAny: False
 		Tiles:
 			1: Rock
-			3: Rock
-			2: Rock
-			0: Rock
+			3: Rough
+			2: Rough
+			0: Rough
 	Template@95:
 		Id: 95
 		Image: BASE95
@@ -1030,7 +1030,7 @@ Templates:
 		Category: Rock-Detail
 		PickAny: False
 		Tiles:
-			0: Rock
+			0: Rough
 			1: Rock
 	Template@96:
 		Id: 96
@@ -1946,7 +1946,7 @@ Templates:
 		Tiles:
 			0: Cliff
 			2: Cliff
-			3: Transition
+			3: Cliff
 			1: Transition
 	Template@199:
 		Id: 199
@@ -3420,7 +3420,7 @@ Templates:
 			0: Rough
 			2: Rough
 			3: Rough
-			1: Sand
+			1: Rock
 	Template@349:
 		Id: 349
 		Image: BGBS10
@@ -3800,12 +3800,12 @@ Templates:
 		Category: Sand-Detail
 		PickAny: False
 		Tiles:
-			1: Sand
-			3: Sand
+			1: Rough
+			3: Rough
 			5: Sand
 			4: Sand
-			2: Sand
-			0: Sand
+			2: Rough
+			0: Rough
 	Template@385:
 		Id: 385
 		Image: ICE24
@@ -3813,10 +3813,10 @@ Templates:
 		Category: Sand-Detail
 		PickAny: False
 		Tiles:
-			0: Sand
-			2: Sand
-			3: Sand
-			1: Sand
+			0: Rough
+			2: Rough
+			3: Rough
+			1: Rough
 	Template@386:
 		Id: 386
 		Image: ICE25
@@ -3824,9 +3824,9 @@ Templates:
 		Category: Sand-Detail
 		PickAny: False
 		Tiles:
-			0: Sand
-			2: Sand
-			3: Sand
+			0: Rough
+			2: Rough
+			3: Rough
 			1: Sand
 	Template@387:
 		Id: 387
@@ -4000,8 +4000,8 @@ Templates:
 		Category: Sand-Detail
 		PickAny: False
 		Tiles:
-			0: Sand
-			1: Sand
+			0: Rough
+			1: Rough
 	Template@404:
 		Id: 404
 		Image: ICE43
@@ -4009,8 +4009,8 @@ Templates:
 		Category: Sand-Detail
 		PickAny: False
 		Tiles:
-			0: Sand
-			1: Sand
+			0: Rough
+			1: Rough
 	Template@405:
 		Id: 405
 		Image: ICE44
@@ -4018,8 +4018,8 @@ Templates:
 		Category: Sand-Detail
 		PickAny: False
 		Tiles:
-			0: Sand
-			1: Sand
+			0: Rough
+			1: Rough
 	Template@406:
 		Id: 406
 		Image: ICE45
@@ -4027,8 +4027,8 @@ Templates:
 		Category: Sand-Detail
 		PickAny: False
 		Tiles:
-			0: Sand
-			1: Sand
+			0: Rough
+			1: Rough
 	Template@407:
 		Id: 407
 		Image: ICE46
@@ -4036,8 +4036,8 @@ Templates:
 		Category: Sand-Detail
 		PickAny: False
 		Tiles:
-			1: Sand
-			0: Sand
+			1: Rough
+			0: Rough
 	Template@408:
 		Id: 408
 		Image: TREE00
@@ -4045,7 +4045,7 @@ Templates:
 		Category: Sand-Detail
 		PickAny: False
 		Tiles:
-			0: Sand
+			0: Rough
 	Template@409:
 		Id: 409
 		Image: TREE01
@@ -4053,7 +4053,7 @@ Templates:
 		Category: Sand-Detail
 		PickAny: False
 		Tiles:
-			0: Sand
+			0: Rough
 	Template@410:
 		Id: 410
 		Image: TREE02
@@ -4700,10 +4700,10 @@ Templates:
 		Tiles:
 			0: Sand
 			4: Cliff
-			8: Cliff
+			8: Rough
 			9: Cliff
 			10: Cliff
-			11: Sand
+			11: Rough
 			7: Sand
 			3: Sand
 			2: Cliff
@@ -4717,10 +4717,10 @@ Templates:
 		Category: BaseBorder-Cliff
 		PickAny: False
 		Tiles:
-			3: Sand
-			2: Sand
-			0: Sand
-			1: Sand
+			3: Cliff
+			2: Cliff
+			0: Cliff
+			1: Cliff
 	Template@476:
 		Id: 476
 		Image: WAST31
@@ -4741,8 +4741,8 @@ Templates:
 		Category: Sand-Detail
 		PickAny: False
 		Tiles:
-			0: Concrete
-			1: Concrete
+			0: Rough
+			1: Rough
 	Template@478:
 		Id: 478
 		Image: WAST33
@@ -4767,9 +4767,9 @@ Templates:
 		PickAny: False
 		Tiles:
 			0: Sand
-			1: Sand
-			2: Sand
-			3: Sand
+			1: Cliff
+			2: Cliff
+			3: Rough
 	Template@481:
 		Id: 481
 		Image: WAST36
--- a/mods/d2k/uibits/tabs.png
+++ b/mods/d2k/uibits/tabs.png
--- a/mods/d2k/uibits/tabs.psd
+++ b/mods/d2k/uibits/tabs.psd
--- a/Show More
+++ b/Show More