diff --git a/eos/const.py b/eos/const.py index 12998c0fc..4dbcb357d 100644 --- a/eos/const.py +++ b/eos/const.py @@ -90,9 +90,12 @@ class FittingHardpoint(IntEnum): @unique class SpoolType(IntEnum): - SCALE = 0 # [0..1] - TIME = 1 # Expressed via time in seconds since spool up started - CYCLES = 2 # Expressed in amount of cycles since spool up started + # Spool and cycle scale are different in case if max spool amount cannot + # be divided by spool step without remainder + SPOOL_SCALE = 0 # [0..1] + CYCLE_SCALE = 1 # [0..1] + TIME = 2 # Expressed via time in seconds since spool up started + CYCLES = 3 # Expressed in amount of cycles since spool up started @unique diff --git a/eos/effects.py b/eos/effects.py index 6eefb9ed3..89392ed01 100644 --- a/eos/effects.py +++ b/eos/effects.py @@ -5851,6 +5851,7 @@ class Effect2008(BaseEffect): cynosuralDurationBonus Used by: + Ships from group: Black Ops (5 of 5) Ships from group: Force Recon Ship (8 of 9) """ @@ -5858,7 +5859,7 @@ class Effect2008(BaseEffect): @staticmethod def handler(fit, ship, context, **kwargs): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Cynosural Field Generator', + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Cynosural Field Theory'), 'duration', ship.getModifiedItemAttr('durationBonus'), **kwargs) @@ -35297,10 +35298,10 @@ class Effect7166(BaseEffect): repSpoolMax = container.getModifiedItemAttr('repairMultiplierBonusMax') repSpoolPerCycle = container.getModifiedItemAttr('repairMultiplierBonusPerCycle') defaultSpoolValue = eos.config.settings['globalDefaultSpoolupPercentage'] - spoolType, spoolAmount = resolveSpoolOptions(SpoolOptions(SpoolType.SCALE, defaultSpoolValue, False), container) + spoolType, spoolAmount = resolveSpoolOptions(SpoolOptions(SpoolType.SPOOL_SCALE, defaultSpoolValue, False), container) rps = repAmountBase * (1 + calculateSpoolup(repSpoolMax, repSpoolPerCycle, cycleTime, spoolType, spoolAmount)[0]) / cycleTime - rpsPreSpool = repAmountBase * (1 + calculateSpoolup(repSpoolMax, repSpoolPerCycle, cycleTime, SpoolType.SCALE, 0)[0]) / cycleTime - rpsFullSpool = repAmountBase * (1 + calculateSpoolup(repSpoolMax, repSpoolPerCycle, cycleTime, SpoolType.SCALE, 1)[0]) / cycleTime + rpsPreSpool = repAmountBase * (1 + calculateSpoolup(repSpoolMax, repSpoolPerCycle, cycleTime, SpoolType.SPOOL_SCALE, 0)[0]) / cycleTime + rpsFullSpool = repAmountBase * (1 + calculateSpoolup(repSpoolMax, repSpoolPerCycle, cycleTime, SpoolType.SPOOL_SCALE, 1)[0]) / cycleTime fit.extraAttributes.increase('armorRepair', rps, **kwargs) fit.extraAttributes.increase('armorRepairPreSpool', rpsPreSpool, **kwargs) fit.extraAttributes.increase('armorRepairFullSpool', rpsFullSpool, **kwargs) @@ -35806,3 +35807,58 @@ class Effect7231(BaseEffect): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill('Repair Systems'), 'armorDamageAmount', ship.getModifiedItemAttr('shipBonusGC3'), skill='Gallente Cruiser', **kwargs) + + +class Effect7232(BaseEffect): + """ + modifyDamageMultiplierBonusMax + + Used by: + Implants named like: Low Grade Kostenadza (5 of 6) + """ + + type = 'passive' + + @staticmethod + def handler(fit, implant, context, **kwargs): + fit.modules.filteredItemBoost( + lambda mod: mod.item.group.name == 'Precursor Weapon', 'damageMultiplierBonusMax', + implant.getModifiedItemAttr('damageMultiplierBonusMaxModifier'), **kwargs) + + +class Effect7233(BaseEffect): + """ + modifyDamageMultiplierBonusPerCycle + + Used by: + Implants named like: Low Grade Kostenadza (5 of 6) + """ + + type = 'passive' + + @staticmethod + def handler(fit, implant, context, **kwargs): + fit.modules.filteredItemBoost( + lambda mod: mod.item.group.name == 'Precursor Weapon', 'damageMultiplierBonusPerCycle', + implant.getModifiedItemAttr('damageMultiplierBonusPerCycleModifier'), **kwargs) + + +class Effect7234(BaseEffect): + """ + implantSetKostenadza + + Used by: + Implants named like: Low Grade Kostenadza (6 of 6) + """ + + runTime = 'early' + type = 'passive' + + @staticmethod + def handler(fit, implant, context, **kwargs): + fit.appliedImplants.filteredItemMultiply( + lambda imp: imp.item.group.name == 'Cyberimplant', 'damageMultiplierBonusMaxModifier', + implant.getModifiedItemAttr('setBonusKostenadza'), **kwargs) + fit.appliedImplants.filteredItemMultiply( + lambda imp: imp.item.group.name == 'Cyberimplant', 'damageMultiplierBonusPerCycleModifier', + implant.getModifiedItemAttr('setBonusKostenadza'), **kwargs) diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py index 7caafb96d..b539261cb 100644 --- a/eos/saveddata/module.py +++ b/eos/saveddata/module.py @@ -339,7 +339,12 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut): duringAcceleration = maxVelocity / 2 * accelTime # Distance done after being at full speed fullSpeed = maxVelocity * (flightTime - accelTime) - return duringAcceleration + fullSpeed + maxRange = duringAcceleration + fullSpeed + if 'fofMissileLaunching' in self.charge.effects: + rangeLimit = self.getModifiedChargeAttr("maxFOFTargetRange") + if rangeLimit: + maxRange = min(maxRange, rangeLimit) + return maxRange @property def falloff(self): diff --git a/eos/utils/spoolSupport.py b/eos/utils/spoolSupport.py index 2014654d4..aa280c5c7 100644 --- a/eos/utils/spoolSupport.py +++ b/eos/utils/spoolSupport.py @@ -18,6 +18,7 @@ # =============================================================================== +import math from collections import namedtuple from eos.const import SpoolType @@ -36,15 +37,33 @@ def calculateSpoolup(modMaxValue, modStepValue, modCycleTime, spoolType, spoolAm """ if not modMaxValue or not modStepValue: return 0, 0, 0 - if spoolType == SpoolType.SCALE: - cycles = int(floatUnerr(spoolAmount * modMaxValue / modStepValue)) - return cycles * modStepValue, cycles, cycles * modCycleTime + if spoolType == SpoolType.SPOOL_SCALE: + # Find out at which point of spoolup scale we're on, find out how many cycles + # is enough to reach it and recalculate spoolup value for that amount of cycles + cycles = math.ceil(floatUnerr(modMaxValue * spoolAmount / modStepValue)) + spoolValue = min(modMaxValue, cycles * modStepValue) + return spoolValue, cycles, cycles * modCycleTime + elif spoolType == SpoolType.CYCLE_SCALE: + # For cycle scale, find out max amount of cycles and scale against it + cycles = round(spoolAmount * math.ceil(floatUnerr(modMaxValue / modStepValue))) + spoolValue = min(modMaxValue, cycles * modStepValue) + return spoolValue, cycles, cycles * modCycleTime elif spoolType == SpoolType.TIME: - cycles = min(int(floatUnerr(spoolAmount / modCycleTime)), int(floatUnerr(modMaxValue / modStepValue))) - return cycles * modStepValue, cycles, cycles * modCycleTime + cycles = min( + # How many full cycles mod had by passed time + math.floor(floatUnerr(spoolAmount / modCycleTime)), + # Max amount of cycles + math.ceil(floatUnerr(modMaxValue / modStepValue))) + spoolValue = min(modMaxValue, cycles * modStepValue) + return spoolValue, cycles, cycles * modCycleTime elif spoolType == SpoolType.CYCLES: - cycles = min(int(spoolAmount), int(floatUnerr(modMaxValue / modStepValue))) - return cycles * modStepValue, cycles, cycles * modCycleTime + cycles = min( + # Consider full cycles only + math.floor(spoolAmount), + # Max amount of cycles + math.ceil(floatUnerr(modMaxValue / modStepValue))) + spoolValue = min(modMaxValue, cycles * modStepValue) + return spoolValue, cycles, cycles * modCycleTime else: return 0, 0, 0 diff --git a/eve.db b/eve.db index e878604bf..2c153c817 100644 Binary files a/eve.db and b/eve.db differ diff --git a/graphs/data/fitDamageStats/getter.py b/graphs/data/fitDamageStats/getter.py index f8474a55c..8aaea3849 100644 --- a/graphs/data/fitDamageStats/getter.py +++ b/graphs/data/fitDamageStats/getter.py @@ -54,7 +54,7 @@ class YDpsMixin: for mod in src.item.activeModulesIter(): if not mod.isDealingDamage(): continue - dpsMap[mod] = mod.getDps(spoolOptions=SpoolOptions(SpoolType.SCALE, defaultSpoolValue, False)) + dpsMap[mod] = mod.getDps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, defaultSpoolValue, False)) for drone in src.item.activeDronesIter(): if not drone.isDealingDamage(): continue @@ -88,7 +88,7 @@ class YVolleyMixin: for mod in src.item.activeModulesIter(): if not mod.isDealingDamage(): continue - volleyMap[mod] = mod.getVolley(spoolOptions=SpoolOptions(SpoolType.SCALE, defaultSpoolValue, False)) + volleyMap[mod] = mod.getVolley(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, defaultSpoolValue, False)) for drone in src.item.activeDronesIter(): if not drone.isDealingDamage(): continue diff --git a/graphs/data/fitRemoteReps/getter.py b/graphs/data/fitRemoteReps/getter.py index 823a5bbe5..29549b3c4 100644 --- a/graphs/data/fitRemoteReps/getter.py +++ b/graphs/data/fitRemoteReps/getter.py @@ -50,7 +50,7 @@ class YRpsMixin: isAncShield = 'shipModuleAncillaryRemoteShieldBooster' in mod.item.effects isAncArmor = 'shipModuleAncillaryRemoteArmorRepairer' in mod.item.effects rpsMap[mod] = mod.getRemoteReps( - spoolOptions=SpoolOptions(SpoolType.SCALE, defaultSpoolValue, False), + spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, defaultSpoolValue, False), reloadOverride=ancReload if (isAncShield or isAncArmor) else None) for drone in src.item.activeDronesIter(): if not drone.isRemoteRepping(): diff --git a/gui/builtinContextMenus/moduleSpool.py b/gui/builtinContextMenus/moduleSpool.py index 6d2e3aa46..743f73092 100644 --- a/gui/builtinContextMenus/moduleSpool.py +++ b/gui/builtinContextMenus/moduleSpool.py @@ -45,10 +45,10 @@ class ChangeModuleSpool(ContextMenuSingle): bindmenu = m isNotDefault = self.mod.spoolType is not None and self.mod.spoolAmount is not None - cycleDefault = self.mod.getSpoolData(spoolOptions=SpoolOptions(SpoolType.SCALE, eos.config.settings['globalDefaultSpoolupPercentage'], True))[0] - cycleCurrent = self.mod.getSpoolData(spoolOptions=SpoolOptions(SpoolType.SCALE, eos.config.settings['globalDefaultSpoolupPercentage'], False))[0] - cycleMin = self.mod.getSpoolData(spoolOptions=SpoolOptions(SpoolType.SCALE, 0, True))[0] - cycleMax = self.mod.getSpoolData(spoolOptions=SpoolOptions(SpoolType.SCALE, 1, True))[0] + cycleDefault = self.mod.getSpoolData(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, eos.config.settings['globalDefaultSpoolupPercentage'], True))[0] + cycleCurrent = self.mod.getSpoolData(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, eos.config.settings['globalDefaultSpoolupPercentage'], False))[0] + cycleMin = self.mod.getSpoolData(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, 0, True))[0] + cycleMax = self.mod.getSpoolData(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, 1, True))[0] cycleTotalMin = min(cycleDefault, cycleCurrent, cycleMin) cycleTotalMax = max(cycleDefault, cycleCurrent, cycleMax) diff --git a/gui/builtinStatsViews/firepowerViewFull.py b/gui/builtinStatsViews/firepowerViewFull.py index 2414b032d..c069f6f03 100644 --- a/gui/builtinStatsViews/firepowerViewFull.py +++ b/gui/builtinStatsViews/firepowerViewFull.py @@ -163,9 +163,9 @@ class FirepowerViewFull(StatsView): stats = ( ( "labelFullDpsWeapon", - lambda: fit.getWeaponDps(spoolOptions=SpoolOptions(SpoolType.SCALE, defaultSpoolValue, False)).total, - lambda: fit.getWeaponDps(spoolOptions=SpoolOptions(SpoolType.SCALE, 0, True)).total, - lambda: fit.getWeaponDps(spoolOptions=SpoolOptions(SpoolType.SCALE, 1, True)).total, + lambda: fit.getWeaponDps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, defaultSpoolValue, False)).total, + lambda: fit.getWeaponDps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, 0, True)).total, + lambda: fit.getWeaponDps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, 1, True)).total, 3, 0, 0, "{}{} DPS"), ( "labelFullDpsDrone", @@ -175,15 +175,15 @@ class FirepowerViewFull(StatsView): 3, 0, 0, "{}{} DPS"), ( "labelFullVolleyTotal", - lambda: fit.getTotalVolley(spoolOptions=SpoolOptions(SpoolType.SCALE, defaultSpoolValue, False)).total, - lambda: fit.getTotalVolley(spoolOptions=SpoolOptions(SpoolType.SCALE, 0, True)).total, - lambda: fit.getTotalVolley(spoolOptions=SpoolOptions(SpoolType.SCALE, 1, True)).total, + lambda: fit.getTotalVolley(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, defaultSpoolValue, False)).total, + lambda: fit.getTotalVolley(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, 0, True)).total, + lambda: fit.getTotalVolley(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, 1, True)).total, 3, 0, 0, "{}{}"), ( "labelFullDpsTotal", - lambda: fit.getTotalDps(spoolOptions=SpoolOptions(SpoolType.SCALE, defaultSpoolValue, False)).total, - lambda: fit.getTotalDps(spoolOptions=SpoolOptions(SpoolType.SCALE, 0, True)).total, - lambda: fit.getTotalDps(spoolOptions=SpoolOptions(SpoolType.SCALE, 1, True)).total, + lambda: fit.getTotalDps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, defaultSpoolValue, False)).total, + lambda: fit.getTotalDps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, 0, True)).total, + lambda: fit.getTotalDps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, 1, True)).total, 3, 0, 0, "{}{}")) counter = 0 diff --git a/gui/builtinStatsViews/outgoingViewFull.py b/gui/builtinStatsViews/outgoingViewFull.py index 9004e119c..85f6c73b2 100644 --- a/gui/builtinStatsViews/outgoingViewFull.py +++ b/gui/builtinStatsViews/outgoingViewFull.py @@ -29,27 +29,27 @@ import eos.config stats = [ ( "labelRemoteCapacitor", "Capacitor:", "{}{} GJ/s", "capacitorInfo", "Capacitor restored", - lambda fit, spool: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, spool, False)).capacitor, - lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, 0, True)).capacitor, - lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, 1, True)).capacitor, + lambda fit, spool: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, spool, False)).capacitor, + lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, 0, True)).capacitor, + lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, 1, True)).capacitor, 3, 0, 0), ( "labelRemoteShield", "Shield:", "{}{} HP/s", "shieldActive", "Shield restored", - lambda fit, spool: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, spool, False)).shield, - lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, 0, True)).shield, - lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, 1, True)).shield, + lambda fit, spool: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, spool, False)).shield, + lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, 0, True)).shield, + lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, 1, True)).shield, 3, 0, 0), ( "labelRemoteArmor", "Armor:", "{}{} HP/s", "armorActive", "Armor restored", - lambda fit, spool: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, spool, False)).armor, - lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, 0, True)).armor, - lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, 1, True)).armor, + lambda fit, spool: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, spool, False)).armor, + lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, 0, True)).armor, + lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, 1, True)).armor, 3, 0, 0), ( "labelRemoteHull", "Hull:", "{}{} HP/s", "hullActive", "Hull restored", - lambda fit, spool: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, spool, False)).hull, - lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, 0, True)).hull, - lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, 1, True)).hull, + lambda fit, spool: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, spool, False)).hull, + lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, 0, True)).hull, + lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, 1, True)).hull, 3, 0, 0)] diff --git a/gui/builtinStatsViews/outgoingViewMinimal.py b/gui/builtinStatsViews/outgoingViewMinimal.py index e052bf3eb..10dbab394 100644 --- a/gui/builtinStatsViews/outgoingViewMinimal.py +++ b/gui/builtinStatsViews/outgoingViewMinimal.py @@ -28,27 +28,27 @@ import eos.config stats = [ ( "labelRemoteCapacitor", "Capacitor:", "{}{} GJ/s", "capacitorInfo", "Capacitor restored", - lambda fit, spool: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, spool, False)).capacitor, - lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, 0, True)).capacitor, - lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, 1, True)).capacitor, + lambda fit, spool: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, spool, False)).capacitor, + lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, 0, True)).capacitor, + lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, 1, True)).capacitor, 3, 0, 0), ( "labelRemoteShield", "Shield:", "{}{} HP/s", "shieldActive", "Shield restored", - lambda fit, spool: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, spool, False)).shield, - lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, 0, True)).shield, - lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, 1, True)).shield, + lambda fit, spool: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, spool, False)).shield, + lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, 0, True)).shield, + lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, 1, True)).shield, 3, 0, 0), ( "labelRemoteArmor", "Armor:", "{}{} HP/s", "armorActive", "Armor restored", - lambda fit, spool: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, spool, False)).armor, - lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, 0, True)).armor, - lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, 1, True)).armor, + lambda fit, spool: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, spool, False)).armor, + lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, 0, True)).armor, + lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, 1, True)).armor, 3, 0, 0), ( "labelRemoteHull", "Hull:", "{}{} HP/s", "hullActive", "Hull restored", - lambda fit, spool: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, spool, False)).hull, - lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, 0, True)).hull, - lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, 1, True)).hull, + lambda fit, spool: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, spool, False)).hull, + lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, 0, True)).hull, + lambda fit: fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, 1, True)).hull, 3, 0, 0)] diff --git a/gui/builtinViewColumns/attributeDisplayGraph.py b/gui/builtinViewColumns/attributeDisplayGraph.py index a28bbed55..e993e9d23 100644 --- a/gui/builtinViewColumns/attributeDisplayGraph.py +++ b/gui/builtinViewColumns/attributeDisplayGraph.py @@ -84,7 +84,7 @@ class DpsColumn(GraphColumn): def _getValue(self, fit): defaultSpoolValue = eos.config.settings['globalDefaultSpoolupPercentage'] - return fit.getTotalDps(spoolOptions=SpoolOptions(SpoolType.SCALE, defaultSpoolValue, False)).total, None + return fit.getTotalDps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, defaultSpoolValue, False)).total, None def _getFitTooltip(self): return 'Declared DPS' @@ -102,7 +102,7 @@ class VolleyColumn(GraphColumn): def _getValue(self, fit): defaultSpoolValue = eos.config.settings['globalDefaultSpoolupPercentage'] - return fit.getTotalVolley(spoolOptions=SpoolOptions(SpoolType.SCALE, defaultSpoolValue, False)).total, None + return fit.getTotalVolley(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, defaultSpoolValue, False)).total, None def _getFitTooltip(self): return 'Declared volley' @@ -329,7 +329,7 @@ class ShieldRRColumn(GraphColumn): def _getValue(self, fit): defaultSpoolValue = eos.config.settings['globalDefaultSpoolupPercentage'] - return fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, defaultSpoolValue, False)).shield, 'HP/s' + return fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, defaultSpoolValue, False)).shield, 'HP/s' def _getFitTooltip(self): return 'Declared shield repair speed' @@ -348,7 +348,7 @@ class ArmorRRColumn(GraphColumn): def _getValue(self, fit): defaultSpoolValue = eos.config.settings['globalDefaultSpoolupPercentage'] - return fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, defaultSpoolValue, False)).armor, 'HP/s' + return fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, defaultSpoolValue, False)).armor, 'HP/s' def _getFitTooltip(self): return 'Declared armor repair speed' @@ -367,7 +367,7 @@ class HullRRColumn(GraphColumn): def _getValue(self, fit): defaultSpoolValue = eos.config.settings['globalDefaultSpoolupPercentage'] - return fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SCALE, defaultSpoolValue, False)).hull, 'HP/s' + return fit.getRemoteReps(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, defaultSpoolValue, False)).hull, 'HP/s' def _getFitTooltip(self): return 'Declared hull repair speed' diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py index e56bc5fe8..a54b02841 100644 --- a/gui/builtinViewColumns/misc.py +++ b/gui/builtinViewColumns/misc.py @@ -113,7 +113,7 @@ class Miscellanea(ViewColumn): info.append((text, tooltip)) defaultSpoolValue = eos.config.settings['globalDefaultSpoolupPercentage'] - spoolTime = stuff.getSpoolData(spoolOptions=SpoolOptions(SpoolType.SCALE, defaultSpoolValue, False))[1] + spoolTime = stuff.getSpoolData(spoolOptions=SpoolOptions(SpoolType.SPOOL_SCALE, defaultSpoolValue, False))[1] if spoolTime: text = "{0}s".format(formatAmount(spoolTime, 3, 0, 3)) tooltip = "spool up time" @@ -396,9 +396,9 @@ class Miscellanea(ViewColumn): return text, tooltip elif itemGroup == "Mutadaptive Remote Armor Repairer": defaultSpoolValue = eos.config.settings['globalDefaultSpoolupPercentage'] - spoolOptDefault = SpoolOptions(SpoolType.SCALE, defaultSpoolValue, False) - spoolOptPre = SpoolOptions(SpoolType.SCALE, 0, True) - spoolOptFull = SpoolOptions(SpoolType.SCALE, 1, True) + spoolOptDefault = SpoolOptions(SpoolType.SPOOL_SCALE, defaultSpoolValue, False) + spoolOptPre = SpoolOptions(SpoolType.SPOOL_SCALE, 0, True) + spoolOptFull = SpoolOptions(SpoolType.SPOOL_SCALE, 1, True) rps = stuff.getRemoteReps(spoolOptions=spoolOptDefault, ignoreState=True).armor rpsPre = stuff.getRemoteReps(spoolOptions=spoolOptPre, ignoreState=True).armor rpsFull = stuff.getRemoteReps(spoolOptions=spoolOptFull, ignoreState=True).armor diff --git a/service/port/efs.py b/service/port/efs.py index 9b1cfcf5f..307baa3fa 100755 --- a/service/port/efs.py +++ b/service/port/efs.py @@ -363,7 +363,7 @@ class EfsPort: groups = {} # Export at maximum spool for consistency, spoolup data is exported anyway. defaultSpoolValue = 1 - spoolOptions = SpoolOptions(SpoolType.SCALE, defaultSpoolValue, True) + spoolOptions = SpoolOptions(SpoolType.SPOOL_SCALE, defaultSpoolValue, True) for mod in fit.modules: if mod.getDps(spoolOptions=spoolOptions).total > 0: # Group weapon + ammo combinations that occur more than once @@ -689,7 +689,7 @@ class EfsPort: shipSize = EfsPort.getShipSize(fit.ship.item.groupID) # Export at maximum spool for consistency, spoolup data is exported anyway. defaultSpoolValue = 1 - spoolOptions = SpoolOptions(SpoolType.SCALE, defaultSpoolValue, True) + spoolOptions = SpoolOptions(SpoolType.SPOOL_SCALE, defaultSpoolValue, True) cargoIDs = [] for cargo in fit.cargo: diff --git a/version.yml b/version.yml index 7c868a394..03e8b97b5 100644 --- a/version.yml +++ b/version.yml @@ -1 +1 @@ -version: v2.10.1 +version: v2.11.0dev1