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

Fix style issues from a recent PR.

Browse Source
This commit is contained in:
Paul Chote
2014-12-14 10:55:24 +13:00
parent a50ccd1020
commit ebdb260650
5 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.RA/Attack/AttackBase.cs
View File

@@ -145,11 +145,8 @@ namespace OpenRA.Mods.RA
public bool HasAnyValidWeapons(Target t)
{
if (Info.AttackRequiresEnteringCell)
{
if (!positionable.Value.CanEnterCell(t.Actor.Location, null, false))
return false;
}
if (Info.AttackRequiresEnteringCell && !positionable.Value.CanEnterCell(t.Actor.Location, null, false))
return false;
return Armaments.Any(a => a.Weapon.IsValidAgainst(t, self.World, self));
}

13
OpenRA.Mods.RA/Attack/AttackWander.cs
View File

@@ -27,14 +27,15 @@ namespace OpenRA.Mods.RA
class AttackWander : INotifyIdle
{
readonly AttackMove attackMove;
readonly AttackWanderInfo info;
int ticksIdle;
int effectiveMoveRadius;
readonly AttackMove attackMove;
readonly AttackWanderInfo Info;
public AttackWander(Actor self, AttackWanderInfo info)
{
Info = info;
this.info = info;
effectiveMoveRadius = info.WanderMoveRadius;
attackMove = self.TraitOrDefault<AttackMove>();
}
@@ -47,16 +48,16 @@ namespace OpenRA.Mods.RA
if (!self.World.Map.Contains(targetCell))
{
// If MoveRadius is too big there might not be a valid cell to order the attack to (if actor is on a small island and can't leave)
if (++ticksIdle % Info.MoveReductionRadiusScale == 0)
if (++ticksIdle % info.MoveReductionRadiusScale == 0)
effectiveMoveRadius--;
return; // We'll be back the next tick; better to sit idle for a few seconds than prolongue this tick indefinitely with a loop
return; // We'll be back the next tick; better to sit idle for a few seconds than prolong this tick indefinitely with a loop
}
attackMove.ResolveOrder(self, new Order("AttackMove", self, false) { TargetLocation = targetCell });
ticksIdle = 0;
effectiveMoveRadius = Info.WanderMoveRadius;
effectiveMoveRadius = info.WanderMoveRadius;
}
}
}