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/cnc/maps/Instant_Karma.oramap
+++ b/mods/cnc/maps/Instant_Karma.oramap
--- a/mods/cnc/maps/Nullpeter.oramap
+++ b/mods/cnc/maps/Nullpeter.oramap
--- a/mods/cnc/maps/break_of_day.oramap
+++ b/mods/cnc/maps/break_of_day.oramap
--- a/mods/cnc/maps/chokepoint.oramap
+++ b/mods/cnc/maps/chokepoint.oramap
--- a/mods/cnc/maps/chord_simple.oramap
+++ b/mods/cnc/maps/chord_simple.oramap
--- a/mods/cnc/maps/dead_in_motion.oramap
+++ b/mods/cnc/maps/dead_in_motion.oramap
--- a/mods/cnc/maps/dead_in_motion_(redux).oramap
+++ b/mods/cnc/maps/dead_in_motion_(redux).oramap
--- a/mods/cnc/maps/deterring_democracy.oramap
+++ b/mods/cnc/maps/deterring_democracy.oramap
--- a/mods/cnc/maps/deterring_democracy_plus.oramap
+++ b/mods/cnc/maps/deterring_democracy_plus.oramap
--- a/mods/cnc/maps/eastwest3.oramap
+++ b/mods/cnc/maps/eastwest3.oramap
--- a/mods/cnc/maps/garden2.oramap
+++ b/mods/cnc/maps/garden2.oramap
--- a/mods/cnc/maps/haos_ridges_cnc.oramap
+++ b/mods/cnc/maps/haos_ridges_cnc.oramap
--- a/mods/cnc/maps/into_the_river_below.oramap
+++ b/mods/cnc/maps/into_the_river_below.oramap
--- a/mods/cnc/maps/lessons_from_kosovo.oramap
+++ b/mods/cnc/maps/lessons_from_kosovo.oramap
--- a/mods/cnc/maps/llamas.oramap
+++ b/mods/cnc/maps/llamas.oramap
--- a/mods/cnc/maps/llamas2.oramap
+++ b/mods/cnc/maps/llamas2.oramap
--- a/mods/cnc/maps/manufacturing_consent.oramap
+++ b/mods/cnc/maps/manufacturing_consent.oramap
--- a/mods/cnc/maps/minus_two.oramap
+++ b/mods/cnc/maps/minus_two.oramap
--- a/mods/cnc/maps/no_escapism.oramap
+++ b/mods/cnc/maps/no_escapism.oramap
--- a/mods/cnc/maps/rubicon.oramap
+++ b/mods/cnc/maps/rubicon.oramap
--- a/mods/cnc/maps/sea_and_cake.oramap
+++ b/mods/cnc/maps/sea_and_cake.oramap
--- a/mods/cnc/maps/shellmap/map.yaml
+++ b/mods/cnc/maps/shellmap/map.yaml
@@ -999,10 +999,10 @@ Rules:
 			Widget: MENU_BACKGROUND
 	LST:
 		Mobile:
-			Speed: 3
+			Speed: 42
 	BOAT:
 		Mobile:
-			Speed: 3
+			Speed: 42

 Sequences:

--- a/mods/cnc/maps/skull_valley.oramap
+++ b/mods/cnc/maps/skull_valley.oramap
--- a/mods/cnc/maps/slippery_slopes.oramap
+++ b/mods/cnc/maps/slippery_slopes.oramap
--- a/mods/cnc/maps/the_hourglass.oramap
+++ b/mods/cnc/maps/the_hourglass.oramap
--- a/mods/cnc/maps/thesentinel.oramap
+++ b/mods/cnc/maps/thesentinel.oramap
--- a/mods/cnc/maps/tiberium-oasis-cluster.oramap
+++ b/mods/cnc/maps/tiberium-oasis-cluster.oramap
--- a/mods/cnc/rules/aircraft.yaml
+++ b/mods/cnc/rules/aircraft.yaml
@@ -14,7 +14,7 @@ TRAN:
 	Helicopter:
 		LandWhenIdle: true
 		ROT: 5
-		Speed: 15
+		Speed: 140
 		InitialFacing: 0
 		LandableTerrainTypes: Clear,Rough,Road,Ore,Beach
 	Health:
@@ -56,7 +56,7 @@ HELI:
 	Helicopter:
 		RearmBuildings: hpad
 		ROT: 4
-		Speed: 20
+		Speed: 186
 	Health:
 		HP: 125
 	Armor:
@@ -108,7 +108,7 @@ ORCA:
 	Helicopter:
 		RearmBuildings: hpad
 		ROT: 4
-		Speed: 20
+		Speed: 186
 	Health:
 		HP: 90
 	Armor:
@@ -149,7 +149,7 @@ C17:
 		Cost: 2000
 	Plane:
 		ROT: 5
-		Speed: 35
+		Speed: 326
 	Health:
 		HP: 25
 	Armor:
@@ -157,7 +157,6 @@ C17:
 	RenderUnit:
 	WithShadow:
 	Cargo:
-#		Types: Infantry, Vehicle
 		MaxWeight: 10
 		PipCount: 10
 	Invulnerable:
@@ -188,7 +187,7 @@ A10:
 		Cost: 2000
 	Plane:
 		ROT: 4
-		Speed: 40
+		Speed: 373
 	Health:
 		HP: 150
 	Armor:
@@ -227,7 +226,7 @@ TRAN.Husk:
 		Name: Chinook Transport
 	Helicopter:
 		ROT: 5
-		Speed: 15
+		Speed: 140
 	RevealsShroud:
 		Range: 8
 	WithRotor@PRIMARY:
@@ -245,7 +244,7 @@ HELI.Husk:
 		Name: Apache Longbow
 	Helicopter:
 		ROT: 4
-		Speed: 20
+		Speed: 186
 	RevealsShroud:
 		Range: 10
 	WithRotor:
@@ -260,9 +259,10 @@ ORCA.Husk:
 		Name: Orca
 	Helicopter:
 		ROT: 4
-		Speed: 20
+		Speed: 186
 	RevealsShroud:
 		Range: 10
 	RenderUnit:
 		Image: orca
-	WithShadow:
+	WithShadow:
+
--- a/mods/cnc/rules/civilian-desert.yaml
+++ b/mods/cnc/rules/civilian-desert.yaml
@@ -3,7 +3,7 @@ V20:
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V20.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
@@ -21,7 +21,7 @@ V21:
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V21.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
@@ -39,7 +39,7 @@ V22:
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V22.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
@@ -54,7 +54,7 @@ V22.Husk:

 V23:
 	Inherits: ^CivBuilding
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V23.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
@@ -69,7 +69,7 @@ V24:
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V24.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
@@ -89,7 +89,7 @@ V25:
 		Dimensions: 2,2
 	Tooltip:
 		Name: Church
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V25.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
@@ -109,7 +109,7 @@ V26:
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V26.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
@@ -124,7 +124,7 @@ V26.Husk:

 V27:
 	Inherits: ^CivBuilding
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V27.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
@@ -136,7 +136,7 @@ V27.Husk:

 V28:
 	Inherits: ^CivBuilding
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V28.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
@@ -148,7 +148,7 @@ V28.Husk:

 V29:
 	Inherits: ^CivBuilding
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V29.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
@@ -163,7 +163,7 @@ V30:
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V30.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
@@ -181,7 +181,7 @@ V31:
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V31.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
@@ -199,7 +199,7 @@ V32:
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V32.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
@@ -217,7 +217,7 @@ V33:
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V33.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
@@ -232,7 +232,7 @@ V33.Husk:

 V34:
 	Inherits: ^CivBuilding
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V34.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
@@ -244,7 +244,7 @@ V34.Husk:

 V35:
 	Inherits: ^CivBuilding
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V35.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
@@ -256,7 +256,7 @@ V35.Husk:

 V36:
 	Inherits: ^CivBuilding
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V36.Husk
 	EditorTilesetFilter:
 		RequireTilesets: DESERT
@@ -268,7 +268,7 @@ V36.Husk:

 V37:
 	Inherits: ^CivBuilding
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V37.Husk
 	Building:
 		Footprint: __xx_ ___xx
@@ -282,4 +282,5 @@ V37.Husk:
 		Footprint: __xx_ ___xx
 		Dimensions: 5,2
 	EditorTilesetFilter:
-		RequireTilesets: DESERT
+		RequireTilesets: DESERT
+
--- a/mods/cnc/rules/civilian.yaml
+++ b/mods/cnc/rules/civilian.yaml
@@ -5,7 +5,7 @@ V01:
 		Dimensions: 2,2
 	Tooltip:
 		Name: Church
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V01.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
@@ -25,7 +25,7 @@ V02:
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V02.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
@@ -43,7 +43,7 @@ V03:
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V03.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
@@ -61,7 +61,7 @@ V04:
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V04.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
@@ -79,7 +79,7 @@ V05:
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V05.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
@@ -97,7 +97,7 @@ V06:
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V06.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
@@ -115,7 +115,7 @@ V07:
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V07.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
@@ -130,7 +130,7 @@ V07.Husk:

 V08:
 	Inherits: ^CivBuilding
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V08.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
@@ -142,7 +142,7 @@ V08.Husk:

 V09:
 	Inherits: ^CivBuilding
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V09.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
@@ -154,7 +154,7 @@ V09.Husk:

 V10:
 	Inherits: ^CivBuilding
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V10.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
@@ -166,7 +166,7 @@ V10.Husk:

 V11:
 	Inherits: ^CivBuilding
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V11.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
@@ -178,7 +178,7 @@ V11.Husk:

 V12:
 	Inherits: ^CivBuilding
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V12.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
@@ -190,7 +190,7 @@ V12.Husk:

 V13:
 	Inherits: ^CivBuilding
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V13.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
@@ -202,7 +202,7 @@ V13.Husk:

 V14:
 	Inherits: ^CivField
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V14.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
@@ -214,7 +214,7 @@ V14.Husk:

 V15:
 	Inherits: ^CivField
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V15.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
@@ -226,7 +226,7 @@ V15.Husk:

 V16:
 	Inherits: ^CivField
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V16.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
@@ -238,7 +238,7 @@ V16.Husk:

 V17:
 	Inherits: ^CivField
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V17.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
@@ -250,7 +250,7 @@ V17.Husk:

 V18:
 	Inherits: ^CivField
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V18.Husk
 	EditorTilesetFilter:
 		ExcludeTilesets: DESERT
@@ -265,7 +265,7 @@ ARCO:
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: ARCO.Husk

 ARCO.Husk:
@@ -410,14 +410,14 @@ C10:
 VICE:
 	AppearsOnRadar:
 	Health:
-		Radius: 3
+		Radius: 128
 		HP: 400
 	Armor:
 		Type: Wood
 	RevealsShroud:
 		Range: 6
 	Mobile:
-		Speed: 5
+		Speed: 71
 		TerrainSpeeds:
 			Clear: 70
 			Rough: 60
@@ -454,4 +454,5 @@ VICE:
 	BodyOrientation:
 		QuantizedFacings: 8
 	PoisonedByTiberium:
-		Weapon: Heal
+		Weapon: Heal
+
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -11,17 +11,17 @@
 			Beach: 50
 		ROT: 5
 	SelectionDecorations:
-	Selectable: 
+	Selectable:
 		Voice: VehicleVoice
 	TargetableUnit:
 		TargetTypes: Ground
 	Buildable:
 		Queue: Vehicle
-	Repairable: 
-	Chronoshiftable: 
-	Passenger: 
+	Repairable:
+	Chronoshiftable:
+	Passenger:
 		CargoType: Vehicle
-	IronCurtainable: 
+	IronCurtainable:
 	HiddenUnderFog:
 	GainsExperience:
 	GivesExperience:
@@ -56,17 +56,17 @@
 			Beach: 70
 		ROT: 5
 	SelectionDecorations:
-	Selectable: 
+	Selectable:
 		Voice: VehicleVoice
 	TargetableUnit:
 		TargetTypes: Ground
 	Buildable:
 		Queue: Vehicle
-	Repairable: 
-	Chronoshiftable: 
-	Passenger: 
+	Repairable:
+	Chronoshiftable:
+	Passenger:
 		CargoType: Vehicle
-	IronCurtainable: 
+	IronCurtainable:
 	HiddenUnderFog:
 	GainsExperience:
 	GivesExperience:
@@ -123,7 +123,7 @@
 ^Infantry:
 	AppearsOnRadar:
 	Health:
-		Radius: 3
+		Radius: 128
 	Armor:
 		Type: None
 	RevealsShroud:
@@ -195,7 +195,7 @@
 	Tooltip:
 		Name: Civilian
 	Mobile:
-		Speed: 4
+		Speed: 56
 	Health:
 		HP: 25
 	RevealsShroud:
@@ -215,7 +215,7 @@
 ^DINO:
 	AppearsOnRadar:
 	Health:
-		Radius: 3
+		Radius: 128
 		HP: 1000
 	Armor:
 		Type: Wood
@@ -230,7 +230,7 @@
 	RevealsShroud:
 		Range: 6
 	Mobile:
-		Speed: 8
+		Speed: 113
 		TerrainSpeeds:
 			Clear: 90
 			Rough: 80
@@ -362,7 +362,7 @@
 	-EngineerRepairable:
 	Health:
 		HP: 400
-	Armor: 
+	Armor:
 		Type: Wood
 	Building:
 	RenderBuilding:
@@ -502,7 +502,7 @@
 ^Husk:
 	Health:
 		HP: 140
-	Armor: 
+	Armor:
 		Type: Light
 	Husk:
 		AllowedTerrain: Clear, Rough, Road, Tiberium, BlueTiberium, Beach
@@ -515,11 +515,6 @@
 		ForceHealthPercentage: 25
 	BelowUnits:
 	BodyOrientation:
-#	Capturable:
-#		Type: husk
-#		AllowAllies: true
-#		AllowNeutral: true
-#		AllowEnemies: true
 	LuaScriptEvents:

 ^HelicopterHusk:
@@ -547,3 +542,4 @@
 		DestroyedSound: xplobig4.aud
 	BodyOrientation:
 	LuaScriptEvents:
+
--- a/mods/cnc/rules/husks.yaml
+++ b/mods/cnc/rules/husks.yaml
@@ -22,7 +22,6 @@ APC.Husk:
 	RenderUnit:
 		Image: apc

-
 FTNK.Husk:
 	Inherits: ^Husk
 	Tooltip:
@@ -31,7 +30,6 @@ FTNK.Husk:
 	RenderUnit:
 		Image: ftnk

-
 ARTY.Husk:
 	Inherits: ^Husk
 	Tooltip:
@@ -113,11 +111,12 @@ MLRS.Husk:
 		Image: mlrs
 	ThrowsParticle@turret:
 		Anim: turret
-		
+
 STNK.Husk:
 	Inherits: ^Husk
 	Tooltip:
 		Name: Stealth Tank (Destroyed)
 		Icon: stnkicnh
 	RenderUnit:
-		Image: stnk
+		Image: stnk
+
--- a/mods/cnc/rules/infantry.yaml
+++ b/mods/cnc/rules/infantry.yaml
@@ -11,7 +11,7 @@ E1:
 	Selectable:
 		Bounds: 12,17,0,-6
 	Mobile:
-		Speed: 4
+		Speed: 56
 	Health:
 		HP: 50
 	Armament:
@@ -37,7 +37,7 @@ E2:
 	Selectable:
 		Bounds: 12,17,0,-6
 	Mobile:
-		Speed: 5
+		Speed: 71
 	Health:
 		HP: 50
 	Armament:
@@ -54,7 +54,7 @@ E2:
 		Chance: 50
 	DetectCloaked:
 		Range: 2
-	
+
 E3:
 	Inherits: ^Infantry
 	Valued:
@@ -68,7 +68,7 @@ E3:
 	Selectable:
 		Bounds: 12,17,0,-6
 	Mobile:
-		Speed: 3
+		Speed: 42
 	Health:
 		HP: 45
 	Armament:
@@ -96,7 +96,7 @@ E4:
 	Selectable:
 		Bounds: 12,17,0,-6
 	Mobile:
-		Speed: 5
+		Speed: 71
 	Health:
 		HP: 90
 	Armament:
@@ -126,7 +126,7 @@ E5:
 	Selectable:
 		Bounds: 12,17,0,-6
 	Mobile:
-		Speed: 4
+		Speed: 56
 		TerrainSpeeds:
 			Tiberium: 80
 				PathingCost: 80
@@ -161,7 +161,7 @@ E6:
 	Selectable:
 		Bounds: 12,17,0,-6
 	Mobile:
-		Speed: 4
+		Speed: 56
 	Health:
 		HP: 25
 	Passenger:
@@ -193,7 +193,7 @@ RMBO:
 		Bounds: 12,17,0,-6
 		Voice: CommandoVoice
 	Mobile:
-		Speed: 5
+		Speed: 71
 	Health:
 		HP: 200
 	Passenger:
@@ -261,3 +261,4 @@ RAPT:
 		Description: Bipedal with enlarged sickle-shaped claw on each hindfoot
 	Armament:
 		Weapon: claw
+
--- a/mods/cnc/rules/ships.yaml
+++ b/mods/cnc/rules/ships.yaml
@@ -9,9 +9,9 @@ BOAT:
 	Armor:
 		Type: Heavy
 	Mobile:
-		InitialFacing:64
+		InitialFacing: 64
 		ROT: 4
-		Speed: 2
+		Speed: 28
 		OnRails: true
 	RevealsShroud:
 		Range: 7
@@ -47,9 +47,9 @@ LST:
 			BlueTiberium: 100
 			Beach: 100
 			River: 100
-		InitialFacing:0
+		InitialFacing: 0
 		ROT: 4
-		Speed: 10
+		Speed: 142
 	Health:
 		HP: 400
 	Armor:
@@ -69,3 +69,4 @@ LST:
 	AttackMove:
 		JustMove: true
 	RejectsOrders:
+
--- a/mods/cnc/rules/structures.yaml
+++ b/mods/cnc/rules/structures.yaml
@@ -1,5 +1,3 @@
-# Arranged structures in order, from basic to advanced: Buildings, Defenses, Walls, Misc.
-
 FACT:
 	Inherits: ^Building
 	Buildable:
@@ -17,7 +15,7 @@ FACT:
 		Dimensions: 3,2
 	Health:
 		HP: 1400
-	Armor: 
+	Armor:
 		Type: Wood
 	RevealsShroud:
 		Range: 10
@@ -26,7 +24,7 @@ FACT:
 		Produces: Building,Defense
 	Transforms:
 		IntoActor: mcv
-		Offset:1,1
+		Offset: 1,1
 		Facing: 108
 	ProductionQueue@Building:
 		Type: Building
@@ -187,12 +185,12 @@ PYLE:
 	Bib:
 	RallyPoint:
 	Exit@1:
-		SpawnOffset: -10,2
+		SpawnOffset: -426,85,0
 		ExitCell: 0,1
 	Exit@2:
-		SpawnOffset: 7,7
-		ExitCell: 1,1	
-	Production:		
+		SpawnOffset: 298,298,0
+		ExitCell: 1,1
+	Production:
 		Produces: Infantry
 	ProductionQueue:
 		Type: Infantry
@@ -200,7 +198,7 @@ PYLE:
 		BuildSpeed: .4
 		LowPowerSlowdown: 3
 	ProductionBar:
-	
+
 HAND:
 	Inherits: ^Building
 	Valued:
@@ -225,7 +223,7 @@ HAND:
 	Bib:
 	RallyPoint:
 	Exit@1:
-		SpawnOffset: 12,24
+		SpawnOffset: 512,1024,0
 		ExitCell: 1,2
 	Production:
 		Produces: Infantry
@@ -261,7 +259,7 @@ AFLD:
 	RallyPoint:
 		RallyPoint: 4,2
 	Exit@1:
-		SpawnOffset: -24,0
+		SpawnOffset: -1024,0,0
 		ExitCell: 3,1
 	ProductionAirdrop:
 		Produces: Vehicle
@@ -300,7 +298,7 @@ WEAP:
 	RallyPoint:
 		RallyPoint: 0,3
 	Exit@1:
-		SpawnOffset: -8,-8
+		SpawnOffset: -341,-341,0
 		ExitCell: 0,2
 	Production:
 		Produces: Vehicle
@@ -331,7 +329,7 @@ HPAD:
 	RevealsShroud:
 		Range: 5
 	Exit@1:
-		SpawnOffset: 0,-6
+		SpawnOffset: 0,-256,0
 	Production:
 		Produces: Aircraft
 	Reservable:
@@ -407,7 +405,7 @@ FIX:
 	Reservable:
 	RepairsUnits:
 	RallyPoint:
-	
+
 EYE:
 	RequiresPower:
 	CanPowerDown:
@@ -540,7 +538,7 @@ SAM:
 	-GivesBuildableArea:
 	Health:
 		HP: 400
-	Armor: 
+	Armor:
 		Type: Heavy
 	RevealsShroud:
 		Range: 5
@@ -576,7 +574,7 @@ OBLI:
 	-GivesBuildableArea:
 	Health:
 		HP: 400
-	Armor: 
+	Armor:
 		Type: Heavy
 	RevealsShroud:
 		Range: 8
@@ -588,7 +586,7 @@ OBLI:
 		FireDelay: 8
 	AttackTurreted:
 	Turreted:
-		ROT:255
+		ROT: 255
 	AutoTarget:
 	-RenderBuilding:
 	RenderRangeCircle:
@@ -629,7 +627,7 @@ GTWR:
 	RenderRangeCircle:
 	WithMuzzleFlash:
 	Turreted:
-		ROT:255
+		ROT: 255

 ATWR:
 	Inherits: ^Building
@@ -651,12 +649,12 @@ ATWR:
 	-GivesBuildableArea:
 	Health:
 		HP: 600
-	Armor: 
+	Armor:
 		Type: Heavy
 	RevealsShroud:
 		Range: 9
 	Turreted:
-		ROT:255
+		ROT: 255
 		Offset: 128,128,-85
 	Armament:
 		Weapon: TowerMissle
@@ -687,7 +685,7 @@ SBAG:
 		Owner: gdi
 	Health:
 		HP: 100
-	Armor: 
+	Armor:
 		Type: Light

 CYCL:
@@ -706,7 +704,7 @@ CYCL:
 		Owner: nod
 	Health:
 		HP: 100
-	Armor: 
+	Armor:
 		Type: Light

 BRIK:
@@ -725,7 +723,7 @@ BRIK:
 		Owner: gdi,nod
 	Health:
 		HP: 250
-	Armor: 
+	Armor:
 		Type: Heavy
 	Wall:
 		CrushClasses: heavywall
@@ -733,7 +731,6 @@ BRIK:
 	SoundOnDamageTransition:
 		DestroyedSound: crumble.aud

-# custom prerequisites:
 BARRACKS:
 	Tooltip:
 		Name: Infantry Production
@@ -753,3 +750,4 @@ ANYHQ:
 	Tooltip:
 		Name: a communications center
 		Description: a communications center
+
--- a/mods/cnc/rules/system.yaml
+++ b/mods/cnc/rules/system.yaml
@@ -9,7 +9,7 @@ Player:
 	ActorGroupProxy:
 	DeveloperMode:
 	HackyAI@Default:
-		Name:Easy AI
+		Name: Easy AI
 		BuildingCommonNames:
 			ConstructionYard: fact
 			Refinery: proc
@@ -71,7 +71,7 @@ Player:
 			orca: 5%
 		SquadSize: 15
 	HackyAI@Normal:
-		Name:Normal AI
+		Name: Normal AI
 		BuildingCommonNames:
 			ConstructionYard: fact
 			Refinery: proc
@@ -133,7 +133,7 @@ Player:
 			mtnk: 50%
 		SquadSize: 15
 	HackyAI@hard:
-		Name:Hard AI
+		Name: Hard AI
 		BuildingCommonNames:
 			ConstructionYard: fact
 			Refinery: proc
@@ -312,11 +312,11 @@ World:
 		AllowedTerrainTypes: Clear,Road
 		AllowUnderActors: false
 	SmudgeLayer@SCORCH:
-		Type:Scorch
+		Type: Scorch
 		Sequence: scorches
-		SmokePercentage:50
+		SmokePercentage: 50
 	SmudgeLayer@CRATER:
-		Type:Crater
+		Type: Crater
 		Sequence: craters
 	PathfinderDebugOverlay:
 	SpawnMapActors:
@@ -421,3 +421,4 @@ waypoint:
 	Waypoint:
 	RenderEditorOnly:
 	BodyOrientation:
+
--- a/mods/cnc/rules/tech.yaml
+++ b/mods/cnc/rules/tech.yaml
@@ -1,4 +1,3 @@
-# Oil Derrick
 V19:
 	Inherits: ^TechBuilding
 	CashTrickler:
@@ -7,7 +6,7 @@ V19:
 		Dimensions: 1,1
 	Tooltip:
 		Name: Oil Derrick
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: V19.Husk

 V19.Husk:
@@ -19,7 +18,6 @@ V19.Husk:
 	Tooltip:
 		Name: Oil Derrick (Destroyed)

-# Hospital
 HOSP:
 	Inherits: ^TechBuilding
 	Selectable:
@@ -33,7 +31,7 @@ HOSP:
 		Type: InfantryHealing
 	Tooltip:
 		Name: Hospital
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: HOSP.Husk

 HOSP.Husk:
@@ -44,7 +42,6 @@ HOSP.Husk:
 	Tooltip:
 		Name: Hospital (Destroyed)

-# Bio Lab
 BIO:
 	Inherits: ^TechBuilding
 	Building:
@@ -53,7 +50,7 @@ BIO:
 	Tooltip:
 		Name: Biological Lab
 	Exit@1:
-		SpawnOffset: 0,-10
+		SpawnOffset: 0,-426,0
 		ExitCell: 0,-1
 	Production:
 		Produces: Biolab
@@ -65,7 +62,7 @@ BIO:
 	ProductionBar:
 	RallyPoint:
 		RallyPoint: -1,-1
-	LeavesHusk: 
+	LeavesHusk:
 		HuskActor: BIO.Husk

 BIO.Husk:
@@ -76,7 +73,6 @@ BIO.Husk:
 	Tooltip:
 		Name: Biological Lab (Destroyed)

-# Prison / Tech Center
 MISS:
 	Inherits: ^CivBuilding
 	RenderBuilding:
@@ -90,4 +86,5 @@ MISS:
 		BuildPaletteOrder: 1000
 		Owner: None
 	Valued:
-		Cost: 2000
+		Cost: 2000
+
--- a/mods/cnc/rules/trees.yaml
+++ b/mods/cnc/rules/trees.yaml
@@ -3,7 +3,7 @@ SPLIT2:
 	RenderBuilding:
 		Palette: staticterrain
 	SeedsResource:
-		ResourceType:Tiberium
+		ResourceType: Tiberium
 		Interval: 55
 	Tooltip:
 		Name: Blossom Tree
@@ -18,7 +18,7 @@ SPLIT3:
 	RenderBuilding:
 		Palette: staticterrain
 	SeedsResource:
-		ResourceType:Tiberium
+		ResourceType: Tiberium
 		Interval: 55
 	Tooltip:
 		Name: Blossom Tree
@@ -33,7 +33,7 @@ SPLITBLUE:
 	RenderBuilding:
 		Palette: staticterrain
 	SeedsResource:
-		ResourceType:BlueTiberium
+		ResourceType: BlueTiberium
 		Interval: 110
 	Tooltip:
 		Name: Blossom Tree (blue)
@@ -45,16 +45,22 @@ SPLITBLUE:

 ROCK1:
 	Inherits: ^Rock
+
 ROCK2:
 	Inherits: ^Rock
+
 ROCK3:
 	Inherits: ^Rock
+
 ROCK4:
 	Inherits: ^Rock
+
 ROCK5:
 	Inherits: ^Rock
+
 ROCK6:
 	Inherits: ^Rock
+
 ROCK7:
 	Inherits: ^Rock

@@ -90,16 +96,17 @@ T09:
 	Building:
 		Footprint: x_
 		Dimensions: 2,1
-		
+
 T10:
 	Inherits: ^Tree
 	Building:
 		Footprint: __ xx
+
 T11:
 	Inherits: ^Tree
 	Building:
 		Footprint: __ xx
-		
+
 T12:
 	Inherits: ^Tree

@@ -126,9 +133,10 @@ T17:
 	Building:
 		Footprint: ___ xx_
 		Dimensions: 3,2
+
 T18:
 	Inherits: ^Tree
-	
+
 TC01:
 	Inherits: ^Tree
 	Building:
@@ -158,3 +166,4 @@ TC05:
 	Building:
 		Footprint: __x_ xxx_ _xx_
 		Dimensions: 4,3
+
--- a/mods/cnc/rules/vehicles.yaml
+++ b/mods/cnc/rules/vehicles.yaml
@@ -12,23 +12,23 @@ MCV:
 	Selectable:
 		Priority: 3
 	Mobile:
-		Speed: 5
+		Speed: 71
 	Health:
 		HP: 750
-	Armor: 
+	Armor:
 		Type: Light
 	RevealsShroud:
 		Range: 8
 	Transforms:
 		IntoActor: fact
-		Offset:-1,-1
+		Offset: -1,-1
 		Facing: 108
 		TransformSounds: constru2.aud, hvydoor1.aud
 		NoTransformSounds: deploy1.aud
 	RenderUnit:
 	MustBeDestroyed:
 	AttackMove:
-		JustMove:true
+		JustMove: true
 	BaseBuilding:
 	LeavesHusk:
 		HuskActor: MCV.Husk
@@ -61,15 +61,15 @@ HARV:
 		SearchFromProcRadius: 24
 		SearchFromOrderRadius: 12
 	Mobile:
-		Speed: 6
+		Speed: 85
 	Health:
 		HP: 600
-	Armor: 
+	Armor:
 		Type: Heavy
 	RevealsShroud:
 		Range: 4
 	AttackMove:
-		JustMove:true
+		JustMove: true
 	LeavesHusk:
 		HuskActor: HARV.Husk
 	-GainsExperience:
@@ -88,7 +88,7 @@ APC:
 		Owner: gdi
 	Mobile:
 		ROT: 8
-		Speed: 9
+		Speed: 128
 	Health:
 		HP: 200
 	Armor:
@@ -136,7 +136,7 @@ ARTY:
 		Owner: nod
 	Mobile:
 		ROT: 2
-		Speed: 6
+		Speed: 85
 	Health:
 		HP: 75
 	Armor:
@@ -170,7 +170,7 @@ FTNK:
 		Owner: nod
 	Mobile:
 		ROT: 7
-		Speed: 8
+		Speed: 113
 	Health:
 		HP: 350
 	Armor:
@@ -204,7 +204,7 @@ BGGY:
 		Owner: nod
 	Mobile:
 		ROT: 12
-		Speed: 12
+		Speed: 170
 	Health:
 		HP: 120
 	Armor:
@@ -238,7 +238,7 @@ BIKE:
 		Owner: nod
 	Mobile:
 		ROT: 12
-		Speed: 15
+		Speed: 213
 		TerrainSpeeds:
 			Clear: 70
 			Rough: 35
@@ -261,7 +261,7 @@ BIKE:
 	AutoTarget:
 	LeavesHusk:
 		HuskActor: BIKE.Husk
-	
+
 JEEP:
 	Inherits: ^Vehicle
 	Valued:
@@ -275,7 +275,7 @@ JEEP:
 		Owner: gdi
 	Mobile:
 		ROT: 11
-		Speed: 11
+		Speed: 156
 	Health:
 		HP: 160
 	Armor:
@@ -308,8 +308,8 @@ LTNK:
 		Prerequisites: anyhq
 		Owner: nod
 	Mobile:
-		ROT: 7	
-		Speed: 8
+		ROT: 7
+		Speed: 113
 	Health:
 		HP: 300
 	Armor:
@@ -346,7 +346,7 @@ MTNK:
 		Prerequisites: anyhq
 		Owner: gdi
 	Mobile:
-		Speed: 6
+		Speed: 85
 	Health:
 		HP: 400
 	Armor:
@@ -386,7 +386,7 @@ HTNK:
 		Owner: gdi
 	Mobile:
 		Crushes: wall, heavywall, crate, infantry
-		Speed: 4
+		Speed: 56
 		ROT: 3
 	Health:
 		HP: 900
@@ -436,7 +436,7 @@ MSAM:
 		Prerequisites: anyhq
 		Owner: gdi
 	Mobile:
-		Speed: 6
+		Speed: 85
 		ROT: 4
 	Health:
 		HP: 120
@@ -473,7 +473,7 @@ MLRS:
 		Prerequisites: anyhq
 		Owner: nod
 	Mobile:
-		Speed: 7
+		Speed: 99
 		ROT: 7
 	Health:
 		HP: 120
@@ -514,7 +514,7 @@ STNK:
 		Owner: nod
 	Mobile:
 		ROT: 8
-		Speed: 10
+		Speed: 142
 		Crushes: crate, infantry
 	Health:
 		HP: 150
@@ -551,7 +551,7 @@ MHQ:
 	Armor:
 		Type: Light
 	Mobile:
-		Speed: 6
+		Speed: 85
 	RevealsShroud:
 		Range: 6
 	RenderUnit:
@@ -563,3 +563,4 @@ MHQ:
 	Explodes:
 		Weapon: UnitExplodeSmall
 		EmptyWeapon: UnitExplodeSmall
+
--- a/mods/cnc/weapons.yaml
+++ b/mods/cnc/weapons.yaml
@@ -1,7 +1,7 @@
 FlametankExplode:
 	Warhead:
 		Damage: 100
-		Spread: 24
+		Spread: 1c0
 		Explosion: big_napalm
 		InfDeath: 5
 		ImpactSound: xplobig6.aud
@@ -9,7 +9,7 @@ FlametankExplode:
 HeliCrash:
 	Warhead:
 		Damage: 40
-		Spread: 10
+		Spread: 426
 		Explosion: poof
 		InfDeath: 4
 		ImpactSound: xplos.aud
@@ -23,7 +23,7 @@ HeliExplode:
 UnitExplode:
 	Warhead:
 		Damage: 500
-		Spread: 10
+		Spread: 426
 		Versus:
 			None: 90%
 			Wood: 75%
@@ -36,7 +36,7 @@ UnitExplode:
 UnitExplodeSmall:
 	Warhead:
 		Damage: 40
-		Spread: 10
+		Spread: 426
 		Versus:
 			None: 90%
 			Wood: 75%
@@ -49,7 +49,7 @@ UnitExplodeSmall:
 GrenadierExplode:
 	Warhead:
 		Damage: 10
-		Spread: 9
+		Spread: 384
 		Versus:
 			None: 90%
 			Wood: 75%
@@ -64,7 +64,7 @@ Atomic:
 	Report: nukemisl.aud
 	Warhead@impact:
 		Damage: 1000
-		Spread:15
+		Spread: 640
 		Versus:
 			None: 90%
 			Wood: 60%
@@ -76,7 +76,7 @@ Atomic:
 	Warhead@areanukea:
 		Damage: 200
 		SmudgeType: Scorch
-		Spread: 60
+		Spread: 2c512
 		Size: 3
 		Ore: true
 		Versus:
@@ -90,7 +90,7 @@ Atomic:
 	Warhead@areanukeb:
 		Damage: 200
 		SmudgeType: Scorch
-		Spread:90
+		Spread: 3c768
 		Size: 4
 		Ore: true
 		Versus:
@@ -103,7 +103,7 @@ Atomic:
 	Warhead@areanukec:
 		Damage: 200
 		SmudgeType: Scorch
-		Spread: 120
+		Spread: 5c0
 		Size: 5
 		Ore: true
 		Versus:
@@ -116,7 +116,7 @@ Atomic:
 	Warhead@areanuke:
 		Damage: 200
 		SmudgeType: Scorch
-		Spread: 150
+		Spread: 6c256
 		Size: 6
 		Ore: true
 		Versus:
@@ -131,7 +131,7 @@ IonCannon:
 	ValidTargets: Ground, Air
 	Warhead@impact:
 		Damage: 900
-		Spread: 16
+		Spread: 682
 		Ore: true
 		Versus:
 			None: 100%
@@ -151,12 +151,12 @@ IonCannon:
 Sniper:
 	Report: RAMGUN2.AUD
 	ROF: 40
-	Range: 6
+	Range: 6c0
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 	Warhead:
 		Damage: 100
-		Spread: 1
+		Spread: 42
 		Versus:
 			None: 100%
 			Wood: 5%
@@ -166,13 +166,13 @@ Sniper:

 HighV:
 	ROF: 30
-	Range: 6
+	Range: 6c0
 	Report: GUN8.AUD
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 	Warhead:
 		Damage: 50
-		Spread: 3
+		Spread: 128
 		Versus:
 			None: 100%
 			Wood: 50%
@@ -185,14 +185,14 @@ HeliAGGun:
 	ROF: 20
 	Burst: 2
 	BurstDelay: 0
-	Range: 4
+	Range: 4c0
 	ValidTargets: Ground
 	Report: gun5.aud
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 	Warhead:
 		Damage: 20
-		Spread: 6
+		Spread: 256
 		Versus:
 			None: 100%
 			Wood: 50%
@@ -205,14 +205,14 @@ HeliAAGun:
 	ROF: 20
 	Burst: 2
 	BurstDelay: 0
-	Range: 4
+	Range: 4c0
 	ValidTargets: Air
 	Report: gun5.aud
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 	Warhead:
 		Damage: 20
-		Spread: 3
+		Spread: 128
 		Versus:
 			None: 100%
 			Wood: 50%
@@ -223,13 +223,13 @@ HeliAAGun:

 Pistol:
 	ROF: 7
-	Range: 3
+	Range: 3c0
 	Report: GUN18.AUD
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 	Warhead:
-		Spread: 3
-		Versus: 
+		Spread: 128
+		Versus:
 			None: 100%
 			Wood: 50%
 			Light: 50%
@@ -240,13 +240,13 @@ Pistol:

 M16:
 	ROF: 20
-	Range: 4
+	Range: 4c0
 	Report: MGUN2.AUD
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 	Warhead:
-		Spread: 3
-		Versus: 
+		Spread: 128
+		Versus:
 			None: 100%
 			Wood: 25%
 			Light: 30%
@@ -257,22 +257,22 @@ M16:

 Rockets:
 	ROF: 50
-	Range: 6
+	Range: 6c0
 	Report: BAZOOK1.AUD
 	ValidTargets: Ground, Air
 	Projectile: Missile
 		Arm: 0
 		High: yes
 		Shadow: no
-		Inaccuracy: 3
+		Inaccuracy: 128
 		Image: DRAGON
 		ROT: 15
 		Trail: smokey
 		ContrailLength: 8
-		Speed: 35
+		Speed: 298
 		RangeLimit: 30
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			None: 50%
 			Wood: 85%
@@ -287,7 +287,7 @@ Rockets:

 BikeRockets:
 	ROF: 50
-	Range: 6
+	Range: 6c0
 	Report: BAZOOK1.AUD
 	ValidTargets: Ground, Air
 	Burst: 2
@@ -296,16 +296,16 @@ BikeRockets:
 		Arm: 0
 		High: yes
 		Shadow: no
-		Inaccuracy: 3
+		Inaccuracy: 128
 		Image: DRAGON
 		ROT: 10
 		Trail: smokey
 		ContrailLength: 8
-		Speed: 35
+		Speed: 298
 		RangeLimit: 40
 	Warhead:
-		Spread: 3
-		Versus: 
+		Spread: 128
+		Versus:
 			None: 65%
 			Wood: 50%
 			Light: 100%
@@ -321,22 +321,22 @@ OrcaAGMissiles:
 	ROF: 15
 	Burst: 2
 	BurstDelay: 15
-	Range: 5
+	Range: 5c0
 	Report: BAZOOK1.AUD
 	ValidTargets: Ground
 	Projectile: Missile
 		Arm: 0
 		High: yes
 		Shadow: no
-		Inaccuracy: 3
+		Inaccuracy: 128
 		Image: DRAGON
 		ROT: 10
 		Trail: smokey
 		ContrailLength: 8
-		Speed: 25
+		Speed: 213
 		RangeLimit: 30
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			None: 50%
 			Wood: 100%
@@ -352,22 +352,22 @@ OrcaAAMissiles:
 	ROF: 15
 	Burst: 2
 	BurstDelay: 15
-	Range: 5
+	Range: 5c0
 	Report: BAZOOK1.AUD
 	ValidTargets: Air
 	Projectile: Missile
 		Arm: 0
 		High: yes
 		Shadow: no
-		Inaccuracy: 3
+		Inaccuracy: 128
 		Image: DRAGON
 		ROT: 10
 		Trail: smokey
 		ContrailLength: 8
-		Speed: 25
+		Speed: 213
 		RangeLimit: 30
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			None: 50%
 			Wood: 100%
@@ -381,12 +381,12 @@ OrcaAAMissiles:

 Flamethrower:
 	ROF: 50
-	Range: 2.5
+	Range: 2c512
 	Report: FLAMER2.AUD
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 	Warhead:
-		Spread: 8
+		Spread: 341
 		Versus:
 			None: 90%
 			Wood: 100%
@@ -400,14 +400,14 @@ Flamethrower:

 BigFlamer:
 	ROF: 50
-	Range: 3.5
+	Range: 3c512
 	Report: FLAMER2.AUD
 	Projectile: Bullet
-		Speed: 20
-	Burst:2
-	BurstDelay:25
+		Speed: 341
+	Burst: 2
+	BurstDelay: 25
 	Warhead:
-		Spread: 8
+		Spread: 341
 		Versus:
 			None: 100%
 			Wood: 100%
@@ -421,13 +421,13 @@ BigFlamer:

 Chemspray:
 	ROF: 70
-	Range: 3
+	Range: 3c0
 	Report: FLAMER2.AUD
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 	Warhead:
 		Damage: 80
-		Spread: 6
+		Spread: 256
 		Versus:
 			None: 100%
 			Wood: 75%
@@ -440,16 +440,16 @@ Chemspray:

 Grenade:
 	ROF: 50
-	Range: 5
+	Range: 5c0
 	Report: toss1.aud
 	Projectile: Bullet
-		Speed: 12
+		Speed: 204
 		High: yes
-		Angle: .1
-		Inaccuracy: 5
+		Angle: 62
+		Inaccuracy: 213
 		Image: BOMB
 	Warhead:
-		Spread: 6
+		Spread: 256
 		Versus:
 			None: 90%
 			Wood: 75%
@@ -463,13 +463,13 @@ Grenade:

 70mm:
 	ROF: 38
-	Range: 4
+	Range: 4c0
 	Report: TNKFIRE3.AUD
 	Projectile: Bullet
 		Image: 120MM
-		Speed: 60
+		Speed: 1c0
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			None: 30%
 			Wood: 75%
@@ -484,13 +484,13 @@ Grenade:

 105mm:
 	ROF: 50
-	Range: 4.75
+	Range: 4c768
 	Report: TNKFIRE4.AUD
 	Projectile: Bullet
 		Image: 120MM
-		Speed: 40
+		Speed: 682
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			None: 30%
 			Wood: 75%
@@ -504,13 +504,13 @@ Grenade:

 120mm:
 	ROF: 50
-	Range: 4.75
+	Range: 4c768
 	Report: TNKFIRE6.AUD
 	Projectile: Bullet
 		Image: 120MM
-		Speed: 40
+		Speed: 682
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			None: 30%
 			Wood: 75%
@@ -525,15 +525,15 @@ Grenade:

 120mmDual:
 	ROF: 60
-	Range: 4.75
+	Range: 4c768
 	Report: TNKFIRE6.AUD
 	Burst: 2
 	BurstDelay: 5
 	Projectile: Bullet
 		Image: 120MM
-		Speed: 40
+		Speed: 682
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			None: 30%
 			Wood: 75%
@@ -548,13 +548,13 @@ Grenade:

 TurretGun:
 	ROF: 25
-	Range: 6
+	Range: 6c0
 	Report: TNKFIRE6.AUD
 	Projectile: Bullet
 		Image: 120MM
-		Speed: 50
+		Speed: 853
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			None: 25%
 			Wood: 25%
@@ -568,7 +568,7 @@ TurretGun:

 MammothMissiles:
 	ROF: 100
-	Range: 5
+	Range: 5c0
 	Report: ROCKET1.AUD
 	ValidTargets: Ground, Air
 	Burst: 2
@@ -576,15 +576,15 @@ MammothMissiles:
 		Arm: 0
 		High: yes
 		Shadow: no
-		Inaccuracy: 3
+		Inaccuracy: 128
 		Image: DRAGON
 		ROT: 10
 		Trail: smokey
 		ContrailLength: 8
-		Speed: 25
+		Speed: 213
 		RangeLimit: 35
 	Warhead:
-		Spread: 6
+		Spread: 256
 		Versus:
 			None: 40%
 			Wood: 75%
@@ -596,10 +596,10 @@ MammothMissiles:
 		SmudgeType: Crater
 		Damage: 75

-227mm: 
+227mm:
 	ROF: 140
-	Range: 12
-	MinRange: 3
+	Range: 12c0
+	MinRange: 3c0
 	Burst: 4
 	BurstDelay: 4
 	Report: ROCKET1.AUD
@@ -608,15 +608,15 @@ MammothMissiles:
 		Arm: 5
 		High: yes
 		Shadow: yes
-		Inaccuracy: 20
-		Angle: 0.1
+		Inaccuracy: 853
+		Angle: 62
 		Image: DRAGON
 		ROT: 2
 		ContrailLength: 10
 		Trail: smokey
-		Speed: 20
+		Speed: 341
 	Warhead:
-		Spread: 15
+		Spread: 640
 		Versus:
 			None: 25%
 			Wood: 30%
@@ -630,7 +630,7 @@ MammothMissiles:

 227mm.stnk:
 	ROF: 70
-	Range: 7
+	Range: 7c0
 	Report: ROCKET1.AUD
 	Burst: 2
 	BurstDelay: 10
@@ -639,15 +639,15 @@ MammothMissiles:
 		Arm: 0
 		High: yes
 		Shadow: yes
-		Inaccuracy: 5
+		Inaccuracy: 213
 		Image: DRAGON
 		ROT: 10
 		Trail: smokey
 		ContrailLength: 8
-		Speed: 25
+		Speed: 213
 		RangeLimit: 55
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			None: 35%
 			Wood: 50%
@@ -661,19 +661,19 @@ MammothMissiles:

 ArtilleryShell:
 	ROF: 65
-	Range: 11
-	MinRange: 2
+	Range: 11c0
+	MinRange: 2c0
 	Report: TNKFIRE2.AUD
 	Projectile: Bullet
-		Speed: 12
+		Speed: 204
 		High: yes
-		Angle: .09
-		Inaccuracy: 30
+		Angle: 56
+		Inaccuracy: 1c256
 		ContrailLength: 30
 		Image: 120MM
 	Warhead:
 		Damage: 150
-		Spread: 6
+		Spread: 256
 		Versus:
 			None: 90%
 			Wood: 50%
@@ -687,12 +687,12 @@ ArtilleryShell:
 MachineGun:
 	ROF: 20
 	Burst: 4
-	Range: 4
+	Range: 4c0
 	Report: MGUN11.AUD
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			None: 100%
 			Wood: 25%
@@ -705,7 +705,7 @@ MachineGun:

 BoatMissile:
 	ROF: 35
-	Range: 8
+	Range: 8c0
 	Burst: 2
 	BurstDelay: 7
 	Report: ROCKET2.AUD
@@ -713,16 +713,16 @@ BoatMissile:
 		Arm: 0
 		High: yes
 		Shadow: no
-		Inaccuracy: 5
+		Inaccuracy: 213
 		Image: DRAGON
 		ROT: 10
 		Trail: smokey
 		ContrailLength: 8
-		Speed: 20
+		Speed: 170
 		RangeLimit: 60
 	Warhead:
-		Spread: 6
-		Versus: 
+		Spread: 256
+		Versus:
 			None: 90%
 			Wood: 75%
 			Light: 60%
@@ -735,7 +735,7 @@ BoatMissile:

 TowerMissle:
 	ROF: 24
-	Range: 8
+	Range: 8c0
 	Report: ROCKET2.AUD
 	ValidTargets: Ground, Air
 	Burst: 2
@@ -744,16 +744,16 @@ TowerMissle:
 		Arm: 0
 		High: yes
 		Shadow: no
-		Inaccuracy: 3
+		Inaccuracy: 128
 		Image: DRAGON
 		ROT: 20
 		Trail: smokey
 		ContrailLength: 8
-		Speed: 35
+		Speed: 298
 		RangeLimit: 40
 	Warhead:
-		Spread: 12
-		Versus: 
+		Spread: 512
+		Versus:
 			None: 25%
 			Wood: 25%
 			Light: 100%
@@ -767,13 +767,13 @@ TowerMissle:
 Vulcan:
 	ValidTargets: Ground, Water
 	ROF: 2
-	Range: 6
+	Range: 6c0
 	Report: gun5.aud
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 	Warhead:
 		Damage: 75
-		Spread: 10
+		Spread: 426
 		Versus:
 			None: 100%
 			Wood: 50%
@@ -785,13 +785,13 @@ Vulcan:
 Napalm:
 	ValidTargets: Ground, Water
 	ROF: 4
-	Range: 2
+	Range: 2c0
 	Burst: 2
 	BurstDelay: 2
 	Projectile: GravityBomb
 		Image: BOMBLET
 	Warhead:
-		Spread: 20
+		Spread: 853
 		Versus:
 			None: 90%
 			Wood: 100%
@@ -806,7 +806,7 @@ Napalm:

 Napalm.Crate:
 	Warhead:
-		Spread: 4
+		Spread: 170
 		Versus:
 			None: 90%
 			Wood: 100%
@@ -820,14 +820,14 @@ Napalm.Crate:

 Laser:
 	ROF: 90
-	Range: 8.5
+	Range: 8c512
 	Charges: true
 	Report: OBELRAY1.AUD
 	Projectile: LaserZap
 		BeamWidth: 2
 		HitAnim: laserfire
 	Warhead:
-		Spread: 1
+		Spread: 42
 		Versus:
 			Wood: 50%
 		InfDeath: 5
@@ -836,7 +836,7 @@ Laser:

 SAMMissile:
 	ROF: 15
-	Range: 10
+	Range: 10c0
 	Report: ROCKET2.AUD
 	ValidTargets: Air
 	Projectile: Missile
@@ -845,12 +845,12 @@ SAMMissile:
 		Shadow: no
 		Image: MISSILE
 		ROT: 20
-		Speed: 50
+		Speed: 426
 		RangeLimit: 35
 		Trail: smokey
 		ContrailLength: 8
 	Warhead: AP
-		Spread: 16
+		Spread: 682
 		Versus:
 			None: 100%
 			Wood: 100%
@@ -864,20 +864,20 @@ SAMMissile:

 HonestJohn:
 	ROF: 200
-	Range: 10
+	Range: 10c0
 	Report: ROCKET1.AUD
 	Projectile: Bullet
 		Arm: 10
 		High: yes
 		Shadow: yes
-		Inaccuracy: 5
+		Inaccuracy: 213
 		Image: patriot
 		Trail: smokey
-		Speed: 11
+		Speed: 187
 		RangeLimit: 35
-		Angle: .15
+		Angle: 88
 	Warhead:
-		Spread: 6
+		Spread: 256
 		Versus:
 			None: 90%
 			Wood: 75%
@@ -892,7 +892,7 @@ HonestJohn:
 Tiberium:
 	ROF: 4
 	Warhead:
-		Spread: 1
+		Spread: 42
 		InfDeath: 6
 		Damage: 1
 		PreventProne: yes
@@ -900,19 +900,19 @@ Tiberium:
 Heal:
 	ROF: 4
 	Warhead:
-		Spread: 1
+		Spread: 42
 		Damage: -1
 		PreventProne: yes

 APCGun:
 	ROF: 12
-	Range: 5
+	Range: 5c0
 	Report: gun20.aud
 	ValidTargets: Ground
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			None: 35%
 			Wood: 50%
@@ -920,17 +920,17 @@ APCGun:
 			Heavy: 20%
 		Explosion: small_poof
 		Damage: 15
-		
+
 APCGun.AA:
 	ROF: 12
-	Range: 7
+	Range: 7c0
 	Report: gun20.aud
 	ValidTargets: Air
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c682
 		High: true
 	Warhead:
-		Spread: 3
+		Spread: 128
 		Versus:
 			Heavy: 50%
 		Explosion: small_poof
@@ -938,8 +938,8 @@ APCGun.AA:

 Patriot:
 	ROF: 30
-	Range: 10
-	MinRange: 1
+	Range: 10c0
+	MinRange: 1c0
 	Burst: 2
 	BurstDelay: 15
 	Report: ROCKET2.AUD
@@ -951,11 +951,11 @@ Patriot:
 		Trail: smokey
 		ContrailLength: 8
 		ROT: 20
-		Speed: 50
+		Speed: 426
 		RangeLimit: 30
-		Angle: .15
+		Angle: 88
 	Warhead: AP
-		Spread: 16
+		Spread: 682
 		Versus:
 			None: 100%
 			Wood: 100%
@@ -969,10 +969,10 @@ Patriot:

 Tail:
 	ROF: 30
-	Range: 1
+	Range: 1c0
 	Projectile: Bullet
 	Warhead:
-		Spread: 5
+		Spread: 213
 		Versus:
 			None: 90%
 			Wood: 10%
@@ -984,10 +984,10 @@ Tail:

 Horn:
 	ROF: 20
-	Range: 1
+	Range: 1c0
 	Projectile: Bullet
 	Warhead:
-		Spread: 5
+		Spread: 213
 		Versus:
 			None: 90%
 			Wood: 10%
@@ -999,10 +999,10 @@ Horn:

 Teeth:
 	ROF: 30
-	Range: 1
+	Range: 1c0
 	Projectile: Bullet
 	Warhead:
-		Spread: 5
+		Spread: 213
 		Versus:
 			None: 90%
 			Wood: 10%
@@ -1014,10 +1014,10 @@ Teeth:

 Claw:
 	ROF: 10
-	Range: 1
+	Range: 1c0
 	Projectile: Bullet
 	Warhead:
-		Spread: 5
+		Spread: 213
 		Versus:
 			None: 90%
 			Wood: 10%
@@ -1025,4 +1025,5 @@ Claw:
 			Heavy: 10%
 			Concrete: 10%
 		InfDeath: 1
-		Damage: 60
+		Damage: 60
+
--- a/mods/d2k/maps/death-depths.oramap
+++ b/mods/d2k/maps/death-depths.oramap
--- a/mods/d2k/maps/imperial-basin.oramap
+++ b/mods/d2k/maps/imperial-basin.oramap
--- a/mods/d2k/maps/the-duell.oramap
+++ b/mods/d2k/maps/the-duell.oramap
--- a/mods/d2k/maps/tucks-sietch.oramap
+++ b/mods/d2k/maps/tucks-sietch.oramap
--- a/mods/d2k/maps/venac-ditch.oramap
+++ b/mods/d2k/maps/venac-ditch.oramap
--- a/mods/d2k/rules/aircraft.yaml
+++ b/mods/d2k/rules/aircraft.yaml
@@ -7,14 +7,14 @@
 		Description: Fast drop ship.\n  Unarmed
 	Health:
 		HP: 250
-	Armor: 
+	Armor:
 		Type: Light
 	RevealsShroud:
 		Range: 12
 	Helicopter:
 		InitialFacing: 0
 		ROT: 4
-		Speed: 30
+		Speed: 210
 		LandableTerrainTypes: Sand, Rock, Transition, Spice, Dune
 		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: starporta,starporto,starporth
@@ -40,7 +40,7 @@ FRIGATE:
 		Description: Supply spacecraft
 	Plane:
 		ROT: 5
-		Speed: 50
+		Speed: 350
 		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: starporta,starporto,starporth
 	Health:
@@ -83,7 +83,7 @@ ORNI:
 		LandWhenIdle: false
 		InitialFacing: 20
 		ROT: 6
-		Speed: 40
+		Speed: 280
 		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: starporta,starporto,starporth
 	RenderUnit:
@@ -106,7 +106,7 @@ ORNI.bomber:
 		Range: 10
 	Plane:
 		ROT: 5
-		Speed: 50
+		Speed: 350
 		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: starporta,starporto,starporth
 	LimitedAmmo:
@@ -135,7 +135,7 @@ CARRYALL.infantry:
 		Range: 12
 	Plane:
 		ROT: 4
-		Speed: 40
+		Speed: 280
 		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: starporta,starporto,starporth
 	RenderUnit:
@@ -167,7 +167,7 @@ CARRYALL.Husk:
 		Name: Carryall
 	Helicopter:
 		ROT: 4
-		Speed: 30
+		Speed: 210
 		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: starporta,starporto,starporth
 	RenderUnit:
@@ -180,7 +180,7 @@ ORNI.Husk:
 		Name: Ornithopter
 	Helicopter:
 		ROT: 6
-		Speed: 40
+		Speed: 280
 		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: starporta,starporto,starporth
 	RenderUnit:
@@ -193,7 +193,7 @@ ORNI.bomber.Husk:
 		Name: Ornithopter
 	Plane:
 		ROT: 5
-		Speed: 50
+		Speed: 350
 		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: starporta,starporto,starporth
 	RenderUnit:
@@ -206,7 +206,7 @@ CARRYALL.infantry.Husk:
 		Name: Carryall
 	Plane:
 		ROT: 4
-		Speed: 40
+		Speed: 280
 		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: starporta,starporto,starporth
 	RenderUnit:
@@ -219,9 +219,10 @@ BADR.Husk:
 		Name: Crate Carryall
 	Plane:
 		ROT: 4
-		Speed: 40
+		Speed: 280
 		RepairBuildings: repaira,repairo,repairh
 		RearmBuildings: starporta,starporto,starporth
 	RenderUnit:
 		Image: carryall
-	WithShadow:
+	WithShadow:
+
--- a/mods/d2k/rules/atreides.yaml
+++ b/mods/d2k/rules/atreides.yaml
@@ -58,7 +58,7 @@ PALACEA:
 		ChargeTime: 180
 		LongDesc: Ornithopter drops a load of parachuted\nbombs on your target
 		UnitType: orni.bomber
-		SelectTargetSound: 
+		SelectTargetSound:
 		FlareType:
 	CanPowerDown:
 	RequiresPower:
@@ -100,7 +100,7 @@ MCVA:
 	Transforms:
 		Facing: 16
 		IntoActor: conyarda
-		Offset:-1,-1
+		Offset: -1,-1
 		NoTransformSounds: AI_DPLOY.AUD
 	RenderUnit:
 		Image: DMCV
@@ -175,7 +175,7 @@ SONICTANK:
 		Type: Light
 	Mobile:
 		ROT: 3
-		Speed: 7
+		Speed: 74
 	RevealsShroud:
 		Range: 6
 	RenderUnit:
@@ -213,7 +213,7 @@ FREMEN:
 		Bounds: 12,17,0,0
 		Voice: FremenVoice
 	Mobile:
-		Speed: 5
+		Speed: 53
 	Health:
 		HP: 70
 	Passenger:
@@ -253,7 +253,7 @@ GRENADIER:
 	Health:
 		HP: 50
 	Mobile:
-		Speed: 5
+		Speed: 53
 	Armament:
 		Weapon: Grenade
 		LocalOffset: 0,0,555
@@ -265,4 +265,5 @@ GRENADIER:
 		IdleAnimations: stand,stand2
 	Explodes:
 		Weapon: UnitExplodeSmall
-		Chance: 100
+		Chance: 100
+
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -12,11 +12,11 @@
 			Dune: 60
 		ROT: 5
 	SelectionDecorations:
-	Selectable: 
+	Selectable:
 		Voice: VehicleVoice
 	TargetableUnit:
 		TargetTypes: Ground
-	Passenger: 
+	Passenger:
 		CargoType: Vehicle
 	AttackMove:
 	HiddenUnderFog:
@@ -25,7 +25,7 @@
 	DrawLineToTarget:
 	ActorLostNotification:
 	ProximityCaptor:
-		Types:Vehicle
+		Types: Vehicle
 	GivesBounty:
 	Repairable:
 		RepairBuildings: repaira,repairo,repairh
@@ -52,11 +52,11 @@
 			Dune: 70
 		ROT: 5
 	SelectionDecorations:
-	Selectable: 
+	Selectable:
 		Voice: VehicleVoice
 	TargetableUnit:
 		TargetTypes: Ground
-	Passenger: 
+	Passenger:
 		CargoType: Vehicle
 	AttackMove:
 	HiddenUnderFog:
@@ -65,7 +65,7 @@
 	DrawLineToTarget:
 	ActorLostNotification:
 	ProximityCaptor:
-		Types:Tank
+		Types: Tank
 	GivesBounty:
 	Repairable:
 		RepairBuildings: repaira,repairo,repairh
@@ -81,7 +81,7 @@
 ^Husk:
 	Health:
 		HP: 75
-	Armor: 
+	Armor:
 		Type: Light
 	Husk:
 		AllowedTerrain: Sand, Rock, Transition, Concrete, Spice, SpiceBlobs, Dune
@@ -90,7 +90,7 @@
 	Burns:
 		Interval: 4
 	ProximityCaptor:
-		Types:Husk
+		Types: Husk
 	Tooltip:
 		Name: Destroyed Tank
 	BodyOrientation:
@@ -99,7 +99,7 @@
 ^TowerHusk:
 	Health:
 		HP: 125
-	Armor: 
+	Armor:
 		Type: Concrete
 	Husk:
 	AppearsOnRadar:
@@ -111,7 +111,7 @@
 	Tooltip:
 		Name: Destroyed Tower
 	ProximityCaptor:
-		Types:Husk
+		Types: Husk
 	BodyOrientation:
 	LuaScriptEvents:

@@ -127,7 +127,7 @@
 ^Infantry:
 	AppearsOnRadar:
 	Health:
-		Radius: 3
+		Radius: 96
 	Armor:
 		Type: None
 	RevealsShroud:
@@ -161,7 +161,7 @@
 	DrawLineToTarget:
 	ActorLostNotification:
 	ProximityCaptor:
-		Types:Infantry
+		Types: Infantry
 	GivesBounty:
 	CrushableInfantry:
 		CrushSound: CRUSH1.WAV
@@ -191,7 +191,7 @@
 	DrawLineToTarget:
 	ActorLostNotification:
 	ProximityCaptor:
-		Types:Plane
+		Types: Plane
 	GivesBounty:
 	CombatDebugOverlay:
 	BodyOrientation:
@@ -238,7 +238,7 @@
 		RelativeToTopLeft: yes
 	ShakeOnDeath:
 	ProximityCaptor:
-		Types:Building
+		Types: Building
 	Sellable:
 	GivesBounty:
 	CombatDebugOverlay:
@@ -248,4 +248,5 @@
 	UpdatesPlayerStatistics:
 	WithCrumbleOverlay:
 	Huntable:
-	LuaScriptEvents:
+	LuaScriptEvents:
+
--- a/mods/d2k/rules/harkonnen.yaml
+++ b/mods/d2k/rules/harkonnen.yaml
@@ -95,7 +95,7 @@ PALACEH:
 		LaunchSound:
 		IncomingSound:
 		MissileWeapon: atomic
-		SpawnOffset:-512,1c171,0
+		SpawnOffset: -512,1c171,0
 	CanPowerDown:
 	RequiresPower:
 	SupportPowerChargeBar:
@@ -107,7 +107,7 @@ MCVH:
 	Transforms:
 		Facing: 16
 		IntoActor: conyardh
-		Offset:-1,-1
+		Offset: -1,-1
 		NoTransformSounds: HI_DPLOY.AUD
 	RenderUnit:
 		Image: DMCV
@@ -134,7 +134,7 @@ COMBATH:
 	Buildable:
 		Owner: harkonnen
 	Mobile:
-		Speed: 5
+		Speed: 53
 		ROT: 4
 	Turreted:
 		ROT: 5
@@ -177,7 +177,7 @@ DEVAST:
 		Type: Heavy
 	Mobile:
 		ROT: 3
-		Speed: 4
+		Speed: 42
 		Crushes: crate, infantry
 	RevealsShroud:
 		Range: 7
@@ -222,7 +222,7 @@ SARDAUKAR:
 	Health:
 		HP: 100
 	Mobile:
-		Speed: 4
+		Speed: 42
 	RevealsShroud:
 		Range: 6
 	TakeCover:
@@ -234,3 +234,4 @@ SARDAUKAR:
 	Armament@SECONDARY:
 		Weapon: Slung
 	AttackFrontal:
+
--- a/mods/d2k/rules/infantry.yaml
+++ b/mods/d2k/rules/infantry.yaml
@@ -15,7 +15,7 @@ RIFLE:
 	Health:
 		HP: 50
 	Mobile:
-		Speed: 5
+		Speed: 53
 	Armament:
 		Weapon: LMG
 	AttackFrontal:
@@ -43,7 +43,7 @@ ENGINEER:
 	Health:
 		HP: 25
 	Mobile:
-		Speed: 5
+		Speed: 53
 	Passenger:
 		PipType: Yellow
 	EngineerRepair:
@@ -70,7 +70,7 @@ BAZOOKA:
 	Health:
 		HP: 45
 	Mobile:
-		Speed: 4
+		Speed: 42
 	Armament:
 		Weapon: Bazooka
 		LocalOffset: 0,0,555
@@ -99,7 +99,7 @@ MEDIC:
 	Health:
 		HP: 60
 	Mobile:
-		Speed: 4
+		Speed: 42
 	AutoHeal:
 	Armament:
 		Weapon: Heal
@@ -109,4 +109,5 @@ MEDIC:
 		PipType: Blue
 	-AutoTarget:
 	AttackMove:
-		JustMove: true
+		JustMove: true
+
--- a/mods/d2k/rules/ordos.yaml
+++ b/mods/d2k/rules/ordos.yaml
@@ -87,7 +87,7 @@ PALACEO:
 		ChargeTime: 180
 		LongDesc: Ornithopter drops a load of parachuted\nbombs on your target
 		UnitType: orni.bomber
-		SelectTargetSound: 
+		SelectTargetSound:
 		FlareType:
 	CanPowerDown:
 	RequiresPower:
@@ -100,7 +100,7 @@ MCVO:
 	Transforms:
 		Facing: 16
 		IntoActor: conyardo
-		Offset:-1,-1
+		Offset: -1,-1
 		NoTransformSounds: OI_DPLOY.AUD
 	RenderUnit:
 		Image: DMCV
@@ -121,7 +121,7 @@ COMBATO:
 	Turreted:
 		ROT: 8
 	Mobile:
-		Speed: 9
+		Speed: 96
 		ROT: 8
 		Crushes: crate, infantry
 	RenderUnit:
@@ -162,7 +162,7 @@ RAIDER:
 		Type: Light
 	Mobile:
 		ROT: 10
-		Speed: 14
+		Speed: 149
 	RevealsShroud:
 		Range: 7
 	RenderUnit:
@@ -196,7 +196,7 @@ STEALTHRAIDER:
 		Type: Light
 	Mobile:
 		ROT: 10
-		Speed: 14
+		Speed: 149
 	RevealsShroud:
 		Range: 7
 	RenderUnit:
@@ -241,7 +241,7 @@ DEVIATORTANK:
 		Hotkey: d
 	Mobile:
 		ROT: 3
-		Speed: 6
+		Speed: 64
 	Health:
 		HP: 125
 	Armor:
@@ -251,7 +251,7 @@ DEVIATORTANK:
 	RenderUnit:
 	Armament:
 		Weapon: FakeMissile
-		LocalOffset: -299,0,85 #7
+		LocalOffset: -299,0,85
 	AttackLoyalty:
 	AutoTarget:
 		InitialStance: Defend
@@ -287,7 +287,7 @@ SABOTEUR:
 	Health:
 		HP: 100
 	Mobile:
-		Speed: 6
+		Speed: 64
 	RevealsShroud:
 		Range: 7
 	C4Demolition:
@@ -295,3 +295,4 @@ SABOTEUR:
 	-AutoTarget:
 	AttackMove:
 		JustMove: true
+
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -92,10 +92,10 @@
 	RallyPoint:
 		RallyPoint: 1,3
 	Exit@1:
-		SpawnOffset: 11,18
+		SpawnOffset: 352,576,0
 		ExitCell: 0,2
 	Exit@2:
-		SpawnOffset: 16,15
+		SpawnOffset: 512,480,0
 		ExitCell: 1,2
 	Production:
 		Produces: Infantry
@@ -211,7 +211,7 @@
 	RallyPoint:
 		RallyPoint: 2,2
 	Exit@1:
-		SpawnOffset: 17,-7
+		SpawnOffset: 544,-224,0
 		ExitCell: 2,1
 	Production:
 		Produces: Vehicle
@@ -251,7 +251,7 @@
 	RallyPoint:
 		RallyPoint: 0,3
 	Exit@1:
-		SpawnOffset: 8,6
+		SpawnOffset: 256,192,0
 		ExitCell: 0,2
 	Production:
 		Produces: Armor
@@ -326,10 +326,10 @@
 	RallyPoint:
 		RallyPoint: 1,3
 	Exit@1:
-		SpawnOffset: 0,-15
+		SpawnOffset: 0,-480,0
 		ExitCell: 2,2
 	Exit@2:
-		SpawnOffset: 0,-15
+		SpawnOffset: 0,-480,0
 		ExitCell: 0,2
 	ProductionAirdrop:
 		Produces: Starport
@@ -371,9 +371,6 @@
 		CrushClasses: Concretewall
 	LineBuild:
 		Range: 8
-#	SelectionDecorations:
-#	Selectable:
-#		Priority: 1
 	TargetableBuilding:
 		TargetTypes: Ground, C4
 	RenderBuildingWall:
@@ -383,7 +380,7 @@
 		RelativeToTopLeft: yes
 	AutoTargetIgnore:
 	ProximityCaptor:
-		Types:Wall
+		Types: Wall
 	Sellable:
 	Guardable:
 	BodyOrientation:
@@ -463,7 +460,7 @@ WALL:
 	-GivesBuildableArea:
 	Health:
 		HP: 400
-	Armor: 
+	Armor:
 		Type: Concrete
 	RevealsShroud:
 		Range: 10
@@ -665,7 +662,6 @@ HEAVYC:
 	RenderBuildingWarFactory:
 		Image: HEAVYC

-# custom prerequisites:
 CONYARD:
 	Tooltip:
 		Name: Construction Yard
@@ -689,3 +685,4 @@ REPAIR:
 RESEARCH:
 	Tooltip:
 		Name: Ix Lab
+
--- a/mods/d2k/rules/system.yaml
+++ b/mods/d2k/rules/system.yaml
@@ -43,7 +43,7 @@ Player:
 	ActorGroupProxy:
 	DeveloperMode:
 	HackyAI@Omnius:
-		Name:Omnius
+		Name: Omnius
 		UnitQueues: Infantry, Vehicle, Armor, Starport
 		RallypointTestBuilding: conyarda
 		BuildingCommonNames:
@@ -145,7 +145,7 @@ Player:
 			combato: 100%
 		SquadSize: 8
 	HackyAI@Vidius:
-		Name:Vidious
+		Name: Vidious
 		UnitQueues: Infantry, Vehicle, Armor, Starport
 		RallypointTestBuilding: conyarda
 		BuildingCommonNames:
@@ -248,7 +248,7 @@ Player:
 			combato: 100%
 		SquadSize: 6
 	HackyAI@Gladius:
-		Name:Gladius
+		Name: Gladius
 		UnitQueues: Infantry, Vehicle, Armor, Starport
 		RallypointTestBuilding: conyarda
 		BuildingCommonNames:
@@ -362,7 +362,6 @@ World:
 	LoadWidgetAtGameStart:
 		Widget: INGAME_ROOT
 	ScreenShaker:
-#	NukePaletteEffect: # TODO: does not work well with additive blending (idle overlays still use player palette effects)
 	BuildingInfluence:
 	ChooseBuildTabOnSelect:
 	CrateSpawner:
@@ -565,7 +564,7 @@ CRATE:
 		Palette: effect
 	WithCrateBody:
 	ProximityCaptor:
-		Types:Crate
+		Types: Crate
 	Passenger:
 	BodyOrientation:

@@ -588,7 +587,7 @@ SPICEBLOOM:
 	EditorAppearance:
 		RelativeToTopLeft: yes
 	ProximityCaptor:
-		Types:Tree
+		Types: Tree
 	Tooltip:
 		Name: Spice Bloom
 	SeedsResource:
@@ -597,3 +596,4 @@ SPICEBLOOM:
 	RadarColorFromTerrain:
 		Terrain: Spice
 	BodyOrientation:
+
--- a/mods/d2k/rules/vehicles.yaml
+++ b/mods/d2k/rules/vehicles.yaml
@@ -18,7 +18,7 @@
 	Armor:
 		Type: Light
 	Mobile:
-		Speed: 6
+		Speed: 64
 		Crushes: crate, infantry
 	RevealsShroud:
 		Range: 8
@@ -64,16 +64,14 @@ HARVESTER:
 		HarvestFacings: 8
 		Resources: Spice
 		UnloadTicksPerBale: 5
-		# How far away from our linked refinery to find resources (in cells):
 		SearchFromProcRadius: 24
-		# How far away from last harvest order location to find more resources (in cells):
 		SearchFromOrderRadius: 12
 	Health:
 		HP: 1000
 	Armor:
 		Type: Heavy
 	Mobile:
-		Speed: 6
+		Speed: 64
 		Crushes: crate, infantry
 	RenderUnit:
 		Image: HARVESTER
@@ -124,7 +122,7 @@ TRIKE:
 		Type: Light
 	Mobile:
 		ROT: 10
-		Speed: 12
+		Speed: 128
 	RevealsShroud:
 		Range: 7
 	RenderUnit:
@@ -137,11 +135,6 @@ TRIKE:
 	Explodes:
 		Weapon: UnitExplodeTiny
 		EmptyWeapon: UnitExplodeTiny
-#	Cargo:
-#		Types: Infantry
-#		MaxWeight: 1
-#		PipCount: 1
-#		UnloadFacing: 220

 TRIKE.starport:
 	Inherits: TRIKE
@@ -168,11 +161,11 @@ QUAD:
 		Description: Missile Scout\n Strong vs Vehicles\n  Weak vs Infantry
 	Health:
 		HP: 125
-	Armor: 
+	Armor:
 		Type: Light
 	Mobile:
 		ROT: 8
-		Speed: 9
+		Speed: 96
 	RevealsShroud:
 		Range: 8
 	Armament:
@@ -212,7 +205,7 @@ QUAD.starport:
 	Armor:
 		Type: Heavy
 	Mobile:
-		Speed: 6
+		Speed: 64
 		ROT: 6
 		Crushes: crate, infantry
 	RevealsShroud:
@@ -261,7 +254,7 @@ SIEGETANK:
 	Armor:
 		Type: Heavy
 	Mobile:
-		Speed: 5
+		Speed: 53
 		ROT: 3
 		Crushes: crate, infantry
 	RevealsShroud:
@@ -318,7 +311,7 @@ MISSILETANK:
 		BuildPaletteOrder: 60
 		Hotkey: r
 	Mobile:
-		Speed: 6
+		Speed: 64
 		ROT: 5
 	Health:
 		HP: 90
@@ -356,3 +349,4 @@ MISSILETANK.starport:
 		Owner: atreides, harkonnen, ordos
 	Valued:
 		Cost: 1250
+
--- a/mods/d2k/weapons.yaml
+++ b/mods/d2k/weapons.yaml
@@ -1,15 +1,15 @@
 LMG:
 	ROF: 20
-	Range: 5
+	Range: 5c0
 	Report: MGUN2.WAV
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c256
 		ContrailLength: 3
 		TrailInterval: 1
 		ContrailDelay: 0
 		ContrailUsePlayerColor: true
 	Warhead:
-		Spread: 3
+		Spread: 96
 		Versus:
 			Wood: 25%
 			Light: 40%
@@ -21,20 +21,20 @@ LMG:

 Bazooka:
 	ROF: 50
-	Range: 5
+	Range: 5c0
 	Report: BAZOOK1.WAV
 	ValidTargets: Ground
 	Projectile: Missile
-		Speed: 25
+		Speed: 160
 		Arm: 2
 		Shadow: yes
 		ContrailLength: 10
-		Inaccuracy: 3
+		Inaccuracy: 96
 		Image: RPG
 		ROT: 5
 		RangeLimit: 35
 	Warhead:
-		Spread: 3
+		Spread: 96
 		Versus:
 			None: 10%
 			Wood: 75%
@@ -49,17 +49,17 @@ Bazooka:

 Sniper:
 	ROF: 100
-	Range: 8.5
+	Range: 8c512
 	Report: FREMODD1.WAV
 	Projectile: Bullet
-		Speed: 150
+		Speed: 1c896
 		ContrailLength: 6
 		TrailInterval: 1
 		ContrailDelay: 0
 		ContrailUsePlayerColor: true
-	Warhead: 
+	Warhead:
 		Damage: 60
-		Spread: 1
+		Spread: 32
 		Versus:
 			None: 100%
 			Wood: 0%
@@ -70,17 +70,17 @@ Sniper:

 Vulcan:
 	ROF: 30
-	Range: 5.75
-	Report: VULCAN.AUD # TODO: fallback to RA
+	Range: 5c768
+	Report: VULCAN.AUD
 	ValidTargets: Ground, Air
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c256
 		ContrailLength: 3
 		TrailInterval: 1
 		ContrailDelay: 0
 		ContrailUsePlayerColor: true
 	Warhead:
-		Spread: 3
+		Spread: 96
 		Versus:
 			Wood: 0%
 			Light: 60%
@@ -93,18 +93,18 @@ Vulcan:
 Slung:
 	ROF: 60
 	Delay: 5
-	Range: 5.5
+	Range: 5c512
 	Report: BAZOOK2.WAV
 	ValidTargets: Ground
 	Projectile: Bullet
-		Speed: 25
+		Speed: 320
 		High: true
 		Shadow: yes
-		Angle: .15
-		Inaccuracy: 12
+		Angle: 88
+		Inaccuracy: 384
 		Image: MISSILE
 	Warhead:
-		Spread: 6
+		Spread: 192
 		Versus:
 			None: 0%
 			Wood: 75%
@@ -118,18 +118,18 @@ Slung:

 HMG:
 	ROF: 30
-	Range: 5
+	Range: 5c0
 	Burst: 2
 	BurstDelay: 5
 	Report: 20MMGUN1.WAV
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c256
 		ContrailLength: 3
 		TrailInterval: 1
 		ContrailDelay: 0
 		ContrailUsePlayerColor: true
 	Warhead:
-		Spread: 3
+		Spread: 96
 		Versus:
 			Wood: 15%
 			Light: 45%
@@ -141,18 +141,18 @@ HMG:

 HMGo:
 	ROF: 30
-	Range: 5
+	Range: 5c0
 	Burst: 2
 	BurstDelay: 5
 	Report: 20MMGUN1.WAV
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c256
 		ContrailLength: 3
 		TrailInterval: 1
 		ContrailDelay: 0
 		ContrailUsePlayerColor: true
 	Warhead:
-		Spread: 3
+		Spread: 96
 		Versus:
 			Wood: 15%
 			Light: 45%
@@ -166,19 +166,19 @@ QuadRockets:
 	ROF: 40
 	Burst: 2
 	BurstDelay: 25
-	Range: 7
+	Range: 7c0
 	Report: ROCKET1.WAV
 	ValidTargets: Ground, Air
 	Projectile: Missile
 		Arm: 0
 		Shadow: yes
-		Inaccuracy: 3
+		Inaccuracy: 96
 		Image: RPG
 		ROT: 10
-		Speed: 40
+		Speed: 256
 		RangeLimit: 40
 	Warhead:
-		Spread: 3
+		Spread: 96
 		Versus:
 			None: 35%
 			Wood: 45%
@@ -193,16 +193,16 @@ QuadRockets:

 TurretGun:
 	ROF: 35
-	Range: 7
+	Range: 7c0
 	Report: TURRET1.WAV
 	Projectile: Bullet
-		Speed: 55
+		Speed: 704
 		High: yes
 		Shadow: no
-		Inaccuracy: 9
+		Inaccuracy: 288
 		Image: 120mm
 	Warhead:
-		Spread: 8
+		Spread: 256
 		Versus:
 			None: 50%
 			Wood: 75%
@@ -216,8 +216,8 @@ TurretGun:

 TowerMissile:
 	ROF: 35
-	Range: 7.75
-	MinRange: 1
+	Range: 7c768
+	MinRange: 1c0
 	Report: ROCKET1.WAV
 	ValidTargets: Ground, Air
 	Burst: 2
@@ -226,14 +226,14 @@ TowerMissile:
 		Arm: 0
 		High: yes
 		Shadow: yes
-		Inaccuracy: 12
+		Inaccuracy: 384
 		Image: MISSILE2
 		ROT: 10
-		Speed: 20
+		Speed: 256
 		RangeLimit: 50
-		Angle: 0.2
+		Angle: 110
 	Warhead:
-		Spread: 12
+		Spread: 384
 		Versus:
 			None: 50%
 			Wood: 45%
@@ -248,14 +248,14 @@ TowerMissile:

 90mm:
 	ROF: 50
-	Range: 5.75
+	Range: 5c768
 	Report: MEDTANK1.WAV
 	Projectile: Bullet
-		Speed: 50
-		Inaccuracy: 12
+		Speed: 640
+		Inaccuracy: 384
 		Image: 120mm
 	Warhead:
-		Spread: 8
+		Spread: 256
 		Versus:
 			None: 50%
 			Wood: 50%
@@ -269,14 +269,14 @@ TowerMissile:

 90mma:
 	ROF: 50
-	Range: 7
+	Range: 7c0
 	Report: MEDTANK1.WAV
 	Projectile: Bullet
-		Speed: 55
-		Inaccuracy: 11
+		Speed: 704
+		Inaccuracy: 352
 		Image: 120mm
 	Warhead:
-		Spread: 8
+		Spread: 256
 		Versus:
 			None: 50%
 			Wood: 50%
@@ -290,13 +290,13 @@ TowerMissile:

 DevBullet:
 	ROF: 50
-	Range: 5
+	Range: 5c0
 	Report: TANKHVY1.WAV
 	Projectile: Bullet
-		Speed: 50
+		Speed: 640
 		Image: doubleblastbullet
 	Warhead:
-		Spread: 8
+		Spread: 256
 		Versus:
 			None: 100%
 			Wood: 50%
@@ -310,24 +310,24 @@ DevBullet:

 227mm:
 	ROF: 100
-	Range: 10
-	MinRange: 4
+	Range: 10c0
+	MinRange: 4c0
 	Burst: 4
 	BurstDelay: 15
 	Report: MISSLE1.WAV
 	ValidTargets: Ground
 	Projectile: Bullet
-		Speed: 28
+		Speed: 358
 		Arm: 5
 		High: yes
 		Shadow: yes
-		Inaccuracy: 45
-		Angle: 0.2
+		Inaccuracy: 1c416
+		Angle: 110
 		Image: MISSILE2
 		ROT: 5
 		ContrailLength: 5
 	Warhead:
-		Spread: 12
+		Spread: 384
 		Versus:
 			None: 20%
 			Wood: 50%
@@ -342,20 +342,20 @@ DevBullet:

 FakeMissile:
 	ROF: 120
-	Range: 8
+	Range: 8c0
 	Burst: 1
 	Report: MISSLE1.WAV
 	Projectile: Bullet
-		Speed: 35
+		Speed: 448
 		High: true
 		Shadow: yes
-		Angle: 0.2
-		Inaccuracy: 35
+		Angle: 110
+		Inaccuracy: 1c96
 		Image: MISSILE
 		ContrailLength: 15
-		ContrailUsePlayerColor : True
+		ContrailUsePlayerColor: True
 	Warhead:
-		Spread: 3
+		Spread: 96
 		Versus:
 			None: 0%
 			Wood: 0%
@@ -367,19 +367,19 @@ FakeMissile:

 155mm:
 	ROF: 75
-	Range: 8
-	MinRange: 2
+	Range: 8c0
+	MinRange: 2c0
 	Report: MORTAR1.WAV
 	Projectile: Bullet
-		Speed: 20
+		Speed: 256
 		High: true
 		Shadow: yes
-		Angle: .1
-		Inaccuracy: 40
+		Angle: 62
+		Inaccuracy: 1c256
 		ContrailLength: 20
 		Image: 155mm
 	Warhead:
-		Spread: 12
+		Spread: 384
 		Versus:
 			None: 100%
 			Wood: 80%
@@ -394,7 +394,7 @@ FakeMissile:

 Sound:
 	ROF: 100
-	Range: 8.5
+	Range: 8c512
 	Report: SONIC1.WAV
 	Projectile: LaserZap
 		BeamWidth: 2
@@ -402,7 +402,7 @@ Sound:
 		BeamDuration: 8
 		UsePlayerColor: true
 	Warhead:
-		Spread: 1
+		Spread: 32
 		Versus:
 			None: 60%
 			Wood: 85%
@@ -413,14 +413,14 @@ Sound:

 ChainGun:
 	ROF: 10
-	Range: 5
-	MinRange: 1
+	Range: 5c0
+	MinRange: 1c0
 	Report: 20MMGUN1.WAV
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c256
 		High: true
 	Warhead:
-		Spread: 3
+		Spread: 96
 		Versus:
 			Wood: 50%
 			Light: 60%
@@ -432,12 +432,12 @@ ChainGun:

 Heal:
 	ROF: 160
-	Range: 4
+	Range: 4c0
 	Report:
 	Projectile: Bullet
-		Speed: 100
+		Speed: 1c256
 	Warhead:
-		Spread: 5
+		Spread: 160
 		Versus:
 			Wood: 0%
 			Light: 0%
@@ -448,10 +448,10 @@ Heal:

 WormJaw:
 	ROF: 10
-	Range: 3
+	Range: 3c0
 	Report: WORM.WAV
 	Warhead:
-		Spread: 5
+		Spread: 160
 		Versus:
 			Wood: 0%
 			Concrete: 0%
@@ -459,12 +459,12 @@ WormJaw:

 ParaBomb:
 	ROF: 10
-	Range: 4.5
-	Report: 
+	Range: 4c512
+	Report:
 	Projectile: GravityBomb
 		Image: BOMBS
 	Warhead:
-		Spread: 6
+		Spread: 192
 		Versus:
 			None: 30%
 			Wood: 75%
@@ -478,11 +478,11 @@ ParaBomb:

 Napalm:
 	ROF: 2
-	Range: 3
+	Range: 3c0
 	Projectile: GravityBomb
 		Image: BOMBS
 	Warhead:
-		Spread: 20
+		Spread: 640
 		Versus:
 			None: 20%
 			Wood: 100%
@@ -508,7 +508,7 @@ Demolish:
 Atomic:
 	Warhead:
 		Damage: 1800
-		Spread: 64
+		Spread: 2c0
 		Versus:
 			None: 100%
 			Wood: 100%
@@ -522,7 +522,7 @@ Atomic:
 CrateNuke:
 	Warhead:
 		Damage: 800
-		Spread: 50
+		Spread: 1c576
 		Versus:
 			None: 20%
 			Wood: 75%
@@ -536,7 +536,7 @@ CrateNuke:
 CrateExplosion:
 	Warhead:
 		Damage: 400
-		Spread: 10
+		Spread: 320
 		Versus:
 			None: 90%
 			Wood: 75%
@@ -549,7 +549,7 @@ CrateExplosion:
 UnitExplode:
 	Warhead:
 		Damage: 500
-		Spread: 10
+		Spread: 320
 		Versus:
 			None: 90%
 			Wood: 75%
@@ -562,7 +562,7 @@ UnitExplode:
 UnitExplodeSmall:
 	Warhead:
 		Damage: 60
-		Spread: 10
+		Spread: 320
 		Versus:
 			None: 90%
 			Wood: 75%
@@ -575,7 +575,7 @@ UnitExplodeSmall:
 UnitExplodeTiny:
 	Warhead:
 		Damage: 30
-		Spread: 7
+		Spread: 224
 		Versus:
 			None: 90%
 			Wood: 75%
@@ -588,7 +588,7 @@ UnitExplodeTiny:
 UnitExplodeScale:
 	Warhead:
 		Damage: 90
-		Spread: 13
+		Spread: 416
 		Versus:
 			None: 90%
 			Wood: 75%
@@ -600,16 +600,16 @@ UnitExplodeScale:

 Grenade:
 	ROF: 60
-	Range: 4
-	Report: # TODO
+	Range: 4c0
+	Report:
 	Projectile: Bullet
-		Speed: 16
+		Speed: 204
 		High: true
-		Angle: .1
-		Inaccuracy: 13
-		Image: BOMBS # TODO
+		Angle: 62
+		Inaccuracy: 416
+		Image: BOMBS
 	Warhead:
-		Spread: 6
+		Spread: 192
 		Versus:
 			None: 50%
 			Wood: 100%
@@ -619,4 +619,5 @@ Grenade:
 		InfDeath: 3
 		SmudgeType: SandCrater
 		Damage: 60
-		ImpactSound: EXPLLG5.WAV
+		ImpactSound: EXPLLG5.WAV
+
--- 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/Show More
+++ b/Show More