From 1ab2a781f133c7e974f61a3c05304419d4557177 Mon Sep 17 00:00:00 2001 From: Pavel Penev Date: Wed, 12 Aug 2015 18:32:30 +0300 Subject: [PATCH] Add an upgrade rule for Helicopter removal --- .../UtilityCommands/UpgradeRules.cs | 6 ++++++ mods/cnc/rules/aircraft.yaml | 18 ++++++------------ mods/cnc/rules/defaults.yaml | 6 +++++- mods/d2k/rules/aircraft.yaml | 8 +++++--- mods/d2k/rules/misc.yaml | 2 +- mods/ra/rules/aircraft.yaml | 9 ++++++--- mods/ra/rules/husks.yaml | 9 ++++++--- mods/ts/rules/aircraft.yaml | 18 ++++++------------ mods/ts/rules/defaults.yaml | 3 ++- 9 files changed, 43 insertions(+), 36 deletions(-) diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs index 067bcc6f92..6a861cf6ce 100644 --- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs +++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs @@ -2181,6 +2181,12 @@ namespace OpenRA.Mods.Common.UtilityCommands { if (depth == 1 && node.Key == "Plane") node.Key = "Aircraft"; + + if (depth == 1 && node.Key == "Helicopter") + { + node.Key = "Aircraft"; + node.Value.Nodes.Add(new MiniYamlNode("CanHover", "True")); + } } UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1); diff --git a/mods/cnc/rules/aircraft.yaml b/mods/cnc/rules/aircraft.yaml index 552ba9566e..d4f868b4eb 100644 --- a/mods/cnc/rules/aircraft.yaml +++ b/mods/cnc/rules/aircraft.yaml @@ -9,14 +9,13 @@ TRAN: BuildPaletteOrder: 10 Prerequisites: hpad Queue: Aircraft.GDI, Aircraft.Nod - Helicopter: + Aircraft: LandWhenIdle: true ROT: 5 Speed: 140 InitialFacing: 0 LandableTerrainTypes: Clear,Rough,Road,Ore,Beach,Tiberium,BlueTiberium AltitudeVelocity: 0c100 - AirborneUpgrades: airborne Health: HP: 90 Armor: @@ -53,11 +52,10 @@ HELI: BuildPaletteOrder: 20 Prerequisites: hpad, anyhq, ~techlevel.medium Queue: Aircraft.Nod - Helicopter: + Aircraft: RearmBuildings: hpad ROT: 4 Speed: 186 - AirborneUpgrades: airborne Health: HP: 125 Armor: @@ -105,11 +103,10 @@ ORCA: BuildPaletteOrder: 20 Prerequisites: hpad, anyhq, ~techlevel.medium Queue: Aircraft.GDI - Helicopter: + Aircraft: RearmBuildings: hpad ROT: 4 Speed: 186 - AirborneUpgrades: airborne Health: HP: 90 Armor: @@ -221,10 +218,9 @@ TRAN.Husk: Inherits: ^HelicopterHusk Tooltip: Name: Chinook Transport - Helicopter: + Aircraft: ROT: 5 Speed: 140 - AirborneUpgrades: airborne RevealsShroud: Range: 8c0 Type: CenterPosition @@ -239,10 +235,9 @@ HELI.Husk: Inherits: ^HelicopterHusk Tooltip: Name: Apache Longbow - Helicopter: + Aircraft: ROT: 4 Speed: 186 - AirborneUpgrades: airborne RevealsShroud: Range: 10c0 Type: CenterPosition @@ -255,10 +250,9 @@ ORCA.Husk: Inherits: ^HelicopterHusk Tooltip: Name: Orca - Helicopter: + Aircraft: ROT: 4 Speed: 186 - AirborneUpgrades: airborne RevealsShroud: Range: 10c0 Type: CenterPosition diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 314542ad34..55ef7abde5 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -131,11 +131,12 @@ SelectionDecorations: Selectable: Bounds: 24,24 - Helicopter: + Aircraft: RepairBuildings: hpad RearmBuildings: LandWhenIdle: false AirborneUpgrades: airborne + CanHover: True HiddenUnderFog: Type: CenterPosition ActorLostNotification: @@ -664,6 +665,9 @@ ^HelicopterHusk: Inherits: ^CommonHuskDefaults WithShadow: + Aircraft: + AirborneUpgrades: airborne + CanHover: True FallsToEarth: Spins: True Moves: False diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml index 0ff58461a3..228295b9ae 100644 --- a/mods/d2k/rules/aircraft.yaml +++ b/mods/d2k/rules/aircraft.yaml @@ -9,7 +9,7 @@ carryall.reinforce: HP: 4800 Armor: Type: light - Helicopter: + Aircraft: CruiseAltitude: 2100 InitialFacing: 0 ROT: 4 @@ -21,6 +21,7 @@ carryall.reinforce: LandAltitude: 100 LandWhenIdle: False AirborneUpgrades: airborne + CanHover: True Targetable@GROUND: TargetTypes: Ground, Vehicle UpgradeTypes: airborne @@ -66,7 +67,6 @@ frigate: ornithopter: Inherits: ^Plane - Targetable: TargetTypes: Air AttackBomber: Armament: @@ -81,6 +81,7 @@ ornithopter: RepairBuildings: RearmBuildings: Repulsable: False + CanHover: True AmmoPool: Ammo: 5 Tooltip: @@ -105,11 +106,12 @@ carryall.husk: Inherits: ^AircraftHusk Tooltip: Name: Carryall - Helicopter: + Aircraft: ROT: 4 Speed: 112 RepairBuildings: RearmBuildings: + CanHover: True RenderSprites: Image: carryall diff --git a/mods/d2k/rules/misc.yaml b/mods/d2k/rules/misc.yaml index bd0481364e..aca636b6d1 100644 --- a/mods/d2k/rules/misc.yaml +++ b/mods/d2k/rules/misc.yaml @@ -131,7 +131,7 @@ waypoint: ^carryall.colorpicker: Inherits: carryall - Helicopter: + Aircraft: InitialFacing: 104 RenderSprites: Image: carryall diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml index 9f1b6179ad..0711c1a1af 100644 --- a/mods/ra/rules/aircraft.yaml +++ b/mods/ra/rules/aircraft.yaml @@ -212,7 +212,7 @@ TRAN: RevealsShroud: Range: 12c0 Type: CenterPosition - Helicopter: + Aircraft: RearmBuildings: hpad InitialFacing: 0 ROT: 5 @@ -220,6 +220,7 @@ TRAN: LandableTerrainTypes: Clear,Rough,Road,Ore,Beach AltitudeVelocity: 0c100 AirborneUpgrades: airborne + CanHover: True WithRotor@PRIMARY: Offset: -597,0,341 Sequence: rotor2 @@ -260,13 +261,14 @@ HELI: LocalOffset: 0,213,-85 AttackHeli: FacingTolerance: 20 - Helicopter: + Aircraft: RearmBuildings: hpad LandWhenIdle: false InitialFacing: 20 ROT: 4 Speed: 149 AirborneUpgrades: airborne + CanHover: True AutoTarget: InitialStance: HoldFire WithRotor: @@ -312,13 +314,14 @@ HIND: MuzzleSequence: muzzle AttackHeli: FacingTolerance: 20 - Helicopter: + Aircraft: RearmBuildings: hpad LandWhenIdle: false InitialFacing: 20 ROT: 4 Speed: 112 AirborneUpgrades: airborne + CanHover: True AutoTarget: InitialStance: HoldFire WithRotor: diff --git a/mods/ra/rules/husks.yaml b/mods/ra/rules/husks.yaml index 91f6041088..9a52b37dc1 100644 --- a/mods/ra/rules/husks.yaml +++ b/mods/ra/rules/husks.yaml @@ -85,10 +85,11 @@ TRAN.Husk: Inherits: ^HelicopterHusk Tooltip: Name: Transport Helicopter - Helicopter: + Aircraft: ROT: 4 Speed: 149 AirborneUpgrades: airborne + CanHover: True WithRotor@PRIMARY: Offset: -597,0,341 WithRotor@SECONDARY: @@ -178,10 +179,11 @@ HELI.Husk: Inherits: ^HelicopterHusk Tooltip: Name: Longbow - Helicopter: + Aircraft: ROT: 4 Speed: 149 AirborneUpgrades: airborne + CanHover: True WithRotor: Offset: 0,0,85 SmokeTrailWhenDamaged: @@ -197,10 +199,11 @@ HIND.Husk: Inherits: ^HelicopterHusk Tooltip: Name: Hind - Helicopter: + Aircraft: ROT: 4 Speed: 112 AirborneUpgrades: airborne + CanHover: True WithRotor: SmokeTrailWhenDamaged: Offset: -427,0,0 diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml index 97091249cc..9310cec3aa 100644 --- a/mods/ts/rules/aircraft.yaml +++ b/mods/ts/rules/aircraft.yaml @@ -4,13 +4,12 @@ DPOD: Cost: 10 Tooltip: Name: Drop Pod - Helicopter: + Aircraft: LandWhenIdle: yes ROT: 5 Speed: 149 InitialFacing: 0 LandableTerrainTypes: Clear - AirborneUpgrades: airborne Health: HP: 60 Armor: @@ -40,7 +39,7 @@ DSHP: Cost: 1000 Tooltip: Name: Dropship - Helicopter: + Aircraft: LandWhenIdle: yes ROT: 5 Speed: 168 @@ -48,7 +47,6 @@ DSHP: LandableTerrainTypes: Clear TakeoffSound: dropup1.aud LandingSound: dropdwn1.aud - AirborneUpgrades: airborne Health: HP: 200 Armor: @@ -76,11 +74,10 @@ ORCA: Prerequisites: ~gahpad Selectable: Bounds: 30,24 - Helicopter: + Aircraft: RearmBuildings: gahpad, nahpad ROT: 5 Speed: 186 - AirborneUpgrades: airborne Health: HP: 200 Armor: @@ -155,7 +152,7 @@ ORCATRAN: BuildPaletteOrder: 10 Prerequisites: ~disabled RenderSprites: - Helicopter: + Aircraft: LandWhenIdle: yes ROT: 5 Speed: 84 @@ -163,7 +160,6 @@ ORCATRAN: LandableTerrainTypes: Clear TakeoffSound: dropup1.aud LandingSound: dropdwn1.aud - AirborneUpgrades: airborne Health: HP: 200 Armor: @@ -189,7 +185,7 @@ TRNSPORT: Queue: Air BuildPaletteOrder: 10 Prerequisites: ~gahpad, gadept - Helicopter: + Aircraft: LandWhenIdle: yes ROT: 5 Speed: 149 @@ -198,7 +194,6 @@ TRNSPORT: TakeoffSound: dropup1.aud LandingSound: dropdwn1.aud AltitudeVelocity: 64 - AirborneUpgrades: airborne Health: HP: 175 Armor: @@ -265,11 +260,10 @@ APACHE: Prerequisites: ~nahpad Selectable: Bounds: 30,24 - Helicopter: + Aircraft: RearmBuildings: gahpad, nahpad ROT: 5 Speed: 130 - AirborneUpgrades: airborne Health: HP: 225 Armor: diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index eef8b32259..f7c71144d3 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -482,13 +482,14 @@ ^Helicopter: Inherits: ^Aircraft - Helicopter: + Aircraft: RepairBuildings: gadept RearmBuildings: LandWhenIdle: no CruiseAltitude: 2048 Voice: Move AirborneUpgrades: airborne + CanHover: True ^Plane: Inherits: ^Aircraft