Bump version

It cannot be stacking penalized

.appveyor.yml

@@ -1,5 +1,4 @@
 environment:
-
   global:
     # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
     # /E:ON and /V:ON options are not enabled in the batch script intepreter
@@ -8,76 +7,11 @@ environment:
 
   matrix:
 
-    # Python 2.7.10 is the latest version and is not pre-installed.
-
-    - PYTHON: "C:\\Python27.10"
-      PYTHON_VERSION: "2.7.10"
+    - PYTHON: "C:\\Python36"
+      PYTHON_VERSION: "3.6.x"
       PYTHON_ARCH: "32"
-
-    #- PYTHON: "C:\\Python27.10-x64"
-    #  PYTHON_VERSION: "2.7.10"
-    #  PYTHON_ARCH: "64"
-
-    # Pre-installed Python versions, which Appveyor may upgrade to
-    # a later point release.
-    # See: http://www.appveyor.com/docs/installed-software#python
-
-    #- PYTHON: "C:\\Python27"
-    #  PYTHON_VERSION: "2.7.x" # currently 2.7.9
-    #  PYTHON_ARCH: "32"
-
-    #- PYTHON: "C:\\Python27-x64"
-    #  PYTHON_VERSION: "2.7.x" # currently 2.7.9
-    #  PYTHON_ARCH: "64"
-
-    #- PYTHON: "C:\\Python33"
-    #  PYTHON_VERSION: "3.3.x" # currently 3.3.5
-    #  PYTHON_ARCH: "32"
-
-    #- PYTHON: "C:\\Python33-x64"
-    #  PYTHON_VERSION: "3.3.x" # currently 3.3.5
-    #  PYTHON_ARCH: "64"
-
-    #- PYTHON: "C:\\Python34"
-    #  PYTHON_VERSION: "3.4.x" # currently 3.4.3
-    #  PYTHON_ARCH: "32"
-
-    #- PYTHON: "C:\\Python34-x64"
-    #  PYTHON_VERSION: "3.4.x" # currently 3.4.3
-    #  PYTHON_ARCH: "64"
-
-    # Python versions not pre-installed
-
-    # Python 2.6.6 is the latest Python 2.6 with a Windows installer
-    # See: https://github.com/ogrisel/python-appveyor-demo/issues/10
-
-    #- PYTHON: "C:\\Python266"
-    #  PYTHON_VERSION: "2.6.6"
-    #  PYTHON_ARCH: "32"
-
-    #- PYTHON: "C:\\Python266-x64"
-    #  PYTHON_VERSION: "2.6.6"
-    #  PYTHON_ARCH: "64"
-
-    #- PYTHON: "C:\\Python35"
-    #  PYTHON_VERSION: "3.5.0"
-    #  PYTHON_ARCH: "32"
-
-    #- PYTHON: "C:\\Python35-x64"
-    #  PYTHON_VERSION: "3.5.0"
-    #  PYTHON_ARCH: "64"
-
-    # Major and minor releases (i.e x.0.0 and x.y.0) prior to 3.3.0 use
-    # a different naming scheme.
-
-    #- PYTHON: "C:\\Python270"
-    #  PYTHON_VERSION: "2.7.0"
-    #  PYTHON_ARCH: "32"
-
-    #- PYTHON: "C:\\Python270-x64"
-    #  PYTHON_VERSION: "2.7.0"
-    #  PYTHON_ARCH: "64"
-
+init:
+  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 install:
   # If there is a newer build queued for the same PR, cancel this one.
   # The AppVeyor 'rollout builds' option is supposed to serve the same
@@ -89,34 +23,23 @@ install:
         Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
           throw "There are newer queued builds for this pull request, failing early." }
 
-  # Install wxPython
-  - 'ECHO Downloading wxPython.'
-  - "appveyor DownloadFile https://goo.gl/yvO8PB -FileName C:\\wxpython.exe"
-  #- "appveyor DownloadFile https://goo.gl/Uj0jV3 -FileName C:\\wxpython64.exe"
-
-  - 'ECHO Install wxPython'
-  - "C:\\wxpython.exe /SP- /VERYSILENT /NORESTART"
-  #- "C:\\wxpython64.exe /SP- /VERYSILENT /NORESTART"
-
   - ECHO "Filesystem root:"
   - ps: "ls \"C:/\""
 
+  - ECHO "Filesystem projects root:"
+  - ps: "ls \"C:\\projects\\\""
+
   - ECHO "Filesystem pyfa root:"
-  - ps: "ls \"C:\\projects\\pyfa\\\""
+  - ps: "ls \"C:\\projects\\$env:APPVEYOR_PROJECT_SLUG\""
 
   - ECHO "Installed SDKs:"
   - ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\""
 
-  # Install Python (from the official .msi of http://python.org) and pip when
-  # not already installed.
-  # - ps: if (-not(Test-Path($env:PYTHON))) { & appveyor\install.ps1 }
-
   # Prepend newly installed Python to the PATH of this build (this cannot be
   # done from inside the powershell script as it would require to restart
   # the parent CMD process).
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
 
-  # Check that we have the expected version and architecture for Python
   - "python --version"
   - "python -c \"import struct; print(struct.calcsize('P') * 8)\""
 
@@ -128,19 +51,36 @@ install:
   # compiled extensions and are not provided as pre-built wheel packages,
   # pip will build them from source using the MSVC compiler matching the
   # target Python version and architecture
-  # C:\\projects\\eve-gnosis\\
   - ECHO "Install pip requirements:"
   - "pip install -r requirements.txt"
-  - "pip install -r requirements_test.txt"
-  - "pip install -r requirements_build_windows.txt"
+  - "pip install PyInstaller"
+
+before_build:
+    # directory that will contain the built files
+  - ps: $env:PYFA_DIST_DIR = "c:\projects\$env:APPVEYOR_PROJECT_SLUG\dist"
+  - ps: $env:PYFA_VERSION = (python ./scripts/dump_version.py)
+  - ps: echo("pyfa version ")
+  - ps: echo ($env:PYFA_VERSION)
 
 build_script:
-  # Build the compiled extension
-  # - "python setup.py build"
   - ECHO "Build pyfa:"
-  #- copy C:\projects\pyfa\dist_assets\win\pyfa.spec C:\projects\pyfa\pyfa.spec
-  - "python C:\\projects\\pyfa\\setup.py build"
 
+  ##########
+  # PyInstaller - create binaries for pyfa
+  ##########
+  # Build command for PyInstaller
+  - "python -m PyInstaller --noupx --clean --windowed --noconsole -y pyfa.spec"
+  # Copy over manifest (See pyfa-org/pyfa#1622)
+  - ps: xcopy /y dist_assets\win\pyfa.exe.manifest $env:PYFA_DIST_DIR\pyfa\
+  # Not really sure if this is needed, but why not
+  - ps: xcopy /y dist_assets\win\Microsoft.VC90.CRT.manifest $env:PYFA_DIST_DIR\pyfa\
+
+  ##########
+  # InnoScript EXE building
+  # This is in a separate script because I don't feel like copying over the logic to AppVeyor script right now...
+  ##########
+  - "python dist_assets/win/dist.py"
+  - ps: dir $env:PYFA_DIST_DIR/
   #- ECHO "Build pyfa (Debug):"
   #- copy C:\projects\pyfa\dist_assets\win\pyfa_debug.spec C:\projects\pyfa\pyfa_debug.spec
   #- "pyinstaller.exe --clean --noconfirm --windowed --upx-dir=C:\\projects\\pyfa\\scripts\\upx.exe C:\\projects\\pyfa\\pyfa_debug.spec"
@@ -150,12 +90,11 @@ build: on
 after_build:
   - ps: "ls \"./\""
   #- ps: "ls \"C:\\projects\\pyfa\\build\\pyfa\\\""
-  - ps: "ls \"C:\\projects\\pyfa\\build\\\""
-  - ps: "ls \"C:\\projects\\pyfa\\build\\exe.win32-2.7\\\""
+#  - ps: "ls \"C:\\projects\\$env:APPVEYOR_PROJECT_SLUG\\build\\exe.win32-2.7\\\""
   # Zip
   # APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER
   #- 7z a build.zip -r C:\projects\pyfa\build\pyfa\*.*
-  - 7z a pyfa.zip -r C:\projects\pyfa\build\exe.win32-2.7\*.*
+  - ps: 7z a "pyfa-$env:PYFA_VERSION-win.zip" -r "$env:PYFA_DIST_DIR\pyfa\*.*"
   #- 7z a pyfa_debug.zip -r C:\projects\pyfa\dist\pyfa_debug\*.*
 
 on_success:
@@ -176,11 +115,21 @@ after_test:
 
 artifacts:
   # Archive the generated packages in the ci.appveyor.com build report.
-  - path: pyfa.zip
-    name: 'pyfa.zip'
+  - path: pyfa*-win.zip
+  - path: pyfa*-win.exe
   #- path: pyfa_debug.zip
   #  name: Pyfa_debug
 
+deploy:
+  tag: $(pyfa_version)
+  release: pyfa $(pyfa_version)
+  description: 'Release description'
+  provider: GitHub
+  auth_token:
+    secure: BfNHO66ff5hVx2O2ORbl49X0U/5h2V2T0IuRZDwm7fd1HvsVluF0wRCbl29oRp1M
+  draft: true
+  on:
+    APPVEYOR_REPO_TAG: true        # deploy on tag push only
 #on_success:
 #  - TODO: upload the content of dist/*.whl to a public wheelhouse
-#
+#

.gitignore

@@ -122,3 +122,4 @@ gitversion
 /.version
 *.swp
 
+*.fsdbinary

.travis.yml

@@ -1,39 +1,29 @@
+os: linux
 language: python
-cache: pip
 python:
-  - '2.7'
-env:
-  - TOXENV=pep8
-addons:
-  apt:
-    packages:
+  - 3.6
+matrix:
+  include:
+  - os: osx
+    osx_image: xcode7.3
+    language: generic
+    env: PYTHON=3.6.1
 before_install:
-  - sudo apt-get update && sudo apt-get --reinstall install -qq language-pack-en language-pack-ru language-pack-he language-pack-zh-hans
-  - 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
+  - bash scripts/setup-osx.sh
 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
-script:
-  - py.test --cov=./
-after_success:
-  - bash <(curl -s https://codecov.io/bash)
+  - export PYFA_VERSION="$(python3 scripts/dump_version.py)"
+  - bash scripts/package-osx.sh
 before_deploy:
-  - pip install -r requirements_build_linux.txt
+  - export RELEASE_PKG_FILE=$(ls *.deb)
+  - echo "deploying $RELEASE_PKG_FILE to GitHub releases"
+deploy:
+  provider: releases
+  api_key:
+    secure: Xfu0xApoB0zUPLXl29aYUulVC3iA4/3bXQwwADKCfAKZwxgNon4dLbO7Rie5/7Ukf2POL0KwmRaQGN3kOr+XSoIVTE4M5sXxnhiaaLGKQ+48hDizLE6JuXcZGJvkxUaghaTzIdCwHsG7VGBsPfQgfGsjJcfBp8tFNLmRyM/Jpsr8T6BR2MxtBIEUVy8zrOWFNZqnmWrY2pWMsB9fYt3JFNdpqeIgRAYqbBsBcZQ1MngLTi3ztuYS5IaF+lk06RrnBlHmUsJu/5nCvIpvPvD0i2BLZ3Uu0+Fn+8QWUgjJEL9MNseXZMXynu05xd8YRk7Ajc9CUrzQIIbAktyteYp85kE3pUJHmrMLcXhh7nqkwttR5/47Zwa3OLJLJFKBxMx6wY5jFkJjkV08850B7aWrmTFl/Eqc3Q5nZMuiEt3wFRbjxHi9h1mTN/fkxfRRHg8u3ENGPR+ZPiFC3J18qtks/B/hsKjjHvZP1i79OYlET4V/zyLyyQkCbpDaARQANuotLYJyZ7tH+KWEyRsvTi0M9Yev9mNNw6aI4vzh4HfkEhvcvnWnYwckPj1dnjQ573Qpw0Z9wsconoWfHAn+hBDt3+YLMrrFZl++mCRskHH1mZChX3aGMDi49zD0kfxBUkYPOAhguc6PwudBxHUZP+O6T/SoHylff6EizCE/k5dGeAk=
+  file_glob: true
+  file: "dist/pyfa-*.zip"
+  skip_cleanup: true
+  draft: true
+  on:
+    tags: true
+    repo: pyfa-org/Pyfa

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
 ```
@@ -28,7 +24,7 @@ $ brew install Caskroom/cask/pyfa
 ### Linux Distro-specific Packages
 The following is a list of pyfa packages available for certain distributions. Please note that these packages are maintained by third-parties and are not evaluated by the pyfa developers.
 
-* Debian/Ubuntu/derivitives: https://github.com/AdamMajer/Pyfa/releases
+* Debian/Ubuntu/derivatives: https://github.com/AdamMajer/Pyfa/releases
 * Arch: https://aur.archlinux.org/packages/pyfa/
 * openSUSE: https://build.opensuse.org/package/show/home:rmk2/pyfa
 * FreeBSD: http://www.freshports.org/games/pyfa/ (see [#484](https://github.com/pyfa-org/Pyfa/issues/484) for instructions)
@@ -57,6 +53,10 @@ pyfa is licensed under the GNU GPL v3.0, see LICENSE
     * [TweetFleet Slack](https://www.fuzzwork.co.uk/tweetfleet-slack-invites/): @blitzmann
     * [Gitter chat](https://gitter.im/pyfa-org/Pyfa): @ blitzmann
     * Email: sable.blitzmann@gmail.com
+* Kadesh / DarkPhoenix
+    * GitHub: @DarkFenX
+    * EVE: Kadesh Priestess
+    * Email: phoenix@mail.ru
 
 ## CCP Copyright Notice
 EVE Online, the EVE logo, EVE and all associated logos and designs are the intellectual property of CCP hf. All artwork, screenshots, characters, vehicles, storylines, world facts or other recognizable features of the intellectual property relating to these trademarks are likewise the intellectual property of CCP hf. EVE Online and the EVE logo are the registered trademarks of CCP hf. All rights are reserved worldwide. All other trademarks are the property of their respective owners. CCP hf. has granted permission to pyfa to use EVE Online and all associated logos and designs for promotional and information purposes on its website but does not endorse, and is not in any way affiliated with, pyfa. CCP is in no way responsible for the content on or functioning of this program, nor can it be liable for any damage arising from the use of this program.

_development/helpers.py

@@ -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,
@@ -129,7 +129,8 @@ def Saveddata():
     from eos.saveddata.ship import Ship
     from eos.saveddata.fit import Fit
     from eos.saveddata.character import Character
-    from eos.saveddata.module import Module, State
+    from eos.saveddata.module import Module
+    from eos.const import FittingModuleState
     from eos.saveddata.citadel import Citadel
     from eos.saveddata.booster import Booster
 
@@ -139,7 +140,7 @@ def Saveddata():
         'Fit'      : Fit,
         'Character': Character,
         'Module'   : Module,
-        'State'    : State,
+        'State'    : FittingModuleState,
         'Booster'  : Booster,
     }
     return helper

_development/helpers_fits.py

@@ -1,7 +1,6 @@
 import pytest
 
 # noinspection PyPackageRequirements
-from _development.helpers import DBInMemory as DB, Gamedata, Saveddata
 
 
 # noinspection PyShadowingNames

_development/helpers_items.py

@@ -1,7 +1,6 @@
 import pytest
 
 # noinspection PyPackageRequirements
-from _development.helpers import DBInMemory as DB, Gamedata, Saveddata
 
 
 # noinspection PyShadowingNames

config.py

@@ -1,8 +1,14 @@
 import os
 import sys
+import yaml
+import wx
 
 from logbook import CRITICAL, DEBUG, ERROR, FingersCrossedHandler, INFO, Logger, NestedSetup, NullHandler, \
     StreamHandler, TimedRotatingFileHandler, WARNING
+import hashlib
+from eos.const import FittingSlot
+
+from cryptography.fernet import Fernet
 
 pyfalog = Logger(__name__)
 
@@ -19,14 +25,10 @@ debug = False
 # Defines if our saveddata will be in pyfa root or not
 saveInRoot = False
 
-# Version data
-
-version = "2.0.0b5"
-tag = "git"
-expansionName = "YC120.3"
-expansionVersion = "1.8"
 evemonMinVersion = "4081"
 
+minItemSearchLength = 3
+
 pyfaPath = None
 savePath = None
 saveDB = None
@@ -34,6 +36,10 @@ gameDB = None
 logPath = None
 loggingLevel = None
 logging_setup = None
+cipher = None
+clientHash = None
+
+ESI_CACHE = 'esi_cache'
 
 LOGLEVEL_MAP = {
     "critical": CRITICAL,
@@ -43,6 +49,17 @@ LOGLEVEL_MAP = {
     "debug": DEBUG,
 }
 
+slotColourMap = {
+    FittingSlot.LOW: wx.Colour(250, 235, 204),  # yellow = low slots
+    FittingSlot.MED: wx.Colour(188, 215, 241),  # blue   = mid slots
+    FittingSlot.HIGH: wx.Colour(235, 204, 209),  # red    = high slots
+    FittingSlot.RIG: '',
+    FittingSlot.SUBSYSTEM: ''
+}
+
+def getClientSecret():
+    return clientHash
+
 
 def isFrozen():
     if hasattr(sys, 'frozen'):
@@ -66,12 +83,7 @@ def getPyfaRoot():
 
 
 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)"
+    return version
 
 
 def getDefaultSave():
@@ -86,6 +98,9 @@ def defPaths(customSavePath=None):
     global gameDB
     global saveInRoot
     global logPath
+    global cipher
+    global clientHash
+    global version
 
     pyfalog.debug("Configuring Pyfa")
 
@@ -95,6 +110,12 @@ def defPaths(customSavePath=None):
     if pyfaPath is None:
         pyfaPath = getPyfaRoot()
 
+    # Version data
+
+    with open(os.path.join(pyfaPath, "version.yml"), 'r') as file:
+        data = yaml.load(file, Loader=yaml.SafeLoader)
+        version = data['version']
+
     # Where we store the saved fits etc, default is the current users home directory
     if saveInRoot is True:
         savePath = getattr(configforced, "savePath", None)
@@ -110,12 +131,22 @@ def defPaths(customSavePath=None):
 
     __createDirs(savePath)
 
+    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-py3-dev.db")
+    saveDB = os.path.join(savePath, "saveddata.db")
 
     # The database where the static EVE data from the datadump is kept.
     # This is not the standard sqlite datadump but a modified version created by eos
@@ -140,9 +171,6 @@ def defPaths(customSavePath=None):
     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
@@ -204,20 +232,6 @@ def defLogging():
             )
         ])
 
-    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):

dist_assets/mac/pyfa.spec

@@ -19,18 +19,24 @@ added_files = [
              ('../../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', '.'),
+             ('../../version.yml', '.'),
              ]
 
 
-import_these = []
+import_these = [
+    'numpy.core._dtype_ctypes',  # https://github.com/pyinstaller/pyinstaller/issues/3982
+    'sqlalchemy.ext.baked'  # windows build doesn't launch without if when using sqlalchemy 1.3.x
+]
+
+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')
+paths = ('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("_"):
@@ -51,8 +57,10 @@ a = Analysis([r'../../pyfa.py'],
              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,
@@ -64,10 +72,19 @@ exe = EXE(pyz,
           upx=True,
           runtime_tmpdir=None,
           console=False ,
-          icon='dist_assets/mac/pyfa.icns',
+          icon=icon,
           )
 
-app = BUNDLE(exe,
-             name='pyfa.app',
-             icon=None,
-             bundle_identifier=None)
+app = BUNDLE(
+    exe,
+    name='pyfa.app',
+    icon=icon,
+    bundle_identifier=None,
+    info_plist={
+        'NSHighResolutionCapable': 'True',
+        'NSPrincipalClass': 'NSApplication',
+        'CFBundleName': 'pyfa',
+        'CFBundleDisplayName': 'pyfa',
+        'CFBundleIdentifier': 'org.pyfaorg.pyfa',
+    }
+)

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>

dist_assets/win/dist.py

@@ -0,0 +1,37 @@
+# helper script to zip up pyinstaller distribution and create installer file
+
+import os.path
+from subprocess import call
+import zipfile
+from packaging.version import Version
+import yaml
+
+
+with open("version.yml", 'r') as file:
+    data = yaml.load(file, Loader=yaml.SafeLoader)
+    version = data['version']
+
+os.environ["PYFA_DIST_DIR"] = os.path.join(os.getcwd(), 'dist')
+
+os.environ["PYFA_VERSION"] = version
+iscc = "C:\Program Files (x86)\Inno Setup 5\ISCC.exe" # inno script location via wine
+
+source = os.path.join(os.environ["PYFA_DIST_DIR"], "pyfa")
+
+fileName = "pyfa-{}-win".format(os.environ["PYFA_VERSION"])
+
+print("Compiling EXE")
+
+v = Version(version)
+
+print(v)
+
+call([
+    iscc,
+    os.path.join(os.getcwd(), "dist_assets", "win", "pyfa-setup.iss"),
+    "/dMyAppVersion=%s" % v,
+    "/dMyAppDir=%s" % source,
+    "/dMyOutputDir=%s" % os.path.join(os.getcwd()),
+    "/dMyOutputFile=%s" % fileName])  # stdout=devnull, stderr=devnull
+
+print("Done")

dist_assets/win/pyfa-setup.iss

@@ -5,24 +5,22 @@
 ; we do some #ifdef conditionals because automated compilation passes these as arguments
 
 #ifndef MyAppVersion
-    #define MyAppVersion "1.15.0"
-#endif
-#ifndef MyAppExpansion
-    #define MyAppExpansion "Vanguard 1.0"
+    #define MyAppVersion "2.1.0"
 #endif
 
 ; Other config
 
 #define MyAppName "pyfa"
 #define MyAppPublisher "pyfa"
-#define MyAppURL "https://forums.eveonline.com/t/27156"
+#define MyAppURL "https://github.com/pyfa-org/Pyfa/"
 #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', " ", "-"))
+    #define MyOutputFile LowerCase(StringChange(MyAppName+'-'+MyAppVersion+'-win', " ", "-"))
 #endif
 #ifndef MyAppDir
     #define MyAppDir "pyfa"
@@ -38,7 +36,7 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{3DA39096-C08D-49CD-90E0-1D177F32C8AA}
 AppName={#MyAppName}
-AppVersion={#MyAppVersion} ({#MyAppExpansion})
+AppVersion={#MyAppVersion}
 AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
@@ -50,10 +48,8 @@ LicenseFile={#MyAppDir}\LICENSE
 OutputDir={#MyOutputDir}
 OutputBaseFilename={#MyOutputFile}
 SetupIconFile={#MyAppDir}\pyfa.ico
-Compression=lzma
 SolidCompression=yes
 CloseApplications=yes
-AppReadmeFile=https://github.com/pyfa-org/Pyfa/blob/v{#MyAppVersion}/readme.txt
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -63,7 +59,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 +99,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 +150,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

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>

dist_assets/win/pyfa.spec

@@ -5,8 +5,7 @@ from itertools import chain
 import subprocess
 import requests.certs
 
-label = subprocess.check_output([
-    "git", "describe", "--tags"]).strip()
+label = subprocess.check_output(["git", "describe", "--tags"]).strip()
 
 with open('.version', 'w+') as f:
     f.write(label.decode())
@@ -18,18 +17,24 @@ added_files = [
              ('../../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', '.'),
+             ('../../version.yml', '.'),
              ]
 
-import_these = []
+import_these = [
+    'numpy.core._dtype_ctypes',  # https://github.com/pyinstaller/pyinstaller/issues/3982
+    'sqlalchemy.ext.baked'  # windows build doesn't launch without if when using sqlalchemy 1.3.x
+]
 
 # Walk directories that do dynamic importing
-paths = ('eos/effects', 'eos/db/migrations', 'service/conversions')
+paths = ('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("_"):
@@ -78,4 +83,5 @@ coll = COLLECT(
                upx=True,
                name='pyfa',
                icon='dist_assets/win/pyfa.ico',
-               )
+               )
+

eos/config.py

@@ -11,6 +11,7 @@ debug = False
 gamedataCache = True
 saveddataCache = True
 gamedata_version = ""
+gamedata_date = ""
 gamedata_connectionstring = 'sqlite:///' + realpath(join(dirname(abspath(__file__)), "..", "eve.db"))
 pyfalog.debug("Gamedata connection string: {0}", gamedata_connectionstring)
 
@@ -18,13 +19,14 @@ 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:///' + realpath(join(dirname(abspath(__file__)), "..", "saveddata", "saveddata-py3-db.db"))
+    saveddata_connectionstring = 'sqlite:///' + realpath(join(dirname(abspath(__file__)), "..", "saveddata", "saveddata.db"))
 
 pyfalog.debug("Saveddata connection string: {0}", saveddata_connectionstring)
 
 settings = {
     "useStaticAdaptiveArmorHardener": False,
     "strictSkillLevels": True,
+    "globalDefaultSpoolupPercentage": 1.0
 }
 
 # Autodetect path, only change if the autodetection bugs out.

eos/const.py

@@ -0,0 +1,103 @@
+# =============================================================================
+# Copyright (C) 2019 Ryan Holmes
+#
+# This file is part of pyfa.
+#
+# pyfa is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# pyfa 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
+# =============================================================================
+
+from enum import IntEnum,unique
+
+
+@unique
+class FittingSlot(IntEnum):
+    """
+    Contains slots for ship fittings
+    """
+    # These are self-explanatory
+    LOW = 1
+    MED = 2
+    HIGH = 3
+    RIG = 4
+    SUBSYSTEM = 5
+    # not a real slot, need for pyfa display rack separation
+    MODE = 6
+    # system effects. They are projected "modules" and pyfa assumes all modules
+    # have a slot. In this case, make one up.
+    SYSTEM = 7
+    # used for citadel services
+    SERVICE = 8
+    # fighter 'slots'. Just easier to put them here...
+    F_LIGHT = 10
+    F_SUPPORT = 11
+    F_HEAVY = 12
+    # fighter 'slots' (for structures)
+    FS_LIGHT = 13
+    FS_SUPPORT = 14
+    FS_HEAVY = 15
+
+
+@unique
+class ImplantLocation(IntEnum):
+    """
+    Contains location of the implant
+    """
+    FIT = 0
+    CHARACTER = 1
+
+
+@unique
+class CalcType(IntEnum):
+    """
+    Contains location of the calculation
+    """
+    LOCAL = 0
+    PROJECTED = 1
+    COMMAND = 2
+
+
+@unique
+class FittingModuleState(IntEnum):
+    """
+    Contains the state of a fitting module
+    """
+    OFFLINE = -1
+    ONLINE = 0
+    ACTIVE = 1
+    OVERHEATED = 2
+
+
+@unique
+class FittingHardpoint(IntEnum):
+    """
+    Contains the types of a fitting hardpoint
+    """
+    NONE = 0
+    MISSILE = 1
+    TURRET = 2
+
+
+@unique
+class SpoolType(IntEnum):
+    SCALE = 0  # [0..1]
+    TIME = 1  # Expressed via time in seconds since spool up started
+    CYCLES = 2  # Expressed in amount of cycles since spool up started
+
+
+@unique
+class FitSystemSecurity(IntEnum):
+    HISEC = 0
+    LOWSEC = 1
+    NULLSEC = 2
+    WSPACE = 3

eos/db/__init__.py

@@ -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:
@@ -74,10 +78,10 @@ sd_lock = threading.RLock()
 
 # Import all the definitions for all our database stuff
 # noinspection PyPep8
-from eos.db.gamedata import alphaClones, attribute, category, effect, group, icon, item, marketGroup, metaData, metaGroup, queries, traits, unit
+from eos.db.gamedata import alphaClones, attribute, category, effect, group, item, marketGroup, metaData, metaGroup, queries, traits, unit, dynamicAttributes
 # noinspection PyPep8
-from eos.db.saveddata import booster, cargo, character, crest, damagePattern, databaseRepair, drone, fighter, fit, implant, implantSet, loadDefaultDatabaseValues, \
-    miscData, module, override, price, queries, skill, targetResists, user
+from eos.db.saveddata import booster, cargo, character, damagePattern, databaseRepair, drone, fighter, fit, implant, implantSet, loadDefaultDatabaseValues, \
+    miscData, mutator, module, override, price, queries, skill, targetResists, user
 
 # Import queries
 # noinspection PyPep8

eos/db/gamedata/__init__.py

@@ -1,2 +1,2 @@
-__all__ = ["attribute", "category", "effect", "group", "metaData",
-           "icon", "item", "marketGroup", "metaGroup", "unit", "alphaClones"]
+__all__ = ["attribute", "category", "effect", "group", "metaData", "dynamicAttributes",
+           "item", "marketGroup", "metaGroup", "unit", "alphaClones"]

eos/db/gamedata/attribute.py

@@ -22,7 +22,7 @@ from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.orm import relation, mapper, synonym, deferred
 
 from eos.db import gamedata_meta
-from eos.gamedata import Attribute, AttributeInfo, Unit, Icon
+from eos.gamedata import Attribute, AttributeInfo, Unit
 
 typeattributes_table = Table("dgmtypeattribs", gamedata_meta,
                              Column("value", Float),
@@ -38,7 +38,9 @@ attributes_table = Table("dgmattribs", gamedata_meta,
                          Column("published", Boolean),
                          Column("displayName", String),
                          Column("highIsGood", Boolean),
-                         Column("iconID", Integer, ForeignKey("icons.iconID")),
+                         Column("iconID", Integer),
+                         Column("attributeCategory", Integer),
+                         Column("tooltipDescription", Integer),
                          Column("unitID", Integer, ForeignKey("dgmunits.unitID")))
 
 mapper(Attribute, typeattributes_table,
@@ -46,7 +48,6 @@ mapper(Attribute, typeattributes_table,
 
 mapper(AttributeInfo, attributes_table,
        properties={
-           "icon"       : relation(Icon),
            "unit"       : relation(Unit),
            "ID"         : synonym("attributeID"),
            "name"       : synonym("attributeName"),

eos/db/gamedata/category.py

@@ -17,22 +17,21 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 # ===============================================================================
 
-from sqlalchemy import Column, String, Integer, ForeignKey, Boolean, Table
-from sqlalchemy.orm import relation, mapper, synonym, deferred
+from sqlalchemy import Boolean, Column, Integer, String, Table
+from sqlalchemy.orm import deferred, mapper, synonym
 
 from eos.db import gamedata_meta
-from eos.gamedata import Category, Icon
+from eos.gamedata import Category
 
 categories_table = Table("invcategories", gamedata_meta,
                          Column("categoryID", Integer, primary_key=True),
                          Column("categoryName", String),
                          Column("description", String),
                          Column("published", Boolean),
-                         Column("iconID", Integer, ForeignKey("icons.iconID")))
+                         Column("iconID", Integer))
 
 mapper(Category, categories_table,
        properties={
-           "icon"       : relation(Icon),
            "ID"         : synonym("categoryID"),
            "name"       : synonym("categoryName"),
            "description": deferred(categories_table.c.description)

eos/db/gamedata/dynamicAttributes.py

@@ -0,0 +1,65 @@
+# ===============================================================================
+# 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 Column, Float, Integer, Table, ForeignKey
+from sqlalchemy.orm import mapper, relation, synonym
+from sqlalchemy.ext.associationproxy import association_proxy
+
+from eos.db import gamedata_meta
+from eos.gamedata import DynamicItem, DynamicItemAttribute, DynamicItemItem, Item
+
+from eos.gamedata import AttributeInfo
+
+dynamic_table = Table("mutaplasmids", gamedata_meta,
+                          Column("typeID", ForeignKey("invtypes.typeID"), primary_key=True, index=True),
+                          Column("resultingTypeID", ForeignKey("invtypes.typeID"), primary_key=True))
+
+dynamicAttributes_table = Table("mutaplasmidAttributes", gamedata_meta,
+                      Column("typeID", Integer, ForeignKey("mutaplasmids.typeID"), primary_key=True),
+                      Column("attributeID", ForeignKey("dgmattribs.attributeID"), primary_key=True),
+                      Column("min", Float),
+                      Column("max", Float))
+
+dynamicApplicable_table = Table("mutaplasmidItems", gamedata_meta,
+                      Column("typeID", ForeignKey("mutaplasmids.typeID"), primary_key=True),
+                      Column("applicableTypeID", ForeignKey("invtypes.typeID"), primary_key=True),)
+
+mapper(DynamicItem, dynamic_table, properties={
+           "attributes": relation(DynamicItemAttribute),
+           "item": relation(Item, foreign_keys=[dynamic_table.c.typeID]),
+           "resultingItem": relation(Item, foreign_keys=[dynamic_table.c.resultingTypeID]),
+           "ID": synonym("typeID"),
+})
+
+mapper(DynamicItemAttribute, dynamicAttributes_table,
+       properties={"info": relation(AttributeInfo, lazy=False)})
+
+mapper(DynamicItemItem, dynamicApplicable_table, properties={
+           "mutaplasmid": relation(DynamicItem),
+       })
+
+DynamicItemAttribute.ID = association_proxy("info", "attributeID")
+DynamicItemAttribute.name = association_proxy("info", "attributeName")
+DynamicItemAttribute.description = association_proxy("info", "description")
+DynamicItemAttribute.published = association_proxy("info", "published")
+DynamicItemAttribute.displayName = association_proxy("info", "displayName")
+DynamicItemAttribute.highIsGood = association_proxy("info", "highIsGood")
+DynamicItemAttribute.iconID = association_proxy("info", "iconID")
+DynamicItemAttribute.icon = association_proxy("info", "icon")
+DynamicItemAttribute.unit = association_proxy("info", "unit")

eos/db/gamedata/group.py

@@ -18,10 +18,10 @@
 # ===============================================================================
 
 from sqlalchemy import Column, String, Integer, Boolean, ForeignKey, Table
-from sqlalchemy.orm import relation, mapper, synonym, deferred
+from sqlalchemy.orm import relation, mapper, synonym, deferred, backref
 
 from eos.db import gamedata_meta
-from eos.gamedata import Category, Group, Icon
+from eos.gamedata import Category, Group
 
 groups_table = Table("invgroups", gamedata_meta,
                      Column("groupID", Integer, primary_key=True),
@@ -29,12 +29,11 @@ groups_table = Table("invgroups", gamedata_meta,
                      Column("description", String),
                      Column("published", Boolean),
                      Column("categoryID", Integer, ForeignKey("invcategories.categoryID")),
-                     Column("iconID", Integer, ForeignKey("icons.iconID")))
+                     Column("iconID", Integer))
 
 mapper(Group, groups_table,
        properties={
-           "category"   : relation(Category, backref="groups"),
-           "icon"       : relation(Icon),
+           "category"   : relation(Category, backref=backref("groups", cascade="all,delete")),
            "ID"         : synonym("groupID"),
            "name"       : synonym("groupName"),
            "description": deferred(groups_table.c.description)

eos/db/gamedata/icon.py

@@ -1,35 +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 Column, String, Integer, Table
-from sqlalchemy.orm import mapper, synonym, deferred
-
-from eos.db import gamedata_meta
-from eos.gamedata import Icon
-
-icons_table = Table("icons", gamedata_meta,
-                    Column("iconID", Integer, primary_key=True),
-                    Column("description", String),
-                    Column("iconFile", String))
-
-mapper(Icon, icons_table,
-       properties={
-           "ID"         : synonym("iconID"),
-           "description": deferred(icons_table.c.description)
-       })

eos/db/gamedata/item.py

@@ -17,14 +17,15 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 # ===============================================================================
 
-from sqlalchemy import Column, String, Integer, Boolean, ForeignKey, Table, Float
+from sqlalchemy import Boolean, Column, Float, ForeignKey, Integer, String, Table
 from sqlalchemy.ext.associationproxy import association_proxy
-from sqlalchemy.orm import relation, mapper, synonym, deferred
+from sqlalchemy.orm import backref, deferred, mapper, relation, synonym
 from sqlalchemy.orm.collections import attribute_mapped_collection
-from eos.db.gamedata.effect import typeeffects_table
 
 from eos.db import gamedata_meta
-from eos.gamedata import Attribute, Effect, Group, Icon, Item, MetaType, Traits
+from eos.db.gamedata.dynamicAttributes import dynamicApplicable_table
+from eos.db.gamedata.effect import typeeffects_table
+from eos.gamedata import Attribute, DynamicItem, Effect, Group, Item, MetaType, Traits
 
 items_table = Table("invtypes", gamedata_meta,
                     Column("typeID", Integer, primary_key=True),
@@ -37,16 +38,17 @@ items_table = Table("invtypes", gamedata_meta,
                     Column("capacity", Float),
                     Column("published", Boolean),
                     Column("marketGroupID", Integer, ForeignKey("invmarketgroups.marketGroupID")),
-                    Column("iconID", Integer, ForeignKey("icons.iconID")),
-                    Column("groupID", Integer, ForeignKey("invgroups.groupID"), index=True))
+                    Column("iconID", Integer),
+                    Column("graphicID", Integer),
+                    Column("groupID", Integer, ForeignKey("invgroups.groupID"), index=True),
+                    Column("replacements", String))
 
 from .metaGroup import metatypes_table  # noqa
 from .traits import traits_table  # noqa
 
 mapper(Item, items_table,
        properties={
-           "group"            : relation(Group, backref="items"),
-           "icon"             : relation(Icon),
+           "group"            : relation(Group, backref=backref("items", cascade="all,delete")),
            "_Item__attributes": relation(Attribute, cascade='all, delete, delete-orphan', collection_class=attribute_mapped_collection('name')),
            "effects": relation(Effect, secondary=typeeffects_table, collection_class=attribute_mapped_collection('name')),
            "metaGroup"        : relation(MetaType,
@@ -57,7 +59,12 @@ mapper(Item, items_table,
            "description"      : deferred(items_table.c.description),
            "traits"           : relation(Traits,
                                          primaryjoin=traits_table.c.typeID == items_table.c.typeID,
-                                         uselist=False)
+                                         uselist=False),
+           "mutaplasmids": relation(DynamicItem,
+                   primaryjoin=dynamicApplicable_table.c.applicableTypeID == items_table.c.typeID,
+                   secondaryjoin=dynamicApplicable_table.c.typeID == DynamicItem.typeID,
+                   secondary=dynamicApplicable_table,
+                   backref="applicableItems")
        })
 
 Item.category = association_proxy("group", "category")

eos/db/gamedata/marketGroup.py

@@ -21,7 +21,7 @@ from sqlalchemy import Column, String, Integer, Boolean, ForeignKey, Table
 from sqlalchemy.orm import relation, mapper, synonym, deferred
 
 from eos.db import gamedata_meta
-from eos.gamedata import Icon, Item, MarketGroup
+from eos.gamedata import Item, MarketGroup
 
 marketgroups_table = Table("invmarketgroups", gamedata_meta,
                            Column("marketGroupID", Integer, primary_key=True),
@@ -30,14 +30,13 @@ marketgroups_table = Table("invmarketgroups", gamedata_meta,
                            Column("hasTypes", Boolean),
                            Column("parentGroupID", Integer,
                                   ForeignKey("invmarketgroups.marketGroupID", initially="DEFERRED", deferrable=True)),
-                           Column("iconID", Integer, ForeignKey("icons.iconID")))
+                           Column("iconID", Integer))
 
 mapper(MarketGroup, marketgroups_table,
        properties={
            "items"      : relation(Item, backref="marketGroup"),
            "parent"     : relation(MarketGroup, backref="children",
                                    remote_side=[marketgroups_table.c.marketGroupID]),
-           "icon"       : relation(Icon),
            "ID"         : synonym("marketGroupID"),
            "name"       : synonym("marketGroupName"),
            "description": deferred(marketgroups_table.c.description)

eos/db/gamedata/queries.py

@@ -17,15 +17,16 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 # ===============================================================================
 
-from sqlalchemy.orm import join, exc, aliased
+from sqlalchemy.inspection import inspect
+from sqlalchemy.orm import aliased, exc, join
 from sqlalchemy.sql import and_, or_, select
 
 import eos.config
 from eos.db import gamedata_session
-from eos.db.gamedata.metaGroup import metatypes_table, items_table
 from eos.db.gamedata.group import groups_table
+from eos.db.gamedata.metaGroup import items_table, metatypes_table
 from eos.db.util import processEager, processWhere
-from eos.gamedata import AlphaClone, Attribute, Category, Group, Item, MarketGroup, MetaGroup, AttributeInfo, MetaData
+from eos.gamedata import AlphaClone, Attribute, AttributeInfo, Category, DynamicItem, Group, Item, MarketGroup, MetaData, MetaGroup
 
 cache = {}
 configVal = getattr(eos.config, "gamedataCache", None)
@@ -97,6 +98,36 @@ def getItem(lookfor, eager=None):
     return item
 
 
+def getMutaplasmid(lookfor, eager=None):
+    if isinstance(lookfor, int):
+        item = gamedata_session.query(DynamicItem).filter(DynamicItem.ID == lookfor).first()
+    else:
+        raise TypeError("Need integer as argument")
+    return item
+
+
+def getItemWithBaseItemAttribute(lookfor, baseItemID, eager=None):
+    # A lot of this is described in more detail in #1597
+    item = gamedata_session.query(Item).get(lookfor)
+    base = getItem(baseItemID)
+
+    # we have to load all attributes for this object, otherwise we'll lose access to them when we expunge.
+    # todo: figure out a way to eagerly load all these via the query...
+    for x in [*inspect(Item).relationships.keys(), 'description']:
+        getattr(item, x)
+
+    # Copy over the attributes from the base, but ise the items attributes when there's an overlap
+    # WARNING: the attribute object still has the old typeID. I don't believe we access this typeID anywhere in the code,
+    # but should keep this in mind for now.
+    item._Item__attributes = {**base.attributes, **item.attributes}
+
+    # Expunge the item form the session. This is required to have different Abyssal / Base combinations loaded in memory.
+    # Without expunging it, once one Abyssal Web is created, SQLAlchmey will use it for all others. We don't want this,
+    # we want to generate a completely new object to work with
+    gamedata_session.expunge(item)
+    return item
+
+
 @cachedQuery(1, "lookfor")
 def getItems(lookfor, eager=None):
     """
@@ -241,6 +272,15 @@ def getMarketGroup(lookfor, eager=None):
     return marketGroup
 
 
+def getMarketTreeNodeIds(rootNodeIds):
+    allIds = set()
+    addedIds = set(rootNodeIds)
+    while addedIds:
+        allIds.update(addedIds)
+        addedIds = {mg.ID for mg in gamedata_session.query(MarketGroup).filter(MarketGroup.parentGroupID.in_(addedIds))}
+    return allIds
+
+
 @cachedQuery(2, "where", "filter")
 def getItemsByCategory(filter, where=None, eager=None):
     if isinstance(filter, int):
@@ -361,6 +401,25 @@ def directAttributeRequest(itemIDs, attrIDs):
     return result
 
 
+def getAbyssalTypes():
+    return set([r.resultingTypeID for r in gamedata_session.query(DynamicItem.resultingTypeID).distinct()])
+
+
+@cachedQuery(1, "itemID")
+def getDynamicItem(itemID, eager=None):
+    try:
+        if isinstance(itemID, int):
+            if eager is None:
+                result = gamedata_session.query(DynamicItem).filter(DynamicItem.ID == itemID).one()
+            else:
+                result = gamedata_session.query(DynamicItem).options(*processEager(eager)).filter(DynamicItem.ID == itemID).one()
+        else:
+            raise TypeError("Need integer as argument")
+    except exc.NoResultFound:
+        result = None
+    return result
+
+
 def getRequiredFor(itemID, attrMapping):
     Attribute1 = aliased(Attribute)
     Attribute2 = aliased(Attribute)

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,

eos/db/migrations/upgrade28.py

@@ -0,0 +1,18 @@
+"""
+Migration 28
+
+- adds baseItemID and mutaplasmidID to modules table
+"""
+import sqlalchemy
+
+
+def upgrade(saveddata_engine):
+    try:
+        saveddata_engine.execute("SELECT baseItemID FROM modules LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE modules ADD COLUMN baseItemID INT;")
+
+    try:
+        saveddata_engine.execute("SELECT mutaplasmidID FROM modules LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE modules ADD COLUMN mutaplasmidID INT;")

eos/db/migrations/upgrade29.py

@@ -0,0 +1,18 @@
+"""
+Migration 29
+
+- adds spoolType and spoolAmount to modules table
+"""
+import sqlalchemy
+
+
+def upgrade(saveddata_engine):
+    try:
+        saveddata_engine.execute("SELECT spoolType FROM modules LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE modules ADD COLUMN spoolType INT;")
+
+    try:
+        saveddata_engine.execute("SELECT spoolAmount FROM modules LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE modules ADD COLUMN spoolAmount FLOAT;")

eos/db/migrations/upgrade30.py

@@ -0,0 +1,17 @@
+"""
+Migration 30
+
+- changes to prices table
+"""
+
+
+import sqlalchemy
+
+
+def upgrade(saveddata_engine):
+    try:
+        saveddata_engine.execute("SELECT status FROM prices LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        # Just drop table, table will be re-created by sqlalchemy and
+        # data will be re-fetched
+        saveddata_engine.execute("DROP TABLE prices;")

eos/db/migrations/upgrade31.py

@@ -0,0 +1,15 @@
+"""
+Migration 31
+
+- added fit system security column
+"""
+
+
+import sqlalchemy
+
+
+def upgrade(saveddata_engine):
+    try:
+        saveddata_engine.execute("SELECT systemSecurity FROM fits LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE fits ADD COLUMN systemSecurity INT")

eos/db/saveddata/__init__.py

@@ -1,6 +1,7 @@
 __all__ = [
     "character",
     "fit",
+    "mutator",
     "module",
     "user",
     "skill",
@@ -12,7 +13,6 @@ __all__ = [
     "miscData",
     "targetResists",
     "override",
-    "crest",
     "implantSet",
     "loadDefaultDatabaseValues"
 ]

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 HandledImplantList, 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,
@@ -56,12 +75,17 @@ mapper(Character, characters_table,
                    cascade="all,delete-orphan"),
            "_Character__implants"    : relation(
                    Implant,
-                   collection_class=HandledImplantBoosterList,
+                   collection_class=HandledImplantList,
                    cascade='all,delete-orphan',
                    backref='character',
                    single_parent=True,
                    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)
        }
        )

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)

eos/db/saveddata/fit.py

@@ -17,33 +17,33 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 # ===============================================================================
 
-from sqlalchemy.ext.associationproxy import association_proxy
-from sqlalchemy.orm.collections import attribute_mapped_collection
-from sqlalchemy.sql import and_
-from sqlalchemy.orm import relation, reconstructor, mapper, relationship
-from sqlalchemy import ForeignKey, Column, Integer, String, Table, Boolean, DateTime
 import datetime
 
-from eos.db import saveddata_meta
-from eos.db import saveddata_session
+from sqlalchemy import Boolean, Column, DateTime, ForeignKey, Integer, String, Table
+from sqlalchemy.ext.associationproxy import association_proxy
+from sqlalchemy.orm import mapper, reconstructor, relation, relationship
+from sqlalchemy.orm.collections import attribute_mapped_collection
+from sqlalchemy.sql import and_
+
+from eos.db import saveddata_meta, saveddata_session
 from eos.db.saveddata.cargo import cargo_table
 from eos.db.saveddata.drone import drones_table
 from eos.db.saveddata.fighter import fighters_table
 from eos.db.saveddata.implant import fitImplants_table
 from eos.db.saveddata.module import modules_table
-from eos.effectHandlerHelpers import HandledModuleList, HandledImplantBoosterList, HandledProjectedModList, \
-    HandledDroneCargoList, HandledProjectedDroneList
-from eos.saveddata.implant import Implant
-from eos.saveddata.character import Character
-from eos.saveddata.user import User
-from eos.saveddata.fighter import Fighter
-from eos.saveddata.fit import Fit as es_Fit, ImplantLocation
-from eos.saveddata.drone import Drone
+from eos.effectHandlerHelpers import HandledDroneCargoList, HandledImplantList, HandledBoosterList, HandledModuleList, HandledProjectedDroneList, HandledProjectedModList
 from eos.saveddata.booster import Booster
-from eos.saveddata.module import Module
 from eos.saveddata.cargo import Cargo
+from eos.saveddata.character import Character
 from eos.saveddata.damagePattern import DamagePattern
+from eos.saveddata.drone import Drone
+from eos.saveddata.fighter import Fighter
+from eos.saveddata.fit import Fit as es_Fit
+from eos.saveddata.implant import Implant
+from eos.saveddata.module import Module
 from eos.saveddata.targetResists import TargetResists
+from eos.saveddata.user import User
+
 
 fits_table = Table("fits", saveddata_meta,
                    Column("ID", Integer, primary_key=True),
@@ -56,11 +56,12 @@ fits_table = Table("fits", saveddata_meta,
                    Column("booster", Boolean, nullable=False, index=True, default=0),
                    Column("targetResistsID", ForeignKey("targetResists.ID"), nullable=True),
                    Column("modeID", Integer, nullable=True),
-                   Column("implantLocation", Integer, nullable=False, default=ImplantLocation.FIT),
+                   Column("implantLocation", Integer, nullable=False),
                    Column("notes", String, nullable=True),
                    Column("ignoreRestrictions", Boolean, default=0),
                    Column("created", DateTime, nullable=True, default=datetime.datetime.now),
-                   Column("modified", DateTime, nullable=True, default=datetime.datetime.now, onupdate=datetime.datetime.now)
+                   Column("modified", DateTime, nullable=True, default=datetime.datetime.now, onupdate=datetime.datetime.now),
+                   Column("systemSecurity", Integer, nullable=True)
                    )
 
 projectedFits_table = Table("projectedFits", saveddata_meta,
@@ -132,13 +133,13 @@ class CommandFit(object):
         )
 
 
-es_Fit._Fit__projectedFits = association_proxy(
+es_Fit.projectedFitDict = association_proxy(
         "victimOf",  # look at the victimOf association...
         "source_fit",  # .. and return the source fits
         creator=lambda sourceID, source_fit: ProjectedFit(sourceID, source_fit)
 )
 
-es_Fit._Fit__commandFits = association_proxy(
+es_Fit.commandFitDict = association_proxy(
         "boostedOf",  # look at the boostedOf association...
         "booster_fit",  # .. and return the booster fit
         creator=lambda boosterID, booster_fit: CommandFit(boosterID, booster_fit)
@@ -184,7 +185,7 @@ mapper(es_Fit, fits_table,
            "shipID": fits_table.c.shipID,
            "_Fit__boosters": relation(
                    Booster,
-                   collection_class=HandledImplantBoosterList,
+                   collection_class=HandledBoosterList,
                    cascade='all, delete, delete-orphan',
                    backref='owner',
                    single_parent=True),
@@ -220,7 +221,7 @@ mapper(es_Fit, fits_table,
                    primaryjoin=and_(fighters_table.c.fitID == fits_table.c.ID, fighters_table.c.projected == True)),  # noqa
            "_Fit__implants": relation(
                    Implant,
-                   collection_class=HandledImplantBoosterList,
+                   collection_class=HandledImplantList,
                    cascade='all, delete, delete-orphan',
                    backref='owner',
                    single_parent=True,

eos/db/saveddata/implantSet.py

@@ -23,7 +23,7 @@ import datetime
 
 from eos.db import saveddata_meta
 from eos.db.saveddata.implant import implantsSetMap_table
-from eos.effectHandlerHelpers import HandledImplantBoosterList
+from eos.effectHandlerHelpers import HandledImplantList
 from eos.saveddata.implant import Implant
 from eos.saveddata.implantSet import ImplantSet
 
@@ -38,7 +38,7 @@ mapper(ImplantSet, implant_set_table,
        properties={
            "_ImplantSet__implants": relation(
                    Implant,
-                   collection_class=HandledImplantBoosterList,
+                   collection_class=HandledImplantList,
                    cascade='all, delete, delete-orphan',
                    backref='set',
                    single_parent=True,

eos/db/saveddata/loadDefaultDatabaseValues.py

@@ -38,49 +38,58 @@ class DefaultDatabaseValues(object):
                              ["[Generic]Thermal", "0", "100", "0", "0"], ["[Generic]Kinetic", "0", "0", "100", "0"],
                              ["[Generic]Explosive", "0", "0", "0", "100"],
                              ["[NPC][Asteroid] Blood Raiders", "5067", "4214", "0", "0"],
-                             ["[Bombs]Concussion Bomb", "0", "0", "6400", "0"],
                              ["[Bombs]Electron Bomb", "6400", "0", "0", "0"],
                              ["[Bombs]Scorch Bomb", "0", "6400", "0", "0"],
+                             ["[Bombs]Concussion Bomb", "0", "0", "6400", "0"],
                              ["[Bombs]Shrapnel Bomb", "0", "0", "0", "6400"],
+                             ["[Frequency Crystals][T2] Conflagration", "61.6", "61.6", "0", "0"],
+                             ["[Frequency Crystals][T2] Scorch", "72", "16", "0", "0"],
                              ["[Frequency Crystals][T2] Gleam", "56", "56", "0", "0"],
                              ["[Frequency Crystals][T2] Aurora", "40", "24", "0", "0"],
-                             ["[Frequency Crystals][T2] Scorch", "72", "16", "0", "0"],
-                             ["[Frequency Crystals][T2] Conflagration", "61.6", "61.6", "0", "0"],
+                             ["[Frequency Crystals]Multifrequency", "61.6", "44", "0", "0"],
                              ["[Frequency Crystals]Gamma", "61.6", "35.2", "0", "0"],
+                             ["[Frequency Crystals]Xray", "52.8", "35.2", "0", "0"],
+                             ["[Frequency Crystals]Ultraviolet", "52.8", "26.4", "0", "0"],
+                             ["[Frequency Crystals]Standard", "44", "26.4", "0", "0"],
                              ["[Frequency Crystals]Infrared", "44", "17.6", "0", "0"],
                              ["[Frequency Crystals]Microwave", "35.2", "17.6", "0", "0"],
-                             ["[Frequency Crystals]Multifrequency", "61.6", "44", "0", "0"],
                              ["[Frequency Crystals]Radio", "44", "0", "0", "0"],
-                             ["[Frequency Crystals]Standard", "44", "26.4", "0", "0"],
-                             ["[Frequency Crystals]Ultraviolet", "52.8", "26.4", "0", "0"],
-                             ["[Frequency Crystals]Xray", "52.8", "35.2", "0", "0"],
                              ["[Hybrid Charges][T2] Void", "0", "61.6", "61.6", "0"],
                              ["[Hybrid Charges][T2] Null", "0", "48", "40", "0"],
                              ["[Hybrid Charges][T2] Javelin", "0", "64", "48", "0"],
                              ["[Hybrid Charges][T2] Spike", "0", "32", "32", "0"],
                              ["[Hybrid Charges]Antimatter", "0", "48", "67.2", "0"],
-                             ["[Hybrid Charges]Iridium", "0", "28.8", "38.4", "0"],
-                             ["[Hybrid Charges]Iron", "0", "19.2", "28.8", "0"],
-                             ["[Hybrid Charges]Lead", "0", "28.8", "48", "0"],
                              ["[Hybrid Charges]Plutonium", "0", "48", "57.6", "0"],
-                             ["[Hybrid Charges]Thorium", "0", "38.4", "48", "0"],
-                             ["[Hybrid Charges]Tungsten", "0", "19.2", "38.4", "0"],
                              ["[Hybrid Charges]Uranium", "0", "38.4", "57.6", "0"],
-                             ["[Missiles]Mjolnir", "100", "0", "0", "0"], ["[Missiles]Inferno", "0", "100", "0", "0"],
-                             ["[Missiles]Scourge", "0", "0", "100", "0"], ["[Missiles]Nova", "0", "0", "0", "100"],
+                             ["[Hybrid Charges]Thorium", "0", "38.4", "48", "0"],
+                             ["[Hybrid Charges]Lead", "0", "28.8", "48", "0"],
+                             ["[Hybrid Charges]Iridium", "0", "28.8", "38.4", "0"],
+                             ["[Hybrid Charges]Tungsten", "0", "19.2", "38.4", "0"],
+                             ["[Hybrid Charges]Iron", "0", "19.2", "28.8", "0"],
+                             ["[Missiles]Mjolnir", "100", "0", "0", "0"],
+                             ["[Missiles]Inferno", "0", "100", "0", "0"],
+                             ["[Missiles]Scourge", "0", "0", "100", "0"],
+                             ["[Missiles]Nova", "0", "0", "0", "100"],
                              ["[Missiles][Structure] Standup Missile", "100", "100", "100", "100"],
-                             ["[Projectile Ammo][T2] Tremor", "0", "0", "24", "40"],
-                             ["[Projectile Ammo][T2] Quake", "0", "0", "40", "72"],
                              ["[Projectile Ammo][T2] Hail", "0", "0", "26.4", "96.8"],
                              ["[Projectile Ammo][T2] Barrage", "0", "0", "40", "48"],
-                             ["[Projectile Ammo]Carbonized Lead", "0", "0", "35.2", "8.8"],
-                             ["[Projectile Ammo]Depleted Uranium", "0", "26.4", "17.6", "26.4"],
+                             ["[Projectile Ammo][T2] Quake", "0", "0", "40", "72"],
+                             ["[Projectile Ammo][T2] Tremor", "0", "0", "24", "40"],
                              ["[Projectile Ammo]EMP", "79.2", "0", "8.8", "17.6"],
-                             ["[Projectile Ammo]Fusion", "0", "0", "17.6", "88"],
-                             ["[Projectile Ammo]Nuclear", "0", "0", "8.8", "35.2"],
                              ["[Projectile Ammo]Phased Plasma", "0", "88", "17.6", "0"],
-                             ["[Projectile Ammo]Proton", "26.4", "0", "17.6", "0"],
+                             ["[Projectile Ammo]Fusion", "0", "0", "17.6", "88"],
+                             ["[Projectile Ammo]Depleted Uranium", "0", "26.4", "17.6", "26.4"],
                              ["[Projectile Ammo]Titanium Sabot", "0", "0", "52.8", "176"],
+                             ["[Projectile Ammo]Proton", "26.4", "0", "17.6", "0"],
+                             ["[Projectile Ammo]Carbonized Lead", "0", "0", "35.2", "8.8"],
+                             ["[Projectile Ammo]Nuclear", "0", "0", "8.8", "35.2"],
+                             # Different sizes of plasma do different damage, the values here are
+                             # average of proportions across sizes
+                             ["[Exotic Plasma][T2] Occult", "0", "55863", "0", "44137"],
+                             ["[Exotic Plasma][T2] Mystic", "0", "66319", "0", "33681"],
+                             ["[Exotic Plasma]Tetryon", "0", "69208", "0", "30792"],
+                             ["[Exotic Plasma]Baryon", "0", "59737", "0", "40263"],
+                             ["[Exotic Plasma]Meson", "0", "60519", "0", "39481"],
                              ["[NPC][Burner] Cruor (Blood Raiders)", "90", "90", "0", "0"],
                              ["[NPC][Burner] Dramiel (Angel)", "55", "0", "20", "96"],
                              ["[NPC][Burner] Daredevil (Serpentis)", "0", "110", "154", "0"],

eos/db/saveddata/module.py

@@ -17,18 +17,22 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 # ===============================================================================
 
-from sqlalchemy import Table, Column, Integer, ForeignKey, CheckConstraint, Boolean, DateTime
+from sqlalchemy import Table, Column, Integer, Float, ForeignKey, CheckConstraint, Boolean, DateTime
+from sqlalchemy.orm.collections import attribute_mapped_collection
 from sqlalchemy.orm import relation, mapper
 import datetime
 
 from eos.db import saveddata_meta
 from eos.saveddata.module import Module
+from eos.saveddata.mutator import Mutator
 from eos.saveddata.fit import Fit
 
 modules_table = Table("modules", saveddata_meta,
                       Column("ID", Integer, primary_key=True),
                       Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False, index=True),
                       Column("itemID", Integer, nullable=True),
+                      Column("baseItemID", Integer, nullable=True),
+                      Column("mutaplasmidID", Integer, nullable=True),
                       Column("dummySlot", Integer, nullable=True, default=None),
                       Column("chargeID", Integer),
                       Column("state", Integer, CheckConstraint("state >= -1"), CheckConstraint("state <= 2")),
@@ -36,7 +40,17 @@ modules_table = Table("modules", saveddata_meta,
                       Column("position", Integer),
                       Column("created", DateTime, nullable=True, default=datetime.datetime.now),
                       Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now),
+                      Column("spoolType", Integer, nullable=True),
+                      Column("spoolAmount", Float, nullable=True),
                       CheckConstraint('("dummySlot" = NULL OR "itemID" = NULL) AND "dummySlot" != "itemID"'))
 
 mapper(Module, modules_table,
-       properties={"owner": relation(Fit)})
+       properties={
+           "owner": relation(Fit),
+           "mutators": relation(
+                   Mutator,
+                   backref="module",
+                   cascade="all,delete-orphan",
+                   collection_class=attribute_mapped_collection('attrID')
+           )
+       })

eos/db/saveddata/mutator.py

@@ -0,0 +1,35 @@
+# ===============================================================================
+# 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/>.
+# ===============================================================================
+
+import datetime
+
+from sqlalchemy import Column, DateTime, Float, ForeignKey, Integer, Table
+from sqlalchemy.orm import mapper
+
+from eos.db import saveddata_meta
+from eos.saveddata.mutator import Mutator
+
+mutator_table = Table("mutators", saveddata_meta,
+                        Column("moduleID", Integer, ForeignKey("modules.ID"), primary_key=True, index=True),
+                        Column("attrID", Integer, primary_key=True, index=True),
+                        Column("value", Float, nullable=False),
+                        Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                        Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now))
+
+mapper(Mutator, mutator_table)

eos/db/saveddata/price.py

@@ -17,18 +17,19 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 # ===============================================================================
 
+
 from sqlalchemy import Table, Column, Float, Integer
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
 from eos.saveddata.price import Price
 
+
 prices_table = Table("prices", saveddata_meta,
                      Column("typeID", Integer, primary_key=True),
                      Column("price", Float, default=0.0),
                      Column("time", Integer, nullable=False),
-                     Column("failed", Integer))
+                     Column("status", Integer, nullable=False))
 
-mapper(Price, prices_table, properties={
-    "_Price__price": prices_table.c.price,
-})
+
+mapper(Price, prices_table)

eos/db/saveddata/queries.py

@@ -21,13 +21,14 @@ import sys
 
 from sqlalchemy.sql import and_
 from sqlalchemy import desc, select
+from sqlalchemy import func
 
 from eos.db import saveddata_session, sd_lock
 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
@@ -283,6 +284,12 @@ def countAllFits():
     return count
 
 
+def countFitGroupedByShip():
+    with sd_lock:
+        count = eos.db.saveddata_session.query(Fit.shipID, func.count(Fit.shipID)).group_by(Fit.shipID).all()
+    return count
+
+
 def countFitsWithShip(lookfor, ownerID=None, where=None, eager=None):
     """
     Get all the fits using a certain ship.
@@ -467,29 +474,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()
+        filter = and_(filter, SsoCharacter.ID == lookfor)
     elif isinstance(lookfor, str):
-        eager = processEager(eager)
-        with sd_lock:
-            character = saveddata_session.query(CrestChar).options(*eager).filter(CrestChar.name == lookfor).first()
+        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
 
 
@@ -543,6 +549,15 @@ def commit():
     with sd_lock:
         try:
             saveddata_session.commit()
+        except Exception:
+            saveddata_session.rollback()
+            exc_info = sys.exc_info()
+            raise exc_info[0](exc_info[1]).with_traceback(exc_info[2])
+
+
+def flush():
+    with sd_lock:
+        try:
             saveddata_session.flush()
         except Exception:
             saveddata_session.rollback()

eos/effectHandlerHelpers.py

@@ -17,8 +17,10 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 # ===============================================================================
 
+
 from logbook import Logger
 
+
 pyfalog = Logger(__name__)
 
 
@@ -111,8 +113,14 @@ class HandledList(list):
             thing.itemID = 0
         list.remove(self, thing)
 
+    def sort(self, *args, **kwargs):
+        # We need it here to prevent external users from accidentally sorting the list as alot of
+        # external logic relies on keeping modules at their places
+        raise NotImplementedError
+
 
 class HandledModuleList(HandledList):
+
     def append(self, mod):
         emptyPosition = float("Inf")
         for i in range(len(self)):
@@ -123,55 +131,89 @@ class HandledModuleList(HandledList):
                     emptyPosition = currPos
 
         if emptyPosition < len(self):
-            del self[emptyPosition]
             mod.position = emptyPosition
-            HandledList.insert(self, emptyPosition, mod)
+            self.__toModule(emptyPosition, mod)
             if mod.isInvalid:
-                self.remove(mod)
-            return
+                self.__toDummy(mod.position)
+        else:
+            self.appendIgnoreEmpty(mod)
 
+    def appendIgnoreEmpty(self, mod):
         mod.position = len(self)
         HandledList.append(self, mod)
         if mod.isInvalid:
             self.remove(mod)
-            return
 
-    def insert(self, index, mod):
-        mod.position = index
-        i = index
+    def replace(self, idx, mod):
+        try:
+            oldMod = self[idx]
+        except IndexError:
+            return
+        self.__toModule(idx, mod)
+        if mod.isInvalid:
+            self.__toModule(idx, oldMod)
+
+    def replaceRackPosition(self, rackPosition, mod):
+        listPositions = []
+        for currPos in range(len(self)):
+            currMod = self[currPos]
+            if currMod.slot == mod.slot:
+                listPositions.append(currPos)
+        listPositions.sort()
+        try:
+            modListPosition = listPositions[rackPosition]
+        except IndexError:
+            self.appendIgnoreEmpty(mod)
+        else:
+            oldMod = self[modListPosition]
+            if mod.isEmpty:
+                self.__toDummy(modListPosition)
+            else:
+                self.__toModule(modListPosition, mod)
+                # If new module cannot be appended, restore old state
+                if mod.isInvalid:
+                    if oldMod.isEmpty:
+                        self.__toDummy(modListPosition)
+                    else:
+                        self.__toModule(modListPosition, oldMod)
+
+    def insert(self, idx, mod):
+        mod.position = idx
+        i = idx
         while i < len(self):
             self[i].position += 1
             i += 1
-        HandledList.insert(self, index, mod)
+        HandledList.insert(self, idx, mod)
+        if mod.isInvalid:
+            self.remove(mod)
 
     def remove(self, mod):
         HandledList.remove(self, mod)
         oldPos = mod.position
-
         mod.position = None
         for i in range(oldPos, len(self)):
             self[i].position -= 1
 
-    def toDummy(self, index):
+    def free(self, idx):
+        self.__toDummy(idx)
+
+    def __toDummy(self, index):
         mod = self[index]
         if not mod.isEmpty:
             dummy = mod.buildEmpty(mod.slot)
             dummy.position = index
             self[index] = dummy
+            mod.position = None
 
-    def toModule(self, index, mod):
+    def __toModule(self, index, mod):
+        oldMod = self[index]
         mod.position = index
         self[index] = mod
-
-    def freeSlot(self, slot):
-        for i in range(len(self)):
-            mod = self[i]
-            if mod.getModifiedItemAttr("subSystemSlot") == slot:
-                self.toDummy(i)
-                break
+        oldMod.position = None
 
 
 class HandledDroneCargoList(HandledList):
+
     def find(self, item):
         for o in self:
             if o.item == item:
@@ -183,29 +225,110 @@ class HandledDroneCargoList(HandledList):
 
     def append(self, thing):
         HandledList.append(self, thing)
+        if thing.isInvalid:
+            self.remove(thing)
 
+    def insert(self, idx, thing):
+        HandledList.insert(self, idx, thing)
         if thing.isInvalid:
             self.remove(thing)
 
 
-class HandledImplantBoosterList(HandledList):
-    def append(self, thing):
-        if thing.isInvalid:
-            HandledList.append(self, thing)
-            self.remove(thing)
+class HandledImplantList(HandledList):
+
+    def append(self, implant):
+        if implant.isInvalid:
+            HandledList.append(self, implant)
+            self.remove(implant)
             return
+        if self.__slotCheck(implant):
+            HandledList.append(self, implant)
+            self.remove(implant)
+            return
+        HandledList.append(self, implant)
 
+    def insert(self, idx, implant):
+        if implant.isInvalid:
+            HandledList.insert(self, idx, implant)
+            self.remove(implant)
+            return
+        if self.__slotCheck(implant):
+            HandledList.insert(self, idx, implant)
+            self.remove(implant)
+            return
+        HandledList.insert(self, idx, implant)
+
+    def makeRoom(self, implant):
         # if needed, remove booster that was occupying slot
-        oldObj = next((m for m in self if m.slot == thing.slot), None)
-        if oldObj:
-            pyfalog.info("Slot {0} occupied with {1}, replacing with {2}", thing.slot, oldObj.item.name, thing.item.name)
+        oldObj = next((i for i in self if i.slot == implant.slot), None)
+        if oldObj is not None:
+            pyfalog.info("Slot {0} occupied with {1}, replacing with {2}", implant.slot, oldObj.item.name, implant.item.name)
+            position = self.index(oldObj)
+            from gui.fitCommands.helpers import ImplantInfo
+            implantInfo = ImplantInfo.fromImplant(oldObj)
             oldObj.itemID = 0  # hack to remove from DB. See GH issue #324
             self.remove(oldObj)
+            return position, implantInfo
+        return None, None
 
-        HandledList.append(self, thing)
+    def __slotCheck(self, implant):
+        return any(i.slot == implant.slot for i in self)
+
+
+class HandledBoosterList(HandledList):
+
+    def append(self, booster):
+        if booster.isInvalid:
+            HandledList.append(self, booster)
+            self.remove(booster)
+            return
+        if self.__slotCheck(booster):
+            HandledList.append(self, booster)
+            self.remove(booster)
+            return
+        HandledList.append(self, booster)
+
+    def insert(self, idx, booster):
+        if booster.isInvalid:
+            HandledList.insert(self, idx, booster)
+            self.remove(booster)
+            return
+        if self.__slotCheck(booster):
+            HandledList.insert(self, idx, booster)
+            self.remove(booster)
+            return
+        HandledList.insert(self, idx, booster)
+
+    def makeRoom(self, booster):
+        # if needed, remove booster that was occupying slot
+        oldObj = next((b for b in self if b.slot == booster.slot), None)
+        if oldObj is not None:
+            pyfalog.info("Slot {0} occupied with {1}, replacing with {2}", booster.slot, oldObj.item.name, booster.item.name)
+            position = self.index(oldObj)
+            from gui.fitCommands.helpers import BoosterInfo
+            boosterInfo = BoosterInfo.fromBooster(oldObj)
+            oldObj.itemID = 0  # hack to remove from DB. See GH issue #324
+            self.remove(oldObj)
+            return position, boosterInfo
+        return None, None
+
+    def __slotCheck(self, booster):
+        return any(b.slot == booster.slot for b in self)
+
+
+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:
             # we must include it before we remove it. doing it this way ensures
@@ -213,33 +336,62 @@ class HandledProjectedModList(HandledList):
             HandledList.append(self, proj)
             self.remove(proj)
             return
-
         proj.projected = True
-        isSystemEffect = proj.item.group.name == "Effect Beacon"
-
-        if isSystemEffect:
-            # remove other system effects - only 1 per fit plz
-            oldEffect = next((m for m in self if m.item.group.name == "Effect Beacon"), None)
-
-            if oldEffect:
-                pyfalog.info("System effect occupied with {0}, replacing with {1}", oldEffect.item.name, proj.item.name)
-                self.remove(oldEffect)
-
         HandledList.append(self, proj)
-
         # Remove non-projectable modules
-        if not proj.item.isType("projected") and not isSystemEffect:
+        if not proj.item.isType("projected") and not proj.isExclusiveSystemEffect:
             self.remove(proj)
 
+    def insert(self, idx, proj):
+        if proj.isInvalid:
+            # we must include it before we remove it. doing it this way ensures
+            # rows and relationships in database are removed as well
+            HandledList.insert(self, idx, proj)
+            self.remove(proj)
+            return
+        proj.projected = True
+        HandledList.insert(self, idx, proj)
+        # Remove non-projectable modules
+        if not proj.item.isType("projected") and not proj.isExclusiveSystemEffect:
+            self.remove(proj)
+
+    @property
+    def currentSystemEffect(self):
+        return next((m for m in self if m.isExclusiveSystemEffect), None)
+
+    def makeRoom(self, proj):
+        if proj.isExclusiveSystemEffect:
+            # remove other system effects - only 1 per fit plz
+            mod = self.currentSystemEffect
+
+            if mod:
+                pyfalog.info("System effect occupied with {0}, removing it to make space for {1}".format(mod.item.name, proj.item.name))
+                position = self.index(mod)
+                # We need to pack up this info, so whatever...
+                from gui.fitCommands.helpers import ModuleInfo
+                modInfo = ModuleInfo.fromModule(mod)
+                self.remove(mod)
+                return position, modInfo
+        return None, None
+
 
 class HandledProjectedDroneList(HandledDroneCargoList):
+
     def append(self, proj):
         proj.projected = True
         HandledList.append(self, proj)
-
         # Remove invalid or non-projectable drones
         if proj.isInvalid or not proj.item.isType("projected"):
             self.remove(proj)
+            proj.projected = False
+
+    def insert(self, idx, proj):
+        proj.projected = True
+        HandledList.insert(self, idx, proj)
+        # Remove invalid or non-projectable drones
+        if proj.isInvalid or not proj.item.isType("projected"):
+            self.remove(proj)
+            proj.projected = False
 
 
 class HandledItem(object):

eos/effects/__init__.py

@@ -1,19 +0,0 @@
-# ===============================================================================
-# Copyright (C) 2010 Diego Duclos
-#               2010 Anton Vorobyov
-#
-# This file, as well as all files in this folder, are 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/>.
-# ===============================================================================

eos/effects/accerationcontrolcapneedbonuspostpercentcapacitorneedlocationshipgroupafterburner.py

@@ -1,10 +0,0 @@
-# accerationControlCapNeedBonusPostPercentCapacitorNeedLocationShipGroupAfterburner
-#
-# Used by:
-# Modules named like: Dynamic Fuel Valve (8 of 8)
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
-                                  "capacitorNeed", container.getModifiedItemAttr("capNeedBonus"))

eos/effects/accerationcontrolskillabmwdspeedboost.py

@@ -1,12 +0,0 @@
-# accerationControlSkillAb&MwdSpeedBoost
-#
-# Used by:
-# Implant: Zor's Custom Navigation Hyper-Link
-# Skill: Acceleration Control
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
-                                  "speedFactor", container.getModifiedItemAttr("speedFBonus") * level)

eos/effects/accerationcontrolspeedfbonuspostpercentspeedfactorlocationshipgroupafterburner.py

@@ -1,10 +0,0 @@
-# accerationControlSpeedFBonusPostPercentSpeedFactorLocationShipGroupAfterburner
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Rogue' Acceleration Control AC (6 of 6)
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module",
-                                  "speedFactor", implant.getModifiedItemAttr("speedFBonus"))

eos/effects/accessdifficultybonusmodifierrequiringarchaelogy.py

@@ -1,13 +0,0 @@
-# accessDifficultyBonusModifierRequiringArchaelogy
-#
-# Used by:
-# Modules named like: Emission Scope Sharpener (8 of 8)
-# Implant: Poteque 'Prospector' Archaeology AC-905
-# Implant: Poteque 'Prospector' Environmental Analysis EY-1005
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredItemIncrease(lambda module: module.item.requiresSkill("Archaeology"),
-                                     "accessDifficultyBonus",
-                                     container.getModifiedItemAttr("accessDifficultyBonusModifier"), position="post")

eos/effects/accessdifficultybonusmodifierrequiringhacking.py

@@ -1,14 +0,0 @@
-# accessDifficultyBonusModifierRequiringHacking
-#
-# Used by:
-# Modules named like: Memetic Algorithm Bank (8 of 8)
-# Implant: Neural Lace 'Blackglass' Net Intrusion 920-40
-# Implant: Poteque 'Prospector' Environmental Analysis EY-1005
-# Implant: Poteque 'Prospector' Hacking HC-905
-type = "passive"
-
-
-def handler(fit, container, context):
-    fit.modules.filteredItemIncrease(lambda c: c.item.requiresSkill("Hacking"),
-                                     "accessDifficultyBonus",
-                                     container.getModifiedItemAttr("accessDifficultyBonusModifier"), position="post")

eos/effects/adaptivearmorhardener.py

@@ -1,125 +0,0 @@
-# adaptiveArmorHardener
-#
-# Used by:
-# Module: Reactive Armor Hardener
-from logbook import Logger
-import eos.config
-
-pyfalog = Logger(__name__)
-
-runTime = "late"
-type = "active"
-
-
-def handler(fit, module, context):
-    damagePattern = fit.damagePattern
-
-    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.")
-        return
-
-    # Skip if there is no damage pattern. Example: projected ships or fleet boosters
-    if damagePattern:
-
-        # Populate a tuple with the damage profile modified by current armor resists.
-        baseDamageTaken = (
-            damagePattern.emAmount * fit.ship.getModifiedItemAttr('armorEmDamageResonance'),
-            damagePattern.thermalAmount * fit.ship.getModifiedItemAttr('armorThermalDamageResonance'),
-            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])
-
-        resistanceShiftAmount = module.getModifiedItemAttr(
-            'resistanceShiftAmount') / 100  # The attribute is in percent and we want a fraction
-        RAHResistance = [
-            module.getModifiedItemAttr('armorEmDamageResonance'),
-            module.getModifiedItemAttr('armorThermalDamageResonance'),
-            module.getModifiedItemAttr('armorKineticDamageResonance'),
-            module.getModifiedItemAttr('armorExplosiveDamageResonance'),
-        ]
-
-        # Simulate RAH cycles until the RAH either stops changing or enters a loop.
-        # The number of iterations is limited to prevent an infinite loop if something goes wrong.
-        cycleList = []
-        loopStart = -20
-        for num in range(50):
-            # 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 = [
-                (0, baseDamageTaken[0] * RAHResistance[0], RAHResistance[0]),
-                (3, baseDamageTaken[3] * RAHResistance[3], RAHResistance[3]),
-                (2, baseDamageTaken[2] * RAHResistance[2], RAHResistance[2]),
-                (1, baseDamageTaken[1] * RAHResistance[1], RAHResistance[1]),
-            ]
-
-            # Sort the tuple to drop the highest damage value to the bottom
-            sortedDamagePattern_tuples = sorted(damagePattern_tuples, key=lambda damagePattern: damagePattern[1])
-
-            if sortedDamagePattern_tuples[2][1] == 0:
-                # One damage type: the top damage type takes from the other three
-                # Since the resistances not taking damage will end up going to the type taking damage we just do the whole thing at once.
-                change0 = 1 - sortedDamagePattern_tuples[0][2]
-                change1 = 1 - sortedDamagePattern_tuples[1][2]
-                change2 = 1 - sortedDamagePattern_tuples[2][2]
-                change3 = -(change0 + change1 + change2)
-            elif sortedDamagePattern_tuples[1][1] == 0:
-                # Two damage types: the top two damage types take from the other two
-                # Since the resistances not taking damage will end up going equally to the types taking damage we just do the whole thing at once.
-                change0 = 1 - sortedDamagePattern_tuples[0][2]
-                change1 = 1 - sortedDamagePattern_tuples[1][2]
-                change2 = -(change0 + change1) / 2
-                change3 = -(change0 + change1) / 2
-            else:
-                # Three or four damage types: the top two damage types take from the other two
-                change0 = min(resistanceShiftAmount, 1 - sortedDamagePattern_tuples[0][2])
-                change1 = min(resistanceShiftAmount, 1 - sortedDamagePattern_tuples[1][2])
-                change2 = -(change0 + change1) / 2
-                change3 = -(change0 + change1) / 2
-
-            RAHResistance[sortedDamagePattern_tuples[0][0]] = sortedDamagePattern_tuples[0][2] + change0
-            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])
-
-            # See if the current RAH profile has been encountered before, indicating a loop.
-            for i, val in enumerate(cycleList):
-                tolerance = 1e-06
-                if abs(RAHResistance[0] - val[0]) <= tolerance and \
-                            abs(RAHResistance[1] - val[1]) <= tolerance and \
-                            abs(RAHResistance[2] - val[2]) <= tolerance and \
-                            abs(RAHResistance[3] - val[3]) <= tolerance:
-                    loopStart = i
-                    # 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])
-
-        # Average the profiles in the RAH loop, or the last 20 if it didn't find a loop.
-        loopCycles = cycleList[loopStart:]
-        numCycles = len(loopCycles)
-        average = [0, 0, 0, 0]
-        for cycle in loopCycles:
-            for i in range(4):
-                average[i] += cycle[i]
-
-        for i in range(4):
-            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])
-        for i, attr in enumerate((
-                'armorEmDamageResonance', 'armorThermalDamageResonance', 'armorKineticDamageResonance',
-                'armorExplosiveDamageResonance')):
-            module.increaseItemAttr(attr, average[i] - module.getModifiedItemAttr(attr))
-            fit.ship.multiplyItemAttr(attr, average[i], stackingPenalties=True, penaltyGroup="preMul")

eos/effects/addtosignatureradius2.py

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

eos/effects/afterburnerdurationbonuspostpercentdurationlocationshipmodulesrequiringafterburner.py

@@ -1,13 +0,0 @@
-# afterburnerDurationBonusPostPercentDurationLocationShipModulesRequiringAfterburner
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Rogue' Afterburner AB (6 of 6)
-# Implant: Zor's Custom Navigation Link
-# Skill: Afterburner
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"),
-                                  "duration", container.getModifiedItemAttr("durationBonus") * level)

eos/effects/agilitybonus.py

@@ -1,9 +0,0 @@
-# agilityBonus
-#
-# Used by:
-# Subsystems named like: Propulsion Interdiction Nullifier (4 of 4)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.ship.increaseItemAttr("agility", src.getModifiedItemAttr("agilityBonusAdd"))

eos/effects/agilitymultipliereffect.py

@@ -1,13 +0,0 @@
-# agilityMultiplierEffect
-#
-# Used by:
-# Modules from group: Inertial Stabilizer (7 of 7)
-# Modules from group: Nanofiber Internal Structure (7 of 7)
-# Modules from group: Reinforced Bulkhead (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("agility",
-                           module.getModifiedItemAttr("agilityMultiplier"),
-                           stackingPenalties=True)

eos/effects/agilitymultipliereffectpassive.py

@@ -1,9 +0,0 @@
-# agilityMultiplierEffectPassive
-#
-# Used by:
-# Modules named like: Polycarbon Engine Housing (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("agilityMultiplier"), stackingPenalties=True)

eos/effects/ammofallofmultiplier.py

@@ -1,14 +0,0 @@
-# ammoFallofMultiplier
-#
-# 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)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.multiplyItemAttr("falloff", module.getModifiedChargeAttr("fallofMultiplier") or 1)

eos/effects/ammoinfluencecapneed.py

@@ -1,13 +0,0 @@
-# ammoInfluenceCapNeed
-#
-# Used by:
-# Items from category: Charge (478 of 928)
-type = "passive"
-
-
-def handler(fit, module, context):
-    # Dirty hack to work around cap charges setting cap booster
-    # injection amount to zero
-    rawAttr = module.item.getAttribute("capacitorNeed")
-    if rawAttr is not None and rawAttr >= 0:
-        module.boostItemAttr("capacitorNeed", module.getModifiedChargeAttr("capNeedBonus") or 0)

eos/effects/ammoinfluencerange.py

@@ -1,9 +0,0 @@
-# ammoInfluenceRange
-#
-# Used by:
-# Items from category: Charge (572 of 928)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.multiplyItemAttr("maxRange", module.getModifiedChargeAttr("weaponRangeMultiplier"))

eos/effects/ammospeedmultiplier.py

@@ -1,11 +0,0 @@
-# ammoSpeedMultiplier
-#
-# 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)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.multiplyItemAttr("speed", module.getModifiedChargeAttr("speedMultiplier") or 1)

eos/effects/ammotrackingmultiplier.py

@@ -1,15 +0,0 @@
-# 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)
-# Charges from group: Projectile Ammo (128 of 128)
-type = "passive"
-
-
-def handler(fit, module, context):
-    module.multiplyItemAttr("trackingSpeed", module.getModifiedChargeAttr("trackingSpeedMultiplier"))

eos/effects/angelsetbonus.py

@@ -1,14 +0,0 @@
-# angelsetbonus
-#
-# Used by:
-# Implants named like: grade Halo (18 of 18)
-runTime = "early"
-type = "passive"
-
-
-def handler(fit, implant, context):
-    fit.appliedImplants.filteredItemMultiply(
-        lambda implant: "signatureRadiusBonus" in implant.itemModifiedAttributes and
-                        "implantSetAngel" in implant.itemModifiedAttributes,
-        "signatureRadiusBonus",
-        implant.getModifiedItemAttr("implantSetAngel"))

eos/effects/antiwarpscramblingpassive.py

@@ -1,9 +0,0 @@
-# antiWarpScramblingPassive
-#
-# Used by:
-# Modules from group: Warp Core Stabilizer (8 of 8)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("warpScrambleStatus", module.getModifiedItemAttr("warpScrambleStrength"))

eos/effects/archaeologyskillvirusbonus.py

@@ -1,14 +0,0 @@
-# archaeologySkillVirusBonus
-#
-# Used by:
-# Modules named like: Emission Scope Sharpener (8 of 8)
-# Implant: Poteque 'Prospector' Archaeology AC-905
-# Implant: Poteque 'Prospector' Environmental Analysis EY-1005
-# Skill: Archaeology
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Archaeology"),
-                                     "virusCoherence", container.getModifiedItemAttr("virusCoherenceBonus") * level)

eos/effects/armorallrepairsystemsamountbonuspassive.py

@@ -1,12 +0,0 @@
-# armorAllRepairSystemsAmountBonusPassive
-#
-# Used by:
-# Implants named like: Exile Booster (4 of 4)
-# Implant: Antipharmakon Kosybo
-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"))

eos/effects/armordamageamountbonuscapitalarmorrepairers.py

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

eos/effects/armoredcommanddurationbonus.py

@@ -1,11 +0,0 @@
-# armoredCommandDurationBonus
-#
-# Used by:
-# Skill: Armored Command
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "buffDuration",
-                                  src.getModifiedItemAttr("durationBonus") * lvl)

eos/effects/armoredcommandmindlink.py

@@ -1,20 +0,0 @@
-# armoredCommandMindlink
-#
-# Used by:
-# Implant: Armored Command Mindlink
-# Implant: Federation Navy Command Mindlink
-# Implant: Imperial Navy Command Mindlink
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff2Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff1Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff4Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff3Multiplier",
-                                    src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "buffDuration",
-                                  src.getModifiedItemAttr("mindlinkBonus"))

eos/effects/armoredcommandstrengthbonus.py

@@ -1,17 +0,0 @@
-# armoredCommandStrengthBonus
-#
-# Used by:
-# Skill: Armored Command Specialist
-type = "passive"
-
-
-def handler(fit, src, context):
-    lvl = src.level
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff1Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff2Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff4Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff3Multiplier",
-                                    src.getModifiedItemAttr("commandStrengthBonus") * lvl)

eos/effects/armorhpbonusadd.py

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

eos/effects/armorhpbonusaddpassive.py

@@ -1,9 +0,0 @@
-# armorHPBonusAddPassive
-#
-# Used by:
-# Subsystems from group: Defensive Systems (9 of 12)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.increaseItemAttr("armorHP", module.getModifiedItemAttr("armorHPBonusAdd") or 0)

eos/effects/armorhpmultiply.py

@@ -1,10 +0,0 @@
-# armorHPMultiply
-#
-# Used by:
-# Modules from group: Armor Coating (202 of 202)
-# Modules from group: Armor Plating Energized (187 of 187)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("armorHP", module.getModifiedItemAttr("armorHPMultiplier"))

eos/effects/armorreinforcermassadd.py

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

eos/effects/armorrepair.py

@@ -1,12 +0,0 @@
-# armorRepair
-#
-# Used by:
-# Modules from group: Armor Repair Unit (105 of 105)
-runTime = "late"
-type = "active"
-
-
-def handler(fit, module, context):
-    amount = module.getModifiedItemAttr("armorDamageAmount")
-    speed = module.getModifiedItemAttr("duration") / 1000.0
-    fit.extraAttributes.increase("armorRepair", amount / speed)

eos/effects/armorrepairamountbonussubcap.py

@@ -1,10 +0,0 @@
-# armorRepairAmountBonusSubcap
-#
-# Used by:
-# Implants named like: grade Asklepian (15 of 18)
-type = "passive"
-
-
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", src.getModifiedItemAttr("armorRepairBonus"))

eos/effects/armorrepairprojectorfalloffbonus.py

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

eos/effects/armorrepairprojectormaxrangebonus.py

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

eos/effects/armorupgradesmasspenaltyreductionbonus.py

@@ -1,11 +0,0 @@
-# armorUpgradesMassPenaltyReductionBonus
-#
-# Used by:
-# Skill: Armor Layering
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Reinforcer",
-                                  "massAddition", container.getModifiedItemAttr("massPenaltyReduction") * level)

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"))

eos/effects/astrogeologyminingamountbonuspostpercentminingamountlocationshipmodulesrequiringmining.py

@@ -1,14 +0,0 @@
-# astrogeologyMiningAmountBonusPostPercentMiningAmountLocationShipModulesRequiringMining
-#
-# Used by:
-# Implants named like: Inherent Implants 'Highwall' Mining MX (3 of 3)
-# Implant: Michi's Excavation Augmentor
-# Skill: Astrogeology
-# Skill: Mining
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
-                                  "miningAmount", container.getModifiedItemAttr("miningAmountBonus") * level)

eos/effects/basemaxscandeviationmodifiermoduleonline2none.py

@@ -1,12 +0,0 @@
-# baseMaxScanDeviationModifierModuleOnline2None
-#
-# Used by:
-# Variations of module: Scan Pinpointing Array I (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
-                                    "baseMaxScanDeviation",
-                                    module.getModifiedItemAttr("maxScanDeviationModifierModule"),
-                                    stackingPenalties=True)

eos/effects/basemaxscandeviationmodifierrequiringastrometrics.py

@@ -1,14 +0,0 @@
-# baseMaxScanDeviationModifierRequiringAstrometrics
-#
-# Used by:
-# Implants named like: Poteque 'Prospector' Astrometric Pinpointing AP (3 of 3)
-# Skill: Astrometric Pinpointing
-# Skill: Astrometrics
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
-                                    "baseMaxScanDeviation",
-                                    container.getModifiedItemAttr("maxScanDeviationModifier") * level)

eos/effects/basesensorstrengthmodifiermodule.py

@@ -1,11 +0,0 @@
-# baseSensorStrengthModifierModule
-#
-# Used by:
-# Variations of module: Scan Rangefinding Array I (2 of 2)
-type = "passive"
-
-
-def handler(fit, module, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
-                                    "baseSensorStrength", module.getModifiedItemAttr("scanStrengthBonusModule"),
-                                    stackingPenalties=True)

eos/effects/basesensorstrengthmodifierrequiringastrometrics.py

@@ -1,18 +0,0 @@
-# baseSensorStrengthModifierRequiringAstrometrics
-#
-# Used by:
-# Modules from group: Scan Probe Launcher (4 of 7)
-# Implants named like: Poteque 'Prospector' Astrometric Rangefinding AR (3 of 3)
-# Implants named like: grade Virtue (10 of 12)
-# Modules named like: Gravity Capacitor Upgrade (8 of 8)
-# Skill: Astrometric Rangefinding
-# Skill: Astrometrics
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    penalized = False if "skill" in context or "implant" in context else True
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
-                                    "baseSensorStrength", container.getModifiedItemAttr("scanStrengthBonus") * level,
-                                    stackingPenalties=penalized)

eos/effects/battlecruiserdronespeed.py

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

eos/effects/battlecruisermetrange.py

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

eos/effects/battlecruisermhtrange.py

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

eos/effects/battlecruisermissilerange.py

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

eos/effects/battlecruisermptrange.py

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

eos/effects/bclargeenergyturretcapacitorneedbonus.py

@@ -1,10 +0,0 @@
-# bcLargeEnergyTurretCapacitorNeedBonus
-#
-# Used by:
-# Ship: Oracle
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                     "capacitorNeed", ship.getModifiedItemAttr("bcLargeTurretCap"))

eos/effects/bclargeenergyturretcpuneedbonus.py

@@ -1,10 +0,0 @@
-# bcLargeEnergyTurretCPUNeedBonus
-#
-# Used by:
-# Ship: Oracle
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                     "cpu", ship.getModifiedItemAttr("bcLargeTurretCPU"))

eos/effects/bclargeenergyturretpowerneedbonus.py

@@ -1,10 +0,0 @@
-# bcLargeEnergyTurretPowerNeedBonus
-#
-# Used by:
-# Ship: Oracle
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                     "power", ship.getModifiedItemAttr("bcLargeTurretPower"))

eos/effects/bclargehybridturretcapacitorneedbonus.py

@@ -1,11 +0,0 @@
-# bcLargeHybridTurretCapacitorNeedBonus
-#
-# Used by:
-# Ship: Naga
-# Ship: Talos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                     "capacitorNeed", ship.getModifiedItemAttr("bcLargeTurretCap"))

eos/effects/bclargehybridturretcpuneedbonus.py

@@ -1,11 +0,0 @@
-# bcLargeHybridTurretCPUNeedBonus
-#
-# Used by:
-# Ship: Naga
-# Ship: Talos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                     "cpu", ship.getModifiedItemAttr("bcLargeTurretCPU"))

eos/effects/bclargehybridturretpowerneedbonus.py

@@ -1,11 +0,0 @@
-# bcLargeHybridTurretPowerNeedBonus
-#
-# Used by:
-# Ship: Naga
-# Ship: Talos
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
-                                     "power", ship.getModifiedItemAttr("bcLargeTurretPower"))

eos/effects/bclargeprojectileturretcpuneedbonus.py

@@ -1,10 +0,0 @@
-# bcLargeProjectileTurretCPUNeedBonus
-#
-# Used by:
-# Ship: Tornado
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                     "cpu", ship.getModifiedItemAttr("bcLargeTurretCPU"))

eos/effects/bclargeprojectileturretpowerneedbonus.py

@@ -1,10 +0,0 @@
-# bcLargeProjectileTurretPowerNeedBonus
-#
-# Used by:
-# Ship: Tornado
-type = "passive"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                     "power", ship.getModifiedItemAttr("bcLargeTurretPower"))

eos/effects/biologytimebonusfixed.py

@@ -1,12 +0,0 @@
-# biologyTimeBonusFixed
-#
-# Used by:
-# Implants named like: Eifyr and Co. 'Alchemist' Biology BY (2 of 2)
-# Skill: Biology
-type = "passive"
-
-
-def handler(fit, container, context):
-    level = container.level if "skill" in context else 1
-    fit.boosters.filteredItemBoost(lambda bst: True, "boosterDuration",
-                                   container.getModifiedItemAttr("durationBonus") * level)

eos/effects/blockaderunnercloakcpupercentbonus.py

@@ -1,12 +0,0 @@
-# blockadeRunnerCloakCpuPercentBonus
-#
-# Used by:
-# Ships from group: Blockade Runner (4 of 4)
-type = "passive"
-runTime = "early"
-
-
-def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cloaking Device",
-                                  "cpu", ship.getModifiedItemAttr("eliteIndustrialCovertCloakBonus"),
-                                  skill="Transport Ships")

eos/effects/boosterarmorhppenalty.py

@@ -1,15 +0,0 @@
-# boosterArmorHpPenalty
-#
-# Used by:
-# Implants from group: Booster (12 of 62)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Armor Capacity"
-
-# Attribute that this effect targets
-attr = "boosterArmorHPPenalty"
-
-
-def handler(fit, booster, context):
-    fit.ship.boostItemAttr("armorHP", booster.getModifiedItemAttr(attr))

eos/effects/boosterarmorrepairamountpenalty.py

@@ -1,18 +0,0 @@
-# boosterArmorRepairAmountPenalty
-#
-# Used by:
-# Implants named like: Drop Booster (3 of 4)
-# Implants named like: Mindflood Booster (3 of 4)
-# Implants named like: Sooth Sayer Booster (3 of 4)
-type = "boosterSideEffect"
-
-# User-friendly name for the side effect
-displayName = "Armor Repair Amount"
-
-# Attribute that this effect targets
-attr = "boosterArmorRepairAmountPenalty"
-
-
-def handler(fit, booster, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Unit",
-                                  "armorDamageAmount", booster.getModifiedItemAttr(attr))