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

Add interface IPreventsEjectOnDeath.

Browse Source
This commit is contained in:
Taryn Hill
2015-03-23 21:05:22 -05:00
parent bcb75869c7
commit 2bac9f6c64
2 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenRA.Mods.Common/Traits/Demolishable.cs
View File

@@ -17,11 +17,26 @@ namespace OpenRA.Mods.Common.Traits
{
public bool IsValidTarget(ActorInfo actorInfo, Actor saboteur) { return true; }
public object Create(ActorInitializer init) { return new Demolishable(); }
[Desc("If true and this actor has EjectOnDeath, no actor will be spawned.")]
public readonly bool PreventsEjectOnDeath = false;
public object Create(ActorInitializer init) { return new Demolishable(init.Self, this); }
}
public class Demolishable : IDemolishable
public class Demolishable : IDemolishable, IPreventsEjectOnDeath
{
readonly DemolishableInfo info;
public Demolishable(Actor self, DemolishableInfo info)
{
this.info = info;
}
public bool PreventsEjectOnDeath(Actor self)
{
return info.PreventsEjectOnDeath;
}
public void Demolish(Actor self, Actor saboteur)
{
self.Kill(saboteur);

18
OpenRA.Mods.Common/Traits/EjectOnDeath.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Eject a ground soldier or a paratrooper while in the air.")]
public class EjectOnDeathInfo : TraitInfo<EjectOnDeath>
public class EjectOnDeathInfo : ITraitInfo
{
[ActorReference]
public readonly string PilotActor = "E1";
@@ -26,17 +26,31 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Risks stuck units when they don't have the Paratrooper trait.")]
public readonly bool AllowUnsuitableCell = false;
public object Create(ActorInitializer init) { return new EjectOnDeath(init.Self, this); }
}
public interface IPreventsEjectOnDeath { bool PreventsEjectOnDeath(Actor self); }
public class EjectOnDeath : INotifyKilled
{
readonly EjectOnDeathInfo info;
public EjectOnDeath(Actor self, EjectOnDeathInfo info)
{
this.info = info;
}
public void Killed(Actor self, AttackInfo e)
{
if (self.Owner.WinState == WinState.Lost || !self.World.Map.Contains(self.Location))
return;
foreach (var condition in self.TraitsImplementing<IPreventsEjectOnDeath>())
if (condition.PreventsEjectOnDeath(self))
return;
var r = self.World.SharedRandom.Next(1, 100);
var info = self.Info.Traits.Get<EjectOnDeathInfo>();
if (r <= 100 - info.SuccessRate)
return;