Add some logic to disable from CREST menu items if character is not logged in

This reverts commit ff87d5e456.

.gitignore

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

LICENSE

@@ -549,14 +549,14 @@ to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
 
-  13. Use with the GNU General Public License.
+  13. Use with the GNU Affero General Public License.
 
   Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
+under version 3 of the GNU Affero General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU General Public License,
+but the special requirements of the GNU Affero General Public License,
 section 13, concerning interaction through a network will apply to the
 combination as such.
 

README.md

@@ -0,0 +1,47 @@
+# pyfa
+
+![pyfa](https://cloud.githubusercontent.com/assets/3904767/10271512/af385ef2-6ade-11e5-8f67-52b8b1e4c797.PNG)
+
+## What is it?
+
+pyfa, short for **py**thon **f**itting **a**ssistant, allows you to create, experiment with, and save ship fittings without being in game. Open source and written in Python, it is available on any platform where Python 2.x and wxWidgets are available, including Windows, Mac OS X, and Linux.
+
+## Latest Version and Changelogs
+The latest version along with release notes can always be found on the projects [Releases](https://github.com/DarkFenX/Pyfa/releases) page. pyfa will notify you if you are running an outdated version.
+
+## Installing
+Windows and OS X users are supplied self-contained builds of pyfa that can be run without additional software. An `.exe` installer is also available for the Windows builds. There is no self-contained package for Linux users, which are expected to run pyfa through their distributions Python interpreter. However, there are a number of third-party packages available that handle the dependencies and updates for pyfa (for example, [pyfa for Arch Linux](https://aur.archlinux.org/packages/pyfa/)). Please check your distributions repositories.
+
+## Requirements
+If you wish to help with development or simply need to run pyfa through a Python interpreter, the following software is required:
+
+* Python >= 2.6
+* `wxPython` 2.8/3.0
+* `sqlalchemy` >= 0.6
+* `dateutil`
+* `matplotlib` (for some Linux distributions, you may need to install separate wxPython bindings, such as `python-matplotlib-wx`)
+
+## Bug Reporting
+The preferred method of reporting bugs is through the projects GitHub Issues interface. Alternatively, posting a report in the pyfa thread on the official EVE Online forums is acceptable. Guidelines for bug reporting can be found on [this wiki page](https://github.com/DarkFenX/Pyfa/wiki/Bug-Reporting). 
+
+## Liscense
+pyfa is licensed under the GNU GPL v3.0, see LICENSE
+
+## Resources
+* 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 University guide using pyfa](http://wiki.eveuniversity.org/Guide_to_using_PYFA)
+* [EVE Online website](http://www.eveonline.com/)
+
+## Contacts:
+* Kadesh Priestess
+    * GitHub: @DarkFenX
+    * [TweetFleet Slack](https://www.fuzzwork.co.uk/tweetfleet-slack-invites/): @kadesh
+* Sable Blitzmann
+    * GitHub: @blitzmann
+    * [TweetFleet Slack](https://www.fuzzwork.co.uk/tweetfleet-slack-invites/): @blitzmann
+    * Email: sable.blitzmann@gmail.com
+
+## CCP Copyright Notice
+EVE Online, the EVE logo, EVE and all associated logos and designs are the intellectual property of CCP hf. All artwork, screenshots, characters, vehicles, storylines, world facts or other recognizable features of the intellectual property relating to these trademarks are likewise the intellectual property of CCP hf. EVE Online and the EVE logo are the registered trademarks of CCP hf. All rights are reserved worldwide. All other trademarks are the property of their respective owners. CCP hf. has granted permission to Osmium to use EVE Online and all associated logos and designs for promotional and information purposes on its website but does not endorse, and is not in any way affiliated with, Osmium. CCP is in no way responsible for the content on or functioning of this website, nor can it be liable for any damage arising from the use of this website.

config.py

@@ -1,86 +1,134 @@
-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.2.0"
-tag = "stable"
-expansionName = "Kronos"
-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
+
+# TODO: move all logging back to pyfa.py main loop
+# We moved it here just to avoid rebuilding windows skeleton for now (any change to pyfa.py needs it)
+import logging
+import logging.handlers
+
+# Load variable overrides specific to distribution type
+try:
+    import configforced
+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.15.1"
+tag = "git"
+expansionName = "Vanguard"
+expansionVersion = "1.0"
+evemonMinVersion = "4081"
+
+clientID = 'af87365240d644f7950af563b8418bad'
+
+pyfaPath = None
+savePath = None
+saveDB = None
+gameDB = None
+
+
+class StreamToLogger(object):
+   """
+   Fake file-like stream object that redirects writes to a logger instance.
+   From: http://www.electricmonk.nl/log/2011/08/14/redirect-stdout-and-stderr-to-a-logger-in-python/
+   """
+   def __init__(self, logger, log_level=logging.INFO):
+      self.logger = logger
+      self.log_level = log_level
+      self.linebuf = ''
+
+   def write(self, buf):
+      for line in buf.rstrip().splitlines():
+         self.logger.log(self.log_level, line.rstrip())
+
+def isFrozen():
+    if hasattr(sys, 'frozen'):
+        return True
+    else:
+        return False
+
+def getPyfaRoot():
+    base = getattr(sys.modules['__main__'], "__file__", 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 __createDirs(path):
+    if not os.path.exists(path):
+        os.makedirs(path)
+
+def defPaths():
+    global debug
+    global pyfaPath
+    global savePath
+    global saveDB
+    global gameDB
+    global saveInRoot
+
+    if debug:
+        logLevel = logging.DEBUG
+    else:
+        logLevel = logging.WARN
+
+    # 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())
+
+    __createDirs(savePath)
+
+    if isFrozen():
+        os.environ["REQUESTS_CA_BUNDLE"] = os.path.join(pyfaPath, "cacert.pem")
+
+    format = '%(asctime)s %(name)-24s %(levelname)-8s %(message)s'
+    logging.basicConfig(format=format, level=logLevel)
+    handler = logging.handlers.RotatingFileHandler(os.path.join(savePath, "log.txt"), maxBytes=1000000, backupCount=3)
+    formatter = logging.Formatter(format)
+    handler.setFormatter(formatter)
+    logging.getLogger('').addHandler(handler)
+
+    logging.info("Starting pyfa")
+
+    if hasattr(sys, 'frozen'):
+        stdout_logger = logging.getLogger('STDOUT')
+        sl = StreamToLogger(stdout_logger, logging.INFO)
+        sys.stdout = sl
+
+        # This interferes with cx_Freeze's own handling of exceptions. Find a way to fix this.
+        #stderr_logger = logging.getLogger('STDERR')
+        #sl = StreamToLogger(stderr_logger, logging.ERROR)
+        #sys.stderr = sl
+
+    # 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(pyfaPath, "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"))
-saveddata_connectionstring = 'sqlite:///:memory:'
+gamedata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "eve.db")), sys.getfilesystemencoding())
+saveddata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "saveddata", "saveddata.db")), sys.getfilesystemencoding())
 
 #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, getCrestCharacters, getCrestCharacter
 
 #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,40 @@
-import sqlalchemy
+import config
+import shutil
+import time
+import re
+import os
+import migrations
+
+def getVersion(db):
+    cursor = db.execute('PRAGMA user_version')
+    return cursor.fetchone()[0]
+
+def getAppVersion():
+    return migrations.appVersion
 
 def update(saveddata_engine):
-    checkPriceFailures(saveddata_engine)
-    checkApiDefaultChar(saveddata_engine)
-    checkFitBooster(saveddata_engine)
+    dbVersion = getVersion(saveddata_engine)
+    appVersion = getAppVersion()
 
-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 dbVersion == appVersion:
+        return
 
+    if dbVersion < appVersion:
+        # Automatically backup database
+        toFile = "%s/saveddata_migration_%d-%d_%s.db"%(
+            config.savePath,
+            dbVersion,
+            appVersion,
+            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(dbVersion, appVersion):
+
+            func = migrations.updates[version+1]
+            if func:
+                print "applying update",version+1
+                func(saveddata_engine)
+
+        # when all is said and done, set version to current
+        saveddata_engine.execute("PRAGMA user_version = {}".format(appVersion))

eos/db/migrations/__init__.py

@@ -0,0 +1,31 @@
+"""
+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)
+"""
+
+import pkgutil
+import re
+
+
+updates = {}
+appVersion = 0
+
+prefix = __name__ + "."
+for importer, modname, ispkg in pkgutil.iter_modules(__path__, prefix):
+    # loop through python files, extracting update number and function, and
+    # adding it to a list
+    modname_tail = modname.rsplit('.', 1)[-1]
+    module = __import__(modname, fromlist=True)
+    m = re.match("^upgrade(?P<index>\d+)$", modname_tail)
+    if not m:
+        continue
+    index = int(m.group("index"))
+    appVersion = max(appVersion, index)
+    upgrade = getattr(module, "upgrade", False)
+    if upgrade:
+        updates[index] = upgrade

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

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

eos/db/migrations/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/migrations/upgrade8.py

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

eos/db/migrations/upgrade9.py

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

eos/db/saveddata/__init__.py

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

eos/db/saveddata/booster.py

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

eos/db/saveddata/crest.py

@@ -0,0 +1,31 @@
+#===============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# 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, String, Boolean
+from sqlalchemy.orm import mapper
+
+from eos.db import saveddata_meta
+from eos.types import CrestChar
+
+crest_table = Table("crest", saveddata_meta,
+                         Column("ID", Integer, primary_key = True),
+                         Column("name", String, nullable = False, unique = True),
+                         Column("refresh_token", String, nullable = False))
+
+mapper(CrestChar, crest_table)

eos/db/saveddata/fit.py

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

eos/db/saveddata/queries.py

@@ -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, CrestChar
 from eos.db.saveddata.fleet import squadmembers_table
 from eos.db.saveddata.fit import projectedFits_table
 from sqlalchemy.sql import and_
@@ -185,6 +185,12 @@ def getFit(lookfor, eager=None):
                 fit = saveddata_session.query(Fit).options(*eager).filter(Fit.ID == fitID).first()
     else:
         raise TypeError("Need integer as argument")
+
+    if fit and fit.isInvalid:
+        with sd_lock:
+            removeInvalid([fit])
+        return None
+
     return fit
 
 @cachedQuery(Fleet, 1, "fleetID")
@@ -244,9 +250,10 @@ def getFitsWithShip(shipID, ownerID=None, where=None, eager=None):
         filter = processWhere(filter, where)
         eager = processEager(eager)
         with sd_lock:
-            fits = saveddata_session.query(Fit).options(*eager).filter(filter).all()
+            fits = removeInvalid(saveddata_session.query(Fit).options(*eager).filter(filter).all())
     else:
         raise TypeError("ShipID must be integer")
+
     return fits
 
 def getBoosterFits(ownerID=None, where=None, eager=None):
@@ -264,9 +271,15 @@ def getBoosterFits(ownerID=None, where=None, eager=None):
     filter = processWhere(filter, where)
     eager = processEager(eager)
     with sd_lock:
-        fits = saveddata_session.query(Fit).options(*eager).filter(filter).all()
+        fits = removeInvalid(saveddata_session.query(Fit).options(*eager).filter(filter).all())
+
     return fits
 
+def countAllFits():
+    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.
@@ -290,7 +303,8 @@ def countFitsWithShip(shipID, ownerID=None, where=None, eager=None):
 def getFitList(eager=None):
     eager = processEager(eager)
     with sd_lock:
-        fits = saveddata_session.query(Fit).options(*eager).all()
+        fits = removeInvalid(saveddata_session.query(Fit).options(*eager).all())
+
     return fits
 
 def getFleetList(eager=None):
@@ -308,6 +322,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 +342,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 +366,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")
@@ -350,7 +394,8 @@ def searchFits(nameLike, where=None, eager=None):
     filter = processWhere(Fit.name.like(nameLike, escape="\\"), where)
     eager = processEager(eager)
     with sd_lock:
-        fits = saveddata_session.query(Fit).options(*eager).filter(filter).all()
+        fits = removeInvalid(saveddata_session.query(Fit).options(*eager).filter(filter).all())
+
     return fits
 
 def getSquadsIDsWithFitID(fitID):
@@ -361,7 +406,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 +414,41 @@ 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 getCrestCharacters(eager=None):
+    eager = processEager(eager)
+    with sd_lock:
+        characters = saveddata_session.query(CrestChar).options(*eager).all()
+    return characters
+
+@cachedQuery(CrestChar, 1, "lookfor")
+def getCrestCharacter(lookfor, eager=None):
+    if isinstance(lookfor, int):
+        if eager is None:
+            with sd_lock:
+                character = saveddata_session.query(CrestChar).get(lookfor)
+        else:
+            eager = processEager(eager)
+            with sd_lock:
+                character = saveddata_session.query(CrestChar).options(*eager).filter(CrestChar.ID == lookfor).first()
+    elif isinstance(lookfor, basestring):
+        eager = processEager(eager)
+        with sd_lock:
+            character = saveddata_session.query(CrestChar).options(*eager).filter(CrestChar.name == lookfor).first()
+    else:
+        raise TypeError("Need integer or string as argument")
+    return character
+
+def removeInvalid(fits):
+    invalids = [f for f in fits if f.isInvalid]
+
+    if invalids:
+        map(fits.remove, invalids)
+        map(saveddata_session.delete, invalids)
+        saveddata_session.commit()
+
+    return fits
 
 def add(stuff):
     with sd_lock:

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

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

eos/effects/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,5 +1,8 @@
+# addToSignatureRadius2
+#
 # Used by:
-# Modules from group: Shield Extender (37 of 37)
+# Modules from group: Missile Launcher Bomb (2 of 2)
+# Modules from group: Shield Extender (25 of 25)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusAdd"))

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 831)
 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 831)
 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,7 +1,9 @@
+# armorDamageAmountBonusCapitalArmorRepairers
+#
 # Used by:
 # Modules named like: Auxiliary Nano Pump (8 of 8)
 type = "passive"
 def handler(fit, implant, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"),
                                   "armorDamageAmount", implant.getModifiedItemAttr("repairBonus"),
-                                  stackingPenalties = True)
+                                  stackingPenalties=True)

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

eos/effects/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/battlecruiserdronespeed.py

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

eos/effects/battlecruisermetrange.py

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

eos/effects/battlecruisermhtrange.py

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

eos/effects/battlecruisermissilerange.py

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

eos/effects/battlecruisermptrange.py

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

eos/effects/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