From 3174deed996ab29ae7db3b762c53795bce64d8c1 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Fri, 9 Aug 2019 16:27:03 +0300 Subject: [PATCH] Change range factor for turret ammo sorting from optimal + falloff/2 to optimal + falloff --- eos/capSim.py | 2 +- gui/builtinContextMenus/moduleAmmoChange.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eos/capSim.py b/eos/capSim.py index 966a8ca09..dd8bae908 100644 --- a/eos/capSim.py +++ b/eos/capSim.py @@ -181,7 +181,7 @@ class CapSimulator: # If injecting cap will "overshoot" max cap, postpone it if isInjector and cap - capNeed > capCapacity: awaitingInjectors.append((duration, capNeed, shot, clipSize, reloadTime, isInjector)) - + else: # If we will need more cap than we have, but we are not at 100% - # use awaiting cap injectors to top us up until we have enough or diff --git a/gui/builtinContextMenus/moduleAmmoChange.py b/gui/builtinContextMenus/moduleAmmoChange.py index a6eff6219..1918ad58d 100644 --- a/gui/builtinContextMenus/moduleAmmoChange.py +++ b/gui/builtinContextMenus/moduleAmmoChange.py @@ -67,8 +67,8 @@ class ChangeModuleAmmo(ContextMenuCombined): if d > 0: damage += d - # Take optimal and half falloff as range factor - rangeFactor = range_ + falloff / 2 + # Take optimal and falloff as range factor + rangeFactor = range_ + falloff return - rangeFactor, charge.name.rsplit()[-2:], damage, charge.name