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

introduce a Barrel object, unhacking the local offsets.

Browse Source
This commit is contained in:
Chris Forbes
2010-07-31 15:27:36 +12:00
parent 42683f5966
commit 693c8d96b1
1 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,8 @@ namespace OpenRA.Mods.RA
public virtual object Create(ActorInitializer init) { return new AttackBase(init.self); } public virtual object Create(ActorInitializer init) { return new AttackBase(init.self); }
} }
public class Barrel { public int2 Position; public int Facing; /* relative to turret */ }
public class Weapon public class Weapon
{ {
public WeaponInfo Info; public WeaponInfo Info;
@@ -44,14 +46,27 @@ namespace OpenRA.Mods.RA
public float Recoil = 0.0f; // remaining recoil fraction public float Recoil = 0.0f; // remaining recoil fraction
public int[] Offset; public int[] Offset;
public int[] LocalOffset; public Barrel[] Barrels;
public Weapon(WeaponInfo info, int[] offset, int[] localOffset) public Weapon(WeaponInfo info, int[] offset, int[] localOffset)
{ {
Info = info; Info = info;
Burst = info.Burst; Burst = info.Burst;
Offset = offset; Offset = offset;
LocalOffset = localOffset;
var barrels = new List<Barrel>();
for (var i = 0; i < localOffset.Length / 3; i++)
barrels.Add(new Barrel
{
Position = new int2(localOffset[3 * i], localOffset[3 * i + 1]),
Facing = localOffset[3 * i + 2]
});
// if no barrels specified, the default is "turret position; turret facing".
if (barrels.Count == 0)
barrels.Add(new Barrel { Position = int2.Zero, Facing = 0 });
Barrels = barrels.ToArray();
} }
public bool IsReloading { get { return FireDelay > 0; } } public bool IsReloading { get { return FireDelay > 0; } }
@@ -128,11 +143,11 @@ namespace OpenRA.Mods.RA
var info = self.Info.Traits.Get<AttackBaseInfo>(); var info = self.Info.Traits.Get<AttackBaseInfo>();
foreach (var w in Weapons) foreach (var w in Weapons)
if (CheckFire(self, unit, w.Info, ref w.FireDelay, w.Offset, ref w.Burst, w.LocalOffset)) if (CheckFire(self, unit, w, w.Info, ref w.FireDelay, w.Offset, ref w.Burst))
w.Recoil = 1; w.Recoil = 1;
} }
bool CheckFire(Actor self, Unit unit, WeaponInfo weapon, ref int fireDelay, int[] offset, ref int burst, int[] localOffset) bool CheckFire(Actor self, Unit unit, Weapon w, WeaponInfo weapon, ref int fireDelay, int[] offset, ref int burst)
{ {
if (fireDelay > 0) return false; if (fireDelay > 0) return false;
@@ -145,14 +160,11 @@ namespace OpenRA.Mods.RA
if (!Combat.WeaponValidForTarget(weapon, target)) return false; if (!Combat.WeaponValidForTarget(weapon, target)) return false;
var numOffsets = (localOffset.Length + 2) / 3; var barrel = w.Barrels[burst % w.Barrels.Length];
if (numOffsets == 0) numOffsets = 1;
var localOffsetForShot = burst % numOffsets;
var thisLocalOffset = localOffset.Skip(3 * localOffsetForShot).Take(3).ToArray();
var fireOffset = new[] { var fireOffset = new[] {
offset.ElementAtOrDefault(0) + thisLocalOffset.ElementAtOrDefault(0), offset.ElementAtOrDefault(0) + barrel.Position.X,
offset.ElementAtOrDefault(1) + thisLocalOffset.ElementAtOrDefault(1), offset.ElementAtOrDefault(1) + barrel.Position.Y,
offset.ElementAtOrDefault(2), offset.ElementAtOrDefault(2),
offset.ElementAtOrDefault(3) }; offset.ElementAtOrDefault(3) };
@@ -178,7 +190,7 @@ namespace OpenRA.Mods.RA
dest = target.CenterLocation.ToInt2(), dest = target.CenterLocation.ToInt2(),
destAltitude = destUnit != null ? destUnit.Altitude : 0, destAltitude = destUnit != null ? destUnit.Altitude : 0,
facing = thisLocalOffset.ElementAtOrDefault(2) + facing = barrel.Facing +
(self.traits.Contains<Turreted>() ? self.traits.Get<Turreted>().turretFacing : (self.traits.Contains<Turreted>() ? self.traits.Get<Turreted>().turretFacing :
unit != null ? unit.Facing : Util.GetFacing(target.CenterLocation - self.CenterLocation, 0)), unit != null ? unit.Facing : Util.GetFacing(target.CenterLocation - self.CenterLocation, 0)),
}; };