From 7441badc96907e26d4bd2164ff5eff877e77ecf9 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 9 Mar 2018 16:39:33 +0100 Subject: [PATCH] Make TD use Locomotor --- mods/cnc/rules/defaults.yaml | 50 ++-------------- mods/cnc/rules/infantry.yaml | 8 +-- mods/cnc/rules/ships.yaml | 11 +--- mods/cnc/rules/vehicles.yaml | 14 ++--- mods/cnc/rules/world.yaml | 109 +++++++++++++++++++++++++++++++++++ 5 files changed, 120 insertions(+), 72 deletions(-) diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 05ce44f87d..bcf3e685ac 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -212,15 +212,7 @@ Inherits@3: ^SpriteActor Huntable: Mobile: - Crushes: crate - TerrainSpeeds: - Clear: 80 - Rough: 50 - Road: 100 - Bridge: 100 - Tiberium: 50 - BlueTiberium: 50 - Beach: 50 + Locomotor: wheeled TurnSpeed: 5 SelectionDecorations: WithSpriteControlGroupDecoration: @@ -256,15 +248,7 @@ ^Tank: Inherits: ^Vehicle Mobile: - Crushes: wall, crate, infantry - TerrainSpeeds: - Clear: 80 - Rough: 70 - Road: 100 - Bridge: 100 - Tiberium: 70 - BlueTiberium: 70 - Beach: 70 + Locomotor: tracked TurnSpeed: 5 Tooltip: GenericName: Tank @@ -334,18 +318,7 @@ RevealsShroud: Range: 5c0 Mobile: - Crushes: crate - SharesCell: true - TerrainSpeeds: - Clear: 90 - Rough: 80 - Road: 100 - Bridge: 100 - Tiberium: 70 - PathingCost: 300 - BlueTiberium: 70 - PathingCost: 300 - Beach: 80 + Locomotor: foot SelectionDecorations: WithSpriteControlGroupDecoration: Selectable: @@ -499,15 +472,8 @@ RevealsShroud: Range: 6c0 Mobile: - Crushes: crate + Locomotor: critter Speed: 113 - TerrainSpeeds: - Clear: 90 - Rough: 80 - Road: 100 - Tiberium: 70 - BlueTiberium: 70 - Beach: 80 Voice: Move SelectionDecorations: WithSpriteControlGroupDecoration: @@ -554,13 +520,7 @@ Mobile: Voice: Move Speed: 71 - TerrainSpeeds: - Clear: 70 - Rough: 60 - Road: 70 - Tiberium: 100 - BlueTiberium: 100 - Beach: 60 + Locomotor: critter SelectionDecorations: WithSpriteControlGroupDecoration: Selectable: diff --git a/mods/cnc/rules/infantry.yaml b/mods/cnc/rules/infantry.yaml index 52554279b9..2cb63bbe28 100644 --- a/mods/cnc/rules/infantry.yaml +++ b/mods/cnc/rules/infantry.yaml @@ -132,11 +132,7 @@ E5: Description: Advanced general-purpose infantry.\n Strong vs all Ground units Mobile: Speed: 56 - TerrainSpeeds: - Tiberium: 90 - PathingCost: 90 - BlueTiberium: 90 - PathingCost: 90 + Locomotor: chem Health: HP: 9000 AutoTarget: @@ -225,8 +221,6 @@ RMBO: PVICE: Inherits: ^Viceroid - Mobile: - Crushes: crate Buildable: Queue: Biolab BuildPaletteOrder: 40 diff --git a/mods/cnc/rules/ships.yaml b/mods/cnc/rules/ships.yaml index 992833dd07..a3ed97d615 100644 --- a/mods/cnc/rules/ships.yaml +++ b/mods/cnc/rules/ships.yaml @@ -58,16 +58,7 @@ LST: BuildPaletteOrder: 1000 Prerequisites: ~disabled Mobile: - Crushes: crate - TerrainSpeeds: - Clear: 100 - Rough: 100 - Road: 100 - Water: 100 - Tiberium: 100 - BlueTiberium: 100 - Beach: 100 - River: 100 + Locomotor: lcraft InitialFacing: 0 TurnSpeed: 4 Speed: 142 diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml index 92d4e9faea..2278ff2924 100644 --- a/mods/cnc/rules/vehicles.yaml +++ b/mods/cnc/rules/vehicles.yaml @@ -16,7 +16,7 @@ MCV: DecorationBounds: 36,36 Mobile: Speed: 71 - Crushes: crate, infantry + Locomotor: heavywheeled Health: HP: 120000 Armor: @@ -268,13 +268,7 @@ BIKE: Mobile: TurnSpeed: 10 Speed: 213 - TerrainSpeeds: - Clear: 70 - Rough: 35 - Road: 100 - Tiberium: 35 - BlueTiberium: 35 - Beach: 35 + Locomotor: bike Health: HP: 11000 Armor: @@ -426,7 +420,7 @@ HTNK: Queue: Vehicle.GDI Description: Heavily armored GDI Tank.\nCan attack Aircraft.\n Strong vs Everything Mobile: - Crushes: wall, heavywall, crate, infantry + Locomotor: heavytracked Speed: 56 TurnSpeed: 3 Health: @@ -576,9 +570,9 @@ STNK: Queue: Vehicle.Nod Description: Long-range missile tank that can cloak.\nCan attack Aircraft.\nHas weak armor. Can be spotted by infantry and defense structures.\n Strong vs Vehicles, Tanks\n Weak vs Infantry. Mobile: + Locomotor: heavywheeled TurnSpeed: 10 Speed: 142 - Crushes: crate, infantry Health: HP: 15000 Armor: diff --git a/mods/cnc/rules/world.yaml b/mods/cnc/rules/world.yaml index 362565fd3f..6e327eb01a 100644 --- a/mods/cnc/rules/world.yaml +++ b/mods/cnc/rules/world.yaml @@ -13,6 +13,115 @@ FogVariants: typea, typeb, typec, typed OverrideFullShroud: full OverrideFullFog: full + Locomotor@FOOT: + Name: foot + Crushes: crate + SharesCell: true + TerrainSpeeds: + Clear: 90 + Rough: 80 + Road: 100 + Bridge: 100 + Tiberium: 70 + PathingCost: 300 + BlueTiberium: 70 + PathingCost: 300 + Beach: 80 + Locomotor@CHEM: + Name: chem + Crushes: crate + SharesCell: true + TerrainSpeeds: + Clear: 90 + Rough: 80 + Road: 100 + Bridge: 100 + Tiberium: 90 + BlueTiberium: 90 + Beach: 80 + Locomotor@WHEELED: + Name: wheeled + Crushes: crate + TerrainSpeeds: + Clear: 80 + Rough: 50 + Road: 100 + Bridge: 100 + Tiberium: 50 + BlueTiberium: 50 + Beach: 50 + Locomotor@BIKE: + Name: bike + Crushes: crate + TerrainSpeeds: + Clear: 70 + Rough: 35 + Road: 100 + Bridge: 100 + Tiberium: 35 + BlueTiberium: 35 + Beach: 35 + Locomotor@HEAVYWHEELED: + Name: heavywheeled + Crushes: crate, infantry + TerrainSpeeds: + Clear: 80 + Rough: 50 + Road: 100 + Bridge: 100 + Tiberium: 50 + BlueTiberium: 50 + Beach: 50 + Locomotor@TRACKED: + Name: tracked + Crushes: wall, crate, infantry + TerrainSpeeds: + Clear: 80 + Rough: 70 + Road: 100 + Bridge: 100 + Tiberium: 70 + BlueTiberium: 70 + Beach: 70 + Locomotor@HEAVYTRACKED: + Name: heavytracked + Crushes: wall, heavywall, crate, infantry + TerrainSpeeds: + Clear: 80 + Rough: 70 + Road: 100 + Bridge: 100 + Tiberium: 70 + BlueTiberium: 70 + Beach: 70 + Locomotor@NAVAL: + Name: naval + Crushes: crate + TerrainSpeeds: + Water: 100 + Locomotor@LANDINGCRAFT: + Name: lcraft + Crushes: crate + TerrainSpeeds: + Clear: 100 + Rough: 100 + Road: 100 + Water: 100 + Tiberium: 100 + BlueTiberium: 100 + Beach: 100 + River: 100 + Locomotor@CRITTER: + Name: critter + Crushes: crate + TerrainSpeeds: + Clear: 90 + Rough: 80 + Road: 100 + Bridge: 100 + Tiberium: 70 + BlueTiberium: 70 + Beach: 80 Faction@Random: Name: Any InternalName: Random