diff --git a/OpenRA.Mods.RA/Effects/NukeLaunch.cs b/OpenRA.Mods.RA/Effects/NukeLaunch.cs index 5b4e697e59..3d7f83962d 100755 --- a/OpenRA.Mods.RA/Effects/NukeLaunch.cs +++ b/OpenRA.Mods.RA/Effects/NukeLaunch.cs @@ -26,27 +26,22 @@ using OpenRA.Traits; namespace OpenRA.Mods.RA.Effects { - class NukeInfo : IProjectileInfo - { - public readonly string Image = null; - public IEffect Create(ProjectileArgs args) { return null; } - } - class NukeLaunch : IEffect { readonly Actor silo; Animation anim; float2 pos; int2 targetLocation; - readonly int targetAltitude = 400; int altitude; bool goingUp = true; + string weapon; public NukeLaunch(Actor silo, string weapon, int2 targetLocation) { this.silo = silo; this.targetLocation = targetLocation; - anim = new Animation("nuke"); + this.weapon = weapon; + anim = new Animation(weapon); anim.PlayRepeating("up"); if (silo == null) @@ -61,7 +56,6 @@ namespace OpenRA.Mods.RA.Effects void StartDescent(World world) { pos = OpenRA.Traits.Util.CenterOfCell(targetLocation); - anim = new Animation("nuke"); anim.PlayRepeating("down"); goingUp = false; } @@ -93,7 +87,7 @@ namespace OpenRA.Mods.RA.Effects void Explode(World world) { world.AddFrameEndTask(w => w.Remove(this)); - Combat.DoExplosion(silo.Owner.PlayerActor, "Atomic", pos.ToInt2(), 0); + Combat.DoExplosion(silo.Owner.PlayerActor, weapon, pos.ToInt2(), 0); world.WorldActor.traits.Get().AddEffect(20, pos, 5); } diff --git a/mods/ra/sequences.xml b/mods/ra/sequences.xml index 283a5f1176..2cc44662cc 100644 --- a/mods/ra/sequences.xml +++ b/mods/ra/sequences.xml @@ -936,4 +936,8 @@ + + + + \ No newline at end of file diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index 3faeeae408..e67de4b8cb 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -619,8 +619,6 @@ SCUD: Damage: 600 Atomic: - Nuke: - Image: Nuke Warhead@impact: Damage: 1000 Spread: 6