Setup most of the nuclear missile silo animations.

OpenRA · Apr 4, 2023 · 3936e1b · 3936e1b
1 parent a8fb8a1
commit 3936e1b
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 8 deletions.
diff --git 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
@@ -911,7 +911,6 @@ namisl:
 		LaunchSpeechNotification: AtomBombLaunchDetected
 		MissileWeapon: atomic
 		MissilePalette: player
-		MissileDelay: 35
 		SpawnOffset: 0,0,-1c0
 		IsPlayerPalette: true
 		DisplayTimerRelationships: Ally, Neutral, Enemy
@@ -929,7 +928,10 @@ namisl:
 		PauseOnCondition: lowpower
 		SelectTargetSpeechNotification: SelectTarget
 		MissileImage: atomic
-	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
@@ -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