From f955e83797b256607774d9bee85882034153324b Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Wed, 23 Sep 2015 20:51:49 +0200
Subject: [PATCH] Apply original D2k base speeds

10.666667 in OpenRA with 32x32px tiles equals 1 in original RA1 and 64 in original D2k (ground actors).
For aircraft, I applied original D2k speed / 64 * 7, which should be correct for 32x32px.
---
 mods/d2k/rules/aircraft.yaml | 16 ++++++++--------
 mods/d2k/rules/infantry.yaml | 14 +++++++-------
 mods/d2k/rules/vehicles.yaml | 29 +++++++++++++----------------
 3 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml
index 7aae2bec10..d39156970d 100644
--- a/mods/d2k/rules/aircraft.yaml
+++ b/mods/d2k/rules/aircraft.yaml
@@ -13,7 +13,7 @@ carryall.reinforce:
 		CruiseAltitude: 2100
 		InitialFacing: 0
 		ROT: 4
-		Speed: 160
+		Speed: 112
 		LandableTerrainTypes: Sand, Rock, Transition, Spice, Dune
 		RepairBuildings: repair_pad
 		RearmBuildings:
@@ -52,8 +52,8 @@ frigate:
 		Name: Frigate
 		Description: Supply spacecraft
 	Plane:
-		ROT: 5
-		Speed: 350
+		ROT: 1
+		Speed: 126
 		RepairBuildings: repair_pad
 		RearmBuildings:
 		Repulsable: False
@@ -82,9 +82,9 @@ ornithopter:
 	Armor:
 		Type: Light
 	Plane:
-		ROT: 5
-		Speed: 350
-		RepairBuildings: repair_pad
+		ROT: 2
+		Speed: 189
+		RepairBuildings:
 		RearmBuildings:
 		Repulsable: False
 	AmmoPool:
@@ -101,7 +101,7 @@ ornithopter.husk:
 		Name: Ornithopter
 	Plane:
 		ROT: 5
-		Speed: 350
+		Speed: 189
 		RepairBuildings:
 		RearmBuildings:
 	RenderSprites:
@@ -113,7 +113,7 @@ carryall.husk:
 		Name: Carryall
 	Helicopter:
 		ROT: 4
-		Speed: 210
+		Speed: 112
 		RepairBuildings:
 		RearmBuildings:
 	RenderSprites:
diff --git a/mods/d2k/rules/infantry.yaml b/mods/d2k/rules/infantry.yaml
index 80e3f525ea..4aa1d50157 100644
--- a/mods/d2k/rules/infantry.yaml
+++ b/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:
diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml
index 4a2872217a..b37e7698da 100644
--- a/mods/d2k/rules/vehicles.yaml
+++ b/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
-		ROT: 6
+		Speed: 75
+		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
-		ROT: 4
-	Turreted:
-		ROT: 5
+		Speed: 64
 	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
-		ROT: 8
+		Speed: 85
+		ROT: 5
 		Crushes: crate, infantry
 	Health:
 		HP: 1800