Fix ReloadAmmoPool.ResetFire ignoring multipliers

OpenRA · Jan 11, 2020 · bb1d5f1 · bb1d5f1
1 parent 43eabdf
commit bb1d5f1
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/OpenRA.Mods.Common/Traits/ReloadAmmoPool.cs b/OpenRA.Mods.Common/Traits/ReloadAmmoPool.cs
@@ -58,14 +58,18 @@ protected override void Created(Actor self)
 		{
 			ammoPool = self.TraitsImplementing<AmmoPool>().Single(ap => ap.Info.Name == Info.AmmoPool);
 			modifiers = self.TraitsImplementing<IReloadAmmoModifier>().ToArray();
-			remainingTicks = Info.Delay;
 			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)
 		{
 			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) { }