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

more porting

Browse Source
This commit is contained in:
Chris Forbes
2010-01-10 19:25:16 +13:00
parent e131963c53
commit 356b7dae7a
4 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRa.Game/Shroud.cs
View File

@@ -4,6 +4,7 @@ using System.Linq;
using System.Text;
using IjwFramework.Types;
using OpenRa.Game.Graphics;
using OpenRa.Game.Traits;
namespace OpenRa.Game
{

13
OpenRa.Game/Traits/AutoHeal.cs
View File

@@ -17,23 +17,16 @@ namespace OpenRa.Game.Traits
self.CancelActivity();
}
float GetMaximumRange(Actor self)
{
return new[] { self.LegacyInfo.Primary, self.LegacyInfo.Secondary }
.Where(w => w != null)
.Max(w => Rules.WeaponInfo[w].Range);
}
bool NeedsNewTarget(Actor self)
{
var attack = self.traits.WithInterface<AttackBase>().First();
var range = GetMaximumRange(self);
var range = Util.GetMaximumRange(self);
if (attack.target == null)
return true; // he's dead.
if ((attack.target.Location - self.Location).LengthSquared > range * range + 2)
return true; // wandered off faster than we could follow
if (attack.target.Health == attack.target.LegacyInfo.Strength)
if (attack.target.Health == attack.target.Info.Traits.WithInterface<OwnedActorInfo>().First().HP)
return true; // fully healed
return false;
@@ -42,7 +35,7 @@ namespace OpenRa.Game.Traits
public void Tick(Actor self)
{
var attack = self.traits.WithInterface<AttackBase>().First();
var range = GetMaximumRange(self);
var range = Util.GetMaximumRange(self);
if (NeedsNewTarget(self))
AttackTarget(self, ChooseTarget(self, range));

10
OpenRa.Game/Traits/AutoTarget.cs
View File

@@ -13,20 +13,12 @@ namespace OpenRa.Game.Traits
attack.ResolveOrder(self, new Order("Attack", self, target, int2.Zero, null));
}
float GetMaximumRange(Actor self)
{
var info = self.Info.Traits.WithInterface<AttackBaseInfo>().First();
return new[] { info.PrimaryWeapon, info.SecondaryWeapon }
.Where(w => w != null)
.Max(w => Rules.WeaponInfo[w].Range);
}
public void Tick(Actor self)
{
if (!self.IsIdle) return;
var attack = self.traits.WithInterface<AttackBase>().First();
var range = GetMaximumRange(self);
var range = Util.GetMaximumRange(self);
if (attack.target == null ||
(attack.target.Location - self.Location).LengthSquared > range * range + 2)

8
OpenRa.Game/Traits/Util.cs
View File

@@ -142,5 +142,13 @@ namespace OpenRa.Game.Traits
return acts.Reverse().Aggregate(
(next, a) => { a.NextActivity = next; return a; });
}
public static float GetMaximumRange(Actor self)
{
var info = self.Info.Traits.WithInterface<AttackBaseInfo>().First();
return new[] { info.PrimaryWeapon, info.SecondaryWeapon }
.Where(w => w != null)
.Max(w => Rules.WeaponInfo[w].Range);
}
}
}