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

Fix Armament not working properly with value 0 in BurstDelays

Browse Source
This commit is contained in:
Gustas
2023-02-17 20:49:25 +02:00
committed by Matthias Mailänder
parent b7e0ed9b87
commit 4dec79a5fb
6 changed files with 24 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -255,7 +255,7 @@ namespace OpenRA.Mods.Common.Activities
{
if (!attack.IsTraitPaused)
foreach (var a in armaments)
a.CheckFire(self, facing, target);
a.CheckFire(self, facing, target, false);
}
void IActivityNotifyStanceChanged.StanceChanged(Actor self, AutoTarget autoTarget, UnitStance oldStance, UnitStance newStance)

2
OpenRA.Mods.Common/Traits/Air/AttackBomber.cs
View File

@@ -65,7 +65,7 @@ namespace OpenRA.Mods.Common.Traits
continue;
inAttackRange = true;
a.CheckFire(self, facing, target);
a.CheckFire(self, facing, target, false);
}
// Actors without armaments may want to trigger an action when it passes the target

29
OpenRA.Mods.Common/Traits/Armament.cs
View File

@@ -101,6 +101,9 @@ namespace OpenRA.Mods.Common.Traits
if (WeaponInfo.Burst > 1 && WeaponInfo.BurstDelays.Length > 1 && (WeaponInfo.BurstDelays.Length != WeaponInfo.Burst - 1))
throw new YamlException($"Weapon '{weaponToLower}' has an invalid number of BurstDelays, must be single entry or Burst - 1.");
if (WeaponInfo.ReloadDelay <= 0)
throw new YamlException($"Weapon '{weaponToLower}' ReloadDelay value must not be equal to or lower than 0");
base.RulesetLoaded(rules, ai);
}
}
@@ -251,26 +254,32 @@ namespace OpenRA.Mods.Common.Traits
// Note: facing is only used by the legacy positioning code
// The world coordinate model uses Actor.Orientation
public virtual Barrel CheckFire(Actor self, IFacing facing, in Target target)
public virtual bool CheckFire(Actor self, IFacing facing, in Target target, bool notifyAttacking)
{
if (!CanFire(self, target))
return null;
return false;
if (ticksSinceLastShot >= Weapon.ReloadDelay)
Burst = Weapon.Burst;
ticksSinceLastShot = 0;
do
{
// If Weapon.Burst == 1, cycle through all LocalOffsets, otherwise use the offset corresponding to current Burst
currentBarrel %= barrelCount;
var barrel = Weapon.Burst == 1 ? Barrels[currentBarrel] : Barrels[Burst % Barrels.Length];
currentBarrel++;
// If Weapon.Burst == 1, cycle through all LocalOffsets, otherwise use the offset corresponding to current Burst
currentBarrel %= barrelCount;
var barrel = Weapon.Burst == 1 ? Barrels[currentBarrel] : Barrels[Burst % Barrels.Length];
currentBarrel++;
FireBarrel(self, facing, target, barrel);
UpdateBurst(self, target);
FireBarrel(self, facing, target, barrel);
if (notifyAttacking)
foreach (var notify in notifyAttacks)
notify.Attacking(self, target, this, barrel);
}
while (FireDelay == 0 && CanFire(self, target));
UpdateBurst(self, target);
return barrel;
return true;
}
protected virtual void FireBarrel(Actor self, IFacing facing, in Target target, Barrel barrel)

2
OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
View File

@@ -166,7 +166,7 @@ namespace OpenRA.Mods.Common.Traits
return;
foreach (var a in Armaments)
a.CheckFire(self, facing, target);
a.CheckFire(self, facing, target, false);
}
IEnumerable<IOrderTargeter> IIssueOrder.Orders

13
OpenRA.Mods.Common/Traits/Attack/AttackGarrisoned.cs
View File

@@ -78,7 +78,6 @@ namespace OpenRA.Mods.Common.Traits
public class AttackGarrisoned : AttackFollow, INotifyPassengerEntered, INotifyPassengerExited, IRender
{
public new readonly AttackGarrisonedInfo Info;
INotifyAttack[] notifyAttacks;
readonly Lazy<BodyOrientation> coords;
readonly List<Armament> armaments;
readonly List<AnimationWithOffset> muzzles;
@@ -98,12 +97,6 @@ namespace OpenRA.Mods.Common.Traits
paxRender = new Dictionary<Actor, RenderSprites>();
}
protected override void Created(Actor self)
{
notifyAttacks = self.TraitsImplementing<INotifyAttack>().ToArray();
base.Created(self);
}
protected override Func<IEnumerable<Armament>> InitializeGetArmaments(Actor self)
{
return () => armaments;
@@ -171,8 +164,7 @@ namespace OpenRA.Mods.Common.Traits
paxFacing[a.Actor].Facing = targetYaw;
paxPos[a.Actor].SetCenterPosition(a.Actor, pos + PortOffset(self, port));
var barrel = a.CheckFire(a.Actor, facing, target);
if (barrel == null)
if (!a.CheckFire(a.Actor, facing, target, true))
continue;
if (a.Info.MuzzleSequence != null)
@@ -188,9 +180,6 @@ namespace OpenRA.Mods.Common.Traits
muzzles.Add(muzzleFlash);
muzzleAnim.PlayThen(sequence, () => muzzles.Remove(muzzleFlash));
}
foreach (var npa in notifyAttacks)
npa.Attacking(self, target, a, barrel);
}
}