Update database to tq version and bump version in config

This reverts commit 1402ceec63.

.gitignore

@@ -20,3 +20,4 @@ saveddata/
 
 #Pyfa file
 pyfaFits.html
+build/

README.md

@@ -6,6 +6,13 @@ It provides many advanced features such as graphs and full calculations of any p
 
 Please see the [FAQ](https://github.com/DarkFenX/Pyfa/wiki/FAQ) for answers to common questions / concerns
 
+#### A note for Linux users
+pyfa currently only supports wxPython 2.8. However, there are some distros that have started to support 3.0 and subsequently dropped support for 2.8 altogether (such as Debian Jessie). If this is the case and wxPython 3.0 is the only version installed, the official pyfa releases will not run. You must either find a package for 2.8 or compile it yourself.
+
+For Debian Jessie, wxPython 2.8 is available in Sid (the unstable repo). you can use apt-pinning to install select packages from unstable and still keep your stable system. See http://jaqque.sbih.org/kplug/apt-pinning.html for me details.
+
+3.0 support is being worked on and can be found on the wx3 branch. It may be stable enough for you, but there are a few bugs related to it. Please see the wx3 label on the GitHub issues area for me information on known issues (biggest one currently is GTK warning spam): https://github.com/DarkFenX/Pyfa/labels/wx3
+
 #### Links
 * [Development repository: http://github.com/DarkFenX/Pyfa](http://github.com/DarkFenX/Pyfa)
 * [XMPP conference:

config.py

@@ -1,6 +1,11 @@
 import os
 import sys
 
+# TODO: move all logging back to pyfa.py main loop
+# We moved it here just to avoid rebuilding windows skeleton for now (any change to pyfa.py needs it)
+import logging
+import logging.handlers
+
 # Load variable overrides specific to distribution type
 try:
     import configforced
@@ -12,23 +17,43 @@ debug = False
 # Defines if our saveddata will be in pyfa root or not
 saveInRoot = False
 
+if debug:
+    logLevel = logging.DEBUG
+else:
+    logLevel = logging.WARN
+
 # Version data
-version = "1.10.1"
-tag = "preview"
-expansionName = "t3d_changes"
+version = "1.15.0"
+tag = "Stable"
+expansionName = "Vanguard"
 expansionVersion = "1.0"
 evemonMinVersion = "4081"
 
-# Database version (int ONLY)
-# Increment every time we need to flag for user database upgrade/modification
-dbversion = 6
-
 pyfaPath = None
 savePath = None
 staticPath = None
 saveDB = None
 gameDB = None
 
+
+class StreamToLogger(object):
+   """
+   Fake file-like stream object that redirects writes to a logger instance.
+   From: http://www.electricmonk.nl/log/2011/08/14/redirect-stdout-and-stderr-to-a-logger-in-python/
+   """
+   def __init__(self, logger, log_level=logging.INFO):
+      self.logger = logger
+      self.log_level = log_level
+      self.linebuf = ''
+
+   def write(self, buf):
+      for line in buf.rstrip().splitlines():
+         self.logger.log(self.log_level, line.rstrip())
+
+def __createDirs(path):
+    if not os.path.exists(path):
+        os.makedirs(path)
+
 def defPaths():
     global pyfaPath
     global savePath
@@ -54,19 +79,25 @@ def defPaths():
             savePath = unicode(os.path.expanduser(os.path.join("~", ".pyfa")),
                                sys.getfilesystemencoding())
 
-    # Redirect stderr to file if we're requested to do so
-    stderrToFile = getattr(configforced, "stderrToFile", None)
-    if stderrToFile is True:
-        if not os.path.exists(savePath):
-            os.mkdir(savePath)
-        sys.stderr = open(os.path.join(savePath, "error_log.txt"), "w")
+    __createDirs(savePath)
 
-    # Same for stdout
-    stdoutToFile = getattr(configforced, "stdoutToFile", None)
-    if stdoutToFile is True:
-        if not os.path.exists(savePath):
-            os.mkdir(savePath)
-        sys.stdout = open(os.path.join(savePath, "output_log.txt"), "w")
+    format = '%(asctime)s %(name)-24s %(levelname)-8s %(message)s'
+    logging.basicConfig(format=format, level=logLevel)
+    handler = logging.handlers.RotatingFileHandler(os.path.join(savePath, "log.txt"), maxBytes=1000000, backupCount=3)
+    formatter = logging.Formatter(format)
+    handler.setFormatter(formatter)
+    logging.getLogger('').addHandler(handler)
+
+    logging.info("Starting pyfa")
+
+    if hasattr(sys, 'frozen'):
+        stdout_logger = logging.getLogger('STDOUT')
+        sl = StreamToLogger(stdout_logger, logging.INFO)
+        sys.stdout = sl
+
+        stderr_logger = logging.getLogger('STDERR')
+        sl = StreamToLogger(stderr_logger, logging.ERROR)
+        sys.stderr = sl
 
     # Static EVE Data from the staticdata repository, should be in the staticdata
     # directory in our pyfa directory

eos/capSim.py

@@ -82,18 +82,25 @@ class CapSimulator(object):
             if self.scale:
                 duration, capNeed = self.scale_activation(duration, capNeed)
 
-            if self.stagger:
-                duration = int(duration/amount)
-            else:
-                capNeed *= amount
-
-            period = lcm(period, duration)
-
             # set clipSize to infinite if reloads are disabled unless it's
             # a cap booster module.
             if not self.reload and capNeed > 0:
                 clipSize = 0
 
+            if self.stagger:
+                if clipSize == 0:
+                    duration = int(duration/amount)
+                else:
+                    stagger_amount = (duration*clipSize+10000)/(amount*clipSize)
+                    for i in range(1, amount):
+                        heapq.heappush(self.state,
+                                       [i*stagger_amount, duration,
+                                        capNeed, 0, clipSize])
+            else:
+                capNeed *= amount
+
+            period = lcm(period, duration)
+
             # period optimization doesn't work when reloads are active.
             if clipSize:
                 disable_period = True

eos/config.py

@@ -5,7 +5,7 @@ debug = False
 gamedataCache = True
 saveddataCache = True
 gamedata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "staticdata", "eve.db")), sys.getfilesystemencoding())
-saveddata_connectionstring = 'sqlite:///:memory:'
+saveddata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "saveddata", "saveddata.db")), sys.getfilesystemencoding())
 
 #Autodetect path, only change if the autodetection bugs out.
 path = dirname(unicode(__file__, sys.getfilesystemencoding()))

eos/db/migration.py

@@ -1,32 +1,46 @@
 import config
 import shutil
 import time
+import re
+import os
+
+def getAppVersion():
+    # calculate app version based on upgrade files we have
+    appVersion = 0
+    for fname in os.listdir(os.path.join(os.path.dirname(__file__), "migrations")):
+        m = re.match("^upgrade(?P<index>\d+)\.py$", fname)
+        if not m:
+            continue
+        index = int(m.group("index"))
+        appVersion = max(appVersion, index)
+    return appVersion
 
 def getVersion(db):
     cursor = db.execute('PRAGMA user_version')
     return cursor.fetchone()[0]
 
 def update(saveddata_engine):
-    currversion = getVersion(saveddata_engine)
+    dbVersion = getVersion(saveddata_engine)
+    appVersion = getAppVersion()
 
-    if currversion == config.dbversion:
+    if dbVersion == appVersion:
         return
 
-    if currversion < config.dbversion:
+    if dbVersion < appVersion:
         # Automatically backup database
         toFile = "%s/saveddata_migration_%d-%d_%s.db"%(
             config.savePath,
-            currversion,
-            config.dbversion,
+            dbVersion,
+            appVersion,
             time.strftime("%Y%m%d_%H%M%S"))
 
         shutil.copyfile(config.saveDB, toFile)
 
-        for version in xrange(currversion, config.dbversion):
-            module = __import__('eos.db.migrations.upgrade%d'%(version+1), fromlist=True)
+        for version in xrange(dbVersion, appVersion):
+            module = __import__("eos.db.migrations.upgrade{}".format(version + 1), fromlist=True)
             upgrade = getattr(module, "upgrade", False)
             if upgrade:
                 upgrade(saveddata_engine)
 
         # when all is said and done, set version to current
-        saveddata_engine.execute('PRAGMA user_version = %d'%config.dbversion)
+        saveddata_engine.execute("PRAGMA user_version = {}".format(appVersion))

eos/db/migrations/upgrade10.py

@@ -0,0 +1,16 @@
+"""
+Migration 10
+
+- Adds active attribute to projected fits
+"""
+
+import sqlalchemy
+
+def upgrade(saveddata_engine):
+    # Update projectedFits schema to include active attribute
+    try:
+        saveddata_engine.execute("SELECT active FROM projectedFits LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE projectedFits ADD COLUMN active BOOLEAN")
+        saveddata_engine.execute("UPDATE projectedFits SET active = 1")
+        saveddata_engine.execute("UPDATE projectedFits SET amount = 1")

eos/db/migrations/upgrade7.py

@@ -0,0 +1,24 @@
+"""
+Migration 7
+
+- Converts Scorpion Ishukone Watch to Scorpion
+
+    Mosaic introduced proper skinning system, and Ishukone Scorp
+    was the only ship which was presented as stand-alone ship in
+    Pyfa.
+"""
+
+
+CONVERSIONS = {
+    640: (  # Scorpion
+        4005,  # Scorpion Ishukone Watch
+    )
+}
+
+def upgrade(saveddata_engine):
+
+    # Convert ships
+    for replacement_item, list in CONVERSIONS.iteritems():
+        for retired_item in list:
+            saveddata_engine.execute('UPDATE "fits" SET "shipID" = ? WHERE "shipID" = ?', (replacement_item, retired_item))
+

eos/db/migrations/upgrade8.py

@@ -0,0 +1,85 @@
+"""
+Migration 8
+
+- Converts modules based on Carnyx Module Tiericide
+    Some modules have been unpublished (and unpublished module attributes are removed
+    from database), which causes pyfa to crash. We therefore replace these
+    modules with their new replacements
+"""
+
+
+CONVERSIONS = {
+    8529: (  # Large F-S9 Regolith Compact Shield Extender
+        8409,  # Large Subordinate Screen Stabilizer I
+    ),
+    8419: (  # Large Azeotropic Restrained Shield Extender
+        8489,  # Large Supplemental Barrier Emitter I
+    ),
+    8517: (  # Medium F-S9 Regolith Compact Shield Extender
+        8397,  # Medium Subordinate Screen Stabilizer I
+    ),
+    8433: (  # Medium Azeotropic Restrained Shield Extender
+        8477,  # Medium Supplemental Barrier Emitter I
+    ),
+    20627: (  # Small 'Trapper' Shield Extender
+        8437,  # Micro Azeotropic Ward Salubrity I
+        8505,  # Micro F-S9 Regolith Shield Induction
+        3849,  # Micro Shield Extender I
+        3851,  # Micro Shield Extender II
+        8387,  # Micro Subordinate Screen Stabilizer I
+        8465,  # Micro Supplemental Barrier Emitter I
+    ),
+    8521: (  # Small F-S9 Regolith Compact Shield Extender
+        8401,  # Small Subordinate Screen Stabilizer I
+    ),
+    8427: (  # Small Azeotropic Restrained Shield Extender
+        8481,  # Small Supplemental Barrier Emitter I
+    ),
+    11343: (  # 100mm Crystalline Carbonide Restrained Plates
+        11345,  # 100mm Reinforced Nanofiber Plates I
+    ),
+    11341: (  # 100mm Rolled Tungsten Compact Plates
+        11339,  # 100mm Reinforced Titanium Plates I
+    ),
+    11327: (  # 1600mm Crystalline Carbonide Restrained Plates
+        11329,  # 1600mm Reinforced Nanofiber Plates I
+    ),
+    11325: (  # 1600mm Rolled Tungsten Compact Plates
+        11323,  # 1600mm Reinforced Titanium Plates I
+    ),
+    11351: (  # 200mm Crystalline Carbonide Restrained Plates
+        11353,  # 200mm Reinforced Nanofiber Plates I
+    ),
+    11349: (  # 200mm Rolled Tungsten Compact Plates
+        11347,  # 200mm Reinforced Titanium Plates I
+    ),
+    11311: (  # 400mm Crystalline Carbonide Restrained Plates
+        11313,  # 400mm Reinforced Nanofiber Plates I
+    ),
+    11309: (  # 400mm Rolled Tungsten Compact Plates
+        11307,  # 400mm Reinforced Titanium Plates I
+    ),
+    23791: (  # 'Citadella' 100mm Steel Plates
+        11335,  # 50mm Reinforced Crystalline Carbonide Plates I
+        11337,  # 50mm Reinforced Nanofiber Plates I
+        11333,  # 50mm Reinforced Rolled Tungsten Plates I
+        11291,  # 50mm Reinforced Steel Plates I
+        20343,  # 50mm Reinforced Steel Plates II
+        11331,  # 50mm Reinforced Titanium Plates I
+    ),
+    11319: (  # 800mm Crystalline Carbonide Restrained Plates
+        11321,  # 800mm Reinforced Nanofiber Plates I
+    ),
+    11317: (  # 800mm Rolled Tungsten Compact Plates
+        11315,  #  800mm Reinforced Titanium Plates I
+    ),
+}
+
+def upgrade(saveddata_engine):
+
+    # Convert modules
+    for replacement_item, list in CONVERSIONS.iteritems():
+        for retired_item in list:
+            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+

eos/db/migrations/upgrade9.py

@@ -0,0 +1,23 @@
+"""
+Migration 9
+
+Effectively drops UNIQUE constraint from boosters table. SQLite does not support
+this, so we have to copy the table to the updated schema and then rename it
+"""
+
+tmpTable = """
+CREATE TABLE boostersTemp (
+    'ID' INTEGER NOT NULL,
+    'itemID' INTEGER,
+    'fitID' INTEGER NOT NULL,
+    'active' BOOLEAN,
+    PRIMARY KEY(ID),
+    FOREIGN KEY('fitID') REFERENCES fits ('ID')
+)
+"""
+
+def upgrade(saveddata_engine):
+    saveddata_engine.execute(tmpTable)
+    saveddata_engine.execute("INSERT INTO boostersTemp (ID, itemID, fitID, active) SELECT ID, itemID, fitID, active FROM boosters")
+    saveddata_engine.execute("DROP TABLE boosters")
+    saveddata_engine.execute("ALTER TABLE boostersTemp RENAME TO boosters")

eos/db/saveddata/booster.py

@@ -29,7 +29,7 @@ boosters_table = Table("boosters", saveddata_meta,
                        Column("itemID", Integer),
                        Column("fitID", Integer, ForeignKey("fits.ID"), nullable = False),
                        Column("active", Boolean),
-                       UniqueConstraint("itemID", "fitID"))
+                       )
 
 activeSideEffects_table = Table("boostersActiveSideEffects", saveddata_meta,
                                 Column("boosterID", ForeignKey("boosters.ID"), primary_key = True),

eos/db/saveddata/fit.py

@@ -17,9 +17,11 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 #===============================================================================
 
-from sqlalchemy import Table, Column, Integer, ForeignKey, String, Boolean
-from sqlalchemy.orm import relation, mapper
+from sqlalchemy import *
+from sqlalchemy.orm import *
 from sqlalchemy.sql import and_
+from sqlalchemy.ext.associationproxy import association_proxy
+from sqlalchemy.orm.collections import attribute_mapped_collection
 
 from eos.db import saveddata_meta
 from eos.db.saveddata.module import modules_table
@@ -27,9 +29,7 @@ from eos.db.saveddata.drone import drones_table
 from eos.db.saveddata.cargo import cargo_table
 from eos.db.saveddata.implant import fitImplants_table
 from eos.types import Fit, Module, User, Booster, Drone, Cargo, Implant, Character, DamagePattern, TargetResists
-from eos.effectHandlerHelpers import HandledModuleList, HandledDroneList, \
-HandledImplantBoosterList, HandledProjectedModList, HandledProjectedDroneList, \
-HandledProjectedFitList, HandledCargoList
+from eos.effectHandlerHelpers import *
 
 fits_table = Table("fits", saveddata_meta,
                          Column("ID", Integer, primary_key = True),
@@ -47,31 +47,119 @@ fits_table = Table("fits", saveddata_meta,
 projectedFits_table = Table("projectedFits", saveddata_meta,
                             Column("sourceID", ForeignKey("fits.ID"), primary_key = True),
                             Column("victimID", ForeignKey("fits.ID"), primary_key = True),
-                            Column("amount", Integer))
+                            Column("amount", Integer, nullable = False, default = 1),
+                            Column("active", Boolean, nullable = False, default = 1),
+)
+
+class ProjectedFit(object):
+    def __init__(self, sourceID, source_fit, amount=1, active=True):
+        self.sourceID = sourceID
+        self.source_fit = source_fit
+        self.active = active
+        self.__amount = amount
+
+    @reconstructor
+    def init(self):
+        if self.source_fit.isInvalid:
+            # Very rare for this to happen, but be prepared for it
+            eos.db.saveddata_session.delete(self.source_fit)
+            eos.db.saveddata_session.flush()
+            eos.db.saveddata_session.refresh(self.victim_fit)
+
+    # We have a series of setters and getters here just in case someone
+    # downgrades and screws up the table with NULL values
+    @property
+    def amount(self):
+        return self.__amount or 1
+
+    @amount.setter
+    def amount(self, amount):
+        self.__amount = amount
+
+    def __repr__(self):
+        return "ProjectedFit(sourceID={}, victimID={}, amount={}, active={}) at {}".format(
+            self.sourceID, self.victimID, self.amount, self.active, hex(id(self))
+        )
+
+Fit._Fit__projectedFits = association_proxy(
+    "victimOf",  # look at the victimOf association...
+    "source_fit",  # .. and return the source fits
+    creator=lambda sourceID, source_fit: ProjectedFit(sourceID, source_fit)
+)
+
 mapper(Fit, fits_table,
-       properties = {"_Fit__modules" : relation(Module, collection_class = HandledModuleList,
-                                                primaryjoin = and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == False),
-                                                order_by = modules_table.c.position, cascade='all, delete, delete-orphan'),
-                     "_Fit__projectedModules" : relation(Module, collection_class = HandledProjectedModList, cascade='all, delete, delete-orphan', single_parent=True,
-                                                primaryjoin = and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == True)),
-                     "owner" : relation(User, backref = "fits"),
-                     "_Fit__boosters" : relation(Booster, collection_class = HandledImplantBoosterList, cascade='all, delete, delete-orphan', single_parent=True),
-                     "_Fit__drones" : relation(Drone, collection_class = HandledDroneList, cascade='all, delete, delete-orphan', single_parent=True,
-                                               primaryjoin = and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == False)),
-                     "_Fit__cargo" : relation(Cargo, collection_class = HandledCargoList, cascade='all, delete, delete-orphan', single_parent=True,
-                                               primaryjoin = and_(cargo_table.c.fitID == fits_table.c.ID)),
-                     "_Fit__projectedDrones" : relation(Drone, collection_class = HandledProjectedDroneList, cascade='all, delete, delete-orphan', single_parent=True,
-                                               primaryjoin = and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == True)),
-                     "_Fit__implants" : relation(Implant, collection_class = HandledImplantBoosterList, cascade='all, delete, delete-orphan', single_parent=True,
-                                                 primaryjoin = fitImplants_table.c.fitID == fits_table.c.ID,
-                                                 secondaryjoin = fitImplants_table.c.implantID == Implant.ID,
-                                                 secondary = fitImplants_table),
-                     "_Fit__character" : relation(Character, backref = "fits"),
-                     "_Fit__damagePattern" : relation(DamagePattern),
-                     "_Fit__targetResists" : relation(TargetResists),
-                     "_Fit__projectedFits" : relation(Fit,
-                                                      primaryjoin = projectedFits_table.c.victimID == fits_table.c.ID,
-                                                      secondaryjoin = fits_table.c.ID == projectedFits_table.c.sourceID,
-                                                      secondary = projectedFits_table,
-                                                      collection_class = HandledProjectedFitList)
-                     })
+        properties = {
+            "_Fit__modules": relation(
+                Module,
+                collection_class=HandledModuleList,
+                primaryjoin=and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == False),
+                order_by=modules_table.c.position,
+                cascade='all, delete, delete-orphan'),
+            "_Fit__projectedModules": relation(
+                Module,
+                collection_class=HandledProjectedModList,
+                cascade='all, delete, delete-orphan',
+                single_parent=True,
+                primaryjoin=and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == True)),
+            "owner": relation(
+                User,
+                backref="fits"),
+            "itemID": fits_table.c.shipID,
+            "shipID": fits_table.c.shipID,
+            "_Fit__boosters": relation(
+                Booster,
+                collection_class=HandledImplantBoosterList,
+                cascade='all, delete, delete-orphan',
+                single_parent=True),
+            "_Fit__drones": relation(
+                Drone,
+                collection_class=HandledDroneCargoList,
+                cascade='all, delete, delete-orphan',
+                single_parent=True,
+                primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == False)),
+            "_Fit__cargo": relation(
+                Cargo,
+                collection_class=HandledDroneCargoList,
+                cascade='all, delete, delete-orphan',
+                single_parent=True,
+                primaryjoin=and_(cargo_table.c.fitID == fits_table.c.ID)),
+            "_Fit__projectedDrones": relation(
+                Drone,
+                collection_class=HandledProjectedDroneList,
+                cascade='all, delete, delete-orphan',
+                single_parent=True,
+                primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == True)),
+            "_Fit__implants": relation(
+                Implant,
+                collection_class=HandledImplantBoosterList,
+                cascade='all, delete, delete-orphan',
+                backref='fit',
+                single_parent=True,
+                primaryjoin=fitImplants_table.c.fitID == fits_table.c.ID,
+                secondaryjoin=fitImplants_table.c.implantID == Implant.ID,
+                secondary=fitImplants_table),
+            "_Fit__character": relation(
+                Character,
+                backref="fits"),
+            "_Fit__damagePattern": relation(DamagePattern),
+            "_Fit__targetResists": relation(TargetResists),
+            "projectedOnto": relationship(
+                ProjectedFit,
+                primaryjoin=projectedFits_table.c.sourceID == fits_table.c.ID,
+                backref='source_fit',
+                collection_class=attribute_mapped_collection('victimID'),
+                cascade='all, delete, delete-orphan'),
+            "victimOf": relationship(
+                ProjectedFit,
+                primaryjoin=fits_table.c.ID == projectedFits_table.c.victimID,
+                backref='victim_fit',
+                collection_class=attribute_mapped_collection('sourceID'),
+                cascade='all, delete, delete-orphan'),
+       }
+)
+
+mapper(ProjectedFit, projectedFits_table,
+       properties = {
+            "_ProjectedFit__amount": projectedFits_table.c.amount,
+       }
+)

eos/db/saveddata/queries.py

@@ -185,6 +185,12 @@ def getFit(lookfor, eager=None):
                 fit = saveddata_session.query(Fit).options(*eager).filter(Fit.ID == fitID).first()
     else:
         raise TypeError("Need integer as argument")
+
+    if fit and fit.isInvalid:
+        with sd_lock:
+            removeInvalid([fit])
+        return None
+
     return fit
 
 @cachedQuery(Fleet, 1, "fleetID")
@@ -244,9 +250,10 @@ def getFitsWithShip(shipID, ownerID=None, where=None, eager=None):
         filter = processWhere(filter, where)
         eager = processEager(eager)
         with sd_lock:
-            fits = saveddata_session.query(Fit).options(*eager).filter(filter).all()
+            fits = removeInvalid(saveddata_session.query(Fit).options(*eager).filter(filter).all())
     else:
         raise TypeError("ShipID must be integer")
+
     return fits
 
 def getBoosterFits(ownerID=None, where=None, eager=None):
@@ -264,7 +271,8 @@ def getBoosterFits(ownerID=None, where=None, eager=None):
     filter = processWhere(filter, where)
     eager = processEager(eager)
     with sd_lock:
-        fits = saveddata_session.query(Fit).options(*eager).filter(filter).all()
+        fits = removeInvalid(saveddata_session.query(Fit).options(*eager).filter(filter).all())
+
     return fits
 
 def countAllFits():
@@ -295,7 +303,8 @@ def countFitsWithShip(shipID, ownerID=None, where=None, eager=None):
 def getFitList(eager=None):
     eager = processEager(eager)
     with sd_lock:
-        fits = saveddata_session.query(Fit).options(*eager).all()
+        fits = removeInvalid(saveddata_session.query(Fit).options(*eager).all())
+
     return fits
 
 def getFleetList(eager=None):
@@ -385,7 +394,8 @@ def searchFits(nameLike, where=None, eager=None):
     filter = processWhere(Fit.name.like(nameLike, escape="\\"), where)
     eager = processEager(eager)
     with sd_lock:
-        fits = saveddata_session.query(Fit).options(*eager).filter(filter).all()
+        fits = removeInvalid(saveddata_session.query(Fit).options(*eager).filter(filter).all())
+
     return fits
 
 def getSquadsIDsWithFitID(fitID):
@@ -406,6 +416,16 @@ def getProjectedFits(fitID):
     else:
         raise TypeError("Need integer as argument")
 
+def removeInvalid(fits):
+    invalids = [f for f in fits if f.isInvalid]
+
+    if invalids:
+        map(fits.remove, invalids)
+        map(saveddata_session.delete, invalids)
+        saveddata_session.commit()
+
+    return fits
+
 def add(stuff):
     with sd_lock:
         saveddata_session.add(stuff)

eos/effectHandlerHelpers.py

@@ -17,8 +17,12 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 #===============================================================================
 
+#from sqlalchemy.orm.attributes import flag_modified
 import eos.db
 import eos.types
+import logging
+
+logger = logging.getLogger(__name__)
 
 class HandledList(list):
     def filteredItemPreAssign(self, filter, *args, **kwargs):
@@ -101,6 +105,14 @@ class HandledList(list):
             except AttributeError:
                 pass
 
+    def remove(self, thing):
+        # We must flag it as modified, otherwise it not be removed from the database
+        # @todo: flag_modified isn't in os x skel. need to rebuild to include
+        #flag_modified(thing, "itemID")
+        if thing.isInvalid:  # see GH issue #324
+            thing.itemID = 0
+        list.remove(self, thing)
+
 class HandledModuleList(HandledList):
     def append(self, mod):
         emptyPosition = float("Inf")
@@ -115,10 +127,14 @@ class HandledModuleList(HandledList):
             del self[emptyPosition]
             mod.position = emptyPosition
             HandledList.insert(self, emptyPosition, mod)
+            if mod.isInvalid:
+                self.remove(mod)
             return
 
         mod.position = len(self)
         HandledList.append(self, mod)
+        if mod.isInvalid:
+            self.remove(mod)
 
     def insert(self, index, mod):
         mod.position = index
@@ -143,139 +159,82 @@ class HandledModuleList(HandledList):
             dummy.position = index
             self[index] = dummy
 
+    def toModule(self, index, mod):
+        mod.position = index
+        self[index] = mod
+
     def freeSlot(self, slot):
         for i in range(len(self) -1, -1, -1):
             mod = self[i]
             if mod.getModifiedItemAttr("subSystemSlot") == slot:
                 del self[i]
 
-class HandledDroneList(HandledList):
+class HandledDroneCargoList(HandledList):
     def find(self, item):
-        for d in self:
-            if d.item == item:
-                yield d
+        for o in self:
+            if o.item == item:
+                yield o
 
     def findFirst(self, item):
-        for d in self.find(item):
-            return d
+        for o in self.find(item):
+            return o
 
-    def append(self, drone):
-        list.append(self, drone)
+    def append(self, thing):
+        HandledList.append(self, thing)
 
-    def remove(self, drone):
-        HandledList.remove(self, drone)
-
-    def appendItem(self, item, amount = 1):
-        if amount < 1: ValueError("Amount of drones to add should be >= 1")
-        d = self.findFirst(item)
-
-        if d is None:
-            d = eos.types.Drone(item)
-            self.append(d)
-
-        d.amount += amount
-        return d
-
-    def removeItem(self, item, amount):
-        if amount < 1: ValueError("Amount of drones to remove should be >= 1")
-        d = self.findFirst(item)
-        if d is None: return
-        d.amount -= amount
-        if d.amount <= 0:
-            self.remove(d)
-            return None
-
-        return d
-
-class HandledCargoList(HandledList):
-    # shameless copy of HandledDroneList
-    # I have no idea what this does, but I needed it
-    # @todo: investigate this
-    def find(self, item):
-        for d in self:
-            if d.item == item:
-                yield d
-
-    def findFirst(self, item):
-        for d in self.find(item):
-            return d
-
-    def append(self, cargo):
-        list.append(self, cargo)
-
-    def remove(self, cargo):
-        HandledList.remove(self, cargo)
-
-    def appendItem(self, item, qty = 1):
-        if qty < 1: ValueError("Amount of cargo to add should be >= 1")
-        d = self.findFirst(item)
-
-        if d is None:
-            d = eos.types.Cargo(item)
-            self.append(d)
-
-        d.qty += qty
-        return d
-
-    def removeItem(self, item, qty):
-        if qty < 1: ValueError("Amount of cargo to remove should be >= 1")
-        d = self.findFirst(item)
-        if d is None: return
-        d.qty -= qty
-        if d.qty <= 0:
-            self.remove(d)
-            return None
-
-        return d
+        if thing.isInvalid:
+            self.remove(thing)
 
 class HandledImplantBoosterList(HandledList):
-    def __init__(self):
-        self.__slotCache = {}
+    def append(self, thing):
+        if thing.isInvalid:
+            HandledList.append(self, thing)
+            self.remove(thing)
+            return
 
-    def append(self, implant):
-        if self.__slotCache.has_key(implant.slot):
-            raise ValueError("Implant/Booster slot already in use, remove the old one first or set replace = True")
-        self.__slotCache[implant.slot] = implant
-        HandledList.append(self, implant)
+        # if needed, remove booster that was occupying slot
+        oldObj = next((m for m in self if m.slot == thing.slot), None)
+        if oldObj:
+            logging.info("Slot %d occupied with %s, replacing with %s", thing.slot, oldObj.item.name, thing.item.name)
+            oldObj.itemID = 0  # hack to remove from DB. See GH issue #324
+            self.remove(oldObj)
 
-    def remove(self, implant):
-        HandledList.remove(self, implant)
-        del self.__slotCache[implant.slot]
-        # While we deleted this implant, in edge case seems like not all references
-        # to it are removed and object still lives in session; forcibly remove it,
-        # or otherwise when adding the same booster twice booster's table (typeID, fitID)
-        # constraint will report database integrity error
-        # TODO: make a proper fix, probably by adjusting fit-boosters sqlalchemy relationships
-        eos.db.remove(implant)
-
-    def freeSlot(self, slot):
-        if hasattr(slot, "slot"):
-            slot = slot.slot
-
-        try:
-            implant = self.__slotCache[slot]
-        except KeyError:
-            return False
-        try:
-            self.remove(implant)
-        except ValueError:
-            return False
-        return True
+        HandledList.append(self, thing)
 
 class HandledProjectedModList(HandledList):
+    def append(self, proj):
+        if proj.isInvalid:
+            # we must include it before we remove it. doing it this way ensures
+            # rows and relationships in database are removed as well
+            HandledList.append(self, proj)
+            self.remove(proj)
+            return
+
+        proj.projected = True
+        isSystemEffect = proj.item.group.name == "Effect Beacon"
+
+        if isSystemEffect:
+            # remove other system effects - only 1 per fit plz
+            oldEffect = next((m for m in self if m.item.group.name == "Effect Beacon"), None)
+
+            if oldEffect:
+                logging.info("System effect occupied with %s, replacing with %s", oldEffect.item.name, proj.item.name)
+                self.remove(oldEffect)
+
+        HandledList.append(self, proj)
+
+        # Remove non-projectable modules
+        if not proj.item.isType("projected") and not isSystemEffect:
+            self.remove(proj)
+
+class HandledProjectedDroneList(HandledDroneCargoList):
     def append(self, proj):
         proj.projected = True
         HandledList.append(self, proj)
 
-class HandledProjectedDroneList(HandledDroneList):
-    def append(self, proj):
-        proj.projected = True
-        list.append(self, proj)
-
-class HandledProjectedFitList(HandledList):
-    def append(self, proj):
-        proj.projected = True
-        list.append(self, proj)
+        # Remove invalid or non-projectable drones
+        if proj.isInvalid or not proj.item.isType("projected"):
+            self.remove(proj)
 
 class HandledItem(object):
     def preAssignItemAttr(self, *args, **kwargs):

eos/effects/addtosignatureradius2.py

@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules from group: Missile Launcher Bomb (2 of 2)
-# Modules from group: Shield Extender (37 of 37)
+# Modules from group: Shield Extender (25 of 25)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusAdd"))

eos/effects/ammoinfluencecapneed.py

@@ -1,7 +1,7 @@
 # ammoInfluenceCapNeed
 #
 # Used by:
-# Items from category: Charge (458 of 829)
+# Items from category: Charge (458 of 831)
 type = "passive"
 def handler(fit, module, context):
     # Dirty hack to work around cap charges setting cap booster

eos/effects/ammoinfluencerange.py

@@ -1,7 +1,7 @@
 # ammoInfluenceRange
 #
 # Used by:
-# Items from category: Charge (559 of 829)
+# Items from category: Charge (559 of 831)
 type = "passive"
 def handler(fit, module, context):
     module.multiplyItemAttr("maxRange", module.getModifiedChargeAttr("weaponRangeMultiplier"))

eos/effects/armordamageamountbonuscapitalarmorrepairers.py

@@ -6,4 +6,4 @@ type = "passive"
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"),
                                   "armorDamageAmount", implant.getModifiedItemAttr("repairBonus"),
-                                  stackingPenalties = True)
+                                  stackingPenalties=True)

eos/effects/armorhpbonusadd.py

@@ -1,7 +1,7 @@
 # armorHPBonusAdd
 #
 # Used by:
-# Modules from group: Armor Reinforcer (57 of 57)
+# Modules from group: Armor Reinforcer (41 of 41)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("armorHP", module.getModifiedItemAttr("armorHPBonusAdd"))

eos/effects/armorreinforcermassadd.py

@@ -1,7 +1,7 @@
 # armorReinforcerMassAdd
 #
 # Used by:
-# Modules from group: Armor Reinforcer (57 of 57)
+# Modules from group: Armor Reinforcer (41 of 41)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("mass", module.getModifiedItemAttr("massAddition"))

eos/effects/battlecruiserdronespeed.py

@@ -0,0 +1,9 @@
+# battlecruiserDroneSpeed
+#
+# Used by:
+# Ship: Myrmidon
+# Ship: Prophecy
+type = "passive"
+def handler(fit, ship, context):
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
+                                 "maxVelocity", ship.getModifiedItemAttr("roleBonusCBC"))

eos/effects/battlecruisermetrange.py

@@ -0,0 +1,10 @@
+# battlecruiserMETRange
+#
+# Used by:
+# Ships named like: Harbinger (2 of 2)
+type = "passive"
+def handler(fit, ship, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
+                                  "maxRange", ship.getModifiedItemAttr("roleBonusCBC"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
+                                  "falloff", ship.getModifiedItemAttr("roleBonusCBC"))

eos/effects/battlecruisermhtrange.py

@@ -0,0 +1,11 @@
+# battlecruiserMHTRange
+#
+# Used by:
+# Ships named like: Brutix (2 of 2)
+# Ship: Ferox
+type = "passive"
+def handler(fit, ship, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
+                                  "maxRange", ship.getModifiedItemAttr("roleBonusCBC"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
+                                  "falloff", ship.getModifiedItemAttr("roleBonusCBC"))

eos/effects/battlecruisermissilerange.py

@@ -0,0 +1,9 @@
+# battlecruiserMissileRange
+#
+# Used by:
+# Ships named like: Drake (2 of 2)
+# Ship: Cyclone
+type = "passive"
+def handler(fit, skill, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
+                                    "maxVelocity", skill.getModifiedItemAttr("roleBonusCBC"))

eos/effects/battlecruisermptrange.py

@@ -0,0 +1,10 @@
+# battlecruiserMPTRange
+#
+# Used by:
+# Ships named like: Hurricane (2 of 2)
+type = "passive"
+def handler(fit, ship, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
+                                  "maxRange", ship.getModifiedItemAttr("roleBonusCBC"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
+                                  "falloff", ship.getModifiedItemAttr("roleBonusCBC"))

eos/effects/blockaderunnercloakcpupercentbonus.py

@@ -5,6 +5,5 @@
 type = "passive"
 runTime = "early"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Transport Ships").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cloaking Device",
-                                  "cpu", ship.getModifiedItemAttr("eliteIndustrialCovertCloakBonus") * level)
+                                  "cpu", ship.getModifiedItemAttr("eliteIndustrialCovertCloakBonus"), skill="Transport Ships")

eos/effects/boosterarmorhppenalty.py

@@ -1,7 +1,7 @@
 # boosterArmorHpPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 37)
+# Implants from group: Booster (12 of 39)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.ship.boostItemAttr("armorHP", booster.getModifiedItemAttr("boosterArmorHPPenalty"))

eos/effects/boosterarmorrepairamountpenalty.py

@@ -1,7 +1,7 @@
 # boosterArmorRepairAmountPenalty
 #
 # Used by:
-# Implants from group: Booster (9 of 37)
+# Implants from group: Booster (9 of 39)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Unit",

eos/effects/boostermaxvelocitypenalty.py

@@ -1,7 +1,7 @@
 # boosterMaxVelocityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 37)
+# Implants from group: Booster (12 of 39)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.ship.boostItemAttr("maxVelocity", booster.getModifiedItemAttr("boosterMaxVelocityPenalty"))

eos/effects/boostershieldcapacitypenalty.py

@@ -1,7 +1,7 @@
 # boosterShieldCapacityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 37)
+# Implants from group: Booster (12 of 39)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.ship.boostItemAttr("shieldCapacity", booster.getModifiedItemAttr("boosterShieldCapacityPenalty"))

eos/effects/boosterturretoptimalrangepenalty.py

@@ -1,7 +1,7 @@
 # boosterTurretOptimalRangePenalty
 #
 # Used by:
-# Implants from group: Booster (9 of 37)
+# Implants from group: Booster (9 of 39)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),

eos/effects/caldarishipecmburstoptimalrangecb3.py

@@ -2,9 +2,7 @@
 #
 # Used by:
 # Ship: Scorpion
-# Ship: Scorpion Ishukone Watch
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Battleship").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM Burst",
-                                  "ecmBurstRange", ship.getModifiedItemAttr("shipBonusCB3") * level)
+                                  "ecmBurstRange", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")

eos/effects/caldarishipewcapacitorneedcc.py

@@ -6,6 +6,5 @@
 # Ship: Rook
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Cruiser").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusCC") * level)
+                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")

eos/effects/caldarishipewcapacitorneedcf2.py

@@ -4,6 +4,5 @@
 # Variations of ship: Griffin (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Frigate").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusCF2") * level)
+                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")

eos/effects/caldarishipewfalloffrangecb3.py

@@ -2,9 +2,7 @@
 #
 # Used by:
 # Ship: Scorpion
-# Ship: Scorpion Ishukone Watch
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Battleship").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "falloff", ship.getModifiedItemAttr("shipBonusCB3") * level)
+                                  "falloff", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")

eos/effects/caldarishipewfalloffrangecc2.py

@@ -4,6 +4,5 @@
 # Ship: Blackbird
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Cruiser").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "falloff", ship.getModifiedItemAttr("shipBonusCC2") * level)
+                                  "falloff", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")

eos/effects/caldarishipewoptimalrangecb3.py

@@ -2,9 +2,7 @@
 #
 # Used by:
 # Ship: Scorpion
-# Ship: Scorpion Ishukone Watch
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Battleship").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusCB3") * level)
+                                  "maxRange", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")

eos/effects/caldarishipewoptimalrangecc2.py

@@ -4,6 +4,5 @@
 # Ship: Blackbird
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Cruiser").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusCC2") * level)
+                                  "maxRange", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")

eos/effects/caldarishipewstrengthcb.py

@@ -2,11 +2,9 @@
 #
 # Used by:
 # Ship: Scorpion
-# Ship: Scorpion Ishukone Watch
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Battleship").level
     for sensorType in ("Gravimetric", "Ladar", "Magnetometric", "Radar"):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
                                       "scan{0}StrengthBonus".format(sensorType),
-                                      ship.getModifiedItemAttr("shipBonusCB") * level)
+                                      ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")

eos/effects/capacitorcapacitymultiply.py

@@ -4,7 +4,7 @@
 # Modules from group: Capacitor Flux Coil (6 of 6)
 # Modules from group: Capacitor Power Relay (20 of 20)
 # Modules from group: Power Diagnostic System (23 of 23)
-# Modules from group: Propulsion Module (107 of 107)
+# Modules from group: Propulsion Module (114 of 114)
 # Modules from group: Reactor Control Unit (22 of 22)
 # Modules from group: Shield Flux Coil (11 of 11)
 # Modules from group: Shield Power Relay (11 of 11)

eos/effects/carrieramarrarmorenergytransferrange3.py

@@ -5,9 +5,7 @@
 # Ship: Archon
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Amarr Carrier").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
-                                  "maxRange", ship.getModifiedItemAttr("carrierAmarrBonus3") * level)
+                                  "maxRange", ship.getModifiedItemAttr("carrierAmarrBonus3"), skill="Amarr Carrier")
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Capacitor Emission Systems"),
-                                  "powerTransferRange", ship.getModifiedItemAttr("carrierAmarrBonus3") * level)
-    
+                                  "powerTransferRange", ship.getModifiedItemAttr("carrierAmarrBonus3"), skill="Amarr Carrier")

eos/effects/carrieramarrarmorresist2.py

@@ -5,7 +5,6 @@
 # Ship: Archon
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Amarr Carrier").level
     for resType in ("Em", "Explosive", "Kinetic", "Thermal"):
         fit.ship.boostItemAttr("armor{0}DamageResonance".format(resType),
-                               ship.getModifiedItemAttr("carrierAmarrBonus2") * level)
+                               ship.getModifiedItemAttr("carrierAmarrBonus2"), skill="Amarr Carrier")

eos/effects/carrieramarrdronemax1.py

@@ -5,6 +5,4 @@
 # Ship: Archon
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Amarr Carrier").level
-    amount = ship.getModifiedItemAttr("carrierAmarrBonus1")
-    fit.extraAttributes.increase("maxActiveDrones", amount * level)
+    fit.extraAttributes.increase("maxActiveDrones", ship.getModifiedItemAttr("carrierAmarrBonus1"), skill="Amarr Carrier")

eos/effects/carrieramarrfighterbombermaxvelocity2.py

@@ -4,6 +4,5 @@
 # Ship: Revenant
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Amarr Carrier").level
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighter Bombers"),
-                                 "maxVelocity", ship.getModifiedItemAttr("carrierAmarrBonus2") * level)
+                                 "maxVelocity", ship.getModifiedItemAttr("carrierAmarrBonus2"), skill="Amarr Carrier")

eos/effects/carrieramarrfightermaxvelocity2.py

@@ -4,6 +4,5 @@
 # Ship: Revenant
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Amarr Carrier").level
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighters"),
-                                 "maxVelocity", ship.getModifiedItemAttr("carrierAmarrBonus2") * level)
+                                 "maxVelocity", ship.getModifiedItemAttr("carrierAmarrBonus2"), skill="Amarr Carrier")

eos/effects/carrieramarrleadershipmaxgroupactive4.py

@@ -5,6 +5,5 @@
 # Ship: Revenant
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Amarr Carrier").level
     fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator",
-                                     "maxGroupActive", ship.getModifiedItemAttr("carrierAmarrBonus4") * level)
+                                     "maxGroupActive", ship.getModifiedItemAttr("carrierAmarrBonus4"), skill="Amarr Carrier")

eos/effects/carriercaldaridronemax1.py

@@ -5,6 +5,4 @@
 # Ship: Wyvern
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Carrier").level
-    amount = ship.getModifiedItemAttr("carrierCaldariBonus1")
-    fit.extraAttributes.increase("maxActiveDrones", amount * level)
+    fit.extraAttributes.increase("maxActiveDrones", ship.getModifiedItemAttr("carrierCaldariBonus1"), skill="Caldari Carrier")

eos/effects/carriercaldarifightersandbomberssig1.py

@@ -4,6 +4,5 @@
 # Ship: Revenant
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Carrier").level
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighters") or drone.item.requiresSkill("Fighter Bombers"),
-                                 "signatureRadius", ship.getModifiedItemAttr("carrierCaldariBonus1") * level)
+                                 "signatureRadius", ship.getModifiedItemAttr("carrierCaldariBonus1"), skill="Caldari Carrier")

eos/effects/carriercaldarileadershipmaxgroupactive4.py

@@ -4,6 +4,5 @@
 # Ship: Wyvern
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Carrier").level
     fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator",
-                                     "maxGroupActive", ship.getModifiedItemAttr("carrierCaldariBonus4") * level)
+                                     "maxGroupActive", ship.getModifiedItemAttr("carrierCaldariBonus4"), skill="Caldari Carrier")

eos/effects/carriercaldarishieldenergytransferrange3.py

@@ -6,8 +6,7 @@
 # Ship: Wyvern
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Carrier").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "shieldTransferRange", ship.getModifiedItemAttr("carrierCaldariBonus3") * level)
+                                  "shieldTransferRange", ship.getModifiedItemAttr("carrierCaldariBonus3"), skill="Caldari Carrier")
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Capacitor Emission Systems"),
-                                  "powerTransferRange", ship.getModifiedItemAttr("carrierCaldariBonus3") * level)
+                                  "powerTransferRange", ship.getModifiedItemAttr("carrierCaldariBonus3"), skill="Caldari Carrier")

eos/effects/carriercaldarishieldresist2.py

@@ -5,7 +5,6 @@
 # Ship: Wyvern
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Carrier").level
     for resType in ("Em", "Explosive", "Kinetic", "Thermal"):
         fit.ship.boostItemAttr("shield{0}DamageResonance".format(resType),
-                               ship.getModifiedItemAttr("carrierCaldariBonus2") * level)
+                               ship.getModifiedItemAttr("carrierCaldariBonus2"), skill="Caldari Carrier")

eos/effects/carriergallentearmorshieldtransferrange3.py

@@ -5,8 +5,7 @@
 # Ship: Thanatos
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Gallente Carrier").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "shieldTransferRange", ship.getModifiedItemAttr("carrierGallenteBonus3") * level)
+                                  "shieldTransferRange", ship.getModifiedItemAttr("carrierGallenteBonus3"), skill="Gallente Carrier")
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
-                                  "maxRange", ship.getModifiedItemAttr("carrierGallenteBonus3") * level)
+                                  "maxRange", ship.getModifiedItemAttr("carrierGallenteBonus3"), skill="Gallente Carrier")

eos/effects/carriergallentebomberdroneowndmg2.py

@@ -4,6 +4,5 @@
 # Ship: Nyx
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Gallente Carrier").level
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighter Bombers"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("carrierGallenteBonus2") * level)
+                                 "damageMultiplier", ship.getModifiedItemAttr("carrierGallenteBonus2"), skill="Gallente Carrier")

eos/effects/carriergallentedronemax1.py

@@ -5,6 +5,4 @@
 # Ship: Thanatos
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Gallente Carrier").level
-    amount = ship.getModifiedItemAttr("carrierGallenteBonus1")
-    fit.extraAttributes.increase("maxActiveDrones", amount * level)
+    fit.extraAttributes.increase("maxActiveDrones", ship.getModifiedItemAttr("carrierGallenteBonus1"), skill="Gallente Carrier")

eos/effects/carriergallentedroneowndmg2.py

@@ -5,6 +5,5 @@
 # Ship: Thanatos
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Gallente Carrier").level
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighters"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("carrierGallenteBonus2") * level)
+                                 "damageMultiplier", ship.getModifiedItemAttr("carrierGallenteBonus2"), skill="Gallente Carrier")

eos/effects/carriergallenteleadershipmaxgroupactive4.py

@@ -4,6 +4,5 @@
 # Ship: Nyx
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Gallente Carrier").level
     fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator",
-                                     "maxGroupActive", ship.getModifiedItemAttr("carrierGallenteBonus4") * level)
+                                     "maxGroupActive", ship.getModifiedItemAttr("carrierGallenteBonus4"), skill="Gallente Carrier")

eos/effects/carrierminmatararmorshieldamount.py

@@ -5,8 +5,7 @@
 # Ship: Nidhoggur
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Minmatar Carrier").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster",
-                                  "shieldBonus", ship.getModifiedItemAttr("carrierMinmatarBonus2") * level)
+                                  "shieldBonus", ship.getModifiedItemAttr("carrierMinmatarBonus2"), skill="Minmatar Carrier")
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer",
-                                  "armorDamageAmount", ship.getModifiedItemAttr("carrierMinmatarBonus2") * level)
+                                  "armorDamageAmount", ship.getModifiedItemAttr("carrierMinmatarBonus2"), skill="Minmatar Carrier")

eos/effects/carrierminmatararmorshieldtransferrange3.py

@@ -5,8 +5,7 @@
 # Ship: Nidhoggur
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Minmatar Carrier").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "shieldTransferRange", ship.getModifiedItemAttr("carrierMinmatarBonus3") * level)
+                                  "shieldTransferRange", ship.getModifiedItemAttr("carrierMinmatarBonus3"), skill="Minmatar Carrier")
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
-                                  "maxRange", ship.getModifiedItemAttr("carrierMinmatarBonus3") * level)
+                                  "maxRange", ship.getModifiedItemAttr("carrierMinmatarBonus3"), skill="Minmatar Carrier")

eos/effects/carrierminmatardronemax1.py

@@ -5,6 +5,4 @@
 # Ship: Nidhoggur
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Minmatar Carrier").level
-    amount = ship.getModifiedItemAttr("carrierMinmatarBonus1")
-    fit.extraAttributes.increase("maxActiveDrones", amount * level)
+    fit.extraAttributes.increase("maxActiveDrones", ship.getModifiedItemAttr("carrierMinmatarBonus1"), skill="Minmatar Carrier")

eos/effects/carrierminmatarleadershipmaxgroupactive4.py

@@ -4,6 +4,5 @@
 # Ship: Hel
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Minmatar Carrier").level
     fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator",
-                                     "maxGroupActive", ship.getModifiedItemAttr("carrierMinmatarBonus4") * level)
+                                     "maxGroupActive", ship.getModifiedItemAttr("carrierMinmatarBonus4"), skill="Minmatar Carrier")

eos/effects/commandbonustdmultiplywithcommandbonushidden.py

@@ -8,5 +8,5 @@ type = "active", "gang"
 def handler(fit, module, context):
     if "gang" not in context: return
     for bonus in ("maxRangeBonus", "falloffBonus", "trackingSpeedBonus"):
-        fit.modules.filteredItemBoost(lambda mod: lambda mod: mod.item.requiresSkill("Weapon Disruption"),
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
                                       bonus, module.getModifiedItemAttr("commandBonusTD"))

eos/effects/commandshipmultirelayeffect.py

@@ -1,9 +1,9 @@
 # commandshipMultiRelayEffect
 #
 # Used by:
-# Ships from group: Capital Industrial Ship (2 of 2)
 # Ships from group: Command Ship (8 of 8)
-# Ships from group: Industrial Command Ship (2 of 2)
+# Ship: Orca
+# Ship: Rorqual
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator",

eos/effects/covertopscloakcpupercentbonus1.py

@@ -5,6 +5,5 @@
 type = "passive"
 runTime = "early"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Covert Ops").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cloaking Device",
-                                  "cpu", ship.getModifiedItemAttr("eliteBonusCoverOps1") * level)
+                                  "cpu", ship.getModifiedItemAttr("eliteBonusCoverOps1"), skill="Covert Ops")

eos/effects/drawbackcpuoutput.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Modules from group: Rig Drones (64 of 64)
-# Modules named like: Optimizer (16 of 16)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.boostItemAttr("cpuOutput", module.getModifiedItemAttr("drawback"))

eos/effects/drawbacksigrad.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Modules from group: Rig Shield (72 of 72)
+# Modules named like: Optimizer (16 of 16)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("drawback"), stackingPenalties = True)

eos/effects/dreadnoughtmd1projdmgbonus.py

@@ -1,9 +1,8 @@
 # dreadnoughtMD1ProjDmgBonus
 #
 # Used by:
-# Ships named like: Naglfar (2 of 2)
+# Ship: Naglfar
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Minmatar Dreadnought").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("dreadnoughtShipBonusM1") * level)
+                                  "damageMultiplier", ship.getModifiedItemAttr("dreadnoughtShipBonusM1"), skill="Minmatar Dreadnought")

eos/effects/dreadnoughtmd3projrofbonus.py

@@ -1,9 +1,8 @@
 # dreadnoughtMD3ProjRoFBonus
 #
 # Used by:
-# Ships named like: Naglfar (2 of 2)
+# Ship: Naglfar
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Minmatar Dreadnought").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"),
-                                  "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusM3") * level)
+                                  "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusM3"), skill="Minmatar Dreadnought")

eos/effects/dreadnoughtshipbonushybriddmgg1.py

@@ -1,9 +1,8 @@
 # dreadnoughtShipBonusHybridDmgG1
 #
 # Used by:
-# Ships named like: Moros (2 of 2)
+# Ship: Moros
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Gallente Dreadnought").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("dreadnoughtShipBonusG1") * level)
+                                  "damageMultiplier", ship.getModifiedItemAttr("dreadnoughtShipBonusG1"), skill="Gallente Dreadnought")

eos/effects/dreadnoughtshipbonushybridrofg2.py

@@ -1,9 +1,8 @@
 # dreadnoughtShipBonusHybridRoFG2
 #
 # Used by:
-# Ships named like: Moros (2 of 2)
+# Ship: Moros
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Gallente Dreadnought").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"),
-                                  "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusG2") * level)
+                                  "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusG2"), skill="Gallente Dreadnought")

eos/effects/dreadnoughtshipbonuslasercapneeda1.py

@@ -1,9 +1,8 @@
 # dreadnoughtShipBonusLaserCapNeedA1
 #
 # Used by:
-# Ships named like: Revelation (2 of 2)
+# Ship: Revelation
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Amarr Dreadnought").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("dreadnoughtShipBonusA1") * level)
+                                  "capacitorNeed", ship.getModifiedItemAttr("dreadnoughtShipBonusA1"), skill="Amarr Dreadnought")

eos/effects/dreadnoughtshipbonuslaserrofa2.py

@@ -1,9 +1,8 @@
 # dreadnoughtShipBonusLaserRofA2
 #
 # Used by:
-# Ships named like: Revelation (2 of 2)
+# Ship: Revelation
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Amarr Dreadnought").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"),
-                                  "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusA2") * level)
+                                  "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusA2"), skill="Amarr Dreadnought")

eos/effects/dreadnoughtshipbonusshieldresistancesc2.py

@@ -1,10 +1,9 @@
 # dreadnoughtShipBonusShieldResistancesC2
 #
 # Used by:
-# Ships named like: Phoenix (2 of 2)
+# Ship: Phoenix
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Dreadnought").level
     for damageType in ("em", "thermal", "explosive", "kinetic"):
         fit.ship.boostItemAttr("shield{}DamageResonance".format(damageType.capitalize()),
-                               ship.getModifiedItemAttr("dreadnoughtShipBonusC2") * level)
+                               ship.getModifiedItemAttr("dreadnoughtShipBonusC2"), skill="Caldari Dreadnought")

eos/effects/elitebargebonusiceharvestingcycletimebarge3.py

@@ -1,9 +1,8 @@
 # eliteBargeBonusIceHarvestingCycleTimeBarge3
 #
 # Used by:
-# Ships from group: Exhumer (4 of 4)
+# Ships from group: Exhumer (3 of 3)
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Exhumers").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"),
-                                  "duration", ship.getModifiedItemAttr("eliteBonusBarge2") * level)
+                                  "duration", ship.getModifiedItemAttr("eliteBonusBarge2"), skill="Exhumers")

eos/effects/elitebargebonusminingdurationbarge2.py

@@ -1,9 +1,8 @@
 # eliteBargeBonusMiningDurationBarge2
 #
 # Used by:
-# Ships from group: Exhumer (4 of 4)
+# Ships from group: Exhumer (3 of 3)
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Exhumers").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
-                                  "duration", ship.getModifiedItemAttr("eliteBonusBarge2") * level)
+                                  "duration", ship.getModifiedItemAttr("eliteBonusBarge2"), skill="Exhumers")

eos/effects/elitebargeshieldresistance1.py

@@ -1,10 +1,9 @@
 # eliteBargeShieldResistance1
 #
 # Used by:
-# Ships from group: Exhumer (4 of 4)
+# Ships from group: Exhumer (3 of 3)
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Exhumers").level
     for damageType in ("em", "thermal", "explosive", "kinetic"):
         fit.ship.boostItemAttr("shield{}DamageResonance".format(damageType.capitalize()),
-                               ship.getModifiedItemAttr("eliteBonusBarge1") * level)
+                               ship.getModifiedItemAttr("eliteBonusBarge1"), skill="Exhumers")

eos/effects/elitebonusassaultshiplightmissilerof.py

@@ -4,6 +4,5 @@
 # Ship: Cambion
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Assault Frigates").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Light",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusGunship1") * level)
+                                  "speed", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")

eos/effects/elitebonusassaultshipmissilevelocity1.py

@@ -4,6 +4,5 @@
 # Ship: Hawk
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Assault Frigates").level
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusGunship1") * level)
+                                    "maxVelocity", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")

eos/effects/elitebonusassaultshiprocketrof.py

@@ -4,6 +4,5 @@
 # Ship: Cambion
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Assault Frigates").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rocket",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusGunship1") * level)
+                                  "speed", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")

eos/effects/elitebonusblackopsagiliy1.py

@@ -4,5 +4,4 @@
 # Ship: Sin
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Black Ops").level
-    fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("eliteBonusBlackOps1") * level)
+    fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops")

eos/effects/elitebonusblackopscloakvelocity2.py

@@ -5,5 +5,4 @@
 type = "passive"
 def handler(fit, ship, context):
     if fit.extraAttributes["cloaked"]:
-        level = fit.character.getSkill("Black Ops").level
-        fit.ship.multiplyItemAttr("maxVelocity", ship.getModifiedItemAttr("eliteBonusBlackOps2") * level)
+        fit.ship.multiplyItemAttr("maxVelocity", ship.getModifiedItemAttr("eliteBonusBlackOps2"), skill="Black Ops")

eos/effects/elitebonusblackopsecmburstgravandladarandmagnetoandradar.py

@@ -4,8 +4,7 @@
 # Ship: Widow
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Black Ops").level
     sensorTypes = ("Gravimetric", "Ladar", "Magnetometric", "Radar")
     for type in sensorTypes:
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM Burst", "scan{0}StrengthBonus".format(type),
-                                      ship.getModifiedItemAttr("eliteBonusBlackOps1") * level)
+                                      ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops")

eos/effects/elitebonusblackopsecmgravandladarandmagnetometricandradarstrength1.py

@@ -4,8 +4,7 @@
 # Ship: Widow
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Black Ops").level
     sensorTypes = ("Gravimetric", "Ladar", "Magnetometric", "Radar")
     for type in sensorTypes:
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "scan{0}StrengthBonus".format(type),
-                                      ship.getModifiedItemAttr("eliteBonusBlackOps1") * level)
+                                      ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops")

eos/effects/elitebonusblackopslargeenergyturrettracking1.py

@@ -4,6 +4,5 @@
 # Ship: Redeemer
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Black Ops").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusBlackOps1") * level)
+                                  "trackingSpeed", ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops")

eos/effects/elitebonusblackopsmaxvelocity1.py

@@ -4,5 +4,4 @@
 # Ship: Panther
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Black Ops").level
-    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("eliteBonusBlackOps1") * level)
+    fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops")

eos/effects/elitebonuscommandshiparmoredcs3.py

@@ -4,6 +4,5 @@
 # Ships from group: Command Ship (4 of 8)
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Command Ships").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"),
-                                  "commandBonus", ship.getModifiedItemAttr("eliteBonusCommandShips3") * level)
+                                  "commandBonus", ship.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")

eos/effects/elitebonuscommandshiparmorhp1.py

@@ -4,5 +4,4 @@
 # Ship: Damnation
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Command Ships").level
-    fit.ship.boostItemAttr("armorHP", ship.getModifiedItemAttr("eliteBonusCommandShips1") * level)
+    fit.ship.boostItemAttr("armorHP", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships")

eos/effects/elitebonuscommandshiphamrofcs1.py

@@ -5,6 +5,5 @@
 # Ship: Nighthawk
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Command Ships").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusCommandShips1") * level)
+                                  "speed", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships")

eos/effects/elitebonuscommandshipheavyassaultmissiledamagecs2.py

@@ -4,8 +4,7 @@
 # Ship: Damnation
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Command Ships").level
     damageTypes = ("em", "explosive", "kinetic", "thermal")
     for damageType in damageTypes:
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("eliteBonusCommandShips2") * level)
+                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")

eos/effects/elitebonuscommandshipheavydronetrackingcs2.py

@@ -4,6 +4,5 @@
 # Ship: Eos
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Command Ships").level
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "trackingSpeed", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level)
+                                 "trackingSpeed", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")

eos/effects/elitebonuscommandshipheavydronevelocitycs2.py

@@ -4,6 +4,5 @@
 # Ship: Eos
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Command Ships").level
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "maxVelocity", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level)
+                                 "maxVelocity", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")

eos/effects/elitebonuscommandshipheavymissiledamagecs2.py

@@ -4,8 +4,7 @@
 # Ship: Damnation
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Command Ships").level
     damageTypes = ("em", "explosive", "kinetic", "thermal")
     for damageType in damageTypes:
         fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),
-                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("eliteBonusCommandShips2") * level)
+                                        "{0}Damage".format(damageType), ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")

eos/effects/elitebonuscommandshiphmrofcs1.py

@@ -5,6 +5,5 @@
 # Ship: Nighthawk
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Command Ships").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusCommandShips1") * level)
+                                  "speed", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships")

eos/effects/elitebonuscommandshiphybridfalloffcs2.py

@@ -4,6 +4,5 @@
 # Ship: Astarte
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Command Ships").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "falloff", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level)
+                                  "falloff", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")

eos/effects/elitebonuscommandshiphybridoptimalcs1.py

@@ -4,6 +4,5 @@
 # Ship: Vulture
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Command Ships").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("eliteBonusCommandShips1") * level)
+                                  "maxRange", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships")

eos/effects/elitebonuscommandshipinformationcs3.py

@@ -4,6 +4,5 @@
 # Ships from group: Command Ship (4 of 8)
 type = "passive"
 def handler(fit, module, context):
-    level = fit.character.getSkill("Command Ships").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
-                                  "commandBonus", module.getModifiedItemAttr("eliteBonusCommandShips3") * level)
+                                  "commandBonus", module.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")

eos/effects/elitebonuscommandshipinformationhiddencs3.py

@@ -4,6 +4,5 @@
 # Ships from group: Command Ship (4 of 8)
 type = "passive"
 def handler(fit, module, context):
-    level = fit.character.getSkill("Command Ships").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"),
-                                  "commandBonusHidden", module.getModifiedItemAttr("eliteBonusCommandShips3") * level)
+                                  "commandBonusHidden", module.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")

eos/effects/elitebonuscommandshiplaserdamagecs1.py

@@ -4,6 +4,5 @@
 # Ship: Absolution
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Command Ships").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusCommandShips1") * level)
+                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships")

eos/effects/elitebonuscommandshiplaserrofcs2.py

@@ -4,6 +4,5 @@
 # Ship: Absolution
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Command Ships").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "speed", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level)
+                                  "speed", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")

eos/effects/elitebonuscommandshipmediumhybriddamagecs2.py

@@ -4,6 +4,5 @@
 # Ship: Vulture
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Command Ships").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level)
+                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships")

eos/effects/elitebonuscommandshipmediumhybridrofcs1.py

@@ -4,6 +4,5 @@
 # Ship: Astarte
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Command Ships").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
-                                  "speed", ship.getModifiedItemAttr("eliteBonusCommandShips1") * level)
+                                  "speed", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships")