Fix mass of t3ds

.gitignore

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

README.md

@@ -1,58 +1,15 @@
-# pyfa
+# Pyfa
 
-[![Join the chat at https://gitter.im/pyfa-org/Pyfa](https://badges.gitter.im/pyfa-org/Pyfa.svg)](https://gitter.im/pyfa-org/Pyfa?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+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.
 
-![pyfa](https://cloud.githubusercontent.com/assets/3904767/10271512/af385ef2-6ade-11e5-8f67-52b8b1e4c797.PNG)
+It provides many advanced features such as graphs and full calculations of any possible combination of modules, fits, etc.
 
-## What is it?
+Please see the [FAQ](https://github.com/DarkFenX/Pyfa/wiki/FAQ) for answers to common questions / concerns
 
-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.7
-* `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`)
-* `requests`
-
-### Linux Distro-specific Packages
-The following is a list of pyfa packages available for certain distros. Please note that these packages are maintained by third-parties and are not evaluated by the pyfa developers.
-
-* Debian/Ubuntu/derivitives: https://github.com/AdamMajer/Pyfa/releases
-* Arch: https://aur.archlinux.org/packages/pyfa/
-* openSUSE: https://build.opensuse.org/package/show/home:rmk2/pyfa
-* FreeBSD: http://www.freshports.org/games/pyfa/ (see #484 for instructions)
-
-## 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). 
-
-## License
-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)
+#### 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 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,11 +1,6 @@
 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
@@ -18,66 +13,35 @@ debug = False
 saveInRoot = False
 
 # Version data
-version = "1.19.1"
-tag = "Stable"
-expansionName = "February 2016"
+version = "1.10.1"
+tag = "preview"
+expansionName = "t3d_changes"
 expansionVersion = "1.1"
 evemonMinVersion = "4081"
 
+# Database version (int ONLY)
+# Increment every time we need to flag for user database upgrade/modification
+dbversion = 6
+
 pyfaPath = None
 savePath = None
+staticPath = None
 saveDB = None
 gameDB = None
 
-
-class StreamToLogger(object):
-   """
-   Fake file-like stream object that redirects writes to a logger instance.
-   From: http://www.electricmonk.nl/log/2011/08/14/redirect-stdout-and-stderr-to-a-logger-in-python/
-   """
-   def __init__(self, logger, log_level=logging.INFO):
-      self.logger = logger
-      self.log_level = log_level
-      self.linebuf = ''
-
-   def write(self, buf):
-      for line in buf.rstrip().splitlines():
-         self.logger.log(self.log_level, line.rstrip())
-
-def 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 staticPath
     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()
+        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:
@@ -90,30 +54,23 @@ def defPaths():
             savePath = unicode(os.path.expanduser(os.path.join("~", ".pyfa")),
                                sys.getfilesystemencoding())
 
-    __createDirs(savePath)
+    # 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")
 
-    if isFrozen():
-        os.environ["REQUESTS_CA_BUNDLE"] = os.path.join(pyfaPath, "cacert.pem")
-        os.environ["SSL_CERT_FILE"] = os.path.join(pyfaPath, "cacert.pem")
+    # Same for stdout
+    stdoutToFile = getattr(configforced, "stdoutToFile", None)
+    if stdoutToFile is True:
+        if not os.path.exists(savePath):
+            os.mkdir(savePath)
+        sys.stdout = open(os.path.join(savePath, "output_log.txt"), "w")
 
-    format = '%(asctime)s %(name)-24s %(levelname)-8s %(message)s'
-    logging.basicConfig(format=format, level=logLevel)
-    handler = logging.handlers.RotatingFileHandler(os.path.join(savePath, "log.txt"), maxBytes=1000000, backupCount=3)
-    formatter = logging.Formatter(format)
-    handler.setFormatter(formatter)
-    logging.getLogger('').addHandler(handler)
-
-    logging.info("Starting pyfa")
-
-    if hasattr(sys, 'frozen'):
-        stdout_logger = logging.getLogger('STDOUT')
-        sl = StreamToLogger(stdout_logger, logging.INFO)
-        sys.stdout = sl
-
-        # 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
+    # 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")
@@ -121,7 +78,7 @@ def defPaths():
     # 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")
+    gameDB = os.path.join(staticPath, "eve.db")
 
     ## DON'T MODIFY ANYTHING BELOW ##
     import eos.config

eos/capSim.py

@@ -59,50 +59,41 @@ class CapSimulator(object):
         return duration, capNeed
 
     def init(self, modules):
-        """prepare modules. a list of (duration, capNeed, clipSize, disableStagger) tuples is
+        """prepare modules. a list of (duration, capNeed, clipSize) tuples is
          expected, with clipSize 0 if the module has infinite ammo.
             """
-        self.modules = modules
+        mods = {}
+        for module in modules:
+                if module in mods:
+                        mods[module] += 1
+                else:
+                        mods[module] = 1
+
+        self.modules = mods
+
 
     def reset(self):
         """Reset the simulator state"""
         self.state = []
-        mods = {}
         period = 1
         disable_period = False
 
-        # Loop over modules, clearing clipSize if applicable, and group modules based on attributes
-        for (duration, capNeed, clipSize, disableStagger) in self.modules:
+        for (duration, capNeed, clipSize), amount in self.modules.iteritems():
             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
 
-            # Group modules based on their properties
-            if (duration, capNeed, clipSize, disableStagger) in mods:
-                mods[(duration, capNeed, clipSize, disableStagger)] += 1
-            else:
-                mods[(duration, capNeed, clipSize, disableStagger)] = 1
-
-        # Loop over grouped modules, configure staggering and push to the simulation state
-        for (duration, capNeed, clipSize, disableStagger), amount in mods.iteritems():
-            if self.stagger and not disableStagger:
-                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
@@ -169,13 +160,13 @@ class CapSimulator(object):
 
             iterations += 1
 
-            t_last = t_now
-
             if cap < cap_lowest:
                 if cap < 0.0:
                     break
                 cap_lowest = cap
 
+            t_last = t_now
+
             # queue the next activation of this module
             t_now += duration
             shot += 1

eos/config.py

@@ -4,8 +4,8 @@ import sys
 debug = False
 gamedataCache = True
 saveddataCache = True
-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())
+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 = dirname(unicode(__file__, sys.getfilesystemencoding()))

eos/db/__init__.py

@@ -68,8 +68,14 @@ from eos.db.gamedata import *
 from eos.db.saveddata import *
 
 #Import queries
-from eos.db.gamedata.queries import *
-from eos.db.saveddata.queries import *
+from eos.db.gamedata.queries import getItem, searchItems, getVariations, getItemsByCategory, directAttributeRequest, \
+                                    getMarketGroup, getGroup, getCategory, getAttributeInfo, getMetaData, getMetaGroup
+from eos.db.saveddata.queries import getUser, getCharacter, getFit, getFitsWithShip, countFitsWithShip, searchFits, \
+                                     getCharacterList, getPrice, getDamagePatternList, getDamagePattern, \
+                                     getFitList, getFleetList, getFleet, save, remove, commit, add, \
+                                     getCharactersForUser, getMiscData, getSquadsIDsWithFitID, getWing, \
+                                     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:":

eos/db/migration.py

@@ -1,40 +1,32 @@
 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):
-    dbVersion = getVersion(saveddata_engine)
-    appVersion = getAppVersion()
+    currversion = getVersion(saveddata_engine)
 
-    if dbVersion == appVersion:
+    if currversion == config.dbversion:
         return
 
-    if dbVersion < appVersion:
+    if currversion < config.dbversion:
         # Automatically backup database
         toFile = "%s/saveddata_migration_%d-%d_%s.db"%(
             config.savePath,
-            dbVersion,
-            appVersion,
+            currversion,
+            config.dbversion,
             time.strftime("%Y%m%d_%H%M%S"))
 
         shutil.copyfile(config.saveDB, toFile)
 
-        for version in xrange(dbVersion, appVersion):
-
-            func = migrations.updates[version+1]
-            if func:
-                print "applying update",version+1
-                func(saveddata_engine)
+        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 = {}".format(appVersion))
+        saveddata_engine.execute('PRAGMA user_version = %d'%config.dbversion)

eos/db/migrations/__init__.py

@@ -7,25 +7,3 @@ 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/upgrade10.py

@@ -1,16 +0,0 @@
-"""
-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/upgrade11.py

@@ -1,116 +0,0 @@
-"""
-Migration 11
-
-- Converts modules based on December Release 2015 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 = {
-    16467: (  # Medium Gremlin Compact Energy Neutralizer
-        16471,  # Medium Unstable Power Fluctuator I
-    ),
-    22947: (  # 'Beatnik' Small Remote Armor Repairer
-        23414,  # 'Brotherhood' Small Remote Armor Repairer
-    ),
-    8295: (  # Type-D Restrained Shield Flux Coil
-        8293,  # Beta Reactor Control: Shield Flux I
-    ),
-    16499: (  # Heavy Knave Scoped Energy Nosferatu
-        16501,  # E500 Prototype Energy Vampire
-    ),
-    16477: (  # Heavy Infectious Scoped Energy Neutralizer
-        16473,  # Heavy Rudimentary Energy Destabilizer I
-    ),
-    16475: (  # Heavy Gremlin Compact Energy Neutralizer
-        16479,  # Heavy Unstable Power Fluctuator I
-    ),
-    16447: (  # Medium Solace Scoped Remote Armor Repairer
-        16445,  # Medium 'Arup' Remote Armor Repairer
-    ),
-    508: (  # 'Basic' Shield Flux Coil
-        8325,  # Alpha Reactor Shield Flux
-        8329,  # Marked Generator Refitting: Shield Flux
-        8323,  # Partial Power Plant Manager: Shield Flux
-        8327,  # Type-E Power Core Modification: Shield Flux
-    ),
-    1419: (  # 'Basic' Shield Power Relay
-        8341,  # Alpha Reactor Shield Power Relay
-        8345,  # Marked Generator Refitting: Shield Power Relay
-        8339,  # Partial Power Plant Manager: Shield Power Relay
-        8343,  # Type-E Power Core Modification: Shield Power Relay
-    ),
-    16439: (  # Small Solace Scoped Remote Armor Repairer
-        16437,  # Small 'Arup' Remote Armor Repairer
-    ),
-    16505: (  # Medium Ghoul Compact Energy Nosferatu
-        16511,  # Medium Diminishing Power System Drain I
-    ),
-    8297: (  # Mark I Compact Shield Flux Coil
-        8291,  # Local Power Plant Manager: Reaction Shield Flux I
-    ),
-    16455: (  # Large Solace Scoped Remote Armor Repairer
-        16453,  # Large 'Arup' Remote Armor Repairer
-    ),
-    6485: (  # M51 Benefactor Compact Shield Recharger
-        6491,  # Passive Barrier Compensator I
-        6489,  # 'Benefactor' Ward Reconstructor
-        6487,  # Supplemental Screen Generator I
-    ),
-    5137: (  # Small Knave Scoped Energy Nosferatu
-        5135,  # E5 Prototype Energy Vampire
-    ),
-    8579: (  # Medium Murky Compact Remote Shield Booster
-        8581,  # Medium 'Atonement' Remote Shield Booster
-    ),
-    8531: (  # Small Murky Compact Remote Shield Booster
-        8533,  # Small 'Atonement' Remote Shield Booster
-    ),
-    16497: (  # Heavy Ghoul Compact Energy Nosferatu
-        16503,  # Heavy Diminishing Power System Drain I
-    ),
-    4477: (  # Small Gremlin Compact Energy Neutralizer
-        4475,  # Small Unstable Power Fluctuator I
-    ),
-    8337: (  # Mark I Compact Shield Power Relay
-        8331,  # Local Power Plant Manager: Reaction Shield Power Relay I
-    ),
-    23416: (  # 'Peace' Large Remote Armor Repairer
-        22951,  # 'Pacifier' Large Remote Armor Repairer
-    ),
-    5141: (  # Small Ghoul Compact Energy Nosferatu
-        5139,  # Small Diminishing Power System Drain I
-    ),
-    4471: (  # Small Infectious Scoped Energy Neutralizer
-        4473,  # Small Rudimentary Energy Destabilizer I
-    ),
-    16469: (  # Medium Infectious Scoped Energy Neutralizer
-        16465,  # Medium Rudimentary Energy Destabilizer I
-    ),
-    8335: (  # Type-D Restrained Shield Power Relay
-        8333,  # Beta Reactor Control: Shield Power Relay I
-    ),
-    405: (  # 'Micro' Remote Shield Booster
-        8631,  # Micro Asymmetric Remote Shield Booster
-        8627,  # Micro Murky Remote Shield Booster
-        8629,  # Micro 'Atonement' Remote Shield Booster
-        8633,  # Micro S95a Remote Shield Booster
-    ),
-    8635: (  # Large Murky Compact Remote Shield Booster
-        8637,  # Large 'Atonement' Remote Shield Booster
-    ),
-    16507: (  # Medium Knave Scoped Energy Nosferatu
-        16509,  # E50 Prototype Energy Vampire
-    ),
-}
-
-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/upgrade7.py

@@ -1,24 +0,0 @@
-"""
-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

@@ -1,85 +0,0 @@
-"""
-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

@@ -1,23 +0,0 @@
-"""
-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,18 +1,3 @@
-__all__ = [
-    "character",
-    "fit",
-    "module",
-    "user",
-    "skill",
-    "price",
-    "booster",
-    "drone",
-    "implant",
-    "fleet",
-    "damagePattern",
-    "miscData",
-    "targetResists",
-    "override",
-    "crest"
-]
-
+__all__ = ["character", "fit", "module", "user", "skill", "price",
+           "booster", "drone", "implant", "fleet", "damagePattern",
+           "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

@@ -1,31 +0,0 @@
-#===============================================================================
-# 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,11 +17,9 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 #===============================================================================
 
-from sqlalchemy import *
-from sqlalchemy.orm import *
+from sqlalchemy import Table, Column, Integer, ForeignKey, String, Boolean
+from sqlalchemy.orm import relation, mapper
 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
@@ -29,7 +27,9 @@ from eos.db.saveddata.drone import drones_table
 from eos.db.saveddata.cargo import cargo_table
 from eos.db.saveddata.implant import fitImplants_table
 from eos.types import Fit, Module, User, Booster, Drone, Cargo, Implant, Character, DamagePattern, TargetResists
-from eos.effectHandlerHelpers import *
+from eos.effectHandlerHelpers import HandledModuleList, HandledDroneList, \
+HandledImplantBoosterList, HandledProjectedModList, HandledProjectedDroneList, \
+HandledProjectedFitList, HandledCargoList
 
 fits_table = Table("fits", saveddata_meta,
                          Column("ID", Integer, primary_key = True),
@@ -47,119 +47,31 @@ fits_table = Table("fits", saveddata_meta,
 projectedFits_table = Table("projectedFits", saveddata_meta,
                             Column("sourceID", ForeignKey("fits.ID"), primary_key = True),
                             Column("victimID", ForeignKey("fits.ID"), primary_key = True),
-                            Column("amount", Integer, 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)
-)
-
+                            Column("amount", Integer))
 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"),
-            "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,
-       }
-)
+       properties = {"_Fit__modules" : relation(Module, collection_class = HandledModuleList,
+                                                primaryjoin = and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == False),
+                                                order_by = modules_table.c.position, cascade='all, delete, delete-orphan'),
+                     "_Fit__projectedModules" : relation(Module, collection_class = HandledProjectedModList, cascade='all, delete, delete-orphan', single_parent=True,
+                                                primaryjoin = and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == True)),
+                     "owner" : relation(User, backref = "fits"),
+                     "_Fit__boosters" : relation(Booster, collection_class = HandledImplantBoosterList, cascade='all, delete, delete-orphan', single_parent=True),
+                     "_Fit__drones" : relation(Drone, collection_class = HandledDroneList, cascade='all, delete, delete-orphan', single_parent=True,
+                                               primaryjoin = and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == False)),
+                     "_Fit__cargo" : relation(Cargo, collection_class = HandledCargoList, cascade='all, delete, delete-orphan', single_parent=True,
+                                               primaryjoin = and_(cargo_table.c.fitID == fits_table.c.ID)),
+                     "_Fit__projectedDrones" : relation(Drone, collection_class = HandledProjectedDroneList, cascade='all, delete, delete-orphan', single_parent=True,
+                                               primaryjoin = and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == True)),
+                     "_Fit__implants" : relation(Implant, collection_class = HandledImplantBoosterList, cascade='all, delete, delete-orphan', single_parent=True,
+                                                 primaryjoin = fitImplants_table.c.fitID == fits_table.c.ID,
+                                                 secondaryjoin = fitImplants_table.c.implantID == Implant.ID,
+                                                 secondary = fitImplants_table),
+                     "_Fit__character" : relation(Character, backref = "fits"),
+                     "_Fit__damagePattern" : relation(DamagePattern),
+                     "_Fit__targetResists" : relation(TargetResists),
+                     "_Fit__projectedFits" : relation(Fit,
+                                                      primaryjoin = projectedFits_table.c.victimID == fits_table.c.ID,
+                                                      secondaryjoin = fits_table.c.ID == projectedFits_table.c.sourceID,
+                                                      secondary = projectedFits_table,
+                                                      collection_class = HandledProjectedFitList)
+                     })

eos/db/saveddata/override.py

@@ -1,31 +0,0 @@
-#===============================================================================
-# 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, Float
-from sqlalchemy.orm import mapper
-
-from eos.db import saveddata_meta
-from eos.types import Override
-
-overrides_table = Table("overrides", saveddata_meta,
-                     Column("itemID", Integer, primary_key=True,  index = True),
-                     Column("attrID", Integer, primary_key=True, index = True),
-                     Column("value", Float, nullable = False))
-
-mapper(Override, overrides_table)

eos/db/saveddata/queries.py

@@ -19,8 +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, TargetResists, Override, CrestChar
+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_
@@ -183,15 +182,9 @@ def getFit(lookfor, eager=None):
         else:
             eager = processEager(eager)
             with sd_lock:
-                fit = saveddata_session.query(Fit).options(*eager).filter(Fit.ID == lookfor).first()
+                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")
@@ -251,10 +244,9 @@ def getFitsWithShip(shipID, ownerID=None, where=None, eager=None):
         filter = processWhere(filter, where)
         eager = processEager(eager)
         with sd_lock:
-            fits = removeInvalid(saveddata_session.query(Fit).options(*eager).filter(filter).all())
+            fits = 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):
@@ -272,8 +264,7 @@ def getBoosterFits(ownerID=None, where=None, eager=None):
     filter = processWhere(filter, where)
     eager = processEager(eager)
     with sd_lock:
-        fits = removeInvalid(saveddata_session.query(Fit).options(*eager).filter(filter).all())
-
+        fits = saveddata_session.query(Fit).options(*eager).filter(filter).all()
     return fits
 
 def countAllFits():
@@ -304,8 +295,7 @@ def countFitsWithShip(shipID, ownerID=None, where=None, eager=None):
 def getFitList(eager=None):
     eager = processEager(eager)
     with sd_lock:
-        fits = removeInvalid(saveddata_session.query(Fit).options(*eager).all())
-
+        fits = saveddata_session.query(Fit).options(*eager).all()
     return fits
 
 def getFleetList(eager=None):
@@ -395,8 +385,7 @@ def searchFits(nameLike, where=None, eager=None):
     filter = processWhere(Fit.name.like(nameLike, escape="\\"), where)
     eager = processEager(eager)
     with sd_lock:
-        fits = removeInvalid(saveddata_session.query(Fit).options(*eager).filter(filter).all())
-
+        fits = saveddata_session.query(Fit).options(*eager).filter(filter).all()
     return fits
 
 def getSquadsIDsWithFitID(fitID):
@@ -417,55 +406,6 @@ def getProjectedFits(fitID):
     else:
         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 getOverrides(itemID, eager=None):
-    if isinstance(itemID, int):
-        return saveddata_session.query(Override).filter(Override.itemID == itemID).all()
-    else:
-        raise TypeError("Need integer as argument")
-
-def clearOverrides():
-    with sd_lock:
-        deleted_rows = saveddata_session.query(Override).delete()
-    commit()
-    return deleted_rows
-
-def getAllOverrides(eager=None):
-    return saveddata_session.query(Override).all()
-
-def removeInvalid(fits):
-    invalids = [f for f in fits if f.isInvalid]
-
-    if invalids:
-        map(fits.remove, invalids)
-        map(saveddata_session.delete, invalids)
-        saveddata_session.commit()
-
-    return fits
-
 def add(stuff):
     with sd_lock:
         saveddata_session.add(stuff)

eos/effectHandlerHelpers.py

@@ -17,12 +17,8 @@
 # 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):
@@ -105,14 +101,6 @@ 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")
@@ -127,14 +115,10 @@ 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
@@ -159,82 +143,139 @@ 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 HandledDroneCargoList(HandledList):
+class HandledDroneList(HandledList):
     def find(self, item):
-        for o in self:
-            if o.item == item:
-                yield o
+        for d in self:
+            if d.item == item:
+                yield d
 
     def findFirst(self, item):
-        for o in self.find(item):
-            return o
+        for d in self.find(item):
+            return d
 
-    def append(self, thing):
-        HandledList.append(self, thing)
+    def append(self, drone):
+        list.append(self, drone)
 
-        if thing.isInvalid:
-            self.remove(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
 
 class HandledImplantBoosterList(HandledList):
-    def append(self, thing):
-        if thing.isInvalid:
-            HandledList.append(self, thing)
-            self.remove(thing)
-            return
+    def __init__(self):
+        self.__slotCache = {}
 
-        # 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 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)
 
-        HandledList.append(self, thing)
+    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
 
 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):
+class HandledProjectedDroneList(HandledDroneList):
     def append(self, proj):
         proj.projected = True
-        HandledList.append(self, proj)
+        list.append(self, proj)
 
-        # Remove invalid or non-projectable drones
-        if proj.isInvalid or not proj.item.isType("projected"):
-            self.remove(proj)
+class HandledProjectedFitList(HandledList):
+    def append(self, proj):
+        proj.projected = True
+        list.append(self, proj)
 
 class HandledItem(object):
     def preAssignItemAttr(self, *args, **kwargs):

eos/effects/addtosignatureradius2.py

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

eos/effects/ammoinfluencecapneed.py

@@ -1,7 +1,7 @@
 # ammoInfluenceCapNeed
 #
 # Used by:
-# Items from category: Charge (458 of 833)
+# 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,7 +1,7 @@
 # ammoInfluenceRange
 #
 # Used by:
-# Items from category: Charge (559 of 833)
+# Items from category: Charge (559 of 829)
 type = "passive"
 def handler(fit, module, context):
     module.multiplyItemAttr("maxRange", module.getModifiedChargeAttr("weaponRangeMultiplier"))

eos/effects/armordamageamountbonuscapitalarmorrepairers.py

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

eos/effects/armorhpbonusadd.py

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

eos/effects/armorreinforcermassadd.py

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

eos/effects/armorrepairprojectorfalloffbonus.py

@@ -1,11 +0,0 @@
-# armorRepairProjectorFalloffBonus
-#
-# Used by:
-# Variations of ship: Navitas (2 of 2)
-# Ship: Augoror
-# Ship: Deacon
-# Ship: Exequror
-# Ship: Inquisitor
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", "falloffEffectiveness", src.getModifiedItemAttr("falloffBonus"))

eos/effects/armorrepairprojectormaxrangebonus.py

@@ -1,11 +1,10 @@
 # armorRepairProjectorMaxRangeBonus
 #
 # Used by:
-# Variations of ship: Navitas (2 of 2)
 # Ship: Augoror
-# Ship: Deacon
 # Ship: Exequror
 # Ship: Inquisitor
+# Ship: Navitas
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer",

eos/effects/armortankinggang2.py

@@ -1,4 +1,4 @@
-# armorWarfareArmorHpReplacer
+# armorTankingGang2
 #
 # Used by:
 # Implant: Armored Warfare Mindlink

eos/effects/battlecruiserdronespeed.py

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

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

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

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

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

eos/effects/blockaderunnercloakcpupercentbonus.py

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

eos/effects/caldarishipecmburstoptimalrangecb3.py

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

eos/effects/caldarishipewcapacitorneedcc.py

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

eos/effects/caldarishipewcapacitorneedcf2.py

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

eos/effects/caldarishipewfalloffrangecb3.py

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

eos/effects/caldarishipewfalloffrangecc2.py

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

eos/effects/caldarishipewoptimalrangecb3.py

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

eos/effects/caldarishipewoptimalrangecc2.py

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

eos/effects/caldarishipewstrengthcb.py

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

eos/effects/capacitorcapacitymultiply.py

@@ -4,8 +4,10 @@
 # Modules from group: Capacitor Flux Coil (6 of 6)
 # Modules from group: Capacitor Power Relay (20 of 20)
 # Modules from group: Power Diagnostic System (23 of 23)
-# Modules from group: Propulsion Module (114 of 114)
+# Modules from group: Propulsion Module (107 of 107)
 # Modules from group: Reactor Control Unit (22 of 22)
+# Modules from group: Shield Flux Coil (11 of 11)
+# Modules from group: Shield Power Relay (11 of 11)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("capacitorCapacity", module.getModifiedItemAttr("capacitorCapacityMultiplier"))

eos/effects/carrieramarrarmorenergytransferrange3.py

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

eos/effects/carrieramarrarmorresist2.py

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

eos/effects/carrieramarrarmortransferfalloff3.py

@@ -1,8 +0,0 @@
-# carrierAmarrArmorTransferFalloff3
-#
-# Used by:
-# Ship: Aeon
-# Ship: Archon
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("carrierAmarrBonus3"), skill="Amarr Carrier")

eos/effects/carrieramarrdronemax1.py

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

eos/effects/carrieramarrfighterbombermaxvelocity2.py

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

eos/effects/carrieramarrfightermaxvelocity2.py

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

eos/effects/carrieramarrleadershipmaxgroupactive4.py

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

eos/effects/carriercaldaridronemax1.py

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

eos/effects/carriercaldarifightersandbomberssig1.py

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

eos/effects/carriercaldarileadershipmaxgroupactive4.py

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

eos/effects/carriercaldarishieldenergytransferrange3.py

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

eos/effects/carriercaldarishieldresist2.py

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

eos/effects/carriercaldarishieldtransferfalloff3.py

@@ -1,9 +0,0 @@
-# carrierCaldariShieldTransferFalloff3
-#
-# Used by:
-# Ship: Chimera
-# Ship: Revenant
-# Ship: Wyvern
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"), "falloffEffectiveness", src.getModifiedItemAttr("carrierCaldariBonus3"), skill="Caldari Carrier")

eos/effects/carriergallentearmorshieldtransferfalloff3.py

@@ -1,8 +0,0 @@
-# carrierGallenteArmor&ShieldTransferFalloff3
-#
-# Used by:
-# Ship: Nyx
-# Ship: Thanatos
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems") or mod.item.requiresSkill("Capital Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("carrierGallenteBonus3"), skill="Gallente Carrier")

eos/effects/carriergallentearmorshieldtransferrange3.py

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

eos/effects/carriergallentebomberdroneowndmg2.py

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

eos/effects/carriergallentedronemax1.py

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

eos/effects/carriergallentedroneowndmg2.py

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

eos/effects/carriergallenteleadershipmaxgroupactive4.py

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

eos/effects/carrierminmatararmorshieldamount.py

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

eos/effects/carrierminmatararmorshieldtransferfalloff3.py

@@ -1,8 +0,0 @@
-# carrierMinmatarArmor&ShieldTransferFalloff3
-#
-# Used by:
-# Ship: Hel
-# Ship: Nidhoggur
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems") or mod.item.requiresSkill("Capital Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("carrierMinmatarBonus3"), skill="Minmatar Carrier")

eos/effects/carrierminmatararmorshieldtransferrange3.py

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

eos/effects/carrierminmatardronemax1.py

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

eos/effects/carrierminmatarleadershipmaxgroupactive4.py

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

eos/effects/commandbonusecmmultiplywithcommandbonushidden.py

@@ -5,8 +5,6 @@
 gangBonus = "commandBonusECM"
 gangBoost = "ewarStrECM"
 type = "active", "gang"
-runTime = "late"
-
 def handler(fit, module, context):
     if "gang" not in context: return
     for scanType in ("Magnetometric", "Radar", "Ladar", "Gravimetric"):

eos/effects/commandbonusrsdmultiplywithcommandbonushidden.py

@@ -5,8 +5,6 @@
 gangBonus = "commandBonusRSD"
 gangBoost = "ewarStrRSD"
 type = "active", "gang"
-runTime = "late"
-
 def handler(fit, module, context):
     if "gang" not in context: return
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Sensor Linking"),

eos/effects/commandbonustdmultiplywithcommandbonushidden.py

@@ -5,18 +5,8 @@
 gangBonus = "commandBonusTD"
 gangBoost = "ewarStrTD"
 type = "active", "gang"
-runTime = "late"
-
 def handler(fit, module, context):
     if "gang" not in context: return
-    for bonus in (
-        "missileVelocityBonus",
-        "explosionDelayBonus",
-        "aoeVelocityBonus",
-        "falloffBonus",
-        "maxRangeBonus",
-        "aoeCloudSizeBonus",
-        "trackingSpeedBonus"
-    ):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
+    for bonus in ("maxRangeBonus", "falloffBonus", "trackingSpeedBonus"):
+        fit.modules.filteredItemBoost(lambda mod: lambda mod: mod.item.requiresSkill("Weapon Disruption"),
                                       bonus, module.getModifiedItemAttr("commandBonusTD"))

eos/effects/commandbonustpmultiplywithcommandbonushidden.py

@@ -5,10 +5,8 @@
 gangBonus = "commandBonusTP"
 gangBoost = "ewarStrTP"
 type = "active", "gang"
-runTime = "late"
-
 def handler(fit, module, context):
     if "gang" not in context: return
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Target Painting"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter",
                                   "signatureRadiusBonus", module.getModifiedItemAttr("commandBonusTP"),
                                   stackingPenalties = True)

eos/effects/commandshipmultirelayeffect.py

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

eos/effects/covertopsandreconopscloakmoduledelaybonus.py

@@ -4,12 +4,12 @@
 # Ships from group: Black Ops (4 of 4)
 # Ships from group: Blockade Runner (4 of 4)
 # Ships from group: Covert Ops (5 of 5)
-# Ships from group: Expedition Frigate (2 of 2)
 # Ships from group: Force Recon Ship (6 of 6)
 # Ships from group: Stealth Bomber (4 of 4)
 # Ships named like: Stratios (2 of 2)
 # Subsystems named like: Offensive Covert Reconfiguration (4 of 4)
 # Ship: Astero
+# Ship: Prospect
 type = "passive"
 def handler(fit, container, context):
     fit.modules.filteredItemForce(lambda mod: mod.item.requiresSkill("Cloaking"),

eos/effects/covertopscloakcpupercentbonus1.py

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

eos/effects/covertopscloakcpupercentbonuspiratefaction.py

@@ -1,8 +1,8 @@
 # covertOpsCloakCPUPercentBonusPirateFaction
 #
 # Used by:
-# Ships from group: Expedition Frigate (2 of 2)
 # Ship: Astero
+# Ship: Prospect
 # Ship: Victorieux Luxury Yacht
 type = "passive"
 runTime = "early"

eos/effects/covertopsstealthbombertargettingdelaybonus.py

@@ -4,7 +4,6 @@
 # Ships from group: Black Ops (4 of 4)
 # Ships from group: Stealth Bomber (4 of 4)
 # Ship: Chremoas
-# Ship: Endurance
 # Ship: Etana
 type = "passive"
 def handler(fit, ship, context):

eos/effects/crystalminingamountinfo2.py

@@ -1,7 +0,0 @@
-# crystalMiningamountInfo2
-#
-# Used by:
-# Modules from group: Frequency Mining Laser (3 of 3)
-type = "passive"
-def handler(fit, module, context):
-    module.preAssignItemAttr("specialtyMiningAmount", module.getModifiedItemAttr("miningAmount"))

eos/effects/drawbackcpuoutput.py

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

eos/effects/drawbacksigrad.py

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

eos/effects/dreadnoughtmd1projdmgbonus.py

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

eos/effects/dreadnoughtmd3projrofbonus.py

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

eos/effects/dreadnoughtshipbonushybriddmgg1.py

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

eos/effects/dreadnoughtshipbonushybridrofg2.py

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

eos/effects/dreadnoughtshipbonuslasercapneeda1.py

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

eos/effects/dreadnoughtshipbonuslaserrofa2.py

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

eos/effects/dreadnoughtshipbonusshieldresistancesc2.py

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

eos/effects/dronearmordamagebonuseffect.py

@@ -1,8 +1,9 @@
 # droneArmorDamageBonusEffect
 #
 # Used by:
-# Ships from group: Logistics (5 of 5)
 # Ship: Exequror
+# Ship: Guardian
+# Ship: Oneiros
 # Ship: Scythe
 type = "passive"
 def handler(fit, ship, context):

eos/effects/dronedmgbonus.py

@@ -1,7 +1,7 @@
 # droneDmgBonus
 #
 # Used by:
-# Skills from group: Drones (8 of 23)
+# Skills from group: Drones (8 of 21)
 # Skills named like: Drone Specialization (4 of 4)
 type = "passive"
 def handler(fit, skill, context):

eos/effects/dronehullrepairbonuseffect.py

@@ -1,9 +0,0 @@
-# droneHullRepairBonusEffect
-#
-# Used by:
-# Ships from group: Logistics (5 of 5)
-# Ship: Exequror
-# Ship: Scythe
-type = "passive"
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Logistic Drone", "structureDamageAmount", src.getModifiedItemAttr("droneArmorDamageAmountBonus"))

eos/effects/droneshieldbonusbonuseffect.py

@@ -1,7 +1,7 @@
 # droneShieldBonusBonusEffect
 #
 # Used by:
-# Ships from group: Logistics (5 of 5)
+# Ships from group: Logistics (3 of 5)
 # Ship: Exequror
 # Ship: Scythe
 type = "passive"

eos/effects/elitebargebonusiceharvestingcycletimebarge3.py

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

eos/effects/elitebargebonusminingdurationbarge2.py

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

eos/effects/elitebargeshieldresistance1.py

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

eos/effects/elitebonusassaultshiplightmissilerof.py

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

eos/effects/elitebonusassaultshipmissilevelocity1.py

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

eos/effects/elitebonusassaultshiprocketrof.py

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

eos/effects/elitebonusblackopsagiliy1.py

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