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

Fixes units hunting Advanced Comm. Center after being damaged by Ion Cannon.

Browse Source 
Additionally made weapon, effect animation and effect palette customizable.
This commit is contained in:
reaperrr
2014-05-16 17:31:46 +02:00
parent bbf2364bba
commit d5023e376d
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Mods.Cnc/Effects/IonCannon.cs
View File

@@ -20,13 +20,17 @@ namespace OpenRA.Mods.Cnc.Effects
{ {
Target target; Target target;
Animation anim; Animation anim;
Actor firedBy; Player firedBy;
string palette;
string weapon;
public IonCannon(Actor firedBy, World world, CPos location) public IonCannon(Player firedBy, string weapon, World world, CPos location, string effect, string palette)
{ {
this.firedBy = firedBy; this.firedBy = firedBy;
this.weapon = weapon;
this.palette = palette;
target = Target.FromCell(location); target = Target.FromCell(location);
anim = new Animation("ionsfx"); anim = new Animation(effect);
anim.PlayThen("idle", () => Finish(world)); anim.PlayThen("idle", () => Finish(world));
} }
@@ -34,13 +38,13 @@ namespace OpenRA.Mods.Cnc.Effects
public IEnumerable<IRenderable> Render(WorldRenderer wr) public IEnumerable<IRenderable> Render(WorldRenderer wr)
{ {
return anim.Render(target.CenterPosition, wr.Palette("effect")); return anim.Render(target.CenterPosition, wr.Palette(palette));
} }
void Finish(World world) void Finish(World world)
{ {
world.AddFrameEndTask(w => w.Remove(this)); world.AddFrameEndTask(w => w.Remove(this));
Combat.DoExplosion(firedBy, "IonCannon", target.CenterPosition); Combat.DoExplosion(firedBy.PlayerActor, weapon, target.CenterPosition);
} }
} }
} }

8
OpenRA.Mods.Cnc/IonCannonPower.cs
View File

@@ -21,9 +21,13 @@ namespace OpenRA.Mods.Cnc
[ActorReference] [ActorReference]
[Desc("Actor to spawn when the attack starts")] [Desc("Actor to spawn when the attack starts")]
public readonly string CameraActor = null; public readonly string CameraActor = null;
[Desc("Amount of time to keep the camera alive")] [Desc("Amount of time to keep the camera alive")]
public readonly int CameraRemoveDelay = 25; public readonly int CameraRemoveDelay = 25;
[Desc("Effect sequence to display")]
public readonly string Effect = "ionsfx";
public readonly string EffectPalette = "effect";
[Desc("Which weapon to fire")]
public readonly string Weapon = "IonCannon";
public override object Create(ActorInitializer init) { return new IonCannonPower(init.self, this); } public override object Create(ActorInitializer init) { return new IonCannonPower(init.self, this); }
} }
@@ -46,7 +50,7 @@ namespace OpenRA.Mods.Cnc
{ {
var info = Info as IonCannonPowerInfo; var info = Info as IonCannonPowerInfo;
Sound.Play(Info.LaunchSound, order.TargetLocation.CenterPosition); Sound.Play(Info.LaunchSound, order.TargetLocation.CenterPosition);
w.Add(new IonCannon(self, w, order.TargetLocation)); w.Add(new IonCannon(self.Owner, info.Weapon, w, order.TargetLocation, info.Effect, info.EffectPalette));
if (info.CameraActor == null) if (info.CameraActor == null)
return; return;