From 94f22638be623f7eaefd4417efec63ae2331035a Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Mon, 27 Apr 2015 19:46:33 +1200 Subject: [PATCH] Add an upgrade rule. --- OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs | 4 ++++ mods/cnc/rules/aircraft.yaml | 2 -- mods/ra/rules/aircraft.yaml | 1 - mods/ra/rules/husks.yaml | 1 - 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs index 6f6ef15174..eea3551efc 100644 --- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs +++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs @@ -872,6 +872,10 @@ namespace OpenRA.Mods.Common.UtilityCommands } } + if (engineVersion < 201504277) + if (node.Key.StartsWith("WithRotor")) + node.Value.Nodes.RemoveAll(p => p.Key == "Id"); + UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1); } } diff --git a/mods/cnc/rules/aircraft.yaml b/mods/cnc/rules/aircraft.yaml index f7683387c1..ffae216000 100644 --- a/mods/cnc/rules/aircraft.yaml +++ b/mods/cnc/rules/aircraft.yaml @@ -30,7 +30,6 @@ TRAN: Sequence: rotor2 GroundSequence: slow-rotor2 WithRotor@SECONDARY: - Id: rotor_2 Offset: 597,0,85 Cargo: Types: Infantry @@ -231,7 +230,6 @@ TRAN.Husk: WithRotor@PRIMARY: Offset: -597,0,171 WithRotor@SECONDARY: - Id: rotor_2 Offset: 597,0,85 RenderUnit: Image: tran diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml index 6e74710c35..44ef9c9746 100644 --- a/mods/ra/rules/aircraft.yaml +++ b/mods/ra/rules/aircraft.yaml @@ -210,7 +210,6 @@ TRAN: Sequence: rotor2 GroundSequence: slow-rotor2 WithRotor@SECONDARY: - Id: rotor_2 Offset: 597,0,213 Cargo: Types: Infantry diff --git a/mods/ra/rules/husks.yaml b/mods/ra/rules/husks.yaml index a3e69503a1..ba6e3fadf8 100644 --- a/mods/ra/rules/husks.yaml +++ b/mods/ra/rules/husks.yaml @@ -94,7 +94,6 @@ TRAN.Husk: WithRotor@PRIMARY: Offset: -597,0,341 WithRotor@SECONDARY: - Id: rotor_2 Offset: 597,0,213 RevealsShroud: Range: 12c0