Merge branch 'regSkills' into preview_proj_skills

.gitignore

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

README.md

@@ -1,58 +1,22 @@
-# 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.
+#### A note for Linux users
+pyfa currently only supports wxPython 2.8. However, there are some distros that have started to support 3.0 and subsequently dropped support for 2.8 altogether (such as Debian Jessie). If this is the case and wxPython 3.0 is the only version installed, the official pyfa releases will not run. You must either find a package for 2.8 or compile it yourself.
 
-## 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.
+For Debian Jessie, wxPython 2.8 is available in Sid (the unstable repo). you can use apt-pinning to install select packages from unstable and still keep your stable system. See http://jaqque.sbih.org/kplug/apt-pinning.html for me details.
 
-## 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.
+3.0 support is being worked on and can be found on the wx3 branch. It may be stable enough for you, but there are a few bugs related to it. Please see the wx3 label on the GitHub issues area for me information on known issues (biggest one currently is GTK warning spam): https://github.com/DarkFenX/Pyfa/labels/wx3
 
-### 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

@@ -17,15 +17,18 @@ debug = False
 # Defines if our saveddata will be in pyfa root or not
 saveInRoot = False
 
+logLevel = logging.DEBUG
+
 # Version data
-version = "1.19.1"
-tag = "Stable"
-expansionName = "February 2016"
-expansionVersion = "1.1"
+version = "1.13.3"
+tag = "git"
+expansionName = "Aegis"
+expansionVersion = "1.0"
 evemonMinVersion = "4081"
 
 pyfaPath = None
 savePath = None
+staticPath = None
 saveDB = None
 gameDB = None
 
@@ -44,40 +47,23 @@ class StreamToLogger(object):
       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:
@@ -92,10 +78,6 @@ def defPaths():
 
     __createDirs(savePath)
 
-    if isFrozen():
-        os.environ["REQUESTS_CA_BUNDLE"] = os.path.join(pyfaPath, "cacert.pem")
-        os.environ["SSL_CERT_FILE"] = os.path.join(pyfaPath, "cacert.pem")
-
     format = '%(asctime)s %(name)-24s %(levelname)-8s %(message)s'
     logging.basicConfig(format=format, level=logLevel)
     handler = logging.handlers.RotatingFileHandler(os.path.join(savePath, "log.txt"), maxBytes=1000000, backupCount=3)
@@ -110,10 +92,13 @@ def defPaths():
         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
+        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 +106,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,20 +59,26 @@ 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)
 
@@ -81,15 +87,7 @@ class CapSimulator(object):
             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 self.stagger:
                 if clipSize == 0:
                     duration = int(duration/amount)
                 else:
@@ -169,13 +167,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

@@ -3,15 +3,22 @@ import shutil
 import time
 import re
 import os
-import migrations
+
+def getAppVersion():
+    # calculate app version based on upgrade files we have
+    appVersion = 0
+    for fname in os.listdir(os.path.join(os.path.dirname(__file__), "migrations")):
+        m = re.match("^upgrade(?P<index>\d+)\.py$", fname)
+        if not m:
+            continue
+        index = int(m.group("index"))
+        appVersion = max(appVersion, index)
+    return appVersion
 
 def getVersion(db):
     cursor = db.execute('PRAGMA user_version')
     return cursor.fetchone()[0]
 
-def getAppVersion():
-    return migrations.appVersion
-
 def update(saveddata_engine):
     dbVersion = getVersion(saveddata_engine)
     appVersion = getAppVersion()
@@ -30,11 +37,10 @@ def update(saveddata_engine):
         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)
+            module = __import__("eos.db.migrations.upgrade{}".format(version + 1), fromlist=True)
+            upgrade = getattr(module, "upgrade", False)
+            if upgrade:
+                upgrade(saveddata_engine)
 
         # when all is said and done, set version to current
         saveddata_engine.execute("PRAGMA user_version = {}".format(appVersion))

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/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/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/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/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,7 +182,7 @@ 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")
 
@@ -417,45 +416,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]
 

eos/effectHandlerHelpers.py

@@ -159,10 +159,6 @@ 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]

eos/effects/ammoinfluencecapneed.py

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

eos/effects/ammoinfluencerange.py

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

eos/effects/armordamageamountbonuscapitalarmorrepairers.py

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

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

@@ -1,8 +1,7 @@
 # caldariShipEwCapacitorNeedCF2
 #
 # Used by:
-# Ship: Griffin
-# Ship: Kitsune
+# Variations of ship: Griffin (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",

eos/effects/capacitorcapacitymultiply.py

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

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

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

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

@@ -6,6 +6,6 @@
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "maxRange", ship.getModifiedItemAttr("carrierGallenteBonus3"), skill="Gallente Carrier")
+                                  "shieldTransferRange", ship.getModifiedItemAttr("carrierGallenteBonus3"), skill="Gallente Carrier")
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
                                   "maxRange", ship.getModifiedItemAttr("carrierGallenteBonus3"), skill="Gallente Carrier")

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

@@ -6,6 +6,6 @@
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "maxRange", ship.getModifiedItemAttr("carrierMinmatarBonus3"), skill="Minmatar Carrier")
+                                  "shieldTransferRange", ship.getModifiedItemAttr("carrierMinmatarBonus3"), skill="Minmatar Carrier")
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
                                   "maxRange", ship.getModifiedItemAttr("carrierMinmatarBonus3"), skill="Minmatar Carrier")

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"
-    ):
+    for bonus in ("maxRangeBonus", "falloffBonus", "trackingSpeedBonus"):
         fit.modules.filteredItemBoost(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/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,5 @@
 type = "passive"
 runTime = "early"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Cloaking"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cloaking Device",
                                   "cpu", ship.getModifiedItemAttr("eliteBonusCoverOps1"), skill="Covert Ops")

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

@@ -1,8 +0,0 @@
-# eliteBonusCommandDestroyerArmored1
-#
-# Used by:
-# Ship: Magus
-# Ship: Pontifex
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")

eos/effects/elitebonuscommanddestroyerinfo1.py

@@ -1,8 +0,0 @@
-# eliteBonusCommandDestroyerInfo1
-#
-# Used by:
-# Ship: Pontifex
-# Ship: Stork
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")

eos/effects/elitebonuscommanddestroyerinfohidden1.py

@@ -1,8 +0,0 @@
-# eliteBonusCommandDestroyerInfoHidden1
-#
-# Used by:
-# Ship: Pontifex
-# Ship: Stork
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonusHidden", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")

eos/effects/elitebonuscommanddestroyermjfgspool2.py

@@ -1,7 +0,0 @@
-# eliteBonusCommandDestroyerMJFGspool2
-#
-# Used by:
-# Ships from group: Command Destroyers (4 of 4)
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Micro Jump Drive Operation"), "duration", src.getModifiedItemAttr("eliteBonusCommandDestroyer2"), skill="Command Destroyers")

eos/effects/elitebonuscommanddestroyermwdsigradius3.py

@@ -1,7 +0,0 @@
-# eliteBonusCommandDestroyerMWDSigRadius3
-#
-# Used by:
-# Ships from group: Command Destroyers (4 of 4)
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"), "signatureRadiusBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer3"), skill="Command Destroyers")

eos/effects/elitebonuscommanddestroyersiege1.py

@@ -1,8 +0,0 @@
-# eliteBonusCommandDestroyerSiege1
-#
-# Used by:
-# Ship: Bifrost
-# Ship: Stork
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")

eos/effects/elitebonuscommanddestroyerskirmish1.py

@@ -1,8 +0,0 @@
-# eliteBonusCommandDestroyerSkirmish1
-#
-# Used by:
-# Ship: Bifrost
-# Ship: Magus
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), "commandBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")

eos/effects/elitebonuselectronicattackshipenergyneutrange1.py

@@ -0,0 +1,8 @@
+# eliteBonusElectronicAttackShipEnergyNeutRange1
+#
+# Used by:
+# Ship: Sentinel
+type = "passive"
+def handler(fit, ship, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer",
+                                  "energyDestabilizationRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"), skill="Electronic Attack Ships")

eos/effects/elitebonuselectronicattackshipenergyvampirerange1.py

@@ -0,0 +1,8 @@
+# eliteBonusElectronicAttackShipEnergyVampireRange1
+#
+# Used by:
+# Ship: Sentinel
+type = "passive"
+def handler(fit, ship, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire",
+                                  "powerTransferRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"), skill="Electronic Attack Ships")

eos/effects/elitebonusheavyinterdictorswarpdisruptfieldgeneratorwarpscramblerange2.py

@@ -1,7 +1,7 @@
 # eliteBonusHeavyInterdictorsWarpDisruptFieldGeneratorWarpScrambleRange2
 #
 # Used by:
-# Ships from group: Heavy Interdiction Cruiser (5 of 5)
+# Ships from group: Heavy Interdiction Cruiser (4 of 5)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Disrupt Field Generator",

eos/effects/elitebonuslogifrigarmorhp2.py

@@ -1,7 +0,0 @@
-# eliteBonusLogiFrigArmorHP2
-#
-# Used by:
-# Ship: Deacon
-type = "passive"
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("armorHP", src.getModifiedItemAttr("eliteBonusLogiFrig2"), skill="Logistics Frigates")

eos/effects/elitebonuslogifrigarmorrepspeedcap1.py

@@ -1,9 +0,0 @@
-# eliteBonusLogiFrigArmorRepSpeedCap1
-#
-# Used by:
-# Ship: Deacon
-# Ship: Thalia
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed", src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "duration", src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates")

eos/effects/elitebonuslogifrigshieldhp2.py

@@ -1,7 +0,0 @@
-# eliteBonusLogiFrigShieldHP2
-#
-# Used by:
-# Ship: Kirin
-type = "passive"
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldCapacity", src.getModifiedItemAttr("eliteBonusLogiFrig2"), skill="Logistics Frigates")

eos/effects/elitebonuslogifrigshieldrepspeedcap1.py

@@ -1,9 +0,0 @@
-# eliteBonusLogiFrigShieldRepSpeedCap1
-#
-# Used by:
-# Ship: Kirin
-# Ship: Scalpel
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "duration", src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "capacitorNeed", src.getModifiedItemAttr("eliteBonusLogiFrig1"), skill="Logistics Frigates")

eos/effects/elitebonuslogifrigsignature2.py

@@ -1,8 +0,0 @@
-# eliteBonusLogiFrigSignature2
-#
-# Used by:
-# Ship: Scalpel
-# Ship: Thalia
-type = "passive"
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("signatureRadius", src.getModifiedItemAttr("eliteBonusLogiFrig2"), skill="Logistics Frigates")

eos/effects/elitebonuslogisticenergytransfercapneed1.py

@@ -5,4 +5,4 @@
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
-                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
+                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics")

eos/effects/elitebonuslogisticenergytransfercapneed2.py

@@ -6,4 +6,4 @@
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
-                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers")
+                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics")

eos/effects/elitebonuslogisticremotearmorrepaircapneed1.py

@@ -5,4 +5,4 @@
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer",
-                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
+                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics")

eos/effects/elitebonuslogisticremotearmorrepaircapneed2.py

@@ -5,4 +5,4 @@
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer",
-                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers")
+                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics")

eos/effects/elitebonuslogisticshieldtransfercapneed1.py

@@ -6,4 +6,4 @@
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster",
-                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
+                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics")

eos/effects/elitebonuslogisticshieldtransfercapneed2.py

@@ -5,4 +5,4 @@
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster",
-                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers")
+                                  "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics")

eos/effects/elitebonuslogisticstrackinglinkfalloffbonus1.py

@@ -5,4 +5,4 @@
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "falloffBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
+                                  "falloffBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics")

eos/effects/elitebonuslogisticstrackinglinkfalloffbonus2.py

@@ -5,4 +5,4 @@
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "falloffBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers")
+                                  "falloffBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics")

eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus1.py

@@ -5,4 +5,4 @@
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "maxRangeBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
+                                  "maxRangeBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics")

eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus2.py

@@ -5,4 +5,4 @@
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "maxRangeBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers")
+                                  "maxRangeBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics")

eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus1.py

@@ -5,4 +5,4 @@
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "trackingSpeedBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
+                                  "trackingSpeedBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics")

eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus2.py

@@ -5,4 +5,4 @@
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",
-                                  "trackingSpeedBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics Cruisers")
+                                  "trackingSpeedBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics")

eos/effects/elitebonusvampiredrainamount2.py

@@ -5,5 +5,5 @@
 # Ship: Pilgrim
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire",
                                   "powerTransferAmount", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")

eos/effects/eliteindustrialarmorresists2.py

@@ -5,6 +5,5 @@
 # Ship: Occator
 type = "passive"
 def handler(fit, ship, context):
-    for damageType in ("em", "thermal", "explosive", "kinetic"):
         fit.ship.boostItemAttr("armor{}DamageResonance".format(damageType.capitalize()),
                                ship.getModifiedItemAttr("eliteBonusIndustrial2"), skill="Transport Ships")

eos/effects/elitereconbonusenergyneutamount2.py

@@ -5,5 +5,5 @@
 # Ship: Pilgrim
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer",
                                   "energyDestabilizationAmount", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")

eos/effects/elitereconbonusenergyneutrange1.py

@@ -0,0 +1,8 @@
+# eliteReconBonusEnergyNeutRange1
+#
+# Used by:
+# Ship: Curse
+type = "passive"
+def handler(fit, ship, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer",
+                                  "energyDestabilizationRange", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")

eos/effects/elitereconbonusneutrange3.py

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

eos/effects/elitereconbonusvamprange3.py

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

eos/effects/elitereconenergyvampirerangebonus1.py

@@ -0,0 +1,8 @@
+# eliteReconEnergyVampireRangeBonus1
+#
+# Used by:
+# Ship: Curse
+type = "passive"
+def handler(fit, ship, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire",
+                                  "powerTransferRange", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")

eos/effects/energydestabilizationnew.py

@@ -1,7 +1,8 @@
 # energyDestabilizationNew
 #
 # Used by:
-# Drones from group: Energy Neutralizer Drone (3 of 3)
+# Drones from group: Cap Drain Drone (3 of 3)
+# Modules from group: Energy Destabilizer (41 of 41)
 from eos.types import State
 type = "active", "projected"
 def handler(fit, container, context):

eos/effects/energyneutralizerfalloff.py

@@ -1,13 +0,0 @@
-# energyNeutralizerFalloff
-#
-# Used by:
-# Modules from group: Energy Neutralizer (45 of 45)
-from eos.types import State
-type = "active", "projected"
-def handler(fit, container, context):
-    if "projected" in context and ((hasattr(container, "state") \
-    and container.state >= State.ACTIVE) or hasattr(container, "amountActive")):
-        multiplier = container.amountActive if hasattr(container, "amountActive") else 1
-        amount = container.getModifiedItemAttr("energyDestabilizationAmount")
-        time = container.getModifiedItemAttr("duration")
-        fit.addDrain(time, amount * multiplier, 0)

eos/effects/energytransferarraymaxrangebonus.py

@@ -6,4 +6,4 @@
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter",
-                                  "powerTransferRange", ship.getModifiedItemAttr("maxRangeBonus2"))
+                                  "powerTransferRange", ship.getModifiedItemAttr("maxRangeBonus"))

eos/effects/entosiscpuaddition.py

@@ -1,8 +0,0 @@
-# entosisCPUAddition
-#
-# Used by:
-# Modules from group: Entosis Link (6 of 6)
-type = "passive"
-def handler(fit, module, context):
-    module.increaseItemAttr("cpu", module.getModifiedItemAttr("entosisCPUAdd"))
-

eos/effects/entosiscpupenalty.py

@@ -1,8 +0,0 @@
-# entosisCPUPenalty
-#
-# Used by:
-# Ships from group: Interceptor (10 of 10)
-type = "passive"
-def handler(fit, ship, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Infomorph Psychology"),
-                                     "entosisCPUAdd", ship.getModifiedItemAttr("entosisCPUPenalty"))

eos/effects/entosislink.py

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

eos/effects/ewgrouptdmaxrangebonus.py

@@ -4,5 +4,5 @@
 # Implants named like: grade Centurion (10 of 12)
 type = "passive"
 def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor",
                                   "maxRange", implant.getModifiedItemAttr("rangeSkillBonus"))

eos/effects/ewskillguidancedisruptionbonus.py

@@ -1,16 +0,0 @@
-# ewSkillGuidanceDisruptionBonus
-#
-# Used by:
-# Modules named like: Tracking Diagnostic Subroutines (8 of 8)
-# Skill: Weapon Destabilization
-type = "passive"
-def handler(fit, src, context):
-    level = src.level if "skill" in context else 1
-    for attr in (
-        "explosionDelayBonus",
-        "aoeVelocityBonus",
-        "aoeCloudSizeBonus",
-        "missileVelocityBonus"
-    ):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
-                                      attr, src.getModifiedItemAttr("scanSkillEwStrengthBonus") * level)

eos/effects/ewskilltdfalloffbonus.py

@@ -4,5 +4,5 @@
 # Skill: Frequency Modulation
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor",
                                   "falloff", skill.getModifiedItemAttr("falloffBonus") * skill.level)

eos/effects/ewskilltdmaxrangebonus.py

@@ -6,6 +6,6 @@
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor",
                                   "maxRange", container.getModifiedItemAttr("rangeSkillBonus") * level,
                                   stackingPenalties = "skill" not in context)

eos/effects/ewskilltrackingdisruptionrangedisruptionbonus.py

@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules named like: Tracking Diagnostic Subroutines (8 of 8)
-# Skill: Weapon Destabilization
+# Skill: Turret Destabilization
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1

eos/effects/ewskilltrackingdisruptiontrackingspeedbonus.py

@@ -2,9 +2,9 @@
 #
 # Used by:
 # Modules named like: Tracking Diagnostic Subroutines (8 of 8)
-# Skill: Weapon Destabilization
+# Skill: Turret Destabilization
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor",
                                   "trackingSpeedBonus", container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level)

eos/effects/expeditionfrigatebonusiceharvestingcycletime2.py

@@ -1,7 +0,0 @@
-# expeditionFrigateBonusIceHarvestingCycleTime2
-#
-# Used by:
-# Ship: Endurance
-type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"), "duration", src.getModifiedItemAttr("eliteBonusExpedition2"), skill="Expedition Frigates")

eos/effects/expeditionfrigateshieldresistance1.py

@@ -1,10 +0,0 @@
-# expeditionFrigateShieldResistance1
-#
-# Used by:
-# Ship: Endurance
-type = "passive"
-def handler(fit, src, context):
-    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("eliteBonusExpedition1"), skill="Expedition Frigates")
-    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("eliteBonusExpedition1"), skill="Expedition Frigates")
-    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("eliteBonusExpedition1"), skill="Expedition Frigates")
-    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("eliteBonusExpedition1"), skill="Expedition Frigates")

eos/effects/gangabmwdfactorboost.py

@@ -4,8 +4,6 @@
 # Variations of module: Skirmish Warfare Link - Rapid Deployment I (2 of 2)
 type = "gang", "active"
 gangBoost = "speedFactor"
-runTime = "late"
-
 def handler(fit, module, context):
     if "gang" not in context: return
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",

eos/effects/gangarmorhardening.py

@@ -4,8 +4,6 @@
 # Variations of module: Armored Warfare Link - Passive Defense I (2 of 2)
 type = "gang", "active"
 gangBoost = "armorResistance"
-runTime = "late"
-
 def handler(fit, module, context):
     if "gang" not in context: return
     for damageType in ("Em", "Thermal", "Explosive", "Kinetic"):

eos/effects/gangarmorrepaircapreducerselfandprojected.py

@@ -4,8 +4,6 @@
 # Variations of module: Armored Warfare Link - Damage Control I (2 of 2)
 type = "gang", "active"
 gangBoost = "armorRepairCapacitorNeed"
-runTime = "late"
-
 def handler(fit, module, context):
     if "gang" not in context: return
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Remote Armor Repair Systems"),