epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix various breakage in nuke code

Browse Source
This commit is contained in:
Chris Forbes
2010-06-09 20:02:27 +12:00
parent 1bd7a9b590
commit 3870be5122
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Mods.RA/Effects/NukeLaunch.cs
View File

@@ -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<ScreenShaker>().AddEffect(20, pos, 5);
}