Upgrade mod rules to match engine changes.

2013-12-26 20:33:56 +13:00
parent bd334a6295
commit 996877d9e5
151 changed files with 1215 additions and 1308 deletions
--- a/mods/ra/maps/Fort-Lonestar/map.yaml
+++ b/mods/ra/maps/Fort-Lonestar/map.yaml
@@ -763,7 +763,7 @@ Rules:
 		Armor:
 			Type: Heavy
 		Mobile:
-			Speed: 5
+			Speed: 71
 			Crushes: wall, atmine, crate, infantry
 		RevealsShroud:
 			Range: 7
@@ -814,7 +814,7 @@ Rules:
 		Selectable:
 			Bounds: 12,17,0,-6
 		Mobile:
-			Speed: 4
+			Speed: 56
 		Health:
 			HP: 200
 		Passenger:
@@ -840,7 +840,7 @@ Rules:
 		Health:
 			HP: 25
 		Mobile:
-			Speed: 4
+			Speed: 56
 		RevealsShroud:
 			Range: 5
 		Passenger:
@@ -865,7 +865,7 @@ Rules:
 			Type: Light
 		Mobile:
 			ROT: 10
-			Speed: 9
+			Speed: 128
 		RevealsShroud:
 			Range: 4
 		Turreted:
@@ -890,7 +890,7 @@ Rules:
 		Armor:
 			Type: Heavy
 		Mobile:
-			Speed: 10
+			Speed: 142
 		RevealsShroud:
 			Range: 5
 		Armament:
@@ -923,7 +923,7 @@ Rules:
 			Type: Light
 		Mobile:
 			ROT: 2
-			Speed: 6
+			Speed: 85
 		RevealsShroud:
 			Range: 7
 		AttackFrontal:
@@ -941,7 +941,7 @@ Rules:
 		Armor:
 			Type: Light
 		Mobile:
-			Speed: 7
+			Speed: 99
 		RevealsShroud:
 			Range: 5
 		Armament:
@@ -960,7 +960,7 @@ Rules:
 		Armor:
 			Type: Heavy
 		Mobile:
-			Speed: 4
+			Speed: 56
 		RevealsShroud:
 			Range: 14
 		Turreted:
@@ -1013,7 +1013,7 @@ Rules:
 			Type: Light
 		Plane:
 			ROT: 5
-			Speed: 30
+			Speed: 280
 		LimitedAmmo:
 			Ammo: 30
 		RenderUnit:
@@ -1044,7 +1044,7 @@ Rules:
 		WithShadow:
 		Plane:
 			ROT: 5
-			Speed: 16
+			Speed: 149
 		SmokeTrailWhenDamaged:
 			Offset: -853,0,171
 			Interval: 2
@@ -1057,17 +1057,17 @@ VoxelSequences:
 Weapons:
 	120mm:
 		ROF: 150
-		Range: 10
+		Range: 10c0
 		Report: CANNON1.AUD
 		Burst: 6
 		Projectile: Bullet
-			Speed: 12
+			Speed: 204
 			High: true
-			Inaccuracy: 40
+			Inaccuracy: 1c682
 			Image: 120MM
 			ContrailLength: 50
 		Warhead:
-			Spread: 6
+			Spread: 256
 			Versus:
 				None: 75%
 				Wood: 75%
@@ -1080,23 +1080,23 @@ Weapons:
 			Damage: 150
 	MammothTusk:
 		ROF: 300
-		Range: 10
+		Range: 10c0
 		Report: MISSILE6.AUD
 		Burst: 2
 		ValidTargets: Ground, Air
 		Projectile: Missile
-			Speed: 15
+			Speed: 128
 			Arm: 2
 			High: true
 			Shadow: false
 			Trail: smokey
 			ContrailLength: 150
-			Inaccuracy: 20
+			Inaccuracy: 853
 			Image: DRAGON
 			ROT: 10
 			RangeLimit: 80
 		Warhead:
-			Spread: 15
+			Spread: 640
 			Versus:
 				None: 125%
 				Wood: 110%
@@ -1110,19 +1110,19 @@ Weapons:
 			Damage: 250
 	VolkNapalm:
 		ROF: 40
-		Range: 8
+		Range: 8c0
 		Report: firebl3.aud
 		ValidTargets: Ground
 		Burst: 6
 		BurstDelay: 1
 		Projectile: Bullet
-			Speed: 25
+			Speed: 426
 			Image: 120MM
-			Inaccuracy: 60
+			Inaccuracy: 2c512
 			Trail: smokey
 			ContrailLength: 2
 		Warhead:
-			Spread: 8
+			Spread: 341
 			Versus:
 				None: 90%
 				Wood: 170%
@@ -1137,12 +1137,12 @@ Weapons:
 			Damage: 15
 	ParaBomb:
 		ROF: 5
-		Range: 5
+		Range: 5c0
 		Report: CHUTE1.AUD
 		Projectile: GravityBomb
 			Image: BOMBLET
 		Warhead:
-			Spread: 10
+			Spread: 426
 			Versus:
 				None: 125%
 				Wood: 100%
@@ -1156,20 +1156,20 @@ Weapons:
 			Damage: 200
 	155mm:
 		ROF: 10
-		Range: 7.5
+		Range: 7c512
 		Burst: 20
-		MinRange: 3
+		MinRange: 3c0
 		-Report:
 		Projectile: Bullet
-			Speed: 10
+			Speed: 170
 			Trail: fb4
 			Image: fb3
 			High: true
-			Angle: .1
-			Inaccuracy: 40
+			Angle: 62
+			Inaccuracy: 1c682
 			ContrailLength: 2
 		Warhead:
-			Spread: 10
+			Spread: 426
 			Versus:
 				None: 80%
 				Wood: 100%
@@ -1184,14 +1184,14 @@ Weapons:
 			Damage: 10
 	FLAK-23:
 		ROF: 10
-		Range: 8
+		Range: 8c0
 		Report: AACANON3.AUD
 		ValidTargets: Air,Ground
 		Projectile: Bullet
-			Speed: 100
+			Speed: 1c682
 			High: true
 		Warhead:
-			Spread: 5
+			Spread: 213
 			Versus:
 				None: 35%
 				Wood: 30%
@@ -1202,20 +1202,20 @@ Weapons:
 			Damage: 25
 	SCUD:
 		ROF: 280
-		Range: 7
-		MinRange: 3
+		Range: 7c0
+		MinRange: 3c0
 		Report: MISSILE1.AUD
 		Projectile: Bullet
-			Speed: 10
+			Speed: 170
 			Arm: 10
 			High: true
 			Shadow: false
 			Trail: smokey
-			Inaccuracy: 10
+			Inaccuracy: 426
 			Image: V2
-			Angle: .1
+			Angle: 62
 		Warhead:
-			Spread: 20
+			Spread: 853
 			Versus:
 				None: 100%
 				Wood: 90%
@@ -1230,12 +1230,12 @@ Weapons:
 			WaterImpactSound: kaboom1.aud
 	SilencedPPK:
 		ROF: 80
-		Range: 2.5
+		Range: 2c512
 		Report: silppk.aud
 		Projectile: Bullet
-			Speed: 100
+			Speed: 1c682
 		Warhead:
-			Spread: 3
+			Spread: 128
 			Versus:
 				Wood: 0%
 				Light: 0%
--- a/mods/ra/maps/Sahara.oramap
+++ b/mods/ra/maps/Sahara.oramap
--- a/mods/ra/maps/Survival02/map.yaml
+++ b/mods/ra/maps/Survival02/map.yaml
@@ -1124,12 +1124,12 @@ VoxelSequences:
 Weapons:
 	ParaBomb:
 		ROF: 5
-		Range: 7
+		Range: 7c0
 		Report: CHUTE1
 		Projectile: GravityBomb
 			Image: BOMBLET
 		Warhead:
-			Spread: 15
+			Spread: 640
 			Versus:
 				None: 125%
 				Wood: 100%
--- a/mods/ra/maps/a-path-beyond.oramap
+++ b/mods/ra/maps/a-path-beyond.oramap
--- a/mods/ra/maps/alaska-anarchy-redux.oramap
+++ b/mods/ra/maps/alaska-anarchy-redux.oramap
--- a/mods/ra/maps/all-connected.oramap
+++ b/mods/ra/maps/all-connected.oramap
--- a/mods/ra/maps/allies-01-classic/map.yaml
+++ b/mods/ra/maps/allies-01-classic/map.yaml
@@ -2,6 +2,8 @@ Selectable: True

 MapFormat: 6

+RequiresMod: ra
+
 Title: Allies 01: In the thick of it

 Description: In the thick of it
@@ -10,6 +12,14 @@ Author: Westwood Studios

 Tileset: SNOW

+MapSize: 128,128
+
+Bounds: 49,45,30,36
+
+UseAsShellmap: False
+
+Type: Campaign
+
 Options:
 	Crates: False
 	Fog: True
@@ -18,17 +28,6 @@ Options:
 	FragileAlliances: False
 	StartingCash: 0
 	ConfigurableStartingUnits: False
-	Difficulties:
-
-MapSize: 128,128
-
-RequiresMod: ra
-
-Bounds: 49,45,30,36
-
-UseAsShellmap: False
-
-Type: Campaign

 Players:
 	PlayerReference@USSR:
@@ -44,17 +43,17 @@ Players:
 		Enemies: USSR,Greece,England
 	PlayerReference@Greece:
 		Name: Greece
-		Race: allies
-		ColorRamp: 161,134,200
-		Allies: England
-		Enemies: Neutral,USSR
-		Required: True
 		Playable: True
 		AllowBots: False
+		Required: True
 		LockRace: True
+		Race: allies
+		LockColor: True
+		ColorRamp: 161,134,200
 		LockSpawn: True
 		LockTeam: True
-		LockColor: True
+		Allies: England
+		Enemies: Neutral,USSR
 	PlayerReference@England:
 		Name: England
 		Race: allies
@@ -611,14 +610,14 @@ VoxelSequences:

 Weapons:
 	8Inch:
-		Range: 25
-
+		Range: 25c0
 	M60mg:
-		Range: 5
+		Range: 5c0
 		ROF: 20
 		Burst: 1
 		Warhead:
 			Damage: 20
+
 Voices:

 Notifications:
--- a/mods/ra/maps/allies-01/map.yaml
+++ b/mods/ra/maps/allies-01/map.yaml
@@ -414,18 +414,18 @@ VoxelSequences:
 Weapons:
 	8Inch:
 		ROF: 200
-		Range: 25
+		Range: 25c0
 		Burst: 2
 		Report: TURRET1.AUD
 		Projectile: Bullet
-			Speed: 30
+			Speed: 512
 			High: true
-			Angle: .1
-			Inaccuracy: 100
+			Angle: 62
+			Inaccuracy: 4c170
 			Image: 120MM
 			ContrailLength: 10
 		Warhead:
-			Spread: 5
+			Spread: 213
 			Versus:
 				None: 60%
 				Wood: 75%
--- a/mods/ra/maps/allies-02-classic/map.yaml
+++ b/mods/ra/maps/allies-02-classic/map.yaml
@@ -2,6 +2,8 @@ Selectable: True

 MapFormat: 6

+RequiresMod: ra
+
 Title: Allies 02: Five to one

 Description: Five to one
@@ -10,6 +12,14 @@ Author: Westwood Studios

 Tileset: SNOW

+MapSize: 128,128
+
+Bounds: 43,44,50,42
+
+UseAsShellmap: False
+
+Type: Campaign
+
 Options:
 	Crates: False
 	Fog: True
@@ -18,17 +28,6 @@ Options:
 	FragileAlliances: False
 	StartingCash: 5700
 	ConfigurableStartingUnits: False
-	Difficulties:
-
-MapSize: 128,128
-
-RequiresMod: ra
-
-Bounds: 43,44,50,42
-
-UseAsShellmap: False
-
-Type: Campaign

 Players:
 	PlayerReference@USSR:
@@ -943,11 +942,12 @@ VoxelSequences:

 Weapons:
 	M60mg:
-		Range: 5
+		Range: 5c0
 		ROF: 20
 		Burst: 1
 		Warhead:
 			Damage: 20
+
 Voices:

 Notifications:
--- a/mods/ra/maps/allies-04/map.yaml
+++ b/mods/ra/maps/allies-04/map.yaml
@@ -1863,7 +1863,7 @@ Rules:
 		Tooltip:
 			Icon: dogicon
 		Mobile:
-			Speed: 4
+			Speed: 56
 		RenderInfantry:
 			Image: DOG
 	TRUK.Hijackable:
--- a/mods/ra/maps/arctic-triangle-affair.oramap
+++ b/mods/ra/maps/arctic-triangle-affair.oramap
--- a/mods/ra/maps/asymetric-battle.oramap
+++ b/mods/ra/maps/asymetric-battle.oramap
--- a/mods/ra/maps/bad-neighbors.oramap
+++ b/mods/ra/maps/bad-neighbors.oramap
--- a/mods/ra/maps/battle-lake.oramap
+++ b/mods/ra/maps/battle-lake.oramap
--- a/mods/ra/maps/black-gold.oramap
+++ b/mods/ra/maps/black-gold.oramap
--- a/mods/ra/maps/bloody-delta.oramap
+++ b/mods/ra/maps/bloody-delta.oramap
--- a/mods/ra/maps/bombardment-islands.oramap
+++ b/mods/ra/maps/bombardment-islands.oramap
--- a/mods/ra/maps/bomber-john/map.yaml
+++ b/mods/ra/maps/bomber-john/map.yaml
@@ -824,7 +824,7 @@ Rules:
 		Armor:
 			Type: Heavy
 		Mobile:
-			Speed: 9
+			Speed: 128
 			WaitAverage: 1
 			WaitSpread: 1
 			ROT: 900
--- a/mods/ra/maps/breaking-point.oramap
+++ b/mods/ra/maps/breaking-point.oramap
--- a/mods/ra/maps/caffeinated.oramap
+++ b/mods/ra/maps/caffeinated.oramap
--- a/mods/ra/maps/calm-before-storm.oramap
+++ b/mods/ra/maps/calm-before-storm.oramap
--- a/mods/ra/maps/central-conflict.oramap
+++ b/mods/ra/maps/central-conflict.oramap
--- a/mods/ra/maps/chaos-canyon.oramap
+++ b/mods/ra/maps/chaos-canyon.oramap
--- a/mods/ra/maps/chokepoint.oramap
+++ b/mods/ra/maps/chokepoint.oramap
--- a/mods/ra/maps/coastal-influence.oramap
+++ b/mods/ra/maps/coastal-influence.oramap
--- a/mods/ra/maps/contact.oramap
+++ b/mods/ra/maps/contact.oramap
--- a/mods/ra/maps/convergence.oramap
+++ b/mods/ra/maps/convergence.oramap
--- a/mods/ra/maps/crossing-the-river.oramap
+++ b/mods/ra/maps/crossing-the-river.oramap
--- a/mods/ra/maps/desert-shellmap/map.yaml
+++ b/mods/ra/maps/desert-shellmap/map.yaml
@@ -1332,7 +1332,7 @@ Rules:
 		DesertShellmapAutoUnload:
 	MIG:
 		Plane:
-			Speed: 30
+			Speed: 280
 	BADR:
 		Invulnerable:
 	MISS:
@@ -1346,11 +1346,11 @@ Weapons:
 	8Inch:
 		Report: tank6.aud
 	2Inch:
-		Range: 10
+		Range: 10c0
 	TTankZap:
-		Range: 4.75
+		Range: 4c768
 	FLAK-23:
-		Range: 4
+		Range: 4c0

 Voices:

--- a/mods/ra/maps/doubles.oramap
+++ b/mods/ra/maps/doubles.oramap
--- a/mods/ra/maps/doughnut.oramap
+++ b/mods/ra/maps/doughnut.oramap
--- a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml
+++ b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml
@@ -344,7 +344,7 @@ Rules:
 		Health:
 			HP: 120
 		Mobile:
-			Speed: 7
+			Speed: 99

 Sequences:

@@ -353,9 +353,9 @@ VoxelSequences:
 Weapons:
 	PortaTesla:
 		ROF: 20
-		Range: 10
+		Range: 10c0
 		Warhead:
-			Spread: 1
+			Spread: 42
 			InfDeath: 5
 			Damage: 80

--- a/mods/ra/maps/drop-zone-w/map.yaml
+++ b/mods/ra/maps/drop-zone-w/map.yaml
@@ -253,7 +253,7 @@ Rules:
 		Health:
 			HP: 1000
 		Mobile:
-			Speed: 12
+			Speed: 170
 		RevealsShroud:
 			Range: 50
 		Armament@PRIMARY:
@@ -303,18 +303,18 @@ VoxelSequences:
 Weapons:
 	8Inch:
 		ROF: 200
-		Range: 32
+		Range: 32c0
 		Burst: 4
 		Report: TURRET1
 		Projectile: Bullet
-			Speed: 32
+			Speed: 546
 			High: true
-			Angle: .1
-			Inaccuracy: 80
+			Angle: 62
+			Inaccuracy: 3c341
 			Image: 120MM
 			ContrailLength: 30
 		Warhead:
-			Spread: 3
+			Spread: 128
 			Versus:
 				None: 60%
 				Wood: 75%
@@ -329,19 +329,19 @@ Weapons:
 			WaterImpactSound: splash9
 	SubMissile:
 		ROF: 250
-		Range: 32
+		Range: 32c0
 		Burst: 4
 		Report: MISSILE6
 		Projectile: Bullet
-			Speed: 24
+			Speed: 409
 			High: true
-			Angle: .1
-			Inaccuracy: 70
+			Angle: 62
+			Inaccuracy: 2c938
 			Image: MISSILE
 			Trail: smokey
 			ContrailLength: 30
 		Warhead:
-			Spread: 10
+			Spread: 426
 			Versus:
 				None: 40%,
 				Light: 30%
--- a/mods/ra/maps/drop-zone/map.yaml
+++ b/mods/ra/maps/drop-zone/map.yaml
@@ -239,7 +239,7 @@ Rules:
 		Health:
 			HP: 120
 		Mobile:
-			Speed: 7
+			Speed: 99

 Sequences:

@@ -248,9 +248,9 @@ VoxelSequences:
 Weapons:
 	PortaTesla:
 		ROF: 20
-		Range: 10
+		Range: 10c0
 		Warhead:
-			Spread: 1
+			Spread: 42
 			InfDeath: 5
 			Damage: 80

--- a/mods/ra/maps/east-vs-west.oramap
+++ b/mods/ra/maps/east-vs-west.oramap
--- a/mods/ra/maps/encounter.oramap
+++ b/mods/ra/maps/encounter.oramap
--- a/mods/ra/maps/engagement.oramap
+++ b/mods/ra/maps/engagement.oramap
--- a/mods/ra/maps/equal-opportunity.oramap
+++ b/mods/ra/maps/equal-opportunity.oramap
--- a/mods/ra/maps/first-come-first-served.oramap
+++ b/mods/ra/maps/first-come-first-served.oramap
--- a/mods/ra/maps/forest-path.oramap
+++ b/mods/ra/maps/forest-path.oramap
--- a/mods/ra/maps/free-coasts.oramap
+++ b/mods/ra/maps/free-coasts.oramap
--- a/mods/ra/maps/ghost-town.oramap
+++ b/mods/ra/maps/ghost-town.oramap
--- a/mods/ra/maps/haos-ridges.oramap
+++ b/mods/ra/maps/haos-ridges.oramap
--- a/mods/ra/maps/hasselhoff.oramap
+++ b/mods/ra/maps/hasselhoff.oramap
--- a/mods/ra/maps/hectic.oramap
+++ b/mods/ra/maps/hectic.oramap
--- a/mods/ra/maps/high-and-low-extended.oramap
+++ b/mods/ra/maps/high-and-low-extended.oramap
--- a/mods/ra/maps/high-and-low.oramap
+++ b/mods/ra/maps/high-and-low.oramap
--- a/mods/ra/maps/island-hoppers.oramap
+++ b/mods/ra/maps/island-hoppers.oramap
--- a/mods/ra/maps/keep-off-the-grass-2.oramap
+++ b/mods/ra/maps/keep-off-the-grass-2.oramap
--- a/mods/ra/maps/mad-scramble.oramap
+++ b/mods/ra/maps/mad-scramble.oramap
--- a/mods/ra/maps/man-to-man.oramap
+++ b/mods/ra/maps/man-to-man.oramap
--- a/mods/ra/maps/marooned-2.oramap
+++ b/mods/ra/maps/marooned-2.oramap
--- a/mods/ra/maps/mass-confliction.oramap
+++ b/mods/ra/maps/mass-confliction.oramap
--- a/mods/ra/maps/monster-tank-madness/map.yaml
+++ b/mods/ra/maps/monster-tank-madness/map.yaml
@@ -2578,7 +2578,7 @@ Rules:
 		Armor:
 			Type: Concrete
 		Mobile:
-			Speed: 3
+			Speed: 42
 			Crushes: wall, atmine, crate, infantry
 		RevealsShroud:
 			Range: 6
@@ -2750,14 +2750,14 @@ Weapons:
 			High: True
 	SuperTankPrimary:
 		ROF: 70
-		Range: 4.75
+		Range: 4c768
 		Report: TURRET1
 		Burst: 2
 		Projectile: Bullet
-			Speed: 40
+			Speed: 682
 			Image: 120MM
 		Warhead:
-			Spread: 3
+			Spread: 128
 			Versus:
 				None: 20%
 				Wood: 75%
--- a/mods/ra/maps/nishnekolymsk.oramap
+++ b/mods/ra/maps/nishnekolymsk.oramap
--- a/mods/ra/maps/north-by-northwest.oramap
+++ b/mods/ra/maps/north-by-northwest.oramap
--- a/mods/ra/maps/pearly-wastelands.oramap
+++ b/mods/ra/maps/pearly-wastelands.oramap
--- a/mods/ra/maps/pressure.oramap
+++ b/mods/ra/maps/pressure.oramap
--- a/mods/ra/maps/puddles-redux.oramap
+++ b/mods/ra/maps/puddles-redux.oramap
--- a/mods/ra/maps/raraku.oramap
+++ b/mods/ra/maps/raraku.oramap
--- a/mods/ra/maps/regeneration-basin.oramap
+++ b/mods/ra/maps/regeneration-basin.oramap
--- a/mods/ra/maps/ring-of-fire.oramap
+++ b/mods/ra/maps/ring-of-fire.oramap
--- a/mods/ra/maps/river-war-2.oramap
+++ b/mods/ra/maps/river-war-2.oramap
--- a/mods/ra/maps/room-warzone.oramap
+++ b/mods/ra/maps/room-warzone.oramap
--- a/mods/ra/maps/seven-stairs.oramap
+++ b/mods/ra/maps/seven-stairs.oramap
--- a/mods/ra/maps/snow
+++ b/mods/ra/maps/snow
--- a/mods/ra/maps/snowy-island.oramap
+++ b/mods/ra/maps/snowy-island.oramap
--- a/mods/ra/maps/snowyridge.oramap
+++ b/mods/ra/maps/snowyridge.oramap
--- a/mods/ra/maps/soviet-01-classic/map.yaml
+++ b/mods/ra/maps/soviet-01-classic/map.yaml
@@ -911,7 +911,7 @@ Rules:
 		RevealsShroud:
 			Range: 7
 		Exit@1:
-			SpawnOffset: 0,4
+			SpawnOffset: 0,170,0
 			ExitCell: 1,1
 			Facing: 192
 		RenderBuilding:
--- a/mods/ra/maps/strip-mine.oramap
+++ b/mods/ra/maps/strip-mine.oramap
--- a/mods/ra/maps/styrian-mountains.oramap
+++ b/mods/ra/maps/styrian-mountains.oramap
--- a/mods/ra/maps/suffrage.oramap
+++ b/mods/ra/maps/suffrage.oramap
--- a/mods/ra/maps/tainted-peak.oramap
+++ b/mods/ra/maps/tainted-peak.oramap
--- a/mods/ra/maps/temperal.oramap
+++ b/mods/ra/maps/temperal.oramap
--- a/mods/ra/maps/the-white-pentagon.oramap
+++ b/mods/ra/maps/the-white-pentagon.oramap
--- a/mods/ra/maps/tournament-island.oramap
+++ b/mods/ra/maps/tournament-island.oramap
--- a/mods/ra/maps/vegetation.oramap
+++ b/mods/ra/maps/vegetation.oramap
--- a/mods/ra/maps/winter-warzone.oramap
+++ b/mods/ra/maps/winter-warzone.oramap
--- a/mods/ra/rules/aircraft.yaml
+++ b/mods/ra/rules/aircraft.yaml
@@ -8,13 +8,12 @@ BADR:
 		Type: Light
 	Plane:
 		ROT: 5
-		Speed: 16
+		Speed: 149
 	RenderUnit:
 	WithShadow:
 	IronCurtainable:
 	Cargo:
 		MaxWeight: 10
-#		Types: Infantry, Vehicle
 	-Selectable:
 	-GainsExperience:
 	Tooltip:
@@ -46,7 +45,7 @@ BADR.Bomber:
 		Type: Light
 	Plane:
 		ROT: 5
-		Speed: 16
+		Speed: 149
 	LimitedAmmo:
 		Ammo: 7
 	RenderUnit:
@@ -101,7 +100,7 @@ MIG:
 	Plane:
 		InitialFacing: 192
 		ROT: 5
-		Speed: 20
+		Speed: 186
 		RearmBuildings: afld
 	RenderUnit:
 		CameraPitch: 99
@@ -154,7 +153,7 @@ YAK:
 		RearmBuildings: afld
 		InitialFacing: 192
 		ROT: 5
-		Speed: 16
+		Speed: 149
 	RenderUnit:
 		CameraPitch: 99
 	WithShadow:
@@ -190,7 +189,7 @@ TRAN:
 		Description: Fast Infantry Transport Helicopter.\n  Unarmed
 	Health:
 		HP: 120
-	Armor: 
+	Armor:
 		Type: Light
 	RevealsShroud:
 		Range: 12
@@ -198,7 +197,7 @@ TRAN:
 		RearmBuildings: hpad
 		InitialFacing: 0
 		ROT: 5
-		Speed: 12
+		Speed: 112
 		LandableTerrainTypes: Clear,Rough,Road,Ore,Beach
 	RenderUnit:
 	WithRotor@PRIMARY:
@@ -261,7 +260,7 @@ HELI:
 		LandWhenIdle: false
 		InitialFacing: 20
 		ROT: 4
-		Speed: 16
+		Speed: 149
 	RenderUnit:
 	WithRotor:
 		Offset: 0,0,85
@@ -307,7 +306,7 @@ HIND:
 		LandWhenIdle: false
 		InitialFacing: 20
 		ROT: 4
-		Speed: 12
+		Speed: 112
 	RenderUnit:
 	WithRotor:
 	WithShadow:
@@ -334,7 +333,7 @@ U2:
 		Type: Heavy
 	Plane:
 		ROT: 7
-		Speed: 40
+		Speed: 373
 	RenderUnit:
 	WithShadow:
 	IronCurtainable:
@@ -360,7 +359,7 @@ BADR.Husk:
 	WithShadow:
 	Plane:
 		ROT: 5
-		Speed: 16
+		Speed: 149
 	SmokeTrailWhenDamaged@0:
 		Offset: -432,560,0
 		Interval: 2
@@ -384,7 +383,7 @@ MIG.Husk:
 		Offset: -598,683,0
 	Plane:
 		ROT: 5
-		Speed: 20
+		Speed: 186
 	SmokeTrailWhenDamaged:
 		Offset: -853,0,171
 		Interval: 2
@@ -404,7 +403,7 @@ YAK.Husk:
 		Offset: -853,0,0
 	Plane:
 		ROT: 5
-		Speed: 16
+		Speed: 149
 	SmokeTrailWhenDamaged:
 		Offset: -853,0,0
 		Interval: 2
@@ -421,7 +420,7 @@ TRAN.Husk:
 	WithShadow:
 	Helicopter:
 		ROT: 4
-		Speed: 16
+		Speed: 149
 	WithRotor@PRIMARY:
 		Offset: -597,0,341
 	WithRotor@SECONDARY:
@@ -439,7 +438,7 @@ HELI.Husk:
 	WithShadow:
 	Helicopter:
 		ROT: 4
-		Speed: 16
+		Speed: 149
 	WithRotor:
 		Offset: 0,0,85
 	SmokeTrailWhenDamaged:
@@ -457,7 +456,7 @@ HIND.Husk:
 	WithShadow:
 	Helicopter:
 		ROT: 4
-		Speed: 12
+		Speed: 112
 	WithRotor:
 	SmokeTrailWhenDamaged:
 		Offset: -427,0,0
@@ -472,7 +471,7 @@ U2.Husk:
 	WithShadow:
 	Plane:
 		ROT: 7
-		Speed: 40
+		Speed: 373
 	Contrail@1:
 		Offset: -725,683,0
 	Contrail@2:
@@ -481,3 +480,4 @@ U2.Husk:
 		Offset: -1c43,0,0
 		Interval: 2
 		MinDamage: Undamaged
+
--- a/mods/ra/rules/civilian.yaml
+++ b/mods/ra/rules/civilian.yaml
@@ -235,14 +235,14 @@ V18:
 	Inherits: ^CivField
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
-		
+
 V19:
 	Inherits: ^CivBuilding
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
 	Tooltip:
 		Name: Oil Pump
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V19.Husk
 	AutoTargetIgnore:

@@ -501,7 +501,6 @@ BRIDGEHUT.small:
 	TargetableBuilding:
 		TargetTypes: BridgeHut

-#Desert Terrain Expansion
 V20:
 	Inherits: ^DesertCivBuilding
 	Building:
@@ -648,5 +647,6 @@ SNOWHUT:
 	Building:
 		Footprint: x x
 		Dimensions: 1,2
-	RenderBuilding: 
+	RenderBuilding:
 		Scale: 0.7
+
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -11,15 +11,15 @@
 			Beach: 40
 		ROT: 5
 	SelectionDecorations:
-	Selectable: 
+	Selectable:
 		Voice: VehicleVoice
 	TargetableUnit:
 		TargetTypes: Ground
-	Repairable: 
-	Chronoshiftable: 
-	Passenger: 
+	Repairable:
+	Chronoshiftable:
+	Passenger:
 		CargoType: Vehicle
-	IronCurtainable: 
+	IronCurtainable:
 	AttackMove:
 	HiddenUnderFog:
 	GainsExperience:
@@ -27,10 +27,10 @@
 	DrawLineToTarget:
 	ActorLostNotification:
 	ProximityCaptor:
-		Types:Vehicle
+		Types: Vehicle
 	GivesBounty:
 	GpsDot:
-		String:Vehicle
+		String: Vehicle
 	WithSmoke:
 	UpdatesPlayerStatistics:
 	CombatDebugOverlay:
@@ -58,13 +58,13 @@
 			Beach: 70
 		ROT: 5
 	SelectionDecorations:
-	Selectable: 
+	Selectable:
 		Voice: VehicleVoice
 	TargetableUnit:
 		TargetTypes: Ground
-	Repairable: 
-	Chronoshiftable: 
-	Passenger: 
+	Repairable:
+	Chronoshiftable:
+	Passenger:
 		CargoType: Vehicle
 	IronCurtainable:
 	AttackMove:
@@ -74,10 +74,10 @@
 	DrawLineToTarget:
 	ActorLostNotification:
 	ProximityCaptor:
-		Types:Tank
+		Types: Tank
 	GivesBounty:
 	GpsDot:
-		String:Vehicle
+		String: Vehicle
 	WithSmoke:
 	UpdatesPlayerStatistics:
 	CombatDebugOverlay:
@@ -95,7 +95,7 @@
 ^Infantry:
 	AppearsOnRadar:
 	Health:
-		Radius: 3
+		Radius: 128
 	Armor:
 		Type: None
 	RevealsShroud:
@@ -127,10 +127,10 @@
 	DrawLineToTarget:
 	ActorLostNotification:
 	ProximityCaptor:
-		Types:Infantry
+		Types: Infantry
 	GivesBounty:
 	GpsDot:
-		String:Infantry
+		String: Infantry
 	ParachuteAttachment:
 		Offset: 0,0,427
 	CrushableInfantry:
@@ -170,10 +170,10 @@
 	ActorLostNotification:
 		Notification: NavalUnitLost
 	ProximityCaptor:
-		Types:Ship
+		Types: Ship
 	GivesBounty:
 	GpsDot:
-		String:Ship
+		String: Ship
 	WithSmoke:
 	UpdatesPlayerStatistics:
 	CombatDebugOverlay:
@@ -199,7 +199,7 @@
 	ActorLostNotification:
 		Notification: AirUnitLost
 	ProximityCaptor:
-		Types:Plane
+		Types: Plane
 	EjectOnDeath:
 		PilotActor: E1
 		SuccessRate: 50
@@ -207,7 +207,7 @@
 		EjectInAir: yes
 	GivesBounty:
 	GpsDot:
-		String:Plane
+		String: Plane
 	UpdatesPlayerStatistics:
 	CombatDebugOverlay:
 	BodyOrientation:
@@ -217,7 +217,7 @@
 ^Helicopter:
 	Inherits: ^Plane
 	GpsDot:
-		String:Helicopter
+		String: Helicopter

 ^Building:
 	AppearsOnRadar:
@@ -250,7 +250,7 @@
 		RelativeToTopLeft: yes
 	ShakeOnDeath:
 	ProximityCaptor:
-		Types:Building
+		Types: Building
 	Sellable:
 	AcceptsSupplies:
 	GivesBounty:
@@ -261,7 +261,7 @@
 	BodyOrientation:
 	FrozenUnderFog:
 	GpsDot:
-		String:Structure
+		String: Structure
 	Huntable:
 	LuaScriptEvents:

@@ -294,7 +294,7 @@
 		UseTerrainPalette: true
 	AutoTargetIgnore:
 	ProximityCaptor:
-		Types:Wall
+		Types: Wall
 	Sellable:
 	Guardable:
 	BodyOrientation:
@@ -312,7 +312,7 @@
 	Tooltip:
 		Name: Civilian Building
 	ProximityCaptor:
-		Types:CivilianBuilding
+		Types: CivilianBuilding
 	-AcceptsSupplies:
 	-GivesBuildableArea:
 	-Sellable:
@@ -351,14 +351,14 @@
 	Health:
 		HP: 20
 	Mobile:
-		Speed: 4
+		Speed: 56
 	RevealsShroud:
 		Range: 2
 	Armament:
 		Weapon: Pistol
 	AttackFrontal:
 	ProximityCaptor:
-		Types:CivilianInfantry
+		Types: CivilianInfantry
 	-RenderInfantry:
 	RenderInfantryPanic:
 	ScaredyCat:
@@ -377,7 +377,7 @@
 		Name: Field
 	-ProximityCaptor:
 	ProximityCaptor:
-		Types:CivilianField
+		Types: CivilianField

 ^Tree:
 	Tooltip:
@@ -394,7 +394,7 @@
 		RelativeToTopLeft: yes
 		UseTerrainPalette: true
 	ProximityCaptor:
-		Types:Tree
+		Types: Tree
 	Health:
 		HP: 500
 	DeadBuildingState:
@@ -418,7 +418,7 @@
 	AppearsOnRadar:
 	Burns:
 	ProximityCaptor:
-		Types:Husk
+		Types: Husk
 	BelowUnits:
 	BodyOrientation:
 	Chronoshiftable:
@@ -454,12 +454,11 @@
 	Health:
 		HP: 1000
 	ProximityCaptor:
-		Types:Bridge
+		Types: Bridge
 	AutoTargetIgnore:
 	BodyOrientation:
 	LuaScriptEvents:

-#Temperate Terrain Expansion
 ^SVBridge:
 	Tooltip:
 		Name: Small Bridge
@@ -472,7 +471,7 @@
 	Health:
 		HP: 750
 	ProximityCaptor:
-		Types:Bridge
+		Types: Bridge
 	AutoTargetIgnore:
 	BodyOrientation:
 	LuaScriptEvents:
@@ -489,7 +488,7 @@
 	Health:
 		HP: 750
 	ProximityCaptor:
-		Types:Bridge
+		Types: Bridge
 	AutoTargetIgnore:
 	BodyOrientation:
 	LuaScriptEvents:
@@ -506,12 +505,11 @@
 	Health:
 		HP: 750
 	ProximityCaptor:
-		Types:Bridge
+		Types: Bridge
 	AutoTargetIgnore:
 	BodyOrientation:
 	LuaScriptEvents:

-#Desert Terrain Expansion:
 ^Rock:
 	Tooltip:
 		Name: Rock
@@ -527,7 +525,7 @@
 		RelativeToTopLeft: yes
 		UseTerrainPalette: true
 	ProximityCaptor:
-		Types:Tree
+		Types: Tree
 	BodyOrientation:
 	FrozenUnderFog:
 		StartsRevealed: true
@@ -537,3 +535,4 @@
 	Inherits: ^CivBuilding
 	RenderBuilding:
 		Palette: terrain
+
--- a/mods/ra/rules/infantry.yaml
+++ b/mods/ra/rules/infantry.yaml
@@ -17,7 +17,7 @@ DOG:
 	Health:
 		HP: 12
 	Mobile:
-		Speed: 7
+		Speed: 99
 	RevealsShroud:
 		Range: 5
 	Armament:
@@ -44,7 +44,7 @@ E1:
 	Health:
 		HP: 50
 	Mobile:
-		Speed: 4
+		Speed: 56
 	Armament:
 		Weapon: M1Carbine
 	AttackFrontal:
@@ -72,7 +72,7 @@ E2:
 	Health:
 		HP: 50
 	Mobile:
-		Speed: 5
+		Speed: 71
 	Armament:
 		Weapon: Grenade
 		LocalOffset: 0,0,555
@@ -104,7 +104,7 @@ E3:
 	Health:
 		HP: 45
 	Mobile:
-		Speed: 4
+		Speed: 56
 	Armament@PRIMARY:
 		Weapon: RedEye
 		LocalOffset: 0,0,555
@@ -136,7 +136,7 @@ E4:
 	Health:
 		HP: 40
 	Mobile:
-		Speed: 4
+		Speed: 56
 	Armament:
 		Weapon: Flamer
 		LocalOffset: 427,0,341
@@ -166,7 +166,7 @@ E6:
 	Health:
 		HP: 25
 	Mobile:
-		Speed: 4
+		Speed: 56
 	Passenger:
 		PipType: Yellow
 	EngineerRepair:
@@ -200,7 +200,7 @@ SPY:
 	Health:
 		HP: 25
 	Mobile:
-		Speed: 4
+		Speed: 56
 	RevealsShroud:
 		Range: 5
 	Passenger:
@@ -240,7 +240,7 @@ E7:
 	Health:
 		HP: 100
 	Mobile:
-		Speed: 5
+		Speed: 71
 	RevealsShroud:
 		Range: 6
 	C4Demolition:
@@ -276,7 +276,7 @@ MEDI:
 	Health:
 		HP: 80
 	Mobile:
-		Speed: 4
+		Speed: 56
 	RevealsShroud:
 		Range: 3
 	Passenger:
@@ -313,7 +313,7 @@ MECH:
 	Health:
 		HP: 80
 	Mobile:
-		Speed: 4
+		Speed: 56
 	RevealsShroud:
 		Range: 3
 	Passenger:
@@ -343,7 +343,7 @@ EINSTEIN:
 	Health:
 		HP: 25
 	Mobile:
-		Speed: 5
+		Speed: 71
 	RevealsShroud:
 		Range: 2
 	-AutoTarget:
@@ -367,7 +367,7 @@ DELPHI:
 	Health:
 		HP: 25
 	Mobile:
-		Speed: 5
+		Speed: 71
 	RevealsShroud:
 		Range: 2
 	-AutoTarget:
@@ -404,7 +404,7 @@ THF:
 	Health:
 		HP: 25
 	Mobile:
-		Speed: 4
+		Speed: 56
 	RevealsShroud:
 		Range: 5
 	Passenger:
@@ -435,7 +435,7 @@ SHOK:
 	Health:
 		HP: 80
 	Mobile:
-		Speed: 4
+		Speed: 56
 	RevealsShroud:
 		Range: 4
 	Armament:
@@ -465,7 +465,7 @@ SNIPER:
 	Selectable:
 		Bounds: 12,17,0,-6
 	Mobile:
-		Speed: 4
+		Speed: 56
 	Health:
 		HP: 80
 	Passenger:
@@ -511,7 +511,7 @@ Zombie:
 	Health:
 		HP: 250
 	Mobile:
-		Speed: 3
+		Speed: 42
 	AutoTarget:
 		ScanRadius: 5
 	AttackFrontal:
@@ -535,9 +535,9 @@ Ant:
 		Bounds: 30,30,0,-2
 	Health:
 		HP: 750
-		Radius: 11
+		Radius: 469
 	Mobile:
-		Speed: 7
+		Speed: 99
 		ROT: 12
 		SharesCell: no
 	AutoTarget:
@@ -545,3 +545,4 @@ Ant:
 	AttackFrontal:
 	Armament:
 		Weapon: mandible
+
--- a/mods/ra/rules/ships.yaml
+++ b/mods/ra/rules/ships.yaml
@@ -17,7 +17,7 @@ SS:
 		Type: Light
 	Mobile:
 		ROT: 4
-		Speed: 5
+		Speed: 71
 	RevealsShroud:
 		Range: 6
 	-TargetableUnit:
@@ -64,7 +64,7 @@ MSUB:
 		Type: Light
 	Mobile:
 		ROT: 3
-		Speed: 3
+		Speed: 42
 	RevealsShroud:
 		Range: 6
 	RenderUnit:
@@ -111,7 +111,7 @@ DD:
 		Type: Heavy
 	Mobile:
 		ROT: 7
-		Speed: 6
+		Speed: 85
 	RevealsShroud:
 		Range: 6
 	Turreted:
@@ -157,7 +157,7 @@ CA:
 		Type: Heavy
 	Mobile:
 		ROT: 3
-		Speed: 3
+		Speed: 42
 	RevealsShroud:
 		Range: 7
 	Turreted@PRIMARY:
@@ -215,7 +215,7 @@ LST:
 		Type: Heavy
 	Mobile:
 		ROT: 10
-		Speed: 8
+		Speed: 113
 	RevealsShroud:
 		Range: 6
 	RenderUnit:
@@ -247,7 +247,7 @@ PT:
 		Type: Heavy
 	Mobile:
 		ROT: 7
-		Speed: 9
+		Speed: 128
 	RevealsShroud:
 		Range: 7
 	Turreted:
@@ -269,3 +269,4 @@ PT:
 	Chronoshiftable:
 	IronCurtainable:
 	RepairableNear:
+
--- a/mods/ra/rules/structures.yaml
+++ b/mods/ra/rules/structures.yaml
@@ -103,19 +103,19 @@ SPEN:
 	RevealsShroud:
 		Range: 4
 	Exit@1:
-		SpawnOffset: 0,-5
+		SpawnOffset: 0,-213,0
 		Facing: 96
 		ExitCell: -1,2
 	Exit@2:
-		SpawnOffset: 0,-5
+		SpawnOffset: 0,-213,0
 		Facing: 160
 		ExitCell: 3,2
 	Exit@3:
-		SpawnOffset: 0,0
+		SpawnOffset: 0,0,0
 		Facing: 32
 		ExitCell: 0,0
 	Exit@4:
-		SpawnOffset: 0,0
+		SpawnOffset: 0,0,0
 		Facing: 224
 		ExitCell: 2,0
 	Production:
@@ -160,19 +160,19 @@ SYRD:
 	RevealsShroud:
 		Range: 4
 	Exit@1:
-		SpawnOffset: -24,24
+		SpawnOffset: -1024,1024,0
 		Facing: 160
 		ExitCell: 0,2
 	Exit@2:
-		SpawnOffset: 24,24
+		SpawnOffset: 1024,1024,0
 		Facing: 224
 		ExitCell: 2,2
 	Exit@3:
-		SpawnOffset: -24,-24
+		SpawnOffset: -1024,-1024,0
 		Facing: 96
 		ExitCell: 0,0
 	Exit@4:
-		SpawnOffset: 24,-24
+		SpawnOffset: 1024,-1024,0
 		Facing: 32
 		ExitCell: 2,0
 	Production:
@@ -410,18 +410,12 @@ PBOX:
 		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
@@ -471,13 +465,6 @@ PBOX.E1:
 	Cargo:
 		InitialUnits: e1

-#PBOX.E2:
-#	Inherits: PBOX
-#	Tooltip:
-#		Name: Pillbox (Grenades)
-#	RenderBuilding:
-#		Image: PBOX
-
 PBOX.E3:
 	Inherits: PBOX
 	Tooltip:
@@ -572,18 +559,12 @@ HBOX:
 		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
@@ -633,13 +614,6 @@ HBOX.E1:
 	Cargo:
 		InitialUnits: e1

-#HBOX.E2:
-#	Inherits: HBOX
-#	Tooltip:
-#		Name: Camo Pillbox (Grenades)
-#	RenderBuilding:
-#		Image: HBOX
-
 HBOX.E3:
 	Inherits: HBOX
 	Tooltip:
@@ -888,7 +862,7 @@ WEAP:
 	RenderBuildingWarFactory:
 	RallyPoint:
 	Exit@1:
-		SpawnOffset: 5,-3
+		SpawnOffset: 213,-128,0
 		ExitCell: 1,2
 	Production:
 		Produces: Vehicle
@@ -915,7 +889,7 @@ FACT:
 	Bib:
 	Production:
 		Produces: Building,Defense
-	IronCurtainable: 
+	IronCurtainable:
 	Valued:
 		Cost: 2500
 	Tooltip:
@@ -926,7 +900,7 @@ FACT:
 	BaseBuilding:
 	Transforms:
 		IntoActor: mcv
-		Offset:1,1
+		Offset: 1,1
 		Facing: 96
 	ProductionBar:
 	DeadBuildingState:
@@ -1033,7 +1007,7 @@ HPAD:
 		Range: 5
 	Bib:
 	Exit@1:
-		SpawnOffset: 0,-6
+		SpawnOffset: 0,-256,0
 		ExitCell: 0,0
 	Production:
 		Produces: Helicopter
@@ -1066,9 +1040,9 @@ AFLD:
 	RevealsShroud:
 		Range: 7
 	Exit@1:
-		SpawnOffset: 0,4
+		SpawnOffset: 0,170,0
 		ExitCell: 1,1
-		Facing:192
+		Facing: 192
 	Production:
 		Produces: Plane
 	Reservable:
@@ -1203,10 +1177,10 @@ BARR:
 	Bib:
 	RallyPoint:
 	Exit@1:
-		SpawnOffset: -4,19
+		SpawnOffset: -170,810,0
 		ExitCell: 0,2
 	Exit@2:
-		SpawnOffset: -17,15
+		SpawnOffset: -725,640,0
 		ExitCell: 0,2
 	Production:
 		Produces: Infantry
@@ -1240,17 +1214,17 @@ TENT:
 	Bib:
 	RallyPoint:
 	Exit@1:
-		SpawnOffset: -1,19
+		SpawnOffset: -42,810,0
 		ExitCell: 0,2
 	Exit@2:
-		SpawnOffset: -17,15
+		SpawnOffset: -725,640,0
 		ExitCell: 0,2
 	Production:
 		Produces: Infantry
 	PrimaryBuilding:
 	IronCurtainable:
 	ProductionBar:
-	
+
 KENN:
 	Inherits: ^Building
 	Tooltip:
@@ -1519,9 +1493,9 @@ CYCL:
 	Inherits: ^Wall
 	Health:
 		HP: 100
-	Armor: 
+	Armor:
 		Type: Wood
-		
+
 BARB:
 	Inherits: ^Wall
 	Health:
@@ -1533,10 +1507,9 @@ WOOD:
 	Inherits: ^Wall
 	Health:
 		HP: 100
-	Armor: 
+	Armor:
 		Type: Wood

-# custom prerequisites:
 BARRACKS:
 	Tooltip:
 		Name: Infantry Production
@@ -1556,3 +1529,4 @@ ANYPOWER:
 	Tooltip:
 		Name: Power Plant
 		Description: Power Plant
+
--- a/mods/ra/rules/system.yaml
+++ b/mods/ra/rules/system.yaml
@@ -48,7 +48,7 @@ Player:
 	ActorGroupProxy:
 	DeveloperMode:
 	HackyAI@EasyAI:
-		Name:Easy AI
+		Name: Easy AI
 		BuildingCommonNames:
 			ConstructionYard: fact
 			Refinery: proc
@@ -100,7 +100,7 @@ Player:
 			3tnk: 50%
 		SquadSize: 20
 	HackyAI@NormalAI:
-		Name:Normal AI
+		Name: Normal AI
 		BuildingCommonNames:
 			ConstructionYard: fact
 			Refinery: proc
@@ -166,7 +166,7 @@ Player:
 			pt: 10%
 		SquadSize: 40
 	HackyAI@HardAI:
-		Name:Hard AI
+		Name: Hard AI
 		BuildingCommonNames:
 			ConstructionYard: fact
 			Refinery: proc
@@ -231,7 +231,7 @@ Player:
 			pt: 10%
 		SquadSize: 10
 	HackyAI@TestAI:
-		Name:Test AI
+		Name: Test AI
 		BuildingCommonNames:
 			ConstructionYard: fact
 			Refinery: proc
@@ -304,7 +304,7 @@ Player:
 			pt: 8%
 		SquadSize: 10
 	HackyAI@IslandMapAI:
-		Name:Island Map AI
+		Name: Island Map AI
 		BuildingCommonNames:
 			ConstructionYard: fact
 			Refinery: proc
@@ -354,7 +354,7 @@ Player:
 			pt: 10%
 		SquadSize: 1
 	HackyAI@HightechAI:
-		Name:High-Tech AI
+		Name: High-Tech AI
 		BuildingCommonNames:
 			ConstructionYard: fact
 			Refinery: proc
@@ -425,7 +425,7 @@ Player:
 			msub: 100%
 		SquadSize: 10
 	HackyAI@LongrangeAI:
-		Name:Long-Range AI
+		Name: Long-Range AI
 		BuildingCommonNames:
 			ConstructionYard: fact
 			Refinery: proc
@@ -477,7 +477,7 @@ Player:
 			3tnk: 15%
 		SquadSize: 25
 	HackyAI@TankAI:
-		Name:Tank AI
+		Name: Tank AI
 		BuildingCommonNames:
 			ConstructionYard: fact
 			Refinery: proc
@@ -654,11 +654,11 @@ World:
 		AllowUnderActors: false
 		TerrainType: Gems
 	SmudgeLayer@SCORCH:
-		Type:Scorch
+		Type: Scorch
 		Sequence: scorches
-		SmokePercentage:50
+		SmokePercentage: 50
 	SmudgeLayer@CRATER:
-		Type:Crater
+		Type: Crater
 		Sequence: craters
 	PathfinderDebugOverlay:
 	SpawnMapActors:
@@ -814,24 +814,24 @@ CRATE:
 		Images: scrate
 		XmasImages: xcratea, xcrateb, xcratec, xcrated
 	ProximityCaptor:
-		Types:Crate
+		Types: Crate
 	Passenger:
 	BodyOrientation:

 CAMERA:
 	Aircraft:
 	Health:
-		HP:1000
+		HP: 1000
 	RevealsShroud:
 		Range: 10
 	ProximityCaptor:
-		Types:Camera
+		Types: Camera
 	BodyOrientation:

 FLARE:
 	Aircraft:
 	Health:
-		HP:1000
+		HP: 1000
 	RevealsShroud:
 		Range: 3
 	RenderFlare:
@@ -873,3 +873,4 @@ waypoint:
 	Waypoint:
 	RenderEditorOnly:
 	BodyOrientation:
+
--- a/mods/ra/rules/trees.yaml
+++ b/mods/ra/rules/trees.yaml
@@ -51,7 +51,7 @@ T08:
 	Building:
 		Footprint: x_
 		Dimensions: 2,1
-	
+
 T10:
 	Inherits: ^Tree
 	Building:
@@ -197,7 +197,6 @@ BOXES01:
 	Inherits: ^Tree
 	Tooltip:
 		Name: Boxes
-	

 BOXES02:
 	Inherits: ^Tree
@@ -283,7 +282,6 @@ ICE05:
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT

-# Desert Terrain Expansion
 ROCK1:
 	Inherits: ^Rock
 	Building:
@@ -404,3 +402,4 @@ LAR2:
 	EditorAppearance:
 		RelativeToTopLeft: yes
 		UseTerrainPalette: true
+
--- a/mods/ra/rules/vehicles.yaml
+++ b/mods/ra/rules/vehicles.yaml
@@ -16,7 +16,7 @@ V2RL:
 	Armor:
 		Type: Light
 	Mobile:
-		Speed: 6
+		Speed: 85
 	RevealsShroud:
 		Range: 5
 	Armament:
@@ -45,7 +45,7 @@ V2RL:
 	Armor:
 		Type: Heavy
 	Mobile:
-		Speed: 9
+		Speed: 128
 	RevealsShroud:
 		Range: 4
 	Turreted:
@@ -84,7 +84,7 @@ V2RL:
 	Armor:
 		Type: Heavy
 	Mobile:
-		Speed: 6
+		Speed: 85
 		Crushes: wall, atmine, crate, infantry
 	RevealsShroud:
 		Range: 5
@@ -126,7 +126,7 @@ V2RL:
 	Armor:
 		Type: Heavy
 	Mobile:
-		Speed: 5
+		Speed: 71
 		Crushes: wall, atmine, crate, infantry
 	RevealsShroud:
 		Range: 5
@@ -170,7 +170,7 @@ V2RL:
 	Armor:
 		Type: Heavy
 	Mobile:
-		Speed: 3
+		Speed: 42
 		Crushes: wall, atmine, crate, infantry
 	RevealsShroud:
 		Range: 6
@@ -224,7 +224,7 @@ ARTY:
 		Type: Light
 	Mobile:
 		ROT: 2
-		Speed: 6
+		Speed: 85
 	RevealsShroud:
 		Range: 5
 	Armament:
@@ -258,16 +258,14 @@ HARV:
 		Capacity: 20
 		Resources: Ore,Gems
 		UnloadTicksPerBale: 1
-		# How far away from our linked proc (refinery) to find resources (in cells):
 		SearchFromProcRadius: 24
-		# How far away from last harvest order location to find more resources (in cells):
 		SearchFromOrderRadius: 12
 	Health:
 		HP: 600
 	Armor:
 		Type: Heavy
 	Mobile:
-		Speed: 6
+		Speed: 85
 		Crushes: wall, atmine, crate, infantry
 	RevealsShroud:
 		Range: 4
@@ -275,7 +273,7 @@ HARV:
 		ImagesByFullness: harvempty, harvhalf, harv
 	-AttackMove:
 	GpsDot:
-		String:Harvester
+		String: Harvester
 	LeavesHusk:
 		HuskActor: HARV.EmptyHusk
 	HarvesterHuskModifier:
@@ -305,13 +303,13 @@ MCV:
 	Armor:
 		Type: Light
 	Mobile:
-		Speed: 6
+		Speed: 85
 		Crushes: wall, atmine, crate, infantry
 	RevealsShroud:
 		Range: 4
 	Transforms:
 		IntoActor: fact
-		Offset:-1,-1
+		Offset: -1,-1
 		Facing: 96
 		TransformSounds: placbldg.aud, build5.aud
 		NoTransformSounds: nodeply1.aud
@@ -340,7 +338,7 @@ JEEP:
 		Type: Light
 	Mobile:
 		ROT: 10
-		Speed: 12
+		Speed: 170
 	RevealsShroud:
 		Range: 8
 	Turreted:
@@ -376,7 +374,7 @@ APC:
 	Armor:
 		Type: Heavy
 	Mobile:
-		Speed: 10
+		Speed: 142
 	RevealsShroud:
 		Range: 5
 	Armament:
@@ -410,7 +408,7 @@ MNLY.AP:
 	Armor:
 		Type: Heavy
 	Mobile:
-		Speed: 9
+		Speed: 128
 	RevealsShroud:
 		Range: 5
 	RenderUnit:
@@ -444,7 +442,7 @@ MNLY.AT:
 	Armor:
 		Type: Heavy
 	Mobile:
-		Speed: 9
+		Speed: 128
 	RevealsShroud:
 		Range: 5
 	RenderUnit:
@@ -478,7 +476,7 @@ TRUK:
 	Armor:
 		Type: Light
 	Mobile:
-		Speed: 9
+		Speed: 128
 	RevealsShroud:
 		Range: 3
 	RenderUnit:
@@ -505,7 +503,7 @@ MGG:
 	Armor:
 		Type: Heavy
 	Mobile:
-		Speed: 6
+		Speed: 85
 	RenderUnit:
 	WithIdleOverlay@SPINNER:
 		Offset: -299,0,171
@@ -551,7 +549,7 @@ MRJ:
 	Armor:
 		Type: Heavy
 	Mobile:
-		Speed: 6
+		Speed: 85
 	RevealsShroud:
 		Range: 6
 	RenderUnit:
@@ -644,7 +642,7 @@ TTNK:
 	Armor:
 		Type: Light
 	Mobile:
-		Speed: 8
+		Speed: 113
 		Crushes: wall, atmine, crate, infantry
 	RevealsShroud:
 		Range: 7
@@ -673,11 +671,11 @@ FTRK:
 		Description: Flak Truck, good for scouting.\n  Strong vs Light Vehicles, Aircraft  \n  Weak vs Tanks
 	Health:
 		HP: 120
-	Armor: 
+	Armor:
 		Type: Light
 	Mobile:
 		ROT: 10
-		Speed: 9
+		Speed: 128
 	RevealsShroud:
 		Range: 4
 	Turreted:
@@ -716,7 +714,7 @@ DTRK:
 	Armor:
 		Type: Light
 	Mobile:
-		Speed: 6
+		Speed: 85
 	RevealsShroud:
 		Range: 3
 	RenderUnit:
@@ -750,7 +748,7 @@ CTNK:
 	Armor:
 		Type: Light
 	Mobile:
-		Speed: 8
+		Speed: 113
 		Crushes: wall, atmine, crate, infantry
 	RevealsShroud:
 		Range: 6
@@ -785,7 +783,7 @@ QTNK:
 	Armor:
 		Type: Heavy
 	Mobile:
-		Speed: 4
+		Speed: 56
 		Crushes: wall, atmine, crate, infantry
 	RevealsShroud:
 		Range: 6
@@ -799,4 +797,5 @@ QTNK:
 	MadTank:
 	-EjectOnDeath:
 	TargetableUnit:
-		TargetTypes: Ground, MADTank
+		TargetTypes: Ground, MADTank
+
--- a/mods/ra/weapons.yaml
+++ b/mods/ra/weapons.yaml