From 4dc281b37e9c2aa3eb2cf25f90ecc95c957c8cb7 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Wed, 20 Mar 2019 13:07:44 +0300 Subject: [PATCH] Move spoolup enum into costs --- eos/const.py | 7 +++++++ eos/effects/shipmoduleremotearmormutadaptiverepairer.py | 3 ++- eos/utils/spoolSupport.py | 9 +-------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/eos/const.py b/eos/const.py index a8def2bcf..4c71d76c5 100644 --- a/eos/const.py +++ b/eos/const.py @@ -86,3 +86,10 @@ class FittingHardpoint(IntEnum): NONE = 0 MISSILE = 1 TURRET = 2 + + +@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 diff --git a/eos/effects/shipmoduleremotearmormutadaptiverepairer.py b/eos/effects/shipmoduleremotearmormutadaptiverepairer.py index 29d52fb47..94a53be2b 100644 --- a/eos/effects/shipmoduleremotearmormutadaptiverepairer.py +++ b/eos/effects/shipmoduleremotearmormutadaptiverepairer.py @@ -4,8 +4,9 @@ # Modules from group: Mutadaptive Remote Armor Repairer (5 of 5) -from eos.utils.spoolSupport import SpoolType, SpoolOptions, calculateSpoolup, resolveSpoolOptions import eos.config +from eos.utils.spoolSupport import SpoolType, SpoolOptions, calculateSpoolup, resolveSpoolOptions + type = "projected", "active" runTime = "late" diff --git a/eos/utils/spoolSupport.py b/eos/utils/spoolSupport.py index de265731f..2014654d4 100644 --- a/eos/utils/spoolSupport.py +++ b/eos/utils/spoolSupport.py @@ -19,21 +19,14 @@ from collections import namedtuple -from enum import IntEnum, unique +from eos.const import SpoolType from eos.utils.float import floatUnerr SpoolOptions = namedtuple('SpoolOptions', ('spoolType', 'spoolAmount', 'force')) -@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 - - def calculateSpoolup(modMaxValue, modStepValue, modCycleTime, spoolType, spoolAmount): """ Calculate damage multiplier increment based on passed parameters. Module cycle time