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

more... Combat.GetSecondaryWeapon() dies, etc

Browse Source
This commit is contained in:
Chris Forbes
2010-07-31 18:04:02 +12:00
parent 449cc4a42d
commit 9fcc739cd5
3 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.RA/AttackBase.cs
View File

@@ -97,7 +97,7 @@ namespace OpenRA.Mods.RA
Weapons.Add(new Weapon(info.PrimaryWeapon, Weapons.Add(new Weapon(info.PrimaryWeapon,
info.PrimaryOffset, info.PrimaryLocalOffset)); info.PrimaryOffset, info.PrimaryLocalOffset));
if (self.GetSecondaryWeapon() != null) if (info.SecondaryWeapon != null)
Weapons.Add(new Weapon(info.SecondaryWeapon, Weapons.Add(new Weapon(info.SecondaryWeapon,
info.SecondaryOffset ?? info.PrimaryOffset, info.SecondaryLocalOffset)); info.SecondaryOffset ?? info.PrimaryOffset, info.SecondaryLocalOffset));
} }
@@ -302,12 +302,12 @@ namespace OpenRA.Mods.RA
protected virtual void QueueAttack(Actor self, Order order) protected virtual void QueueAttack(Actor self, Order order)
{ {
/* todo: choose the appropriate weapon, when only one works against this target */ var weapon = ChooseWeaponForTarget(Target.FromOrder(order));
var weapon = self.GetPrimaryWeapon() ?? self.GetSecondaryWeapon();
self.QueueActivity( self.QueueActivity(
new Activities.Attack( new Activities.Attack(
Target.FromOrder(order), Target.FromOrder(order),
Math.Max(0, (int)weapon.Range))); Math.Max(0, (int)weapon.Info.Range)));
} }
/* temp hack */ /* temp hack */
@@ -316,5 +316,7 @@ namespace OpenRA.Mods.RA
public bool HasAnyValidWeapons(Target t) { return Weapons.Any(w => w.IsValidAgainst(t)); } public bool HasAnyValidWeapons(Target t) { return Weapons.Any(w => w.IsValidAgainst(t)); }
public float GetMaximumRange() { return Weapons.Max(w => w.Info.Range); } public float GetMaximumRange() { return Weapons.Max(w => w.Info.Range); }
public Weapon ChooseWeaponForTarget(Target t) { return Weapons.First(w => w.IsValidAgainst(t)); }
} }
} }

4
OpenRA.Mods.RA/AttackTurreted.cs
View File

@@ -50,13 +50,13 @@ namespace OpenRA.Mods.RA
const int RangeTolerance = 1; /* how far inside our maximum range we should try to sit */ const int RangeTolerance = 1; /* how far inside our maximum range we should try to sit */
/* todo: choose the appropriate weapon, when only one works against this target */ /* todo: choose the appropriate weapon, when only one works against this target */
var weapon = order.Subject.GetPrimaryWeapon() ?? order.Subject.GetSecondaryWeapon(); var weapon = ChooseWeaponForTarget(Target.FromOrder(order));
target = Target.FromOrder(order); target = Target.FromOrder(order);
if (self.traits.Contains<Mobile>()) if (self.traits.Contains<Mobile>())
self.QueueActivity( new Follow( target, self.QueueActivity( new Follow( target,
Math.Max( 0, (int)weapon.Range - RangeTolerance ) ) ); Math.Max( 0, (int)weapon.Info.Range - RangeTolerance ) ) );
} }
bool buildComplete = false; bool buildComplete = false;

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

@@ -187,17 +187,6 @@ namespace OpenRA.Mods.RA
return Rules.Weapons[weapon.ToLowerInvariant()]; return Rules.Weapons[weapon.ToLowerInvariant()];
} }
public static WeaponInfo GetSecondaryWeapon(this Actor self)
{
var info = self.Info.Traits.GetOrDefault<AttackBaseInfo>();
if (info == null) return null;
var weapon = info.SecondaryWeapon;
if (weapon == null) return null;
return Rules.Weapons[weapon.ToLowerInvariant()];
}
static float2 GetRecoil(Actor self, float recoil) static float2 GetRecoil(Actor self, float recoil)
{ {
var abInfo = self.Info.Traits.GetOrDefault<AttackBaseInfo>(); var abInfo = self.Info.Traits.GetOrDefault<AttackBaseInfo>();