merge RA Classic 0.1 yaml rules by @Iran

2013-01-26 11:48:26 +01:00
parent 7398914af9
commit 7caf2956d7
12 changed files with 3808 additions and 1569 deletions
--- a/mods/ra-classic/mod.yaml
+++ b/mods/ra-classic/mod.yaml
@@ -70,17 +70,17 @@ ChromeLayout:

 Weapons:
 	mods/ra-classic/weapons.yaml
-	
+
 Voices:
 	mods/ra/voices.yaml

 Notifications:
 	mods/ra/notifications.yaml
-	
+
 TileSets:
 	mods/ra/tilesets/snow.yaml
 	mods/ra/tilesets/interior.yaml
-	mods/ra/tilesets/temperat.yaml
+	mods/ra-classic/tilesets/temperat.yaml

 Music:
 	mods/ra/music.yaml
--- a/mods/ra-classic/rules/aircraft.yaml
+++ b/mods/ra-classic/rules/aircraft.yaml
@@ -14,15 +14,9 @@ BADR:
 	IronCurtainable:
 	Cargo:
 		MaxWeight: 10
-#		Types: Infantry, Vehicle
 	-Selectable:
-	-GainsExperience:
 	Tooltip:
 		Name: Badger
-	Contrail@1:
-		ContrailOffset: 11, -11
-	Contrail@2:
-		ContrailOffset: -11, -11
 	FallsToEarth:
 		Spins: no
 		Moves: yes
@@ -53,15 +47,10 @@ BADR.bomber:
 	RenderUnit:
 		Image: badr
 	WithShadow:
-	IronCurtainable:	
+	IronCurtainable:
 	-Selectable:
-	-GainsExperience:
 	Tooltip:
 		Name: Badger
-	Contrail@1:
-		ContrailOffset: 11, -11
-	Contrail@2:
-		ContrailOffset: -11, -11
 	FallsToEarth:
 		Spins: no
 		Moves: yes
@@ -80,16 +69,16 @@ MIG:
 	Buildable:
 		Queue: Plane
 		BuildPaletteOrder: 100
-		Prerequisites: afld, stek
+		Prerequisites: afld
 		BuiltAt: afld
 		Owner: soviet
 	Valued:
-		Cost: 2000
+		Cost: 1200
 	Tooltip:
 		Name: Mig Attack Plane
 		Description: Fast Ground-Attack Plane.\n  Strong vs Buildings\n  Weak vs Infantry, Light Vehicles
 	Health:
-		HP: 70
+		HP: 50
 	Armor:
 		Type: Light
 	RevealsShroud:
@@ -106,15 +95,11 @@ MIG:
 	RenderUnit:
 	WithShadow:
 	LimitedAmmo:
-		Ammo: 8
+		Ammo: 3
 	IronCurtainable:
 	ReturnOnIdle:
 	Selectable:
 		Bounds: 44,40,0,0
-	Contrail@1:
-		ContrailOffset: 16,-14
-	Contrail@2:
-		ContrailOffset: -16,-14
 	FallsToEarth:
 		Spins: no
 		Moves: yes
@@ -132,7 +117,7 @@ YAK:
 		BuiltAt: afld
 		Owner: soviet
 	Valued:
-		Cost: 1000
+		Cost: 800
 	Tooltip:
 		Name: Yak Attack Plane
 		Description: Anti-Tanks & Anti-Infantry Plane.\n  Strong vs Infantry, Tanks\n  Weak vs Buildings
@@ -143,8 +128,8 @@ YAK:
 	RevealsShroud:
 		Range: 10
 	AttackPlane:
-		PrimaryWeapon: ChainGun.Yak
-		SecondaryWeapon: ChainGun.Yak
+		PrimaryWeapon: ChainGun
+		SecondaryWeapon: ChainGun
 		PrimaryOffset: -5,-6,0,0
 		SecondaryOffset: 5,-6,0,0
 		FacingTolerance: 20
@@ -156,14 +141,12 @@ YAK:
 	RenderUnit:
 	WithShadow:
 	LimitedAmmo:
-		Ammo: 18
+		Ammo: 15
 		PipCount: 6
 		ReloadTicks: 11
 	IronCurtainable:
 	ReturnOnIdle:
 	WithMuzzleFlash:
-	Contrail:
-		ContrailOffset: 0, -20
 	FallsToEarth:
 		Spins: no
 		Moves: yes
@@ -171,7 +154,7 @@ YAK:
 	SmokeTrailWhenDamaged:
 		Offset: 0, -20
 		Interval: 2
-		
+

 TRAN:
 	Inherits: ^Helicopter
@@ -180,7 +163,7 @@ TRAN:
 		BuildPaletteOrder: 110
 		Prerequisites: hpad
 		BuiltAt: hpad
-		Owner: allies
+		Owner: soviet
 	Valued:
 		Cost: 1200
 	Tooltip:
@@ -212,45 +195,29 @@ TRAN:
 	IronCurtainable:
 	FallsToEarth:
 		Explosion: UnitExplode
-		
-TRAN.Husk1:
-	Inherits: ^Husk
-	Tooltip:
-		Name: Husk (Transport Helicopter)
-	RenderUnit:
-		Image: tran1husk
-
-TRAN.Husk2:
-	Inherits: ^Husk
-	Tooltip:
-		Name: Husk (Transport Helicopter)
-	RenderUnit:
-		Image: tran2husk

 HELI:
 	Inherits: ^Helicopter
 	Buildable:
 		Queue: Plane
 		BuildPaletteOrder: 90
-		Prerequisites: hpad, atek
+		Prerequisites: hpad
 		BuiltAt: hpad
 		Owner: allies
 	Valued:
-		Cost: 2000
+		Cost: 1200
 	Tooltip:
 		Name: Longbow
-		Description: Helicopter Gunship with AG Missiles.\n  Strong vs Tanks\n  Weak vs Infantry
+		Description: Helicopter AG Missiles.\n  Strong vs Tanks\n  Weak vs Infantry
 	Health:
-		HP: 120
+		HP: 225
 	Armor:
-		Type: Light
+		Type: Heavy
 	RevealsShroud:
 		Range: 12
 	AttackHeli:
 		PrimaryWeapon: HellfireAG
-		SecondaryWeapon: HellfireAA
 		PrimaryOffset: -5,0,0,2
-		SecondaryOffset: 5,0,0,2
 		FacingTolerance: 20
 	Helicopter:
 		RearmBuildings: hpad
@@ -263,7 +230,7 @@ HELI:
 		Offset: 0,0,0,-2
 	WithShadow:
 	LimitedAmmo:
-		Ammo: 8
+		Ammo: 6
 	IronCurtainable:
 	FallsToEarth:
 		Explosion: UnitExplode
@@ -277,16 +244,16 @@ HIND:
 		BuildPaletteOrder: 90
 		Prerequisites: hpad
 		BuiltAt: hpad
-		Owner: allies
+		Owner: soviet
 	Valued:
-		Cost: 1000
+		Cost: 1200
 	Tooltip:
 		Name: Hind
-		Description: Helicopter Gunship with Chainguns.\n  Strong vs Infantry, Light Vehicles.\n  Weak vs Tanks
+		Description: Helicopter with Chainguns.\n  Strong vs Infantry, Light Vehicles.\n  Weak vs Tanks
 	Health:
-		HP: 150
+		HP: 225
 	Armor:
-		Type: Light
+		Type: Heavy
 	RevealsShroud:
 		Range: 10
 	AttackHeli:
@@ -305,7 +272,7 @@ HIND:
 	WithRotor:
 	WithShadow:
 	LimitedAmmo:
-		Ammo: 24
+		Ammo: 12
 		PipCount: 6
 		ReloadTicks: 8
 	IronCurtainable:
@@ -330,11 +297,6 @@ U2:
 	WithShadow:
 	IronCurtainable:
 	-Selectable:
-	-GainsExperience:
-	Contrail@1:
-		ContrailOffset: 16, -17
-	Contrail@2:
-		ContrailOffset: -16, -17
 	FallsToEarth:
 		Spins: no
 		Moves: yes
--- a/mods/ra-classic/rules/civilian.yaml
+++ b/mods/ra-classic/rules/civilian.yaml
@@ -0,0 +1,276 @@
+C1:
+	Inherits: ^CivInfantry
+
+C2:
+	Inherits: ^CivInfantry
+	Selectable:
+		Voice: CivilianFemaleVoice
+
+C3:
+	Inherits: ^CivInfantry
+	RenderInfantryPanic:
+		Image: C1
+
+C4:
+	Inherits: ^CivInfantry
+	Selectable:
+		Voice: CivilianFemaleVoice
+	RenderInfantryPanic:
+		Image: C2
+
+C5:
+	Inherits: ^CivInfantry
+	RenderInfantryPanic:
+		Image: C1
+
+C6:
+	Inherits: ^CivInfantry
+	Selectable:
+		Voice: CivilianFemaleVoice
+	RenderInfantryPanic:
+		Image: C2
+
+C7:
+	Inherits: ^CivInfantry
+	RenderInfantryPanic:
+		Image: C1
+
+C8:
+	Inherits: ^CivInfantry
+	Selectable:
+		Voice: CivilianFemaleVoice
+	RenderInfantryPanic:
+		Image: C2
+
+C9:
+	Inherits: ^CivInfantry
+	RenderInfantryPanic:
+		Image: C1
+
+C10:
+	Inherits: ^CivInfantry
+	Selectable:
+		Voice: CivilianFemaleVoice
+	RenderInfantryPanic:
+		Image: C2
+
+FCOM:
+	Inherits: ^TechBuilding
+	Building:
+		Power: -200
+		Footprint: xx xx
+		Dimensions: 2,2
+	Health:
+		HP: 400
+	Armor:
+		Type: Wood
+	Tooltip:
+		Name: Forward Command
+	RevealsShroud:
+		Range: 10
+	Bib:
+
+HOSP:
+	Inherits: ^TechBuilding
+	Building:
+		Footprint: xx xx
+		Dimensions: 2,2
+	Tooltip:
+		Name: Hospital
+	RepairsUnits:
+
+V01:
+	Inherits: ^CivBuilding
+	Building:
+		Footprint: xx xx
+		Dimensions: 2,2
+	Tooltip:
+		Name: Church
+
+V02:
+	Inherits: ^CivBuilding
+	Building:
+		Footprint: xx xx
+		Dimensions: 2,2
+
+V03:
+	Inherits: ^CivBuilding
+	Building:
+		Footprint: xx xx
+		Dimensions: 2,2
+
+V04:
+	Inherits: ^CivBuilding
+	Building:
+		Footprint: xx xx
+		Dimensions: 2,2
+
+V05:
+	Inherits: ^CivBuilding
+	Building:
+		Footprint: xx
+		Dimensions: 2,1
+
+V06:
+	Inherits: ^CivBuilding
+	Building:
+		Footprint: xx
+		Dimensions: 2,1
+
+V07:
+	Inherits: ^CivBuilding
+	Building:
+		Footprint: xx
+		Dimensions: 2,1
+
+V08:
+	Inherits: ^CivBuilding
+
+V09:
+	Inherits: ^CivBuilding
+
+V10:
+	Inherits: ^CivBuilding
+
+V11:
+	Inherits: ^CivBuilding
+
+V12:
+	Inherits: ^CivBuilding
+
+V13:
+	Inherits: ^CivBuilding
+
+V14:
+	Inherits: ^CivField
+
+V15:
+	Inherits: ^CivField
+
+V16:
+	Inherits: ^CivField
+
+V17:
+	Inherits: ^CivField
+
+V18:
+	Inherits: ^CivField
+
+BARL:
+	Inherits: ^TechBuilding
+	Selectable:
+		Priority: 0
+	Health:
+		HP: 10
+	Explodes:
+		Weapon: BarrelExplode
+	Tooltip:
+		Name: Explosive Barrel
+	AutoTargetIgnore:
+
+BRL3:
+	Inherits: ^TechBuilding
+	Selectable:
+		Priority: 0
+	Health:
+		HP: 10
+	Explodes:
+		Weapon: BarrelExplode
+	Tooltip:
+		Name: Explosive Barrel
+	AutoTargetIgnore:
+
+MISS:
+	Inherits: ^TechBuilding
+	Selectable:
+		Priority: 0
+	Building:
+		Footprint: xxx xxx
+		Dimensions: 3,2
+	Health:
+		HP: 400
+	Armor:
+		Type: Wood
+	Tooltip:
+		Name: Technology Center
+	Bib:
+
+BIO:
+	Inherits: ^TechBuilding
+	Building:
+		Footprint: xx xx
+		Dimensions: 2,2
+	Tooltip:
+		Name: Biological Lab
+
+
+OILB:
+	Inherits: ^TechBuilding
+	Selectable:
+		Priority: 0
+	Building:
+		Footprint: xx xx
+		Dimensions: 2,2
+	Health:
+		HP: 400
+	Armor:
+		Type: Wood
+	Bib:
+	RevealsShroud:
+		Range: 3
+	Capturable:
+	CapturableBar:
+	EngineerRepairable:
+	-MustBeDestroyed:
+	Tooltip:
+		Name: Oil Derrick
+
+BR1:
+	Inherits: ^Bridge
+	Bridge:
+		Template: 235
+		DamagedTemplate: 236
+		DestroyedTemplate: 237
+		SouthOffset: 0,2
+
+BR2:
+	Inherits: ^Bridge
+	Bridge:
+		Template: 238
+		DamagedTemplate: 239
+		DestroyedTemplate: 240
+		NorthOffset: 3,0
+
+BR3:
+	Inherits: ^Bridge
+	Bridge:
+		Long: yes
+		ShorePieces: br1,br2
+		Template: 241
+		DamagedTemplate: 242
+		DestroyedTemplate: 243
+		DestroyedPlusNorthTemplate: 245
+		DestroyedPlusSouthTemplate: 244
+		DestroyedPlusBothTemplate: 246
+		NorthOffset: 2,0
+		SouthOffset: 0,1
+
+BRIDGE1:
+	Inherits: ^Bridge
+	Bridge:
+		Template: 131
+		DamagedTemplate: 378
+		DestroyedTemplate: 132
+	Building:
+		Footprint: _____ _____ _____
+		Dimensions: 5,3
+
+BRIDGE2:
+	Inherits: ^Bridge
+	Bridge:
+		Template: 133
+		DamagedTemplate: 379
+		DestroyedTemplate: 134
+	Building:
+		Footprint: _____ _____
+		Dimensions: 5,2
--- a/mods/ra-classic/rules/defaults.yaml
+++ b/mods/ra-classic/rules/defaults.yaml
@@ -20,15 +20,10 @@
 		CargoType: Vehicle
 	IronCurtainable: 
 	AttackMove:
-	HiddenUnderFog:
-	GainsExperience:
-	GivesExperience:
-	DrawLineToTarget:
 	ActorLostNotification:
 		Notification: unitlst1.aud
 	ProximityCaptor:
 		Types:Vehicle
-	GivesBounty:
 	GpsDot:
 		String:Vehicle
 	WithSmoke:
@@ -56,15 +51,10 @@
 		CargoType: Vehicle
 	IronCurtainable:
 	AttackMove:
-	HiddenUnderFog:
-	GainsExperience:
-	GivesExperience:
-	DrawLineToTarget:
 	ActorLostNotification:
 		Notification: unitlst1.aud
 	ProximityCaptor:
 		Types:Tank
-	GivesBounty:
 	GpsDot:
 		String:Vehicle
 	WithSmoke:
@@ -97,25 +87,17 @@
 	AttackMove:
 	Passenger:
 		CargoType: Infantry
-	HiddenUnderFog:
 	TeslaInstantKills:
-	GainsExperience:
-	GivesExperience:
-	DrawLineToTarget:
 	ActorLostNotification:
 		Notification: unitlst1.aud
 	ProximityCaptor:
 		Types:Infantry
-	GivesBounty:
 	GpsDot:
 		String:Infantry
 	ParachuteAttachment:
 		Offset: 0,-10
 	CrushableInfantry:
 		CrushSound: squishy2.aud
-	RepairableNear:
-		Buildings: hosp
-		CloseEnough: 1
 	UpdatesPlayerStatistics:

 ^Ship:
@@ -131,16 +113,11 @@
 		TargetTypes: Ground, Water
 	DetectCloaked:
 		Range: 3
-	HiddenUnderFog:
 	AttackMove:
-	GainsExperience:
-	GivesExperience:
-	DrawLineToTarget:
 	ActorLostNotification:
 		Notification: navylst1.aud
 	ProximityCaptor:
 		Types:Ship
-	GivesBounty:
 	GpsDot:
 		String:Ship
 	WithSmoke:
@@ -156,9 +133,6 @@
 		TargetTypes: Air
 		GroundedTargetTypes: Ground
 	HiddenUnderFog:
-	GainsExperience:
-	GivesExperience:
-	DrawLineToTarget:
 	ActorLostNotification:
 		Notification: aunitl1.aud
 	DebugAircraftFacing:
@@ -170,7 +144,6 @@
 	EjectOnDeath:
 		PilotActor: E1
 		SuccessRate: 50
-	GivesBounty:
 	GpsDot:
 		String:Plane
 	UpdatesPlayerStatistics:
@@ -202,10 +175,8 @@
 	RepairableBuilding:
 	EngineerRepairable:
 	EmitInfantryOnSell:
-		ActorTypes: e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,e1,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,e6,e6,e6,e6,e6
+		ActorTypes: e1,e1,e1,c1,c2,e6
 	MustBeDestroyed:
-	GivesExperience:
-#	FrozenUnderFog:
 	CaptureNotification:
 		Notification: strucap1.aud
 	EditorAppearance:
@@ -214,9 +185,6 @@
 	ProximityCaptor:
 		Types:Building
 	Sellable:
-	AcceptsSupplies:
-	GivesBounty:
-	UpdatesPlayerStatistics:

 ^Wall:
 	AppearsOnRadar:
@@ -249,7 +217,6 @@
 	ProximityCaptor:
 		Types:Wall
 	Sellable:
-	UpdatesPlayerStatistics:

 ^TechBuilding:
 	Inherits: ^Building
@@ -263,7 +230,6 @@
 		Name: Civilian Building
 	ProximityCaptor:
 		Types:CivilianBuilding
-	-AcceptsSupplies:
 	-GivesBuildableArea:
 	-Sellable:
 	-Capturable:
@@ -351,70 +317,4 @@
 		HP: 1000
 	ProximityCaptor:
 		Types:Bridge
-	AutoTargetIgnore:
-
-#Temperate Terrain Expansion
-^SVBridge:
-	Tooltip:
-		Name: Small Bridge
-	BelowUnits:
-	TargetableBuilding:
-		TargetTypes: Ground, Water
-	Building:
-		Footprint: ___ ___
-		Dimensions: 3,2
-	Health:
-		HP: 750
-	ProximityCaptor:
-		Types:Bridge
-
-^SHBridge:
-	Tooltip:
-		Name: Small Bridge
-	BelowUnits:
-	TargetableBuilding:
-		TargetTypes: Ground, Water
-	Building:
-		Footprint: __ __ __
-		Dimensions: 2,3
-	Health:
-		HP: 750
-	ProximityCaptor:
-		Types:Bridge
-
-^STDBridge:
-	Tooltip:
-		Name: Small Bridge
-	BelowUnits:
-	TargetableBuilding:
-		TargetTypes: Ground, Water
-	Building:
-		Footprint: ____ ____
-		Dimensions: 4,2
-	Health:
-		HP: 750
-	ProximityCaptor:
-		Types:Bridge
-
-#Desert Terrain Expansion:
-^Rock:
-	Tooltip:
-		Name: Rock
-	RenderBuilding:
-		Palette: terrain
-	Building:
-		Footprint: __ x_
-		Dimensions: 2,2
-	AppearsOnRadar:
-	RadarColorFromTerrain:
-		Terrain: Tree
-	EditorAppearance:
-		RelativeToTopLeft: yes
-		UseTerrainPalette: true
-	ProximityCaptor:
-		Types:Tree
-
-^DesertCivBuilding:
-	Inherits: ^CivBuilding
-	RenderBuilding:
-		Palette: terrain
+	AutoTargetIgnore:
--- a/mods/ra-classic/rules/infantry.yaml
+++ b/mods/ra-classic/rules/infantry.yaml
@@ -3,9 +3,8 @@ DOG:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 30
-		Prerequisites: barr
+		Prerequisites: kenn
 		Owner: soviet
-		Hotkey: o
 	Valued:
 		Cost: 200
 	Tooltip:
@@ -17,7 +16,7 @@ DOG:
 	Health:
 		HP: 12
 	Mobile:
-		Speed: 7
+		Speed: 4
 	RevealsShroud:
 		Range: 5
 	AutoTarget:
@@ -34,7 +33,6 @@ E1:
 		Queue: Infantry
 		BuildPaletteOrder: 10
 		Owner: allies,soviet
-		Hotkey: i
 	Valued:
 		Cost: 100
 	Tooltip:
@@ -60,7 +58,6 @@ E2:
 		BuildPaletteOrder: 10
 		Owner: soviet
 		Prerequisites: barr
-		Hotkey: g
 	Valued:
 		Cost: 160
 	Tooltip:
@@ -82,7 +79,7 @@ E2:
 		IdleAnimations: idle1,idle2
 	Explodes:
 		Weapon: UnitExplodeSmall
-		Chance: 50		
+		Chance: 50

 E3:
 	Inherits: ^Infantry
@@ -90,7 +87,6 @@ E3:
 		Queue: Infantry
 		BuildPaletteOrder: 20
 		Owner: allies,soviet
-		Hotkey: r
 	Valued:
 		Cost: 300
 	Tooltip:
@@ -118,7 +114,6 @@ E4:
 		BuildPaletteOrder: 60
 		Prerequisites: ftur
 		Owner: soviet
-		Hotkey: t
 	Valued:
 		Cost: 300
 	Tooltip:
@@ -138,14 +133,13 @@ E4:
 	-RenderInfantry:
 	RenderInfantryProne:
 		IdleAnimations: idle1,idle2
-
+		
 E6:
 	Inherits: ^Infantry
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 50
 		Owner: soviet,allies
-		Hotkey: e
 	Valued:
 		Cost: 500
 	Tooltip:
@@ -169,7 +163,7 @@ E6:
 	-RenderInfantry:
 	RenderInfantryProne:
 		IdleAnimations: idle1,idle2
-
+		
 SPY:
 	Inherits: ^Infantry
 	Buildable:
@@ -177,7 +171,6 @@ SPY:
 		BuildPaletteOrder: 60
 		Prerequisites: dome, tent
 		Owner: allies
-		Hotkey: p
 	Valued:
 		Cost: 500
 	SpyToolTip:
@@ -202,23 +195,19 @@ SPY:
 	-RenderInfantry:
 	RenderSpy:
 		IdleAnimations: idle1,idle2
-	AttackFrontal:
-		PrimaryWeapon: SilencedPPK
-
+		
 E7:
 	Inherits: ^Infantry
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 110
 		Prerequisites: techcenter
-		Owner: allies
-		Hotkey: y
-		BuildLimit: 1
+		Owner: allies,soviet
 	Valued:
 		Cost: 1200
 	Tooltip:
 		Name: Tanya
-		Description: Elite commando infantry, armed with \ndual pistols and C4.\n  Strong vs Infantry, Buildings\n  Weak vs Vehicles\n  Special Ability: Destroy Building with C4\n\nMaximum 1 can be trained
+		Description: Elite commando infantry, armed with \ndual pistols and C4.\n  Strong vs Infantry, Buildings\n  Weak vs Vehicles\n  Special Ability: Destroy Building with C4
 	Selectable:
 		Voice: TanyaVoice
 		Bounds: 12,17,0,-9
@@ -240,47 +229,6 @@ E7:
 	RenderInfantryProne:
 		IdleAnimations: idle1,idle2

-E8:
-	Inherits: ^Infantry
-	Buildable:
-		Queue: Infantry
-		BuildPaletteOrder: 110
-		Prerequisites: stek
-		Owner: soviet
-		Hotkey: v
-		BuildLimit: 1
-	Valued:
-		Cost: 1800
-	Tooltip:
-		Name: Volkov
-		Description: Elite commando cyborg, armed with \nmodular cannons and grenade launcher.\n  Strong vs Vehicles, Infantry\n  Weak vs Aircraft\n\nMaximum 1 can be trained
-	Selectable:
-		Voice: VolkovVoice
-		Bounds: 12,17,0,-9
-	Health:
-		HP: 200
-	Armor:
-		Type: Cybernetic
-	Mobile:
-		Speed: 5
-		Crushes: atmine, crate
-	RevealsShroud:
-		Range: 4
-	Passenger:
-		PipType: Red
-	AttackFrontal:
-		PrimaryWeapon: VolkAT
-		SecondaryWeapon: VolkNapalm
-	TakeCover:
-	-RenderInfantry:
-	RenderInfantryProne:
-		IdleAnimations: idle1
-	CrushableInfantry:
-		CrushSound: crunchy2.aud
-	RepairableNear:
-		Buildings: fix
-		CloseEnough: 1
-
 MEDI:
 	Inherits: ^Infantry
 	Buildable:
@@ -288,9 +236,8 @@ MEDI:
 		BuildPaletteOrder: 20
 		Owner: allies
 		Prerequisites: tent
-		Hotkey: m
 	Valued:
-		Cost: 300
+		Cost: 800
 	Tooltip:
 		Name: Medic
 		Description: Heals nearby infantry.\n  Strong vs Nothing\n  Weak vs Everything
@@ -323,7 +270,6 @@ MECH:
 		BuildPaletteOrder: 70
 		Owner: allies
 		Prerequisites: fix
-		Hotkey: c
 	Valued:
 		Cost: 800
 	Tooltip:
@@ -350,6 +296,7 @@ MECH:
 	-RenderInfantry:
 	RenderInfantryProne:
 		IdleAnimations: idle1,idle2
+
 EINSTEIN:
 	Inherits: ^Infantry
 	Selectable:
@@ -375,11 +322,10 @@ SHOK:
 	Inherits: ^Infantry
 	Buildable:
 		Queue: Infantry
-		Prerequisites: stek,tsla
+		Prerequisites: tsla
 		Owner: soviet
-		Hotkey: l
 	Valued:
-		Cost: 500
+		Cost: 900
 	Tooltip:
 		Name: Tesla Trooper
 		Description: Infantry with tesla coils\n Strong vs Infantry\n Weak vs Vehicles
@@ -399,46 +345,4 @@ SHOK:
 	-RenderInfantry:
 	RenderInfantryProne:
 		IdleAnimations: idle1,idle2
-	-CrushableInfantry:
-
-SNIPER:
-	Inherits: ^Infantry
-	Valued:
-		Cost: 700
-	Tooltip:
-		Icon: snipericon
-		Name: Sniper
-		Description: Elite sniper infantry unit.\n  Strong vs Infantry\n  Weak vs Vehicles
-	Buildable:
-		Queue: Infantry
-		BuildPaletteOrder: 50
-		Owner: soviet
-		Prerequisites: dome
-		Hotkey: n
-	Selectable:
-		Bounds: 12,17,0,-6
-	Mobile:
-		Speed: 4
-	Health:
-		HP: 200
-	Passenger:
-		PipType: Red
-	RevealsShroud:
-		Range: 6
-	AutoTarget:
-		InitialStance: HoldFire
-	AttackFrontal:
-		PrimaryWeapon: Sniper
-	TakeCover:
-	-RenderInfantry:
-	RenderInfantryProne:
-		IdleAnimations: idle1,idle2
-	Cloak:
-		InitialDelay: 250
-		CloakDelay: 120
-		CloakSound:
-		UncloakSound:
-		UncloakOnMove: yes
-	Captures:
-		CaptureTypes: civilianbuilding
-		AllowAllies: true
+	-CrushableInfantry:
--- a/mods/ra-classic/rules/ships.yaml
+++ b/mods/ra-classic/rules/ships.yaml
@@ -6,19 +6,18 @@ SS:
 		Prerequisites: spen
 		BuiltAt: spen
 		Owner: soviet
-		Hotkey: b
 	Valued:
 		Cost: 950
 	Tooltip:
 		Name: Submarine
 		Description: Submerged anti-ship unit armed with \ntorpedoes.\n  Strong vs Ships\n  Weak vs Everything\n  Special Ability: Submerge
 	Health:
-		HP: 250
+		HP: 120
 	Armor:
 		Type: Light
 	Mobile:
-		ROT: 4
-		Speed: 5
+		ROT: 7
+		Speed: 6
 	RevealsShroud:
 		Range: 6
 	-TargetableUnit:
@@ -44,7 +43,7 @@ SS:
 	AutoTarget:
 		InitialStance: HoldFire
 	AttackMove:
-
+	
 MSUB:
 	Inherits: ^Ship
 	Buildable:
@@ -53,19 +52,18 @@ MSUB:
 		Prerequisites: spen,stek
 		BuiltAt: spen
 		Owner: soviet
-		Hotkey: m
 	Valued:
-		Cost: 2400
+		Cost: 1650
 	Tooltip:
 		Name: Missile Submarine
 		Description: Submerged anti-ground unit armed with \nlong-range ballistic missiles.\n  Strong vs Buildings\n  Weak vs Everything\n  Special Ability: Submerge
 	Health:
-		HP: 400
+		HP: 150
 	Armor:
 		Type: Light
 	Mobile:
-		ROT: 3
-		Speed: 3
+		ROT: 7
+		Speed: 5
 	RevealsShroud:
 		Range: 6
 	RenderUnit:
@@ -96,10 +94,9 @@ DD:
 	Buildable:
 		Queue: Ship
 		BuildPaletteOrder: 70
-		Prerequisites: syrd,dome
+		Prerequisites: syrd
 		BuiltAt: syrd
 		Owner: allies
-		Hotkey: r
 	Valued:
 		Cost: 1000
 	Tooltip:
@@ -140,19 +137,18 @@ CA:
 		Prerequisites: syrd,atek
 		BuiltAt: syrd
 		Owner: allies
-		Hotkey: c
 	Valued:
-		Cost: 2400
+		Cost: 2000
 	Tooltip:
 		Name: Cruiser
 		Description: Very slow long-range ship. \n  Strong vs Buildings\n  Weak vs Ships, Submarines
 	Health:
-		HP: 800
+		HP: 700
 	Armor:
 		Type: Heavy
 	Mobile:
-		ROT: 2
-		Speed: 2
+		ROT: 5
+		Speed: 4
 	RevealsShroud:
 		Range: 7
 	Turreted:
@@ -182,7 +178,6 @@ LST:
 		Queue: Ship
 		BuildPaletteOrder: 30
 		Owner: allies,soviet
-		Hotkey: t
 	Valued:
 		Cost: 700
 	Tooltip:
@@ -194,7 +189,7 @@ LST:
 		Type: Heavy
 	Mobile:
 		ROT: 10
-		Speed: 8
+		Speed: 14
 	RevealsShroud:
 		Range: 6
 	RenderUnit:
@@ -215,7 +210,6 @@ PT:
 		Prerequisites: syrd
 		BuiltAt: syrd
 		Owner: allies
-		Hotkey: g
 	Valued:
 		Cost: 500
 	Tooltip:
--- a/mods/ra-classic/rules/structures.yaml
+++ b/mods/ra-classic/rules/structures.yaml
@@ -1,17 +1,51 @@
+KENN:
+	Inherits: ^Building
+	Buildable:
+		Queue: Building
+		BuildPaletteOrder: 30
+		Prerequisites: barr
+		Owner: soviet
+	Valued:
+		Cost: 200
+	Tooltip:
+		Name: Dog Kennel
+		Description: Dog kennel
+	Building:
+		Power: -10
+		Dimensions: 1,1
+	Health:
+		HP: 400
+	Armor:
+		Type: Wood
+	RevealsShroud:
+		Range: 4
+	Bib:
+#	RallyPoint:
+#	Exit@1:
+#		SpawnOffset: -4,19
+#		ExitCell: 0,2
+#	Exit@2:
+#		SpawnOffset: -17,15
+#		ExitCell: 0,2
+#	Production:
+#		Produces: Infantry
+#	PrimaryBuilding:
+	IronCurtainable:
+#	ProductionBar:
+
 MSLO:
 	Inherits: ^Building
 	Valued:
 		Cost: 2500
 	Tooltip:
 		Name: Missile Silo
-		Description: Launches a devastating nuclear strike.\n  Strong vs Infantry, Buildings\n  Weak vs Tanks\n  Special Ability: Nuclear Missile\n\nMaximum 1 can be built
+		Description: Launches a devastating nuclear strike.\n  Strong vs Infantry, Buildings\n  Weak vs Tanks\n  Special Ability: Nuclear Missile
 		Icon: msloicon2
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 130
 		Prerequisites: techcenter
 		Owner: soviet,allies
-		BuildLimit: 1
 	Building:
 		Power: -100
 		Footprint: xx
@@ -43,7 +77,7 @@ GAP:
 	RequiresPower:
 	CanPowerDown:
 	Valued:
-		Cost: 1000
+		Cost: 500
 	Tooltip:
 		Name: Gap Generator
 		Description: Regenerates the shroud nearby, \nobscuring the area.\n  Unarmed
@@ -53,17 +87,17 @@ GAP:
 		Prerequisites: atek
 		Owner: allies
 	Building:
-		Power: -60
+		Power: -90
 		Footprint: _ x
 		Dimensions: 1,2
 	Health:
-		HP: 1000
+		HP: 700
 	Armor:
 		Type: Wood
 	RevealsShroud:
-		Range: 6
+		Range: 10
 	CreatesShroud:
-		Range: 6
+		Range: 10
 	IronCurtainable:
 	RenderShroudCircle:

@@ -72,7 +106,7 @@ SPEN:
 	InfiltrateForSupportPower:
 		Proxy: powerproxy.sonarpulse
 	Valued:
-		Cost: 800
+		Cost: 650
 	Tooltip:
 		Name: Sub Pen
 		Description: Produces and repairs submarines and \ntransports
@@ -133,7 +167,7 @@ SYRD:
 		Owner: allies
 		Hotkey: y
 	Valued:
-		Cost: 1000
+		Cost: 650
 	Tooltip:
 		Name: Shipyard
 		Description: Produces and repairs ships
@@ -188,7 +222,7 @@ IRON:
 		Owner: soviet
 		Hotkey: c
 	Valued:
-		Cost: 1500
+		Cost: 2800
 	Tooltip:
 		Name: Iron Curtain
 		Description: Makes a group of units invulnerable for a \nshort time.\n  Special Ability: Invulnerability
@@ -208,8 +242,8 @@ IRON:
 		Image: infxicon
 		ChargeTime: 120
 		Description: Invulnerability
-		LongDesc: Makes a group of units invulnerable\nfor 15 seconds.
-		Duration: 15
+		LongDesc: Makes a group of units invulnerable\nfor 10 seconds.
+		Duration: 10
 		SelectTargetSound: slcttgt1.aud
 		BeginChargeSound: ironchg1.aud
 		EndChargeSound: ironrdy1.aud
@@ -226,7 +260,7 @@ PDOX:
 		Owner: allies
 		Hotkey: o
 	Valued:
-		Cost: 1500
+		Cost: 2800
 	Tooltip:
 		Name: Chronosphere
 		Description: Teleports a unit from one place \nto another, for a limited time.\n  Special Ability: Chronoshift
@@ -253,7 +287,6 @@ PDOX:
 		Duration: 30
 		KillCargo: yes
 	SupportPowerChargeBar:
-	-AcceptsSupplies:

 TSLA:
 	Inherits: ^Building
@@ -276,7 +309,7 @@ TSLA:
 		Dimensions: 1,2
 	-GivesBuildableArea:
 	Health:
-		HP: 400
+		HP: 600
 	Armor:
 		Type: Heavy
 	RevealsShroud:
@@ -290,8 +323,6 @@ TSLA:
 	IronCurtainable:
 	-RenderBuilding:
 	RenderRangeCircle:
-	-AcceptsSupplies:
-	DrawLineToTarget:

 AGUN:
 	Inherits: ^Building
@@ -304,7 +335,7 @@ AGUN:
 		Owner: allies
 		Hotkey: g
 	Valued:
-		Cost: 800
+		Cost: 600
 	Tooltip:
 		Name: AA Gun
 		Description: Anti-Air base defense.\n  Strong vs Aircraft\n  Weak vs Infantry, Tanks
@@ -331,8 +362,6 @@ AGUN:
 	-RenderBuilding:
 	RenderRangeCircle:
 		RangeCircleType: aa
-	-AcceptsSupplies:
-	DrawLineToTarget:

 DOME:
 	RequiresPower:
@@ -345,7 +374,7 @@ DOME:
 		Owner: allies,soviet
 		Hotkey: r
 	Valued:
-		Cost: 1600
+		Cost: 1000
 	Tooltip:
 		Name: Radar Dome
 		Description: Provides an overview of the battlefield.\n  Requires power to operate.
@@ -366,8 +395,16 @@ DOME:

 PBOX:
 	Inherits: ^Building
+	Buildable:
+		Queue: Defense
+		BuildPaletteOrder: 20
+		Prerequisites: tent
+		Owner: allies
+		Hotkey: p
 	Tooltip:
-		Name: Pillbox (Unarmed)
+		Name: Pillbox
+		Description: Basic defensive structure.\n  Strong vs Infantry, Light Vehicles\n  Weak vs Tanks, Aircraft
+		Icon: PBOXICON
 	Building:
 		Power: -15
 	-GivesBuildableArea:
@@ -378,148 +415,29 @@ PBOX:
 	Armor:
 		Type: Wood
 	RevealsShroud:
-		Range: 6
+		Range: 5
 	IronCurtainable:
-	-AcceptsSupplies:
-	Turreted:
-		ROT: 255
-	Cargo:
-		Types: Infantry
-		MaxWeight: 1
-		PipCount: 1
-	-EmitInfantryOnSell:
-#	EmitCargoOnSell:
-	DrawLineToTarget:
-	TransformOnPassenger@e1:
-		PassengerTypes: e1
-		OnEnter: pbox.e1
-		OnExit: pbox
-		SkipMakeAnims: true
-#	TransformOnPassenger@e2:
-#		PassengerTypes: e2
-#		OnEnter: pbox.e2
-#		OnExit: pbox
-#		SkipMakeAnims: true
-	TransformOnPassenger@e3:
-		PassengerTypes: e3
-		OnEnter: pbox.e3
-		OnExit: pbox
-		SkipMakeAnims: true
-	TransformOnPassenger@e4:
-		PassengerTypes: e4
-		OnEnter: pbox.e4
-		OnExit: pbox
-		SkipMakeAnims: true
-	TransformOnPassenger@e7:
-		PassengerTypes: e7
-		OnEnter: pbox.e7
-		OnExit: pbox
-		SkipMakeAnims: true
-	TransformOnPassenger@SHOK:
-		PassengerTypes: shok
-		OnEnter: pbox.shok
-		OnExit: pbox
-		SkipMakeAnims: true
-	TransformOnPassenger@Sniper:
-		PassengerTypes: sniper
-		OnEnter: pbox.sniper
-		OnExit: pbox
-		SkipMakeAnims: true
-
-PBOX.E1:
-	Inherits: PBOX
-	Buildable:
-		Queue: Defense
-		BuildPaletteOrder: 20
-		Prerequisites: tent
-		Owner: allies
-		Hotkey: p
-	Tooltip:
-		Name: Pillbox (Guns)
-		Description: Basic defensive structure.\n  Strong vs Infantry, Light Vehicles\n  Weak vs Tanks, Aircraft
-		Icon: PBOXICON
-	RenderBuilding:
-		Image: PBOX
 	RenderRangeCircle:
 	AutoTarget:
 	AttackTurreted:
 		PrimaryWeapon: Vulcan
 		PrimaryLocalOffset: 0,-11,0,0,0
 	WithMuzzleFlash:
-	Cargo:
-		InitialUnits: e1
-
-#PBOX.E2:
-#	Inherits: PBOX
-#	Tooltip:
-#		Name: Pillbox (Grenades)
-#	RenderBuilding:
-#		Image: PBOX
-
-PBOX.E3:
-	Inherits: PBOX
-	Tooltip:
-		Name: Pillbox (Rockets)
-	RenderBuilding:
-		Image: PBOX
-	RenderRangeCircle:
-	AutoTarget:
-	AttackTurreted:
-		PrimaryWeapon: Dragon
-		PrimaryLocalOffset: 0,-11,0,0,0
-
-PBOX.E4:
-	Inherits: PBOX
-	Tooltip:
-		Name: Pillbox (Flamethrower)
-	RenderBuilding:
-		Image: PBOX
-	RenderRangeCircle:
-	AutoTarget:
-	AttackTurreted:
-		PrimaryWeapon: Flamer
-		PrimaryLocalOffset: 0,-11,0,0,0
-
-PBOX.E7:
-	Inherits: PBOX
-	Tooltip:
-		Name: Pillbox (Tanya)
-	RenderBuilding:
-		Image: PBOX
-	RenderRangeCircle:
-	AutoTarget:
-	AttackTurreted:
-		PrimaryWeapon: Colt45
-		PrimaryLocalOffset: 0,-11,0,0,0
-
-PBOX.SHOK:
-	Inherits: PBOX
-	Tooltip:
-		Name: Pillbox (Tesla)
-	RenderBuilding:
-		Image: PBOX
-	RenderRangeCircle:
-	AutoTarget:
-	AttackTurreted:
-		PrimaryWeapon: PortaTesla
-		PrimaryLocalOffset: 0,-11,0,0,0
-
-PBOX.SNIPER:
-	Inherits: PBOX
-	Tooltip:
-		Name: Pillbox (Sniper)
-	RenderBuilding:
-		Image: PBOX
-	RenderRangeCircle:
-	AutoTarget:
-	AttackTurreted:
-		PrimaryWeapon: Sniper
-		PrimaryLocalOffset: 0,-11,0,0,0
-
+	Turreted:
+		ROT: 255
+	
 HBOX:
 	Inherits: ^Building
+	Buildable:
+		Queue: Defense
+		BuildPaletteOrder: 20
+		Prerequisites: tent
+		Owner: allies
+#		Hotkey: p
 	Tooltip:
-		Name: Camo Pillbox (Unarmed)
+		Name: Camo Pillbox
+		Description: Hidden defensive structure.\n  Strong vs Infantry, Light Vehicles\n  Weak vs Tanks, Aircraft
+		Icon: HBOXICON
 	Building:
 		Power: -15
 	-GivesBuildableArea:
@@ -530,148 +448,16 @@ HBOX:
 	Armor:
 		Type: Wood
 	RevealsShroud:
-		Range: 6
-	Cloak:
-		InitialDelay: 125
-		CloakDelay: 60
-		CloakSound: appear1.aud
-		UncloakSound: appear1.aud
+		Range: 5
 	IronCurtainable:
-	-AcceptsSupplies:
-	Turreted:
-		ROT: 255
-	Cargo:
-		Types: Infantry
-		MaxWeight: 1
-		PipCount: 1
-	-EmitInfantryOnSell:
-#	EmitCargoOnSell:
-	DrawLineToTarget:
-	TransformOnPassenger@e1:
-		PassengerTypes: e1
-		OnEnter: HBOX.e1
-		OnExit: HBOX
-		SkipMakeAnims: true
-#	TransformOnPassenger@e2:
-#		PassengerTypes: e2
-#		OnEnter: HBOX.e2
-#		OnExit: HBOX
-#		SkipMakeAnims: true
-	TransformOnPassenger@e3:
-		PassengerTypes: e3
-		OnEnter: HBOX.e3
-		OnExit: HBOX
-		SkipMakeAnims: true
-	TransformOnPassenger@e4:
-		PassengerTypes: e4
-		OnEnter: HBOX.e4
-		OnExit: HBOX
-		SkipMakeAnims: true
-	TransformOnPassenger@e7:
-		PassengerTypes: e7
-		OnEnter: HBOX.e7
-		OnExit: HBOX
-		SkipMakeAnims: true
-	TransformOnPassenger@SHOK:
-		PassengerTypes: shok
-		OnEnter: HBOX.shok
-		OnExit: HBOX
-		SkipMakeAnims: true
-	TransformOnPassenger@Sniper:
-		PassengerTypes: sniper
-		OnEnter: HBOX.sniper
-		OnExit: HBOX
-		SkipMakeAnims: true
-
-HBOX.E1:
-	Inherits: HBOX
-	Buildable:
-		Queue: Defense
-		BuildPaletteOrder: 20
-		Prerequisites: tent
-		Owner: allies
-		Hotkey: p
-	Tooltip:
-		Name: Camo Pillbox (Guns)
-		Description: Hidden defensive structure.\n  Strong vs Infantry, Light Vehicles\n  Weak vs Tanks, Aircraft
-		Icon: HBOXICON
-	RenderBuilding:
-		Image: HBOX
 	RenderRangeCircle:
 	AutoTarget:
 	AttackTurreted:
 		PrimaryWeapon: Vulcan
 		PrimaryLocalOffset: 0,-11,0,0,0
 	WithMuzzleFlash:
-	Cargo:
-		InitialUnits: e1
-
-#HBOX.E2:
-#	Inherits: HBOX
-#	Tooltip:
-#		Name: Camo Pillbox (Grenades)
-#	RenderBuilding:
-#		Image: HBOX
-
-HBOX.E3:
-	Inherits: HBOX
-	Tooltip:
-		Name: Camo Pillbox (Rockets)
-	RenderBuilding:
-		Image: HBOX
-	RenderRangeCircle:
-	AutoTarget:
-	AttackTurreted:
-		PrimaryWeapon: Dragon
-		PrimaryLocalOffset: 0,-11,0,0,0
-
-HBOX.E4:
-	Inherits: HBOX
-	Tooltip:
-		Name: Camo Pillbox (Flamethrower)
-	RenderBuilding:
-		Image: HBOX
-	RenderRangeCircle:
-	AutoTarget:
-	AttackTurreted:
-		PrimaryWeapon: Flamer
-		PrimaryLocalOffset: 0,-11,0,0,0
-
-HBOX.E7:
-	Inherits: HBOX
-	Tooltip:
-		Name: Camo Pillbox (Tanya)
-	RenderBuilding:
-		Image: HBOX
-	RenderRangeCircle:
-	AutoTarget:
-	AttackTurreted:
-		PrimaryWeapon: Colt45
-		PrimaryLocalOffset: 0,-11,0,0,0
-
-HBOX.SHOK:
-	Inherits: HBOX
-	Tooltip:
-		Name: Camo Pillbox (Tesla)
-	RenderBuilding:
-		Image: HBOX
-	RenderRangeCircle:
-	AutoTarget:
-	AttackTurreted:
-		PrimaryWeapon: PortaTesla
-		PrimaryLocalOffset: 0,-11,0,0,0
-
-HBOX.SNIPER:
-	Inherits: HBOX
-	Tooltip:
-		Name: Camo Pillbox (Sniper)
-	RenderBuilding:
-		Image: HBOX
-	RenderRangeCircle:
-	AutoTarget:
-	AttackTurreted:
-		PrimaryWeapon: Sniper
-		PrimaryLocalOffset: 0,-11,0,0,0
+	Turreted:
+		ROT: 255

 GUN:
 	Inherits: ^Building
@@ -682,19 +468,19 @@ GUN:
 		Owner: allies
 		Hotkey: t
 	Valued:
-		Cost: 600
+		Cost: 800
 	Tooltip:
 		Name: Turret
 		Description: Anti-Armor base defense.\n  Strong vs Tanks\n  Weak vs Infantry, Aircraft
 	Building:
-		Power: -40
+		Power: -55
 	-GivesBuildableArea:
 	Health:
 		HP: 400
 	Armor:
 		Type: Heavy
 	RevealsShroud:
-		Range: 7
+		Range: 6
 	Turreted:
 		ROT: 12
 		InitialFacing: 50
@@ -705,8 +491,6 @@ GUN:
 	IronCurtainable:
 	-RenderBuilding:
 	RenderRangeCircle:
-	-AcceptsSupplies:
-	DrawLineToTarget:

 FTUR:
 	Inherits: ^Building
@@ -739,8 +523,6 @@ FTUR:
 	AutoTarget:
 	IronCurtainable:
 	RenderRangeCircle:
-	-AcceptsSupplies:
-	DrawLineToTarget:

 SAM:
 	Inherits: ^Building
@@ -780,8 +562,6 @@ SAM:
 		RangeCircleType: aa
 	RequiresPower:
 	CanPowerDown:
-	-AcceptsSupplies:
-	DrawLineToTarget:

 ATEK:
 	Inherits: ^Building
@@ -838,9 +618,9 @@ WEAP:
 		Footprint: xxx xxx
 		Dimensions: 3,2
 	Health:
-		HP: 1500
+		HP: 1000
 	Armor:
-		Type: Wood
+		Type: Light
 	RevealsShroud:
 		Range: 4
 	Bib:
@@ -879,10 +659,6 @@ FACT:
 	CustomSellValue:
 		Value: 2500
 	BaseBuilding:
-	Transforms:
-		IntoActor: mcv
-		Offset:1,1
-		Facing: 96
 	ProductionBar:
 		
 PROC:
@@ -894,7 +670,7 @@ PROC:
 		Owner: allies,soviet
 		Hotkey: e
 	Valued:
-		Cost: 1400
+		Cost: 2000
 	Tooltip:
 		Name: Ore Refinery
 		Description: Converts Ore and Gems into money
@@ -914,7 +690,6 @@ PROC:
 		PipCount: 17
 		Capacity: 2000
 	IronCurtainable:
-	DrawLineToTarget:
 	CustomSellValue:
 		Value: 600
 	FreeActor:
@@ -963,10 +738,10 @@ HPAD:
 		Queue: Building
 		BuildPaletteOrder: 90
 		Prerequisites: dome
-		Owner: allies
+		Owner: allies,soviet
 		Hotkey: i
 	Valued:
-		Cost: 500
+		Cost: 1500
 	Tooltip:
 		Name: Helipad
 		Description: Produces and reloads helicopters
@@ -990,7 +765,6 @@ HPAD:
 	Reservable:
 	IronCurtainable:
 	ProductionBar:
-	PrimaryBuilding:

 AFLD:
 	Inherits: ^Building
@@ -1001,18 +775,18 @@ AFLD:
 		Owner: soviet
 		Hotkey: g
 	Valued:
-		Cost: 500
+		Cost: 600
 	Tooltip:
 		Name: Airfield
 		Description: Provides radar and off-map support\n  Special Ability: Paratroopers\n  Special Ability: Spy Plane
 	Building:
-		Power: -20
+		Power: -30
 		Footprint: xxx xxx
 		Dimensions: 3,2
 	Health:
 		HP: 1000
 	Armor:
-		Type: Wood
+		Type: Heavy
 	RevealsShroud:
 		Range: 7
 	Exit@1:
@@ -1041,7 +815,6 @@ AFLD:
 		SelectTargetSound: slcttgt1.aud
 	ProductionBar:
 	SupportPowerChargeBar:
-	PrimaryBuilding:
 	
 POWR:
 	Inherits: ^Building
@@ -1075,7 +848,7 @@ APWR:
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 20
-		Prerequisites: dome
+		Prerequisites: powr
 		Owner: allies,soviet
 		Hotkey: l
 	Valued:
@@ -1135,7 +908,7 @@ BARR:
 		Owner: soviet
 		Hotkey: b
 	Valued:
-		Cost: 400
+		Cost: 300
 	Tooltip:
 		Name: Soviet Barracks
 		Description: Produces infantry
@@ -1172,7 +945,7 @@ TENT:
 		Owner: allies
 		Hotkey: b
 	Valued:
-		Cost: 400
+		Cost: 300
 	Tooltip:
 		Name: Allied Barracks
 		Description: Produces infantry
@@ -1199,23 +972,6 @@ TENT:
 	PrimaryBuilding:
 	IronCurtainable:
 	ProductionBar:
-	
-KENN:
-	Inherits: ^Building
-	Tooltip:
-		Name: Kennel
-	Building:
-		Power: -10
-	-GivesBuildableArea:
-	Health:
-		HP: 300
-	Armor:
-		Type: Wood
-	RevealsShroud:
-		Range: 4
-	IronCurtainable:
-	-EmitInfantryOnSell:
-	-AcceptsSupplies:

 FIX:
 	Inherits: ^Building
@@ -1249,13 +1005,14 @@ FIX:

 FACF:
 	Inherits: ^Building
-#	Buildable:
-#		BuildPaletteOrder: 900
-#		Owner: allies
-#		Cost: 50
-#		Description: Fake Construction Yard
-#		LongDesc: Looks like a Construction Yard.
-#		Hotkey: c
+	Buildable:
+		BuildPaletteOrder: 900
+		Owner: allies
+		Cost: 50
+	Tooltip:
+		Name: Fake Construction Yard
+		Description: Fake Construction Yard
+		LongDesc: Looks like a Construction Yard.
 	Building:
 		Power: -2
 		Footprint: xxx xxx xxx
@@ -1274,14 +1031,15 @@ FACF:

 WEAF:
 	Inherits: ^Building
-#	Buildable:
-#		BuildPaletteOrder: 900
-#		Prerequisites: proc
-#		Owner: allies
-#		Cost: 50
-#		Description: Fake War Factory
-#		LongDesc: Looks like a War Factory.
-#		Hotkey: x
+	Buildable:
+		BuildPaletteOrder: 900
+		Prerequisites: proc
+		Owner: allies
+		Cost: 50
+	Tooltip:
+		Name: Fake War Factory
+		Description: Fake War Factory
+		LongDesc: Looks like a War Factory.
 	Building:
 		Power: -2
 		Footprint: xxx xxx
@@ -1305,14 +1063,13 @@ SYRF:
 		Cost: 50
 	Tooltip:
 		Name: Fake Shipyard
-#	Buildable:
-#		BuildPaletteOrder: 900
-#		Prerequisites: anypower
-#		Owner: allies
-#		Cost: 50
-#		Description: Fake Shipyard
-#		LongDesc: Looks like a Shipyard
-#		Hotkey: z
+		Description: Fake Shipyard
+		LongDesc: Looks like a Shipyard
+	Buildable:
+		BuildPaletteOrder: 900
+		Prerequisites: anypower
+		Owner: allies
+		Cost: 50
 	TargetableBuilding:
 		TargetTypes: Ground, Water
 	Building:
@@ -1357,14 +1114,13 @@ DOMF:
 		Cost: 50
 	Tooltip:
 		Name: Fake Radar Dome
-#	Buildable:
-#		BuildPaletteOrder: 900
-#		Prerequisites: proc
-#		Owner: allies
-#		Cost: 50
-#		Description: Fake Radar Dome
-#		LongDesc: Looks like a Radar Dome
-#		Hotkey: v
+		Description: Fake Radar Dome
+		LongDesc: Looks like a Radar Dome
+	Buildable:
+		BuildPaletteOrder: 900
+		Prerequisites: proc
+		Owner: allies
+		Cost: 50
 	Building:
 		Power: -2
 		Footprint: xx xx
@@ -1396,7 +1152,7 @@ SBAG:
 		Name: Sandbag Wall
 		Description: Stops infantry and blocks enemy fire.\nCan be crushed by tanks.
 	Health:
-		HP: 300
+		HP: 1
 	Armor:
 		Type: Wood

@@ -1416,7 +1172,7 @@ FENC:
 		Name: Wire Fence
 		Description: Stops infantry and blocks enemy fire.\nCan be crushed by tanks.
 	Health:
-		HP: 300
+		HP: 1
 	Armor:
 		Type: Wood

@@ -1429,7 +1185,7 @@ BRIK:
 		Owner: allies,soviet
 		Hotkey: w
 	Valued:
-		Cost: 100
+		Cost: 50
 	CustomSellValue:
 		Value: 0
 	Tooltip:
@@ -1439,7 +1195,7 @@ BRIK:
 		DamagedSound: crmble2.aud
 		DestroyedSound: kaboom30.aud
 	Health:
-		HP: 500
+		HP: 1
 	Armor:
 		Type: Concrete
 	Wall:
@@ -1448,21 +1204,21 @@ BRIK:
 CYCL:
 	Inherits: ^Wall
 	Health:
-		HP: 100
+		HP: 1
 	Armor: 
-		Type: Wood
+		Type: None
 		
 BARB:
 	Inherits: ^Wall
 	Health:
-		HP: 100
+		HP: 1
 	Armor:
 		Type: Wood

 WOOD:
 	Inherits: ^Wall
 	Health:
-		HP: 100
+		HP: 1
 	Armor: 
 		Type: Wood

@@ -1481,8 +1237,7 @@ TECHCENTER:
 	Tooltip:
 		Name: Tech Center
 		Description: Tech Center
-
 ANYPOWER:
 	Tooltip:
 		Name: Power Plant
-		Description: Power Plant
+		Description: Power Plant
--- a/mods/ra-classic/rules/system.yaml
+++ b/mods/ra-classic/rules/system.yaml
@@ -34,7 +34,7 @@ Player:
 	PowerManager:
 	AllyRepair:
 	PlayerResources:
-		InitialCash: 5000
+		InitialCash: 10000
 	ActorGroupProxy:
 	DeveloperMode:
 	HackyAI@EasyAI:
@@ -96,91 +96,6 @@ Player:
 			2tnk: 25%
 			3tnk: 50%
 		SquadSize: 10
-	HackyAI@OptiAI:
-		Name:Eisenhower AI
-		BuildingFractions:
-			proc: 25.1%
-			powr: 35%
-			tent: 0.1%
-			barr: 0.1%
-			weap: 0.1%
-			fix: 0.1%
-			dome: 0.1%
-			atek: 0.1%
-			stek: 0.1%
-		UnitsToBuild:
-			e1: 50%
-			e2: 1%
-			e3: 10%
-			medi: 0.01%
-			e7: 0.01%
-			apc: 10%
-			jeep: 10%
-			ftrk: 25%
-			1tnk: 25%
-			2tnk: 50%
-			3tnk: 75%
-			4tnk: 100%
-			arty: 30%
-			v2rl: 30%
-		SquadSize: 10
-	HackyAI@ZhukovAI:
-		Name:Zhukov AI
-		BuildingFractions:
-			proc: 20%
-			powr: 35%
-			tent: 1%
-			barr: 1%
-			weap: 1%
-			pbox.e1: 4%
-			hbox.e1: 3%
-			gun: 10%
-			ftur: 10%
-			tsla: 5%
-			dome: 10%
-			fix: 0.1%
-			agun: 7%
-			sam: 7%
-			atek: 1%
-			stek: 1%
-		UnitsToBuild:
-			e1: 4%
-			e3: 1%
-			harv: 10%
-			ftrk: 5%
-			v2rl: 40%
-			arty: 40%
-			1tnk: 15%
-			2tnk: 15%
-			3tnk: 15%
-		SquadSize: 25
-	HackyAI@RommelAI:
-		Name:Rommel AI
-		BuildingFractions:
-			proc: 30%
-			powr: 35%
-			tent: 1%
-			barr: 1%
-			weap: 1%
-			pbox.e1: 7%
-			gun: 7%
-			ftur: 10%
-			tsla: 5%
-			fix: 0.1%
-			dome: 10%
-			agun: 5%
-			sam: 1%
-			atek: 1%
-			stek: 1%
-		UnitsToBuild:
-			e1: 5%
-			e3: 10%
-			3tnk: 75%
-			2tnk: 75%
-			v2rl: 15%
-			arty: 15%
-			harv: 10%
-		SquadSize: 7
 	PlayerColorPalette:
 		BasePalette: player
 		RemapIndex: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95
@@ -192,7 +107,7 @@ Player:
 	BaseAttackNotifier:
 	PlayerStatistics:

-World:	
+World:
 	OpenWidgetAtGameStart:
 		Widget: INGAME_ROOT
 		ObserverWidget: OBSERVER_ROOT
@@ -204,8 +119,8 @@ World:
 	BuildingInfluence:
 	ChooseBuildTabOnSelect:
 	BridgeLayer:
-		Bridges: bridge1, bridge2, br1, br2, br3, sbridge1, sbridge2, sbridge3, sbridge4
-	CrateDrop:
+		Bridges: bridge1, bridge2, br1, br2, br3
+	CrateSpawner:
 		Minimum: 1
 		Maximum: 3
 		SpawnInterval: 120
@@ -346,7 +261,7 @@ CRATE:
 		Lifetime: 120
 		TerrainTypes: Clear, Rough, Road, Water, Ore, Beach
 	GiveCashCrateAction:
-		Amount: 1000
+		Amount: 2000
 		SelectionShares: 50
 		UseCashTick: yes
 	LevelUpCrateAction:
@@ -360,10 +275,6 @@ CRATE:
 	HideMapCrateAction:
 		SelectionShares: 5
 		Effect: hide-map
-	HealUnitsCrateAction:
-		Notification: heal2.aud
-		SelectionShares: 2
-		Effect: heal
 	RevealMapCrateAction:
 		SelectionShares: 1
 		Effect: reveal-map
--- a/mods/ra-classic/rules/trees.yaml
+++ b/mods/ra-classic/rules/trees.yaml
@@ -3,48 +3,36 @@ T01:
 	Building:
 		Footprint: __ x_
 		Dimensions: 2,2
-	EditorTilesetFilter:
-		ExcludeTilesets: DESERT

 T02:
 	Inherits: ^Tree
 	Building:
 		Footprint: __ x_
 		Dimensions: 2,2
-	EditorTilesetFilter:
-		ExcludeTilesets: DESERT

 T03:
 	Inherits: ^Tree
 	Building:
 		Footprint: __ x_
 		Dimensions: 2,2
-	EditorTilesetFilter:
-		ExcludeTilesets: DESERT

 T05:
 	Inherits: ^Tree
 	Building:
 		Footprint: __ x_
 		Dimensions: 2,2
-	EditorTilesetFilter:
-		ExcludeTilesets: DESERT

 T06:
 	Inherits: ^Tree
 	Building:
 		Footprint: __ x_
 		Dimensions: 2,2
-	EditorTilesetFilter:
-		ExcludeTilesets: DESERT

 T07:
 	Inherits: ^Tree
 	Building:
 		Footprint: __ x_
 		Dimensions: 2,2
-	EditorTilesetFilter:
-		ExcludeTilesets: DESERT

 T08:
 	Inherits: ^Tree
@@ -52,69 +40,55 @@ T08:
 		Footprint: x_
 		Dimensions: 2,1
 	
+
 T10:
 	Inherits: ^Tree
 	Building:
 		Footprint: __ xx
 		Dimensions: 2,2
-	EditorTilesetFilter:
-		ExcludeTilesets: DESERT
+	

 T11:
 	Inherits: ^Tree
 	Building:
 		Footprint: __ xx
 		Dimensions: 2,2
-	EditorTilesetFilter:
-		ExcludeTilesets: DESERT

 T12:
 	Inherits: ^Tree
 	Building:
 		Footprint: __ x_
 		Dimensions: 2,2
-	EditorTilesetFilter:
-		ExcludeTilesets: DESERT

 T13:
 	Inherits: ^Tree
 	Building:
 		Footprint: __ x_
 		Dimensions: 2,2
-	EditorTilesetFilter:
-		ExcludeTilesets: DESERT

 T14:
 	Inherits: ^Tree
 	Building:
 		Footprint: ___ xx_
 		Dimensions: 3,2
-	EditorTilesetFilter:
-		ExcludeTilesets: DESERT

 T15:
 	Inherits: ^Tree
 	Building:
 		Footprint: ___ xx_
 		Dimensions: 3,2
-	EditorTilesetFilter:
-		ExcludeTilesets: DESERT

 T16:
 	Inherits: ^Tree
 	Building:
 		Footprint: __ x_
 		Dimensions: 2,2
-	EditorTilesetFilter:
-		ExcludeTilesets: DESERT

 T17:
 	Inherits: ^Tree
 	Building:
 		Footprint: __ x_
 		Dimensions: 2,2
-	EditorTilesetFilter:
-		ExcludeTilesets: DESERT

 TC01:
 	Inherits: ^Tree
@@ -127,32 +101,24 @@ TC02:
 	Building:
 		Footprint: _x_ xx_
 		Dimensions: 3,2
-	EditorTilesetFilter:
-		ExcludeTilesets: DESERT

 TC03:
 	Inherits: ^Tree
 	Building:
 		Footprint: xx_ xx_
 		Dimensions: 3,2
-	EditorTilesetFilter:
-		ExcludeTilesets: DESERT

 TC04:
 	Inherits: ^Tree
 	Building:
 		Footprint: ____ xxx_ x___
 		Dimensions: 4,3
-	EditorTilesetFilter:
-		ExcludeTilesets: DESERT

 TC05:
 	Inherits: ^Tree
 	Building:
 		Footprint: __x_ xxx_ _xx_
 		Dimensions: 4,3
-	EditorTilesetFilter:
-		ExcludeTilesets: DESERT

 MINE:
 	Inherits: ^Tree
@@ -216,8 +182,6 @@ ICE01:
 		Dimensions: 2,2
 	Tooltip:
 		Name: Ice Floe
-	EditorTilesetFilter:
-		ExcludeTilesets: DESERT

 ICE02:
 	Inherits: ^Tree
@@ -226,8 +190,6 @@ ICE02:
 		Dimensions: 1,2
 	Tooltip:
 		Name: Ice Floe
-	EditorTilesetFilter:
-		ExcludeTilesets: DESERT

 ICE03:
 	Inherits: ^Tree
@@ -236,68 +198,13 @@ ICE03:
 		Dimensions: 2,1
 	Tooltip:
 		Name: Ice Floe
-	EditorTilesetFilter:
-		ExcludeTilesets: DESERT

 ICE04:
 	Inherits: ^Tree
 	Tooltip:
 		Name: Ice Floe
-	EditorTilesetFilter:
-		ExcludeTilesets: DESERT

 ICE05:
 	Inherits: ^Tree
 	Tooltip:
-		Name: Ice Floe
-	EditorTilesetFilter:
-		ExcludeTilesets: DESERT
-
-# Desert Terrain Expansion
-ROCK1:
-	Inherits: ^Rock
-	Building:
-		Footprint: ___ xx_
-		Dimensions: 3,2
-
-ROCK2:
-	Inherits: ^Rock
-	Building:
-		Footprint: xx_
-		Dimensions: 3,1
-
-ROCK3:
-	Inherits: ^Rock
-	Building:
-		Footprint: ___ xx_
-		Dimensions: 3,2
-
-ROCK4:
-	Inherits: ^Rock
-	Building:
-		Footprint: x_
-		Dimensions: 2,1
-
-ROCK5:
-	Inherits: ^Rock
-	Building:
-		Footprint: x_
-		Dimensions: 2,1
-
-ROCK6:
-	Inherits: ^Rock
-	Building:
-		Footprint: ___ xxx
-		Dimensions: 3,2
-
-ROCK7:
-	Inherits: ^Rock
-	Building:
-		Footprint: xxxx_
-		Dimensions: 5,1
-
-T04:
-	Inherits: ^Tree
-	Building:
-		Footprint: __ x_
-		Dimensions: 2,2
+		Name: Ice Floe
--- a/mods/ra-classic/rules/vehicles.yaml
+++ b/mods/ra-classic/rules/vehicles.yaml
@@ -3,9 +3,8 @@ V2RL:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 40
-		Prerequisites: dome
+		Prerequisites: weap,dome
 		Owner: soviet
-		Hotkey: v
 	Valued:
 		Cost: 700
 	Tooltip:
@@ -25,7 +24,7 @@ V2RL:
 	AutoTarget:
 	Explodes:
 		Weapon: SCUD
-		EmptyWeapon:
+		EmptyWeapon: SCUD

 1TNK:
 	Inherits: ^Tank
@@ -33,18 +32,18 @@ V2RL:
 		Queue: Vehicle
 		BuildPaletteOrder: 40
 		Owner: allies
-		Hotkey: g
 	Valued:
 		Cost: 700
 	Tooltip:
 		Name: Light Tank
 		Description: Light Tank, good for scouting.\n  Strong vs Light Vehicles\n  Weak vs Tanks, Aircraft
 	Health:
-		HP: 220
+		HP: 300
 	Armor:
 		Type: Heavy
 	Mobile:
 		Speed: 9
+		Crushes: wall, atmine, crate, infantry
 	RevealsShroud:
 		Range: 4
 	Turreted:
@@ -58,28 +57,24 @@ V2RL:
 	Explodes:
 		Weapon: UnitExplodeSmall
 		EmptyWeapon: UnitExplodeSmall
-	LeavesHusk:
-		HuskActor: 1TNK.Husk
-
+	
 2TNK:
 	Inherits: ^Tank
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 60
-		Prerequisites: fix
 		Owner: allies
-		Hotkey: f
 	Valued:
-		Cost: 850
+		Cost: 800
 	Tooltip:
 		Name: Medium Tank
 		Description: Allied Main Battle Tank.\n  Strong vs Tanks, Light Vehicles\n  Weak vs Infantry, Aircraft
 	Health:
-		HP: 450
+		HP: 400
 	Armor:
 		Type: Heavy
 	Mobile:
-		Speed: 6
+		Speed: 8
 		Crushes: wall, atmine, crate, infantry
 	RevealsShroud:
 		Range: 5
@@ -94,8 +89,6 @@ V2RL:
 	Explodes:
 		Weapon: UnitExplodeSmall
 		EmptyWeapon: UnitExplodeSmall
-	LeavesHusk:
-		HuskActor: 2TNK.Husk
 	Selectable:
 		Bounds: 30,30

@@ -104,20 +97,18 @@ V2RL:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 40
-		Prerequisites: fix
 		Owner: soviet
-		Hotkey: h
 	Valued:
-		Cost: 1150
+		Cost: 950
 	Tooltip:
 		Name: Heavy Tank
 		Description: Soviet Main Battle Tank, with dual cannons\n  Strong vs Tanks, Light Vehicles\n  Weak vs Infantry, Aircraft
 	Health:
-		HP: 550
+		HP: 400
 	Armor:
 		Type: Heavy
 	Mobile:
-		Speed: 5
+		Speed: 7
 		Crushes: wall, atmine, crate, infantry
 	RevealsShroud:
 		Range: 5
@@ -133,8 +124,6 @@ V2RL:
 	Explodes:
 		Weapon: UnitExplodeSmall
 		EmptyWeapon: UnitExplodeSmall
-	LeavesHusk:
-		HuskActor: 3TNK.Husk
 	Selectable:
 		Bounds: 30,30

@@ -143,25 +132,24 @@ V2RL:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 100
-		Prerequisites: fix,stek
+		Prerequisites: weap,stek
 		Owner: soviet
-		Hotkey: m
 	Valued:
-		Cost: 1800
+		Cost: 1700
 	Tooltip:
 		Name: Mammoth Tank
 		Description: Big and slow tank, with anti-air capability.\n  Strong vs Tanks, Aircraft\n  Weak vs Infantry
 	Health:
-		HP: 900
+		HP: 600
 	Armor:
 		Type: Heavy
 	Mobile:
-		Speed: 3
+		Speed: 4
 		Crushes: wall, atmine, crate, infantry
 	RevealsShroud:
 		Range: 6
 	Turreted:
-		ROT: 1
+		ROT: 2
 	AttackTurreted:
 		PrimaryWeapon: 120mm
 		SecondaryWeapon: MammothTusk
@@ -169,19 +157,16 @@ V2RL:
 		SecondaryLocalOffset: -7,2,0,0,25, 7,2,0,0,-25
 		PrimaryRecoil: 4
 		PrimaryRecoilRecovery: 0.7
-		SecondaryRecoil: 1
 	RenderUnitTurreted:
 	AutoTarget:
 	Explodes:
 		Weapon: UnitExplodeSmall
 		EmptyWeapon: UnitExplodeSmall
-	LeavesHusk:
-		HuskActor: 4TNK.Husk
 	SelfHealing:
 		Step: 1
 		Ticks: 1
-		HealIfBelow: 80%
-		DamageCooldown: 150
+		HealIfBelow: 50%
+		DamageCooldown: 200
 	Selectable:
 		Bounds: 44,38,0,-4

@@ -190,9 +175,7 @@ ARTY:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 80
-		Prerequisites: dome
 		Owner: allies
-		Hotkey: r
 	Valued:
 		Cost: 600
 	Tooltip:
@@ -222,9 +205,8 @@ HARV:
 		BuildPaletteOrder: 10
 		Prerequisites: proc
 		Owner: allies,soviet
-		Hotkey: e
 	Valued:
-		Cost: 1100
+		Cost: 1400
 	Tooltip:
 		Name: Ore Truck
 		Description: Collects Ore and Gems for processing.\n  Unarmed
@@ -252,12 +234,10 @@ HARV:
 	-AttackMove:
 	GpsDot:
 		String:Harvester
-	LeavesHusk:
-		HuskActor: HARV.EmptyHusk
-	HarvesterHuskModifier:
-		FullHuskActor: HARV.FullHusk
-		FullnessThreshold: 50
-
+	Explodes:
+		Weapon: UnitExplodeSmall
+		EmptyWeapon: UnitExplodeSmall
+	
 MCV:
 	Inherits: ^Vehicle
 	Buildable:
@@ -265,9 +245,8 @@ MCV:
 		BuildPaletteOrder: 110
 		Prerequisites: fix
 		Owner: allies,soviet
-		Hotkey: b
 	Valued:
-		Cost: 2000
+		Cost: 2500
 	Tooltip:
 		Name: Mobile Construction Vehicle
 		Description: Deploys into another Construction Yard.\n  Unarmed
@@ -291,10 +270,11 @@ MCV:
 		NoTransformSounds: nodeply1.aud
 	RenderUnit:
 	MustBeDestroyed:
+	Explodes:
+		Weapon: UnitExplodeSmall
+		EmptyWeapon: UnitExplodeSmall
 	BaseBuilding:
 	-AttackMove:
-	LeavesHusk:
-		HuskActor: MCV.Husk

 JEEP:
 	Inherits: ^Vehicle
@@ -302,9 +282,8 @@ JEEP:
 		Queue: Vehicle
 		BuildPaletteOrder: 30
 		Owner: allies
-		Hotkey: n
 	Valued:
-		Cost: 500
+		Cost: 600
 	Tooltip:
 		Name: Ranger
 		Description: Fast scout & anti-infantry vehicle.\n  Strong vs Infantry\n  Weak vs Tanks, Aircraft
@@ -314,9 +293,9 @@ JEEP:
 		Type: Light
 	Mobile:
 		ROT: 10
-		Speed: 12
+		Speed: 10
 	RevealsShroud:
-		Range: 8
+		Range: 6
 	Turreted:
 		ROT: 10
 	AttackTurreted:
@@ -324,31 +303,29 @@ JEEP:
 		PrimaryOffset: 0,0,0,-2
 	WithMuzzleFlash:
 	RenderUnitTurreted:
+	Explodes:
+		Weapon: UnitExplodeSmall
+		EmptyWeapon: UnitExplodeSmall
 	AutoTarget:
-	Cargo:
-		Types: Infantry
-		MaxWeight: 1
-		PipCount: 1
-		UnloadFacing: 220

 APC:
 	Inherits: ^Tank
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 50
-		Owner: soviet
-		Hotkey: c
+		Owner: allies
 	Valued:
-		Cost: 850
+		Cost: 800
 	Tooltip:
 		Name: Armored Personnel Carrier
 		Description: Tough infantry transport.\n  Strong vs Infantry, Light Vehicles\n  Weak vs Tanks, Aircraft
 	Health:
-		HP: 300
+		HP: 200
 	Armor:
 		Type: Heavy
 	Mobile:
 		Speed: 10
+		Crushes: wall, atmine, crate, infantry
 	RevealsShroud:
 		Range: 5
 	AttackFrontal:
@@ -357,6 +334,9 @@ APC:
 	RenderUnit:
 	WithMuzzleFlash:
 	AutoTarget:
+	Explodes:
+		Weapon: UnitExplodeSmall
+		EmptyWeapon: UnitExplodeSmall
 	Cargo:
 		Types: Infantry
 		MaxWeight: 5
@@ -370,7 +350,6 @@ MNLY.AP:
 		BuildPaletteOrder: 30
 		Prerequisites: fix
 		Owner: soviet
-		Hotkey: p
 	Valued:
 		Cost: 800
 	Tooltip:
@@ -383,6 +362,7 @@ MNLY.AP:
 		Type: Heavy
 	Mobile:
 		Speed: 9
+		Crushes: wall, atmine, crate, infantry
 	RevealsShroud:
 		Range: 5
 	RenderUnit:
@@ -394,6 +374,9 @@ MNLY.AP:
 		Ammo: 5
 	AttackMove:
 		JustMove: true
+	Explodes:
+		Weapon: UnitExplodeSmall
+		EmptyWeapon: UnitExplodeSmall

 MNLY.AT:
 	Inherits: ^Tank
@@ -402,7 +385,6 @@ MNLY.AT:
 		BuildPaletteOrder: 30
 		Prerequisites: fix
 		Owner: allies
-		Hotkey: i
 	Valued:
 		Cost: 800
 	Tooltip:
@@ -415,6 +397,8 @@ MNLY.AT:
 		Type: Heavy
 	Mobile:
 		Speed: 9
+		Crushes: wall, atmine, crate, infantry
+		ROT: 
 	RevealsShroud:
 		Range: 5
 	RenderUnit:
@@ -426,165 +410,23 @@ MNLY.AT:
 		Ammo: 3
 	AttackMove:
 		JustMove: true
-
-TRUK:
-	Inherits: ^Vehicle
-	Buildable:
-		Queue: Vehicle
-		BuildPaletteOrder: 120
-		Prerequisites: weap
-		Owner: allies, soviet
-		Hotkey: u
-	Valued:
-		Cost: 500
-	Tooltip:
-		Name: Supply Truck
-		Description: Transports cash to other players.\n  Unarmed
-	Health:
-		HP: 110
-	Armor:
-		Type: Light
-	Mobile:
-		Speed: 9
-	RevealsShroud:
-		Range: 3
-	RenderUnit:
-	SupplyTruck:
-		Payload: 500
-	AttackMove:
-		JustMove: yes
-		
-MGG:
-	Inherits: ^Vehicle
-	Buildable:
-		Queue: Vehicle
-		BuildPaletteOrder: 150
-		Prerequisites: atek
-		Owner: allies
-		Hotkey: s
-	Valued:
-		Cost: 1500
-	Tooltip:
-		Name: Mobile Gap Generator
-		Description: Regenerates the shroud nearby, \nobscuring the area.\n  Unarmed
-	Health:
-		HP: 200
-	Armor:
-		Type: Light
-	Mobile:
-		Speed: 6
-	RevealsShroud:
-		Range: 6
-	RenderUnitSpinner:
-		Offset: 0,6
-	AttackMove:
-		JustMove: yes
-	CreatesShroud:
-		Range: 4
-	RenderShroudCircle:
 	Explodes:
 		Weapon: UnitExplodeSmall
 		EmptyWeapon: UnitExplodeSmall
-	LeavesHusk:
-		HuskActor: MGG.Husk
-
-MGG.Husk:
-	Inherits: ^Husk
-	Tooltip:
-		Name: Husk (Mobile Gap Generator)
-	RenderUnit:
-		Image: mgg
-	ThrowsParticle@spinner:
-		Anim: spinner-idle
-		Spread: 3,3
-		Speed: 6
-		AnimKey: spinner-idle
-		Offset: 0,6
-
-1TNK.Husk:
-	Inherits: ^Husk
-	Tooltip:
-		Name: Husk (Light Tank)
-	RenderUnit:
-		Image: 1tnk
-	ThrowsParticle@turret:
-		Anim: turret
-		Spread: 3,3
-		Speed: 6
-		AnimKey: turret
-
-2TNK.Husk:
-	Inherits: ^Husk
-	Tooltip:
-		Name: Husk (Medium Tank)
-	RenderUnit:
-		Image: 2tnk
-	ThrowsParticle@turret:
-		Anim: turret
-		Spread: 3,3
-		Speed: 6
-		AnimKey: turret
-
-3TNK.Husk:
-	Inherits: ^Husk
-	Tooltip:
-		Name: Husk (Heavy Tank)
-	RenderUnit:
-		Image: 3tnk
-	ThrowsParticle@turret:
-		Anim: turret
-		Spread: 3,3
-		Speed: 6
-		AnimKey: turret
-
-4TNK.Husk:
-	Inherits: ^Husk
-	Tooltip:
-		Name: Husk (Mammoth Tank)
-	RenderUnit:
-		Image: 4tnk
-	ThrowsParticle@turret:
-		Anim: turret
-		Spread: 3,3
-		Speed: 6
-		AnimKey: turret
-
-HARV.FullHusk:
-	Inherits: ^Husk
-	Tooltip:
-		Name: Husk (Harvester)
-	RenderUnit:
-		Image: hhusk
-
-HARV.EmptyHusk:
-	Inherits: ^Husk
-	Tooltip:
-		Name: Husk (Harvester)
-	RenderUnit:
-		Image: hhusk2
-
-MCV.Husk:
-	Inherits: ^Husk
-	Tooltip:
-		Name: Husk (MCV)
-	RenderUnit:
-		Image: mcvhusk

 TTNK:
 	Inherits: ^Tank
 	Buildable:
 		Queue: Vehicle
-		BuildPaletteOrder: 130
-		Prerequisites: stek,tsla
+		Prerequisites: tsla
 		Owner: soviet
-		Hotkey: l
 	Valued:
-		Cost: 1350
+		Cost: 1500
 	Tooltip:
 		Name: Tesla Tank
-		Description: Tank with mounted tesla coil.\n  Strong vs Infantry, Light Vehicles\n  and Buildings  \n  Weak vs Tanks, Aircraft
+		Description: Tank with mounted tesla coil.\n Strong vs Infantry.\n Weak vs Tanks
 	Health:
-		HP: 150
+		HP: 110
 	Armor:
 		Type: Light
 	Mobile:
@@ -599,41 +441,9 @@ TTNK:
 	Selectable:
 		Bounds: 28,28,0,0
 	AutoTarget:
-
-FTRK:
-	Inherits: ^Vehicle
-	Buildable:
-		Queue: Vehicle
-		BuildPaletteOrder: 30
-		Owner: soviet
-		Hotkey: k
-	Valued:
-		Cost: 600
-	Tooltip:
-		Name: Flak Truck
-		Description: Flak Truck, good for scouting.\n  Strong vs Light Vehicles, Aircraft  \n  Weak vs Tanks
-	Health:
-		HP: 120
-	Armor: 
-		Type: Light
-	Mobile:
-		ROT: 10
-		Speed: 9
-	RevealsShroud:
-		Range: 4
-	Turreted:
-		ROT: 5
-	AttackTurreted:
-		PrimaryWeapon: FLAK-23
-		PrimaryOffset: 0,5,0,-4
-		PrimaryRecoil: 2
-	RenderUnitTurreted:
-	AutoTarget:
 	Explodes:
 		Weapon: UnitExplodeSmall
 		EmptyWeapon: UnitExplodeSmall
-	Selectable:
-		Bounds: 28,28,0,0

 DTRK:
 	Inherits: ^Vehicle
@@ -642,7 +452,6 @@ DTRK:
 		BuildPaletteOrder: 140
 		Prerequisites: stek
 		Owner: soviet
-		Hotkey: o
 	Valued:
 		Cost: 2500
 	Tooltip:
@@ -674,7 +483,6 @@ CTNK:
 		BuildPaletteOrder: 140
 		Prerequisites: atek
 		Owner: allies
-		Hotkey: j
 	Valued:
 		Cost: 1200
 	Tooltip:
@@ -698,3 +506,4 @@ CTNK:
 		PrimaryLocalOffset: -4,0,0,0,0, -4,0,0,0,0
 		SecondaryLocalOffset: 4,0,0,0,25, 4,0,0,0,-25
 	ChronoshiftDeploy:
+		EmptyWeapon: UnitExplodeSmall
--- a/mods/ra-classic/tilesets/temperat.yaml
+++ b/mods/ra-classic/tilesets/temperat.yaml
--- a/mods/ra-classic/weapons.yaml
+++ b/mods/ra-classic/weapons.yaml