Merge pull request #9418 from reaperrr/d2k-speed

Apply original D2k actor speed

mods/d2k/rules/aircraft.yaml

@@ -6,14 +6,14 @@ carryall.reinforce:
 		Name: Carryall
 		Description: Large winged, planet-bound ship\n  Automatically lifts harvesters.
 	Health:
-		HP: 250
+		HP: 4800
 	Armor:
-		Type: Light
+		Type: light
 	Helicopter:
 		CruiseAltitude: 2100
 		InitialFacing: 0
 		ROT: 4
-		Speed: 160
+		Speed: 112
 		LandableTerrainTypes: Sand, Rock, Transition, Spice, Dune
 		RepairBuildings: repair_pad
 		RearmBuildings:
@@ -52,21 +52,15 @@ frigate:
 		Name: Frigate
 		Description: Supply spacecraft
 	Plane:
-		ROT: 5
+		ROT: 1
-		Speed: 350
+		Speed: 126
 		RepairBuildings: repair_pad
 		RearmBuildings:
 		Repulsable: False
-	Health:
-		HP: 500
 	-AppearsOnRadar:
-	Armor:
-		Type: Heavy
 	Cargo:
 		MaxWeight: 20
 		PipCount: 10
-	DamageMultiplier@INVULNERABLE:
-		Modifier: 0
 	FlyAwayOnIdle:
 	RejectsOrders:
 
@@ -78,13 +72,13 @@ ornithopter:
 	Armament:
 		Weapon: OrniBomb
 	Health:
-		HP: 100
+		HP: 900
 	Armor:
-		Type: Light
+		Type: light
 	Plane:
-		ROT: 5
+		ROT: 2
-		Speed: 350
+		Speed: 189
-		RepairBuildings: repair_pad
+		RepairBuildings:
 		RearmBuildings:
 		Repulsable: False
 	AmmoPool:
@@ -101,7 +95,7 @@ ornithopter.husk:
 		Name: Ornithopter
 	Plane:
 		ROT: 5
-		Speed: 350
+		Speed: 189
 		RepairBuildings:
 		RearmBuildings:
 	RenderSprites:
@@ -113,7 +107,7 @@ carryall.husk:
 		Name: Carryall
 	Helicopter:
 		ROT: 4
-		Speed: 210
+		Speed: 112
 		RepairBuildings:
 		RearmBuildings:
 	RenderSprites:

mods/d2k/rules/defaults.yaml

@@ -60,13 +60,13 @@
 	Mobile:
 		Crushes: crate
 		TerrainSpeeds:
-			Sand: 90
+			Sand: 100
 			Rock: 100
-			Transition: 95
+			Transition: 100
 			Concrete: 100
-			Spice: 80
+			Spice: 100
-			SpiceBlobs: 80
+			SpiceBlobs: 100
-			Dune: 60
+			Dune: 50
 		ROT: 5
 	SelectionDecorations:
 	Selectable:
@@ -100,14 +100,6 @@
 	Inherits: ^Vehicle
 	Mobile:
 		Crushes: crate, infantry
-		TerrainSpeeds:
-			Sand: 85
-			Rock: 100
-			Transition: 92
-			Concrete: 100
-			Spice: 80
-			SpiceBlobs: 80
-			Dune: 70
 
 ^Husk:
 	Inherits@1: ^SpriteActor
@@ -176,14 +168,14 @@
 		Crushes: crate
 		SharesCell: true
 		TerrainSpeeds:
-			Sand: 80
+			Sand: 100
 			Rock: 100
-			Transition: 90
+			Transition: 100
 			Concrete: 100
-			Spice: 80
+			Spice: 100
-			SpiceBlobs: 80
+			SpiceBlobs: 100
-			Dune: 60
+			Dune: 50
-			Rough: 70
+			Rough: 80
 	SelectionDecorations:
 	Selectable:
 		Bounds: 12,18,0,-6

mods/d2k/rules/infantry.yaml

@@ -11,7 +11,7 @@ light_inf:
 	Health:
 		HP: 600
 	Mobile:
-		Speed: 53
+		Speed: 43
 	Armament:
 		Weapon: LMG
 	AttackFrontal:
@@ -34,7 +34,7 @@ engineer:
 	Health:
 		HP: 500
 	Mobile:
-		Speed: 53
+		Speed: 31
 	Passenger:
 		PipType: Yellow
 	EngineerRepair:
@@ -62,7 +62,7 @@ trooper:
 	Health:
 		HP: 700
 	Mobile:
-		Speed: 42
+		Speed: 31
 	Armament:
 		Weapon: Bazooka
 		LocalOffset: 0,0,555
@@ -115,7 +115,7 @@ fremen:
 		BuildPaletteOrder: 100
 		Prerequisites: ~barracks.atreides, palace, ~techlevel.high
 	Mobile:
-		Speed: 53
+		Speed: 43
 	Health:
 		HP: 700
 	RevealsShroud:
@@ -154,7 +154,7 @@ grenadier:
 	Health:
 		HP: 600
 	Mobile:
-		Speed: 53
+		Speed: 43
 	Armament:
 		LocalOffset: 0,0,555
 		Weapon: grenade
@@ -183,7 +183,7 @@ sardaukar:
 	Health:
 		HP: 1000
 	Mobile:
-		Speed: 42
+		Speed: 31
 	RevealsShroud:
 		Range: 6c0
 	WithInfantryBody:
@@ -216,7 +216,7 @@ saboteur:
 	Health:
 		HP: 400
 	Mobile:
-		Speed: 64
+		Speed: 43
 	RevealsShroud:
 		Range: 7c0
 	C4Demolition:

mods/d2k/rules/vehicles.yaml

@@ -17,7 +17,7 @@ mcv:
 	Armor:
 		Type: light
 	Mobile:
-		Speed: 64
+		Speed: 31
 		Crushes: crate, infantry
 	RevealsShroud:
 		Range: 8c0
@@ -68,7 +68,7 @@ harvester:
 	Armor:
 		Type: harvester
 	Mobile:
-		Speed: 64
+		Speed: 43
 		Crushes: crate, infantry
 	RevealsShroud:
 		Range: 4c0
@@ -172,7 +172,7 @@ siege_tank:
 	Armor:
 		Type: light
 	Mobile:
-		Speed: 53
+		Speed: 43
 		ROT: 3
 		Crushes: crate, infantry
 	RevealsShroud:
@@ -255,7 +255,7 @@ sonic_tank:
 		Type: light
 	Mobile:
 		ROT: 3
-		Speed: 74
+		Speed: 31
 	RevealsShroud:
 		Range: 6c0
 	Armament:
@@ -288,7 +288,7 @@ devastator:
 		Type: heavy
 	Mobile:
 		ROT: 3
-		Speed: 42
+		Speed: 31
 		Crushes: crate, infantry
 	RevealsShroud:
 		Range: 7c0
@@ -379,7 +379,7 @@ deviator:
 		Prerequisites: ~heavy.ordos, research_centre, ~techlevel.high
 	Mobile:
 		ROT: 3
-		Speed: 64
+		Speed: 53
 	Health:
 		HP: 1100
 	Armor:
@@ -415,13 +415,13 @@ deviator:
 	Armor:
 		Type: heavy
 	Mobile:
-		Speed: 64
+		Speed: 75
-		ROT: 6
+		ROT: 5
 		Crushes: crate, infantry
 	RevealsShroud:
 		Range: 8c0
 	Turreted:
-		ROT: 6
+		ROT: 5
 		RealignDelay: 0
 	Armament:
 		Weapon: 80mm_A
@@ -457,10 +457,7 @@ combat_tank_h:
 	Armament:
 		Weapon: 80mm_H
 	Mobile:
-		Speed: 53
+		Speed: 64
-		ROT: 4
-	Turreted:
-		ROT: 5
 	RevealsShroud:
 		Range: 7c0
 	Health:
@@ -473,12 +470,12 @@ combat_tank_o:
 	Buildable:
 		Prerequisites: ~heavy.ordos
 	Turreted:
-		ROT: 8
+		ROT: 5
 	Armament:
 		Weapon: 80mm_O
 	Mobile:
-		Speed: 96
+		Speed: 85
-		ROT: 8
+		ROT: 5
 		Crushes: crate, infantry
 	Health:
 		HP: 1800