Change validator requirement for owner ID

This fixes bug related to sqlalch 1.0

.gitignore

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

README.md

@@ -0,0 +1,15 @@
+# Pyfa
+
+Pyfa is a cross-platform desktop fitting application for EVE online that can be used natively on any platform where python and wxwidgets are available.
+
+It provides many advanced features such as graphs and full calculations of any possible combination of modules, fits, etc.
+
+Please see the [FAQ](https://github.com/DarkFenX/Pyfa/wiki/FAQ) for answers to common questions / concerns
+
+#### Links
+* [Development repository: http://github.com/DarkFenX/Pyfa](http://github.com/DarkFenX/Pyfa)
+* [XMPP conference:
+pyfa@conference.jabber.org](pyfa@conference.jabber.org)
+* [EVE forum thread](http://forums.eveonline.com/default.aspx?g=posts&t=247609)
+* [EVE Online website](http://www.eveonline.com/)
+

config.py

@@ -1,86 +1,108 @@
-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.3.1"
-tag = "git"
-expansionName = "Crius"
-expansionVersion = "1.0"
-evemonMinVersion = "4081"
-
-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.11.1"
+tag = "git"
+expansionName = "Mosaic"
+expansionVersion = "1.0"
+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
+
+
+def isFrozen():
+    if hasattr(sys, 'frozen'):
+        return True
+    else:
+        return False
+
+
+def getPyfaRoot():
+    base = sys.executable if isFrozen() else sys.argv[0]
+    root = os.path.dirname(os.path.realpath(os.path.abspath(base)))
+    root = unicode(root, sys.getfilesystemencoding())
+    return root
+
+
+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 = getPyfaRoot()
+
+    # 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 None:
+        stderrToFile = True if isFrozen() else False
+    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 None:
+        stdoutToFile = True if isFrozen() else False
+    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):
@@ -49,7 +58,6 @@ if saveddata_connectionstring is not None:
 
     saveddata_meta = MetaData()
     saveddata_meta.bind = saveddata_engine
-    migration.update(saveddata_engine)
     saveddata_session = sessionmaker(bind=saveddata_engine, autoflush=False, expire_on_commit=False)()
 
 # Lock controlling any changes introduced to session
@@ -66,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
+                                     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:":
@@ -75,3 +84,4 @@ if config.saveddata_connectionstring == "sqlite:///:memory:":
 def rollback():
     with sd_lock:
         saveddata_session.rollback()
+

eos/db/gamedata/attribute.py

@@ -31,6 +31,7 @@ attributes_table = Table("dgmattribs", gamedata_meta,
                          Column("attributeID", Integer, primary_key = True),
                          Column("attributeName", String),
                          Column("defaultValue", Float),
+                         Column("maxAttributeID", Integer, ForeignKey("dgmattribs.attributeID")),
                          Column("description", Unicode),
                          Column("published", Boolean),
                          Column("displayName", String),

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),
@@ -53,9 +54,8 @@ mapper(Item, items_table,
                      "name" : synonym("typeName"),
                      "description" : deferred(items_table.c.description),
                      "traits" : relation(Traits,
-                                            primaryjoin = traits_table.c.typeID == items_table.c.typeID,
-                                            order_by = traits_table.c.typeID,
-                                            uselist = True)
+                                         primaryjoin = traits_table.c.typeID == items_table.c.typeID,
+                                         uselist = False)
                     })
 
 Item.category = association_proxy("group", "category")

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/gamedata/traits.py

@@ -1,22 +1,11 @@
 
-from sqlalchemy import Column, Table, Integer, String, ForeignKey, and_, select
-from sqlalchemy.orm import mapper, column_property
-from eos.types import Item, Traits
+from sqlalchemy import Column, Table, Integer, String, ForeignKey
+from sqlalchemy.orm import mapper
+from eos.types import Traits
 from eos.db import gamedata_meta
 
 traits_table = Table("invtraits", gamedata_meta,
                      Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True),
-                     Column("skillID", Integer, ForeignKey("invtypes.typeID"), primary_key=True),
-                     Column("bonusText", String, primary_key=True))
+                     Column("traitText", String))
 
-
-from .item import items_table
-
-mapper(Traits, traits_table,
-        properties = {"skillName" : column_property(
-                                             select([items_table.c.typeName],
-                                                and_(
-                                                    items_table.c.typeID == traits_table.c.skillID,
-                                                    traits_table.c.skillID != -1
-                                                )))
-        });
+mapper(Traits, traits_table);

eos/db/migration.py

@@ -1,59 +1,32 @@
-import sqlalchemy
+import config
+import shutil
+import time
+
+def getVersion(db):
+    cursor = db.execute('PRAGMA user_version')
+    return cursor.fetchone()[0]
 
 def update(saveddata_engine):
-    checkPriceFailures(saveddata_engine)
-    checkApiDefaultChar(saveddata_engine)
-    checkFitBooster(saveddata_engine)
+    currversion = getVersion(saveddata_engine)
 
-def checkPriceFailures(saveddata_engine):
-    # Check if we have 'failed' column
-    try:
-        saveddata_engine.execute("SELECT failed FROM prices")
-    except sqlalchemy.exc.DatabaseError:
-        # As we don't have any important data there, let's just drop
-        # and recreate whole table
-        from eos.db.saveddata.price import prices_table
-        # Attempt to drop/create table only if it's already there
-        try:
-            prices_table.drop(saveddata_engine)
-            prices_table.create(saveddata_engine)
-        except sqlalchemy.exc.DatabaseError:
-            pass
+    if currversion == config.dbversion:
+        return
 
+    if currversion < config.dbversion:
+        # Automatically backup database
+        toFile = "%s/saveddata_migration_%d-%d_%s.db"%(
+            config.savePath,
+            currversion,
+            config.dbversion,
+            time.strftime("%Y%m%d_%H%M%S"))
 
-def checkApiDefaultChar(saveddata_engine):
-    try:
-        saveddata_engine.execute("SELECT * FROM characters LIMIT 1")
-    # If table doesn't exist, it means we're doing everything from scratch
-    # and sqlalchemy will process everything as needed
-    except sqlalchemy.exc.DatabaseError:
-        pass
-    # If not, we're running on top of existing DB
-    else:
-        # Check that we have columns
-        try:
-            saveddata_engine.execute("SELECT defaultChar, chars FROM characters LIMIT 1")
-        # If we don't, create them
-        # This is ugly as hell, but we can't use proper migrate packages as it
-        # will require us to rebuild skeletons, including mac
-        except sqlalchemy.exc.DatabaseError:
-            saveddata_engine.execute("ALTER TABLE characters ADD COLUMN defaultChar INTEGER;")
-            saveddata_engine.execute("ALTER TABLE characters ADD COLUMN chars VARCHAR;")
+        shutil.copyfile(config.saveDB, toFile)
 
-def checkFitBooster(saveddata_engine):
-    try:
-        saveddata_engine.execute("SELECT * FROM fits LIMIT 1")
-    # If table doesn't exist, it means we're doing everything from scratch
-    # and sqlalchemy will process everything as needed
-    except sqlalchemy.exc.DatabaseError:
-        pass
-    # If not, we're running on top of existing DB
-    else:
-        # Check that we have columns
-        try:
-            saveddata_engine.execute("SELECT booster FROM fits LIMIT 1")
-        # If we don't, create them
-        except sqlalchemy.exc.DatabaseError:
-            saveddata_engine.execute("ALTER TABLE fits ADD COLUMN booster BOOLEAN;")
-        # Set NULL data to 0 (needed in case of downgrade, see GH issue #62
-        saveddata_engine.execute("UPDATE fits SET booster = 0 WHERE booster IS NULL;")
+        for version in xrange(currversion, config.dbversion):
+            module = __import__('eos.db.migrations.upgrade%d'%(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)

eos/db/migrations/__init__.py

@@ -0,0 +1,9 @@
+"""
+The migration module includes migration logic to update database scheme and/or
+data for the user database.
+
+To create a migration, simply create a file upgrade<migration number>.py and
+define an upgrade() function with the logic. Please note that there must be as
+many upgrade files as there are database versions (version 5 would include
+upgrade files 1-5)
+"""

eos/db/migrations/upgrade1.py

@@ -0,0 +1,97 @@
+"""
+Migration 1
+
+- Alters fits table to introduce target resist attribute
+- Converts modules based on Oceanus Module Tiericide
+    Some modules have been deleted, which causes pyfa to crash when fits are
+    loaded as they no longer exist in the database. We therefore replace these
+    modules with their new replacements
+
+    Based on http://community.eveonline.com/news/patch-notes/patch-notes-for-oceanus/
+    and output of itemDiff.py
+"""
+
+import sqlalchemy
+
+CONVERSIONS = {
+    6135: [  # Scoped Cargo Scanner
+        6133,  # Interior Type-E Cargo Identifier
+    ],
+    6527: [  # Compact Ship Scanner
+        6525,  # Ta3 Perfunctory Vessel Probe
+        6529,  # Speculative Ship Identifier I
+        6531,  # Practical Type-E Ship Probe
+    ],
+    6569: [  # Scoped Survey Scanner
+        6567,  # ML-3 Amphilotite Mining Probe
+        6571,  # Rock-Scanning Sensor Array I
+        6573,  # 'Dactyl' Type-E Asteroid Analyzer
+    ],
+    509: [  # 'Basic' Capacitor Flux Coil
+        8163,  # Partial Power Plant Manager: Capacitor Flux
+        8165,  # Alpha Reactor Control: Capacitor Flux
+        8167,  # Type-E Power Core Modification: Capacitor Flux
+        8169,  # Marked Generator Refitting: Capacitor Flux
+    ],
+    8135: [  # Restrained Capacitor Flux Coil
+        8131,  # Local Power Plant Manager: Capacitor Flux I
+    ],
+    8133: [  # Compact Capacitor Flux Coil
+        8137,  # Mark I Generator Refitting: Capacitor Flux
+    ],
+    3469: [  # Basic Co-Processor
+        8744,  # Nanoelectrical Co-Processor
+        8743,  # Nanomechanical CPU Enhancer
+        8746,  # Quantum Co-Processor
+        8745,  # Photonic CPU Enhancer
+        15425,  # Naiyon's Modified Co-Processor (never existed but convert
+                # anyway as some fits may include it)
+    ],
+    8748: [  # Upgraded Co-Processor
+        8747,  # Nanomechanical CPU Enhancer I
+        8750,  # Quantum Co-Processor I
+        8749,  # Photonic CPU Enhancer I
+    ],
+    1351: [  # Basic Reactor Control Unit
+        8251,  # Partial Power Plant Manager: Reaction Control
+        8253,  # Alpha Reactor Control: Reaction Control
+        8257,  # Marked Generator Refitting: Reaction Control
+    ],
+    8263: [  # Compact Reactor Control Unit
+        8259,  # Local Power Plant Manager: Reaction Control I
+        8265,  # Mark I Generator Refitting: Reaction Control
+        8261,  # Beta Reactor Control: Reaction Control I
+    ],
+    16537: [  # Compact Micro Auxiliary Power Core
+        16539,  # Micro B88 Core Augmentation
+        16541,  # Micro K-Exhaust Core Augmentation
+    ],
+    31936: [  # Navy Micro Auxiliary Power Core
+        16543,  # Micro 'Vigor' Core Augmentation
+    ],
+    8089: [  # Compact Light Missile Launcher
+       8093,  # Prototype 'Arbalest' Light Missile Launcher
+    ],
+    8091: [  # Ample Light Missile Launcher
+        7993,  # Experimental TE-2100 Light Missile Launcher
+    ],
+    # Surface Cargo Scanner I was removed from game, however no mention of
+    # replacement module in patch notes. Morphing it to meta 0 module to be safe
+    442: [  # Cargo Scanner I
+        6129,  # Surface Cargo Scanner I
+    ]
+}
+
+def upgrade(saveddata_engine):
+    # Update fits schema to include target resists attribute
+    try:
+        saveddata_engine.execute("SELECT targetResistsID FROM fits LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE fits ADD COLUMN targetResistsID INTEGER;")
+
+    # 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/upgrade2.py

@@ -0,0 +1,21 @@
+"""
+Migration 2
+
+- Includes old upgrade paths pre-1.5.0. See GH issue #190 for why this is needed
+"""
+
+import sqlalchemy
+
+def upgrade(saveddata_engine):
+    # Update characters schema to include default chars
+    try:
+        saveddata_engine.execute("SELECT defaultChar, chars FROM characters LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE characters ADD COLUMN defaultChar INTEGER")
+        saveddata_engine.execute("ALTER TABLE characters ADD COLUMN chars VARCHAR")
+
+    # Update fits schema to include booster attribute
+    try:
+        saveddata_engine.execute("SELECT booster FROM fits LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE fits ADD COLUMN booster BOOLEAN")

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/saveddata/__init__.py

@@ -1,3 +1,3 @@
 __all__ = ["character", "fit", "module", "user", "skill", "price",
            "booster", "drone", "implant", "fleet", "damagePattern",
-           "miscData"]
+           "miscData", "targetResists"]

eos/db/saveddata/fit.py

@@ -26,10 +26,11 @@ from eos.db.saveddata.module import modules_table
 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
+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
+
 fits_table = Table("fits", saveddata_meta,
                          Column("ID", Integer, primary_key = True),
                          Column("ownerID", ForeignKey("users.ID"), nullable = True, index = True),
@@ -38,7 +39,10 @@ fits_table = Table("fits", saveddata_meta,
                          Column("timestamp", Integer, nullable = False),
                          Column("characterID", ForeignKey("characters.ID"), nullable = True),
                          Column("damagePatternID", ForeignKey("damagePatterns.ID"), nullable=True),
-                         Column("booster", Boolean, nullable = False, index = True, default = 0))
+                         Column("booster", Boolean, nullable = False, index = True, default = 0),
+                         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),
@@ -64,6 +68,7 @@ mapper(Fit, fits_table,
                                                  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,

eos/db/saveddata/queries.py

@@ -19,7 +19,7 @@
 
 from eos.db.util import processEager, processWhere
 from eos.db import saveddata_session, sd_lock
-from eos.types import User, Character, Fit, Price, DamagePattern, Fleet, MiscData, Wing, Squad
+from eos.types import User, Character, Fit, Price, DamagePattern, Fleet, MiscData, Wing, Squad, TargetResists
 from eos.db.saveddata.fleet import squadmembers_table
 from eos.db.saveddata.fit import projectedFits_table
 from sqlalchemy.sql import and_
@@ -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:
@@ -322,6 +333,12 @@ def getDamagePatternList(eager=None):
         patterns = saveddata_session.query(DamagePattern).options(*eager).all()
     return patterns
 
+def getTargetResistsList(eager=None):
+    eager = processEager(eager)
+    with sd_lock:
+        patterns = saveddata_session.query(TargetResists).options(*eager).all()
+    return patterns
+
 @cachedQuery(DamagePattern, 1, "lookfor")
 def getDamagePattern(lookfor, eager=None):
     if isinstance(lookfor, int):
@@ -340,6 +357,24 @@ def getDamagePattern(lookfor, eager=None):
         raise TypeError("Need integer or string as argument")
     return pattern
 
+@cachedQuery(TargetResists, 1, "lookfor")
+def getTargetResists(lookfor, eager=None):
+    if isinstance(lookfor, int):
+        if eager is None:
+            with sd_lock:
+                pattern = saveddata_session.query(TargetResists).get(lookfor)
+        else:
+            eager = processEager(eager)
+            with sd_lock:
+                pattern = saveddata_session.query(TargetResists).options(*eager).filter(TargetResists.ID == lookfor).first()
+    elif isinstance(lookfor, basestring):
+        eager = processEager(eager)
+        with sd_lock:
+            pattern = saveddata_session.query(TargetResists).options(*eager).filter(TargetResists.name == lookfor).first()
+    else:
+        raise TypeError("Need integer or string as argument")
+    return pattern
+
 def searchFits(nameLike, where=None, eager=None):
     if not isinstance(nameLike, basestring):
         raise TypeError("Need string as argument")
@@ -361,7 +396,7 @@ def getSquadsIDsWithFitID(fitID):
             return squads
     else:
         raise TypeError("Need integer as argument")
-        
+
 def getProjectedFits(fitID):
     if isinstance(fitID, int):
         with sd_lock:
@@ -369,7 +404,7 @@ def getProjectedFits(fitID):
             fits = saveddata_session.query(Fit).filter(filter).all()
             return fits
     else:
-        raise TypeError("Need integer as argument")        
+        raise TypeError("Need integer as argument")
 
 def add(stuff):
     with sd_lock:

eos/db/saveddata/targetResists.py

@@ -0,0 +1,35 @@
+#===============================================================================
+# Copyright (C) 2014 Ryan Holmes
+#
+# This file is part of eos.
+#
+# eos is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# eos is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with eos.  If not, see <http://www.gnu.org/licenses/>.
+#===============================================================================
+
+from sqlalchemy import Table, Column, Integer, Float, ForeignKey, String
+from sqlalchemy.orm import mapper
+
+from eos.db import saveddata_meta
+from eos.types import TargetResists
+
+targetResists_table = Table("targetResists", saveddata_meta,
+                             Column("ID", Integer, primary_key = True),
+                             Column("name", String),
+                             Column("emAmount", Float),
+                             Column("thermalAmount", Float),
+                             Column("kineticAmount", Float),
+                             Column("explosiveAmount", Float),
+                             Column("ownerID", ForeignKey("users.ID"), nullable=True))
+
+mapper(TargetResists, targetResists_table)

eos/effects/accerationcontrolcapneedbonuspostpercentcapacitorneedlocationshipgroupafterburner.py

@@ -1,3 +1,5 @@
+# accerationControlCapNeedBonusPostPercentCapacitorNeedLocationShipGroupAfterburner
+#
 # Used by:
 # Modules named like: Dynamic Fuel Valve (8 of 8)
 type = "passive"

eos/effects/accerationcontrolskillabmwdspeedboost.py

@@ -1,3 +1,5 @@
+# accerationControlSkillAb&MwdSpeedBoost
+#
 # Used by:
 # Implant: Zor's Custom Navigation Hyper-Link
 # Skill: Acceleration Control

eos/effects/accerationcontrolspeedfbonuspostpercentspeedfactorlocationshipgroupafterburner.py

@@ -1,3 +1,5 @@
+# accerationControlSpeedFBonusPostPercentSpeedFactorLocationShipGroupAfterburner
+#
 # Used by:
 # Implants named like: Eifyr and Co. 'Rogue' Acceleration Control AC (6 of 6)
 type = "passive"

eos/effects/accessdifficultybonusmodifierrequiringarchaelogy.py

@@ -1,3 +1,5 @@
+# accessDifficultyBonusModifierRequiringArchaelogy
+#
 # Used by:
 # Modules named like: Emission Scope Sharpener (8 of 8)
 # Implant: Poteque 'Prospector' Archaeology AC-905

eos/effects/accessdifficultybonusmodifierrequiringhacking.py

@@ -1,3 +1,5 @@
+# accessDifficultyBonusModifierRequiringHacking
+#
 # Used by:
 # Modules named like: Memetic Algorithm Bank (8 of 8)
 # Implant: Poteque 'Prospector' Environmental Analysis EY-1005

eos/effects/adaptivearmorhardener.py

@@ -1,3 +1,5 @@
+# adaptiveArmorHardener
+#
 # Used by:
 # Module: Reactive Armor Hardener
 type = "active"

eos/effects/addtosignatureradius2.py

@@ -1,4 +1,7 @@
+# addToSignatureRadius2
+#
 # Used by:
+# Modules from group: Missile Launcher Bomb (2 of 2)
 # Modules from group: Shield Extender (37 of 37)
 type = "passive"
 def handler(fit, module, context):

eos/effects/advanceddroneinterfacingmaxgroupdcuskilllevel.py

@@ -1,3 +1,5 @@
+# advancedDroneInterfacingMaxGroupDCUSkillLevel
+#
 # Used by:
 # Skill: Advanced Drone Interfacing
 type = "passive"

eos/effects/afterburnerdurationbonuspostpercentdurationlocationshipmodulesrequiringafterburner.py

@@ -1,3 +1,5 @@
+# afterburnerDurationBonusPostPercentDurationLocationShipModulesRequiringAfterburner
+#
 # Used by:
 # Implants named like: Eifyr and Co. 'Rogue' Afterburner AB (6 of 6)
 # Implant: Zor's Custom Navigation Link

eos/effects/agilitymultipliereffect.py

@@ -1,7 +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/agilitymultipliereffectpassive.py

@@ -1,3 +1,5 @@
+# agilityMultiplierEffectPassive
+#
 # Used by:
 # Modules named like: Polycarbon Engine Housing (8 of 8)
 type = "passive"

eos/effects/ammofallofmultiplier.py

@@ -1,3 +1,5 @@
+# ammoFallofMultiplier
+#
 # Used by:
 # Charges from group: Advanced Artillery Ammo (6 of 6)
 # Charges from group: Advanced Autocannon Ammo (6 of 6)

eos/effects/ammoinfluencecapneed.py

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

eos/effects/ammoinfluencerange.py

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

eos/effects/ammospeedmultiplier.py

@@ -1,7 +1,9 @@
+# ammoSpeedMultiplier
+#
 # Used by:
 # Charges from group: Festival Charges (8 of 8)
+# Charges from group: Interdiction Probe (2 of 2)
 # Charges from group: Survey Probe (3 of 3)
-# Charge: Warp Disrupt Probe
 type = "passive"
 def handler(fit, module, context):
     module.multiplyItemAttr("speed", module.getModifiedChargeAttr("speedMultiplier") or 1)

eos/effects/ammotrackingmultiplier.py

@@ -1,3 +1,5 @@
+# ammoTrackingMultiplier
+#
 # Used by:
 # Charges from group: Advanced Artillery Ammo (6 of 6)
 # Charges from group: Advanced Autocannon Ammo (6 of 6)

eos/effects/angelsetbonus.py

@@ -1,3 +1,5 @@
+# angelsetbonus
+#
 # Used by:
 # Implants named like: grade Halo (18 of 18)
 runTime = "early"

eos/effects/antiwarpscramblingpassive.py

@@ -1,3 +1,5 @@
+# antiWarpScramblingPassive
+#
 # Used by:
 # Modules from group: Warp Core Stabilizer (8 of 8)
 type = "passive"

eos/effects/archaeologyskillvirusbonus.py

@@ -1,3 +1,5 @@
+# archaeologySkillVirusBonus
+#
 # Used by:
 # Modules named like: Emission Scope Sharpener (8 of 8)
 # Implant: Poteque 'Prospector' Archaeology AC-905

eos/effects/armorallrepairsystemsamountbonuspassive.py

@@ -1,3 +1,5 @@
+# armorAllRepairSystemsAmountBonusPassive
+#
 # Used by:
 # Implants named like: Exile Booster (4 of 4)
 type = "passive"

eos/effects/armordamageamountbonuscapitalarmorrepairers.py

@@ -1,3 +1,5 @@
+# armorDamageAmountBonusCapitalArmorRepairers
+#
 # Used by:
 # Modules named like: Auxiliary Nano Pump (8 of 8)
 type = "passive"

eos/effects/armoredsquadroncommand.py

@@ -1,3 +1,5 @@
+# armoredSquadronCommand
+#
 # Used by:
 # Skill: Armored Warfare Specialist
 runTime = "early"

eos/effects/armoredwarfaremindlink.py

@@ -1,3 +1,5 @@
+# armoredWarfareMindlink
+#
 # Used by:
 # Implant: Armored Warfare Mindlink
 # Implant: Federation Navy Warfare Mindlink

eos/effects/armorhpbonusadd.py

@@ -1,3 +1,5 @@
+# armorHPBonusAdd
+#
 # Used by:
 # Modules from group: Armor Reinforcer (57 of 57)
 type = "passive"

eos/effects/armorhpbonusaddpassive.py

@@ -1,3 +1,5 @@
+# armorHPBonusAddPassive
+#
 # Used by:
 # Subsystems from group: Defensive Systems (16 of 16)
 type = "passive"

eos/effects/armorhpmultiply.py

@@ -1,3 +1,5 @@
+# armorHPMultiply
+#
 # Used by:
 # Modules from group: Armor Coating (202 of 202)
 # Modules from group: Armor Plating Energized (187 of 187)

eos/effects/armorreinforcermassadd.py

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

eos/effects/armorrepair.py

@@ -1,3 +1,5 @@
+# armorRepair
+#
 # Used by:
 # Modules from group: Armor Repair Unit (100 of 100)
 runTime = "late"

eos/effects/armorrepairprojectormaxrangebonus.py

@@ -1,3 +1,5 @@
+# armorRepairProjectorMaxRangeBonus
+#
 # Used by:
 # Ship: Augoror
 # Ship: Exequror

eos/effects/armortankinggang.py

@@ -1,3 +1,5 @@
+# armorTankingGang
+#
 # Used by:
 # Skill: Armored Warfare
 type = "gang"

eos/effects/armortankinggang2.py

@@ -1,3 +1,5 @@
+# armorTankingGang2
+#
 # Used by:
 # Implant: Armored Warfare Mindlink
 # Implant: Federation Navy Warfare Mindlink

eos/effects/armorupgradesmasspenaltyreductionbonus.py

@@ -1,3 +1,5 @@
+# armorUpgradesMassPenaltyReductionBonus
+#
 # Used by:
 # Skill: Armor Layering
 type = "passive"

eos/effects/astrogeologyminingamountbonuspostpercentminingamountlocationshipmodulesrequiringmining.py

@@ -1,3 +1,5 @@
+# astrogeologyMiningAmountBonusPostPercentMiningAmountLocationShipModulesRequiringMining
+#
 # Used by:
 # Implants named like: Inherent Implants 'Highwall' Mining MX (3 of 3)
 # Implant: Michi's Excavation Augmentor

eos/effects/basemaxscandeviationmodifiermoduleonline2none.py

@@ -1,3 +1,5 @@
+# baseMaxScanDeviationModifierModuleOnline2None
+#
 # Used by:
 # Variations of module: Scan Pinpointing Array I (2 of 2)
 type = "passive"

eos/effects/basemaxscandeviationmodifierrequiringastrometrics.py

@@ -1,3 +1,5 @@
+# baseMaxScanDeviationModifierRequiringAstrometrics
+#
 # Used by:
 # Implants named like: Poteque 'Prospector' Astrometric Pinpointing AP (3 of 3)
 # Skill: Astrometric Pinpointing

eos/effects/basesensorstrengthmodifiermodule.py

@@ -1,3 +1,5 @@
+# baseSensorStrengthModifierModule
+#
 # Used by:
 # Variations of module: Scan Rangefinding Array I (2 of 2)
 type = "passive"

eos/effects/basesensorstrengthmodifierrequiringastrometrics.py

@@ -1,3 +1,5 @@
+# baseSensorStrengthModifierRequiringAstrometrics
+#
 # Used by:
 # Modules from group: Scan Probe Launcher (4 of 7)
 # Implants named like: Poteque 'Prospector' Astrometric Rangefinding AR (3 of 3)

eos/effects/bclargeenergyturretcapacitorneedbonus.py

@@ -1,3 +1,5 @@
+# bcLargeEnergyTurretCapacitorNeedBonus
+#
 # Used by:
 # Ship: Oracle
 type = "passive"

eos/effects/bclargeenergyturretcpuneedbonus.py

@@ -1,3 +1,5 @@
+# bcLargeEnergyTurretCPUNeedBonus
+#
 # Used by:
 # Ship: Oracle
 type = "passive"

eos/effects/bclargeenergyturretpowerneedbonus.py

@@ -1,3 +1,5 @@
+# bcLargeEnergyTurretPowerNeedBonus
+#
 # Used by:
 # Ship: Oracle
 type = "passive"

eos/effects/bclargehybridturretcapacitorneedbonus.py

@@ -1,3 +1,5 @@
+# bcLargeHybridTurretCapacitorNeedBonus
+#
 # Used by:
 # Ship: Naga
 # Ship: Talos

eos/effects/bclargehybridturretcpuneedbonus.py

@@ -1,3 +1,5 @@
+# bcLargeHybridTurretCPUNeedBonus
+#
 # Used by:
 # Ship: Naga
 # Ship: Talos

eos/effects/bclargehybridturretpowerneedbonus.py

@@ -1,3 +1,5 @@
+# bcLargeHybridTurretPowerNeedBonus
+#
 # Used by:
 # Ship: Naga
 # Ship: Talos

eos/effects/bclargeprojectileturretcpuneedbonus.py

@@ -1,3 +1,5 @@
+# bcLargeProjectileTurretCPUNeedBonus
+#
 # Used by:
 # Ship: Tornado
 type = "passive"

eos/effects/bclargeprojectileturretpowerneedbonus.py

@@ -1,3 +1,5 @@
+# bcLargeProjectileTurretPowerNeedBonus
+#
 # Used by:
 # Ship: Tornado
 type = "passive"

eos/effects/biologytimebonusfixed.py

@@ -1,3 +1,5 @@
+# biologyTimeBonusFixed
+#
 # Used by:
 # Implants named like: Eifyr and Co. 'Alchemist' Biology BY (2 of 2)
 # Skill: Biology

eos/effects/blockaderunnercloakcpupercentbonus.py

@@ -1,3 +1,5 @@
+# blockadeRunnerCloakCpuPercentBonus
+#
 # Used by:
 # Ships from group: Blockade Runner (4 of 4)
 type = "passive"

eos/effects/boosterarmorhppenalty.py

@@ -1,3 +1,5 @@
+# boosterArmorHpPenalty
+#
 # Used by:
 # Implants from group: Booster (12 of 37)
 type = "boosterSideEffect"

eos/effects/boosterarmorrepairamountpenalty.py

@@ -1,3 +1,5 @@
+# boosterArmorRepairAmountPenalty
+#
 # Used by:
 # Implants from group: Booster (9 of 37)
 type = "boosterSideEffect"

eos/effects/boostercapacitorcapacitypenalty.py

@@ -1,3 +1,5 @@
+# boosterCapacitorCapacityPenalty
+#
 # Used by:
 # Implants named like: Blue Pill Booster (3 of 5)
 # Implants named like: Exile Booster (3 of 4)

eos/effects/boostermaxvelocitypenalty.py

@@ -1,3 +1,5 @@
+# boosterMaxVelocityPenalty
+#
 # Used by:
 # Implants from group: Booster (12 of 37)
 type = "boosterSideEffect"

eos/effects/boostermissileexplosioncloudpenaltyfixed.py

@@ -1,3 +1,5 @@
+# boosterMissileExplosionCloudPenaltyFixed
+#
 # Used by:
 # Implants named like: Exile Booster (3 of 4)
 # Implants named like: Mindflood Booster (3 of 4)

eos/effects/boostermissileexplosionvelocitypenalty.py

@@ -1,3 +1,5 @@
+# boosterMissileExplosionVelocityPenalty
+#
 # Used by:
 # Implants named like: Blue Pill Booster (3 of 5)
 type = "boosterSideEffect"

eos/effects/boostermissilevelocitypenalty.py

@@ -1,3 +1,5 @@
+# boosterMissileVelocityPenalty
+#
 # Used by:
 # Implants named like: Crash Booster (3 of 4)
 # Implants named like: X Instinct Booster (3 of 4)

eos/effects/boostermodifyboosterarmorpenalties.py

@@ -1,5 +1,7 @@
+# boosterModifyBoosterArmorPenalties
+#
 # Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
+# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
 # Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"

eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py

@@ -1,5 +1,7 @@
+# boosterModifyBoosterMaxVelocityAndCapacitorPenalty
+#
 # Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
+# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
 # Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"

eos/effects/boostermodifyboostermissilepenalty.py

@@ -1,5 +1,7 @@
+# boosterModifyBoosterMissilePenalty
+#
 # Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
+# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
 # Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"

eos/effects/boostermodifyboostershieldpenalty.py

@@ -1,5 +1,7 @@
+# boosterModifyBoosterShieldPenalty
+#
 # Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
+# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
 # Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"

eos/effects/boostermodifyboosterturretpenalty.py

@@ -1,5 +1,7 @@
+# boosterModifyBoosterTurretPenalty
+#
 # Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2)
+# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2)
 # Implants named like: grade Edge (10 of 12)
 # Skill: Neurotoxin Control
 type = "passive"

eos/effects/boostershieldcapacitypenalty.py

@@ -1,3 +1,5 @@
+# boosterShieldCapacityPenalty
+#
 # Used by:
 # Implants from group: Booster (12 of 37)
 type = "boosterSideEffect"

eos/effects/boosterturretfalloffpenalty.py

@@ -1,3 +1,5 @@
+# boosterTurretFalloffPenalty
+#
 # Used by:
 # Implants named like: Drop Booster (3 of 4)
 # Implants named like: X Instinct Booster (3 of 4)

eos/effects/boosterturretoptimalrangepenalty.py

@@ -1,3 +1,5 @@
+# boosterTurretOptimalRangePenalty
+#
 # Used by:
 # Implants from group: Booster (9 of 37)
 type = "boosterSideEffect"

eos/effects/boosterturrettrackingpenalty.py

@@ -1,3 +1,5 @@
+# boosterTurretTrackingPenalty
+#
 # Used by:
 # Implants named like: Exile Booster (3 of 4)
 # Implants named like: Frentix Booster (3 of 4)

eos/effects/caldarisetbonus3.py

@@ -1,3 +1,5 @@
+# caldarisetbonus3
+#
 # Used by:
 # Implants named like: High grade Talon (6 of 6)
 runTime = "early"

eos/effects/caldarisetlgbonus.py

@@ -1,3 +1,5 @@
+# caldarisetLGbonus
+#
 # Used by:
 # Implants named like: Low grade Talon (6 of 6)
 runTime = "early"

eos/effects/caldarishipecmburstoptimalrangecb3.py

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

eos/effects/caldarishipewcapacitorneedcc.py

@@ -1,4 +1,7 @@
+# caldariShipEwCapacitorNeedCC
+#
 # Used by:
+# Ship: Chameleon
 # Ship: Falcon
 # Ship: Rook
 type = "passive"

eos/effects/caldarishipewcapacitorneedcf2.py

@@ -1,3 +1,5 @@
+# caldariShipEwCapacitorNeedCF2
+#
 # Used by:
 # Variations of ship: Griffin (2 of 2)
 type = "passive"

eos/effects/caldarishipewfalloffrangecb3.py

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

eos/effects/caldarishipewfalloffrangecc2.py

@@ -1,3 +1,5 @@
+# caldariShipEwFalloffRangeCC2
+#
 # Used by:
 # Ship: Blackbird
 type = "passive"

eos/effects/caldarishipewoptimalrangecb3.py

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

eos/effects/caldarishipewoptimalrangecc2.py

@@ -1,3 +1,5 @@
+# caldariShipEwOptimalRangeCC2
+#
 # Used by:
 # Ship: Blackbird
 type = "passive"

eos/effects/caldarishipewstrengthcb.py

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

eos/effects/capacitorcapacityaddpassive.py

@@ -1,3 +1,5 @@
+# capacitorCapacityAddPassive
+#
 # Used by:
 # Subsystems from group: Engineering Systems (16 of 16)
 # Subsystem: Tengu Offensive - Magnetic Infusion Basin

eos/effects/capacitorcapacitybonus.py

@@ -1,3 +1,5 @@
+# capacitorCapacityBonus
+#
 # Used by:
 # Modules from group: Capacitor Battery (27 of 27)
 type = "passive"