Merge

2012-07-02 13:46:28 +12:00
parent 5897a44fc5 3dc39b2c9d
commit b3c5137add
101 changed files with 1629 additions and 624 deletions
--- a/mods/cnc/chrome/ingame.yaml
+++ b/mods/cnc/chrome/ingame.yaml
@@ -103,8 +103,6 @@ Container@PLAYER_WIDGETS:
 					Font:Bold
 					TooltipText: Menu
 					TooltipContainer:TOOLTIP_CONTAINER
-					ClickSound:button.aud
-					ClickDisabledSound:scold2.aud
 					Children:
 						Image@ICON:
 							X:7
@@ -120,8 +118,6 @@ Container@PLAYER_WIDGETS:
 					Font:Bold
 					TooltipText: Sell
 					TooltipContainer:TOOLTIP_CONTAINER
-					ClickSound:button.aud
-					ClickDisabledSound:scold2.aud
 					Children:
 						Image@ICON:
 							X:7
@@ -136,8 +132,6 @@ Container@PLAYER_WIDGETS:
 					Font:Bold
 					TooltipText: Repair
 					TooltipContainer:TOOLTIP_CONTAINER
-					ClickSound:button.aud
-					ClickDisabledSound:scold2.aud
 					Children:
 						Image@ICON:
 							X:7
@@ -200,8 +194,6 @@ Container@PLAYER_WIDGETS:
 							Key: q
 							TooltipText: Buildings
 							TooltipContainer:TOOLTIP_CONTAINER
-							ClickSound:button.aud
-							ClickDisabledSound:scold2.aud
 							Children:
 								Image@ICON:
 									X:7
@@ -214,8 +206,6 @@ Container@PLAYER_WIDGETS:
 							Key: w
 							TooltipText: Defense
 							TooltipContainer:TOOLTIP_CONTAINER
-							ClickSound:button.aud
-							ClickDisabledSound:scold2.aud
 							Children:
 								Image@ICON:
 									X:7
@@ -228,8 +218,6 @@ Container@PLAYER_WIDGETS:
 							Key: e
 							TooltipText: Infantry
 							TooltipContainer:TOOLTIP_CONTAINER
-							ClickSound:button.aud
-							ClickDisabledSound:scold2.aud
 							Children:
 								Image@ICON:
 									X:7
@@ -242,8 +230,6 @@ Container@PLAYER_WIDGETS:
 							Key: r
 							TooltipText: Vehicles
 							TooltipContainer:TOOLTIP_CONTAINER
-							ClickSound:button.aud
-							ClickDisabledSound:scold2.aud
 							Children:
 								Image@ICON:
 									X:7
@@ -256,8 +242,6 @@ Container@PLAYER_WIDGETS:
 							Key: t
 							TooltipText: Aircraft
 							TooltipContainer:TOOLTIP_CONTAINER
-							ClickSound:button.aud
-							ClickDisabledSound:scold2.aud
 							Children:
 								Image@ICON:
 									X:7
@@ -265,8 +249,6 @@ Container@PLAYER_WIDGETS:
 									ImageCollection:production-icons
 		ProductionTabs@PRODUCTION_TABS:
 			PaletteWidget:PRODUCTION_PALETTE
-			ClickSound:button.aud
-			DisabledClickSound:scold2.aud
 			X:WINDOW_RIGHT - 204
 			Y:268
 			Width:194
@@ -274,8 +256,6 @@ Container@PLAYER_WIDGETS:
 		ProductionPalette@PRODUCTION_PALETTE:
 			X:WINDOW_RIGHT - 204
 			Y:287
-			TabClick: button.aud
-			DisabledTabClick:scold2.aud
 			TooltipContainer:TOOLTIP_CONTAINER
 Background@FMVPLAYER:
 	Width:WINDOW_RIGHT
--- a/mods/cnc/cursors.yaml
+++ b/mods/cnc/cursors.yaml
@@ -197,6 +197,11 @@ Cursors:
 			length:4
 			x:12
 			y:12
+		move-rough:
+			start:0
+			length: 8
+			x: 12
+			y: 12

 	attackmove:cursor
 		attackmove:
--- a/mods/cnc/mod.yaml
+++ b/mods/cnc/mod.yaml
@@ -90,6 +90,9 @@ Movies:
 Voices:
 	mods/cnc/voices.yaml

+Notifications:
+	mods/cnc/notifications.yaml
+
 Music:
 	mods/cnc/music.yaml

--- a/mods/cnc/notifications.yaml
+++ b/mods/cnc/notifications.yaml
@@ -0,0 +1,26 @@
+Speech:
+	Notifications:
+		Repairing: repair1
+		LowPower: lopower1
+		SilosNeeded: silos1
+		PrimaryBuildingSelected: pribldg1
+		BuildingCannotPlaceAudio: deploy1
+		NewOptions: newopt1
+		AbilityInsufficientPower: nopower1
+		Win: accom1
+		Lose: fail1
+		BaseAttack: baseatk1
+		HarvesterAttack:
+		Leave: batlcon1
+
+Sounds:
+	Notifications:
+		RadarUp: comcntr1
+		RadarDown: powrdn1
+		CashTickUp:
+		CashTickDown:
+		LevelUp: text2
+		ChatLine: scold1
+		TabClick: button
+		ClickSound: button
+		ClickDisabledSound: scold2
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -133,8 +133,9 @@
 	SpawnViceroid:
 		Probability: 2
 	CrushableInfantry:
-	Repairable:
-		RepairBuildings: hosp
+	RepairableNear:
+		Buildings: hosp
+		CloseEnough: 1

 ^CivInfantry:
 	Inherits: ^Infantry
--- a/mods/cnc/rules/system.yaml
+++ b/mods/cnc/rules/system.yaml
@@ -3,8 +3,6 @@ Player:
 	TechTree:
 	SupportPowerManager:
 	ConquestVictoryConditions:
-		WinNotification:accom1.aud
-		LoseNotification:fail1.aud
 	PowerManager:
 	AllyRepair:
 	PlayerResources:
@@ -70,14 +68,18 @@ World:
 		Bridges: bridge1, bridge2, bridge3, bridge4
 	PaletteFromCurrentTileset@terrain:
 		Name: terrain
+		ShadowIndex: 4
 	PaletteFromCurrentTileset@static:
 		Name: staticterrain
+		ShadowIndex: 4
 	PaletteFromFile@chrome:
 		Name: chrome
 		Filename: temperat.pal
+		ShadowIndex: 3
 	PaletteFromFile@effect:
 		Name: effect
 		Filename: temperat.pal
+		ShadowIndex: 4
 	PaletteFromRGBA@shadow:
 		Name: shadow
 		R: 0
@@ -151,17 +153,6 @@ World:
 	CreateMPPlayers:
 	SpawnMPUnits:
 	MPStartLocations:
-	EvaAlerts:
-		RadarUp: comcntr1.aud
-		RadarDown: powrdn1.aud
-		BuildingCannotPlaceAudio: deploy1.aud
-		CashTickUp:
-		CashTickDown:
-		LowPower: lopower1.aud
-		SilosNeeded: silos1.aud
-		PrimaryBuildingSelected: pribldg1.aud
-		AbilityInsufficientPower: nopower1.aud
-		LevelUp: text2.aud
 	SpatialBins:
 		BinSize: 4
 	Shroud:
--- a/mods/cnc/rules/tech.yaml
+++ b/mods/cnc/rules/tech.yaml
@@ -21,7 +21,7 @@ V19.Husk:

 # Hospital
 HOSP:
-	Inherits: ^TechBuilding
+	Inherits: ^CivBuilding
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
@@ -29,9 +29,7 @@ HOSP:
 		Name: Hospital
 	LeavesHusk: 
 		HuskActor: HOSP.Husk
-	Reservable:
 	RepairsUnits:
-	RallyPoint:

 HOSP.Husk:
 	Inherits: ^CivBuildingHusk
--- a/mods/cnc/weapons.yaml
+++ b/mods/cnc/weapons.yaml
@@ -8,7 +8,7 @@ UnitExplode:
 			Light: 60%
 			Heavy: 25%
 		Explosion: 8
-		InfDeath: 3
+		InfDeath: 4
 		ImpactSound: xplobig6

 UnitExplodeSmall:
@@ -21,7 +21,7 @@ UnitExplodeSmall:
 			Light: 60%
 			Heavy: 25%
 		Explosion: 8
-		InfDeath: 3
+		InfDeath: 4
 		ImpactSound: xplos

 GrenadierExplode:
@@ -34,7 +34,7 @@ GrenadierExplode:
 			Light: 60%
 			Heavy: 25%
 		Explosion: 8
-		InfDeath: 2
+		InfDeath: 3
 		ImpactSound: xplos

 Atomic:
@@ -48,7 +48,7 @@ Atomic:
 			Light: 60%
 			Heavy: 25%
 		Explosion: 6
-		InfDeath: 4
+		InfDeath: 5
 		ImpactSound: nukexplo
 	Warhead@areanuke:
 		DamageModel: PerCell
@@ -62,7 +62,7 @@ Atomic:
 			Light: 60%
 			Heavy: 25%
 		Delay: 3
-		InfDeath: 4
+		InfDeath: 5
 		ImpactSound: xplobig4

 IonCannon:
@@ -75,7 +75,7 @@ IonCannon:
 			Wood: 60%
 			Light: 60%
 			Heavy: 25%
-		InfDeath: 4
+		InfDeath: 5
 	Warhead@area:
 		DamageModel: PerCell
 		Damage: 200
@@ -88,7 +88,7 @@ IonCannon:
 			Light: 60%
 			Heavy: 25%
 		Delay: 3
-		InfDeath: 4
+		InfDeath: 5

 Sniper:
 	Report: RAMGUN2
@@ -104,7 +104,7 @@ Sniper:
 			Wood: 5%
 			Light: 5%
 			Heavy: 5%
-		InfDeath: 1
+		InfDeath: 2

 HighV:
 	ROF: 40
@@ -120,7 +120,7 @@ HighV:
 			Wood: 50%
 			Light: 50%
 			Heavy: 25%
-		InfDeath: 1
+		InfDeath: 2
 		Explosion: 1

 HeliAGGun:
@@ -140,7 +140,7 @@ HeliAGGun:
 			Wood: 50%
 			Light: 50%
 			Heavy: 25%
-		InfDeath: 1
+		InfDeath: 2
 		Explosion: 1

 HeliAAGun:
@@ -160,7 +160,7 @@ HeliAAGun:
 			Wood: 50%
 			Light: 50%
 			Heavy: 25%
-		InfDeath: 1
+		InfDeath: 2
 		Explosion: 1

 Pistol:
@@ -176,7 +176,7 @@ Pistol:
 			Wood: 50%
 			Light: 50%
 			Heavy: 25%
-		InfDeath: 1
+		InfDeath: 2
 		Explosion: 1
 		Damage: 1

@@ -194,7 +194,7 @@ M16:
 			Light: 30%
 			Heavy: 10%
 		Explosion: 1
-		InfDeath: 1
+		InfDeath: 2
 		Damage: 15

 Rockets:
@@ -220,7 +220,7 @@ Rockets:
 			Wood: 75%
 			Light: 75%
 			Heavy: 50%
-		InfDeath: 3
+		InfDeath: 4
 		Explosion: 4
 		ImpactSound: xplos
 		SmudgeType: Crater
@@ -251,7 +251,7 @@ BikeRockets:
 			Wood: 30%
 			Light: 75%
 			Heavy: 30%
-		InfDeath: 3
+		InfDeath: 4
 		Explosion: 4
 		ImpactSound: xplos
 		SmudgeType: Crater
@@ -282,7 +282,7 @@ OrcaAGMissiles:
 			Wood: 75%
 			Light: 75%
 			Heavy: 50%
-		InfDeath: 3
+		InfDeath: 4
 		Explosion: 4
 		ImpactSound: xplos
 		SmudgeType: Crater
@@ -313,7 +313,7 @@ OrcaAAMissiles:
 			Wood: 75%
 			Light: 75%
 			Heavy: 50%
-		InfDeath: 3
+		InfDeath: 4
 		Explosion: 4
 		ImpactSound: xplos
 		SmudgeType: Crater
@@ -332,7 +332,7 @@ Flamethrower:
 			Wood: 200%
 			Light: 75%
 			Heavy: 25%
-		InfDeath: 4
+		InfDeath: 5
 		ImpactSound: flamer2
 		SmudgeType: Scorch
 		Damage: 35
@@ -352,7 +352,7 @@ BigFlamer:
 			Wood: 200%
 			Light: 75%
 			Heavy: 25%
-		InfDeath: 4
+		InfDeath: 5
 		Explosion: 3
 		ImpactSound: flamer2
 		SmudgeType: Scorch
@@ -372,7 +372,7 @@ Chemspray:
 			Wood: 75%
 			Light: 75%
 			Heavy: 50%
-		InfDeath: 5
+		InfDeath: 6
 		SmudgeType: Scorch
 		ImpactSound: xplos

@@ -392,7 +392,7 @@ Grenade:
 			Wood: 75%
 			Light: 75%
 			Heavy: 50%
-		InfDeath: 2
+		InfDeath: 3
 		Explosion: 5
 		ImpactSound: xplos
 		SmudgeType: Crater
@@ -412,7 +412,7 @@ Grenade:
 			Wood: 75%
 			Light: 75%
 			Heavy: 50%
-		InfDeath: 3
+		InfDeath: 4
 		Explosion: 4
 		ImpactSound: xplos
 		SmudgeType: Crater
@@ -432,7 +432,7 @@ Grenade:
 			Wood: 75%
 			Light: 75%
 			Heavy: 50%
-		InfDeath: 3
+		InfDeath: 4
 		Explosion: 4
 		ImpactSound: xplos
 		SmudgeType: Crater
@@ -452,7 +452,7 @@ Grenade:
 			Wood: 75%
 			Light: 75%
 			Heavy: 50%
-		InfDeath: 3
+		InfDeath: 4
 		Explosion: 4
 		ImpactSound: xplos
 		SmudgeType: Crater
@@ -473,7 +473,7 @@ Grenade:
 			Wood: 75%
 			Light: 75%
 			Heavy: 50%
-		InfDeath: 3
+		InfDeath: 4
 		Explosion: 4
 		ImpactSound: xplos
 		SmudgeType: Crater
@@ -493,7 +493,7 @@ TurretGun:
 			Wood: 75%
 			Light: 75%
 			Heavy: 50%
-		InfDeath: 3
+		InfDeath: 4
 		Explosion: 4
 		ImpactSound: xplos
 		SmudgeType: Crater
@@ -523,7 +523,7 @@ MammothMissiles:
 			Wood: 75%
 			Light: 75%
 			Heavy: 50%
-		InfDeath: 3
+		InfDeath: 4
 		Explosion: 4
 		ImpactSound: xplos
 		SmudgeType: Crater
@@ -554,7 +554,7 @@ MammothMissiles:
 			Wood: 50%
 			Light: 100%
 			Heavy: 50%
-		InfDeath: 3
+		InfDeath: 4
 		Explosion: 4
 		ImpactSound: xplos
 		SmudgeType: Crater
@@ -585,7 +585,7 @@ MammothMissiles:
 			Wood: 75%
 			Light: 75%
 			Heavy: 50%
-		InfDeath: 3
+		InfDeath: 4
 		Explosion: 4
 		ImpactSound: xplos
 		SmudgeType: Crater
@@ -611,7 +611,7 @@ ArtilleryShell:
 			Wood: 75%
 			Light: 60%
 			Heavy: 25%
-		InfDeath: 2
+		InfDeath: 3
 		Explosion: 8
 		SmudgeType: Crater
 		ImpactSound: XPLOSML2
@@ -629,7 +629,7 @@ MachineGun:
 			Wood: 50%
 			Light: 50%
 			Heavy: 25%
-		InfDeath: 1
+		InfDeath: 2
 		Explosion: 1
 		Damage: 15

@@ -657,7 +657,7 @@ BoatMissile:
 			Wood: 75%
 			Light: 60%
 			Heavy: 25%
-		InfDeath: 2
+		InfDeath: 3
 		Explosion: 5
 		ImpactSound: xplos
 		SmudgeType: Crater
@@ -688,7 +688,7 @@ TowerMissle:
 			Wood: 75%
 			Light: 60%
 			Heavy: 25%
-		InfDeath: 2
+		InfDeath: 3
 		Explosion: 5
 		ImpactSound: xplos
 		SmudgeType: Crater
@@ -705,7 +705,7 @@ Napalm:
 			Wood: 100%
 			Light: 60%
 			Heavy: 25%
-		InfDeath: 4
+		InfDeath: 5
 		Explosion: 3
 		ImpactSound: flamer2
 		SmudgeType: Scorch
@@ -719,7 +719,7 @@ Napalm.Crate:
 			Wood: 100%
 			Light: 60%
 			Heavy: 25%
-		InfDeath: 4
+		InfDeath: 5
 		Explosion: 3
 		ImpactSound: flamer2
 		SmudgeType: Scorch
@@ -734,7 +734,7 @@ Laser:
 		BeamRadius: 1
 	Warhead:
 		Spread: 1
-		InfDeath: 4
+		InfDeath: 5
 		SmudgeType: Scorch
 		Damage: 200

@@ -760,7 +760,7 @@ SAMMissile:
 			Wood: 75%
 			Light: 75%
 			Heavy: 50%
-		InfDeath: 3
+		InfDeath: 4
 		Explosion: 4
 		ImpactSound: xplos
 		SmudgeType: Crater
@@ -788,7 +788,7 @@ HonestJohn:
 			Wood: 75%
 			Light: 60%
 			Heavy: 25%
-		InfDeath: 2
+		InfDeath: 3
 		Explosion: 5
 		ImpactSound: xplos
 		SmudgeType: Crater
@@ -798,7 +798,7 @@ Tiberium:
 	ROF: 4
 	Warhead:
 		Spread: 1
-		InfDeath: 5
+		InfDeath: 6
 		Damage: 1
 		PreventProne: yes

--- a/mods/d2k/TODO
+++ b/mods/d2k/TODO
@@ -13,23 +13,21 @@
 # add more spice tiles and make them fit
 # add game logic for concrete plates (use terrain overlay from bridges/ressources)
 # allow placing turrets on walls
-# R8 converter needs infantry/ornithocopter frame resorter
 # add grenade thrower
 # make sandworm behave like a moving anti-vehicle mine
 # add neutral buildings: emperor palace, fremen siech, smugglers factory
 # add deathhand missile (nuke)
 # maybe add ornithocopter strikes (they are currently directly contrallable units with non-reloading machine guns as in Dune II)
 # allow upgrades
-# allow different EVA voices for each faction (currently Atreides only)
 # add muzzles and explosions (currently falls back to RA)
 # create a shellmap (currently just a blank placeholder)
 # rework chrome UI, dialoges, tabs
 # add sonic tank weapon (currently uses tesla)
-# make deviator change the allegiance of ememy units (currently shoots rockets)
 # starport prices should vary
 # black spots on buildings should be fading team colors
 # gamefile extraction (setup/setup.z) from CD fails
 # support patch 1.06 gamefiles: DATA.R8 has more frames and currently fails to extract, also featuring new terrain with white houses and new unit: grenade thrower
-# infantry-only areas (Rough) do not show the dark-green mouse cursor
 # put TilesetBuilder.Export into OpenRA.Utility to call the functions directly when extracting game-files (instead of opening a GUI)
-# group number metrics are off
+# group number metrics are off
+# add bibs
+# building offsets wrong (worst for towers)
--- a/mods/d2k/cursors.yaml
+++ b/mods/d2k/cursors.yaml
@@ -1,4 +1,4 @@
-Transparent:
+ShadowIndex: 1

 Palettes:
 	cursor: cursor.pal
@@ -180,12 +180,12 @@ Cursors:
 			x: 12
 			y: 12
 		ability:
-			start:96
+			start:72
 			length: 8
 			x: 12
 			y: 12
 		ability-minimap:
-			start:96
+			start:72
 			length: 8
 			x: 12
 			y: 12
@@ -237,6 +237,11 @@ Cursors:
 			length: 1
 			x: 12
 			y: 12
+		move-rough:
+			start:256
+			length: 8
+			x: 12
+			y: 12

 	nopower: cursor
 		powerdown-blocked:
--- a/mods/d2k/mod.yaml
+++ b/mods/d2k/mod.yaml
@@ -71,6 +71,9 @@ Weapons:
 Voices:
 	mods/d2k/voices.yaml

+Notifications:
+	mods/d2k/notifications.yaml
+
 TileSets:
 	mods/d2k/tilesets/arrakis.yaml

--- a/mods/d2k/notifications.yaml
+++ b/mods/d2k/notifications.yaml
@@ -0,0 +1,37 @@
+# requires Dune 2000/DATA/GAMESFX copied to ~/.openra/Content/d2k
+
+Speech:
+	DefaultVariant: .AUD
+	Prefixes:
+		atreides: AI_
+		ordos: OI_
+		harkonnen: HI_
+	Notifications:
+		Repairing: MEND
+		BuildingCannotPlaceAudio: PLACE
+		LowPower: POWER
+		SilosNeeded: SILOS
+		PrimaryBuildingSelected: PRMRY
+		AbilityInsufficientPower:
+		NewOptions: NEWOP
+		Win: MWIN
+		Lose: MFAIL
+		BaseAttack: ATACK
+		HarvesterAttack: HATTK
+		Leave: ABORT
+
+Sounds:
+	Notifications:
+		RadarUp: MULTI1
+		RadarDown:
+		DisablePower: POWRDN1
+		EnablePower: POWRUP1
+		CashTickUp: CASHTIK1
+		CashTickDown:CASHTIK1
+		LevelUp: SCORTIK1
+		ChatLine: CHAT1
+		BuildPaletteOpen: BUTTON1
+		BuildPaletteClose: BUTTON1
+		TabClick: SIDEBAR1
+		ClickSound: BUTTON1
+		ClickDisabledSound: ENDLIST1
--- a/mods/d2k/rules/aircraft.yaml
+++ b/mods/d2k/rules/aircraft.yaml
@@ -1,16 +1,14 @@
-CARRYALL:
+^CARRYALL:
 	Inherits: ^Helicopter
 	Buildable:
 		Queue: Plane
 		BuildPaletteOrder: 110
-		Prerequisites: anyhightech
-		BuiltAt: hightecha
-		Owner: atreides,harkonnen,ordos
 	Valued:
 		Cost: 1200
 	Tooltip:
 		Name: Carryall
 		Description: Fast drop ship.\n  Unarmed
+		Icon: carryallicon
 	Health:
 		HP: 500
 	Armor: 
--- a/mods/d2k/rules/atreides.yaml
+++ b/mods/d2k/rules/atreides.yaml
@@ -50,6 +50,60 @@ 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
+	RenderUnit:
+		Image: HARVESTER
+
+TRIKEA:
+	Inherits: ^TRIKE
+	Buildable:
+		Prerequisites: lighta
+		Owner: atreides
+	RenderUnit:
+		Image: TRIKE
+
+QUADA:
+	Inherits: ^QUAD
+	Buildable:
+		Prerequisites: lighta
+		Owner: atreides
+	RenderUnit:
+		Image: QUAD
+
+SIEGETANKA:
+	Inherits: ^SIEGETANK
+	Buildable:
+		Prerequisites: heavya, radara
+		Owner: atreides
+	RenderUnit:
+		Image: SIEGETANK
+
+MISSILETANKA:
+	Inherits: ^MISSILETANK
+	Buildable:
+		Prerequisites: heavya
+		Owner: atreides
+	RenderUnit:
+		Image: MISSILETANK
+
+CARRYALLA:
+	Inherits: ^CARRYALL
+	Buildable:
+		Prerequisites: hightecha
+		BuiltAt: hightecha
+		Owner: atreides
+	RenderUnit:
+		Image: CARRYALL

 BARRA:
 	Inherits: ^BARRACKS
--- a/mods/d2k/rules/harkonnen.yaml
+++ b/mods/d2k/rules/harkonnen.yaml
@@ -32,6 +32,60 @@ 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
+	RenderUnit:
+		Image: TRIKE
+
+QUADH:
+	Inherits: ^QUAD
+	Buildable:
+		Prerequisites: lighth
+		Owner: harkonnen
+	RenderUnit:
+		Image: QUAD
+
+SIEGETANKH:
+	Inherits: ^SIEGETANK
+	Buildable:
+		Prerequisites: heavyh, radarh
+		Owner: harkonnen
+	RenderUnit:
+		Image: SIEGETANK
+
+MISSILETANKH:
+	Inherits: ^MISSILETANK
+	Buildable:
+		Prerequisites: heavyh
+		Owner: harkonnen
+	RenderUnit:
+		Image: MISSILETANK
+
+CARRYALLH:
+	Inherits: ^CARRYALL
+	Buildable:
+		Prerequisites: hightechh
+		BuiltAt: hightechh
+		Owner: harkonnen
+	RenderUnit:
+		Image: CARRYALL

 BARRH:
 	Inherits: ^BARRACKS
--- a/mods/d2k/rules/ordos.yaml
+++ b/mods/d2k/rules/ordos.yaml
@@ -32,6 +32,11 @@ REFO:
 		Owner: ordos
 	RenderBuildingWarFactory:
 		Image: REFO
+	FreeActor:
+		Actor: HARVESTERO
+		InitialActivity: FindResources
+		SpawnOffset: 1,2
+		Facing: 64

 BARRO:
 	Inherits: ^BARRACKS
@@ -160,6 +165,14 @@ MCVO:
 	RenderUnit:
 		Image: DMCV

+HARVESTERO:
+	Inherits: ^HARVESTER
+	Buildable:
+		Prerequisites: heavyo,refo
+		Owner: ordos
+	RenderUnit:
+		Image: HARVESTER
+
 COMBATO:
 	Inherits: ^COMBAT
 	Buildable:
@@ -171,7 +184,7 @@ RAIDER:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 15
-		Prerequisites: anylight
+		Prerequisites: lighto
 		Owner: ordos
 	Valued:
 		Cost: 200
@@ -197,17 +210,50 @@ RAIDER:
 		SecondaryOffset: 0,0,0,-4
 	AutoTarget:

+QUADO:
+	Inherits: ^QUAD
+	Buildable:
+		Prerequisites: lighto
+		Owner: ordos
+	RenderUnit:
+		Image: QUAD
+
+SIEGETANKO:
+	Inherits: ^SIEGETANK
+	Buildable:
+		Prerequisites: heavyo, radaro
+		Owner: ordos
+	RenderUnit:
+		Image: SIEGETANK
+
+MISSILETANKO:
+	Inherits: ^MISSILETANK
+	Buildable:
+		Prerequisites: heavyo
+		Owner: ordos
+	RenderUnit:
+		Image: MISSILETANK
+
+CARRYALLO:
+	Inherits: ^CARRYALL
+	Buildable:
+		Prerequisites: hightecho
+		BuiltAt: hightecho
+		Owner: ordos
+	RenderUnit:
+		Image: CARRYALL
+
 DEVIATORTANK:
 	Inherits: ^Tank
 	Valued:
 		Cost: 800
 	Tooltip:
 		Name: Deviator
-		Description: Long range artillery.\n  Strong vs Infantry, Tanks, Air\n  Weak vs Buildings
+		Description: Will cause no actual damage.\nFires a warhead which changes allegiances\n but does not effect buildings or tanks.
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 50
-		Prerequisites: anyheavy
+		Prerequisites: heavyo
 		Owner: ordos
 	Mobile:
 		Speed: 6
@@ -218,8 +264,12 @@ DEVIATORTANK:
 	RevealsShroud:
 		Range: 6
 	RenderUnit:
-	AttackFrontal:
-		PrimaryWeapon: MammothTusk
+#	Captures:
+#		CaptureTypes:
+#		Range: 5
+#		wastedAfterwards: false
+	AttackLoyalty:
+		PrimaryWeapon: FakeMissile
 		PrimaryLocalOffset: -7,2,0,0,25, 7,2,0,0,-25
 		PrimaryRecoil: 1
 	AutoTarget:
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -41,8 +41,6 @@
 	Tooltip:
 		Name: Windtrap
 		Description: Provides power for other structures
-	ProvidesCustomPrerequisite:
-		Prerequisite: anypower
 	Building:
 		Power: 100
 		Footprint: xx xx xx
@@ -60,7 +58,6 @@
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 30
-		Prerequisites: anypower
 		Hotkey: b
 	Valued:
 		Cost: 400
@@ -104,8 +101,6 @@
 	Tooltip:
 		Name: High Tech Factory
 		Description: Produces Carryalls
-	ProvidesCustomPrerequisite:
-		Prerequisite: anyhightech
 	Building:
 		Power: -30
 		Footprint: _x_ xxx xxx
@@ -180,9 +175,6 @@
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 10
-		Prerequisites: anypower
-	ProvidesCustomPrerequisite:
-		Prerequisite: anyref
 	Valued:
 		Cost: 1400
 	Tooltip:
@@ -207,11 +199,6 @@
 		Capacity: 2000
 	CustomSellValue:
 		Value: 600
-	FreeActor:
-		Actor: HARVESTER
-		InitialActivity: FindResources
-		SpawnOffset: 1,2
-		Facing: 64

 ^SILO:
 	Inherits: ^Building
@@ -245,8 +232,6 @@
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 50
-	ProvidesCustomPrerequisite:
-		Prerequisite: anylight
 	Valued:
 		Cost: 1000
 	Tooltip:
@@ -266,8 +251,8 @@
 	-RenderBuilding:
 	RallyPoint:
 	Exit@1:
-		SpawnOffset: 10,0
-		ExitCell: 1,3
+		SpawnOffset: 5,0
+		ExitCell: 1,1
 	Production:
 		Produces: Vehicle
 	PrimaryBuilding:
@@ -282,8 +267,6 @@
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 50
-	ProvidesCustomPrerequisite:
-		Prerequisite: anyheavy
 	Valued:
 		Cost: 2000
 	Tooltip:
@@ -302,9 +285,10 @@
 	Bib:
 	-RenderBuilding:
 	RallyPoint:
+		RallyPoint: 0,3
 	Exit@1:
-		SpawnOffset: 10,0
-		ExitCell: 1,3
+		SpawnOffset: -2,-2
+		ExitCell: 0,2
 	Production:
 		Produces: Vehicle
 	PrimaryBuilding:
@@ -321,8 +305,6 @@
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 60
-	ProvidesCustomPrerequisite:
-		Prerequisite: anyradar
 	Valued:
 		Cost: 1400
 	Tooltip:
@@ -348,8 +330,6 @@
 	Tooltip:
 		Name: Starport
 		Description: Provides a dropzone for vehicle reinforcements
-	ProvidesCustomPrerequisite:
-		Prerequisite: anystarport
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 60
--- a/mods/d2k/rules/system.yaml
+++ b/mods/d2k/rules/system.yaml
@@ -2,18 +2,7 @@ Player:
 	TechTree:
 	PlaceBuilding:
 	SupportPowerManager:
-	ConquestVictoryConditions@Atreides:
-		Race: atreides
-		WinNotification: AI_MWIN.AUD
-		LoseNotification: AI_MFAIL.AUD
-	ConquestVictoryConditions@Harkonnen:
-		Race: harkonnen
-		WinNotification: HI_MWIN.AUD
-		LoseNotification: HI_MFAIL.AUD
-	ConquestVictoryConditions@Ordos:
-		Race: ordos
-		WinNotification: OI_MWIN.AUD
-		LoseNotification: OI_MFAIL.AUD
+	ConquestVictoryConditions:
 	PowerManager:
 	AllyRepair:
 	PlayerResources:
@@ -65,15 +54,8 @@ Player:
 	PlayerColorPalette:
 		BasePalette: d2k
 		RemapIndex: 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255
-	BaseAttackNotifier@Atreides:
-		Race: atreides
-		Audio: AI_ATACK.AUD
-	BaseAttackNotifier@Harkonnen:
-		Race: harkonnen
-		Audio: HI_ATACK.AUD
-	BaseAttackNotifier@Ordos:
-		Race: ordos
-		Audio: OI_ATACK.AUD
+	BaseAttackNotifier:
+	HarvesterAttackNotifier:

 World:	
 	OpenWidgetAtGameStart:
@@ -91,15 +73,19 @@ World:
 		ValidGround: Sand, Dune, Rock
 	PaletteFromCurrentTileset:
 		Name: terrain
+		ShadowIndex: 1
 	PaletteFromFile@d2k:
 		Name: d2k
 		Filename: d2k.pal
+		ShadowIndex: 1
 	PaletteFromFile@chrome:
 		Name: chrome
 		Filename: d2k.pal
+		ShadowIndex: 3
 	PaletteFromFile@effect:
 		Name: effect
 		Filename: temperat.pal
+		ShadowIndex: 4
 	PaletteFromRGBA@shadow:
 		Name: shadow
 		R: 0
@@ -179,25 +165,12 @@ World:
 	SpawnMPUnits@ordos:
 		InitialUnit: mcvo
 		Faction: ordos
-#TODO: These are just the Atreides sounds.
-	EvaAlerts:
-		RadarUp: POWRUP1.aud
-		RadarDown: POWRDN1.aud
-		BuildingCannotPlaceAudio: AI_PLACE.AUD
-		CashTickUp: CASHTIK1.aud
-		CashTickDown:CASHTIK1.aud
-		NewOptions: AI_NEWOP.AUD
-		LowPower: AI_POWER.AUD
-		SilosNeeded: AI_SILOS.AUD
-		PrimaryBuildingSelected: AI_PRMRY.AUD
-		AbilityInsufficientPower:
-		LevelUp: SCORTIK1.aud
-		Repairing:
 	SpatialBins:
 		BinSize: 4
 	Shroud:
 	PathFinder:
 	ValidateOrder:
+
 CRATE:
 	Tooltip:
 		Name: Crate
@@ -234,21 +207,42 @@ CRATE:
 		SelectionShares: 2
 		NoBaseSelectionShares: 9001
 		Unit: mcvo
-	GiveUnitCrateAction@Trike:
+	GiveUnitCrateAction@TrikeA:
 		SelectionShares: 7
-		Unit: trike
-	GiveUnitCrateAction@Quad:
+		Unit: trikea
+	GiveUnitCrateAction@TrikeH:
+		SelectionShares: 7
+		Unit: trikeh
+	GiveUnitCrateAction@QuadA:
 		SelectionShares: 6
-		Unit: quad
+		Unit: quada
+	GiveUnitCrateAction@QuadH:
+		SelectionShares: 6
+		Unit: quadh
+	GiveUnitCrateAction@QuadO:
+		SelectionShares: 6
+		Unit: quado
 	GiveUnitCrateAction@Raider:
 		SelectionShares: 6
 		Unit: raider
-	GiveUnitCrateAction@SiegeTank:
+	GiveUnitCrateAction@SiegeTankA:
 		SelectionShares: 6
-		Unit: siegetank
-	GiveUnitCrateAction@MissileTank:
+		Unit: siegetanka
+	GiveUnitCrateAction@SiegeTankH:
 		SelectionShares: 6
-		Unit: missiletank
+		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:
 		SelectionShares: 5
 		Unit: combata
--- a/mods/d2k/rules/vehicles.yaml
+++ b/mods/d2k/rules/vehicles.yaml
@@ -27,18 +27,17 @@
 	Transforms:
 		TransformSounds: BUILD1.aud

-HARVESTER:
+^HARVESTER:
 	Inherits: ^Vehicle
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 10
-		Prerequisites: anyref,anyheavy
-		Owner: atreides,harkonnen,ordos
 	Valued:
 		Cost: 1100
 	Tooltip:
 		Name: Spice Harvester
 		Description: Collects Spice for processing.\n  Unarmed
+		Icon: harvestericon
 	Selectable:
 		Priority: 7
 		Bounds: 42,42
@@ -46,7 +45,7 @@ HARVESTER:
 		Capacity: 20
 		Resources: Spice
 		UnloadTicksPerBale: 1
-		# How far away from our linked proc (refinery) to find resources (in cells):
+		# 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):
 		SearchFromOrderRadius: 12
@@ -62,18 +61,17 @@ HARVESTER:
 		Range: 4
 	-AttackMove:

-TRIKE:
+^TRIKE:
 	Inherits: ^Vehicle
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 15
-		Prerequisites: anylight
-		Owner: atreides,harkonnen
 	Valued:
 		Cost: 200
 	Tooltip:
 		Name: Scout Trike
 		Description: Weak Scout.\n Decent vs. Infantry
+		Icon: trikeicon
 	Selectable:
 		Bounds: 24,24
 	Health:
@@ -91,18 +89,17 @@ TRIKE:
 		PrimaryOffset: 0,0,0,-4
 	AutoTarget:

-QUAD:
+^QUAD:
 	Inherits: ^Vehicle
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 30
-		Prerequisites: anylight
-		Owner: atreides,harkonnen,ordos
 	Valued:
 		Cost: 400
 	Tooltip:
 		Name: Quad
 		Description: Fast scout vehicle, armed with \nrockets.\n  Strong vs Vehicles\n  Weak vs Infantry
+		Icon: quadicon
 	Health:
 		HP: 120
 	Armor: 
@@ -154,18 +151,17 @@ QUAD:
 	Selectable:
 		Bounds: 30,30

-SIEGETANK:
+^SIEGETANK:
 	Inherits: ^Tank
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 80
-		Prerequisites: anyradar
-		Owner: atreides,harkonnen,ordos
 	Valued:
 		Cost: 600
 	Tooltip:
 		Name: Siege Tank
 		Description: Long-range artillery.\n  Strong vs Infantry, Buildings\n  Weak vs Tanks, Aircraft
+		Icon: siegetankicon
 	Health:
 		HP: 75
 	Armor:
@@ -189,18 +185,17 @@ SIEGETANK:
 	Selectable:
 		Bounds: 30,30

-MISSILETANK:
+^MISSILETANK:
 	Inherits: ^Tank
 	Valued:
 		Cost: 800
 	Tooltip:
 		Name: Missile Tank
 		Description: Long range artillery.\n  Strong vs Infantry, Buildings\n  Weak vs Tanks, Aircraft
+		Icon: missiletankicon
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 50
-		Prerequisites: anyheavy
-		Owner: atreides,harkonnen,ordos
 	Mobile:
 		Speed: 6
 	Health:
--- a/mods/d2k/tilesets/arrakis.yaml
+++ b/mods/d2k/tilesets/arrakis.yaml
--- a/mods/d2k/weapons.yaml
+++ b/mods/d2k/weapons.yaml
@@ -12,7 +12,7 @@ M1Carbine:
 			Heavy: 10%
 			Concrete: 10%
 		Explosion: piffs
-		InfDeath: 1
+		InfDeath: 2
 		Damage: 15

 Dragon:
@@ -41,7 +41,7 @@ Dragon:
 			Concrete: 20%
 		Explosion: med_explosion
 		WaterExplosion: med_splash
-		InfDeath: 3
+		InfDeath: 4
 		SmudgeType: SandCrater, RockCrater
 		Damage: 50
 		ImpactSound: kaboom12
@@ -71,7 +71,7 @@ QuadRockets:
 			Wood: 30%
 			Light: 75%
 			Heavy: 30%
-		InfDeath: 3
+		InfDeath: 4
 		Explosion: med_explosion
 		WaterExplosion: med_splash
 		ImpactSound: kaboom12
@@ -93,7 +93,7 @@ TurretGun:
 			Light: 75%
 			Concrete: 50%
 		Explosion: small_explosion
-		InfDeath: 3
+		InfDeath: 4
 		SmudgeType: SandCrater, RockCrater
 		Damage: 60

@@ -122,7 +122,7 @@ TowerMissle:
 			Wood: 75%
 			Light: 60%
 			Heavy: 25%
-		InfDeath: 2
+		InfDeath: 3
 		Explosion: small_explosion
 		ImpactSound: kaboom12
 		SmudgeType: SandCrater, RockCrater
@@ -143,7 +143,7 @@ TowerMissle:
 			Heavy: 40%
 			Concrete: 30%
 		Explosion: small_explosion
-		InfDeath: 3
+		InfDeath: 4
 		SmudgeType: SandCrater, RockCrater
 		Damage: 16

@@ -162,7 +162,7 @@ TowerMissle:
 			Light: 75%
 			Concrete: 50%
 		Explosion: small_explosion
-		InfDeath: 3
+		InfDeath: 4
 		SmudgeType: SandCrater, RockCrater
 		Damage: 30

@@ -183,7 +183,7 @@ TowerMissle:
 			Light: 75%
 			Concrete: 50%
 		Explosion: small_explosion
-		InfDeath: 3
+		InfDeath: 4
 		SmudgeType: SandCrater, RockCrater
 		Damage: 40

@@ -203,7 +203,7 @@ TowerMissle:
 			Light: 75%
 			Concrete: 50%
 		Explosion: small_explosion
-		InfDeath: 3
+		InfDeath: 4
 		SmudgeType: SandCrater, RockCrater
 		Damage: 50

@@ -232,43 +232,37 @@ TowerMissle:
 			Wood: 75%
 			Light: 75%
 			Heavy: 50%
-		InfDeath: 3
+		InfDeath: 4
 		Explosion: med_explosion
 		WaterExplosion: med_splash
 		ImpactSound: kaboom12
 		SmudgeType: SandCrater, RockCrater
 		Damage: 25

-MammothTusk:
-	ROF: 60
+FakeMissile:
+	ROF: 90
 	Range: 8
+	Burst: 1
 	Report: MISSLE1
-	Burst: 2
-	ValidTargets: Ground, Air
-	Projectile: Missile
-		Speed: 30
-		Arm: 2
+	Projectile: Bullet
+		Speed: 35
 		High: true
-		Shadow: false
-		Proximity: true
-#		Trail: smokey
-		ContrailLength: 10
-		Inaccuracy: 3
-		Image: DRAGON
-		ROT: 5
-		RangeLimit: 40
+		Angle: .2
+		Inaccuracy: 70
+		Image: MISSILE
+		Trail: smokey
+		ContrailLength: 30
 	Warhead:
-		Spread: 6
+		Spread: 10
 		Versus: 
-			None: 90%
-			Wood: 75%
-			Light: 60%
-			Heavy: 25%
-		Explosion: med_explosion
-		WaterExplosion: med_splash
-		InfDeath: 2
+			Wood: 0%
+			Heavy: 0%
+			Concrete: 0%
+		Explosion: large_explosion
+		WaterExplosion: large_splash
 		SmudgeType: SandCrater, RockCrater
-		Damage: 45
+		Damage: 0
+		ImpactSound: kaboom12

 155mm:
 	ROF: 85
@@ -292,7 +286,7 @@ MammothTusk:
 			Concrete: 50%
 		Explosion: large_explosion
 		WaterExplosion: med_splash
-		InfDeath: 2
+		InfDeath: 3
 		SmudgeType: SandCrater, RockCrater
 		Damage: 220

@@ -304,7 +298,7 @@ TTankZap:
 	Projectile: TeslaZap
 	Warhead:
 		Spread: 1
-		InfDeath: 5
+		InfDeath: 6
 		Damage: 100

 ChainGun:
@@ -323,7 +317,7 @@ ChainGun:
 			Heavy: 25%
 			Concrete: 25%
 		Explosion: piffs
-		InfDeath: 1
+		InfDeath: 2
 		Damage: 20

 M60mg:
@@ -341,7 +335,7 @@ M60mg:
 			Heavy: 10%
 			Concrete: 10%
 		Explosion: piffs
-		InfDeath: 1
+		InfDeath: 2
 		Damage: 15

 Demolish:
@@ -365,7 +359,7 @@ Atomic:
 			Heavy: 25%
 			Concrete: 50%
 		Explosion: nuke
-		InfDeath: 4
+		InfDeath: 5
 		ImpactSound: EXPLSML2
 	Warhead@areanuke:
 		DamageModel: PerCell
@@ -379,7 +373,7 @@ Atomic:
 			Heavy: 25%
 			Concrete: 50%
 		Delay: 4
-		InfDeath: 4
+		InfDeath: 5
 		ImpactSound: EXPLLG2

 CrateNuke:
@@ -393,7 +387,7 @@ CrateNuke:
 			Heavy: 25%
 			Concrete: 50%
 		Explosion: nuke
-		InfDeath: 4
+		InfDeath: 5
 		ImpactSound: EXPLSML2
 	Warhead@areanuke:
 		DamageModel: PerCell
@@ -407,7 +401,7 @@ CrateNuke:
 			Heavy: 25%
 			Concrete: 50%
 		Delay: 4
-		InfDeath: 4
+		InfDeath: 5
 		ImpactSound: EXPLLG2

 CrateExplosion:
@@ -421,7 +415,7 @@ CrateExplosion:
 			Heavy: 25%
 		Explosion: self_destruct
 		WaterExplosion: self_destruct
-		InfDeath: 3
+		InfDeath: 4
 		ImpactSound: EXPLSML4

 UnitExplode:
@@ -435,7 +429,7 @@ UnitExplode:
 			Heavy: 25%
 		Explosion: self_destruct
 		WaterExplosion: large_splash
-		InfDeath: 3
+		InfDeath: 4
 		ImpactSound: EXPLMD1

 UnitExplodeSmall:
@@ -448,7 +442,7 @@ UnitExplodeSmall:
 			Light: 60%
 			Heavy: 25%
 		Explosion: large_explosion
-		InfDeath: 3
+		InfDeath: 4
 		ImpactSound: EXPLSML2

 WormJaw:
@@ -486,7 +480,7 @@ RedEye:
 			Light: 60%
 			Heavy: 25%
 		Explosion: med_explosion
-		InfDeath: 2
+		InfDeath: 3
 		SmudgeType: SandCrater, RockCrater
 		Damage: 40

@@ -504,7 +498,7 @@ Sniper:
 			Wood: 5%
 			Light: 5%
 			Heavy: 5%
-		InfDeath: 1
+		InfDeath: 2

 Vulcan:
 	ROF: 30
@@ -521,7 +515,7 @@ Vulcan:
 			Heavy: 25%
 			Concrete: 25%
 		Explosion: piffs
-		InfDeath: 1
+		InfDeath: 2
 		Damage: 10
 	Warhead@2:
 		Spread: 3
@@ -531,7 +525,7 @@ Vulcan:
 			Heavy: 25%
 			Concrete: 25%
 		Explosion: piffs
-		InfDeath: 1
+		InfDeath: 2
 		Damage: 10
 		Delay: 2
 	Warhead@3:
@@ -542,7 +536,7 @@ Vulcan:
 			Heavy: 25%
 			Concrete: 25%
 		Explosion: piffs
-		InfDeath: 1
+		InfDeath: 2
 		Damage: 10
 		Delay: 4
 	Warhead@4:
@@ -553,7 +547,7 @@ Vulcan:
 			Heavy: 25%
 			Concrete: 25%
 		Explosion: piffs
-		InfDeath: 1
+		InfDeath: 2
 		Damage: 10
 		Delay: 6
 	Warhead@5:
@@ -564,7 +558,7 @@ Vulcan:
 			Heavy: 25%
 			Concrete: 25%
 		Explosion: piffs
-		InfDeath: 1
+		InfDeath: 2
 		Damage: 10
 		Delay: 8
 	Warhead@6:
@@ -575,6 +569,6 @@ Vulcan:
 			Heavy: 25%
 			Concrete: 25%
 		Explosion: piffs
-		InfDeath: 1
+		InfDeath: 2
 		Damage: 10
 		Delay: 10
--- a/mods/ra/chrome/ingame.yaml
+++ b/mods/ra/chrome/ingame.yaml
@@ -333,11 +333,13 @@ Container@OBSERVER_ROOT:
 			Height: 200
 			DrawBackground: False
 			RemoveTime:250
+			UseContrast: yes
 		ChatEntry@CHAT_ENTRY:
 			X:250
 			Y:WINDOW_BOTTOM - HEIGHT
 			Width: 760
 			Height: 30
+			UseContrast: yes
 		Background@PERF_BG:
 			ClickThrough:true
 			Background:dialog4
--- a/mods/ra/cursors.yaml
+++ b/mods/ra/cursors.yaml
@@ -91,6 +91,11 @@ Cursors:
 			length: 4
 			x: 12
 			y: 12
+		move-rough:
+			start:10
+			length: 4
+			x: 12
+			y: 12
 		move-blocked:
 			start:14
 			x: 12
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -70,6 +70,9 @@ Weapons:
 	
 Voices:
 	mods/ra/voices.yaml
+
+Notifications:
+	mods/ra/notifications.yaml
 	
 TileSets:
 	mods/ra/tilesets/snow.yaml
--- a/mods/ra/notifications.yaml
+++ b/mods/ra/notifications.yaml
@@ -0,0 +1,30 @@
+Speech:
+	Notifications:
+		Repairing: repair1
+		LowPower: lopower1
+		SilosNeeded: silond1
+		PrimaryBuildingSelected: pribldg1
+		BuildingCannotPlaceAudio: nodeply1
+		NewOptions: newopt1
+		AbilityInsufficientPower: nopowr1
+		Win: misnwon1
+		Lose: misnlst1
+		BaseAttack: baseatk1
+		HarvesterAttack:
+		Leave: bct1
+
+Sounds:
+	Notifications:
+		RadarUp: radaron2
+		RadarDown: radardn1
+		CashTickUp: cashup1
+		CashTickDown:cashdn1
+		LevelUp: hydrod1
+		DisablePower: bleep11
+		EnablePower: bleep12
+		ChatLine: scold1
+		BuildPaletteOpen: bleep13
+		BuildPaletteClose: bleep13
+		TabClick: ramenu1
+		ClickSound:
+		ClickDisabledSound:
--- a/mods/ra/rules/structures.yaml
+++ b/mods/ra/rules/structures.yaml
@@ -948,6 +948,7 @@ HPAD:
 	Reservable:
 	IronCurtainable:
 	ProductionBar:
+	PrimaryBuilding:

 AFLD:
 	Inherits: ^Building
@@ -998,6 +999,7 @@ AFLD:
 		SelectTargetSound: slcttgt1.aud
 	ProductionBar:
 	SupportPowerChargeBar:
+	PrimaryBuilding:
 	
 POWR:
 	Inherits: ^Building
--- a/mods/ra/rules/system.yaml
+++ b/mods/ra/rules/system.yaml
@@ -31,8 +31,6 @@ Player:
 	PlaceBuilding:
 	SupportPowerManager:
 	ConquestVictoryConditions:
-		WinNotification:misnwon1.aud
-		LoseNotification:misnlst1.aud
 	PowerManager:
 	AllyRepair:
 	PlayerResources:
@@ -212,12 +210,15 @@ World:
 		WaterChance: .2
 	PaletteFromCurrentTileset:
 		Name: terrain
+		ShadowIndex: 4
 	PaletteFromFile@chrome:
 		Name: chrome
 		Filename: temperat.pal
+		ShadowIndex: 3
 	PaletteFromFile@effect:
 		Name: effect
 		Filename: temperat.pal
+		ShadowIndex: 4
 	PaletteFromRGBA@shadow:
 		Name: shadow
 		R: 0
@@ -293,7 +294,6 @@ World:
 	CreateMPPlayers:
 	MPStartLocations:
 	SpawnMPUnits:
-	EvaAlerts:
 	SpatialBins:
 		BinSize: 4
 	Shroud:
--- a/mods/ra/weapons.yaml
+++ b/mods/ra/weapons.yaml
@@ -12,7 +12,7 @@ Colt45:
 			Heavy: 5%
 			Concrete: 5%
 		Explosion: piff
-		InfDeath: 1
+		InfDeath: 2
 		Damage: 50
 		
 ZSU-23:
@@ -48,7 +48,7 @@ Vulcan:
 			Heavy: 25%
 			Concrete: 25%
 		Explosion: piffs
-		InfDeath: 1
+		InfDeath: 2
 		Damage: 10
 	Warhead@2:
 		Spread: 3
@@ -58,7 +58,7 @@ Vulcan:
 			Heavy: 25%
 			Concrete: 25%
 		Explosion: piffs
-		InfDeath: 1
+		InfDeath: 2
 		Damage: 10
 		Delay: 2
 	Warhead@3:
@@ -69,7 +69,7 @@ Vulcan:
 			Heavy: 25%
 			Concrete: 25%
 		Explosion: piffs
-		InfDeath: 1
+		InfDeath: 2
 		Damage: 10
 		Delay: 4
 	Warhead@4:
@@ -80,7 +80,7 @@ Vulcan:
 			Heavy: 25%
 			Concrete: 25%
 		Explosion: piffs
-		InfDeath: 1
+		InfDeath: 2
 		Damage: 10
 		Delay: 6
 	Warhead@5:
@@ -91,7 +91,7 @@ Vulcan:
 			Heavy: 25%
 			Concrete: 25%
 		Explosion: piffs
-		InfDeath: 1
+		InfDeath: 2
 		Damage: 10
 		Delay: 8
 	Warhead@6:
@@ -102,7 +102,7 @@ Vulcan:
 			Heavy: 25%
 			Concrete: 25%
 		Explosion: piffs
-		InfDeath: 1
+		InfDeath: 2
 		Damage: 10
 		Delay: 10
 		
@@ -135,7 +135,7 @@ Maverick:
 			Concrete: 50%
 		Explosion: med_explosion
 		WaterExplosion: med_splash
-		InfDeath: 3
+		InfDeath: 4
 		SmudgeType: Crater
 		Damage: 70
 		
@@ -157,7 +157,7 @@ FireballLauncher:
 			Concrete: 50%
 		Explosion: napalm
 		WaterExplosion: napalm
-		InfDeath: 4
+		InfDeath: 5
 		SmudgeType: Scorch
 		ImpactSound: firebl3
 		Damage: 150
@@ -183,7 +183,7 @@ Flamer:
 			Concrete: 50%
 		Explosion: small_napalm
 		WaterExplosion: small_napalm
-		InfDeath: 4
+		InfDeath: 5
 		SmudgeType: Scorch
 		ImpactSound: firebl3
 		Damage: 8
@@ -205,7 +205,7 @@ ChainGun:
 			Concrete: 25%
 		Explosion: piffs
 		WaterExplosion: small_splash
-		InfDeath: 1
+		InfDeath: 2
 		Damage: 20

 ChainGun.Yak:
@@ -225,7 +225,7 @@ ChainGun.Yak:
 			Concrete: 25%
 		Explosion: piffs
 		WaterExplosion: small_splash
-		InfDeath: 1
+		InfDeath: 2
 		Damage: 40
 		
 Pistol:
@@ -242,7 +242,7 @@ Pistol:
 			Heavy: 25%
 			Concrete: 25%
 		Explosion: piffs
-		InfDeath: 1
+		InfDeath: 2
 		Damage: 1
 		
 M1Carbine:
@@ -259,7 +259,7 @@ M1Carbine:
 			Heavy: 10%
 			Concrete: 10%
 		Explosion: piffs
-		InfDeath: 1
+		InfDeath: 2
 		Damage: 15

 Dragon:
@@ -288,7 +288,7 @@ Dragon:
 			Concrete: 20%
 		Explosion: med_explosion
 		WaterExplosion: med_splash
-		InfDeath: 3
+		InfDeath: 4
 		SmudgeType: Crater
 		Damage: 50
 		ImpactSound: kaboom12
@@ -321,7 +321,7 @@ HellfireAG:
 			Concrete: 50%
 		Explosion: med_explosion
 		WaterExplosion: med_splash
-		InfDeath: 3
+		InfDeath: 4
 		SmudgeType: Crater
 		Damage: 40

@@ -353,7 +353,7 @@ HellfireAA:
 			Concrete: 50%
 		Explosion: med_explosion
 		WaterExplosion: med_splash
-		InfDeath: 3
+		InfDeath: 4
 		SmudgeType: Crater
 		Damage: 40		

@@ -376,7 +376,7 @@ Grenade:
 			Heavy: 5%
 		Explosion: med_explosion
 		WaterExplosion: small_splash
-		InfDeath: 2
+		InfDeath: 3
 		SmudgeType: Crater
 		Damage: 60
 		ImpactSound: kaboom12
@@ -397,7 +397,7 @@ Grenade:
 			Concrete: 30%
 		Explosion: small_explosion
 		WaterExplosion: small_splash
-		InfDeath: 3
+		InfDeath: 4
 		SmudgeType: Crater
 		Damage: 16

@@ -417,7 +417,7 @@ Grenade:
 			Concrete: 50%
 		Explosion: small_explosion
 		WaterExplosion: small_splash
-		InfDeath: 3
+		InfDeath: 4
 		SmudgeType: Crater
 		Damage: 30

@@ -439,7 +439,7 @@ Grenade:
 			Concrete: 50%
 		Explosion: small_explosion
 		WaterExplosion: small_splash
-		InfDeath: 3
+		InfDeath: 4
 		SmudgeType: Crater
 		Damage: 40

@@ -460,7 +460,7 @@ Grenade:
 			Concrete: 50%
 		Explosion: small_explosion
 		WaterExplosion: small_splash
-		InfDeath: 3
+		InfDeath: 4
 		SmudgeType: Crater
 		Damage: 50

@@ -480,7 +480,7 @@ TurretGun:
 			Concrete: 50%
 		Explosion: small_explosion
 		WaterExplosion: small_splash
-		InfDeath: 3
+		InfDeath: 4
 		SmudgeType: Crater
 		Damage: 60

@@ -511,7 +511,7 @@ MammothTusk:
 			Heavy: 25%
 		Explosion: med_explosion
 		WaterExplosion: med_splash
-		InfDeath: 2
+		InfDeath: 3
 		SmudgeType: Crater
 		Damage: 45

@@ -537,7 +537,7 @@ MammothTusk:
 			Concrete: 50%
 		Explosion: large_explosion
 		WaterExplosion: med_splash
-		InfDeath: 2
+		InfDeath: 3
 		SmudgeType: Crater
 		Damage: 220

@@ -557,7 +557,7 @@ M60mg:
 			Concrete: 10%
 		Explosion: piffs
 		WaterExplosion: small_splash
-		InfDeath: 1
+		InfDeath: 2
 		Damage: 15
 		
 Napalm:
@@ -578,7 +578,7 @@ Napalm:
 			Concrete: 50%
 		Explosion: napalm
 		WaterExplosion: med_splash
-		InfDeath: 4
+		InfDeath: 5
 		SmudgeType: Scorch
 		ImpactSound: firebl3
 		Damage: 100
@@ -593,7 +593,7 @@ CrateNapalm:
 			Concrete: 50%
 		Explosion: napalm
 		WaterExplosion: napalm
-		InfDeath: 4
+		InfDeath: 5
 		SmudgeType: Scorch
 		ImpactSound: firebl3
 		Damage: 600
@@ -609,7 +609,7 @@ CrateExplosion:
 			Heavy: 25%
 		Explosion: self_destruct
 		WaterExplosion: self_destruct
-		InfDeath: 3
+		InfDeath: 4
 		ImpactSound: kaboom15

 CrateNuke:
@@ -624,7 +624,7 @@ CrateNuke:
 			Concrete: 50%
 		Explosion: nuke
 		WaterExplosion: nuke
-		InfDeath: 4
+		InfDeath: 5
 		ImpactSound: kaboom1
 	Warhead@areanuke:
 		DamageModel: PerCell
@@ -638,7 +638,7 @@ CrateNuke:
 			Heavy: 25%
 			Concrete: 50%
 		Delay: 4
-		InfDeath: 4
+		InfDeath: 5
 		ImpactSound: kaboom22
 		
 		
@@ -650,7 +650,7 @@ TeslaZap:
 	Projectile: TeslaZap
 	Warhead:
 		Spread: 1
-		InfDeath: 5
+		InfDeath: 6
 		Damage: 100
 		
 Nike:
@@ -678,7 +678,7 @@ Nike:
 			Heavy: 50%
 			Concrete: 0%
 		Explosion: med_explosion
-		InfDeath: 2
+		InfDeath: 3
 		SmudgeType: Crater
 		Damage: 100

@@ -706,7 +706,7 @@ RedEye:
 			Light: 60%
 			Heavy: 25%
 		Explosion: med_explosion
-		InfDeath: 2
+		InfDeath: 3
 		SmudgeType: Crater
 		Damage: 40

@@ -732,7 +732,7 @@ RedEye:
 			Heavy: 25%
 		Explosion: large_explosion
 		WaterExplosion: large_splash
-		InfDeath: 2
+		InfDeath: 3
 		SmudgeType: Crater
 		Damage: 250
 		ImpactSound: kaboom12
@@ -760,7 +760,7 @@ SubMissile:
 			Heavy: 30%
 		Explosion: large_explosion
 		WaterExplosion: large_splash
-		InfDeath: 2
+		InfDeath: 3
 		SmudgeType: Crater
 		Damage: 300
 		ImpactSound: kaboom12
@@ -794,7 +794,7 @@ Stinger:
 			Concrete: 50%
 		Explosion: med_explosion
 		WaterExplosion: med_splash
-		InfDeath: 3
+		InfDeath: 4
 		SmudgeType: Crater
 		Damage: 30
 		
@@ -821,7 +821,7 @@ TorpTube:
 			Light: 75%
 			Concrete: 50%
 		WaterExplosion: large_splash
-		InfDeath: 3
+		InfDeath: 4
 		SmudgeType: Crater
 		Damage: 180
 		
@@ -841,7 +841,7 @@ TorpTube:
 			Concrete: 50%
 		Explosion: small_explosion
 		WaterExplosion: med_splash
-		InfDeath: 3
+		InfDeath: 4
 		SmudgeType: Crater
 		Damage: 25
 		
@@ -863,7 +863,7 @@ DepthCharge:
 			Light: 75%
 			Concrete: 50%
 		WaterExplosion: large_splash
-		InfDeath: 3
+		InfDeath: 4
 		SmudgeType: Crater
 		Damage: 80
 		
@@ -882,7 +882,7 @@ ParaBomb:
 			Concrete: 50%
 		Explosion: self_destruct
 		WaterExplosion: small_splash
-		InfDeath: 3
+		InfDeath: 4
 		SmudgeType: Crater
 		Damage: 500
 		ImpactSound: kaboom15
@@ -898,7 +898,7 @@ DogJaw:
 			Light: 0%
 			Heavy: 0%
 			Concrete: 0%
-		InfDeath: 0
+		InfDeath: 1
 		Damage: 100
 		
 Heal:
@@ -914,7 +914,7 @@ Heal:
 			Light: 0%
 			Heavy: 0%
 			Concrete: 0%
-		InfDeath: 0
+		InfDeath: 1
 		Damage: -50

 SilencedPPK:
@@ -931,7 +931,7 @@ SilencedPPK:
 			Heavy: 0%
 			Concrete: 0%
 		Explosion: piffs
-		InfDeath: 1
+		InfDeath: 2
 		Damage: 150
 		
 SCUD:
@@ -958,7 +958,7 @@ SCUD:
 			Heavy: 25%
 		Explosion: napalm
 		WaterExplosion: large_splash
-		InfDeath: 2
+		InfDeath: 3
 		SmudgeType: Crater
 		Damage: 600
 		ImpactSound: firebl3
@@ -976,7 +976,7 @@ Atomic:
 			Concrete: 50%
 		Explosion: nuke
 		WaterExplosion: nuke
-		InfDeath: 4
+		InfDeath: 5
 		ImpactSound: kaboom1
 	Warhead@areanuke:
 		DamageModel: PerCell
@@ -990,7 +990,7 @@ Atomic:
 			Heavy: 25%
 			Concrete: 50%
 		Delay: 4
-		InfDeath: 4
+		InfDeath: 5
 		ImpactSound: kaboom22

 UnitExplode:
@@ -1004,7 +1004,7 @@ UnitExplode:
 			Heavy: 25%
 		Explosion: self_destruct
 		WaterExplosion: large_splash
-		InfDeath: 3
+		InfDeath: 4
 		ImpactSound: kaboom22

 UnitExplodeSmall:
@@ -1017,7 +1017,7 @@ UnitExplodeSmall:
 			Light: 60%
 			Heavy: 25%
 		Explosion: large_explosion
-		InfDeath: 3
+		InfDeath: 4
 		ImpactSound: kaboom15

 Crush:
@@ -1044,7 +1044,7 @@ APMine:
 			Heavy: 0%
 			Concrete: 0%
 		ImpactSound: mine1
-		InfDeath: 2
+		InfDeath: 3
 		Explosion: napalm
 		
 Demolish:
@@ -1061,7 +1061,7 @@ PortaTesla:
 	Projectile: TeslaZap
 	Warhead:
 		Spread: 1
-		InfDeath: 5
+		InfDeath: 6
 		Damage: 45

 TTankZap:
@@ -1072,7 +1072,7 @@ TTankZap:
 	Projectile: TeslaZap
 	Warhead:
 		Spread: 1
-		InfDeath: 5
+		InfDeath: 6
 		Damage: 100

 FLAK-23: