From 0501ced4406583e2fdbbbe527d5ab40da0184dc5 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 9 Mar 2018 07:23:31 +0100 Subject: [PATCH] Make RA use Locomotor --- mods/ra/maps/allies-03b/rules.yaml | 2 +- mods/ra/maps/fort-lonestar/rules.yaml | 2 +- mods/ra/maps/monster-tank-madness/rules.yaml | 1 - mods/ra/rules/defaults.yaml | 35 +-------- mods/ra/rules/ships.yaml | 3 +- mods/ra/rules/vehicles.yaml | 18 ++--- mods/ra/rules/world.yaml | 81 ++++++++++++++++++++ 7 files changed, 94 insertions(+), 48 deletions(-) diff --git a/mods/ra/maps/allies-03b/rules.yaml b/mods/ra/maps/allies-03b/rules.yaml index 90202905be..6897dbe3fd 100644 --- a/mods/ra/maps/allies-03b/rules.yaml +++ b/mods/ra/maps/allies-03b/rules.yaml @@ -71,7 +71,7 @@ CAMERA.VeryLarge: CAMERA.Jeep: AlwaysVisible: Mobile: - TerrainSpeeds: + Locomotor: immobile RevealsShroud: Range: 4c0 ScriptTriggers: diff --git a/mods/ra/maps/fort-lonestar/rules.yaml b/mods/ra/maps/fort-lonestar/rules.yaml index 47bb018d93..b527cdee84 100644 --- a/mods/ra/maps/fort-lonestar/rules.yaml +++ b/mods/ra/maps/fort-lonestar/rules.yaml @@ -141,7 +141,7 @@ MOBILETENT: Type: Light Mobile: Speed: 85 - Crushes: wall, mine, crate, infantry + Locomotor: heavywheeled RevealsShroud: Range: 4c0 MustBeDestroyed: diff --git a/mods/ra/maps/monster-tank-madness/rules.yaml b/mods/ra/maps/monster-tank-madness/rules.yaml index 249475f6d9..eabf6124dc 100644 --- a/mods/ra/maps/monster-tank-madness/rules.yaml +++ b/mods/ra/maps/monster-tank-madness/rules.yaml @@ -131,7 +131,6 @@ PBOX: Type: Concrete Mobile: Speed: 42 - Crushes: wall, mine, crate, infantry RevealsShroud: Range: 6c0 RequiresCondition: !friendly diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index be003d1788..032d3e9345 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -220,15 +220,7 @@ DrawLineToTarget: UpdatesPlayerStatistics: Mobile: - Crushes: mine, crate - TerrainSpeeds: - Clear: 80 - Rough: 40 - Road: 100 - Bridge: 100 - Ore: 70 - Gems: 70 - Beach: 40 + Locomotor: wheeled TurnSpeed: 5 SelectionDecorations: WithSpriteControlGroupDecoration: @@ -291,15 +283,7 @@ ^TrackedVehicle: Inherits: ^Vehicle Mobile: - Crushes: wall, mine, crate - TerrainSpeeds: - Clear: 80 - Rough: 70 - Road: 100 - Bridge: 100 - Ore: 70 - Gems: 70 - Beach: 70 + Locomotor: tracked ^Infantry: Inherits@1: ^ExistsInWorld @@ -316,16 +300,7 @@ Range: 4c0 Mobile: Speed: 56 - Crushes: mine, crate - SharesCell: true - TerrainSpeeds: - Clear: 90 - Rough: 80 - Road: 100 - Bridge: 100 - Ore: 80 - Gems: 80 - Beach: 80 + Locomotor: foot SelectionDecorations: WithSpriteControlGroupDecoration: Selectable: @@ -457,9 +432,7 @@ DrawLineToTarget: UpdatesPlayerStatistics: Mobile: - Crushes: crate - TerrainSpeeds: - Water: 100 + Locomotor: naval SelectionDecorations: WithSpriteControlGroupDecoration: Selectable: diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml index f7b23f1ad6..ea54989509 100644 --- a/mods/ra/rules/ships.yaml +++ b/mods/ra/rules/ships.yaml @@ -259,10 +259,9 @@ LST: Armor: Type: Heavy Mobile: + Locomotor: lcraft TurnSpeed: 10 Speed: 113 - TerrainSpeeds: - Beach: 70 RequiresCondition: !notmobile RevealsShroud: Range: 6c0 diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index d30bef9354..b65afc916e 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -68,7 +68,6 @@ V2RL: Type: Heavy Mobile: Speed: 128 - Crushes: wall, mine, crate, infantry RevealsShroud: Range: 5c0 RevealGeneratedShroud: False @@ -112,7 +111,6 @@ V2RL: Type: Heavy Mobile: Speed: 85 - Crushes: wall, mine, crate, infantry RevealsShroud: Range: 6c0 RevealGeneratedShroud: False @@ -159,7 +157,6 @@ V2RL: Type: Heavy Mobile: Speed: 71 - Crushes: wall, mine, crate, infantry RevealsShroud: Range: 6c0 RevealGeneratedShroud: False @@ -208,7 +205,7 @@ V2RL: Type: Heavy Mobile: Speed: 50 - Crushes: wall, mine, crate, infantry, heavywall + Locomotor: heavytracked RevealsShroud: Range: 7c0 RevealGeneratedShroud: False @@ -269,6 +266,7 @@ ARTY: Mobile: TurnSpeed: 2 Speed: 85 + Locomotor: lighttracked RevealsShroud: Range: 5c0 RevealGeneratedShroud: False @@ -315,7 +313,7 @@ HARV: Type: Heavy Mobile: Speed: 85 - Crushes: wall, mine, crate, infantry + Locomotor: heavywheeled RevealsShroud: Range: 4c0 WithHarvestAnimation: @@ -361,7 +359,7 @@ MCV: Type: Light Mobile: Speed: 71 - Crushes: wall, mine, crate, infantry + Locomotor: heavywheeled RevealsShroud: Range: 4c0 Transforms: @@ -441,7 +439,6 @@ APC: Type: Heavy Mobile: Speed: 142 - Crushes: wall, mine, crate, infantry RequiresCondition: !notmobile RevealsShroud: Range: 5c0 @@ -479,7 +476,6 @@ MNLY: Type: Heavy Mobile: Speed: 128 - Crushes: wall, mine, crate, infantry RevealsShroud: Range: 5c0 RevealGeneratedShroud: False @@ -622,7 +618,6 @@ TTNK: Type: Light Mobile: Speed: 113 - Crushes: wall, mine, crate, infantry RevealsShroud: Range: 7c0 RevealGeneratedShroud: False @@ -739,7 +734,7 @@ CTNK: Type: Light Mobile: Speed: 113 - Crushes: wall, mine, crate, infantry + Locomotor: heavywheeled RevealsShroud: Range: 6c0 RevealGeneratedShroud: False @@ -779,7 +774,6 @@ QTNK: Type: Heavy Mobile: Speed: 56 - Crushes: wall, mine, crate, infantry RevealsShroud: Range: 6c0 RevealGeneratedShroud: False @@ -812,7 +806,7 @@ STNK: Type: Light Mobile: Speed: 142 - Crushes: wall, mine, crate, infantry + Locomotor: heavywheeled RequiresCondition: !notmobile RevealsShroud: Range: 7c0 diff --git a/mods/ra/rules/world.yaml b/mods/ra/rules/world.yaml index 3b34408f77..b448a7af52 100644 --- a/mods/ra/rules/world.yaml +++ b/mods/ra/rules/world.yaml @@ -8,6 +8,87 @@ DefeatMusic: map TerrainGeometryOverlay: DebugVisualizations: + Locomotor@FOOT: + Name: foot + Crushes: mine, crate + SharesCell: true + TerrainSpeeds: + Clear: 90 + Rough: 80 + Road: 100 + Bridge: 100 + Ore: 80 + Gems: 80 + Beach: 80 + Locomotor@WHEELED: + Name: wheeled + Crushes: mine, crate + TerrainSpeeds: + Clear: 80 + Rough: 40 + Road: 100 + Bridge: 100 + Ore: 70 + Gems: 70 + Beach: 40 + Locomotor@HEAVYWHEELED: + Name: heavywheeled + Crushes: wall, mine, crate, infantry + TerrainSpeeds: + Clear: 80 + Rough: 40 + Road: 100 + Bridge: 100 + Ore: 70 + Gems: 70 + Beach: 40 + Locomotor@LIGHTTRACKED: + Name: lighttracked + Crushes: wall, mine, crate + TerrainSpeeds: + Clear: 80 + Rough: 70 + Road: 100 + Bridge: 100 + Ore: 70 + Gems: 70 + Beach: 70 + Locomotor@TRACKED: + Name: tracked + Crushes: wall, infantry, mine, crate + TerrainSpeeds: + Clear: 80 + Rough: 70 + Road: 100 + Bridge: 100 + Ore: 70 + Gems: 70 + Beach: 70 + Locomotor@HEAVYTRACKED: + Name: heavytracked + Crushes: wall, infantry, mine, crate, heavywall + TerrainSpeeds: + Clear: 80 + Rough: 70 + Road: 100 + Bridge: 100 + Ore: 70 + Gems: 70 + Beach: 70 + Locomotor@NAVAL: + Name: naval + Crushes: crate + TerrainSpeeds: + Water: 100 + Locomotor@LANDINGCRAFT: + Name: lcraft + Crushes: crate + TerrainSpeeds: + Water: 100 + Beach: 70 + Locomotor@IMMOBILE: + Name: immobile + TerrainSpeeds: ShroudRenderer: FogVariants: shroud Index: 255, 16, 32, 48, 64, 80, 96, 112, 128, 144, 160, 176, 192, 208, 224, 240, 20, 40, 56, 65, 97, 130, 148, 194, 24, 33, 66, 132, 28, 41, 67, 134, 1, 2, 4, 8, 3, 6, 12, 9, 7, 14, 13, 11, 5, 10, 15, 255