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

Don't allow movement for actors without IMove

Browse Source 
However, this does not check if any existing IMove traits are enabled.
This commit is contained in:
abcdefg30
2019-09-26 21:59:54 +02:00
committed by reaperrr
parent 980c0c9cd4
commit a586f10875
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.Common/Traits/AutoTarget.cs
View File

@@ -127,6 +127,9 @@ namespace OpenRA.Mods.Common.Traits
public class AutoTarget : ConditionalTrait<AutoTargetInfo>, INotifyIdle, INotifyDamage, ITick, IResolveOrder, ISync, INotifyOwnerChanged public class AutoTarget : ConditionalTrait<AutoTargetInfo>, INotifyIdle, INotifyDamage, ITick, IResolveOrder, ISync, INotifyOwnerChanged
{ {
public readonly IEnumerable<AttackBase> ActiveAttackBases; public readonly IEnumerable<AttackBase> ActiveAttackBases;
readonly bool allowMovement;
[Sync] [Sync]
int nextScanTime = 0; int nextScanTime = 0;
@@ -187,6 +190,8 @@ namespace OpenRA.Mods.Common.Traits
stance = self.Owner.IsBot || !self.Owner.Playable ? info.InitialStanceAI : info.InitialStance; stance = self.Owner.IsBot || !self.Owner.Playable ? info.InitialStanceAI : info.InitialStance;
PredictedStance = stance; PredictedStance = stance;
allowMovement = Info.AllowMovement && self.TraitOrDefault<IMove>() != null;
} }
protected override void Created(Actor self) protected override void Created(Actor self)
@@ -244,7 +249,7 @@ namespace OpenRA.Mods.Common.Traits
} }
// Don't fire at an invisible enemy when we can't move to reveal it // Don't fire at an invisible enemy when we can't move to reveal it
var allowMove = Info.AllowMovement && Stance > UnitStance.Defend; var allowMove = allowMovement && Stance > UnitStance.Defend;
if (!allowMove && !attacker.CanBeViewedByPlayer(self.Owner)) if (!allowMove && !attacker.CanBeViewedByPlayer(self.Owner))
return; return;
@@ -267,7 +272,7 @@ namespace OpenRA.Mods.Common.Traits
if (IsTraitDisabled || Stance < UnitStance.Defend) if (IsTraitDisabled || Stance < UnitStance.Defend)
return; return;
var allowMove = Info.AllowMovement && Stance > UnitStance.Defend; var allowMove = allowMovement && Stance > UnitStance.Defend;
var allowTurn = Info.AllowTurning && Stance > UnitStance.HoldFire; var allowTurn = Info.AllowTurning && Stance > UnitStance.HoldFire;
ScanAndAttack(self, allowMove, allowTurn); ScanAndAttack(self, allowMove, allowTurn);
} }