From 15d35228e8bd4801c09cf28be43fd5079f1522ab Mon Sep 17 00:00:00 2001 From: Matthias Date: Wed, 6 Oct 2021 21:36:57 +0200 Subject: [PATCH] Setup most of the nuclear missile silo animations. --- .../Render/WithSupportPowerChargedOverlay.cs | 5 ++-- mods/ra2/rules/soviet-structures.yaml | 6 ++-- mods/ra2/sequences/soviet-structures.yaml | 30 ++++++++++++++++--- 3 files changed, 33 insertions(+), 8 deletions(-) diff --git a/OpenRA.Mods.RA2/Traits/Render/WithSupportPowerChargedOverlay.cs b/OpenRA.Mods.RA2/Traits/Render/WithSupportPowerChargedOverlay.cs index fffea824..df32a881 100644 --- a/OpenRA.Mods.RA2/Traits/Render/WithSupportPowerChargedOverlay.cs +++ b/OpenRA.Mods.RA2/Traits/Render/WithSupportPowerChargedOverlay.cs @@ -77,8 +77,9 @@ void INotifySupportPower.Charged(Actor self) void INotifySupportPower.Activated(Actor self) { - overlay.PlayThen(info.EndSequence, - () => visible = false); + if (!string.IsNullOrEmpty(info.EndSequence)) + overlay.PlayThen(info.EndSequence, + () => visible = false); } } } diff --git a/mods/ra2/rules/soviet-structures.yaml b/mods/ra2/rules/soviet-structures.yaml index a626aa2c..dd4642ca 100644 --- a/mods/ra2/rules/soviet-structures.yaml +++ b/mods/ra2/rules/soviet-structures.yaml @@ -878,7 +878,6 @@ namisl: LaunchSpeechNotification: AtomBombLaunchDetected MissileWeapon: atomic MissilePalette: player - MissileDelay: 35 SpawnOffset: 0,0,-1c0 IsPlayerPalette: true DisplayTimerRelationships: Ally, Neutral, Enemy @@ -895,7 +894,10 @@ namisl: FlightDelay: 200 PauseOnCondition: lowpower SelectTargetSpeechNotification: SelectTarget - WithSupportPowerActivationAnimation: + WithSupportPowerChargedOverlay: + WithSupportPowerActivationOverlay: + Sequence: smoke + Palette: effect50alpha SpawnSurvivors: DeathTypes: ExplosionDeath, BulletDeath Actors: e2, e2, e2, e2, e2, e2, e2 diff --git a/mods/ra2/sequences/soviet-structures.yaml b/mods/ra2/sequences/soviet-structures.yaml index 3685a647..3c17b834 100644 --- a/mods/ra2/sequences/soviet-structures.yaml +++ b/mods/ra2/sequences/soviet-structures.yaml @@ -348,16 +348,38 @@ namisl: critical-idle: ngmisl_e Start: 1 ShadowStart: 3 - # TODO: ngmisl_f is actually the open sequence - active: ngmisl_f + charged: ngmisl_f Length: 16 ShadowStart: 32 + Tick: 150 + damaged-charged: ngmisl_f + Start: 16 + Length: 16 + ShadowStart: 48 Tick: 120 - damaged-active: ngmisl_f - Start: 17 + loop: ngmisl_g + ShadowStart: 2 + Tick: 120 + damaged-loop: ngmisl_g + Start: 1 + ShadowStart: 3 + Tick: 120 + end: ngmisl_h + Length: 16 + ShadowStart: 32 + Tick: 150 + damaged-end: ngmisl_h + Start: 16 Length: 16 ShadowStart: 48 Tick: 120 + smoke: nuketo + Length: * + Tick: 120 + Offset: 0, 0 + steam: nukestm # TODO: unused + Length: * + Tick: 120 make: ntmislmk UseTilesetCode: true Length: 26