From dfe2076826e1e74f6368fdc584863b4ffdbe7c2f Mon Sep 17 00:00:00 2001 From: abc013 Date: Fri, 6 Oct 2017 14:38:43 +0200 Subject: [PATCH] Fix passive vehicles can become ranks --- mods/d2k/rules/defaults.yaml | 3 +-- mods/d2k/rules/vehicles.yaml | 9 +++++++++ mods/ra/rules/defaults.yaml | 5 ++--- mods/ra/rules/vehicles.yaml | 12 ++++++++++++ 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml index a49620f1d9..b5ef0608c7 100644 --- a/mods/d2k/rules/defaults.yaml +++ b/mods/d2k/rules/defaults.yaml @@ -164,8 +164,7 @@ ^Vehicle: Inherits@1: ^ExistsInWorld - Inherits@2: ^GainsExperience - Inherits@3: ^SpriteActor + Inherits@2: ^SpriteActor Huntable: Mobile: Crushes: crate, spicebloom diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index 0596125665..57904bda5d 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -100,6 +100,7 @@ harvester: trike: Inherits: ^Vehicle + Inherits@GAINSEXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle @@ -140,6 +141,7 @@ trike: quad: Inherits: ^Vehicle + Inherits@GAINSEXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle @@ -175,6 +177,7 @@ quad: siege_tank: Inherits: ^Tank + Inherits@GAINSEXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Armor @@ -222,6 +225,7 @@ siege_tank: missile_tank: Inherits: ^Tank + Inherits@GAINSEXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Tooltip: Name: Missile Tank @@ -261,6 +265,7 @@ missile_tank: sonic_tank: Inherits: ^Vehicle + Inherits@GAINSEXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Armor @@ -296,6 +301,7 @@ sonic_tank: devastator: Inherits: ^Tank + Inherits@GAINSEXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Armor @@ -360,6 +366,7 @@ devastator: raider: Inherits: ^Vehicle + Inherits@GAINSEXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle @@ -424,6 +431,7 @@ stealth_raider: deviator: Inherits: ^Tank + Inherits@GAINSEXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Valued: Cost: 1000 @@ -461,6 +469,7 @@ deviator: ^combat_tank: Inherits: ^Tank + Inherits@GAINSEXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Armor diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 0b19f19589..885588b066 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -207,9 +207,8 @@ ^Vehicle: Inherits@1: ^ExistsInWorld - Inherits@2: ^GainsExperience - Inherits@3: ^IronCurtainable - Inherits@4: ^SpriteActor + Inherits@2: ^IronCurtainable + Inherits@3: ^SpriteActor Huntable: DrawLineToTarget: UpdatesPlayerStatistics: diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index 647dc70a01..540c77349b 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -1,5 +1,6 @@ V2RL: Inherits: ^Vehicle + Inherits@GAINSEXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle @@ -36,6 +37,7 @@ V2RL: 1TNK: Inherits: ^Tank + Inherits@GAINSEXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle @@ -76,6 +78,7 @@ V2RL: 2TNK: Inherits: ^Tank + Inherits@GAINSEXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle @@ -118,6 +121,7 @@ V2RL: 3TNK: Inherits: ^Tank + Inherits@GAINSEXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle @@ -160,6 +164,7 @@ V2RL: 4TNK: Inherits: ^Tank + Inherits@GAINSEXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Buildable: Queue: Vehicle @@ -218,6 +223,7 @@ V2RL: ARTY: Inherits: ^Tank + Inherits@GAINSEXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle @@ -342,6 +348,7 @@ MCV: JEEP: Inherits: ^Vehicle + Inherits@GAINSEXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle @@ -385,6 +392,7 @@ JEEP: APC: Inherits: ^Tank + Inherits@GAINSEXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle @@ -561,6 +569,7 @@ MRJ: TTNK: Inherits: ^Tank + Inherits@GAINSEXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle @@ -598,6 +607,7 @@ TTNK: FTRK: Inherits: ^Vehicle + Inherits@GAINSEXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Buildable: Queue: Vehicle @@ -672,6 +682,7 @@ DTRK: CTNK: Inherits: ^Vehicle + Inherits@GAINSEXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle @@ -742,6 +753,7 @@ QTNK: STNK: Inherits: ^Vehicle + Inherits@GAINSEXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Buildable: Queue: Vehicle