Update to 908326

fix issue copying fits with sqlalchemy 1.0

.gitignore

@@ -11,8 +11,12 @@
 
 #Patch files
 *.patch
+
 #Personal
-/saveddata
+saveddata/
+
+#PyCharm
+.idea/
 
 #Pyfa file
 pyfaFits.html

config.py

@@ -1,90 +1,95 @@
-import os
-import sys
-
-# Load variable overrides specific to distribution type
-try:
-    import configforced
-except ImportError:
-    configforced = None
-
-# Turns on debug mode
-debug = False
-# Defines if our saveddata will be in pyfa root or not
-saveInRoot = False
-
-# Version data
-version = "1.6.1"
-tag = "Stable"
-expansionName = "Phoebe"
-expansionVersion = "1.0"
-evemonMinVersion = "4081"
-
-# Database version (int ONLY)
-# Increment every time we need to flag for user database upgrade/modification
-dbversion = 2
-
-pyfaPath = None
-savePath = None
-staticPath = None
-saveDB = None
-gameDB = None
-
-def defPaths():
-    global pyfaPath
-    global savePath
-    global staticPath
-    global saveDB
-    global gameDB
-    global saveInRoot
-    # The main pyfa directory which contains run.py
-    # Python 2.X uses ANSI by default, so we need to convert the character encoding
-    pyfaPath = getattr(configforced, "pyfaPath", pyfaPath)
-    if pyfaPath is None:
-        pyfaPath = unicode(os.path.dirname(os.path.realpath(os.path.abspath(
-            sys.modules['__main__'].__file__))), sys.getfilesystemencoding())
-
-    # Where we store the saved fits etc, default is the current users home directory
-    if saveInRoot is True:
-        savePath = getattr(configforced, "savePath", None)
-        if savePath is None:
-            savePath = os.path.join(pyfaPath, "saveddata")
-    else:
-        savePath = getattr(configforced, "savePath", None)
-        if savePath is None:
-            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")
-
-    # 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")
-
-    # Static EVE Data from the staticdata repository, should be in the staticdata
-    # directory in our pyfa directory
-    staticPath = os.path.join(pyfaPath, "staticdata")
-
-    # The database where we store all the fits etc
-    saveDB = os.path.join(savePath, "saveddata.db")
-
-    # The database where the static EVE data from the datadump is kept.
-    # This is not the standard sqlite datadump but a modified version created by eos
-    # maintenance script
-    gameDB = os.path.join(staticPath, "eve.db")
-
-    ## DON'T MODIFY ANYTHING BELOW ##
-    import eos.config
-
-    #Caching modifiers, disable all gamedata caching, its unneeded.
-    eos.config.gamedataCache = False
-    # saveddata db location modifier, shouldn't ever need to touch this
-    eos.config.saveddata_connectionstring = "sqlite:///" + saveDB + "?check_same_thread=False"
-    eos.config.gamedata_connectionstring = "sqlite:///" + gameDB + "?check_same_thread=False"
+import os
+import sys
+
+# Load variable overrides specific to distribution type
+try:
+    import configforced
+except ImportError:
+    configforced = None
+
+# Turns on debug mode
+debug = False
+# Defines if our saveddata will be in pyfa root or not
+saveInRoot = False
+
+# Version data
+version = "1.12.1"
+tag = "git"
+expansionName = "Singularity"
+expansionVersion = "908326"
+evemonMinVersion = "4081"
+
+# Database version (int ONLY)
+# Increment every time we need to flag for user database upgrade/modification
+dbversion = 7
+
+pyfaPath = None
+savePath = None
+staticPath = None
+saveDB = None
+gameDB = None
+
+# TODO: move 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
+logging.basicConfig()
+
+def defPaths():
+    global pyfaPath
+    global savePath
+    global staticPath
+    global saveDB
+    global gameDB
+    global saveInRoot
+    # The main pyfa directory which contains run.py
+    # Python 2.X uses ANSI by default, so we need to convert the character encoding
+    pyfaPath = getattr(configforced, "pyfaPath", pyfaPath)
+    if pyfaPath is None:
+        pyfaPath = unicode(os.path.dirname(os.path.realpath(os.path.abspath(
+            sys.modules['__main__'].__file__))), sys.getfilesystemencoding())
+
+    # Where we store the saved fits etc, default is the current users home directory
+    if saveInRoot is True:
+        savePath = getattr(configforced, "savePath", None)
+        if savePath is None:
+            savePath = os.path.join(pyfaPath, "saveddata")
+    else:
+        savePath = getattr(configforced, "savePath", None)
+        if savePath is None:
+            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")
+
+    # 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")
+
+    # Static EVE Data from the staticdata repository, should be in the staticdata
+    # directory in our pyfa directory
+    staticPath = os.path.join(pyfaPath, "staticdata")
+
+    # The database where we store all the fits etc
+    saveDB = os.path.join(savePath, "saveddata.db")
+
+    # The database where the static EVE data from the datadump is kept.
+    # This is not the standard sqlite datadump but a modified version created by eos
+    # maintenance script
+    gameDB = os.path.join(staticPath, "eve.db")
+
+    ## DON'T MODIFY ANYTHING BELOW ##
+    import eos.config
+
+    #Caching modifiers, disable all gamedata caching, its unneeded.
+    eos.config.gamedataCache = False
+    # saveddata db location modifier, shouldn't ever need to touch this
+    eos.config.saveddata_connectionstring = "sqlite:///" + saveDB + "?check_same_thread=False"
+    eos.config.gamedata_connectionstring = "sqlite:///" + gameDB + "?check_same_thread=False"

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

@@ -1,11 +1,11 @@
-import os.path
+from os.path import realpath, join, dirname, abspath
 import sys
 
 debug = False
 gamedataCache = True
 saveddataCache = True
-gamedata_connectionstring = 'sqlite:///' + os.path.expanduser(os.path.join("~", ".pyfa","eve.db"))
+gamedata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "staticdata", "eve.db")), sys.getfilesystemencoding())
 saveddata_connectionstring = 'sqlite:///:memory:'
 
 #Autodetect path, only change if the autodetection bugs out.
-path = os.path.dirname(unicode(__file__, sys.getfilesystemencoding()))
+path = dirname(unicode(__file__, sys.getfilesystemencoding()))

eos/db/__init__.py

@@ -40,6 +40,15 @@ gamedata_meta = MetaData()
 gamedata_meta.bind = gamedata_engine
 gamedata_session = sessionmaker(bind=gamedata_engine, autoflush=False, expire_on_commit=False)()
 
+# This should be moved elsewhere, maybe as an actual query. Current, without try-except, it breaks when making a new
+# game db because we haven't reached gamedata_meta.create_all()
+try:
+    config.gamedata_version = gamedata_session.execute(
+            "SELECT `field_value` FROM `metadata` WHERE `field_name` LIKE 'client_build'"
+        ).fetchone()[0]
+except:
+    config.gamedata_version = None
+
 saveddata_connectionstring = config.saveddata_connectionstring
 if saveddata_connectionstring is not None:
     if callable(saveddata_connectionstring):
@@ -65,7 +74,8 @@ from eos.db.saveddata.queries import getUser, getCharacter, getFit, getFitsWithS
                                      getCharacterList, getPrice, getDamagePatternList, getDamagePattern, \
                                      getFitList, getFleetList, getFleet, save, remove, commit, add, \
                                      getCharactersForUser, getMiscData, getSquadsIDsWithFitID, getWing, \
-                                     getSquad, getBoosterFits, getProjectedFits, getTargetResistsList, getTargetResists
+                                     getSquad, getBoosterFits, getProjectedFits, getTargetResistsList, getTargetResists,\
+                                     clearPrices, countAllFits
 
 #If using in memory saveddata, you'll want to reflect it so the data structure is good.
 if config.saveddata_connectionstring == "sqlite:///:memory:":
@@ -74,3 +84,4 @@ if config.saveddata_connectionstring == "sqlite:///:memory:":
 def rollback():
     with sd_lock:
         saveddata_session.rollback()
+

eos/db/gamedata/item.py

@@ -30,6 +30,7 @@ items_table = Table("invtypes", gamedata_meta,
                     Column("typeName", String, index=True),
                     Column("description", String),
                     Column("raceID", Integer),
+                    Column("factionID", Integer),
                     Column("volume", Float),
                     Column("mass", Float),
                     Column("capacity", Float),

eos/db/gamedata/metaData.py

@@ -23,7 +23,7 @@ from eos.types import MetaData
 from eos.db import gamedata_meta
 
 metadata_table = Table("metadata", gamedata_meta,
-                           Column("fieldName", String, primary_key=True),
-                           Column("fieldValue", String))
+                           Column("field_name", String, primary_key=True),
+                           Column("field_value", String))
 
 mapper(MetaData, metadata_table)

eos/db/migrations/upgrade3.py

@@ -0,0 +1,13 @@
+"""
+Migration 3
+
+- Adds mode column for fits (t3 dessy)
+"""
+
+import sqlalchemy
+
+def upgrade(saveddata_engine):
+    try:
+        saveddata_engine.execute("SELECT modeID FROM fits LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE fits ADD COLUMN modeID INTEGER")

eos/db/migrations/upgrade4.py

@@ -0,0 +1,141 @@
+"""
+Migration 4
+
+- Converts modules based on Proteus 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
+
+    Based on http://community.eveonline.com/news/patch-notes/patch-notes-for-proteus/
+    and output of itemDiff.py
+"""
+
+
+CONVERSIONS = {
+    506: (  # 'Basic' Capacitor Power Relay
+        8205,  # Alpha Reactor Control: Capacitor Power Relay
+        8209,  # Marked Generator Refitting: Capacitor Power Relay
+        8203,  # Partial Power Plant Manager: Capacity Power Relay
+        8207,  # Type-E Power Core Modification: Capacitor Power Relay
+    ),
+    8177: (  # Mark I Compact Capacitor Power Relay
+        8173,  # Beta Reactor Control: Capacitor Power Relay I
+    ),
+    8175: (  # Type-D Restrained Capacitor Power Relay
+        8171,  # Local Power Plant Manager: Capacity Power Relay I
+    ),
+
+    421: (  # 'Basic' Capacitor Recharger
+        4425,  # AGM Capacitor Charge Array,
+        4421,  # F-a10 Buffer Capacitor Regenerator
+        4423,  # Industrial Capacitor Recharger
+        4427,  # Secondary Parallel Link-Capacitor
+    ),
+    4435: (  # Eutectic Compact Cap Recharger
+        4433,  # Barton Reactor Capacitor Recharger I
+        4431,  # F-b10 Nominal Capacitor Regenerator
+        4437,  # Fixed Parallel Link-Capacitor I
+    ),
+
+    1315: (  # 'Basic' Expanded Cargohold
+        5483,  # Alpha Hull Mod Expanded Cargo
+        5479,  # Marked Modified SS Expanded Cargo
+        5481,  # Partial Hull Conversion Expanded Cargo
+        5485,  # Type-E Altered SS Expanded Cargo
+    ),
+    5493: (  # Type-D Restrained Expanded Cargo
+        5491,  # Beta Hull Mod Expanded Cargo
+        5489,  # Local Hull Conversion Expanded Cargo I
+        5487,  # Mark I Modified SS Expanded Cargo
+    ),
+
+    1401: (  # 'Basic' Inertial Stabilizers
+        5523,  # Alpha Hull Mod Inertial Stabilizers
+        5521,  # Partial Hull Conversion Inertial Stabilizers
+        5525,  # Type-E Altered SS Inertial Stabilizers
+    ),
+    5533: (  # Type-D Restrained Inertial Stabilizers
+        5531,  # Beta Hull Mod Inertial Stabilizers
+        5529,  # Local Hull Conversion Inertial Stabilizers I
+        5527,  # Mark I Modified SS Inertial Stabilizers
+        5519,  # Marked Modified SS Inertial Stabilizers
+    ),
+
+    5239: (  # EP-S Gaussian Scoped Mining Laser
+        5241,  # Dual Diode Mining Laser I
+    ),
+    5233: (  # Single Diode Basic Mining Laser
+        5231,  # EP-R Argon Ion Basic Excavation Pulse
+        5237,  # Rubin Basic Particle Bore Stream
+        5235,  # Xenon Basic Drilling Beam
+    ),
+    5245: (  # Particle Bore Compact Mining Laser
+        5243,  # XeCl Drilling Beam I
+    ),
+
+    22619: (  # Frigoris Restrained Ice Harvester Upgrade
+        22617,  # Crisium Ice Harvester Upgrade
+    ),
+    22611: (  # Elara Restrained Mining Laser Upgrade
+        22609,  # Erin Mining Laser Upgrade
+    ),
+
+    1242: (  # 'Basic' Nanofiber Internal Structure
+        5591,  # Alpha Hull Mod Nanofiber Structure
+        5595,  # Marked Modified SS Nanofiber Structure
+        5559,  # Partial Hull Conversion Nanofiber Structure
+        5593,  # Type-E Altered SS Nanofiber Structure
+    ),
+    5599: (  # Type-D Restrained Nanofiber Structure
+        5597,  # Beta Hull Mod Nanofiber Structure
+        5561,  # Local Hull Conversion Nanofiber Structure I
+        5601,  # Mark I Modified SS Nanofiber Structure
+    ),
+
+    1192: (  # 'Basic' Overdrive Injector System
+        5613,  # Alpha Hull Mod Overdrive Injector
+        5617,  # Marked Modified SS Overdrive Injector
+        5611,  # Partial Hull Conversion Overdrive Injector
+        5615,  # Type-E Altered SS Overdrive Injector
+    ),
+    5631: (  # Type-D Restrained Overdrive Injector
+        5629,  # Beta Hull Mod Overdrive Injector
+        5627,  # Local Hull Conversion Overdrive Injector I
+        5633,  # Mark I Modified SS Overdrive Injector
+    ),
+
+    1537: (  # 'Basic' Power Diagnostic System
+        8213,  # Alpha Reactor Control: Diagnostic System
+        8217,  # Marked Generator Refitting: Diagnostic System
+        8211,  # Partial Power Plant Manager: Diagnostic System
+        8215,  # Type-E Power Core Modification: Diagnostic System
+        8255,  # Type-E Power Core Modification: Reaction Control
+    ),
+    8225: (  # Mark I Compact Power Diagnostic System
+        8221,  # Beta Reactor Control: Diagnostic System I
+        8219,  # Local Power Plant Manager: Diagnostic System I
+        8223,  # Type-D Power Core Modification: Diagnostic System
+    ),
+
+    1240: (  # 'Basic' Reinforced Bulkheads
+        5677,  # Alpha Hull Mod Reinforced Bulkheads
+        5681,  # Marked Modified SS Reinforced Bulkheads
+        5675,  # Partial Hull Conversion Reinforced Bulkheads
+        5679,  # Type-E Altered SS Reinforced Bulkheads
+    ),
+    5649: (  # Mark I Compact Reinforced Bulkheads
+        5645,  # Beta Hull Mod Reinforced Bulkheads
+    ),
+    5647: (  # Type-D Restrained Reinforced Bulkheads
+        5643,  # Local Hull Conversion Reinforced Bulkheads 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/upgrade5.py

@@ -0,0 +1,8 @@
+"""
+Migration 5
+
+Simply deletes damage profiles with a blank name. See GH issue #256
+"""
+
+def upgrade(saveddata_engine):
+    saveddata_engine.execute('DELETE FROM damagePatterns WHERE name LIKE ?', ("",))

eos/db/migrations/upgrade6.py

@@ -0,0 +1,9 @@
+"""
+Migration 6
+
+Overwrites damage profile 0 to reset bad uniform values (bad values set with bug)
+"""
+
+def upgrade(saveddata_engine):
+    saveddata_engine.execute('DELETE FROM damagePatterns WHERE name LIKE ? OR ID LIKE ?', ("Uniform", "1"))
+    saveddata_engine.execute('INSERT INTO damagePatterns VALUES (?, ?, ?, ?, ?, ?, ?)', (1, "Uniform", 25, 25, 25, 25, None))

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,88 @@
+"""
+Migration 4
+
+- Converts modules based on Proteus 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
+
+    Based on http://community.eveonline.com/news/patch-notes/patch-notes-for-proteus/
+    and output of itemDiff.py
+"""
+
+
+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/saveddata/fit.py

@@ -40,7 +40,9 @@ fits_table = Table("fits", saveddata_meta,
                          Column("characterID", ForeignKey("characters.ID"), nullable = True),
                          Column("damagePatternID", ForeignKey("damagePatterns.ID"), nullable=True),
                          Column("booster", Boolean, nullable = False, index = True, default = 0),
-                         Column("targetResistsID", ForeignKey("targetResists.ID"), nullable=True))
+                         Column("targetResistsID", ForeignKey("targetResists.ID"), nullable=True),
+                         Column("modeID", Integer, nullable=True),
+)
 
 projectedFits_table = Table("projectedFits", saveddata_meta,
                             Column("sourceID", ForeignKey("fits.ID"), primary_key = True),

eos/db/saveddata/queries.py

@@ -267,6 +267,11 @@ def getBoosterFits(ownerID=None, where=None, eager=None):
         fits = saveddata_session.query(Fit).options(*eager).filter(filter).all()
     return fits
 
+def countAllFits():
+    with sd_lock:
+        count = saveddata_session.query(Fit).count()
+    return count
+
 def countFitsWithShip(shipID, ownerID=None, where=None, eager=None):
     """
     Get all the fits using a certain ship.
@@ -308,6 +313,12 @@ def getPrice(typeID):
         raise TypeError("Need integer as argument")
     return price
 
+def clearPrices():
+    with sd_lock:
+        deleted_rows = saveddata_session.query(Price).delete()
+    commit()
+    return deleted_rows
+
 def getMiscData(field):
     if isinstance(field, basestring):
         with sd_lock:

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/agilitymultipliereffect.py

@@ -1,9 +1,9 @@
 # agilityMultiplierEffect
 #
 # Used by:
-# Modules from group: Inertia Stabilizer (12 of 12)
-# Modules from group: Nanofiber Internal Structure (14 of 14)
-# Modules from group: Reinforced Bulkhead (12 of 12)
+# Modules from group: Inertial Stabilizer (7 of 7)
+# Modules from group: Nanofiber Internal Structure (7 of 7)
+# Modules from group: Reinforced Bulkhead (8 of 8)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.boostItemAttr("agility",

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/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,8 @@
 # armorReinforcerMassAdd
 #
 # Used by:
-# Modules from group: Armor Reinforcer (57 of 57)
+# Modules from group: Armor Reinforcer (41 of 41)
+# Modules from group: Entosis Link (2 of 2)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("mass", module.getModifiedItemAttr("massAddition"))

eos/effects/caldarishipecmburstoptimalrangecb3.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Ship: Scorpion
-# Ship: Scorpion Ishukone Watch
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Battleship").level

eos/effects/caldarishipewfalloffrangecb3.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Ship: Scorpion
-# Ship: Scorpion Ishukone Watch
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Battleship").level

eos/effects/caldarishipewoptimalrangecb3.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Ship: Scorpion
-# Ship: Scorpion Ishukone Watch
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Battleship").level

eos/effects/caldarishipewstrengthcb.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Ship: Scorpion
-# Ship: Scorpion Ishukone Watch
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Battleship").level

eos/effects/capacitorcapacitymultiply.py

@@ -2,9 +2,9 @@
 #
 # Used by:
 # Modules from group: Capacitor Flux Coil (6 of 6)
-# Modules from group: Capacitor Power Relay (26 of 26)
-# Modules from group: Power Diagnostic System (31 of 31)
-# Modules from group: Propulsion Module (107 of 107)
+# Modules from group: Capacitor Power Relay (20 of 20)
+# Modules from group: Power Diagnostic System (23 of 23)
+# 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/cargocapacitymultiply.py

@@ -1,9 +1,9 @@
 # cargoCapacityMultiply
 #
 # Used by:
-# Modules from group: Expanded Cargohold (13 of 13)
-# Modules from group: Overdrive Injector System (14 of 14)
-# Modules from group: Reinforced Bulkhead (12 of 12)
+# Modules from group: Expanded Cargohold (7 of 7)
+# Modules from group: Overdrive Injector System (7 of 7)
+# Modules from group: Reinforced Bulkhead (8 of 8)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("capacity", module.getModifiedItemAttr("cargoCapacityMultiplier"))

eos/effects/commandbonustdmultiplywithcommandbonushidden.py

@@ -6,6 +6,7 @@ gangBonus = "commandBonusTD"
 gangBoost = "ewarStrTD"
 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/covertopscloakcpupercentbonuspiratefaction.py

@@ -3,6 +3,7 @@
 # Used by:
 # Ship: Astero
 # Ship: Prospect
+# Ship: Victorieux Luxury Yacht
 type = "passive"
 runTime = "early"
 def handler(fit, ship, context):

eos/effects/drawbackarmorhp.py

@@ -1,7 +1,7 @@
 # drawbackArmorHP
 #
 # Used by:
-# Modules from group: Rig Navigation (48 of 68)
+# Modules from group: Rig Navigation (48 of 64)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("drawback"))

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/drawbackwarpspeed.py

@@ -1,7 +1,7 @@
 # drawbackWarpSpeed
 #
 # Used by:
-# Modules named like: Higgs Anchor I (4 of 4)
+# Modules from group: Rig Anchor (4 of 4)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.boostItemAttr("warpSpeedMultiplier", module.getModifiedItemAttr("drawback"), stackingPenalties=True)

eos/effects/elitebargebonusiceharvestingcycletimebarge3.py

@@ -1,7 +1,7 @@
 # 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

eos/effects/elitebargebonusminingdurationbarge2.py

@@ -1,7 +1,7 @@
 # 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

eos/effects/elitebargeshieldresistance1.py

@@ -1,7 +1,7 @@
 # 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

eos/effects/elitebonusheavyinterdictorswarpdisruptfieldgeneratorwarpscramblerange2.py

@@ -1,7 +1,7 @@
 # eliteBonusHeavyInterdictorsWarpDisruptFieldGeneratorWarpScrambleRange2
 #
 # Used by:
-# Ships from group: Heavy Interdiction Cruiser (4 of 4)
+# Ships from group: Heavy Interdiction Cruiser (4 of 5)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Heavy Interdiction Cruisers").level

eos/effects/elitebonusmarauderscruiseandtorpedodamagerole1.py

@@ -1,7 +1,7 @@
 # eliteBonusMaraudersCruiseAndTorpedoDamageRole1
 #
 # Used by:
-# Ships named like: Golem (4 of 4)
+# Ship: Golem
 type = "passive"
 def handler(fit, ship, context):
     damageTypes = ("em", "explosive", "kinetic", "thermal")

eos/effects/elitebonusmaraudersheavymissiledamageemrole1.py

@@ -1,7 +1,7 @@
 # eliteBonusMaraudersHeavyMissileDamageEMRole1
 #
 # Used by:
-# Ships named like: Golem (4 of 4)
+# Ship: Golem
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),

eos/effects/elitebonusmaraudersheavymissiledamageexprole1.py

@@ -1,7 +1,7 @@
 # eliteBonusMaraudersHeavyMissileDamageExpRole1
 #
 # Used by:
-# Ships named like: Golem (4 of 4)
+# Ship: Golem
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),

eos/effects/elitebonusmaraudersheavymissiledamagekinrole1.py

@@ -1,7 +1,7 @@
 # eliteBonusMaraudersHeavyMissileDamageKinRole1
 #
 # Used by:
-# Ships named like: Golem (4 of 4)
+# Ship: Golem
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),

eos/effects/elitebonusmaraudersheavymissiledamagethermrole1.py

@@ -1,7 +1,7 @@
 # eliteBonusMaraudersHeavyMissileDamageThermRole1
 #
 # Used by:
-# Ships named like: Golem (4 of 4)
+# Ship: Golem
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),

eos/effects/elitebonusmaraudershieldbonus2a.py

@@ -1,7 +1,8 @@
 # eliteBonusMarauderShieldBonus2a
 #
 # Used by:
-# Ships from group: Marauder (8 of 16)
+# Ship: Golem
+# Ship: Vargur
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Marauders").level

eos/effects/elitebonusviolatorsewtargetpainting1.py

@@ -1,7 +1,7 @@
 # eliteBonusViolatorsEwTargetPainting1
 #
 # Used by:
-# Ships named like: Golem (4 of 4)
+# Ship: Golem
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Marauders").level

eos/effects/elitebonusviolatorslargeenergyturretdamage1.py

@@ -1,7 +1,7 @@
 # eliteBonusViolatorsLargeEnergyTurretDamage1
 #
 # Used by:
-# Ships named like: Paladin (4 of 4)
+# Ship: Paladin
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Marauders").level

eos/effects/elitebonusviolatorslargeenergyturretdamagerole1.py

@@ -1,7 +1,7 @@
 # eliteBonusViolatorsLargeEnergyTurretDamageRole1
 #
 # Used by:
-# Ships named like: Paladin (4 of 4)
+# Ship: Paladin
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),

eos/effects/elitebonusviolatorslargehybridturretdamagerole1.py

@@ -1,7 +1,7 @@
 # eliteBonusViolatorsLargeHybridTurretDamageRole1
 #
 # Used by:
-# Ships named like: Kronos (4 of 4)
+# Ship: Kronos
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),

eos/effects/elitebonusviolatorslargehybridturrettracking1.py

@@ -1,7 +1,7 @@
 # eliteBonusViolatorsLargeHybridTurretTracking1
 #
 # Used by:
-# Ships named like: Kronos (4 of 4)
+# Ship: Kronos
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Marauders").level

eos/effects/elitebonusviolatorslargeprojectileturretdamagerole1.py

@@ -1,7 +1,7 @@
 # eliteBonusViolatorsLargeProjectileTurretDamageRole1
 #
 # Used by:
-# Ships named like: Vargur (4 of 4)
+# Ship: Vargur
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),

eos/effects/elitebonusviolatorslargeprojectileturrettracking1.py

@@ -1,7 +1,7 @@
 # eliteBonusViolatorsLargeProjectileTurretTracking1
 #
 # Used by:
-# Ships named like: Vargur (4 of 4)
+# Ship: Vargur
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Marauders").level

eos/effects/elitebonusviolatorsrepairsystemsarmordamageamount2.py

@@ -1,7 +1,8 @@
 # eliteBonusViolatorsRepairSystemsArmorDamageAmount2
 #
 # Used by:
-# Ships from group: Marauder (8 of 16)
+# Ship: Kronos
+# Ship: Paladin
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Marauders").level

eos/effects/elitebonusviolatorstractorbeammaxrangerole2.py

@@ -1,7 +1,7 @@
 # eliteBonusViolatorsTractorBeamMaxRangeRole2
 #
 # Used by:
-# Ships from group: Marauder (16 of 16)
+# Ships from group: Marauder (4 of 4)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",

eos/effects/elitebonusviolatorstractorbeammaxtractorvelocityrole3.py

@@ -1,7 +1,7 @@
 # eliteBonusViolatorsTractorBeamMaxTractorVelocityRole3
 #
 # Used by:
-# Ships from group: Marauder (16 of 16)
+# Ships from group: Marauder (4 of 4)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",

eos/effects/elitereconbonusassaultlauncherrof1.py

@@ -1,10 +0,0 @@
-# eliteReconBonusAssaultLauncherROF1
-#
-# Used by:
-# Ship: Huginn
-# Ship: Lachesis
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Recon Ships").level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Light",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusReconShip1") * level)

eos/effects/elitereconbonusheavyassaultlauncherrof1.py

@@ -1,9 +0,0 @@
-# eliteReconBonusHeavyAssaultLauncherROF1
-#
-# Used by:
-# Ship: Huginn
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Recon Ships").level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusReconShip1") * level)

eos/effects/elitereconbonusheavylauncherrof1.py

@@ -1,10 +0,0 @@
-# eliteReconBonusHeavyLauncherROF1
-#
-# Used by:
-# Ship: Huginn
-# Ship: Lachesis
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Recon Ships").level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusReconShip1") * level)

eos/effects/elitereconbonusmhtoptimalrange1.py

@@ -0,0 +1,9 @@
+# eliteReconBonusMHTOptimalRange1
+#
+# Used by:
+# Ship: Lachesis
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Recon Ships").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
+                                  "maxRange", ship.getModifiedItemAttr("eliteBonusReconShip1") * level)

eos/effects/elitereconbonusmptdamage1.py

@@ -0,0 +1,9 @@
+# eliteReconBonusMPTdamage1
+#
+# Used by:
+# Ship: Huginn
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Recon Ships").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
+                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusReconShip1") * level)

eos/effects/elitereconbonusneutrange3.py

@@ -0,0 +1,9 @@
+# eliteReconBonusNeutRange3
+#
+# Used by:
+# Ship: Pilgrim
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Recon Ships").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer",
+                                  "energyDestabilizationRange", ship.getModifiedItemAttr("eliteBonusReconShip3") * level)

eos/effects/elitereconbonusvamprange3.py

@@ -0,0 +1,9 @@
+# eliteReconBonusVampRange3
+#
+# Used by:
+# Ship: Pilgrim
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Recon Ships").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire",
+                                  "powerTransferRange", ship.getModifiedItemAttr("eliteBonusReconShip3") * level)

eos/effects/entosisdurationmultiply.py

@@ -0,0 +1,12 @@
+# entosisDurationMultiply
+#
+# Used by:
+# Ships from group: Carrier (4 of 4)
+# Ships from group: Dreadnought (4 of 4)
+# Ships from group: Supercarrier (5 of 5)
+# Ships from group: Titan (4 of 4)
+# Ship: Rorqual
+type = "passive"
+def handler(fit, ship, context):
+    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Infomorph Psychology"),
+                                     "duration", ship.getModifiedItemAttr("entosisDurationMultiplier") or 1)

eos/effects/entosislink.py

@@ -0,0 +1,7 @@
+# entosisLink
+#
+# Used by:
+# Modules from group: Entosis Link (2 of 2)
+type = "active"
+def handler(fit, module, context):
+    pass

eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py

@@ -1,9 +1,9 @@
 # evasiveManeuveringAgilityBonusPostPercentAgilityShip
 #
 # Used by:
+# Modules from group: Rig Anchor (4 of 4)
 # Implants named like: Eifyr and Co. 'Rogue' Evasive Maneuvering EM (6 of 6)
 # Implants named like: grade Nomad (10 of 12)
-# Modules named like: Higgs Anchor I (4 of 4)
 # Modules named like: Low Friction Nozzle Joints (8 of 8)
 # Implant: Genolution Core Augmentation CA-4
 # Skill: Evasive Maneuvering

eos/effects/freighteragilitybonus2o2.py

@@ -0,0 +1,8 @@
+# freighterAgilityBonus2O2
+#
+# Used by:
+# Ship: Bowhead
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("ORE Freighter").level
+    fit.ship.boostItemAttr("shipMaintenanceBayCapacity", ship.getModifiedItemAttr("freighterBonusO1")*level)

eos/effects/freightersmacapacitybonuso1.py

@@ -0,0 +1,9 @@
+# freighterSMACapacityBonusO1
+#
+# Used by:
+# Ship: Bowhead
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("ORE Freighter").level
+    fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusO2")*level,
+                           stackingPenalties = True)

eos/effects/iceharvestcycletimemodulesrequiringiceharvestingonline.py

@@ -1,7 +1,7 @@
 # iceHarvestCycleTimeModulesRequiringIceHarvestingOnline
 #
 # Used by:
-# Variations of module: Ice Harvester Upgrade I (6 of 6)
+# Variations of module: Ice Harvester Upgrade I (5 of 5)
 type = "passive"
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"),

eos/effects/iceharvestercapacitorneedmultiplier.py

@@ -1,9 +1,8 @@
 # iceHarvesterCapacitorNeedMultiplier
 #
 # Used by:
-# Ships from group: Exhumer (3 of 4)
-# Ship: Procurer
-# Ship: Retriever
+# Variations of ship: Procurer (2 of 2)
+# Variations of ship: Retriever (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Ice Harvesting"),

eos/effects/iceharvesterdurationmultiplier.py

@@ -1,9 +1,8 @@
 # iceHarvesterDurationMultiplier
 #
 # Used by:
-# Ships from group: Exhumer (3 of 4)
-# Ship: Procurer
-# Ship: Retriever
+# Variations of ship: Procurer (2 of 2)
+# Variations of ship: Retriever (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Ice Harvesting"),

eos/effects/iceminercpuusagepercent.py

@@ -1,7 +1,7 @@
 # iceMinerCpuUsagePercent
 #
 # Used by:
-# Variations of module: Ice Harvester Upgrade I (6 of 6)
+# Variations of module: Ice Harvester Upgrade I (5 of 5)
 type = "passive"
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"),

eos/effects/increasesignatureradiusonline.py

@@ -1,7 +1,7 @@
 # increaseSignatureRadiusOnline
 #
 # Used by:
-# Modules from group: Inertia Stabilizer (12 of 12)
+# Modules from group: Inertial Stabilizer (7 of 7)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusBonus"))

eos/effects/interceptor2warpscramblerange.py

@@ -1,7 +1,7 @@
 # Interceptor2WarpScrambleRange
 #
 # Used by:
-# Ships from group: Interceptor (5 of 9)
+# Ships from group: Interceptor (5 of 10)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Interceptors").level

eos/effects/interceptormwdsignatureradiusbonus.py

@@ -1,7 +1,7 @@
 # interceptorMWDSignatureRadiusBonus
 #
 # Used by:
-# Ships from group: Interceptor (9 of 9)
+# Ships from group: Interceptor (9 of 10)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Interceptors").level

eos/effects/massreductionbonuspassive.py

@@ -1,7 +1,7 @@
 # massReductionBonusPassive
 #
 # Used by:
-# Modules named like: Higgs Anchor I (4 of 4)
+# Modules from group: Rig Anchor (4 of 4)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.boostItemAttr("mass", module.getModifiedItemAttr("massBonusPercentage"), stackingPenalties=True)

eos/effects/minercpuusagemultiplypercent2.py

@@ -1,7 +1,7 @@
 # minerCpuUsageMultiplyPercent2
 #
 # Used by:
-# Variations of module: Mining Laser Upgrade I (6 of 6)
+# Variations of module: Mining Laser Upgrade I (5 of 5)
 type = "passive"
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),

eos/effects/minigamevirusstrengthbonus.py

@@ -4,12 +4,12 @@
 # Ships from group: Covert Ops (5 of 5)
 # Ships named like: Stratios (2 of 2)
 # Subsystems named like: Electronics Emergent Locus Analyzer (4 of 4)
-# Variations of ship: Heron (3 of 3)
-# Variations of ship: Imicus (3 of 3)
-# Variations of ship: Magnate (4 of 6)
-# Variations of ship: Probe (3 of 3)
 # Ship: Astero
+# Ship: Heron
+# Ship: Imicus
+# Ship: Magnate
 # Ship: Nestor
+# Ship: Probe
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1

eos/effects/miningdirectorbonuscommandbonuseffective.py

@@ -1,7 +1,7 @@
 # miningDirectorBonusCommandBonusEffective
 #
 # Used by:
-# Ships from group: Capital Industrial Ship (2 of 2)
+# Ship: Rorqual
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Director"),

eos/effects/mininglaser.py

@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules from group: Frequency Mining Laser (3 of 3)
-# Modules from group: Mining Laser (17 of 17)
+# Modules from group: Mining Laser (12 of 12)
 # Modules from group: Strip Miner (5 of 5)
 type = 'active'
 def handler(fit, module, context):

eos/effects/miningyieldmultiplypassive.py

@@ -1,10 +1,9 @@
 # miningYieldMultiplyPassive
 #
 # Used by:
-# Ships from group: Exhumer (3 of 4)
+# Variations of ship: Procurer (2 of 2)
+# Variations of ship: Retriever (2 of 2)
 # Variations of ship: Venture (2 of 2)
-# Ship: Procurer
-# Ship: Retriever
 type = "passive"
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Mining"),

eos/effects/miningyieldmultiplypercent.py

@@ -1,7 +1,7 @@
 # miningYieldMultiplyPercent
 #
 # Used by:
-# Variations of module: Mining Laser Upgrade I (6 of 6)
+# Variations of module: Mining Laser Upgrade I (5 of 5)
 type = "passive"
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),

eos/effects/minmatarshipewtargetpaintermc1.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Bellicose
+# Ship: Rapier
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Cruiser").level

eos/effects/minmatarshipewtargetpaintermc2.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Ship: Huginn
-# Ship: Rapier
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Cruiser").level

eos/effects/missileaoecloudsizebonusonline.py

@@ -0,0 +1,4 @@
+type = "passive"
+def handler(fit, container, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
+                                    "aoeCloudSize", container.getModifiedItemAttr("aoeCloudSizeBonus"))

eos/effects/missileaoevelocitybonusonline.py

@@ -0,0 +1,4 @@
+type = "passive"
+def handler(fit, container, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
+                                    "aoeVelocity", container.getModifiedItemAttr("aoeVelocityBonus"))

eos/effects/missileexplosiondelaybonusonline.py

@@ -0,0 +1,5 @@
+type = "passive"
+def handler(fit, container, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
+                                    "explosionDelay", container.getModifiedItemAttr("explosionDelayBonus"),
+                                    stackingPenalties=True)

eos/effects/missileguidancecomputerbonus4.py

@@ -0,0 +1,11 @@
+type = "active"
+def handler(fit, container, context):
+    for srcAttr, tgtAttr, penalize in (
+        ("aoeCloudSizeBonus", "aoeCloudSize", False),
+        ("aoeVelocityBonus", "aoeVelocity", False),
+        ("missileVelocityBonus", "maxVelocity", True),
+        ("explosionDelayBonus", "explosionDelay", True),
+    ):
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
+                                        tgtAttr, container.getModifiedItemAttr(srcAttr),
+                                        stackingPenalties=penalize)

eos/effects/missilevelocitybonusdefender.py

@@ -5,4 +5,4 @@
 type = "passive"
 def handler(fit, container, context):
     fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Defender Missiles"),
-                                       "maxVelocity", container.getModifiedItemAttr("missileVelocityBonus"))
+                                       "maxVelocity", container.getModifiedItemAttr("missileVelocityBonus"))

eos/effects/missilevelocitybonusonline.py

@@ -0,0 +1,5 @@
+type = "passive"
+def handler(fit, container, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
+                                    "maxVelocity", container.getModifiedItemAttr("missileVelocityBonus"),
+                                    stackingPenalties=True)

eos/effects/modeagilitypostdiv.py

@@ -0,0 +1,12 @@
+# modeAgilityPostDiv
+#
+# Used by:
+# Modules named like: Propulsion Mode (4 of 4)
+type = "passive"
+def handler(fit, module, context):
+    fit.ship.multiplyItemAttr(
+        "agility",
+        1 / module.getModifiedItemAttr("modeAgilityPostDiv"),
+        stackingPenalties=True,
+        penaltyGroup="postDiv"
+    )

eos/effects/modearmorrepdurationpostdiv.py

@@ -0,0 +1,7 @@
+type = "passive"
+def handler(fit, module, context):
+    fit.modules.filteredItemMultiply(
+        lambda mod: mod.item.requiresSkill("Repair Systems"),
+        "duration",
+        1 / module.getModifiedItemAttr("modeArmorRepDurationPostDiv")
+    )

eos/effects/modearmorresonancepostdiv.py

@@ -0,0 +1,18 @@
+# modeArmorResonancePostDiv
+#
+# Used by:
+# Modules named like: Defense Mode (3 of 4)
+type = "passive"
+def handler(fit, module, context):
+    for srcResType, tgtResType in (
+        ("Em", "Em"),
+        ("Explosive", "Explosive"),
+        ("Kinetic", "Kinetic"),
+        ("Thermic", "Thermal")
+    ):
+        fit.ship.multiplyItemAttr(
+            "armor{0}DamageResonance".format(tgtResType),
+            1 / module.getModifiedItemAttr("mode{0}ResistancePostDiv".format(srcResType)),
+            stackingPenalties=True,
+            penaltyGroup="postDiv"
+        )

eos/effects/modehullresonancepostdiv.py

@@ -0,0 +1,16 @@
+# modeHullResonancePostDiv
+#
+# Used by:
+# Module: Hecate Defense Mode
+type = "passive"
+def handler(fit, module, context):
+    for srcResType, tgtResType in (
+        ("Em", "em"),
+        ("Explosive", "explosive"),
+        ("Kinetic", "kinetic"),
+        ("Thermic", "thermal")
+    ):
+        fit.ship.multiplyItemAttr(
+            "{0}DamageResonance".format(tgtResType),
+            1 / module.getModifiedItemAttr("mode{0}ResistancePostDiv".format(srcResType))
+        )

eos/effects/modemwdboostpostdiv.py

@@ -0,0 +1,13 @@
+# modeMWDBoostPostDiv
+#
+# Used by:
+# Module: Hecate Propulsion Mode
+type = "passive"
+def handler(fit, module, context):
+    fit.modules.filteredItemMultiply(
+        lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
+        "speedFactor",
+        1 / module.getModifiedItemAttr("modeMWDVelocityPostDiv"),
+        stackingPenalties=True,
+        penaltyGroup="postDiv"
+    )

eos/effects/modemwdcappostdiv.py

@@ -0,0 +1,11 @@
+# modeMWDCapPostDiv
+#
+# Used by:
+# Module: Hecate Propulsion Mode
+type = "passive"
+def handler(fit, module, context):
+    fit.modules.filteredItemMultiply(
+        lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
+        "capacitorNeed",
+        1 / module.getModifiedItemAttr("modeMWDCapPostDiv")
+    )

eos/effects/modemwdsigradiuspostdiv.py

@@ -0,0 +1,13 @@
+# modeMWDSigRadiusPostDiv
+#
+# Used by:
+# Module: Svipul Defense Mode
+type = "passive"
+def handler(fit, module, context):
+    fit.modules.filteredItemMultiply(
+        lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
+        "signatureRadiusBonus",
+        1 / module.getModifiedItemAttr("modeMWDSigPenaltyPostDiv"),
+        stackingPenalties=True,
+        penaltyGroup="postDiv"
+    )

eos/effects/modeshieldresonancepostdiv.py

@@ -0,0 +1,19 @@
+# modeShieldResonancePostDiv
+#
+# Used by:
+# Module: Jackdaw Defense Mode
+# Module: Svipul Defense Mode
+type = "passive"
+def handler(fit, module, context):
+    for srcResType, tgtResType in (
+        ("Em", "Em"),
+        ("Explosive", "Explosive"),
+        ("Kinetic", "Kinetic"),
+        ("Thermic", "Thermal")
+    ):
+        fit.ship.multiplyItemAttr(
+            "shield{0}DamageResonance".format(tgtResType),
+            1 / module.getModifiedItemAttr("mode{0}ResistancePostDiv".format(srcResType)),
+            stackingPenalties=True,
+            penaltyGroup="postDiv"
+        )

eos/effects/modesigradiuspostdiv.py

@@ -0,0 +1,9 @@
+# modeSigRadiusPostDiv
+#
+# Used by:
+# Module: Confessor Defense Mode
+# Module: Jackdaw Defense Mode
+type = "passive"
+def handler(fit, module, context):
+    fit.ship.multiplyItemAttr("signatureRadius", 1 / module.getModifiedItemAttr("modeSignatureRadiusPostDiv"),
+                              stackingPenalties=True, penaltyGroup="postDiv")

eos/effects/modevelocitypostdiv.py

@@ -0,0 +1,12 @@
+# modeVelocityPostDiv
+#
+# Used by:
+# Modules named like: Propulsion Mode (3 of 4)
+type = "passive"
+def handler(fit, module, context):
+    fit.ship.multiplyItemAttr(
+        "maxVelocity",
+        1 / module.getModifiedItemAttr("modeVelocityPostDiv"),
+        stackingPenalties=True,
+        penaltyGroup="postDiv"
+    )

eos/effects/modifymaxvelocityofshippassive.py

@@ -1,7 +1,7 @@
 # modifyMaxVelocityOfShipPassive
 #
 # Used by:
-# Modules from group: Expanded Cargohold (13 of 13)
+# Modules from group: Expanded Cargohold (7 of 7)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("maxVelocity", module.getModifiedItemAttr("maxVelocityBonus"),

eos/effects/modifypowerrechargerate.py

@@ -2,9 +2,9 @@
 #
 # Used by:
 # Modules from group: Capacitor Flux Coil (6 of 6)
-# Modules from group: Capacitor Power Relay (26 of 26)
-# Modules from group: Capacitor Recharger (25 of 25)
-# Modules from group: Power Diagnostic System (31 of 31)
+# Modules from group: Capacitor Power Relay (20 of 20)
+# Modules from group: Capacitor Recharger (18 of 18)
+# Modules from group: Power Diagnostic System (23 of 23)
 # 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)