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

Fix ReloadAmmoPool.ResetFire ignoring multipliers

Browse Source
This commit is contained in:
reaperrr
2019-12-12 19:54:34 +01:00
committed by Paul Chote
parent 43eabdf54a
commit bb1d5f1d5c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/ReloadAmmoPool.cs
View File

@@ -58,14 +58,18 @@ namespace OpenRA.Mods.Common.Traits
{ {
ammoPool = self.TraitsImplementing<AmmoPool>().Single(ap => ap.Info.Name == Info.AmmoPool); ammoPool = self.TraitsImplementing<AmmoPool>().Single(ap => ap.Info.Name == Info.AmmoPool);
modifiers = self.TraitsImplementing<IReloadAmmoModifier>().ToArray(); modifiers = self.TraitsImplementing<IReloadAmmoModifier>().ToArray();
remainingTicks = Info.Delay;
base.Created(self); base.Created(self);
self.World.AddFrameEndTask(w =>
{
remainingTicks = Util.ApplyPercentageModifiers(Info.Delay, modifiers.Select(m => m.GetReloadAmmoModifier()));
});
} }
void INotifyAttack.Attacking(Actor self, Target target, Armament a, Barrel barrel) void INotifyAttack.Attacking(Actor self, Target target, Armament a, Barrel barrel)
{ {
if (Info.ResetOnFire) if (Info.ResetOnFire)
remainingTicks = Info.Delay; remainingTicks = Util.ApplyPercentageModifiers(Info.Delay, modifiers.Select(m => m.GetReloadAmmoModifier()));
} }
void INotifyAttack.PreparingAttack(Actor self, Target target, Armament a, Barrel barrel) { } void INotifyAttack.PreparingAttack(Actor self, Target target, Armament a, Barrel barrel) { }