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

add Target overload for IsInRange

Browse Source
This commit is contained in:
Bob
2010-11-04 00:37:13 +13:00
committed by Chris Forbes
parent ecf41722c3
commit a77b7af5fd
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/Activities/Attack.cs
View File

@@ -45,7 +45,7 @@ namespace OpenRA.Mods.RA.Activities
var mobile = self.Trait<Mobile>(); var mobile = self.Trait<Mobile>();
var targetCell = Util.CellContaining(Target.CenterLocation); var targetCell = Util.CellContaining(Target.CenterLocation);
if (!Combat.IsInRange( self.CenterLocation, Range, Util.CenterOfCell(targetCell))) if (!Combat.IsInRange( self.CenterLocation, Range, Target))
return Util.SequenceActivities( mobile.MoveTo( Target, Range ), this ); return Util.SequenceActivities( mobile.MoveTo( Target, Range ), this );
var desiredFacing = Util.GetFacing((targetCell - self.Location).ToFloat2(), 0); var desiredFacing = Util.GetFacing((targetCell - self.Location).ToFloat2(), 0);

2
OpenRA.Mods.RA/AttackLeap.cs
View File

@@ -32,7 +32,7 @@ namespace OpenRA.Mods.RA
if (IsLeaping) return; if (IsLeaping) return;
var weapon = self.Trait<AttackBase>().Weapons[0].Info; var weapon = self.Trait<AttackBase>().Weapons[0].Info;
if( !Combat.IsInRange( self.CenterLocation, weapon.Range, target.Actor ) ) return; if( !Combat.IsInRange( self.CenterLocation, weapon.Range, target ) ) return;
self.CancelActivity(); self.CancelActivity();
self.QueueActivity(new Leap(self, target)); self.QueueActivity(new Leap(self, target));

9
OpenRA.Mods.RA/Combat.cs
View File

@@ -234,5 +234,14 @@ namespace OpenRA.Mods.RA
var rsq = range * range * Game.CellSize * Game.CellSize; var rsq = range * range * Game.CellSize * Game.CellSize;
return ( attackOrigin - targetLocation ).LengthSquared < rsq; return ( attackOrigin - targetLocation ).LengthSquared < rsq;
} }
public static bool IsInRange( float2 attackOrigin, float range, Target target )
{
if( !target.IsValid ) return false;
if( target.IsActor )
return IsInRange( attackOrigin, range, target.Actor );
else
return IsInRange( attackOrigin, range, target.CenterLocation );
}
} }
} }

7
OpenRA.Mods.RA/Weapon.cs
View File

@@ -102,13 +102,10 @@ namespace OpenRA.Mods.RA
if (limitedAmmo != null && !limitedAmmo.HasAmmo()) if (limitedAmmo != null && !limitedAmmo.HasAmmo())
return; return;
if( target.IsActor && !Combat.IsInRange( self.CenterLocation, Info.Range, target.Actor ) ) if( !Combat.IsInRange( self.CenterLocation, Info.Range, target ) )
return; return;
else if( !target.IsActor && !Combat.IsInRange( self.CenterLocation, Info.Range, target.CenterLocation ) ) if( Combat.IsInRange( self.CenterLocation, Info.MinRange, target ) )
return; return;
if (Info.MinRange * Info.MinRange * Game.CellSize * Game.CellSize >
(target.CenterLocation - self.CenterLocation).LengthSquared) return;
if (!IsValidAgainst(self.World, target)) return; if (!IsValidAgainst(self.World, target)) return;