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

Allow armaments to be enabled/disabled by upgrades.

Browse Source
This commit is contained in:
Paul Chote
2014-09-27 08:17:26 +12:00
parent 8d54efc7af
commit 67e3c74d31
1 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
OpenRA.Mods.RA/Armament.cs
View File

@@ -53,10 +53,16 @@ namespace OpenRA.Mods.RA
[Desc("Use multiple muzzle images if non-zero")] [Desc("Use multiple muzzle images if non-zero")]
public readonly int MuzzleSplitFacings = 0; public readonly int MuzzleSplitFacings = 0;
[Desc("Enable only if this upgrade is enabled.")]
public readonly string RequiresUpgrade = null;
[Desc("Disable if this upgrade is enabled.")]
public readonly string RestrictedByUpgrade = null;
public object Create(ActorInitializer init) { return new Armament(init.self, this); } public object Create(ActorInitializer init) { return new Armament(init.self, this); }
} }
public class Armament : ITick, IExplodeModifier public class Armament : ITick, IExplodeModifier, IUpgradable
{ {
public readonly ArmamentInfo Info; public readonly ArmamentInfo Info;
public readonly WeaponInfo Weapon; public readonly WeaponInfo Weapon;
@@ -72,6 +78,9 @@ namespace OpenRA.Mods.RA
public int FireDelay { get; private set; } public int FireDelay { get; private set; }
public int Burst { get; private set; } public int Burst { get; private set; }
bool requiresUpgrade;
bool restrictedByUpgrade;
public Armament(Actor self, ArmamentInfo info) public Armament(Actor self, ArmamentInfo info)
{ {
this.self = self; this.self = self;
@@ -99,12 +108,32 @@ namespace OpenRA.Mods.RA
barrels.Add(new Barrel { Offset = WVec.Zero, Yaw = WAngle.Zero }); barrels.Add(new Barrel { Offset = WVec.Zero, Yaw = WAngle.Zero });
Barrels = barrels.ToArray(); Barrels = barrels.ToArray();
// Disable if an upgrade is required
requiresUpgrade = info.RequiresUpgrade != null;
}
public bool AcceptsUpgrade(string type)
{
return type == Info.RequiresUpgrade || type == Info.RestrictedByUpgrade;
}
public void UpgradeAvailable(Actor self, string type, bool available)
{
if (type == Info.RequiresUpgrade)
requiresUpgrade = !available;
else if (type == Info.RestrictedByUpgrade)
restrictedByUpgrade = available;
} }
public void Tick(Actor self) public void Tick(Actor self)
{ {
if (requiresUpgrade || restrictedByUpgrade)
return;
if (FireDelay > 0) if (FireDelay > 0)
--FireDelay; --FireDelay;
Recoil = new WRange(Math.Max(0, Recoil.Range - Info.RecoilRecovery.Range)); Recoil = new WRange(Math.Max(0, Recoil.Range - Info.RecoilRecovery.Range));
for (var i = 0; i < delayedActions.Count; i++) for (var i = 0; i < delayedActions.Count; i++)
@@ -130,7 +159,7 @@ namespace OpenRA.Mods.RA
// The world coordinate model uses Actor.Orientation // The world coordinate model uses Actor.Orientation
public Barrel CheckFire(Actor self, IFacing facing, Target target) public Barrel CheckFire(Actor self, IFacing facing, Target target)
{ {
if (FireDelay > 0) if (IsReloading)
return null; return null;
if (limitedAmmo.Value != null && !limitedAmmo.Value.HasAmmo()) if (limitedAmmo.Value != null && !limitedAmmo.Value.HasAmmo())
@@ -197,7 +226,7 @@ namespace OpenRA.Mods.RA
return barrel; return barrel;
} }
public bool IsReloading { get { return FireDelay > 0; } } public bool IsReloading { get { return FireDelay > 0 || requiresUpgrade || restrictedByUpgrade; } }
public bool ShouldExplode(Actor self) { return !IsReloading; } public bool ShouldExplode(Actor self) { return !IsReloading; }
public WVec MuzzleOffset(Actor self, Barrel b) public WVec MuzzleOffset(Actor self, Barrel b)