Merge branch 'master' into development

2018-08-21 00:45:15 -04:00
parent f0b0285f77 cc529d3499
commit 180b766b59
605 changed files with 8521 additions and 11135 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -118,4 +118,7 @@ ENV/
 .idea
 eos.iml
 gitversion
+.version
+/.version
 *.swp
+
--- a/.mailmap
+++ b/.mailmap
@@ -0,0 +1,14 @@
+cncfanatics <diego.duclos@gmail.com> cncfanatics <cncfanatics@titanium.(none)>
+blitzmann <holmes.ryan.90@gmail.com>
+blitzmann <holmes.ryan.90@gmail.com> blitzmann <ryan.xgamer99@gmail.com>
+blitzmann <holmes.ryan.90@gmail.com>
+blitzmann <holmes.ryan.90@gmail.com> blitzman <ryan.xgamer99@gmail.com>
+blitzmann <holmes.ryan.90@gmail.com> Ryan Holmes <ryan.holmes.90@gmail.com>
+blitzmann <holmes.ryan.90@gmail.com>
+Corollax <corollax@gmail.com> Corollax <corollax@corollax-laptop.(none)>
+Corollax <corollax@gmail.com> Corollax <corollax@corollax-N76VM.(none)>
+Mr. Nukealizer <mr.nukealizer@gmail.com> Mr. Nukealizer <MrNukealizer@users.noreply.github.com>
+DarkPhoenix <phoenix@mail.ru>
+Sakari Orisi <sakari@evefit.org>
+Will Wykeham <will@wykeham.net> Will Wykeham <will.wykeham@paconsulting.com>
+OISumeko <camerongrout@gmail.com> OISumeko <cameron@sporadic.co.nz>
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,9 @@
+dist: trusty
+sudo: required
 language: python
 cache: pip
 python:
-  - '2.7'
+  - '3.6'
 env:
  - TOXENV=pep8
 addons:
@@ -12,28 +14,23 @@ before_install:
  - pip install tox
  # We're not actually installing Tox, but have to run it before we install wxPython via Conda. This is fugly but vOv
  - tox
-  # get Conda
-  - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
-      wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
-    else
-      wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
-    fi
-  - bash miniconda.sh -b -p $HOME/miniconda
-  - export PATH="$HOME/miniconda/bin:$PATH"
-  - hash -r
-  - conda config --set always_yes yes --set changeps1 no
-  - conda update -q conda
-  # Useful for debugging any issues with conda
-  - conda info -a
-install:
+  - pip install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk2/ubuntu-14.04 wxPython==4.0.0b2
+#  # get Conda
+#  - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
+#      wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh;
+#    else
+#      wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+#    fi
+#  - bash miniconda.sh -b -p $HOME/miniconda
+#  - export PATH="$HOME/miniconda/bin:$PATH"
+#  - hash -r
+#  - conda config --set always_yes yes --set changeps1 no
+#  - conda update -q conda
+#  # Useful for debugging any issues with conda
+#  - conda info -a
+#install:
  # install wxPython 3.0.0.0
-  - conda install -c https://conda.anaconda.org/travis wxpython
-before_script:
-  - pip install -r requirements.txt
-  - pip install -r requirements_test.txt
+ # - conda install -c https://conda.anaconda.org/travis wxpython=4.0.0b2
 script:
-  - py.test --cov=./
-after_success:
-  - bash <(curl -s https://codecov.io/bash)
-before_deploy:
-  - pip install -r requirements_build_linux.txt
+  - tox
+
--- a/README.md
+++ b/README.md
@@ -15,12 +15,8 @@ The latest version along with release notes can always be found on the project's
 Windows and OS X users are supplied self-contained builds of pyfa on the [latest releases](https://github.com/pyfa-org/Pyfa/releases/latest) page. An `.exe` installer is also available for Windows builds. Linux users can run pyfa using their distribution's Python interpreter. There is no official self-contained package for Linux, however, there are a number of third-party packages available through distribution-specific repositories.

 #### OS X
-There are two different distributives for OS X: `-mac` and `-mac-deprecated`. 

-* `-mac`: based on wxPython 3.0.2.0 and has updated libraries. This is the recommended build.
-* `-mac-deprecated`: utilizes older binaries running on wxPython 2.8; because of this, some features are not available (currently CREST support and Attribute Overrides). Additionally, as development happens primarily on wxPython 3.0, a few GUI bugs may pop up as `-mac-deprecated` is not actively tested. However, due to some general issues with wxPython 3.0, especially on some newer OS X versions, `-mac-deprecated` is still offered for those that need it.
-
-There is also a [Homebrew](http://brew.sh) option for installing pyfa on OS X. Please note this is maintained by a third-party and is not tested by pyfa developers. Simply fire up in terminal:
+Apart from the official release, there is also a [Homebrew](http://brew.sh) option for installing pyfa on OS X. Please note this is maintained by a third-party and is not tested by pyfa developers. Simply fire up in terminal:
 ```
 $ brew install Caskroom/cask/pyfa
 ```
@@ -36,13 +32,8 @@ The following is a list of pyfa packages available for certain distributions. Pl
 ### Dependencies
 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` >= 1.0.5
-* `dateutil`
-* `matplotlib` (for some Linux distributions you may need to install separate wxPython bindings such as `python-matplotlib-wx`)
-* `requests`
-* `logbook` >= 1.0.0
+* Python 3.6
+* Requirements as listed in `requirements.txt`

 ## Bug Reporting
 The preferred method of reporting bugs is through the project's [GitHub Issues interface](https://github.com/pyfa-org/Pyfa/issues). Alternatively, posting a report in the [pyfa thread](http://forums.eveonline.com/default.aspx?g=posts&t=247609) 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). 
--- a/_development/helpers.py
+++ b/_development/helpers.py
@@ -28,7 +28,7 @@ def DBInMemory_test():
    gamedataCache = True
    saveddataCache = True
    gamedata_version = ""
-    gamedata_connectionstring = 'sqlite:///' + realpath(join(dirname(abspath(unicode(__file__))), "..", "eve.db"))
+    gamedata_connectionstring = 'sqlite:///' + realpath(join(dirname(abspath(str(__file__))), "..", "eve.db"))
    saveddata_connectionstring = 'sqlite:///:memory:'

    class ReadOnlyException(Exception):
@@ -100,8 +100,8 @@ def DBInMemory():
    import eos.db

    # Output debug info to help us troubleshoot Travis
-    print(eos.db.saveddata_engine)
-    print(eos.db.gamedata_engine)
+    print((eos.db.saveddata_engine))
+    print((eos.db.gamedata_engine))

    helper = {
        'config': eos.config,
--- a/_development/helpers_fits.py
+++ b/_development/helpers_fits.py
@@ -41,7 +41,7 @@ def CurseFit(DB, Gamedata, Saveddata):
    mod.state = Saveddata['State'].ONLINE

    # Add 5 neuts
-    for _ in xrange(5):
+    for _ in range(5):
        fit.modules.append(mod)

    return fit
@@ -60,7 +60,7 @@ def HeronFit(DB, Gamedata, Saveddata):
    mod.state = Saveddata['State'].ONLINE

    # Add 5 neuts
-    for _ in xrange(4):
+    for _ in range(4):
        fit.modules.append(mod)

    return fit
--- a/_development/helpers_locale.py
+++ b/_development/helpers_locale.py
@@ -94,8 +94,8 @@ def GetUnicodePath(root, file=None, codec=None):
        path = os.path.join(path, file)

    if codec:
-        path = unicode(path, codec)
+        path = str(path, codec)
    else:
-        path = unicode(path)
+        path = str(path)

    return path
--- a/config.py
+++ b/config.py
@@ -1,7 +1,11 @@
 import os
 import sys

-from logbook import Logger
+from logbook import CRITICAL, DEBUG, ERROR, FingersCrossedHandler, INFO, Logger, NestedSetup, NullHandler, \
+    StreamHandler, TimedRotatingFileHandler, WARNING
+import hashlib
+
+from cryptography.fernet import Fernet

 pyfalog = Logger(__name__)

@@ -19,17 +23,38 @@ debug = False
 saveInRoot = False

 # Version data
-version = "1.35.1"
+
+version = "2.1.1"
 tag = "Stable"
-expansionName = "YC120.2"
-expansionVersion = "1.2"
+expansionName = "Into the Abyss"
+expansionVersion = "1.1"
 evemonMinVersion = "4081"

+minItemSearchLength = 3
+
 pyfaPath = None
 savePath = None
 saveDB = None
 gameDB = None
 logPath = None
+loggingLevel = None
+logging_setup = None
+cipher = None
+clientHash = None
+
+ESI_CACHE = 'esi_cache'
+
+LOGLEVEL_MAP = {
+    "critical": CRITICAL,
+    "error": ERROR,
+    "warning": WARNING,
+    "info": INFO,
+    "debug": DEBUG,
+}
+
+
+def getClientSecret():
+    return clientHash


 def isFrozen():
@@ -45,23 +70,37 @@ def __createDirs(path):


 def getPyfaRoot():
-    base = getattr(sys.modules['__main__'], "__file__", sys.executable) if isFrozen() else sys.argv[0]
+    if hasattr(sys, '_MEIPASS'):
+        return sys._MEIPASS
+    base = getattr(sys.modules['__main__'], "__file__", sys.executable) if isFrozen() else __file__
    root = os.path.dirname(os.path.realpath(os.path.abspath(base)))
-    root = unicode(root, sys.getfilesystemencoding())
+    root = root
    return root


+def getVersion():
+    if os.path.isfile(os.path.join(pyfaPath, '.version')):
+        with open(os.path.join(pyfaPath, '.version')) as f:
+            gitVersion = f.readline()
+        return gitVersion
+    # if no version file exists, then user is running from source or not an official build
+    return version + " (git)"
+
+
 def getDefaultSave():
-    return unicode(os.path.expanduser(os.path.join("~", ".pyfa")), sys.getfilesystemencoding())
+    return os.path.expanduser(os.path.join("~", ".pyfa"))


-def defPaths(customSavePath):
+def defPaths(customSavePath=None):
    global debug
    global pyfaPath
    global savePath
    global saveDB
    global gameDB
    global saveInRoot
+    global logPath
+    global cipher
+    global clientHash

    pyfalog.debug("Configuring Pyfa")

@@ -86,9 +125,19 @@ def defPaths(customSavePath):

    __createDirs(savePath)

-    if isFrozen():
-        os.environ["REQUESTS_CA_BUNDLE"] = os.path.join(pyfaPath, "cacert.pem").encode('utf8')
-        os.environ["SSL_CERT_FILE"] = os.path.join(pyfaPath, "cacert.pem").encode('utf8')
+    secret_file = os.path.join(savePath, ".secret")
+    if not os.path.exists(secret_file):
+        with open(secret_file, "wb") as _file:
+            _file.write(Fernet.generate_key())
+
+    with open(secret_file, 'rb') as fp:
+        key = fp.read()
+        clientHash = hashlib.sha3_256(key).hexdigest()
+        cipher = Fernet(key)
+
+    # if isFrozen():
+    #    os.environ["REQUESTS_CA_BUNDLE"] = os.path.join(pyfaPath, "cacert.pem")
+    #    os.environ["SSL_CERT_FILE"] = os.path.join(pyfaPath, "cacert.pem")

    # The database where we store all the fits etc
    saveDB = os.path.join(savePath, "saveddata.db")
@@ -100,6 +149,13 @@ def defPaths(customSavePath):
    if not gameDB:
        gameDB = os.path.join(pyfaPath, "eve.db")

+    if debug:
+        logFile = "pyfa_debug.log"
+    else:
+        logFile = "pyfa.log"
+
+    logPath = os.path.join(savePath, logFile)
+
    # DON'T MODIFY ANYTHING BELOW
    import eos.config

@@ -109,6 +165,100 @@ def defPaths(customSavePath):
    eos.config.saveddata_connectionstring = "sqlite:///" + saveDB + "?check_same_thread=False"
    eos.config.gamedata_connectionstring = "sqlite:///" + gameDB + "?check_same_thread=False"

+    print(eos.config.saveddata_connectionstring)
+    print(eos.config.gamedata_connectionstring)
+
    # initialize the settings
    from service.settings import EOSSettings
    eos.config.settings = EOSSettings.getInstance().EOSSettings  # this is kind of confusing, but whatever
+
+
+def defLogging():
+    global debug
+    global logPath
+    global loggingLevel
+    global logging_setup
+
+    try:
+        if debug:
+            logging_setup = NestedSetup([
+                # make sure we never bubble up to the stderr handler
+                # if we run out of setup handling
+                NullHandler(),
+                StreamHandler(
+                        sys.stdout,
+                        bubble=False,
+                        level=loggingLevel
+                ),
+                TimedRotatingFileHandler(
+                        logPath,
+                        level=0,
+                        backup_count=3,
+                        bubble=True,
+                        date_format='%Y-%m-%d',
+                ),
+            ])
+        else:
+            logging_setup = NestedSetup([
+                # make sure we never bubble up to the stderr handler
+                # if we run out of setup handling
+                NullHandler(),
+                FingersCrossedHandler(
+                        TimedRotatingFileHandler(
+                                logPath,
+                                level=0,
+                                backup_count=3,
+                                bubble=False,
+                                date_format='%Y-%m-%d',
+                        ),
+                        action_level=ERROR,
+                        buffer_size=1000,
+                        # pull_information=True,
+                        # reset=False,
+                )
+            ])
+    except:
+        print("Critical error attempting to setup logging. Falling back to console only.")
+        logging_setup = NestedSetup([
+            # make sure we never bubble up to the stderr handler
+            # if we run out of setup handling
+            NullHandler(),
+            StreamHandler(
+                    sys.stdout,
+                    bubble=False
+            )
+        ])
+
+    with logging_setup.threadbound():
+
+        # Output all stdout (print) messages as warnings
+        try:
+            sys.stdout = LoggerWriter(pyfalog.warning)
+        except:
+            pyfalog.critical("Cannot redirect.  Continuing without writing stdout to log.")
+
+        # Output all stderr (stacktrace) messages as critical
+        try:
+            sys.stderr = LoggerWriter(pyfalog.critical)
+        except:
+            pyfalog.critical("Cannot redirect.  Continuing without writing stderr to log.")
+
+
+class LoggerWriter(object):
+    def __init__(self, level):
+        # self.level is really like using log.debug(message)
+        # at least in my case
+        self.level = level
+
+    def write(self, message):
+        # if statement reduces the amount of newlines that are
+        # printed to the logger
+        if message.strip() != '':
+            self.level(message.replace("\n", ""))
+
+    def flush(self):
+        # create a flush method so things can be flushed when
+        # the system wants to. Not sure if simply 'printing'
+        # sys.stderr is the correct way to do it, but it seemed
+        # to work properly for me.
+        self.level(sys.stderr)
--- a/dist_assets/linux/pyfa-linux.spec
+++ b/dist_assets/linux/pyfa-linux.spec
@@ -0,0 +1,70 @@
+# -*- mode: python -*-
+
+import os
+from itertools import chain
+import subprocess
+
+label = subprocess.check_output([
+    "git", "describe", "--tags"]).strip()
+
+with open('gitversion', 'w+') as f:
+    f.write(label.decode())
+
+block_cipher = None
+
+
+added_files = [
+             ( 'imgs/gui/*.png', 'imgs/gui' ),
+             ( 'imgs/gui/*.gif', 'imgs/gui' ),
+             ( 'imgs/icons/*.png', 'imgs/icons' ),
+             ( 'imgs/renders/*.png', 'imgs/renders' ),
+             ( 'dist_assets/win/pyfa.ico', '.' ),
+             ( 'dist_assets/cacert.pem', '.' ),
+             ( 'eve.db', '.' ),
+             ( 'README.md', '.' ),
+             ( 'LICENSE', '.' ),
+             ( 'gitversion', '.' ),
+             ]
+
+import_these = []
+
+# Walk directories that do dynamic importing
+paths = ('eos/effects', 'eos/db/migrations', 'service/conversions')
+for root, folders, files in chain.from_iterable(os.walk(path) for path in paths):
+    for file_ in files:
+        if file_.endswith(".py") and not file_.startswith("_"):
+            mod_name = "{}.{}".format(
+                root.replace("/", "."),
+                file_.split(".py")[0],
+            )
+            import_these.append(mod_name)
+
+
+a = Analysis(['pyfa.py'],
+             pathex=[],
+             binaries=[],
+             datas=added_files,
+             hiddenimports=import_these,
+             hookspath=[],
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+exe = EXE(pyz,
+          a.scripts,
+          exclude_binaries=True,
+          name='pyfa',
+          debug=False,
+          strip=False,
+          upx=True,
+          console=True )
+coll = COLLECT(exe,
+               a.binaries,
+               a.zipfiles,
+               a.datas,
+               strip=False,
+               upx=True,
+               name='pyfa')
--- a/dist_assets/mac/pyfa.spec
+++ b/dist_assets/mac/pyfa.spec
@@ -0,0 +1,76 @@
+# -*- mode: python -*-
+
+import os
+from itertools import chain
+import subprocess
+import requests.certs
+
+label = subprocess.check_output([
+    "git", "describe", "--tags"]).strip()
+
+with open('.version', 'w+') as f:
+    f.write(label.decode())
+
+block_cipher = None
+
+added_files = [
+             ('../../imgs/gui/*.png', 'imgs/gui'),
+             ('../../imgs/gui/*.gif', 'imgs/gui'),
+             ('../../imgs/icons/*.png', 'imgs/icons'),
+             ('../../imgs/renders/*.png', 'imgs/renders'),
+             ('../../dist_assets/win/pyfa.ico', '.'),
+             ('../../service/jargon/*.yaml', 'service/jargon'),
+             (requests.certs.where(), '.'),  # is this needed anymore?
+             ('../../eve.db', '.'),
+             ('../../README.md', '.'),
+             ('../../LICENSE', '.'),
+             ('../../.version', '.'),
+             ]
+
+
+import_these = []
+
+icon = os.path.join(os.getcwd(), "dist_assets", "mac", "pyfa.icns")
+
+# Walk directories that do dynamic importing
+paths = ('eos/effects', 'eos/db/migrations', 'service/conversions')
+for root, folders, files in chain.from_iterable(os.walk(path) for path in paths):
+    for file_ in files:
+        if file_.endswith(".py") and not file_.startswith("_"):
+            mod_name = "{}.{}".format(
+                root.replace("/", "."),
+                file_.split(".py")[0],
+            )
+            import_these.append(mod_name)
+
+a = Analysis([r'../../pyfa.py'],
+             pathex=[],
+             binaries=[],
+             datas=added_files,
+             hiddenimports=import_these,
+             hookspath=['dist_assets/pyinstaller_hooks'],
+             runtime_hooks=[],
+             excludes=[],
+             win_no_prefer_redirects=False,
+             win_private_assemblies=False,
+             cipher=block_cipher)
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.zipfiles,
+          a.datas,
+          name='pyfa',
+          debug=False,
+          strip=False,
+          upx=True,
+          runtime_tmpdir=None,
+          console=False ,
+          icon=icon,
+          )
+
+app = BUNDLE(exe,
+             name='pyfa.app',
+             icon=icon,
+             bundle_identifier=None)
--- a/dist_assets/pyinstaller_hooks/hook-matplotlib.backends.py
+++ b/dist_assets/pyinstaller_hooks/hook-matplotlib.backends.py
@@ -0,0 +1,78 @@
+# This apes hook-matplotlib.backends.py, but REMOVES backends, all but
+# the ones in the list below.
+# Courtesy of https://github.com/bpteague/cytoflow/blob/70f9291/packaging/hook-matplotlib.backends.py
+
+KEEP = ["WXAgg", "WX", "agg"]
+
+from PyInstaller.compat import is_darwin
+from PyInstaller.utils.hooks import (
+    eval_statement, exec_statement, logger)
+
+
+def get_matplotlib_backend_module_names():
+    """
+    List the names of all matplotlib backend modules importable under the
+    current Python installation.
+    Returns
+    ----------
+    list
+        List of the fully-qualified names of all such modules.
+    """
+    # Statement safely importing a single backend module.
+    import_statement = """
+import os, sys
+# Preserve stdout.
+sys_stdout = sys.stdout
+try:
+    # Redirect output printed by this importation to "/dev/null", preventing
+    # such output from being erroneously interpreted as an error.
+    with open(os.devnull, 'w') as dev_null:
+        sys.stdout = dev_null
+        __import__('%s')
+# If this is an ImportError, print this exception's message without a traceback.
+# ImportError messages are human-readable and require no additional context.
+except ImportError as exc:
+    sys.stdout = sys_stdout
+    print(exc)
+# Else, print this exception preceded by a traceback. traceback.print_exc()
+# prints to stderr rather than stdout and must not be called here!
+except Exception:
+    sys.stdout = sys_stdout
+    import traceback
+    print(traceback.format_exc())
+"""
+
+    # List of the human-readable names of all available backends.
+    backend_names = eval_statement(
+        'import matplotlib; print(matplotlib.rcsetup.all_backends)')
+
+    # List of the fully-qualified names of all importable backend modules.
+    module_names = []
+
+    # If the current system is not OS X and the "CocoaAgg" backend is available,
+    # remove this backend from consideration. Attempting to import this backend
+    # on non-OS X systems halts the current subprocess without printing output
+    # or raising exceptions, preventing its reliable detection.
+    if not is_darwin and 'CocoaAgg' in backend_names:
+        backend_names.remove('CocoaAgg')
+
+    # For safety, attempt to import each backend in a unique subprocess.
+    for backend_name in backend_names:
+        if backend_name in KEEP:
+            continue
+
+        module_name = 'matplotlib.backends.backend_%s' % backend_name.lower()
+        stdout = exec_statement(import_statement % module_name)
+
+        # If no output was printed, this backend is importable.
+        if not stdout:
+            module_names.append(module_name)
+            logger.info('  Matplotlib backend "%s": removed' % backend_name)
+
+    return module_names
+
+# Freeze all importable backends, as PyInstaller is unable to determine exactly
+# which backends are required by the current program.
+e=get_matplotlib_backend_module_names()
+print(e)
+excludedimports = e
--- a/dist_assets/win/Microsoft.VC90.CRT.manifest
+++ b/dist_assets/win/Microsoft.VC90.CRT.manifest
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<noInheritable/>
+<assemblyIdentity
+    type="win32"
+    name="Microsoft.VC90.CRT"
+    version="9.0.21022.8"
+    processorArchitecture="x86"
+    publicKeyToken="1fc8b3b9a1e18e3b"/>
+<file name="MSVCR90.DLL"/>
+<file name="MSVCM90.DLL"/>
+<file name="MSVCP90.DLL"/>
+</assembly>
--- a/dist_assets/win/dist.py
+++ b/dist_assets/win/dist.py
@@ -0,0 +1,46 @@
+# helper script to zip up pyinstaller distribution and create installer file
+
+import os.path
+from subprocess import call
+import zipfile
+
+
+def zipdir(path, zip):
+    for root, dirs, files in os.walk(path):
+        for file in files:
+            zip.write(os.path.join(root, file))
+
+config = {}
+
+exec(compile(open("config.py").read(), "config.py", 'exec'), config)
+
+iscc =  "C:\Program Files (x86)\Inno Setup 5\ISCC.exe" # inno script location via wine
+
+print("Creating archive")
+
+source = os.path.join(os.getcwd(), "dist", "pyfa")
+
+fileName = "pyfa-{}-{}-{}-win".format(
+    config['version'],
+    config['expansionName'].lower(),
+    config['expansionVersion']
+)
+
+archive = zipfile.ZipFile(os.path.join(os.getcwd(), "dist", fileName + ".zip"), 'w', compression=zipfile.ZIP_DEFLATED)
+zipdir(source, archive)
+archive.close()
+
+print("Compiling EXE")
+
+expansion = "%s %s" % (config['expansionName'], config['expansionVersion']),
+
+call([
+    iscc,
+    os.path.join(os.getcwd(), "dist_assets", "win", "pyfa-setup.iss"),
+    "/dMyAppVersion=%s" % (config['version']),
+    "/dMyAppExpansion=%s" % (expansion),
+    "/dMyAppDir=%s" % source,
+    "/dMyOutputDir=%s" % os.path.join(os.getcwd(), "dist"),
+    "/dMyOutputFile=%s" % fileName])  # stdout=devnull, stderr=devnull
+
+print("Done")
--- a/dist_assets/win/pyfa-setup.iss
+++ b/dist_assets/win/pyfa-setup.iss
@@ -5,7 +5,7 @@
 ; we do some #ifdef conditionals because automated compilation passes these as arguments

 #ifndef MyAppVersion
-    #define MyAppVersion "1.15.0"
+    #define MyAppVersion "2.1.0"
 #endif
 #ifndef MyAppExpansion
    #define MyAppExpansion "Vanguard 1.0"
@@ -19,7 +19,8 @@
 #define MyAppExeName "pyfa.exe"

 ; What version starts with the new structure (1.x.0). This is used to determine if we run directory structure cleanup
-#define VersionFlag 16
+#define MajorVersionFlag 2
+#define MinorVersionFlag 0

 #ifndef MyOutputFile
    #define MyOutputFile LowerCase(StringChange(MyAppName+'-'+MyAppVersion+'-'+MyAppExpansion+'-win-wx3', " ", "-"))
@@ -63,7 +64,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1

 [Files]
-Source: "{#MyAppDir}\pyfa.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#MyAppDir}\pyfa.exe"; DestDir: "{app}"; Flags: ignoreversion; AfterInstall: RemoveFromVirtualStore
 Source: "{#MyAppDir}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files

@@ -103,6 +104,22 @@ begin
    FSWbemLocator := Unassigned;
 end;

+procedure RemoveFromVirtualStore;
+var
+    VirtualStore,FileName,FilePath:String;
+    DriveChars:Integer;
+begin
+    VirtualStore:=AddBackslash(ExpandConstant('{localappdata}'))+'VirtualStore';
+    FileName:=ExpandConstant(CurrentFileName);
+    DriveChars:=Length(ExtractFileDrive(FileName));
+    if DriveChars>0 then begin
+        Delete(FileName,1,DriveChars);
+        FileName:=VirtualStore+FileName;
+        FilePath:=ExtractFilePath(FileName);
+        DelTree(FilePath, True, True, True);
+    end;
+end;
+
 function PrepareToInstall(var NeedsRestart: Boolean): String;
 begin
  if(IsAppRunning( 'pyfa.exe' )) then
@@ -138,15 +155,19 @@ var
  V: Integer;
  iResultCode: Integer;
  sUnInstallString: string;
-  iOldVersion: Cardinal;
+  iOldVersionMajor: Cardinal;
+  iOldVersionMinor: Cardinal;
 begin
  Result := True; // in case when no previous version is found
  if RegValueExists(HKEY_LOCAL_MACHINE,'Software\Microsoft\Windows\CurrentVersion\Uninstall\{3DA39096-C08D-49CD-90E0-1D177F32C8AA}_is1', 'UninstallString') then  //Your App GUID/ID
  begin
    RegQueryDWordValue(HKEY_LOCAL_MACHINE,
      'Software\Microsoft\Windows\CurrentVersion\Uninstall\{3DA39096-C08D-49CD-90E0-1D177F32C8AA}_is1',
-      'MinorVersion', iOldVersion);
-    if iOldVersion < {#VersionFlag} then // If old version with old structure is installed.
+      'MajorVersion', iOldVersionMajor);
+    RegQueryDWordValue(HKEY_LOCAL_MACHINE,
+      'Software\Microsoft\Windows\CurrentVersion\Uninstall\{3DA39096-C08D-49CD-90E0-1D177F32C8AA}_is1',
+      'MinorVersion', iOldVersionMinor);
+    if (iOldVersionMajor < {#MajorVersionFlag}) or ((iOldVersionMajor = {#MajorVersionFlag}) and (iOldVersionMinor < {#MinorVersionFlag})) then // If old version with old structure is installed.
    begin
      V := MsgBox(ExpandConstant('An old version of pyfa was detected. Due to recent changes in the application structure, you must uninstall the previous version first. This will not affect your user data (saved fittings, characters, etc.). Do you want to uninstall now?'), mbInformation, MB_YESNO); //Custom Message if App installed
      if V = IDYES then
--- a/dist_assets/win/pyfa.exe.manifest
+++ b/dist_assets/win/pyfa.exe.manifest
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity name="pyfa" processorArchitecture="x86" type="win32" version="1.0.0.0"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.21022.8" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity>
+    </dependentAssembly>
+  </dependency>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+    </application>
+  </compatibility>
+</assembly>
--- a/dist_assets/win/pyfa.spec
+++ b/dist_assets/win/pyfa.spec
@@ -1,35 +1,39 @@
 # -*- mode: python -*-

-# Note: This script is provided AS-IS for those that may be interested.
-# pyfa does not currently support pyInstaller (or any other build process) 100% at the moment
-
-# Command line to build:
-# (Run from directory where pyfa.py and pyfa.spec lives.)
-# c:\Python27\scripts\pyinstaller.exe --clean --noconfirm --windowed --upx-dir=.\scripts\upx.exe pyfa.spec
-
-# Don't forget to change the path to where your pyfa.py and pyfa.spec lives
-#  pathex=['C:\\Users\\Ebag333\\Documents\\GitHub\\Ebag333\\Pyfa'],
-
 import os
+from itertools import chain
+import subprocess
+import requests.certs
+
+label = subprocess.check_output([
+    "git", "describe", "--tags"]).strip()
+
+with open('.version', 'w+') as f:
+    f.write(label.decode())

 block_cipher = None

 added_files = [
-             ( 'imgs/gui/*.png', 'imgs/gui' ),
-             ( 'imgs/gui/*.gif', 'imgs/gui' ),
-             ( 'imgs/icons/*.png', 'imgs/icons' ),
-             ( 'imgs/renders/*.png', 'imgs/renders' ),
-             ( 'dist_assets/win/pyfa.ico', '.' ),
-             ( 'dist_assets/cacert.pem', '.' ),
-             ( 'eve.db', '.' ),
-             ( 'README.md', '.' ),
-             ( 'LICENSE', '.' ),
+             ('../../imgs/gui/*.png', 'imgs/gui'),
+             ('../../imgs/gui/*.gif', 'imgs/gui'),
+             ('../../imgs/icons/*.png', 'imgs/icons'),
+             ('../../imgs/renders/*.png', 'imgs/renders'),
+             ('../../service/jargon/*.yaml', 'service/jargon'),
+             ('../../dist_assets/win/pyfa.ico', '.'),
+             ('../../dist_assets/win/pyfa.exe.manifest', '.'),
+             ('../../dist_assets/win/Microsoft.VC90.CRT.manifest', '.'),
+             (requests.certs.where(), '.'),  # is this needed anymore?
+             ('../../eve.db', '.'),
+             ('../../README.md', '.'),
+             ('../../LICENSE', '.'),
+             ('../../.version', '.'),
             ]

 import_these = []

-# Walk eos.effects and add all effects so we can import them properly
-for root, folders, files in os.walk("eos/effects"):
+# Walk directories that do dynamic importing
+paths = ('eos/effects', 'eos/db/migrations', 'service/conversions')
+for root, folders, files in chain.from_iterable(os.walk(path) for path in paths):
    for file_ in files:
        if file_.endswith(".py") and not file_.startswith("_"):
            mod_name = "{}.{}".format(
@@ -38,25 +42,24 @@ for root, folders, files in os.walk("eos/effects"):
            )
            import_these.append(mod_name)

-a = Analysis(
-             ['pyfa.py'],
-             pathex=['C:\\projects\\pyfa\\'],
+a = Analysis(['../../pyfa.py'],
+             pathex=[
+                 # Need this, see https://github.com/pyinstaller/pyinstaller/issues/1566
+                 # To get this, download and install windows 10 SDK
+                 # If not building on Windows 10, this might be optional
+                 r'C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x86'],
             binaries=[],
             datas=added_files,
             hiddenimports=import_these,
-             hookspath=[],
+             hookspath=['dist_assets/pyinstaller_hooks'],
             runtime_hooks=[],
-             excludes=[],
+             excludes=['Tkinter'],
             win_no_prefer_redirects=False,
             win_private_assemblies=False,
-             cipher=block_cipher,
-             )
+             cipher=block_cipher)

-pyz = PYZ(
-          a.pure,
-          a.zipped_data,
-          cipher=block_cipher,
-          )
+pyz = PYZ(a.pure, a.zipped_data,
+             cipher=block_cipher)

 exe = EXE(pyz,
          a.scripts,
@@ -67,7 +70,6 @@ exe = EXE(pyz,
          upx=True,
          name='pyfa',
          icon='dist_assets/win/pyfa.ico',
-          onefile=False,
          )

 coll = COLLECT(
@@ -77,7 +79,7 @@ coll = COLLECT(
               a.datas,
               strip=False,
               upx=True,
-               onefile=False,
               name='pyfa',
               icon='dist_assets/win/pyfa.ico',
               )
+
--- a/dist_assets/win/version_resource.py
+++ b/dist_assets/win/version_resource.py
@@ -0,0 +1,45 @@
+# UTF-8
+#
+# For more details about fixed file info 'ffi' see:
+# http://msdn.microsoft.com/en-us/library/ms646997.aspx
+VSVersionInfo(
+  ffi=FixedFileInfo(
+    # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
+    # Set not needed items to zero 0.
+    filevers=(1, 15, 1, 0),
+    prodvers=(1, 15, 1, 0),
+    # Contains a bitmask that specifies the valid bits 'flags'r
+    mask=0x3f,
+    # Contains a bitmask that specifies the Boolean attributes of the file.
+    flags=0x0,
+    # The operating system for which this file was designed.
+    # 0x4 - NT and there is no need to change it.
+    OS=0x40004,
+    # The general type of file.
+    # 0x1 - the file is an application.
+    fileType=0x1,
+    # The function of the file.
+    # 0x0 - the function is not defined for this fileType
+    subtype=0x0,
+    # Creation date and time stamp.
+    date=(0, 0)
+    ),
+  kids=[
+    StringFileInfo(
+      [
+      StringTable(
+        u'040904E4',
+        [StringStruct(u'LegalCopyright', u''),
+        StringStruct(u'InternalName', u'pyfa.exe'),
+        StringStruct(u'FileVersion', u'1.15.1.0'),
+        StringStruct(u'CompanyName', u''),
+        StringStruct(u'OriginalFilename', u'pyfa.exe'),
+        StringStruct(u'ProductVersion', u'1.15.1.0'),
+        StringStruct(u'FileDescription', u'Python fitting assistant'),
+        StringStruct(u'LegalTrademarks', u''),
+        StringStruct(u'Comments', u''),
+        StringStruct(u'ProductName', u'pyfa')])
+      ]),
+    VarFileInfo([VarStruct(u'Translation', [1033, 1252])])
+  ]
+)
--- a/eos/capSim.py
+++ b/eos/capSim.py
@@ -1,6 +1,7 @@
 import heapq
 import time
 from math import sqrt, exp
+from functools import reduce

 DAY = 24 * 60 * 60 * 1000

@@ -71,7 +72,7 @@ class CapSimulator(object):
        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, disableStagger, reloadTime) in self.modules:
            if self.scale:
                duration, capNeed = self.scale_activation(duration, capNeed)

@@ -79,24 +80,25 @@ class CapSimulator(object):
            # a cap booster module.
            if not self.reload and capNeed > 0:
                clipSize = 0
+                reloadTime = 0

            # Group modules based on their properties
-            if (duration, capNeed, clipSize, disableStagger) in mods:
-                mods[(duration, capNeed, clipSize, disableStagger)] += 1
+            if (duration, capNeed, clipSize, disableStagger, reloadTime) in mods:
+                mods[(duration, capNeed, clipSize, disableStagger, reloadTime)] += 1
            else:
-                mods[(duration, capNeed, clipSize, disableStagger)] = 1
+                mods[(duration, capNeed, clipSize, disableStagger, reloadTime)] = 1

        # Loop over grouped modules, configure staggering and push to the simulation state
-        for (duration, capNeed, clipSize, disableStagger), amount in mods.iteritems():
+        for (duration, capNeed, clipSize, disableStagger, reloadTime), amount in mods.items():
            if self.stagger and not disableStagger:
                if clipSize == 0:
                    duration = int(duration / amount)
                else:
-                    stagger_amount = (duration * clipSize + 10000) / (amount * clipSize)
+                    stagger_amount = (duration * clipSize + reloadTime) / (amount * clipSize)
                    for i in range(1, amount):
                        heapq.heappush(self.state,
                                       [i * stagger_amount, duration,
-                                        capNeed, 0, clipSize])
+                                        capNeed, 0, clipSize, reloadTime])
            else:
                capNeed *= amount

@@ -106,7 +108,7 @@ class CapSimulator(object):
            if clipSize:
                disable_period = True

-            heapq.heappush(self.state, [0, duration, capNeed, 0, clipSize])
+            heapq.heappush(self.state, [0, duration, capNeed, 0, clipSize, reloadTime])

        if disable_period:
            self.period = self.t_max
@@ -143,7 +145,7 @@ class CapSimulator(object):

        while 1:
            activation = pop(state)
-            t_now, duration, capNeed, shot, clipSize = activation
+            t_now, duration, capNeed, shot, clipSize, reloadTime = activation
            if t_now >= t_max:
                break

@@ -179,7 +181,7 @@ class CapSimulator(object):
            if clipSize:
                if shot % clipSize == 0:
                    shot = 0
-                    t_now += 10000  # include reload time
+                    t_now += reloadTime  # include reload time
            activation[0] = t_now
            activation[3] = shot

@@ -192,7 +194,7 @@ class CapSimulator(object):

        # calculate EVE's stability value
        try:
-            avgDrain = reduce(float.__add__, map(lambda x: x[2] / x[1], self.state), 0.0)
+            avgDrain = reduce(float.__add__, [x[2] / x[1] for x in self.state], 0.0)
            self.cap_stable_eve = 0.25 * (1.0 + sqrt(-(2.0 * avgDrain * tau - capCapacity) / capCapacity)) ** 2
        except ValueError:
            self.cap_stable_eve = 0.0
--- a/eos/config.py
+++ b/eos/config.py
@@ -11,14 +11,15 @@ debug = False
 gamedataCache = True
 saveddataCache = True
 gamedata_version = ""
-gamedata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "eve.db")), sys.getfilesystemencoding())
+gamedata_date = ""
+gamedata_connectionstring = 'sqlite:///' + realpath(join(dirname(abspath(__file__)), "..", "eve.db"))
 pyfalog.debug("Gamedata connection string: {0}", gamedata_connectionstring)

 if istravis is True or hasattr(sys, '_called_from_test'):
    # Running in Travis. Run saveddata database in memory.
    saveddata_connectionstring = 'sqlite:///:memory:'
 else:
-    saveddata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "saveddata", "saveddata.db")), sys.getfilesystemencoding())
+    saveddata_connectionstring = 'sqlite:///' + realpath(join(dirname(abspath(__file__)), "..", "saveddata", "saveddata-py3-db.db"))

 pyfalog.debug("Saveddata connection string: {0}", saveddata_connectionstring)

@@ -28,4 +29,4 @@ settings = {
 }

 # Autodetect path, only change if the autodetection bugs out.
-path = dirname(unicode(__file__, sys.getfilesystemencoding()))
+path = dirname(__file__)
--- a/eos/db/init.py
+++ b/eos/db/init.py
@@ -22,7 +22,7 @@ import threading
 from sqlalchemy import MetaData, create_engine
 from sqlalchemy.orm import sessionmaker

-import migration
+from . import migration
 from eos import config
 from logbook import Logger

@@ -51,10 +51,14 @@ try:
    config.gamedata_version = gamedata_session.execute(
            "SELECT `field_value` FROM `metadata` WHERE `field_name` LIKE 'client_build'"
    ).fetchone()[0]
+    config.gamedata_date = gamedata_session.execute(
+        "SELECT `field_value` FROM `metadata` WHERE `field_name` LIKE 'dump_time'"
+    ).fetchone()[0]
 except Exception as e:
    pyfalog.warning("Missing gamedata version.")
    pyfalog.critical(e)
    config.gamedata_version = None
+    config.gamedata_date = None

 saveddata_connectionstring = config.saveddata_connectionstring
 if saveddata_connectionstring is not None:
@@ -76,7 +80,7 @@ sd_lock = threading.RLock()
 # noinspection PyPep8
 from eos.db.gamedata import alphaClones, attribute, category, effect, group, icon, item, marketGroup, metaData, metaGroup, queries, traits, unit
 # noinspection PyPep8
-from eos.db.saveddata import booster, cargo, character, crest, damagePattern, databaseRepair, drone, fighter, fit, implant, implantSet, loadDefaultDatabaseValues, \
+from eos.db.saveddata import booster, cargo, character, damagePattern, databaseRepair, drone, fighter, fit, implant, implantSet, loadDefaultDatabaseValues, \
    miscData, module, override, price, queries, skill, targetResists, user

 # Import queries
--- a/eos/db/gamedata/queries.py
+++ b/eos/db/gamedata/queries.py
@@ -81,7 +81,7 @@ def getItem(lookfor, eager=None):
            item = gamedata_session.query(Item).get(lookfor)
        else:
            item = gamedata_session.query(Item).options(*processEager(eager)).filter(Item.ID == lookfor).first()
-    elif isinstance(lookfor, basestring):
+    elif isinstance(lookfor, str):
        if lookfor in itemNameMap:
            id = itemNameMap[lookfor]
            if eager is None:
@@ -154,7 +154,7 @@ def getGroup(lookfor, eager=None):
            group = gamedata_session.query(Group).get(lookfor)
        else:
            group = gamedata_session.query(Group).options(*processEager(eager)).filter(Group.ID == lookfor).first()
-    elif isinstance(lookfor, basestring):
+    elif isinstance(lookfor, str):
        if lookfor in groupNameMap:
            id = groupNameMap[lookfor]
            if eager is None:
@@ -181,7 +181,7 @@ def getCategory(lookfor, eager=None):
        else:
            category = gamedata_session.query(Category).options(*processEager(eager)).filter(
                    Category.ID == lookfor).first()
-    elif isinstance(lookfor, basestring):
+    elif isinstance(lookfor, str):
        if lookfor in categoryNameMap:
            id = categoryNameMap[lookfor]
            if eager is None:
@@ -210,7 +210,7 @@ def getMetaGroup(lookfor, eager=None):
        else:
            metaGroup = gamedata_session.query(MetaGroup).options(*processEager(eager)).filter(
                    MetaGroup.ID == lookfor).first()
-    elif isinstance(lookfor, basestring):
+    elif isinstance(lookfor, str):
        if lookfor in metaGroupNameMap:
            id = metaGroupNameMap[lookfor]
            if eager is None:
@@ -245,7 +245,7 @@ def getMarketGroup(lookfor, eager=None):
 def getItemsByCategory(filter, where=None, eager=None):
    if isinstance(filter, int):
        filter = Category.ID == filter
-    elif isinstance(filter, basestring):
+    elif isinstance(filter, str):
        filter = Category.name == filter
    else:
        raise TypeError("Need integer or string as argument")
@@ -257,7 +257,7 @@ def getItemsByCategory(filter, where=None, eager=None):

@cachedQuery(3, "where", "nameLike", "join")
 def searchItems(nameLike, where=None, join=None, eager=None):
-    if not isinstance(nameLike, basestring):
+    if not isinstance(nameLike, str):
        raise TypeError("Need string as argument")

    if join is None:
@@ -268,7 +268,7 @@ def searchItems(nameLike, where=None, join=None, eager=None):

    items = gamedata_session.query(Item).options(*processEager(eager)).join(*join)
    for token in nameLike.split(' '):
-        token_safe = u"%{0}%".format(sqlizeString(token))
+        token_safe = "%{0}%".format(sqlizeString(token))
        if where is not None:
            items = items.filter(and_(Item.name.like(token_safe, escape="\\"), where))
        else:
@@ -279,12 +279,12 @@ def searchItems(nameLike, where=None, join=None, eager=None):

@cachedQuery(3, "where", "nameLike", "join")
 def searchSkills(nameLike, where=None, eager=None):
-    if not isinstance(nameLike, basestring):
+    if not isinstance(nameLike, str):
        raise TypeError("Need string as argument")

    items = gamedata_session.query(Item).options(*processEager(eager)).join(Item.group, Group.category)
    for token in nameLike.split(' '):
-        token_safe = u"%{0}%".format(sqlizeString(token))
+        token_safe = "%{0}%".format(sqlizeString(token))
        if where is not None:
            items = items.filter(and_(Item.name.like(token_safe, escape="\\"), Category.ID == 16, where))
        else:
@@ -322,7 +322,7 @@ def getVariations(itemids, groupIDs=None, where=None, eager=None):

@cachedQuery(1, "attr")
 def getAttributeInfo(attr, eager=None):
-    if isinstance(attr, basestring):
+    if isinstance(attr, str):
        filter = AttributeInfo.name == attr
    elif isinstance(attr, int):
        filter = AttributeInfo.ID == attr
@@ -337,7 +337,7 @@ def getAttributeInfo(attr, eager=None):

@cachedQuery(1, "field")
 def getMetaData(field):
-    if isinstance(field, basestring):
+    if isinstance(field, str):
        data = gamedata_session.query(MetaData).get(field)
    else:
        raise TypeError("Need string as argument")
@@ -367,7 +367,7 @@ def getRequiredFor(itemID, attrMapping):

    skillToLevelClauses = []

-    for attrSkill, attrLevel in attrMapping.iteritems():
+    for attrSkill, attrLevel in attrMapping.items():
        skillToLevelClauses.append(and_(Attribute1.attributeID == attrSkill, Attribute2.attributeID == attrLevel))

    queryOr = or_(*skillToLevelClauses)
--- a/eos/db/migration.py
+++ b/eos/db/migration.py
@@ -3,7 +3,7 @@ import shutil
 import time

 import config
-import migrations
+from . import migrations

 pyfalog = Logger(__name__)

@@ -34,7 +34,7 @@ def update(saveddata_engine):

        shutil.copyfile(config.saveDB, toFile)

-        for version in xrange(dbVersion, appVersion):
+        for version in range(dbVersion, appVersion):
            func = migrations.updates[version + 1]
            if func:
                pyfalog.info("Applying database update: {0}", version + 1)
--- a/eos/db/migrations/init.py
+++ b/eos/db/migrations/init.py
@@ -15,7 +15,27 @@ updates = {}
 appVersion = 0

 prefix = __name__ + "."
-for importer, modname, ispkg in pkgutil.iter_modules(__path__, prefix):
+
+# load modules to work based with and without pyinstaller
+# from: https://github.com/webcomics/dosage/blob/master/dosagelib/loader.py
+# see: https://github.com/pyinstaller/pyinstaller/issues/1905
+
+# load modules using iter_modules()
+# (should find all filters in normal build, but not pyinstaller)
+module_names = [m[1] for m in pkgutil.iter_modules(__path__, prefix)]
+
+# special handling for PyInstaller
+importers = map(pkgutil.get_importer, __path__)
+toc = set()
+for i in importers:
+    if hasattr(i, 'toc'):
+        toc |= i.toc
+
+for elm in toc:
+    if elm.startswith(prefix):
+        module_names.append(elm)
+
+for modname in module_names:
    # loop through python files, extracting update number and function, and
    # adding it to a list
    modname_tail = modname.rsplit('.', 1)[-1]
--- a/eos/db/migrations/upgrade1.py
+++ b/eos/db/migrations/upgrade1.py
@@ -91,7 +91,7 @@ def upgrade(saveddata_engine):
        saveddata_engine.execute("ALTER TABLE fits ADD COLUMN targetResistsID INTEGER;")

    # Convert modules
-    for replacement_item, list in CONVERSIONS.iteritems():
+    for replacement_item, list in CONVERSIONS.items():
        for retired_item in list:
            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?',
                                     (replacement_item, retired_item))
--- a/eos/db/migrations/upgrade11.py
+++ b/eos/db/migrations/upgrade11.py
@@ -108,7 +108,7 @@ CONVERSIONS = {

 def upgrade(saveddata_engine):
    # Convert modules
-    for replacement_item, list in CONVERSIONS.iteritems():
+    for replacement_item, list in CONVERSIONS.items():
        for retired_item in list:
            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?',
                                     (replacement_item, retired_item))
--- a/eos/db/migrations/upgrade12.py
+++ b/eos/db/migrations/upgrade12.py
@@ -332,7 +332,7 @@ CONVERSIONS = {

 def upgrade(saveddata_engine):
    # Convert modules
-    for replacement_item, list in CONVERSIONS.iteritems():
+    for replacement_item, list in CONVERSIONS.items():
        for retired_item in list:
            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?',
                                     (replacement_item, retired_item))
--- a/eos/db/migrations/upgrade18.py
+++ b/eos/db/migrations/upgrade18.py
@@ -60,7 +60,7 @@ CONVERSIONS = {

 def upgrade(saveddata_engine):
    # Convert modules
-    for replacement_item, list in CONVERSIONS.iteritems():
+    for replacement_item, list in CONVERSIONS.items():
        for retired_item in list:
            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?',
                                     (replacement_item, retired_item))
--- a/eos/db/migrations/upgrade22.py
+++ b/eos/db/migrations/upgrade22.py
@@ -14,7 +14,7 @@ def upgrade(saveddata_engine):
        "boosters": 2,
        "cargo": 2,
        "characters": 2,
-        "crest": 1,
+        # "crest": 1,
        "damagePatterns": 2,
        "drones": 2,
        "fighters": 2,
@@ -29,7 +29,7 @@ def upgrade(saveddata_engine):
        "targetResists": 2
    }

-    for table in tables.keys():
+    for table in list(tables.keys()):

        # midnight brain, there's probably a much more simple way to do this, but fuck it
        if tables[table] > 0:
--- a/eos/db/migrations/upgrade25.py
+++ b/eos/db/migrations/upgrade25.py
@@ -4204,7 +4204,7 @@ conversion2 = {

 def upgrade(saveddata_engine):
    # First we want to get a list of fittings that are completely fitted out with subsystems
-    oldItems = [str(x) for x in conversion2.iterkeys()]
+    oldItems = [str(x) for x in conversion2.keys()]

    # I can't figure out a way to get IN operator to work when supplying a list using a parameterized query. So I'm
    # doing it the shitty way by formatting the SQL string. Don't do this kids!
@@ -4239,7 +4239,7 @@ def upgrade(saveddata_engine):
            # if something fails, fuck it, we tried. It'll default to the generic conversion below
            continue

-    for oldItem, newItem in conversion2.iteritems():
+    for oldItem, newItem in conversion2.items():
        saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?',
                                 (newItem, oldItem))
        saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?',
--- a/eos/db/migrations/upgrade4.py
+++ b/eos/db/migrations/upgrade4.py
@@ -133,7 +133,7 @@ CONVERSIONS = {

 def upgrade(saveddata_engine):
    # Convert modules
-    for replacement_item, list in CONVERSIONS.iteritems():
+    for replacement_item, list in CONVERSIONS.items():
        for retired_item in list:
            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?',
                                     (replacement_item, retired_item))
--- a/eos/db/migrations/upgrade7.py
+++ b/eos/db/migrations/upgrade7.py
@@ -17,7 +17,7 @@ CONVERSIONS = {

 def upgrade(saveddata_engine):
    # Convert ships
-    for replacement_item, list in CONVERSIONS.iteritems():
+    for replacement_item, list in CONVERSIONS.items():
        for retired_item in list:
            saveddata_engine.execute('UPDATE "fits" SET "shipID" = ? WHERE "shipID" = ?',
                                     (replacement_item, retired_item))
--- a/eos/db/migrations/upgrade8.py
+++ b/eos/db/migrations/upgrade8.py
@@ -77,7 +77,7 @@ CONVERSIONS = {

 def upgrade(saveddata_engine):
    # Convert modules
-    for replacement_item, list in CONVERSIONS.iteritems():
+    for replacement_item, list in CONVERSIONS.items():
        for retired_item in list:
            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?',
                                     (replacement_item, retired_item))
--- a/eos/db/saveddata/init.py
+++ b/eos/db/saveddata/init.py
@@ -12,7 +12,6 @@ __all__ = [
    "miscData",
    "targetResists",
    "override",
-    "crest",
    "implantSet",
    "loadDefaultDatabaseValues"
 ]
--- a/eos/db/saveddata/character.py
+++ b/eos/db/saveddata/character.py
@@ -17,24 +17,21 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 # ===============================================================================

-from sqlalchemy import Table, Column, Integer, ForeignKey, String, DateTime, Float
+from sqlalchemy import Table, Column, Integer, ForeignKey, String, DateTime, Float, UniqueConstraint
 from sqlalchemy.orm import relation, mapper
 import datetime

 from eos.db import saveddata_meta
 from eos.db.saveddata.implant import charImplants_table
-from eos.effectHandlerHelpers import HandledImplantBoosterList
+from eos.effectHandlerHelpers import HandledImplantBoosterList, HandledSsoCharacterList
 from eos.saveddata.implant import Implant
 from eos.saveddata.user import User
 from eos.saveddata.character import Character, Skill
+from eos.saveddata.ssocharacter import SsoCharacter

 characters_table = Table("characters", saveddata_meta,
                         Column("ID", Integer, primary_key=True),
                         Column("name", String, nullable=False),
-                         Column("apiID", Integer),
-                         Column("apiKey", String),
-                         Column("defaultChar", Integer),
-                         Column("chars", String, nullable=True),
                         Column("defaultLevel", Integer, nullable=True),
                         Column("alphaCloneID", Integer, nullable=True),
                         Column("ownerID", ForeignKey("users.ID"), nullable=True),
@@ -42,6 +39,28 @@ characters_table = Table("characters", saveddata_meta,
                         Column("created", DateTime, nullable=True, default=datetime.datetime.now),
                         Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now))

+sso_table = Table("ssoCharacter", saveddata_meta,
+                    Column("ID", Integer, primary_key=True),
+                    Column("client", String, nullable=False),
+                    Column("characterID", Integer, nullable=False),
+                    Column("characterName", String, nullable=False),
+                    Column("refreshToken", String, nullable=False),
+                    Column("accessToken", String, nullable=False),
+                    Column("accessTokenExpires", DateTime, nullable=False),
+                    Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                    Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now),
+                    UniqueConstraint('client', 'characterID', name='uix_client_characterID'),
+                    UniqueConstraint('client', 'characterName', name='uix_client_characterName')
+                  )
+
+sso_character_map_table = Table("ssoCharacterMap", saveddata_meta,
+                    Column("characterID", ForeignKey("characters.ID"), primary_key=True),
+                    Column("ssoCharacterID", ForeignKey("ssoCharacter.ID"), primary_key=True),
+                  )
+
+
+mapper(SsoCharacter, sso_table)
+
 mapper(Character, characters_table,
       properties={
           "_Character__alphaCloneID": characters_table.c.alphaCloneID,
@@ -63,5 +82,10 @@ mapper(Character, characters_table,
                   primaryjoin=charImplants_table.c.charID == characters_table.c.ID,
                   secondaryjoin=charImplants_table.c.implantID == Implant.ID,
                   secondary=charImplants_table),
+           "_Character__ssoCharacters"    : relation(
+                   SsoCharacter,
+                   collection_class=HandledSsoCharacterList,
+                   backref='characters',
+                   secondary=sso_character_map_table)
       }
       )
--- a/eos/db/saveddata/crest.py
+++ b/eos/db/saveddata/crest.py
@@ -1,34 +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, DateTime
-from sqlalchemy.orm import mapper
-import datetime
-
-from eos.db import saveddata_meta
-from eos.saveddata.crestchar 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),
-                    # These records aren't updated. Instead, they are dropped and created, hence we don't have a modified field
-                    Column("created", DateTime, nullable=True, default=datetime.datetime.now))
-
-mapper(CrestChar, crest_table)
--- a/eos/db/saveddata/queries.py
+++ b/eos/db/saveddata/queries.py
@@ -27,7 +27,7 @@ from eos.db.saveddata.fit import projectedFits_table
 from eos.db.util import processEager, processWhere
 from eos.saveddata.price import Price
 from eos.saveddata.user import User
-from eos.saveddata.crestchar import CrestChar
+from eos.saveddata.ssocharacter import SsoCharacter
 from eos.saveddata.damagePattern import DamagePattern
 from eos.saveddata.targetResists import TargetResists
 from eos.saveddata.character import Character
@@ -109,9 +109,9 @@ if configVal is True:
        if type not in queryCache:
            return
        functionCache = queryCache[type]
-        for _, localCache in functionCache.iteritems():
+        for _, localCache in functionCache.items():
            toDelete = set()
-            for cacheKey, info in localCache.iteritems():
+            for cacheKey, info in localCache.items():
                IDs = info[1]
                if ID in IDs:
                    toDelete.add(cacheKey)
@@ -156,7 +156,7 @@ def getUser(lookfor, eager=None):
            eager = processEager(eager)
            with sd_lock:
                user = saveddata_session.query(User).options(*eager).filter(User.ID == lookfor).first()
-    elif isinstance(lookfor, basestring):
+    elif isinstance(lookfor, str):
        eager = processEager(eager)
        with sd_lock:
            user = saveddata_session.query(User).options(*eager).filter(User.username == lookfor).first()
@@ -175,7 +175,7 @@ def getCharacter(lookfor, eager=None):
            eager = processEager(eager)
            with sd_lock:
                character = saveddata_session.query(Character).options(*eager).filter(Character.ID == lookfor).first()
-    elif isinstance(lookfor, basestring):
+    elif isinstance(lookfor, str):
        eager = processEager(eager)
        with sd_lock:
            character = saveddata_session.query(Character).options(*eager).filter(
@@ -337,7 +337,7 @@ def clearPrices():


 def getMiscData(field):
-    if isinstance(field, basestring):
+    if isinstance(field, str):
        with sd_lock:
            data = saveddata_session.query(MiscData).get(field)
    else:
@@ -391,7 +391,7 @@ def getDamagePattern(lookfor, eager=None):
            with sd_lock:
                pattern = saveddata_session.query(DamagePattern).options(*eager).filter(
                        DamagePattern.ID == lookfor).first()
-    elif isinstance(lookfor, basestring):
+    elif isinstance(lookfor, str):
        eager = processEager(eager)
        with sd_lock:
            pattern = saveddata_session.query(DamagePattern).options(*eager).filter(
@@ -412,7 +412,7 @@ def getTargetResists(lookfor, eager=None):
            with sd_lock:
                pattern = saveddata_session.query(TargetResists).options(*eager).filter(
                        TargetResists.ID == lookfor).first()
-    elif isinstance(lookfor, basestring):
+    elif isinstance(lookfor, str):
        eager = processEager(eager)
        with sd_lock:
            pattern = saveddata_session.query(TargetResists).options(*eager).filter(
@@ -433,7 +433,7 @@ def getImplantSet(lookfor, eager=None):
            with sd_lock:
                pattern = saveddata_session.query(ImplantSet).options(*eager).filter(
                        TargetResists.ID == lookfor).first()
-    elif isinstance(lookfor, basestring):
+    elif isinstance(lookfor, str):
        eager = processEager(eager)
        with sd_lock:
            pattern = saveddata_session.query(ImplantSet).options(*eager).filter(TargetResists.name == lookfor).first()
@@ -443,10 +443,10 @@ def getImplantSet(lookfor, eager=None):


 def searchFits(nameLike, where=None, eager=None):
-    if not isinstance(nameLike, basestring):
+    if not isinstance(nameLike, str):
        raise TypeError("Need string as argument")
    # Prepare our string for request
-    nameLike = u"%{0}%".format(sqlizeString(nameLike))
+    nameLike = "%{0}%".format(sqlizeString(nameLike))

    # Add any extra components to the search to our where clause
    filter = processWhere(Fit.name.like(nameLike, escape="\\"), where)
@@ -467,29 +467,28 @@ def getProjectedFits(fitID):
        raise TypeError("Need integer as argument")


-def getCrestCharacters(eager=None):
+def getSsoCharacters(clientHash, eager=None):
    eager = processEager(eager)
    with sd_lock:
-        characters = saveddata_session.query(CrestChar).options(*eager).all()
+        characters = saveddata_session.query(SsoCharacter).filter(SsoCharacter.client == clientHash).options(*eager).all()
    return characters


-@cachedQuery(CrestChar, 1, "lookfor")
-def getCrestCharacter(lookfor, eager=None):
+@cachedQuery(SsoCharacter, 1, "lookfor", "clientHash")
+def getSsoCharacter(lookfor, clientHash, eager=None):
+    filter = SsoCharacter.client == clientHash
+
    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()
+        filter = and_(filter, SsoCharacter.ID == lookfor)
+    elif isinstance(lookfor, str):
+        filter = and_(filter, SsoCharacter.characterName == lookfor)
    else:
        raise TypeError("Need integer or string as argument")
+
+    eager = processEager(eager)
+    with sd_lock:
+        character = saveddata_session.query(SsoCharacter).options(*eager).filter(filter).first()
+
    return character


@@ -515,8 +514,8 @@ def removeInvalid(fits):
    invalids = [f for f in fits if f.isInvalid]

    if invalids:
-        map(fits.remove, invalids)
-        map(saveddata_session.delete, invalids)
+        list(map(fits.remove, invalids))
+        list(map(saveddata_session.delete, invalids))
        saveddata_session.commit()

    return fits
@@ -544,7 +543,7 @@ def commit():
        try:
            saveddata_session.commit()
            saveddata_session.flush()
-        except Exception:
+        except Exception as ex:
            saveddata_session.rollback()
            exc_info = sys.exc_info()
-            raise exc_info[0], exc_info[1], exc_info[2]
+            raise exc_info[0](exc_info[1]).with_traceback(exc_info[2])
--- a/eos/db/util.py
+++ b/eos/db/util.py
@@ -39,7 +39,7 @@ def processEager(eager):
        return tuple()
    else:
        l = []
-        if isinstance(eager, basestring):
+        if isinstance(eager, str):
            eager = (eager,)

        for e in eager:
@@ -50,7 +50,7 @@ def processEager(eager):

 def _replacements(eagerString):
    splitEager = eagerString.split(".")
-    for i in xrange(len(splitEager)):
+    for i in range(len(splitEager)):
        part = splitEager[i]
        replacement = replace.get(part)
        if replacement:
--- a/eos/effectHandlerHelpers.py
+++ b/eos/effectHandlerHelpers.py
@@ -115,7 +115,7 @@ class HandledList(list):
 class HandledModuleList(HandledList):
    def append(self, mod):
        emptyPosition = float("Inf")
-        for i in xrange(len(self)):
+        for i in range(len(self)):
            currMod = self[i]
            if currMod.isEmpty and not mod.isEmpty and currMod.slot == mod.slot:
                currPos = mod.position or i
@@ -149,7 +149,7 @@ class HandledModuleList(HandledList):
        oldPos = mod.position

        mod.position = None
-        for i in xrange(oldPos, len(self)):
+        for i in range(oldPos, len(self)):
            self[i].position -= 1

    def toDummy(self, index):
@@ -205,6 +205,16 @@ class HandledImplantBoosterList(HandledList):
        HandledList.append(self, thing)


+class HandledSsoCharacterList(list):
+    def append(self, character):
+        old = next((x for x in self if x.client == character.client), None)
+        if old is not None:
+            pyfalog.warning("Removing SSO Character with same hash: {}".format(repr(old)))
+            list.remove(self, old)
+
+        list.append(self, character)
+
+
 class HandledProjectedModList(HandledList):
    def append(self, proj):
        if proj.isInvalid:
--- a/eos/effects/adaptivearmorhardener.py
+++ b/eos/effects/adaptivearmorhardener.py
@@ -13,11 +13,14 @@ type = "active"

 def handler(fit, module, context):
    damagePattern = fit.damagePattern
+    # pyfalog.debug("==============================")

    static_adaptive_behavior = eos.config.settings['useStaticAdaptiveArmorHardener']

    if (damagePattern.emAmount == damagePattern.thermalAmount == damagePattern.kineticAmount == damagePattern.explosiveAmount) and static_adaptive_behavior:
-        pyfalog.debug("Setting adaptivearmorhardener resists to uniform profile.")
+        # pyfalog.debug("Setting adaptivearmorhardener resists to uniform profile.")
+        for attr in ("armorEmDamageResonance", "armorThermalDamageResonance", "armorKineticDamageResonance", "armorExplosiveDamageResonance"):
+            fit.ship.multiplyItemAttr(attr, module.getModifiedItemAttr(attr), stackingPenalties=True, penaltyGroup="preMul")
        return

    # Skip if there is no damage pattern. Example: projected ships or fleet boosters
@@ -30,7 +33,7 @@ def handler(fit, module, context):
            damagePattern.kineticAmount * fit.ship.getModifiedItemAttr('armorKineticDamageResonance'),
            damagePattern.explosiveAmount * fit.ship.getModifiedItemAttr('armorExplosiveDamageResonance'),
        )
-        # pyfalog.debug("Damage Adjusted for Armor Resists: %f/%f/%f/%f", baseDamageTaken[0], baseDamageTaken[1], baseDamageTaken[2], baseDamageTaken[3])
+        # pyfalog.debug("Damage Adjusted for Armor Resists: %f/%f/%f/%f" % (baseDamageTaken[0], baseDamageTaken[1], baseDamageTaken[2], baseDamageTaken[3]))

        resistanceShiftAmount = module.getModifiedItemAttr(
            'resistanceShiftAmount') / 100  # The attribute is in percent and we want a fraction
@@ -46,7 +49,7 @@ def handler(fit, module, context):
        cycleList = []
        loopStart = -20
        for num in range(50):
-            # pyfalog.debug("Starting cycle %d.", num)
+            # pyfalog.debug("Starting cycle %d." % num)
            # The strange order is to emulate the ingame sorting when different types have taken the same amount of damage.
            # This doesn't take into account stacking penalties. In a few cases fitting a Damage Control causes an inaccurate result.
            damagePattern_tuples = [
@@ -84,7 +87,7 @@ def handler(fit, module, context):
            RAHResistance[sortedDamagePattern_tuples[1][0]] = sortedDamagePattern_tuples[1][2] + change1
            RAHResistance[sortedDamagePattern_tuples[2][0]] = sortedDamagePattern_tuples[2][2] + change2
            RAHResistance[sortedDamagePattern_tuples[3][0]] = sortedDamagePattern_tuples[3][2] + change3
-            # pyfalog.debug("Resistances shifted to %f/%f/%f/%f", RAHResistance[0], RAHResistance[1], RAHResistance[2], RAHResistance[3])
+            # pyfalog.debug("Resistances shifted to %f/%f/%f/%f" % ( RAHResistance[0], RAHResistance[1], RAHResistance[2], RAHResistance[3]))

            # See if the current RAH profile has been encountered before, indicating a loop.
            for i, val in enumerate(cycleList):
@@ -94,16 +97,16 @@ def handler(fit, module, context):
                            abs(RAHResistance[2] - val[2]) <= tolerance and \
                            abs(RAHResistance[3] - val[3]) <= tolerance:
                    loopStart = i
-                    # pyfalog.debug("Loop found: %d-%d", loopStart, num)
+                    # pyfalog.debug("Loop found: %d-%d" % (loopStart, num))
                    break
            if loopStart >= 0:
                break

            cycleList.append(list(RAHResistance))

-        if loopStart < 0:
-            pyfalog.error("Reactive Armor Hardener failed to find equilibrium. Damage profile after armor: {0}/{1}/{2}/{3}",
-                         baseDamageTaken[0], baseDamageTaken[1], baseDamageTaken[2], baseDamageTaken[3])
+        # if loopStart < 0:
+            # pyfalog.error("Reactive Armor Hardener failed to find equilibrium. Damage profile after armor: {0}/{1}/{2}/{3}".format(
+            #             baseDamageTaken[0], baseDamageTaken[1], baseDamageTaken[2], baseDamageTaken[3]))

        # Average the profiles in the RAH loop, or the last 20 if it didn't find a loop.
        loopCycles = cycleList[loopStart:]
@@ -117,7 +120,7 @@ def handler(fit, module, context):
            average[i] = round(average[i] / numCycles, 3)

        # Set the new resistances
-        # pyfalog.debug("Setting new resist profile: %f/%f/%f/%f", average[0], average[1], average[2],average[3])
+        # pyfalog.debug("Setting new resist profile: %f/%f/%f/%f" % ( average[0], average[1], average[2],average[3]))
        for i, attr in enumerate((
                'armorEmDamageResonance', 'armorThermalDamageResonance', 'armorKineticDamageResonance',
                'armorExplosiveDamageResonance')):
--- a/eos/effects/addtosignatureradius2.py
+++ b/eos/effects/addtosignatureradius2.py
@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules from group: Missile Launcher Bomb (2 of 2)
-# Modules from group: Shield Extender (33 of 33)
+# Modules from group: Shield Extender (36 of 36)
 type = "passive"


--- a/eos/effects/ammoinfluencecapneed.py
+++ b/eos/effects/ammoinfluencecapneed.py
@@ -1,7 +1,7 @@
 # ammoInfluenceCapNeed
 #
 # Used by:
-# Items from category: Charge (478 of 925)
+# Items from category: Charge (493 of 947)
 type = "passive"


--- a/eos/effects/ammoinfluencerange.py
+++ b/eos/effects/ammoinfluencerange.py
@@ -1,7 +1,7 @@
 # ammoInfluenceRange
 #
 # Used by:
-# Items from category: Charge (572 of 925)
+# Items from category: Charge (587 of 947)
 type = "passive"


--- a/eos/effects/ammospeedmultiplier.py
+++ b/eos/effects/ammospeedmultiplier.py
@@ -3,6 +3,8 @@
 # Used by:
 # Charges from group: Festival Charges (23 of 23)
 # Charges from group: Interdiction Probe (2 of 2)
+# Charges from group: Structure Festival Charges (3 of 3)
+# Special Edition Assetss from group: Festival Charges Expired (2 of 2)
 type = "passive"


--- a/eos/effects/ammotrackingmultiplier.py
+++ b/eos/effects/ammotrackingmultiplier.py
@@ -1,12 +1,7 @@
 # ammoTrackingMultiplier
 #
 # Used by:
-# Charges from group: Advanced Artillery Ammo (8 of 8)
-# Charges from group: Advanced Autocannon Ammo (8 of 8)
-# Charges from group: Advanced Beam Laser Crystal (8 of 8)
-# Charges from group: Advanced Blaster Charge (8 of 8)
-# Charges from group: Advanced Pulse Laser Crystal (8 of 8)
-# Charges from group: Advanced Railgun Charge (8 of 8)
+# Items from category: Charge (182 of 947)
 # Charges from group: Projectile Ammo (128 of 128)
 type = "passive"

--- a/eos/effects/aoebeaconbioluminescencecloud.py
+++ b/eos/effects/aoebeaconbioluminescencecloud.py
@@ -0,0 +1,16 @@
+# aoe_beacon_bioluminescence_cloud
+#
+# Used by:
+# Celestials named like: Bioluminescence Cloud (3 of 3)
+runTime = "early"
+type = ("projected", "passive", "gang")
+
+
+def handler(fit, beacon, context, **kwargs):
+    for x in range(1, 3):
+        if beacon.getModifiedItemAttr("warfareBuff{}ID".format(x)):
+            value = beacon.getModifiedItemAttr("warfareBuff{}Value".format(x))
+            id = beacon.getModifiedItemAttr("warfareBuff{}ID".format(x))
+
+            if id:
+                fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
--- a/eos/effects/aoebeaconcausticcloud.py
+++ b/eos/effects/aoebeaconcausticcloud.py
@@ -0,0 +1,16 @@
+# aoe_beacon_caustic_cloud
+#
+# Used by:
+# Celestials named like: Caustic Cloud (3 of 3)
+runTime = "early"
+type = ("projected", "passive", "gang")
+
+
+def handler(fit, beacon, context, **kwargs):
+    for x in range(1, 3):
+        if beacon.getModifiedItemAttr("warfareBuff{}ID".format(x)):
+            value = beacon.getModifiedItemAttr("warfareBuff{}Value".format(x))
+            id = beacon.getModifiedItemAttr("warfareBuff{}ID".format(x))
+
+            if id:
+                fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
--- a/eos/effects/aoebeaconfilamentcloud.py
+++ b/eos/effects/aoebeaconfilamentcloud.py
@@ -0,0 +1,16 @@
+# aoe_beacon_filament_cloud
+#
+# Used by:
+# Celestials named like: Filament Cloud (3 of 3)
+runTime = "early"
+type = ("projected", "passive", "gang")
+
+
+def handler(fit, beacon, context, **kwargs):
+    for x in range(1, 3):
+        if beacon.getModifiedItemAttr("warfareBuff{}ID".format(x)):
+            value = beacon.getModifiedItemAttr("warfareBuff{}Value".format(x))
+            id = beacon.getModifiedItemAttr("warfareBuff{}ID".format(x))
+
+            if id:
+                fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
--- a/eos/effects/armorallrepairsystemsamountbonuspassive.py
+++ b/eos/effects/armorallrepairsystemsamountbonuspassive.py
@@ -1,6 +1,7 @@
 # armorAllRepairSystemsAmountBonusPassive
 #
 # Used by:
+# Implants named like: Agency 'Hardshell' TB Dose (3 of 4)
 # Implants named like: Exile Booster (4 of 4)
 # Implant: Antipharmakon Kosybo
 type = "passive"
@@ -9,4 +10,4 @@ type = "passive"
 def handler(fit, booster, context):
    fit.modules.filteredItemBoost(
        lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Capital Repair Systems"),
-        "armorDamageAmount", booster.getModifiedItemAttr("armorDamageAmountBonus"))
+        "armorDamageAmount", booster.getModifiedItemAttr("armorDamageAmountBonus") or 0)
--- a/eos/effects/armorhpbonusadd.py
+++ b/eos/effects/armorhpbonusadd.py
@@ -1,7 +1,7 @@
 # armorHPBonusAdd
 #
 # Used by:
-# Modules from group: Armor Reinforcer (48 of 48)
+# Modules from group: Armor Reinforcer (51 of 51)
 type = "passive"


--- a/eos/effects/armorreinforcermassadd.py
+++ b/eos/effects/armorreinforcermassadd.py
@@ -1,7 +1,7 @@
 # armorReinforcerMassAdd
 #
 # Used by:
-# Modules from group: Armor Reinforcer (48 of 48)
+# Modules from group: Armor Reinforcer (51 of 51)
 type = "passive"


--- a/eos/effects/armorrepair.py
+++ b/eos/effects/armorrepair.py
@@ -1,7 +1,7 @@
 # armorRepair
 #
 # Used by:
-# Modules from group: Armor Repair Unit (105 of 105)
+# Modules from group: Armor Repair Unit (108 of 108)
 runTime = "late"
 type = "active"

--- a/eos/effects/armorwarfarearmorhpreplacer.py
+++ b/eos/effects/armorwarfarearmorhpreplacer.py
@@ -1,10 +0,0 @@
-# Not used by any item
-type = "gang", "active"
-gangBonus = "armorHpBonus2"
-gangBoost = "armorHP"
-
-
-def handler(fit, module, context):
-    if "gang" not in context:
-        return
-    fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("armorHpBonus2"))
--- a/eos/effects/boosterarmorhppenalty.py
+++ b/eos/effects/boosterarmorhppenalty.py
@@ -1,7 +1,7 @@
 # boosterArmorHpPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 54)
+# Implants named like: Booster (12 of 33)
 type = "boosterSideEffect"

 # User-friendly name for the side effect
--- a/eos/effects/boostermaxvelocitypenalty.py
+++ b/eos/effects/boostermaxvelocitypenalty.py
@@ -1,7 +1,7 @@
 # boosterMaxVelocityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 54)
+# Implants named like: Booster (12 of 33)
 type = "boosterSideEffect"

 # User-friendly name for the side effect
--- a/eos/effects/boostershieldcapacitypenalty.py
+++ b/eos/effects/boostershieldcapacitypenalty.py
@@ -1,7 +1,7 @@
 # boosterShieldCapacityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 54)
+# Implants named like: Booster (12 of 33)
 type = "boosterSideEffect"

 # User-friendly name for the side effect
--- a/eos/effects/capacitorcapacitymultiply.py
+++ b/eos/effects/capacitorcapacitymultiply.py
@@ -4,10 +4,12 @@
 # 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 (65 of 127)
+# Modules from group: Propulsion Module (68 of 133)
 # Modules from group: Reactor Control Unit (22 of 22)
 type = "passive"


 def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("capacitorCapacity", module.getModifiedItemAttr("capacitorCapacityMultiplier"))
+    # We default this to None as there are times when the source attribute doesn't exist (for example, Cap Power Relay).
+    # It will return 0 as it doesn't exist, which would nullify whatever the target attribute is
+    fit.ship.multiplyItemAttr("capacitorCapacity", module.getModifiedItemAttr("capacitorCapacityMultiplier", None))
--- a/eos/effects/chargebonuswarfarecharge.py
+++ b/eos/effects/chargebonuswarfarecharge.py
@@ -6,6 +6,6 @@ type = "active"


 def handler(fit, module, context):
-    for x in xrange(1, 4):
+    for x in range(1, 4):
        value = module.getModifiedChargeAttr("warfareBuff{}Multiplier".format(x))
        module.multiplyItemAttr("warfareBuff{}Value".format(x), value)
--- a/eos/effects/citadelrigbonus.py
+++ b/eos/effects/citadelrigbonus.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# citadelRigBonus
+#
+# Used by:
+# Structures from group: Citadel (9 of 9)
 type = "passive"
 runTime = "early"

--- a/eos/effects/cpumultiplierpostmulcpuoutputship.py
+++ b/eos/effects/cpumultiplierpostmulcpuoutputship.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Modules from group: CPU Enhancer (19 of 19)
+# Variations of structure module: Standup Co-Processor Array I (2 of 2)
 type = "passive"


--- a/eos/effects/decreasetargetspeed.py
+++ b/eos/effects/decreasetargetspeed.py
@@ -1,9 +0,0 @@
-# Not used by any item
-type = "active", "projected"
-
-
-def handler(fit, module, context):
-    if "projected" not in context:
-        return
-    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor"),
-                           stackingPenalties=True)
--- a/eos/effects/disintegratorweapondamagemultiply.py
+++ b/eos/effects/disintegratorweapondamagemultiply.py
@@ -0,0 +1,11 @@
+# disintegratorWeaponDamageMultiply
+#
+# Used by:
+# Modules from group: Entropic Radiation Sink (3 of 3)
+type = "passive"
+
+
+def handler(fit, module, context):
+    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Precursor Weapon",
+                                     "damageMultiplier", module.getModifiedItemAttr("damageMultiplier"),
+                                     stackingPenalties=True)
--- a/eos/effects/disintegratorweaponspeedmultiply.py
+++ b/eos/effects/disintegratorweaponspeedmultiply.py
@@ -0,0 +1,11 @@
+# disintegratorWeaponSpeedMultiply
+#
+# Used by:
+# Modules from group: Entropic Radiation Sink (3 of 3)
+type = "passive"
+
+
+def handler(fit, module, context):
+    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Precursor Weapon",
+                                     "speed", module.getModifiedItemAttr("speedMultiplier"),
+                                     stackingPenalties=True)
--- a/eos/effects/doomsdayaoebubble.py
+++ b/eos/effects/doomsdayaoebubble.py
@@ -0,0 +1,10 @@
+# doomsdayAOEBubble
+#
+# Used by:
+# Module: Warp Disruption Burst Projector
+# Structure Module: Standup Warp Disruption Burst Projector
+type = "projected", "active"
+
+
+def handler(fit, module, context):
+    return
--- a/eos/effects/doomsdayaoedamp.py
+++ b/eos/effects/doomsdayaoedamp.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Module: Sensor Dampening Burst Projector
+# Structure Module: Standup Sensor Dampening Burst Projector
 type = "projected", "active"


--- a/eos/effects/doomsdayaoeecm.py
+++ b/eos/effects/doomsdayaoeecm.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Module: ECM Jammer Burst Projector
+# Structure Module: Standup ECM Jammer Burst Projector
 from eos.modifiedAttributeDict import ModifiedAttributeDict

 type = "projected", "active"
--- a/eos/effects/doomsdayaoeneut.py
+++ b/eos/effects/doomsdayaoeneut.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Module: Energy Neutralization Burst Projector
+# Structure Module: Standup Energy Neutralization Burst Projector
 from eos.saveddata.module import State
 from eos.modifiedAttributeDict import ModifiedAttributeDict

--- a/eos/effects/doomsdayaoepaint.py
+++ b/eos/effects/doomsdayaoepaint.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Module: Target Illumination Burst Projector
+# Structure Module: Standup Target Illumination Burst Projector
 type = "projected", "active"


--- a/eos/effects/doomsdayaoetrack.py
+++ b/eos/effects/doomsdayaoetrack.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Module: Weapon Disruption Burst Projector
+# Structure Module: Standup Weapon Disruption Burst Projector

 type = "active", "projected"

--- a/eos/effects/doomsdayaoeweb.py
+++ b/eos/effects/doomsdayaoeweb.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Module: Stasis Webification Burst Projector
+# Structure Module: Standup Stasis Webification Burst Projector
 type = "active", "projected"


--- a/eos/effects/doomsdaybeamdot.py
+++ b/eos/effects/doomsdaybeamdot.py
@@ -0,0 +1,9 @@
+# doomsdayBeamDOT
+#
+# Used by:
+# Modules named like: Lance (4 of 4)
+type = "active"
+
+
+def handler(fit, src, context):
+    pass
--- a/eos/effects/doomsdayconedot.py
+++ b/eos/effects/doomsdayconedot.py
@@ -0,0 +1,9 @@
+# doomsdayConeDOT
+#
+# Used by:
+# Module: Bosonic Field Generator
+type = "active"
+
+
+def handler(fit, src, context):
+    pass
--- a/eos/effects/doomsdayhog.py
+++ b/eos/effects/doomsdayhog.py
@@ -0,0 +1,9 @@
+# doomsdayHOG
+#
+# Used by:
+# Module: Gravitational Transportation Field Oscillator
+type = "active"
+
+
+def handler(fit, src, context):
+    pass
--- a/eos/effects/doomsdayslash.py
+++ b/eos/effects/doomsdayslash.py
@@ -0,0 +1,9 @@
+# doomsdaySlash
+#
+# Used by:
+# Modules named like: Reaper (4 of 4)
+type = "active"
+
+
+def handler(fit, src, context):
+    pass
--- a/eos/effects/dronedamagebonusrequringdrones.py
+++ b/eos/effects/dronedamagebonusrequringdrones.py
@@ -1,7 +0,0 @@
-# Not used by any item
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "damageMultiplier", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
--- a/eos/effects/dronemaxvelocitybonus.py
+++ b/eos/effects/dronemaxvelocitybonus.py
@@ -8,4 +8,4 @@ type = "passive"
 def handler(fit, container, context):
    level = container.level if "skill" in context else 1
    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "maxVelocity", container.getModifiedItemAttr("droneMaxVelocityBonus") * level)
+                                 "maxVelocity", container.getModifiedItemAttr("droneMaxVelocityBonus") * level, stackingPenalties=True)
--- a/eos/effects/elitebonuscommanddestroyerinfohidden1.py
+++ b/eos/effects/elitebonuscommanddestroyerinfohidden1.py
@@ -1,9 +0,0 @@
-# Not used by any item
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"),
-                                  "commandBonusHidden",
-                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"),
-                                  skill="Command Destroyers")
--- a/eos/effects/elitebonuscommanddestroyermwdsigradius3.py
+++ b/eos/effects/elitebonuscommanddestroyermwdsigradius3.py
@@ -1,7 +0,0 @@
-# Not used by any item
-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")
--- a/eos/effects/elitebonuscommandshipinformationhiddencs3.py
+++ b/eos/effects/elitebonuscommandshipinformationhiddencs3.py
@@ -1,7 +0,0 @@
-# Not used by any item
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"),
-                                  "commandBonusHidden", module.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")
--- a/eos/effects/elitebonusflagcruiserallresistances1.py
+++ b/eos/effects/elitebonusflagcruiserallresistances1.py
@@ -0,0 +1,20 @@
+# eliteBonusFlagCruiserAllResistances1
+#
+# Used by:
+# Ship: Monitor
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.ship.boostItemAttr("explosiveDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
+    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
+    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
+    fit.ship.boostItemAttr("armorThermalDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
+    fit.ship.boostItemAttr("thermalDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
+    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
+    fit.ship.boostItemAttr("armorExplosiveDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
+    fit.ship.boostItemAttr("armorEmDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
+    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
+    fit.ship.boostItemAttr("kineticDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
+    fit.ship.boostItemAttr("armorKineticDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
+    fit.ship.boostItemAttr("emDamageResonance", src.getModifiedItemAttr("eliteBonusFlagCruisers1"), skill="Flag Cruisers")
--- a/eos/effects/elitebonusgunshipdronecapacity2.py
+++ b/eos/effects/elitebonusgunshipdronecapacity2.py
@@ -1,6 +0,0 @@
-# Not used by any item
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.ship.increaseItemAttr("droneCapacity", ship.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates")
--- a/eos/effects/elitebonusgunshipdronetracking2.py
+++ b/eos/effects/elitebonusgunshipdronetracking2.py
@@ -1,7 +0,0 @@
-# Not used by any item
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "trackingSpeed",
-                                 src.getModifiedItemAttr("eliteBonusGunship2"), stackingPenalties=True, skill="Assault Frigates")
--- a/eos/effects/energydestabilizationnew.py
+++ b/eos/effects/energydestabilizationnew.py
@@ -1,12 +0,0 @@
-# Not used by any item
-from eos.saveddata.module import State
-
-type = "active", "projected"
-
-
-def handler(fit, src, context):
-    if "projected" in context and ((hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")):
-        multiplier = src.amountActive if hasattr(src, "amountActive") else 1
-        amount = src.getModifiedItemAttr("energyNeutralizerAmount")
-        time = src.getModifiedItemAttr("duration")
-        fit.addDrain(src, time, amount * multiplier, 0)
--- a/eos/effects/energyneutralizerfalloff.py
+++ b/eos/effects/energyneutralizerfalloff.py
@@ -1,7 +1,7 @@
 # energyNeutralizerFalloff
 #
 # Used by:
-# Modules from group: Energy Neutralizer (51 of 51)
+# Modules from group: Energy Neutralizer (54 of 54)
 from eos.saveddata.module import State
 from eos.modifiedAttributeDict import ModifiedAttributeDict

--- a/eos/effects/energytransfer.py
+++ b/eos/effects/energytransfer.py
@@ -1,9 +0,0 @@
-# Not used by any item
-type = "projected", "active"
-
-
-def handler(fit, src, context):
-    if "projected" in context:
-        amount = src.getModifiedItemAttr("powerTransferAmount")
-        duration = src.getModifiedItemAttr("duration")
-        fit.addDrain(src, duration, -amount, 0)
--- a/eos/effects/ewtargetpaint.py
+++ b/eos/effects/ewtargetpaint.py
@@ -1,8 +0,0 @@
-# Not used by any item
-type = "projected", "active"
-
-
-def handler(fit, container, context):
-    if "projected" in context:
-        fit.ship.boostItemAttr("signatureRadius", container.getModifiedItemAttr("signatureRadiusBonus"),
-                               stackingPenalties=True)
--- a/eos/effects/fighterabilityattackm.py
+++ b/eos/effects/fighterabilityattackm.py
@@ -1,4 +1,8 @@
-# Not used by any item
+# fighterAbilityAttackM
+#
+# Used by:
+# Items from category: Fighter (50 of 82)
+# Fighters from group: Heavy Fighter (34 of 34)
 """
 Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
 effects, and thus this effect file contains some custom information useful only to fighters.
--- a/eos/effects/fighterabilityecm.py
+++ b/eos/effects/fighterabilityecm.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# fighterAbilityECM
+#
+# Used by:
+# Fighters named like: Scarab (4 of 4)
 """
 Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
 effects, and thus this effect file contains some custom information useful only to fighters.
--- a/eos/effects/fighterabilityenergyneutralizer.py
+++ b/eos/effects/fighterabilityenergyneutralizer.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# fighterAbilityEnergyNeutralizer
+#
+# Used by:
+# Fighters named like: Cenobite (4 of 4)
 """
 Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
 effects, and thus this effect file contains some custom information useful only to fighters.
--- a/eos/effects/fighterabilityevasivemaneuvers.py
+++ b/eos/effects/fighterabilityevasivemaneuvers.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# fighterAbilityEvasiveManeuvers
+#
+# Used by:
+# Fighters from group: Light Fighter (16 of 32)
 """
 Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
 effects, and thus this effect file contains some custom information useful only to fighters.
--- a/eos/effects/fighterabilitylaunchbomb.py
+++ b/eos/effects/fighterabilitylaunchbomb.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# fighterAbilityLaunchBomb
+#
+# Used by:
+# Fighters from group: Heavy Fighter (16 of 34)
 """
 Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
 effects, and thus this effect file contains some custom information useful only to fighters.
--- a/eos/effects/fighterabilitymicrowarpdrive.py
+++ b/eos/effects/fighterabilitymicrowarpdrive.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# fighterAbilityMicroWarpDrive
+#
+# Used by:
+# Items from category: Fighter (48 of 82)
 """
 Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
 effects, and thus this effect file contains some custom information useful only to fighters.
--- a/eos/effects/fighterabilitymissiles.py
+++ b/eos/effects/fighterabilitymissiles.py
@@ -1,4 +1,8 @@
-# Not used by any item
+# fighterAbilityMissiles
+#
+# Used by:
+# Items from category: Fighter (48 of 82)
+# Fighters from group: Light Fighter (32 of 32)
 """
 Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
 effects, and thus this effect file contains some custom information useful only to fighters.
--- a/eos/effects/fighterabilitystasiswebifier.py
+++ b/eos/effects/fighterabilitystasiswebifier.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# fighterAbilityStasisWebifier
+#
+# Used by:
+# Fighters named like: Dromi (4 of 4)
 """
 Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
 effects, and thus this effect file contains some custom information useful only to fighters.
--- a/eos/effects/fighterabilitywarpdisruption.py
+++ b/eos/effects/fighterabilitywarpdisruption.py
@@ -1,4 +1,7 @@
-# Not used by any item
+# fighterAbilityWarpDisruption
+#
+# Used by:
+# Fighters named like: Siren (4 of 4)
 """
 Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
 effects, and thus this effect file contains some custom information useful only to fighters.
--- a/eos/effects/flagshipmultirelayeffect.py
+++ b/eos/effects/flagshipmultirelayeffect.py
@@ -1,11 +0,0 @@
-# Not used by any item
-type = "passive"
-
-
-def handler(fit, module, context):
-    # Note: we increase maxGroupActive by two.
-    # If we only increased it by one, we'd get the number to stay equal
-    # As Comman Processors use one themselves too
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator" and
-                                                 "maxGroupActive" in mod.itemModifiedAttributes,
-                                     "maxGroupActive", 1)
--- a/eos/effects/fueledarmorrepair.py
+++ b/eos/effects/fueledarmorrepair.py
@@ -1,7 +1,7 @@
 # fueledArmorRepair
 #
 # Used by:
-# Modules from group: Ancillary Armor Repairer (4 of 4)
+# Modules from group: Ancillary Armor Repairer (7 of 7)
 runTime = "late"
 type = "active"

--- a/eos/effects/fueledshieldboosting.py
+++ b/eos/effects/fueledshieldboosting.py
@@ -1,7 +1,7 @@
 # fueledShieldBoosting
 #
 # Used by:
-# Modules from group: Ancillary Shield Booster (5 of 5)
+# Modules from group: Ancillary Shield Booster (8 of 8)
 runTime = "late"
 type = "active"

--- a/eos/effects/highspeedmanuveringcapacitorneedmultiplierpostpercentcapacitorneedlocationshipmodulesrequiringhighspeedmanuvering.py
+++ b/eos/effects/highspeedmanuveringcapacitorneedmultiplierpostpercentcapacitorneedlocationshipmodulesrequiringhighspeedmanuvering.py
@@ -9,4 +9,4 @@ type = "passive"
 def handler(fit, container, context):
    level = container.level if "skill" in context else 1
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
-                                  "capacitorNeed", container.getModifiedItemAttr("capacitorNeedMultiplier") * level)
+                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus") * level)
--- a/eos/effects/iceharvestercapacitorneedmultiplier.py
+++ b/eos/effects/iceharvestercapacitorneedmultiplier.py
@@ -1,7 +0,0 @@
-# Not used by any item
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Ice Harvesting"),
-                                     "capacitorNeed", ship.getModifiedItemAttr("iceHarvestCycleBonus"))
--- a/eos/effects/informationwarfaremaxtargetrangebonus.py
+++ b/eos/effects/informationwarfaremaxtargetrangebonus.py
@@ -1,8 +0,0 @@
-# Not used by any item
-type = "gang"
-gangBoost = "maxTargetRange"
-gangBonus = "maxTargetRangeBonus"
-
-
-def handler(fit, container, context):
-    fit.ship.boostItemAttr(gangBoost, container.getModifiedItemAttr(gangBonus))
--- a/Show More
+++ b/Show More