From a6f6080df24589316ae12aae9b516cbeb1599324 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 20 May 2016 17:08:43 +0200 Subject: [PATCH] Replace WithSpriteRotorOverlay with WithIdleOverlay in OpenRA mods In preparation of removing the now-redundant WithSpriteRotorOverlay trait. --- mods/cnc/rules/aircraft.yaml | 43 ++++++++++++++++++++++++++++-------- mods/ra/rules/aircraft.yaml | 41 +++++++++++++++++++++++++++++----- mods/ra/rules/husks.yaml | 12 ++++++---- mods/ts/rules/aircraft.yaml | 10 ++++++++- mods/ts/rules/husks.yaml | 3 ++- 5 files changed, 88 insertions(+), 21 deletions(-) diff --git a/mods/cnc/rules/aircraft.yaml b/mods/cnc/rules/aircraft.yaml index d21c628fe9..e1a5cacaf5 100644 --- a/mods/cnc/rules/aircraft.yaml +++ b/mods/cnc/rules/aircraft.yaml @@ -23,12 +23,26 @@ TRAN: RevealsShroud: Range: 10c0 Type: CenterPosition - WithSpriteRotorOverlay@PRIMARY: + WithIdleOverlay@ROTOR1AIR: + Offset: 597,0,85 + Sequence: rotor + UpgradeTypes: airborne + UpgradeMinEnabledLevel: 1 + WithIdleOverlay@ROTOR1GROUND: + Offset: 597,0,85 + Sequence: slow-rotor + UpgradeTypes: airborne + UpgradeMaxEnabledLevel: 0 + WithIdleOverlay@ROTOR2AIR: Offset: -597,0,171 Sequence: rotor2 - GroundSequence: slow-rotor2 - WithSpriteRotorOverlay@SECONDARY: - Offset: 597,0,85 + UpgradeTypes: airborne + UpgradeMinEnabledLevel: 1 + WithIdleOverlay@ROTOR2GROUND: + Offset: -597,0,171 + Sequence: slow-rotor2 + UpgradeTypes: airborne + UpgradeMaxEnabledLevel: 0 Cargo: Types: Infantry MaxWeight: 10 @@ -81,8 +95,16 @@ HELI: SelfReloads: true ReloadCount: 10 SelfReloadDelay: 200 - WithSpriteRotorOverlay: + WithIdleOverlay@ROTORAIR: Offset: 0,0,85 + Sequence: rotor + UpgradeTypes: airborne + UpgradeMinEnabledLevel: 1 + WithIdleOverlay@ROTORGROUND: + Offset: 0,0,85 + Sequence: slow-rotor + UpgradeTypes: airborne + UpgradeMaxEnabledLevel: 0 WithMuzzleOverlay: SpawnActorOnDeath: Actor: HELI.Husk @@ -227,10 +249,12 @@ TRAN.Husk: RevealsShroud: Range: 8c0 Type: CenterPosition - WithSpriteRotorOverlay@PRIMARY: - Offset: -597,0,171 - WithSpriteRotorOverlay@SECONDARY: + WithIdleOverlay@ROTOR1: Offset: 597,0,85 + Sequence: rotor + WithIdleOverlay@ROTOR2: + Offset: -597,0,171 + Sequence: rotor2 RenderSprites: Image: tran @@ -244,8 +268,9 @@ HELI.Husk: RevealsShroud: Range: 10c0 Type: CenterPosition - WithSpriteRotorOverlay: + WithIdleOverlay: Offset: 0,0,85 + Sequence: rotor RenderSprites: Image: heli diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml index 76e028a199..c70f48f4e4 100644 --- a/mods/ra/rules/aircraft.yaml +++ b/mods/ra/rules/aircraft.yaml @@ -212,12 +212,26 @@ TRAN: Speed: 112 LandableTerrainTypes: Clear,Rough,Road,Ore,Beach,Gems AltitudeVelocity: 0c100 - WithSpriteRotorOverlay@PRIMARY: + WithIdleOverlay@ROTOR1AIR: + Offset: 597,0,213 + Sequence: rotor + UpgradeTypes: airborne + UpgradeMinEnabledLevel: 1 + WithIdleOverlay@ROTOR1GROUND: + Offset: 597,0,213 + Sequence: slow-rotor + UpgradeTypes: airborne + UpgradeMaxEnabledLevel: 0 + WithIdleOverlay@ROTOR2AIR: Offset: -597,0,341 Sequence: rotor2 - GroundSequence: slow-rotor2 - WithSpriteRotorOverlay@SECONDARY: - Offset: 597,0,213 + UpgradeTypes: airborne + UpgradeMinEnabledLevel: 1 + WithIdleOverlay@ROTOR2GROUND: + Offset: -597,0,341 + Sequence: slow-rotor2 + UpgradeTypes: airborne + UpgradeMaxEnabledLevel: 0 Cargo: Types: Infantry MaxWeight: 8 @@ -262,8 +276,16 @@ HELI: AutoTarget: InitialStance: HoldFire InitialStanceAI: HoldFire - WithSpriteRotorOverlay: + WithIdleOverlay@ROTORAIR: Offset: 0,0,85 + Sequence: rotor + UpgradeTypes: airborne + UpgradeMinEnabledLevel: 1 + WithIdleOverlay@ROTORGROUND: + Offset: 0,0,85 + Sequence: slow-rotor + UpgradeTypes: airborne + UpgradeMaxEnabledLevel: 0 AmmoPool: Ammo: 8 SelectionDecorations: @@ -313,7 +335,14 @@ HIND: AutoTarget: InitialStance: HoldFire InitialStanceAI: HoldFire - WithSpriteRotorOverlay: + WithIdleOverlay@ROTORAIR: + Sequence: rotor + UpgradeTypes: airborne + UpgradeMinEnabledLevel: 1 + WithIdleOverlay@ROTORGROUND: + Sequence: slow-rotor + UpgradeTypes: airborne + UpgradeMaxEnabledLevel: 0 AmmoPool: Ammo: 24 PipCount: 6 diff --git a/mods/ra/rules/husks.yaml b/mods/ra/rules/husks.yaml index 79f532afa3..66161255eb 100644 --- a/mods/ra/rules/husks.yaml +++ b/mods/ra/rules/husks.yaml @@ -88,10 +88,12 @@ TRAN.Husk: Aircraft: TurnSpeed: 4 Speed: 149 - WithSpriteRotorOverlay@PRIMARY: + WithIdleOverlay@PRIMARY: Offset: -597,0,341 - WithSpriteRotorOverlay@SECONDARY: + Sequence: rotor + WithIdleOverlay@SECONDARY: Offset: 597,0,213 + Sequence: rotor2 RevealsShroud: Range: 12c0 Type: CenterPosition @@ -177,8 +179,9 @@ HELI.Husk: Aircraft: TurnSpeed: 4 Speed: 149 - WithSpriteRotorOverlay: + WithIdleOverlay: Offset: 0,0,85 + Sequence: rotor SmokeTrailWhenDamaged: Offset: -427,0,0 MinDamage: Undamaged @@ -195,7 +198,8 @@ HIND.Husk: Aircraft: TurnSpeed: 4 Speed: 112 - WithSpriteRotorOverlay: + WithIdleOverlay: + Sequence: rotor SmokeTrailWhenDamaged: Offset: -427,0,0 MinDamage: Undamaged diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml index 739f50166a..5a1eafd1e1 100644 --- a/mods/ts/rules/aircraft.yaml +++ b/mods/ts/rules/aircraft.yaml @@ -307,8 +307,16 @@ APACHE: PipType: Ammo PipTypeEmpty: AmmoEmpty AutoTarget: - WithSpriteRotorOverlay: + WithIdleOverlay@ROTORAIR: Offset: 85,0,384 + Sequence: rotor + UpgradeTypes: airborne + UpgradeMinEnabledLevel: 1 + WithIdleOverlay@ROTORGROUND: + Offset: 85,0,384 + Sequence: slow-rotor + UpgradeTypes: airborne + UpgradeMaxEnabledLevel: 0 RenderSprites: SpawnActorOnDeath: Actor: APACHE.Husk diff --git a/mods/ts/rules/husks.yaml b/mods/ts/rules/husks.yaml index 01357b6648..4b31fbfa3a 100644 --- a/mods/ts/rules/husks.yaml +++ b/mods/ts/rules/husks.yaml @@ -77,8 +77,9 @@ APACHE.Husk: Aircraft: TurnSpeed: 5 Speed: 130 - WithSpriteRotorOverlay: + WithIdleOverlay: Offset: 85,0,384 + Sequence: rotor RenderSprites: Image: apache RenderVoxels: