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

Add Demolition>(Force)TargetStances

Browse Source
This commit is contained in:
Mustafa Alperen Seki
2018-10-13 11:06:29 +03:00
committed by abcdefg30
parent 51ec97fb2c
commit 3224843d70
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
OpenRA.Mods.Common/Traits/Demolition.cs
View File

@@ -40,6 +40,9 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Voice string when planting explosive charges.")] [Desc("Voice string when planting explosive charges.")]
[VoiceReference] public readonly string Voice = "Action"; [VoiceReference] public readonly string Voice = "Action";
public readonly Stance TargetStances = Stance.Enemy | Stance.Neutral;
public readonly Stance ForceTargetStances = Stance.Enemy | Stance.Neutral | Stance.Ally;
public readonly string Cursor = "c4"; public readonly string Cursor = "c4";
public object Create(ActorInitializer init) { return new Demolition(this); } public object Create(ActorInitializer init) { return new Demolition(this); }
@@ -56,7 +59,7 @@ namespace OpenRA.Mods.Common.Traits
public IEnumerable<IOrderTargeter> Orders public IEnumerable<IOrderTargeter> Orders
{ {
get { yield return new DemolitionOrderTargeter(info.Cursor); } get { yield return new DemolitionOrderTargeter(info); }
} }
public Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued) public Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued)
@@ -95,8 +98,13 @@ namespace OpenRA.Mods.Common.Traits
class DemolitionOrderTargeter : UnitOrderTargeter class DemolitionOrderTargeter : UnitOrderTargeter
{ {
public DemolitionOrderTargeter(string cursor) readonly DemolitionInfo info;
: base("C4", 6, cursor, true, false) { }
public DemolitionOrderTargeter(DemolitionInfo info)
: base("C4", 6, info.Cursor, true, true)
{
this.info = info;
}
public override bool CanTargetActor(Actor self, Actor target, TargetModifiers modifiers, ref string cursor) public override bool CanTargetActor(Actor self, Actor target, TargetModifiers modifiers, ref string cursor)
{ {
@@ -104,11 +112,25 @@ namespace OpenRA.Mods.Common.Traits
if (modifiers.HasModifier(TargetModifiers.ForceMove)) if (modifiers.HasModifier(TargetModifiers.ForceMove))
return false; return false;
var stance = self.Owner.Stances[target.Owner];
if (!info.TargetStances.HasStance(stance) && !modifiers.HasModifier(TargetModifiers.ForceAttack))
return false;
if (!info.ForceTargetStances.HasStance(stance) && modifiers.HasModifier(TargetModifiers.ForceAttack))
return false;
return target.TraitsImplementing<IDemolishable>().Any(i => i.IsValidTarget(target, self)); return target.TraitsImplementing<IDemolishable>().Any(i => i.IsValidTarget(target, self));
} }
public override bool CanTargetFrozenActor(Actor self, FrozenActor target, TargetModifiers modifiers, ref string cursor) public override bool CanTargetFrozenActor(Actor self, FrozenActor target, TargetModifiers modifiers, ref string cursor)
{ {
var stance = self.Owner.Stances[target.Owner];
if (!info.TargetStances.HasStance(stance) && !modifiers.HasModifier(TargetModifiers.ForceAttack))
return false;
if (!info.ForceTargetStances.HasStance(stance) && modifiers.HasModifier(TargetModifiers.ForceAttack))
return false;
return target.Info.TraitInfos<IDemolishableInfo>().Any(i => i.IsValidTarget(target.Info, self)); return target.Info.TraitInfos<IDemolishableInfo>().Any(i => i.IsValidTarget(target.Info, self));
} }
} }