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

Fix Chronoshift / Demotruck interaction

Browse Source
This commit is contained in:
Paul Chote
2010-01-24 17:34:09 +13:00
parent c4ffd49add
commit 86df2cd0d5
3 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenRa.Game/Traits/ChronoshiftPower.cs
View File

@@ -48,20 +48,24 @@ namespace OpenRa.Traits
var chronosphere = self.World.Actors.Where(a => a.Owner == self.Owner var chronosphere = self.World.Actors.Where(a => a.Owner == self.Owner
&& a.traits.Contains<Chronosphere>()).FirstOrDefault(); && a.traits.Contains<Chronosphere>()).FirstOrDefault();
if (chronosphere != null)
chronosphere.traits.Get<RenderBuilding>().PlayCustomAnim( chronosphere, "active" ); bool success = order.TargetActor.traits.Get<Chronoshiftable>().Activate(order.TargetActor,
order.TargetLocation,
(int)((Info as ChronoshiftPowerInfo).Duration * 25 * 60),
(Info as ChronoshiftPowerInfo).KillCargo,
chronosphere);
if (success)
{
Sound.Play("chrono2.aud");
// Trigger screen desaturate effect // Trigger screen desaturate effect
foreach (var a in self.World.Actors.Where(a => a.traits.Contains<ChronoshiftPaletteEffect>())) foreach (var a in self.World.Actors.Where(a => a.traits.Contains<ChronoshiftPaletteEffect>()))
a.traits.Get<ChronoshiftPaletteEffect>().DoChronoshift(); a.traits.Get<ChronoshiftPaletteEffect>().DoChronoshift();
Sound.Play("chrono2.aud"); if (chronosphere != null)
chronosphere.traits.Get<RenderBuilding>().PlayCustomAnim(chronosphere, "active");
order.TargetActor.traits.Get<Chronoshiftable>().Activate(order.TargetActor, }
order.TargetLocation,
(int)((Info as ChronoshiftPowerInfo).Duration * 25 * 60),
(Info as ChronoshiftPowerInfo).KillCargo,
chronosphere);
Game.controller.CancelInputMode(); Game.controller.CancelInputMode();
FinishActivate(); FinishActivate();

4
OpenRa.Game/Traits/Chronoshiftable.cs
View File

@@ -37,7 +37,7 @@ namespace OpenRa.Traits
} }
} }
public virtual void Activate(Actor self, int2 targetLocation, int duration, bool killCargo, Actor chronosphere) public virtual bool Activate(Actor self, int2 targetLocation, int duration, bool killCargo, Actor chronosphere)
{ {
/// Set up return-to-sender info /// Set up return-to-sender info
chronoshiftOrigin = self.Location; chronoshiftOrigin = self.Location;
@@ -57,6 +57,8 @@ namespace OpenRa.Traits
// Set up the teleport // Set up the teleport
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(new Activities.Teleport(targetLocation)); self.QueueActivity(new Activities.Teleport(targetLocation));
return true;
} }
} }
} }

23
OpenRa.Mods.Aftermath/DemoTruck.cs
View File

@@ -17,9 +17,10 @@ namespace OpenRa.Mods.Aftermath
public DemoTruck(Actor self) : base(self) { } public DemoTruck(Actor self) : base(self) { }
// Explode on chronoshift // Explode on chronoshift
public override void Activate(Actor self, int2 targetLocation, int duration, bool killCargo, Actor chronosphere) public override bool Activate(Actor self, int2 targetLocation, int duration, bool killCargo, Actor chronosphere)
{ {
Detonate(self, chronosphere); Detonate(self, chronosphere);
return false;
} }
// Fire primary on death // Fire primary on death
@@ -31,14 +32,26 @@ namespace OpenRa.Mods.Aftermath
public void Detonate(Actor self, Actor detonatedBy) public void Detonate(Actor self, Actor detonatedBy)
{ {
self.InflictDamage(detonatedBy, self.Health, Rules.WarheadInfo["Super"]);
var unit = self.traits.GetOrDefault<Unit>(); var unit = self.traits.GetOrDefault<Unit>();
var info = self.Info.Traits.Get<AttackBaseInfo>();
var altitude = unit != null ? unit.Altitude : 0; var altitude = unit != null ? unit.Altitude : 0;
int2 detonateLocation = self.CenterLocation.ToInt2(); int2 detonateLocation = self.CenterLocation.ToInt2();
self.World.AddFrameEndTask( self.World.AddFrameEndTask( w =>
w => w.Add(new Bullet(self.Info.Traits.Get<AttackBaseInfo>().PrimaryWeapon, detonatedBy.Owner, detonatedBy, {
detonateLocation, detonateLocation, altitude, altitude))); // Fire weapon
w.Add(new Bullet(info.PrimaryWeapon, detonatedBy.Owner, detonatedBy,
detonateLocation, detonateLocation, altitude, altitude));
var weapon = Rules.WeaponInfo[info.PrimaryWeapon];
if (!string.IsNullOrEmpty(weapon.Report))
Sound.Play(weapon.Report + ".aud");
// Remove from world
self.Health = 0;
detonatedBy.Owner.Kills++;
w.Remove(self);
} );
} }
} }
} }