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

Simplify type filtering in GivesCashOnCapture/TransformOnCapture.

Browse Source
This commit is contained in:
Paul Chote
2018-10-26 20:35:06 +01:00
committed by abcdefg30
parent 7e67ce0139
commit 346e670563
2 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly int Amount = 0; public readonly int Amount = 0;
[Desc("Award cash only if the capturer's CaptureTypes overlap with these types. Leave empty to allow all types.")] [Desc("Award cash only if the capturer's CaptureTypes overlap with these types. Leave empty to allow all types.")]
public readonly HashSet<string> CaptureTypes = new HashSet<string>(); public readonly BitSet<CaptureType> CaptureTypes = default(BitSet<CaptureType>);
public override object Create(ActorInitializer init) { return new GivesCashOnCapture(this); } public override object Create(ActorInitializer init) { return new GivesCashOnCapture(this); }
} }
@@ -46,27 +46,19 @@ namespace OpenRA.Mods.Common.Traits
void INotifyCapture.OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner, BitSet<CaptureType> captureTypes) void INotifyCapture.OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner, BitSet<CaptureType> captureTypes)
{ {
if (IsTraitDisabled || !IsValidCaptor(captor)) if (IsTraitDisabled)
return;
if (!info.CaptureTypes.IsEmpty && !info.CaptureTypes.Overlaps(captureTypes))
return; return;
var resources = newOwner.PlayerActor.Trait<PlayerResources>(); var resources = newOwner.PlayerActor.Trait<PlayerResources>();
var amount = resources.ChangeCash(info.Amount); var amount = resources.ChangeCash(info.Amount);
if (!info.ShowTicks && amount != 0) if (!info.ShowTicks && amount != 0)
return; return;
self.World.AddFrameEndTask(w => w.Add( self.World.AddFrameEndTask(w => w.Add(
new FloatingText(self.CenterPosition, self.Owner.Color.RGB, FloatingText.FormatCashTick(amount), info.DisplayDuration))); new FloatingText(self.CenterPosition, self.Owner.Color.RGB, FloatingText.FormatCashTick(amount), info.DisplayDuration)));
} }
bool IsValidCaptor(Actor captor)
{
if (!info.CaptureTypes.Any())
return true;
var capturesInfo = captor.Info.TraitInfoOrDefault<CapturesInfo>();
return capturesInfo != null && info.CaptureTypes.Overlaps(capturesInfo.CaptureTypes);
}
} }
} }

13
OpenRA.Mods.Common/Traits/TransformOnCapture.cs
View File

@@ -25,7 +25,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly bool SkipMakeAnims = true; public readonly bool SkipMakeAnims = true;
[Desc("Transform only if the capturer's CaptureTypes overlap with these types. Leave empty to allow all types.")] [Desc("Transform only if the capturer's CaptureTypes overlap with these types. Leave empty to allow all types.")]
public readonly HashSet<string> CaptureTypes = new HashSet<string>(); public readonly BitSet<CaptureType> CaptureTypes = default(BitSet<CaptureType>);
public virtual object Create(ActorInitializer init) { return new TransformOnCapture(init, this); } public virtual object Create(ActorInitializer init) { return new TransformOnCapture(init, this); }
} }
@@ -43,7 +43,7 @@ namespace OpenRA.Mods.Common.Traits
void INotifyCapture.OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner, BitSet<CaptureType> captureTypes) void INotifyCapture.OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner, BitSet<CaptureType> captureTypes)
{ {
if (!IsValidCaptor(captor)) if (!info.CaptureTypes.IsEmpty && !info.CaptureTypes.Overlaps(captureTypes))
return; return;
var facing = self.TraitOrDefault<IFacing>(); var facing = self.TraitOrDefault<IFacing>();
@@ -53,14 +53,5 @@ namespace OpenRA.Mods.Common.Traits
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(transform); self.QueueActivity(transform);
} }
bool IsValidCaptor(Actor captor)
{
if (!info.CaptureTypes.Any())
return true;
var capturesInfo = captor.Info.TraitInfoOrDefault<CapturesInfo>();
return capturesInfo != null && info.CaptureTypes.Overlaps(capturesInfo.CaptureTypes);
}
} }
} }