Bump version

fix proxy proto string strip

.appveyor.yml

@@ -1,18 +1,71 @@
 image:
-  - Visual Studio 2019
-  - macos
-clone_depth: 400
-
+  - Ubuntu2204
+  - Visual Studio 2022
+  - macos-catalina
 for:
   -
     matrix:
       only:
-        - image: Visual Studio 2019
+        - image: Ubuntu2204
     environment:
-      PYTHON: "C:\\Python37-x64"
+      APPVEYOR_SSH_KEY: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDhb96UEXy8yOy/f+riX/8kKbNx/lOfIZ4pP4Cw3Gj3DmnTwEnxtRtyc+xtaxOsKbt+7+EAXFpCzYX+jHMhtd0QtWB7dbey8DBg31g0f8C5EPquqROibVbhzr/F3f6/d52FFfq6Y/CWaAvLjezvipr+zOOsIFcVusqtXdPJQ/LtUJ0LS5d4lFiw5ELHSxHIpqwGwyb7PbR3ufEFoqbr8eYiCH+vlBob72ArPfo2f3u0sMvpGYmjVVu2jj4FEY2h89sLrGyFdNWBoyumRhkb38+WSAuyPa/Y21+g+S8sRzIlkwbxicGNMtrMIi6zHEIGAgA06Sw2psP807h730PPOVaWjUcU3ojNW8hH3nPizF74pT82+iP7/fFC4PXLP+tBa+8OoHC5yiO7QKUKprMSqVa1qOm8fHbrzglplKJXfzSfUtSE+AQ+HtHhuUWKI+0LBLDrsOJwI5hbsPOAuiZ5I3VfqfAOck6SH9TcmlapVmQEypc7d7oeeUtZSOuIWKXp068= dfx@aw"
+      APPIMAGE_TOOL: appimage-builder-x86_64.AppImage
+      DEPLOY_DIR: AppDir/opt/pyfa
+      # APPVEYOR_SSH_BLOCK: true
+    cache:
+      - /home/appveyor/.cache/pip -> requirements.txt
+    # init:
+    #   - sh: curl -sflL 'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-ssh.sh' | bash -e -
+    install:
+      - sh: sudo DEBIAN_FRONTEND=noninteractive apt-get -y update
+      # AppImage dependencies
+      - sh: sudo DEBIAN_FRONTEND=noninteractive apt-get -y install libfuse2
+      # Preparation script dependencies
+      - sh: sudo DEBIAN_FRONTEND=noninteractive apt-get -y install python3-wxgtk4.0 python3-sqlalchemy python3-logbook
+    before_build:
+      # Prepare pyfa data
+      - sh: find locale/ -type f -name "*.po" -exec msgen "{}" -o "{}" \;
+      - sh: python3 -B scripts/compile_lang.py
+      - sh: python3 -B scripts/dump_crowdin_progress.py
+      - sh: python3 -B db_update.py
+      - sh: export PYFA_VERSION="$(python3 -B scripts/dump_version.py)"
+      - sh: mkdir build
+      # Download packaging tool
+      - sh: curl -o $APPIMAGE_TOOL -L https://github.com/AppImageCrafters/appimage-builder/releases/download/v1.1.0/appimage-builder-1.1.0-x86_64.AppImage
+      - sh: chmod +x $APPIMAGE_TOOL
+    build_script:
+      - sh: mkdir -p AppDir/opt/pyfa
+      - sh: cp -r eos graphs gui imgs locale service utils eve.db config.py pyfa.py db_update.py README.md LICENSE version.yml AppDir/opt/pyfa/
+      - sh: mkdir -p AppDir/usr/share/icons/hicolor/64x64/apps/
+      - sh: cp imgs/gui/pyfa64.png AppDir/usr/share/icons/hicolor/64x64/apps/pyfa.png
+      - sh: ./$APPIMAGE_TOOL --recipe dist_assets/linux/AppImageBuilder.yml
+    after_build:
+      - sh: ls -la
+    artifacts:
+      - path: pyfa-$PYFA_VERSION-linux.AppImage
+    deploy:
+      tag: $PYFA_VERSION
+      release: pyfa $PYFA_VERSION
+      description: 'Release description'
+      provider: GitHub
+      auth_token:
+        secure: M94o0xMtzxrvlKpqMcXU2KfbJdd3aYJ3UxWzePUz/pkT1/Ojiis052CiLsLVyzJg
+      draft: true
+      force_update: false
+      # deploy on tag push only
+      on:
+        APPVEYOR_REPO_TAG: true
+  -
+    matrix:
+      only:
+        - image: Visual Studio 2022
+    environment:
+      PYTHON: "C:\\Python311-x64"
     # Should be enabled only for build process debugging
     # init:
     #   - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+    cache:
+      - C:\users\appveyor\appdata\local\pip\cache\ -> requirements.txt
     install:
       - ps: echo("OS version:")
       - ps: "[System.Environment]::OSVersion.Version"
@@ -49,10 +102,8 @@ for:
       # pip will build them from source using the MSVC compiler matching the
       # target Python version and architecture
       - ps: echo("Install pip requirements:")
-      # This one is needed to build wxpython 4.0.6 on windows
-      - cmd: "python -m pip install pathlib2"
       - cmd: "python -m pip install -r requirements.txt"
-      - cmd: "python -m pip install PyInstaller==3.6"
+      - cmd: "python -m pip install PyInstaller==6.1.0"
     before_build:
         # directory that will contain the built files
       - ps: $env:PYFA_DIST_DIR = "c:\projects\$env:APPVEYOR_PROJECT_SLUG\dist"
@@ -68,7 +119,7 @@ for:
         # Build gamedata DB
       - cmd: "python db_update.py"
       # Build command for PyInstaller
-      - cmd: "python -m PyInstaller --noupx --clean --windowed --noconsole -y pyfa.spec"
+      - cmd: "python -m PyInstaller --clean -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\
       # InnoScript EXE building. This is in a separate script because I don't feel like copying over the logic to AppVeyor script right now...
@@ -95,11 +146,14 @@ for:
   -
     matrix:
       only:
-        - image: macos
-    # Should be enabled only for build process debugging
+        - image: macos-catalina
+    environment:
+      APPVEYOR_SSH_KEY: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJDW/+oYNGOiPvwuwAL9tc/LQgg58aosIVpMYfepQZ20V+VZnHpZh8IRDA8Jo5xht19p2PksA+hFgqA0kpKtrSkuiWdE8rATQItfk4gf7yB0yGasJGGQZYazy9k/9XtmYkq2HHOOeEqdxvrICddJQ88MLCLT9lJENSUP/YS/yGcjZFXVxE11pTeIcqlCRU+3eYa1v7BeNvXIKNhZoK5orXWrtuH3cy8jrSns/u70aYfJ6B2jA8CnWnDbuvpeQtEY61SQqlKUsSArNa8NAsXj41wr3Ar9gAG9330w7EMTqlutk8HZO35uHI0q5qinUhaQYufPPrVkb2L/N+ZCfu0fnh appveyor"
+    cache:
+      - /Users/appveyor/Library/Caches/pip/ -> requirements.txt
     init:
     #   - sh: curl -sflL 'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-ssh.sh' | bash -e -
-      - sh: source ~/venv3.7/bin/activate
+      - sh: source ~/venv3.11/bin/activate
     install:
       - sh: bash scripts/osx-setup.sh
     build_script:
@@ -110,6 +164,9 @@ for:
     after_build:
       - sh: export PYFA_VERSION="$(python3 scripts/dump_version.py)"
       - sh: bash scripts/osx-package.sh
+#    on_finish:
+#      - sh: export APPVEYOR_SSH_BLOCK=true
+#      - sh: curl -sflL 'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-ssh.sh' | bash -e -
     artifacts:
       - path: dist/pyfa*-mac.zip
     before_deploy:

.gitignore

@@ -90,6 +90,7 @@ target/
 
 # pyenv
 .python-version
+PyfaEnv/
 
 # celery beat schedule file
 celerybeat-schedule
@@ -123,3 +124,6 @@ gitversion
 
 *.fsdbinary
 /locale/progress.json
+
+# vscode settings
+.vscode

README.md

@@ -1,27 +1,30 @@
 # pyfa
 
-[![Join us on Slack!](https://pyfainvite.azurewebsites.net/badge.svg)](https://pyfainvite.azurewebsites.net/) [![Build Status](https://travis-ci.org/pyfa-org/Pyfa.svg?branch=master)](https://travis-ci.org/pyfa-org/Pyfa)
+[![Build Status](https://ci.appveyor.com/api/projects/status/github/pyfa-org/pyfa?branch=master&svg=true)]([https://travis-ci.org/pyfa-org/Pyfa](https://ci.appveyor.com/project/pyfa-org/pyfa))
 
 ![pyfa](https://user-images.githubusercontent.com/275209/66119992-864be080-e5e2-11e9-994a-3a4368c9fad7.png)
 
 ## What is it?
 
-Pyfa, short for **py**thon **f**itting **a**ssistant, allows you to create, experiment with, and save ship fittings without being in game. Open source and written in Python, it is available on any platform where Python 3 and wxWidgets are available, including Windows, Mac OS X, and Linux.
+Pyfa, short for **py**thon **f**itting **a**ssistant, allows you to create, experiment with, and save ship fittings without being in game. Open source and written in Python, it is available on any platform where Python 3 and wxWidgets are available, including Windows, macOS, and Linux.
 
 ## Latest Version and Changelogs
 The latest version along with release notes can always be found on the project's [releases](https://github.com/pyfa-org/Pyfa/releases) page. Pyfa will notify you if you are running an outdated version.
 
 ## Installation
-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.
+Windows, macOS, and Linux users are supplied self-contained builds of pyfa on the [latest releases](https://github.com/pyfa-org/Pyfa/releases/latest) page.
 
-### OS X
-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:
+### Third Party Packages
+Please note that these packages are maintained by third-parties and are not evaluated by the pyfa developers.
+
+#### macOS
+Apart from the official release, there is also a [Homebrew](https://formulae.brew.sh/cask/pyfa) option for installing pyfa on macOS. Simply fire up in terminal:
 ```
-$ brew install Caskroom/cask/pyfa
+$ brew install --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.
+#### Linux Distro-specific Packages
+The following is a list of pyfa packages available for certain distributions. 
 
 * Arch: https://aur.archlinux.org/packages/pyfa/
 * Gentoo: https://github.com/ZeroPointEnergy/gentoo-pyfa-overlay

config.py

@@ -28,6 +28,7 @@ saveInRoot = False
 evemonMinVersion = "4081"
 
 minItemSearchLength = 3
+minItemSearchLengthCjk = 1
 
 pyfaPath = None
 savePath = None

db_update.py

@@ -117,8 +117,7 @@ def update_db():
         for k, v in compiled_data.items():
             row = {}
             row.update(v)
-            if keyIdName not in row:
-                row[keyIdName] = int(k)
+            row[keyIdName] = int(k)
             data.append(row)
         return data
 
@@ -139,16 +138,18 @@ def update_db():
         for row in data:
             if (
                 # Apparently people really want Civilian modules available
-                (row['typeName_en-us'].startswith('Civilian') and "Shuttle" not in row['typeName_en-us']) or
-                row['typeName_en-us'] == 'Capsule' or
-                row['groupID'] == 4033  # destructible effect beacons
+                (row['typeName_en-us'].startswith('Civilian') and "Shuttle" not in row['typeName_en-us'])
+                or row['typeName_en-us'] == 'Capsule'
+                or row['groupID'] == 4033  # destructible effect beacons
+                or re.match('AIR .+Booster.*', row['typeName_en-us'])
             ):
                 row['published'] = True
             # Nearly useless and clutter search results too much
             elif (
-                row['typeName_en-us'].startswith('Limited Synth ') or
-                row['typeName_en-us'].startswith('Expired ') or
-                row['typeName_en-us'].endswith(' Filament') and (
+                row['typeName_en-us'].startswith('Limited Synth ')
+                or row['typeName_en-us'].startswith('Expired ')
+                or re.match('Mining Blitz .+ Booster Dose .+', row['typeName_en-us'])
+                or row['typeName_en-us'].endswith(' Filament') and (
                     "'Needlejack'" not in row['typeName_en-us'] and
                     "'Devana'" not in row['typeName_en-us'] and
                     "'Pochven'" not in row['typeName_en-us'] and
@@ -616,6 +617,16 @@ def update_db():
         eos.db.gamedata_session.delete(cat)
 
     # Unused normally, can be useful for customizing items
+    def _copyItem(srcName, tgtTypeID, tgtName):
+        eveType = eos.db.gamedata_session.query(eos.gamedata.Item).filter(eos.gamedata.Item.name == srcName).one()
+        eos.db.gamedata_session.expunge(eveType)
+        sqlalchemy.orm.make_transient(eveType)
+        eveType.ID = tgtTypeID
+        for suffix in eos.config.translation_mapping.values():
+            setattr(eveType, f'typeName{suffix}', tgtName)
+        eos.db.gamedata_session.add(eveType)
+        eos.db.gamedata_session.flush()
+
     def _hardcodeAttribs(typeID, attrMap):
         for attrName, value in attrMap.items():
             try:
@@ -624,7 +635,7 @@ def update_db():
             except sqlalchemy.orm.exc.NoResultFound:
                 attrInfo = eos.db.gamedata_session.query(eos.gamedata.AttributeInfo).filter(eos.gamedata.AttributeInfo.name == attrName).one()
                 attr = eos.gamedata.Attribute()
-                attr.ID = attrInfo.ID
+                attr.attributeID = attrInfo.ID
                 attr.typeID = typeID
                 attr.value = value
                 eos.db.gamedata_session.add(attr)
@@ -640,6 +651,152 @@ def update_db():
             effect.effectName = effectName
             item.effects[effectName] = effect
 
+    def hardcodeShapash():
+        shapashTypeID = 1000000
+        _copyItem(srcName='Utu', tgtTypeID=shapashTypeID, tgtName='Shapash')
+        attrMap = {
+            # Fitting
+            'powerOutput': 50,
+            'cpuOutput': 225,
+            'capacitorCapacity': 420,
+            'rechargeRate': 187500,
+            # Slots
+            'hiSlots': 3,
+            'medSlots': 4,
+            'lowSlots': 4,
+            'launcherSlotsLeft': 0,
+            'turretSlotsLeft': 3,
+            # Rigs
+            'rigSlots': 2,
+            'rigSize': 1,
+            'upgradeCapacity': 400,
+            # Shield
+            'shieldCapacity': 575,
+            'shieldRechargeRate': 625000,
+            'shieldEmDamageResonance': 1 - 0.0,
+            'shieldThermalDamageResonance': 1 - 0.6,
+            'shieldKineticDamageResonance': 1 - 0.85,
+            'shieldExplosiveDamageResonance': 1 - 0.5,
+            # Armor
+            'armorHP': 1015,
+            'armorEmDamageResonance': 1 - 0.5,
+            'armorThermalDamageResonance': 1 - 0.675,
+            'armorKineticDamageResonance': 1 - 0.8375,
+            'armorExplosiveDamageResonance': 1 - 0.1,
+            # Structure
+            'hp': 1274,
+            'emDamageResonance': 1 - 0.33,
+            'thermalDamageResonance': 1 - 0.33,
+            'kineticDamageResonance': 1 - 0.33,
+            'explosiveDamageResonance': 1 - 0.33,
+            'mass': 1215000,
+            'volume': 29500,
+            'capacity': 165,
+            # Navigation
+            'maxVelocity': 325,
+            'agility': 3.467,
+            'warpSpeedMultiplier': 5.5,
+            # Drones
+            'droneCapacity': 75,
+            'droneBandwidth': 25,
+            # Targeting
+            'maxTargetRange': 49000,
+            'maxLockedTargets': 6,
+            'scanRadarStrength': 0,
+            'scanLadarStrength': 0,
+            'scanMagnetometricStrength': 9,
+            'scanGravimetricStrength': 0,
+            'signatureRadius': 39,
+            'scanResolution': 550,
+            # Misc
+            'energyWarfareResistance': 0,
+            'stasisWebifierResistance': 0,
+            'weaponDisruptionResistance': 0}
+        effectMap = {
+            100100: 'pyfaCustomShapashAfArAmount',
+            100101: 'pyfaCustomShapashAfShtTrackingOptimal',
+            100102: 'pyfaCustomShapashGfShtDamage',
+            100103: 'pyfaCustomShapashGfPointRange',
+            100104: 'pyfaCustomShapashGfPropOverheat',
+            100105: 'pyfaCustomShapashRolePlateMass',
+            100106: 'pyfaCustomShapashRoleHeat'}
+        _hardcodeAttribs(shapashTypeID, attrMap)
+        _hardcodeEffects(shapashTypeID, effectMap)
+
+    def hardcodeCybele():
+        cybeleTypeID = 1000001
+        _copyItem(srcName='Adrestia', tgtTypeID=cybeleTypeID, tgtName='Cybele')
+        attrMap = {
+            # Fitting
+            'powerOutput': 1284,
+            'cpuOutput': 400,
+            'capacitorCapacity': 2400,
+            'rechargeRate': 334000,
+            'hiSlots': 5,
+            'medSlots': 4,
+            'lowSlots': 6,
+            'launcherSlotsLeft': 0,
+            'turretSlotsLeft': 5,
+            # Rigs
+            'rigSlots': 2,
+            'rigSize': 2,
+            'upgradeCapacity': 400,
+            # Shield
+            'shieldCapacity': 1200,
+            'shieldRechargeRate': 1250000,
+            'shieldEmDamageResonance': 1 - 0.0,
+            'shieldThermalDamageResonance': 1 - 0.5,
+            'shieldKineticDamageResonance': 1 - 0.9,
+            'shieldExplosiveDamageResonance': 1 - 0.5,
+            # Armor
+            'armorHP': 1900,
+            'armorEmDamageResonance': 1 - 0.5,
+            'armorThermalDamageResonance': 1 - 0.69,
+            'armorKineticDamageResonance': 1 - 0.85,
+            'armorExplosiveDamageResonance': 1 - 0.1,
+            # Structure
+            'hp': 2300,
+            'emDamageResonance': 1 - 0.33,
+            'thermalDamageResonance': 1 - 0.33,
+            'kineticDamageResonance': 1 - 0.33,
+            'explosiveDamageResonance': 1 - 0.33,
+            'mass': 11100000,
+            'volume': 112000,
+            'capacity': 450,
+            # Navigation
+            'maxVelocity': 235,
+            'agility': 0.457,
+            'warpSpeedMultiplier': 4.5,
+            # Drones
+            'droneCapacity': 100,
+            'droneBandwidth': 50,
+            # Targeting
+            'maxTargetRange': 60000,
+            'maxLockedTargets': 6,
+            'scanRadarStrength': 0,
+            'scanLadarStrength': 0,
+            'scanMagnetometricStrength': 15,
+            'scanGravimetricStrength': 0,
+            'signatureRadius': 115,
+            'scanResolution': 330,
+            # Misc
+            'energyWarfareResistance': 0,
+            'stasisWebifierResistance': 0,
+            'weaponDisruptionResistance': 0}
+        effectMap = {
+            100200: 'pyfaCustomCybeleHacMhtFalloff',
+            100201: 'pyfaCustomCybeleHacMhtTracking',
+            100202: 'pyfaCustomCybeleGcMhtDamage',
+            100203: 'pyfaCustomCybeleGcArAmount',
+            100204: 'pyfaCustomCybeleGcPointRange',
+            100205: 'pyfaCustomCybeleRoleVelocity',
+            100206: 'pyfaCustomCybeleRolePlateMass'}
+        _hardcodeAttribs(cybeleTypeID, attrMap)
+        _hardcodeEffects(cybeleTypeID, effectMap)
+
+    # hardcodeShapash()
+    # hardcodeCybele()
+
     eos.db.gamedata_session.commit()
     eos.db.gamedata_engine.execute('VACUUM')
 

dist_assets/linux/AppImageBuilder.yml

@@ -0,0 +1,70 @@
+version: 1
+
+AppDir:
+  path: ./AppDir
+
+  app_info:
+    id: pyfa
+    name: pyfa
+    icon: pyfa
+    version: '{{PYFA_VERSION}}'
+    exec: usr/bin/python3.11
+    exec_args: "-s $APPDIR/opt/pyfa/pyfa.py $@"
+
+  apt:
+    arch: [ amd64 ]
+    sources:
+    - sourceline: 'deb http://us.archive.ubuntu.com/ubuntu jammy main restricted universe multiverse'
+      key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x871920d1991bc93c'
+    - sourceline: 'deb http://us.archive.ubuntu.com/ubuntu jammy-updates main restricted universe multiverse'
+      key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x871920d1991bc93c'
+    - sourceline: 'deb http://us.archive.ubuntu.com/ubuntu jammy-backports main restricted universe multiverse'
+      key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x871920d1991bc93c'
+    - sourceline: 'deb http://us.archive.ubuntu.com/ubuntu jammy-security main restricted universe multiverse'
+      key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x871920d1991bc93c'
+    - sourceline: 'deb https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu jammy main'
+      key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xf23c5a6cf475977595c89f51ba6932366a755776'
+
+    include:
+      - python3.11
+      # wx dependencies
+      - libgtk-3-0
+      - librsvg2-common  # GTK3 recommendation; without it, search in char editor crashes
+      - libwebkit2gtk-4.0-37  # Needed for wx's HTML lib
+    exclude:
+      - hicolor-icon-theme
+      - humanity-icon-theme
+      - ubuntu-mono
+
+  after_bundle:
+    # Install python dependencies to bundled interpreter
+    - export PYTHONHOME="AppDir/usr"
+    - export PYTHONPATH="AppDir/usr/lib/python3.11/site-packages"
+    - curl -L https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+    - AppDir/usr/bin/python3.11 get-pip.py
+    # Just to bundle certificates with AppImage
+    - AppDir/usr/bin/python3.11 -s -m pip install certifi
+    - AppDir/usr/bin/python3.11 -s -m pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04 -r requirements.txt
+
+  files:
+    exclude:
+      - usr/lib/x86_64-linux-gnu/gconv
+      - usr/share/man
+      - usr/share/doc/*/README.*
+      - usr/share/doc/*/changelog.*
+      - usr/share/doc/*/NEWS.*
+      - usr/share/doc/*/TODO.*
+      - usr/include
+
+  runtime:
+    env:
+      PYTHONHOME: '${APPDIR}/usr'
+      PYTHONPATH: '${APPDIR}/usr/lib/python3.11/site-packages'
+      SSL_CERT_FILE: '${APPDIR}/usr/local/lib/python3.11/dist-packages/certifi/cacert.pem'
+      # Workaround for https://github.com/AppImageCrafters/appimage-builder/issues/336
+      XDG_DATA_DIRS: '${APPDIR}/usr/local/share:${APPDIR}/usr/share:/usr/local/share:/usr/share:$XDG_DATA_DIRS'
+
+AppImage:
+  sign-key: None
+  arch: x86_64
+  file_name: 'pyfa-{{PYFA_VERSION}}-linux.AppImage'

dist_assets/linux/pyfa-linux.spec

@@ -1,70 +0,0 @@
-# -*- mode: python -*-
-
-import os
-from itertools import chain
-import subprocess
-
-label = subprocess.check_output([
-    "git", "describe", "--tags"]).strip()
-
-with open('gitversion', 'w+') as f:
-    f.write(label.decode())
-
-block_cipher = None
-
-
-added_files = [
-             ( 'imgs/gui/*.png', 'imgs/gui' ),
-             ( 'imgs/gui/*.gif', 'imgs/gui' ),
-             ( 'imgs/icons/*.png', 'imgs/icons' ),
-             ( 'imgs/renders/*.png', 'imgs/renders' ),
-             ( 'dist_assets/win/pyfa.ico', '.' ),
-             ( 'dist_assets/cacert.pem', '.' ),
-             ( 'eve.db', '.' ),
-             ( 'README.md', '.' ),
-             ( 'LICENSE', '.' ),
-             ( 'gitversion', '.' ),
-             ]
-
-import_these = []
-
-# Walk directories that do dynamic importing
-paths = ('eos/effects', 'eos/db/migrations', 'service/conversions')
-for root, folders, files in chain.from_iterable(os.walk(path) for path in paths):
-    for file_ in files:
-        if file_.endswith(".py") and not file_.startswith("_"):
-            mod_name = "{}.{}".format(
-                root.replace("/", "."),
-                file_.split(".py")[0],
-            )
-            import_these.append(mod_name)
-
-
-a = Analysis(['pyfa.py'],
-             pathex=[],
-             binaries=[],
-             datas=added_files,
-             hiddenimports=import_these,
-             hookspath=[],
-             runtime_hooks=[],
-             excludes=[],
-             win_no_prefer_redirects=False,
-             win_private_assemblies=False,
-             cipher=block_cipher)
-pyz = PYZ(a.pure, a.zipped_data,
-             cipher=block_cipher)
-exe = EXE(pyz,
-          a.scripts,
-          exclude_binaries=True,
-          name='pyfa',
-          debug=False,
-          strip=False,
-          upx=True,
-          console=True )
-coll = COLLECT(exe,
-               a.binaries,
-               a.zipfiles,
-               a.datas,
-               strip=False,
-               upx=True,
-               name='pyfa')

dist_assets/mac/pyfa.spec

@@ -80,6 +80,7 @@ exe = EXE(pyz,
 app = BUNDLE(
     exe,
     name='pyfa.app',
+    version=os.getenv('PYFA_VERSION'),
     icon=icon,
     bundle_identifier=None,
     info_plist={
@@ -88,5 +89,7 @@ app = BUNDLE(
         'CFBundleName': 'pyfa',
         'CFBundleDisplayName': 'pyfa',
         'CFBundleIdentifier': 'org.pyfaorg.pyfa',
+        'CFBundleVersion': os.getenv('PYFA_VERSION'),
+        'CFBundleShortVersionString': os.getenv('PYFA_VERSION'),
     }
 )

dist_assets/win/pyfa-setup.iss

@@ -42,10 +42,10 @@ CloseApplications=yes
 DefaultDirName={pf}\{#MyAppName}
 DefaultGroupName={#MyAppName}
 AllowNoIcons=yes
-LicenseFile={#MyAppDir}\LICENSE
+LicenseFile={#MyAppDir}\app\LICENSE
 OutputDir={#MyOutputDir}
 OutputBaseFilename={#MyOutputFile}
-SetupIconFile={#MyAppDir}\pyfa.ico
+SetupIconFile={#MyAppDir}\app\pyfa.ico
 SolidCompression=yes
 
 [Languages]

docs/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-midnight

docs/callback.html

@@ -0,0 +1,104 @@
+<html>
+  <head>
+    <meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
+    <title>pyfa Authentication Proxy</title>
+    <style type="text/css">
+
+    
+      body { width: 700px; margin: 150px auto; }
+      h1 { font-size: 40px; }
+      h2 { font-size: 32px; }
+      body { font: 20px Helvetica, sans-serif; color: #333; }
+      #article { display: block; text-align: left; width: 650px; margin: 0 auto; }
+      .hidden { display:none; }
+      .success { color: #28a745; }
+      .error { color: #dc3545; }
+      textarea { width: 100%; height: 100px; }
+      hr { border-width: 1px 0 0 0; border-style: solid; border-color: #333; }
+      button { cursor: pointer; background-color: white; border: 1px solid #333; color: #333; padding: 8px 11px; text-align: center; text-decoration: none; display: inline-block; }
+      @media (prefers-color-scheme: dark) {
+          body { background-color: #333; color: white; }
+          textarea { width: 100%; height: 100px; background-color: #aaa;}
+          button { background-color: #333; border: 1px solid white; color: white;  }
+          hr { border-color: white; }
+      }
+    </style>
+  </head>
+
+  <body>
+    <!-- Layout from Short Circuit's CREST login. Shout out! https://github.com/farshield/shortcircuit -->
+      <h1>pyfa</h1>
+      <div id="mode0" class="hidden">
+        <p id="mode0-msg">Processing request...</p>
+        <button id="showBtn" onClick="showCode()">Show Code</button>
+      </div>
+      <div id="mode1" class="hidden">
+        <p id="mode1-p">Please copy and paste the token below into pyfa.</p>
+        <textarea id="authCodeText" readonly></textarea>
+      </div>
+      
+    </div>
+    <script>
+      debugger;
+      function showCode() {
+        var element = document.getElementById(`mode1`);
+        element.classList.remove("hidden");
+        element = document.getElementById(`showBtn`);
+        element.classList.add("hidden"); 
+      }
+
+      function httpPostAsync(url, callback)
+      {
+          var xmlHttp = new XMLHttpRequest();
+          xmlHttp.onreadystatechange = function() { 
+              if (xmlHttp.readyState == XMLHttpRequest.DONE)
+                  callback(xmlHttp);
+          }
+          xmlHttp.open("GET", url, true); // true for asynchronous 
+          xmlHttp.send(null);
+      }
+
+      const urlSearchParams = new URLSearchParams(window.location.search);
+      const params = Object.fromEntries(urlSearchParams.entries());
+      let stateInfo;
+      try {
+        stateInfo = JSON.parse(atob(params.state))
+      } catch (err) {
+        // something has happened and we cannot continue.
+        // todo: show a simple message and exit.
+        throw err;
+      }
+
+      // we always want to show the text box for manual.
+      var element = document.getElementById(`mode${stateInfo.mode}`);
+      element.classList.remove("hidden");
+
+      if (stateInfo.mode === 0) {
+        let p = document.getElementById(`mode1-p`);
+        p.prepend(document.createElement("hr"))
+      }
+      debugger;
+      document.getElementById(`authCodeText`).value = btoa(JSON.stringify(params))
+
+      if (stateInfo.mode == 0) { // auto / server mode 
+        httpPostAsync(stateInfo.redirect + window.location.search, (req)=>{
+          debugger;
+          const msgDiv = document.getElementById(`mode0-msg`);
+          if (req.status === 200) {
+            msgDiv.innerHTML ="<span class='success'>Success!</span> You may close this window and return to the application.";
+            return;
+          } else if (req.status === 0){
+            msgDiv.innerHTML = "<span class='error'>Error!</span> Server response not received.<p><small>The local pyfa server may have timed out, or may not have started correctly.</small></p>";
+          } else if (req.status === 400){
+            msgDiv.innerHTML = `<span class='error'>Error!</span> <p><small>${req.responseText}</small></p>`
+          } else {
+            msgDiv.innerHTML = `<span class='error'>Error!</span> <p><small>There was an unknown error. Please report this to the pyfa issues page.</p><p><textarea readdonly>${req.responseText}</textarea></small></p>`
+          }
+          showCode()
+          // todo: bad request error when it's not  an error itself, but rather
+        })
+        // todo: post message to local EVE server
+      }
+    </script>
+  </body>
+</html>

docs/index.md

@@ -0,0 +1,37 @@
+## Welcome to GitHub Pages
+
+You can use the [editor on GitHub](https://github.com/pyfa-org/Pyfa/edit/gh-pages/index.md) to maintain and preview the content for your website in Markdown files.
+
+Whenever you commit to this repository, GitHub Pages will run [Jekyll](https://jekyllrb.com/) to rebuild the pages in your site, from the content in your Markdown files.
+
+### Markdown
+
+Markdown is a lightweight and easy-to-use syntax for styling your writing. It includes conventions for
+
+```markdown
+Syntax highlighted code block
+
+# Header 1
+## Header 2
+### Header 3
+
+- Bulleted
+- List
+
+1. Numbered
+2. List
+
+**Bold** and _Italic_ and `Code` text
+
+[Link](url) and ![Image](src)
+```
+
+For more details see [GitHub Flavored Markdown](https://guides.github.com/features/mastering-markdown/).
+
+### Jekyll Themes
+
+Your Pages site will use the layout and styles from the Jekyll theme you have selected in your [repository settings](https://github.com/pyfa-org/Pyfa/settings/pages). The name of this theme is saved in the Jekyll `_config.yml` configuration file.
+
+### Support or Contact
+
+Having trouble with Pages? Check out our [documentation](https://docs.github.com/categories/github-pages-basics/) or [contact support](https://support.github.com/contact) and we’ll help you sort it out.

eos/db/gamedata/dynamicAttributes.py

@@ -51,7 +51,7 @@ mapper(DynamicItemAttribute, dynamicAttributes_table,
        properties={"info": relation(AttributeInfo, lazy=False)})
 
 mapper(DynamicItemItem, dynamicApplicable_table, properties={
-           "mutaplasmid": relation(DynamicItem),
+           "mutaplasmid": relation(DynamicItem, viewonly=True),
        })
 
 DynamicItemAttribute.ID = association_proxy("info", "attributeID")

eos/db/gamedata/item.py

@@ -69,7 +69,8 @@ props = {
                primaryjoin=dynamicApplicable_table.c.applicableTypeID == items_table.c.typeID,
                secondaryjoin=dynamicApplicable_table.c.typeID == DynamicItem.typeID,
                secondary=dynamicApplicable_table,
-               backref="applicableItems"
+               backref="applicableItems",
+               viewonly=True
            )
 }
 

eos/db/saveddata/fit.py

@@ -175,12 +175,13 @@ mapper(es_Fit, fits_table,
                    collection_class=HandledModuleList,
                    primaryjoin=and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == False),  # noqa
                    order_by=modules_table.c.position,
+                   overlaps='owner',
                    cascade='all, delete, delete-orphan'),
            "_Fit__projectedModules": relation(
                    Module,
                    collection_class=HandledProjectedModList,
+                   overlaps='owner, _Fit__modules',
                    cascade='all, delete, delete-orphan',
-                   single_parent=True,
                    primaryjoin=and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == True)),  # noqa
            "owner": relation(
                    User,
@@ -190,37 +191,37 @@ mapper(es_Fit, fits_table,
            "_Fit__boosters": relation(
                    Booster,
                    collection_class=HandledBoosterList,
-                   cascade='all, delete, delete-orphan',
-                   single_parent=True),
+                   overlaps='owner',
+                   cascade='all, delete, delete-orphan'),
            "_Fit__drones": relation(
                    Drone,
                    collection_class=HandledDroneCargoList,
+                   overlaps='owner',
                    cascade='all, delete, delete-orphan',
-                   single_parent=True,
                    primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == False)),  # noqa
            "_Fit__fighters": relation(
                    Fighter,
                    collection_class=HandledDroneCargoList,
+                   overlaps='owner',
                    cascade='all, delete, delete-orphan',
-                   single_parent=True,
                    primaryjoin=and_(fighters_table.c.fitID == fits_table.c.ID, fighters_table.c.projected == False)),  # noqa
            "_Fit__cargo": relation(
                    Cargo,
                    collection_class=HandledDroneCargoList,
+                   overlaps='owner',
                    cascade='all, delete, delete-orphan',
-                   single_parent=True,
                    primaryjoin=and_(cargo_table.c.fitID == fits_table.c.ID)),
            "_Fit__projectedDrones": relation(
                    Drone,
                    collection_class=HandledProjectedDroneList,
+                   overlaps='owner, _Fit__drones',
                    cascade='all, delete, delete-orphan',
-                   single_parent=True,
                    primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == True)),  # noqa
            "_Fit__projectedFighters": relation(
                    Fighter,
                    collection_class=HandledProjectedDroneList,
+                   overlaps='owner, _Fit__fighters',
                    cascade='all, delete, delete-orphan',
-                   single_parent=True,
                    primaryjoin=and_(fighters_table.c.fitID == fits_table.c.ID, fighters_table.c.projected == True)),  # noqa
            "_Fit__implants": relation(
                    Implant,

eos/saveddata/damagePattern.py

@@ -59,106 +59,115 @@ BUILTINS = OrderedDict([
     (-20, (_c(_t('Exotic Plasma')) + _t('Baryon'), 0, 59737, 0, 40263)),
     (-21, (_c(_t('Exotic Plasma')) + _t('Tetryon'), 0, 69208, 0, 30792)),
     (-22, (_c(_t('Exotic Plasma')) + '|' + _t('[T2] Occult'), 0, 55863, 0, 44137)),
-    (-23, (_c(_t('Hybrid Charges')) + '|' + _t('[T2] Spike'), 0, 4, 4, 0)),
-    (-24, (_c(_t('Hybrid Charges')) + '|' + _t('[T2] Null'), 0, 6, 5, 0)),
-    (-25, (_c(_t('Hybrid Charges')) + _t('Iron'), 0, 2, 3, 0)),
-    (-26, (_c(_t('Hybrid Charges')) + _t('Tungsten'), 0, 2, 4, 0)),
-    (-27, (_c(_t('Hybrid Charges')) + _t('Iridium'), 0, 3, 4, 0)),
-    (-28, (_c(_t('Hybrid Charges')) + _t('Lead'), 0, 3, 5, 0)),
-    (-29, (_c(_t('Hybrid Charges')) + _t('Thorium'), 0, 4, 5, 0)),
-    (-30, (_c(_t('Hybrid Charges')) + _t('Uranium'), 0, 4, 6, 0)),
-    (-31, (_c(_t('Hybrid Charges')) + _t('Plutonium'), 0, 5, 6, 0)),
-    (-32, (_c(_t('Hybrid Charges')) + _t('Antimatter'), 0, 5, 7, 0)),
-    (-33, (_c(_t('Hybrid Charges')) + '|' + _t('[T2] Javelin'), 0, 8, 6, 0)),
-    (-34, (_c(_t('Hybrid Charges')) + '|' + _t('[T2] Void'), 0, 7.7, 7.7, 0)),
-    (-35, (_c(_t('Projectile Ammo')) + '|' + _t('[T2] Tremor'), 0, 0, 3, 5)),
-    (-36, (_c(_t('Projectile Ammo')) + '|' + _t('[T2] Barrage'), 0, 0, 5, 6)),
-    (-37, (_c(_t('Projectile Ammo')) + _t('Carbonized Lead'), 0, 0, 4, 1)),
-    (-38, (_c(_t('Projectile Ammo')) + _t('Nuclear'), 0, 0, 1, 4)),
-    (-39, (_c(_t('Projectile Ammo')) + _t('Proton'), 3, 0, 2, 0)),
-    (-40, (_c(_t('Projectile Ammo')) + _t('Depleted Uranium'), 0, 3, 2, 3)),
-    (-41, (_c(_t('Projectile Ammo')) + _t('Titanium Sabot'), 0, 0, 6, 2)),
-    (-42, (_c(_t('Projectile Ammo')) + _t('EMP'), 9, 0, 1, 2)),
-    (-43, (_c(_t('Projectile Ammo')) + _t('Phased Plasma'), 0, 10, 2, 0)),
-    (-44, (_c(_t('Projectile Ammo')) + _t('Fusion'), 0, 0, 2, 10)),
-    (-45, (_c(_t('Projectile Ammo')) + '|' + _t('[T2] Quake'), 0, 0, 5, 9)),
-    (-46, (_c(_t('Projectile Ammo')) + '|' + _t('[T2] Hail'), 0, 0, 3.3, 12.1)),
-    (-47, (_c(_t('Missiles')) + _t('Mjolnir'), 1, 0, 0, 0)),
-    (-48, (_c(_t('Missiles')) + _t('Inferno'), 0, 1, 0, 0)),
-    (-49, (_c(_t('Missiles')) + _t('Scourge'), 0, 0, 1, 0)),
-    (-50, (_c(_t('Missiles')) + _t('Nova'), 0, 0, 0, 1)),
-    (-51, (_c(_t('Bombs')) + _t('Electron Bomb'), 6400, 0, 0, 0)),
-    (-52, (_c(_t('Bombs')) + _t('Scorch Bomb'), 0, 6400, 0, 0)),
-    (-53, (_c(_t('Bombs')) + _t('Concussion Bomb'), 0, 0, 6400, 0)),
-    (-54, (_c(_t('Bombs')) + _t('Shrapnel Bomb'), 0, 0, 0, 6400)),
+    # Different sizes of packs do different damage ratios, the values here
+    # are average of ratios across sizes
+    (-23, (_c(_t('Condenser Packs')) + '|' + _t('[T2] StrikeSnipe'), 51817, 0, 48183, 0)),
+    (-24, (_c(_t('Condenser Packs')) + _t('MesmerFlux'), 76476, 0, 23524, 0)),
+    (-25, (_c(_t('Condenser Packs')) + _t('SlamBolt'), 23376, 0, 76624, 0)),
+    (-26, (_c(_t('Condenser Packs')) + _t('BlastShot'), 19820, 0, 80180, 0)),
+    (-27, (_c(_t('Condenser Packs')) + _t('GalvaSurge'), 80206, 0, 19794, 0)),
+    (-28, (_c(_t('Condenser Packs')) + '|' + _t('[T2] ElectroPunch'), 50547, 0, 49453, 0)),
+
+    (-29, (_c(_t('Hybrid Charges')) + '|' + _t('[T2] Spike'), 0, 4, 4, 0)),
+    (-30, (_c(_t('Hybrid Charges')) + '|' + _t('[T2] Null'), 0, 6, 5, 0)),
+    (-31, (_c(_t('Hybrid Charges')) + _t('Iron'), 0, 2, 3, 0)),
+    (-32, (_c(_t('Hybrid Charges')) + _t('Tungsten'), 0, 2, 4, 0)),
+    (-33, (_c(_t('Hybrid Charges')) + _t('Iridium'), 0, 3, 4, 0)),
+    (-34, (_c(_t('Hybrid Charges')) + _t('Lead'), 0, 3, 5, 0)),
+    (-35, (_c(_t('Hybrid Charges')) + _t('Thorium'), 0, 4, 5, 0)),
+    (-36, (_c(_t('Hybrid Charges')) + _t('Uranium'), 0, 4, 6, 0)),
+    (-37, (_c(_t('Hybrid Charges')) + _t('Plutonium'), 0, 5, 6, 0)),
+    (-38, (_c(_t('Hybrid Charges')) + _t('Antimatter'), 0, 5, 7, 0)),
+    (-39, (_c(_t('Hybrid Charges')) + '|' + _t('[T2] Javelin'), 0, 8, 6, 0)),
+    (-40, (_c(_t('Hybrid Charges')) + '|' + _t('[T2] Void'), 0, 7.7, 7.7, 0)),
+    (-41, (_c(_t('Projectile Ammo')) + '|' + _t('[T2] Tremor'), 0, 0, 3, 5)),
+    (-42, (_c(_t('Projectile Ammo')) + '|' + _t('[T2] Barrage'), 0, 0, 5, 6)),
+    (-43, (_c(_t('Projectile Ammo')) + _t('Carbonized Lead'), 0, 0, 4, 1)),
+    (-44, (_c(_t('Projectile Ammo')) + _t('Nuclear'), 0, 0, 1, 4)),
+    (-45, (_c(_t('Projectile Ammo')) + _t('Proton'), 3, 0, 2, 0)),
+    (-46, (_c(_t('Projectile Ammo')) + _t('Depleted Uranium'), 0, 3, 2, 3)),
+    (-47, (_c(_t('Projectile Ammo')) + _t('Titanium Sabot'), 0, 0, 6, 2)),
+    (-48, (_c(_t('Projectile Ammo')) + _t('EMP'), 9, 0, 1, 2)),
+    (-49, (_c(_t('Projectile Ammo')) + _t('Phased Plasma'), 0, 10, 2, 0)),
+    (-50, (_c(_t('Projectile Ammo')) + _t('Fusion'), 0, 0, 2, 10)),
+    (-51, (_c(_t('Projectile Ammo')) + '|' + _t('[T2] Quake'), 0, 0, 5, 9)),
+    (-52, (_c(_t('Projectile Ammo')) + '|' + _t('[T2] Hail'), 0, 0, 3.3, 12.1)),
+    (-53, (_c(_t('Missiles')) + _t('Mjolnir'), 1, 0, 0, 0)),
+    (-54, (_c(_t('Missiles')) + _t('Inferno'), 0, 1, 0, 0)),
+    (-55, (_c(_t('Missiles')) + _t('Scourge'), 0, 0, 1, 0)),
+    (-56, (_c(_t('Missiles')) + _t('Nova'), 0, 0, 0, 1)),
+    (-57, (_c(_t('Bombs')) + _t('Electron Bomb'), 6400, 0, 0, 0)),
+    (-58, (_c(_t('Bombs')) + _t('Scorch Bomb'), 0, 6400, 0, 0)),
+    (-59, (_c(_t('Bombs')) + _t('Concussion Bomb'), 0, 0, 6400, 0)),
+    (-60, (_c(_t('Bombs')) + _t('Shrapnel Bomb'), 0, 0, 0, 6400)),
     # Source: ticket #2067 and #2265
-    (-55, (_c(_t('NPC')) + _c(_t('Abyssal')) + _t('All'), 126, 427, 218, 230)),
-    (-109, (_c(_t('NPC')) + _c(_t('Abyssal')) + _t('Angel'), 450, 72, 80, 398)),
-    (-107, (_c(_t('NPC')) + _c(_t('Abyssal')) + _t('Concord'), 53, 559, 94, 295)),
-    (-56, (_c(_t('NPC')) + _c(_t('Abyssal')) + _t('Drifter'), 250, 250, 250, 250)),
-    (-57, (_c(_t('NPC')) + _c(_t('Abyssal')) + _t('Drones'), 250, 250, 250, 250)),
-    (-58, (_c(_t('NPC')) + _c(_t('Abyssal')) + _t('Overmind'), 0, 410, 590, 0)),
-    (-108, (_c(_t('NPC')) + _c(_t('Abyssal')) + _t('Sansha'), 569, 431, 0, 0)),
-    (-59, (_c(_t('NPC')) + _c(_t('Abyssal')) + _t('Seeker'), 402, 402, 98, 98)),
-    (-60, (_c(_t('NPC')) + _c(_t('Abyssal')) + _t('Sleeper'), 313, 313, 187, 187)),
-    (-61, (_c(_t('NPC')) + _c(_t('Abyssal')) + _t('Triglavian'), 0, 615, 0, 385)),
-    (-62, (_c(_t('NPC')) + _c(_t('Asteroid')) + _t('Angel Cartel'), 1838, 562, 2215, 3838)),
-    (-63, (_c(_t('NPC')) + _c(_t('Asteroid')) + _t('Blood Raiders'), 5067, 4214, 0, 0)),
-    (-64, (_c(_t('NPC')) + _c(_t('Asteroid')) + _t('Guristas'), 0, 1828, 7413, 0)),
-    (-65, (_c(_t('NPC')) + _c(_t('Asteroid')) + _t('Rogue Drone'), 394, 666, 1090, 1687)),
-    (-66, (_c(_t('NPC')) + _c(_t('Asteroid')) + _t('Sanshas Nation'), 5586, 4112, 0, 0)),
-    (-67, (_c(_t('NPC')) + _c(_t('Asteroid')) + _t('Serpentis'), 0, 5373, 4813, 0)),
-    (-68, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Cruor (Blood Raiders)'), 90, 90, 0, 0)),
-    (-69, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Dramiel (Angel)'), 55, 0, 20, 96)),
-    (-70, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Daredevil (Serpentis)'), 0, 110, 154, 0)),
-    (-71, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Succubus (Sanshas Nation)'), 135, 30, 0, 0)),
-    (-72, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Worm (Guristas)'), 0, 0, 228, 0)),
-    (-73, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Enyo'), 0, 147, 147, 0)),
-    (-74, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Hawk'), 0, 0, 247, 0)),
-    (-75, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Jaguar'), 36, 0, 50, 182)),
-    (-76, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Vengeance'), 232, 0, 0, 0)),
-    (-77, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Ashimmu (Blood Raiders)'), 260, 100, 0, 0)),
-    (-78, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Talos'), 0, 413, 413, 0)),
-    (-79, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Sentinel'), 0, 75, 0, 90)),
-    (-80, (_c(_t('NPC')) + _c(_t('Deadspace')) + _t('Angel Cartel'), 369, 533, 1395, 3302)),
-    (-81, (_c(_t('NPC')) + _c(_t('Deadspace')) + _t('Blood Raiders'), 6040, 5052, 10, 15)),
-    (-82, (_c(_t('NPC')) + _c(_t('Deadspace')) + _t('Guristas'), 0, 1531, 9680, 0)),
-    (-83, (_c(_t('NPC')) + _c(_t('Deadspace')) + _t('Rogue Drone'), 276, 1071, 1069, 871)),
-    (-84, (_c(_t('NPC')) + _c(_t('Deadspace')) + _t('Sanshas Nation'), 3009, 2237, 0, 0)),
-    (-85, (_c(_t('NPC')) + _c(_t('Deadspace')) + _t('Serpentis'), 0, 3110, 1929, 0)),
+    (-61, (_c(_t('NPC')) + _c(_t('Abyssal')) + _t('All'), 126, 427, 218, 230)),
+    (-62, (_c(_t('NPC')) + _c(_t('Abyssal')) + _t('Angel'), 450, 72, 80, 398)),
+    (-63, (_c(_t('NPC')) + _c(_t('Abyssal')) + _t('Concord'), 53, 559, 94, 295)),
+    (-64, (_c(_t('NPC')) + _c(_t('Abyssal')) + _t('Drifter'), 250, 250, 250, 250)),
+    (-65, (_c(_t('NPC')) + _c(_t('Abyssal')) + _t('Drones'), 250, 250, 250, 250)),
+    (-66, (_c(_t('NPC')) + _c(_t('Abyssal')) + _t('Overmind'), 0, 410, 590, 0)),
+    (-67, (_c(_t('NPC')) + _c(_t('Abyssal')) + _t('Sansha'), 569, 431, 0, 0)),
+    (-68, (_c(_t('NPC')) + _c(_t('Abyssal')) + _t('Seeker'), 402, 402, 98, 98)),
+    (-69, (_c(_t('NPC')) + _c(_t('Abyssal')) + _t('Sleeper'), 313, 313, 187, 187)),
+    (-70, (_c(_t('NPC')) + _c(_t('Abyssal')) + _t('Triglavian'), 0, 615, 0, 385)),
+    (-71, (_c(_t('NPC')) + _c(_t('Asteroid')) + _t('Angel Cartel'), 1838, 562, 2215, 3838)),
+    (-72, (_c(_t('NPC')) + _c(_t('Asteroid')) + _t('Blood Raiders'), 5067, 4214, 0, 0)),
+    (-73, (_c(_t('NPC')) + _c(_t('Asteroid')) + _t('Guristas'), 0, 1828, 7413, 0)),
+    (-74, (_c(_t('NPC')) + _c(_t('Asteroid')) + _t('Rogue Drone'), 394, 666, 1090, 1687)),
+    (-75, (_c(_t('NPC')) + _c(_t('Asteroid')) + _t('Sanshas Nation'), 5586, 4112, 0, 0)),
+    (-76, (_c(_t('NPC')) + _c(_t('Asteroid')) + _t('Serpentis'), 0, 5373, 4813, 0)),
+    (-77, (_c(_t('NPC')) + _c(_t('Burner')) + _c(_t('Team')) + _t('Enyo'), 0, 147, 147, 0)),
+    (-78, (_c(_t('NPC')) + _c(_t('Burner')) + _c(_t('Team')) + _t('Hawk'), 0, 0, 247, 0)),
+    (-79, (_c(_t('NPC')) + _c(_t('Burner')) + _c(_t('Team')) + _t('Jaguar'), 36, 0, 50, 182)),
+    (-80, (_c(_t('NPC')) + _c(_t('Burner')) + _c(_t('Team')) + _t('Vengeance'), 232, 0, 0, 0)),
+    (-81, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Cruor'), 90, 90, 0, 0)),
+    (-82, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Dramiel'), 55, 0, 20, 96)),
+    (-83, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Daredevil'), 0, 110, 154, 0)),
+    (-84, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Succubus'), 135, 30, 0, 0)),
+    (-85, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Worm'), 0, 0, 228, 0)),
+    (-86, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Ashimmu'), 260, 100, 0, 0)),
+    (-87, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Talos'), 0, 413, 413, 0)),
+    (-88, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Sentinel'), 0, 0, 75, 90)),
+    (-89, (_c(_t('NPC')) + _c(_t('Deadspace')) + _t('Angel Cartel'), 369, 533, 1395, 3302)),
+    (-90, (_c(_t('NPC')) + _c(_t('Deadspace')) + _t('Blood Raiders'), 6040, 5052, 10, 15)),
+    (-91, (_c(_t('NPC')) + _c(_t('Deadspace')) + _t('Guristas'), 0, 1531, 9680, 0)),
+    (-92, (_c(_t('NPC')) + _c(_t('Deadspace')) + _t('Rogue Drone'), 276, 1071, 1069, 871)),
+    (-93, (_c(_t('NPC')) + _c(_t('Deadspace')) + _t('Sanshas Nation'), 3009, 2237, 0, 0)),
+    (-94, (_c(_t('NPC')) + _c(_t('Deadspace')) + _t('Serpentis'), 0, 3110, 1929, 0)),
     # Source: ticket #2067
-    (-86, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Triglavian Entities')) + _t('Dread'), 0, 417, 0, 583)),
-    (-87, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Triglavian Entities')) + _t('Normal Subcaps'), 0, 610, 0, 390)),
+    (-95, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Triglavian Entities')) + _t('Dread'), 0, 417, 0, 583)),
+    (-96, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Triglavian Entities')) + _t('Normal Subcaps'), 0, 610, 0, 390)),
     # To avoid errors on msgfmt, we have to mark that '0%' is meaning literally 0% with no-python-format.
     # See also: https://github.com/vslavik/poedit/issues/645
-    (-88, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Triglavian Entities')) +
+    (-97, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Triglavian Entities')) +
            # xgettext:no-python-format
            _t('Subcaps w/missiles 0% spool up'), 367, 155, 367, 112)),
-    (-89, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Triglavian Entities')) +
+    (-98, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Triglavian Entities')) +
            # xgettext:no-python-format
            _t('Subcaps w/missiles 50% spool up'), 291, 243, 291, 175)),
-    (-90, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Triglavian Entities')) +
+    (-99, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Triglavian Entities')) +
            # xgettext:no-python-format
            _t('Subcaps w/missiles 100% spool up'), 241, 301, 241, 217)),
-    (-91, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Amarr EDENCOM Entities')) + _t('Dread/Subcaps'), 583, 417, 0, 0)),
-    (-92, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Caldari EDENCOM Entities')) + _t('Dread'), 1000, 0, 0, 0)),
-    (-93, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Caldari EDENCOM Entities')) + _t('Subcaps'), 511, 21, 29, 440)),
-    (-94, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Gallente EDENCOM Entities')) + _t('Dread/Subcaps'), 0, 417, 583, 0)),
-    (-95, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Minmatar EDENCOM Entities')) + _t('Dread'), 0, 0, 583, 417)),
-    (-96, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Minmatar EDENCOM Entities')) + _t('Subcaps'), 302, 136, 328, 234)),
-    (-110, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Drifter Entities'), 250, 250, 250, 250)),
-    (-112, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Sleeper Entities'), 265, 265, 235, 235)),
-    (-111, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Rogue Drone Entities'), 250, 250, 250, 250)),
-    (-97, (_c(_t('NPC')) + _c(_t('Mission')) + _t('Amarr Empire'), 4464, 3546, 97, 0)),
-    (-98, (_c(_t('NPC')) + _c(_t('Mission')) + _t('Caldari State'), 0, 2139, 4867, 0)),
-    (-99, (_c(_t('NPC')) + _c(_t('Mission')) + _t('CONCORD'), 336, 134, 212, 412)),
-    (-100, (_c(_t('NPC')) + _c(_t('Mission')) + _t('Gallente Federation'), 9, 3712, 2758, 0)),
-    (-101, (_c(_t('NPC')) + _c(_t('Mission')) + _t('Khanid'), 612, 483, 43, 6)),
-    (-102, (_c(_t('NPC')) + _c(_t('Mission')) + _t('Minmatar Republic'), 1024, 388, 1655, 4285)),
-    (-103, (_c(_t('NPC')) + _c(_t('Mission')) + _t('Mordus Legion'), 25, 262, 625, 0)),
-    (-104, (_c(_t('NPC')) + _c(_t('Mission')) + _t('Thukker'), 0, 52, 10, 79)),
-    (-105, (_c(_t('NPC')) + _t('Sansha Incursion'), 1682, 1347, 3678, 3678)),
-    (-106, (_c(_t('NPC')) + _t('Sleepers'), 1472, 1472, 1384, 1384))])
+    (-100, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Amarr EDENCOM Entities')) + _t('Dread/Subcaps'), 583, 417, 0, 0)),
+    (-101, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Caldari EDENCOM Entities')) + _t('Dread'), 1000, 0, 0, 0)),
+    (-102, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Caldari EDENCOM Entities')) + _t('Subcaps'), 511, 21, 29, 440)),
+    (-103, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Gallente EDENCOM Entities')) + _t('Dread/Subcaps'), 0, 417, 583, 0)),
+    (-104, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Minmatar EDENCOM Entities')) + _t('Dread'), 0, 0, 583, 417)),
+    (-105, (_c(_t('NPC')) + _c(_t('Invasion')) + _c(_t('Minmatar EDENCOM Entities')) + _t('Subcaps'), 302, 136, 328, 234)),
+    (-106, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Drifter Entities'), 250, 250, 250, 250)),
+    (-107, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Sleeper Entities'), 265, 265, 235, 235)),
+    (-108, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Rogue Drone Entities'), 250, 250, 250, 250)),
+    (-109, (_c(_t('NPC')) + _c(_t('Mission')) + _t('Amarr Empire'), 4464, 3546, 97, 0)),
+    (-110, (_c(_t('NPC')) + _c(_t('Mission')) + _t('Caldari State'), 0, 2139, 4867, 0)),
+    (-111, (_c(_t('NPC')) + _c(_t('Mission')) + _t('CONCORD'), 336, 134, 212, 412)),
+    (-112, (_c(_t('NPC')) + _c(_t('Mission')) + _t('Gallente Federation'), 9, 3712, 2758, 0)),
+    (-113, (_c(_t('NPC')) + _c(_t('Mission')) + _t('Khanid'), 612, 483, 43, 6)),
+    (-114, (_c(_t('NPC')) + _c(_t('Mission')) + _t('Minmatar Republic'), 1024, 388, 1655, 4285)),
+    (-115, (_c(_t('NPC')) + _c(_t('Mission')) + _t('Mordus Legion'), 25, 262, 625, 0)),
+    (-116, (_c(_t('NPC')) + _c(_t('Mission')) + _t('Thukker'), 0, 52, 10, 79)),
+    (-117, (_c(_t('NPC')) + _t('Sansha Incursion'), 1682, 1347, 3678, 3678)),
+    (-118, (_c(_t('NPC')) + _t('Sleepers'), 1472, 1472, 1384, 1384))])
 
 
 class DamagePattern:
@@ -207,11 +216,11 @@ class DamagePattern:
             pattern.builtin = True
             cls._builtins[id] = pattern
 
-    def calculateEhp(self, fit):
+    def calculateEhp(self, item):
         ehp = {}
         for (type, attr) in (('shield', 'shieldCapacity'), ('armor', 'armorHP'), ('hull', 'hp')):
-            rawCapacity = fit.ship.getModifiedItemAttr(attr)
-            ehp[type] = self.effectivify(fit, rawCapacity, type)
+            rawCapacity = item.getModifiedItemAttr(attr)
+            ehp[type] = self.effectivify(item, rawCapacity, type)
 
         return ehp
 
@@ -227,10 +236,10 @@ class DamagePattern:
         ereps = {}
         for field in tankInfo:
             if field in typeMap:
-                ereps[field] = self.effectivify(fit, tankInfo[field], typeMap[field])
+                ereps[field] = self.effectivify(fit.ship, tankInfo[field], typeMap[field])
         return ereps
 
-    def effectivify(self, fit, amount, type):
+    def effectivify(self, item, amount, type):
         type = type if type != "hull" else ""
         totalDamage = sum((self.emAmount, self.thermalAmount, self.kineticAmount, self.explosiveAmount))
         specificDivider = 0
@@ -239,7 +248,7 @@ class DamagePattern:
             attrName = "%s%sDamageResonance" % (type, damageType.capitalize())
             attrName = attrName[0].lower() + attrName[1:]
 
-            resonance = fit.ship.getModifiedItemAttr(attrName)
+            resonance = item.getModifiedItemAttr(attrName)
             damage = getattr(self, "%sAmount" % damageType)
 
             specificDivider += damage / float(totalDamage or 1) * resonance

eos/saveddata/drone.py

@@ -82,6 +82,7 @@ class Drone(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut, Mu
         self.__baseRRAmount = None
         self.__miningYield = None
         self.__miningWaste = None
+        self.__ehp = None
         self.__itemModifiedAttributes = ModifiedAttributeDict()
         self.__itemModifiedAttributes.original = self._item.attributes
         self.__itemModifiedAttributes.overrides = self._item.overrides
@@ -287,6 +288,29 @@ class Drone(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut, Mu
             if delay is not None and speed is not None:
                 return delay / 1000.0 * speed
 
+    @property
+    def hp(self):
+        hp = {}
+        for (type, attr) in (('shield', 'shieldCapacity'), ('armor', 'armorHP'), ('hull', 'hp')):
+            hp[type] = self.getModifiedItemAttr(attr)
+
+        return hp
+
+    @property
+    def ehp(self):
+        if self.__ehp is None:
+            if self.owner is None or self.owner.damagePattern is None:
+                ehp = self.hp
+            else:
+                ehp = self.owner.damagePattern.calculateEhp(self)
+            self.__ehp = ehp
+        return self.__ehp
+
+    def calculateShieldRecharge(self):
+        capacity = self.getModifiedItemAttr("shieldCapacity")
+        rechargeRate = self.getModifiedItemAttr("shieldRechargeRate") / 1000.0
+        return 10 / rechargeRate * math.sqrt(0.25) * (1 - math.sqrt(0.25)) * capacity
+
     # Had to add this to match the falloff property in modules.py
     # Fscking ship scanners. If you find any other falloff attributes,
     # Put them in the attrs tuple.
@@ -318,6 +342,7 @@ class Drone(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut, Mu
         self.__baseRRAmount = None
         self.__miningYield = None
         self.__miningWaste = None
+        self.__ehp = None
         self.itemModifiedAttributes.clear()
         self.chargeModifiedAttributes.clear()
 

eos/saveddata/fighter.py

@@ -96,6 +96,7 @@ class Fighter(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
         self.__charge = None
         self.__baseVolley = None
         self.__miningyield = None
+        self.__ehp = None
         self.__itemModifiedAttributes = ModifiedAttributeDict()
         self.__chargeModifiedAttributes = ModifiedAttributeDict()
 
@@ -345,6 +346,29 @@ class Fighter(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
             if falloff is not None:
                 return falloff
 
+    @property
+    def hp(self):
+        hp = {}
+        for (type, attr) in (('shield', 'shieldCapacity'), ('armor', 'armorHP'), ('hull', 'hp')):
+            hp[type] = self.getModifiedItemAttr(attr)
+
+        return hp
+
+    @property
+    def ehp(self):
+        if self.__ehp is None:
+            if self.owner is None or self.owner.damagePattern is None:
+                ehp = self.hp
+            else:
+                ehp = self.owner.damagePattern.calculateEhp(self)
+            self.__ehp = ehp
+        return self.__ehp
+
+    def calculateShieldRecharge(self):
+        capacity = self.getModifiedItemAttr("shieldCapacity")
+        rechargeRate = self.getModifiedItemAttr("shieldRechargeRate") / 1000.0
+        return 10 / rechargeRate * math.sqrt(0.25) * (1 - math.sqrt(0.25)) * capacity
+
     @validates("ID", "itemID", "chargeID", "amount")
     def validator(self, key, val):
         map = {
@@ -361,6 +385,7 @@ class Fighter(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
     def clear(self):
         self.__baseVolley = None
         self.__miningyield = None
+        self.__ehp = None
         self.itemModifiedAttributes.clear()
         self.chargeModifiedAttributes.clear()
         [x.clear() for x in self.abilities]

eos/saveddata/fit.py

@@ -159,6 +159,12 @@ class Fit:
         self.gangBoosts = None
         self.__ecmProjectedList = []
         self.commandBonuses = {}
+        # Reps received, as a list of (amount, cycle time in seconds)
+        self._hullRr = []
+        self._armorRr = []
+        self._armorRrPreSpool = []
+        self._armorRrFullSpool = []
+        self._shieldRr = []
 
     def clearFactorReloadDependentData(self):
         # Here we clear all data known to rely on cycle parameters
@@ -550,6 +556,12 @@ class Fit:
             if stuff is not None and stuff != self:
                 stuff.clear()
 
+        self._hullRr.clear()
+        self._armorRr.clear()
+        self._armorRrPreSpool.clear()
+        self._armorRrFullSpool.clear()
+        self._shieldRr.clear()
+
         # If this is the active fit that we are clearing, not a projected fit,
         # then this will run and clear the projected ships and flag the next
         # iteration to skip this part to prevent recursion.
@@ -621,7 +633,7 @@ class Fit:
                             "duration", value)
 
                 if warfareBuffID == 12:  # Shield Burst: Shield Extension: Shield HP
-                    self.ship.boostItemAttr("shieldCapacity", value, stackingPenalties=True)
+                    self.ship.boostItemAttr("shieldCapacity", value)
 
                 if warfareBuffID == 13:  # Armor Burst: Armor Energizing: Armor Resistance
                     for damageType in ("Em", "Thermal", "Explosive", "Kinetic"):
@@ -640,7 +652,7 @@ class Fit:
                             "duration", value)
 
                 if warfareBuffID == 15:  # Armor Burst: Armor Reinforcement: Armor HP
-                    self.ship.boostItemAttr("armorHP", value, stackingPenalties=True)
+                    self.ship.boostItemAttr("armorHP", value)
 
                 if warfareBuffID == 16:  # Information Burst: Sensor Optimization: Scan Resolution
                     self.ship.boostItemAttr("scanResolution", value, stackingPenalties=True)
@@ -734,7 +746,7 @@ class Fit:
                         self.ship.boostItemAttr(attr, value, stackingPenalties=True)
 
                 if warfareBuffID == 42:  # Erebus Effect Generator : Armor HP bonus
-                    self.ship.boostItemAttr("armorHP", value, stackingPenalties=True)
+                    self.ship.boostItemAttr("armorHP", value)
 
                 if warfareBuffID == 43:  # Erebus Effect Generator : Explosive resistance bonus
                     for attr in ("armorExplosiveDamageResonance", "shieldExplosiveDamageResonance", "explosiveDamageResonance"):
@@ -756,7 +768,7 @@ class Fit:
                         self.ship.boostItemAttr(attr, value, stackingPenalties=True)
 
                 if warfareBuffID == 48:  # Leviathan Effect Generator : Shield HP bonus
-                    self.ship.boostItemAttr("shieldCapacity", value, stackingPenalties=True)
+                    self.ship.boostItemAttr("shieldCapacity", value)
 
                 if warfareBuffID == 49:  # Leviathan Effect Generator : EM resistance bonus
                     for attr in ("armorEmDamageResonance", "shieldEmDamageResonance", "emDamageResonance"):
@@ -870,6 +882,14 @@ class Fit:
                 if warfareBuffID == 100:  # Weather_caustic_toxin_scan_resolution_bonus
                     self.ship.boostItemAttr("scanResolution", value, stackingPenalties=True)
 
+                if warfareBuffID == 2405:  # Insurgency Suppression Bonus: Interdiction Range
+                    self.modules.filteredItemBoost(
+                        lambda mod: mod.item.requiresSkill("Navigation"),
+                        "maxRange", value, stackingPenalties=True)
+                    self.modules.filteredItemBoost(
+                        lambda mod: mod.item.group.name == "Stasis Web",
+                        "maxRange", value, stackingPenalties=True)
+
             del self.commandBonuses[warfareBuffID]
 
     def __resetDependentCalcs(self):
@@ -1469,7 +1489,7 @@ class Fit:
             if self.damagePattern is None:
                 ehp = self.hp
             else:
-                ehp = self.damagePattern.calculateEhp(self)
+                ehp = self.damagePattern.calculateEhp(self.ship)
             self.__ehp = ehp
 
         return self.__ehp
@@ -1478,11 +1498,11 @@ class Fit:
     def tank(self):
         reps = {
             "passiveShield": self.calculateShieldRecharge(),
-            "shieldRepair": self.extraAttributes["shieldRepair"],
-            "armorRepair": self.extraAttributes["armorRepair"],
-            "armorRepairPreSpool": self.extraAttributes["armorRepairPreSpool"],
-            "armorRepairFullSpool": self.extraAttributes["armorRepairFullSpool"],
-            "hullRepair": self.extraAttributes["hullRepair"]
+            "shieldRepair": self.extraAttributes["shieldRepair"] + self._getAppliedShieldRr(),
+            "armorRepair": self.extraAttributes["armorRepair"] + self._getAppliedArmorRr(),
+            "armorRepairPreSpool": self.extraAttributes["armorRepairPreSpool"] + self._getAppliedArmorPreSpoolRr(),
+            "armorRepairFullSpool": self.extraAttributes["armorRepairFullSpool"] + self._getAppliedArmorFullSpoolRr(),
+            "hullRepair": self.extraAttributes["hullRepair"] + self._getAppliedHullRr()
         }
         return reps
 
@@ -1519,11 +1539,11 @@ class Fit:
         if self.__sustainableTank is None:
             sustainable = {
                 "passiveShield": self.calculateShieldRecharge(),
-                "shieldRepair": self.extraAttributes["shieldRepair"],
-                "armorRepair": self.extraAttributes["armorRepair"],
-                "armorRepairPreSpool": self.extraAttributes["armorRepairPreSpool"],
-                "armorRepairFullSpool": self.extraAttributes["armorRepairFullSpool"],
-                "hullRepair": self.extraAttributes["hullRepair"]
+                "shieldRepair": self.extraAttributes["shieldRepair"] + self._getAppliedShieldRr(),
+                "armorRepair": self.extraAttributes["armorRepair"] + self._getAppliedArmorRr(),
+                "armorRepairPreSpool": self.extraAttributes["armorRepairPreSpool"] + self._getAppliedArmorPreSpoolRr(),
+                "armorRepairFullSpool": self.extraAttributes["armorRepairFullSpool"] + self._getAppliedArmorFullSpoolRr(),
+                "hullRepair": self.extraAttributes["hullRepair"] + self._getAppliedHullRr()
             }
             if not self.capStable or self.factorReload:
                 # Map a local repairer type to the attribute it uses
@@ -1760,6 +1780,38 @@ class Fit:
             mults.setdefault(stackingGroup, []).append((1 + strength / 100, None))
         return calculateMultiplier(mults)
 
+    def _getAppliedHullRr(self):
+        return self.__getAppliedRr(self._hullRr)
+
+    def _getAppliedArmorRr(self):
+        return self.__getAppliedRr(self._armorRr)
+
+    def _getAppliedArmorPreSpoolRr(self):
+        return self.__getAppliedRr(self._armorRrPreSpool)
+
+    def _getAppliedArmorFullSpoolRr(self):
+        return self.__getAppliedRr(self._armorRrFullSpool)
+
+    def _getAppliedShieldRr(self):
+        return self.__getAppliedRr(self._shieldRr)
+
+    @staticmethod
+    def __getAppliedRr(rrList):
+        totalRaw = 0
+        for amount, cycleTime in rrList:
+            # That's right, for considerations of RR diminishing returns cycle time is rounded this way
+            totalRaw += amount / int(cycleTime)
+        RR_ADDITION = 7000
+        RR_MULTIPLIER = 10
+        appliedRr = 0
+        for amount, cycleTime in rrList:
+            rrps = amount / int(cycleTime)
+            modified_rrps = RR_ADDITION + (rrps * RR_MULTIPLIER)
+            rrps_mult = 1 - (((rrps + modified_rrps) / (totalRaw + modified_rrps)) - 1) ** 2
+            appliedRr += rrps_mult * amount / cycleTime
+        return appliedRr
+
+
     def __deepcopy__(self, memo=None):
         fitCopy = Fit()
         # Character and owner are not copied

eos/saveddata/module.py

@@ -122,6 +122,8 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut, M
         if self.__charge and self.__charge.category.name != "Charge":
             self.__charge = None
 
+        self.rahPatternOverride = None
+
         self.__baseVolley = None
         self.__baseRRAmount = None
         self.__miningYield = None
@@ -475,7 +477,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut, M
             # Some delay attributes have non-0 default value, so we have to pick according to effects
             if {'superWeaponAmarr', 'superWeaponCaldari', 'superWeaponGallente', 'superWeaponMinmatar', 'lightningWeapon'}.intersection(self.item.effects):
                 dmgDelay = self.getModifiedItemAttr("damageDelayDuration", 0)
-            elif {'doomsdayBeamDOT', 'doomsdaySlash', 'doomsdayConeDOT'}.intersection(self.item.effects):
+            elif {'doomsdayBeamDOT', 'doomsdaySlash', 'doomsdayConeDOT', 'debuffLance'}.intersection(self.item.effects):
                 dmgDelay = self.getModifiedItemAttr("doomsdayWarningDuration", 0)
             else:
                 dmgDelay = 0
@@ -694,16 +696,22 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut, M
                 return False
 
         # Check max group fitted
-        max = self.getModifiedItemAttr("maxGroupFitted")
-        if max:
-            current = 0  # if self.owner != fit else -1  # Disabled, see #1278
-            for mod in fit.modules:
-                if (mod.item and mod.item.groupID == self.item.groupID and
-                        self.getModPosition(fit) != mod.getModPosition(fit)):
-                    current += 1
+        # use raw value, since it seems what EVE uses. Example is FAXes with their capacitor boosters,
+        # which have unmodified value of 10, and modified of 1, and you can actually fit multiples
+        try:
+            max = self.item.attributes.get('maxGroupFitted').value
+        except AttributeError:
+            pass
+        else:
+            if max:
+                current = 0  # if self.owner != fit else -1  # Disabled, see #1278
+                for mod in fit.modules:
+                    if (mod.item and mod.item.groupID == self.item.groupID and
+                            self.getModPosition(fit) != mod.getModPosition(fit)):
+                        current += 1
 
-            if current >= max:
-                return False
+                if current >= max:
+                    return False
 
         # Check this only if we're told to do so
         if hardpointLimit:
@@ -1075,6 +1083,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut, M
         copy.spoolType = self.spoolType
         copy.spoolAmount = self.spoolAmount
         copy.projectionRange = self.projectionRange
+        copy.rahPatternOverride = self.rahPatternOverride
         self._mutaApplyMutators(mutatorClass=MutatorModule, targetInstance=copy)
 
         return copy
@@ -1085,6 +1094,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut, M
         spoolType = self.spoolType
         spoolAmount = self.spoolAmount
         projectionRange = self.projectionRange
+        rahPatternOverride = self.rahPatternOverride
 
         Module.__init__(self, item, self.baseItem, self.mutaplasmid)
         self.state = state
@@ -1093,6 +1103,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut, M
         self.spoolType = spoolType
         self.spoolAmount = spoolAmount
         self.projectionRange = projectionRange
+        self.rahPatternOverride = rahPatternOverride
         self._mutaApplyMutators(mutatorClass=MutatorModule)
 
     def __repr__(self):

eos/saveddata/targetProfile.py

@@ -78,158 +78,166 @@ BUILTINS = OrderedDict([
     (-37, (_c(_t('NPC')) + _c(_t('Mission')) + _t('Mordus Legion'), 0.32, 0.48, 0.4, 0.62)),
     (-38, (_c(_t('NPC')) + _c(_t('Other')) + _t('Sleeper'), 0.61, 0.61, 0.61, 0.61)),
     (-39, (_c(_t('NPC')) + _c(_t('Other')) + _t('Sansha Incursion'), 0.65, 0.63, 0.64, 0.65)),
-    (-40, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Cruor'), 0.795, 0.734, 0.693, 0.672, 900, 18, 20.5)),
-    (-41, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Dramiel'), 0.351, 0.481, 0.611, 0.676, 2100, 11, 25)),
-    (-42, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Daredevil'), 0.685, 0.59, 0.59, 0.433, 1200, 18, 25)),
-    (-43, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Succubus'), 0.351, 0.481, 0.611, 0.676, 4750, 30, 59)),
-    (-44, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Worm'), 0.475, 0.58, 0.685, 0.738, 360, 70, 39)),
-    (-45, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Enyo'), 0.58, 0.72, 0.86, 0.24)),
-    (-46, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Hawk'), 0.3, 0.86, 0.79, 0.65)),
-    (-47, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Jaguar'), 0.78, 0.65, 0.48, 0.56)),
-    (-48, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Vengeance'), 0.66, 0.56, 0.75, 0.86)),
-    (-49, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Ashimmu'), 0.8, 0.76, 0.68, 0.7, 500, 120, 137)),
-    (-50, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Talos'), 0.681, 0.586, 0.586, 0.426, 150, 125, 266)),
-    (-51, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Sentinel'), 0.575, 0.448, 0.522, 0.66, 500, 50, 39)),
+    # Anomic Team, source: client data dump
+    (-40, (_c(_t('NPC')) + _c(_t('Burner')) + _c(_t('Team')) + _t('Enyo'), 0.575, 0.724, 0.862, 0.235, 1020, 37, 39)),
+    (-41, (_c(_t('NPC')) + _c(_t('Burner')) + _c(_t('Team')) + _t('Navitas'), 0.681, 0.586, 0.522, 0.49, 870, 30, 35)),
+    (-42, (_c(_t('NPC')) + _c(_t('Burner')) + _c(_t('Team')) + _t('Hawk'), 0.3, 0.86, 0.79, 0.65, 1122, 48, 39)),
+    (-43, (_c(_t('NPC')) + _c(_t('Burner')) + _c(_t('Team')) + _t('Bantam'), 0.344, 0.475, 0.606, 0.672, 1016, 45, 27)),
+    (-44, (_c(_t('NPC')) + _c(_t('Burner')) + _c(_t('Team')) + _t('Jaguar'), 0.781, 0.65, 0.475, 0.563, 1400, 42, 31)),
+    (-45, (_c(_t('NPC')) + _c(_t('Burner')) + _c(_t('Team')) + _t('Burst'), 0.344, 0.475, 0.606, 0.672, 1174, 39, 31)),
+    (-46, (_c(_t('NPC')) + _c(_t('Burner')) + _c(_t('Team')) + _t('Vengeance'), 0.66, 0.558, 0.745, 0.864, 1050, 37, 40)),
+    (-47, (_c(_t('NPC')) + _c(_t('Burner')) + _c(_t('Team')) + _t('Inquisitor'), 0.681, 0.586, 0.522, 0.49, 920, 29, 20.5)),
+    # Anomic Agent & Base, source: client data dump
+    (-48, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Cruor'), 0.795, 0.734, 0.693, 0.672, 900, 18, 20.5)),
+    (-49, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Dramiel'), 0.351, 0.481, 0.611, 0.676, 2100, 11, 25)),
+    (-50, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Daredevil'), 0.685, 0.59, 0.59, 0.433, 1200, 18, 25)),
+    (-51, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Succubus'), 0.351, 0.481, 0.611, 0.676, 4750, 30, 59)),
+    (-52, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Worm'), 0.475, 0.58, 0.685, 0.738, 360, 70, 39)),
+    (-53, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Ashimmu'), 0.8, 0.76, 0.68, 0.7, 500, 120, 137)),
+    (-54, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Sentinel'), 0.575, 0.448, 0.522, 0.66, 500, 50, 39)),
+    (-55, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Talos'), 0.681, 0.586, 0.586, 0.426, 150, 125, 266)),
+    (-56, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Dragonfly'), 0.35, 0.72, 0.70, 0.55, 1200, 15, 35)),
+    (-57, (_c(_t('NPC')) + _c(_t('Burner')) + _t('Mantis'), 0.60, 0.52, 0.71, 0.71, 900, 25, 35)),
     # Source: ticket #2067
-    (-52, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Triglavian Entities'), 0.422, 0.367, 0.453, 0.411)),
-    (-53, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Amarr EDENCOM Entities'), 0.360, 0.310, 0.441, 0.602)),
-    (-54, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Caldari EDENCOM Entities'), 0.303, 0.610, 0.487, 0.401)),
-    (-55, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Gallente EDENCOM Entities'), 0.383, 0.414, 0.578, 0.513)),
-    (-56, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Minmatar EDENCOM Entities'), 0.620, 0.422, 0.355, 0.399)),
-    (-57, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Dark Matter All Tiers')) + _t('Drones'), 0.439, 0.522, 0.529, 0.435)),
-    (-58, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Dark Matter All Tiers')) + _t('Overmind'), 0.643, 0.593, 0.624, 0.639)),
-    (-59, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Dark Matter All Tiers')) + _t('Seeker'), 0.082, 0.082, 0.082, 0.082)),
-    (-60, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Dark Matter All Tiers')) + _t('Triglavian'), 0.494, 0.41, 0.464, 0.376)),
-    (-61, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Dark Matter All Tiers')) + _t('Drifter'), 0.415, 0.415, 0.415, 0.415)),
-    (-62, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Dark Matter All Tiers')) + _t('Sleeper'), 0.435, 0.435, 0.435, 0.435)),
-    (-63, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Dark Matter All Tiers')) + _t('All'), 0.508, 0.474, 0.495, 0.488)),
-    (-64, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T0/T1/T2')) + _t('Drones'), 0.323, 0.522, 0.529, 0.435)),
-    (-65, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T0/T1/T2')) + _t('Overmind'), 0.542, 0.593, 0.624, 0.639)),
-    (-66, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T0/T1/T2')) + _t('Seeker'), 0, 0.082, 0.082, 0.082)),
-    (-67, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T0/T1/T2')) + _t('Triglavian'), 0.356, 0.41, 0.464, 0.376)),
-    (-68, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T0/T1/T2')) + _t('Drifter'), 0.277, 0.415, 0.415, 0.415)),
-    (-69, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T0/T1/T2')) + _t('Sleeper'), 0.329, 0.435, 0.435, 0.435)),
-    (-70, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T0/T1/T2')) + _t('All'), 0.381, 0.474, 0.495, 0.488)),
-    (-71, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T3 (Some T5 Rooms)')) + _t('Drones'), 0.255, 0.522, 0.529, 0.435)),
-    (-72, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T3 (Some T5 Rooms)')) + _t('Overmind'), 0.48, 0.593, 0.624, 0.639)),
-    (-73, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T3 (Some T5 Rooms)')) + _t('Seeker'), 0, 0.082, 0.082, 0.0822)),
-    (-74, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T3 (Some T5 Rooms)')) + _t('Triglavian'), 0.268, 0.41, 0.464, 0.376)),
-    (-75, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T3 (Some T5 Rooms)')) + _t('Drifter'), 0.191, 0.415, 0.415, 0.415)),
-    (-76, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T3 (Some T5 Rooms)')) + _t('Sleeper'), 0.268, 0.435, 0.435, 0.435)),
-    (-77, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T3 (Some T5 Rooms)')) + _t('All'), 0.308, 0.474, 0.495, 0.488)),
-    (-78, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T4/T5/T6')) + _t('Drones'), 0.193, 0.522, 0.529, 0.435)),
-    (-79, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T4/T5/T6')) + _t('Overmind'), 0.423, 0.593, 0.624, 0.639)),
-    (-80, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T4/T5/T6')) + _t('Seeker'), 0, 0.082, 0.082, 0.082)),
-    (-81, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T4/T5/T6')) + _t('Triglavian'), 0.206, 0.41, 0.464, 0.376)),
-    (-82, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T4/T5/T6')) + _t('Drifter'), 0.111, 0.415, 0.415, 0.415)),
-    (-83, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T4/T5/T6')) + _t('Sleeper'), 0.215, 0.435, 0.435, 0.435)),
-    (-84, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T4/T5/T6')) + _t('All'), 0.247, 0.474, 0.495, 0.488)),
-    (-85, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T0/T1/T2')) + _t('Drones'), 0.461, 0.425, 0.541, 0.443)),
-    (-86, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T0/T1/T2')) + _t('Overmind'), 0.666, 0.489, 0.634, 0.646)),
-    (-87, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T0/T1/T2')) + _t('Seeker'), 0.084, 0, 0.084, 0.084)),
-    (-88, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T0/T1/T2')) + _t('Triglavian'), 0.537, 0.269, 0.489, 0.371)),
-    (-89, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T0/T1/T2')) + _t('Drifter'), 0.43, 0.289, 0.43, 0.43)),
-    (-90, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T0/T1/T2')) + _t('Sleeper'), 0.512, 0.402, 0.512, 0.512)),
-    (-91, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T0/T1/T2')) + _t('All'), 0.537, 0.352, 0.512, 0.495)),
-    (-92, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T3 (Some T5 Rooms)')) + _t('Drones'), 0.461, 0.36, 0.541, 0.443)),
-    (-93, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T3 (Some T5 Rooms)')) + _t('Overmind'), 0.666, 0.413, 0.634, 0.646)),
-    (-94, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T3 (Some T5 Rooms)')) + _t('Seeker'), 0.084, 0, 0.084, 0.084)),
-    (-95, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T3 (Some T5 Rooms)')) + _t('Triglavian'), 0.537, 0.166, 0.489, 0.371)),
-    (-96, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T3 (Some T5 Rooms)')) + _t('Drifter'), 0.43, 0.201, 0.43, 0.43)),
-    (-97, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T3 (Some T5 Rooms)')) + _t('Sleeper'), 0.512, 0.337, 0.512, 0.512)),
-    (-98, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T3 (Some T5 Rooms)')) + _t('All'), 0.537, 0.269, 0.512, 0.495)),
-    (-99, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T4/T5/T6')) + _t('Drones'), 0.461, 0.305, 0.541, 0.443)),
-    (-100, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T4/T5/T6')) + _t('Overmind'), 0.666, 0.345, 0.634, 0.646)),
-    (-101, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T4/T5/T6')) + _t('Seeker'), 0.084, 0, 0.084, 0.084)),
-    (-102, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T4/T5/T6')) + _t('Triglavian'), 0.537, 0.085, 0.489, 0.371)),
-    (-103, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T4/T5/T6')) + _t('Drifter'), 0.43, 0.117, 0.43, 0.43)),
-    (-104, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T4/T5/T6')) + _t('Sleeper'), 0.512, 0.276, 0.512, 0.512)),
-    (-105, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T4/T5/T6')) + _t('All'), 0.537, 0.201, 0.512, 0.495)),
-    (-106, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T0/T1/T2')) + _t('Drones'), 0.439, 0.522, 0.417, 0.435)),
-    (-107, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T0/T1/T2')) + _t('Overmind'), 0.643, 0.593, 0.511, 0.639)),
-    (-108, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T0/T1/T2')) + _t('Seeker'), 0.082, 0.082, 0, 0.082)),
-    (-109, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T0/T1/T2')) + _t('Triglavian'), 0.494, 0.41, 0.304, 0.376)),
-    (-110, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T0/T1/T2')) + _t('Drifter'), 0.415, 0.415, 0.277, 0.415)),
-    (-111, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T0/T1/T2')) + _t('Sleeper'), 0.435, 0.435, 0.329, 0.435)),
-    (-112, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T0/T1/T2')) + _t('All'), 0.508, 0.474, 0.359, 0.488)),
-    (-113, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T3 (Some T5 Rooms)')) + _t('Drones'), 0.439, 0.522, 0.351, 0.435)),
-    (-114, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T3 (Some T5 Rooms)')) + _t('Overmind'), 0.643, 0.593, 0.435, 0.639)),
-    (-115, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T3 (Some T5 Rooms)')) + _t('Seeker'), 0.082, 0.082, 0, 0.082)),
-    (-116, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T3 (Some T5 Rooms)')) + _t('Triglavian'), 0.494, 0.41, 0.198, 0.376)),
-    (-117, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T3 (Some T5 Rooms)')) + _t('Drifter'), 0.415, 0.415, 0.191, 0.415)),
-    (-118, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T3 (Some T5 Rooms)')) + _t('Sleeper'), 0.435, 0.435, 0.268, 0.435)),
-    (-119, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T3 (Some T5 Rooms)')) + _t('All'), 0.508, 0.474, 0.276, 0.488)),
-    (-120, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T4/T5/T6')) + _t('Drones'), 0.439, 0.522, 0.293, 0.435)),
-    (-121, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T4/T5/T6')) + _t('Overmind'), 0.643, 0.593, 0.362, 0.639)),
-    (-122, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T4/T5/T6')) + _t('Seeker'), 0.082, 0.082, 0, 0.082)),
-    (-123, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T4/T5/T6')) + _t('Triglavian'), 0.494, 0.41, 0.122, 0.376)),
-    (-124, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T4/T5/T6')) + _t('Drifter'), 0.415, 0.415, 0.111, 0.415)),
-    (-125, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T4/T5/T6')) + _t('Sleeper'), 0.435, 0.435, 0.215, 0.435)),
-    (-126, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T4/T5/T6')) + _t('All'), 0.508, 0.474, 0.208, 0.488)),
-    (-127, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T0/T1/T2')) + _t('Drones'), 0.449, 0.54, 0.549, 0.336)),
-    (-128, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T0/T1/T2')) + _t('Overmind'), 0.619, 0.574, 0.612, 0.522)),
-    (-129, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T0/T1/T2')) + _t('Seeker'), 0.085, 0.085, 0.085, 0)),
-    (-130, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T0/T1/T2')) + _t('Triglavian'), 0.477, 0.4, 0.461, 0.202)),
-    (-131, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T0/T1/T2')) + _t('Drifter'), 0.437, 0.437, 0.437, 0.295)),
-    (-132, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T0/T1/T2')) + _t('Sleeper'), 0.435, 0.435, 0.435, 0.329)),
-    (-133, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T0/T1/T2')) + _t('All'), 0.493, 0.468, 0.492, 0.35)),
-    (-134, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T3 (Some T5 Rooms)')) + _t('Drones'), 0.449, 0.54, 0.549, 0.264)),
-    (-135, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T3 (Some T5 Rooms)')) + _t('Overmind'), 0.619, 0.574, 0.612, 0.449)),
-    (-136, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T3 (Some T5 Rooms)')) + _t('Seeker'), 0.085, 0.085, 0.085, 0)),
-    (-137, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T3 (Some T5 Rooms)')) + _t('Triglavian'), 0.477, 0.4, 0.461, 0.081)),
-    (-138, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T3 (Some T5 Rooms)')) + _t('Drifter'), 0.437, 0.437, 0.437, 0.206)),
-    (-139, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T3 (Some T5 Rooms)')) + _t('Sleeper'), 0.435, 0.435, 0.435, 0.268)),
-    (-140, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T3 (Some T5 Rooms)')) + _t('All'), 0.493, 0.468, 0.492, 0.264)),
-    (-141, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Drones'), 0.449, 0.54, 0.549, 0.197)),
-    (-142, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Overmind'), 0.619, 0.574, 0.612, 0.379)),
-    (-143, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Seeker'), 0.085, 0.085, 0.085, 0)),
-    (-144, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Triglavian'), 0.477, 0.4, 0.461, 0.034)),
-    (-145, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Drifter'), 0.437, 0.437, 0.437, 0.121)),
-    (-146, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Sleeper'), 0.435, 0.435, 0.435, 0.215)),
-    (-147, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('All'), 0.493, 0.468, 0.492, 0.196)),
+    (-58, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Triglavian Entities'), 0.422, 0.367, 0.453, 0.411)),
+    (-59, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Amarr EDENCOM Entities'), 0.360, 0.310, 0.441, 0.602)),
+    (-60, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Caldari EDENCOM Entities'), 0.303, 0.610, 0.487, 0.401)),
+    (-61, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Gallente EDENCOM Entities'), 0.383, 0.414, 0.578, 0.513)),
+    (-62, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Minmatar EDENCOM Entities'), 0.620, 0.422, 0.355, 0.399)),
+    (-63, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Dark Matter All Tiers')) + _t('Drones'), 0.439, 0.522, 0.529, 0.435)),
+    (-64, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Dark Matter All Tiers')) + _t('Overmind'), 0.643, 0.593, 0.624, 0.639)),
+    (-65, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Dark Matter All Tiers')) + _t('Seeker'), 0.082, 0.082, 0.082, 0.082)),
+    (-66, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Dark Matter All Tiers')) + _t('Triglavian'), 0.494, 0.41, 0.464, 0.376)),
+    (-67, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Dark Matter All Tiers')) + _t('Drifter'), 0.415, 0.415, 0.415, 0.415)),
+    (-68, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Dark Matter All Tiers')) + _t('Sleeper'), 0.435, 0.435, 0.435, 0.435)),
+    (-69, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Dark Matter All Tiers')) + _t('All'), 0.508, 0.474, 0.495, 0.488)),
+    (-70, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T0/T1/T2')) + _t('Drones'), 0.323, 0.522, 0.529, 0.435)),
+    (-71, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T0/T1/T2')) + _t('Overmind'), 0.542, 0.593, 0.624, 0.639)),
+    (-72, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T0/T1/T2')) + _t('Seeker'), 0, 0.082, 0.082, 0.082)),
+    (-73, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T0/T1/T2')) + _t('Triglavian'), 0.356, 0.41, 0.464, 0.376)),
+    (-74, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T0/T1/T2')) + _t('Drifter'), 0.277, 0.415, 0.415, 0.415)),
+    (-75, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T0/T1/T2')) + _t('Sleeper'), 0.329, 0.435, 0.435, 0.435)),
+    (-76, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T0/T1/T2')) + _t('All'), 0.381, 0.474, 0.495, 0.488)),
+    (-77, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T3 (Some T5 Rooms)')) + _t('Drones'), 0.255, 0.522, 0.529, 0.435)),
+    (-78, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T3 (Some T5 Rooms)')) + _t('Overmind'), 0.48, 0.593, 0.624, 0.639)),
+    (-79, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T3 (Some T5 Rooms)')) + _t('Seeker'), 0, 0.082, 0.082, 0.0822)),
+    (-80, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T3 (Some T5 Rooms)')) + _t('Triglavian'), 0.268, 0.41, 0.464, 0.376)),
+    (-81, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T3 (Some T5 Rooms)')) + _t('Drifter'), 0.191, 0.415, 0.415, 0.415)),
+    (-82, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T3 (Some T5 Rooms)')) + _t('Sleeper'), 0.268, 0.435, 0.435, 0.435)),
+    (-83, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T3 (Some T5 Rooms)')) + _t('All'), 0.308, 0.474, 0.495, 0.488)),
+    (-84, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T4/T5/T6')) + _t('Drones'), 0.193, 0.522, 0.529, 0.435)),
+    (-85, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T4/T5/T6')) + _t('Overmind'), 0.423, 0.593, 0.624, 0.639)),
+    (-86, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T4/T5/T6')) + _t('Seeker'), 0, 0.082, 0.082, 0.082)),
+    (-87, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T4/T5/T6')) + _t('Triglavian'), 0.206, 0.41, 0.464, 0.376)),
+    (-88, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T4/T5/T6')) + _t('Drifter'), 0.111, 0.415, 0.415, 0.415)),
+    (-89, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T4/T5/T6')) + _t('Sleeper'), 0.215, 0.435, 0.435, 0.435)),
+    (-90, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T4/T5/T6')) + _t('All'), 0.247, 0.474, 0.495, 0.488)),
+    (-91, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T0/T1/T2')) + _t('Drones'), 0.461, 0.425, 0.541, 0.443)),
+    (-92, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T0/T1/T2')) + _t('Overmind'), 0.666, 0.489, 0.634, 0.646)),
+    (-93, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T0/T1/T2')) + _t('Seeker'), 0.084, 0, 0.084, 0.084)),
+    (-94, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T0/T1/T2')) + _t('Triglavian'), 0.537, 0.269, 0.489, 0.371)),
+    (-95, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T0/T1/T2')) + _t('Drifter'), 0.43, 0.289, 0.43, 0.43)),
+    (-96, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T0/T1/T2')) + _t('Sleeper'), 0.512, 0.402, 0.512, 0.512)),
+    (-97, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T0/T1/T2')) + _t('All'), 0.537, 0.352, 0.512, 0.495)),
+    (-98, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T3 (Some T5 Rooms)')) + _t('Drones'), 0.461, 0.36, 0.541, 0.443)),
+    (-99, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T3 (Some T5 Rooms)')) + _t('Overmind'), 0.666, 0.413, 0.634, 0.646)),
+    (-100, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T3 (Some T5 Rooms)')) + _t('Seeker'), 0.084, 0, 0.084, 0.084)),
+    (-101, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T3 (Some T5 Rooms)')) + _t('Triglavian'), 0.537, 0.166, 0.489, 0.371)),
+    (-102, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T3 (Some T5 Rooms)')) + _t('Drifter'), 0.43, 0.201, 0.43, 0.43)),
+    (-103, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T3 (Some T5 Rooms)')) + _t('Sleeper'), 0.512, 0.337, 0.512, 0.512)),
+    (-104, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T3 (Some T5 Rooms)')) + _t('All'), 0.537, 0.269, 0.512, 0.495)),
+    (-105, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T4/T5/T6')) + _t('Drones'), 0.461, 0.305, 0.541, 0.443)),
+    (-106, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T4/T5/T6')) + _t('Overmind'), 0.666, 0.345, 0.634, 0.646)),
+    (-107, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T4/T5/T6')) + _t('Seeker'), 0.084, 0, 0.084, 0.084)),
+    (-108, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T4/T5/T6')) + _t('Triglavian'), 0.537, 0.085, 0.489, 0.371)),
+    (-109, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T4/T5/T6')) + _t('Drifter'), 0.43, 0.117, 0.43, 0.43)),
+    (-110, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T4/T5/T6')) + _t('Sleeper'), 0.512, 0.276, 0.512, 0.512)),
+    (-111, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T4/T5/T6')) + _t('All'), 0.537, 0.201, 0.512, 0.495)),
+    (-112, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T0/T1/T2')) + _t('Drones'), 0.439, 0.522, 0.417, 0.435)),
+    (-113, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T0/T1/T2')) + _t('Overmind'), 0.643, 0.593, 0.511, 0.639)),
+    (-114, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T0/T1/T2')) + _t('Seeker'), 0.082, 0.082, 0, 0.082)),
+    (-115, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T0/T1/T2')) + _t('Triglavian'), 0.494, 0.41, 0.304, 0.376)),
+    (-116, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T0/T1/T2')) + _t('Drifter'), 0.415, 0.415, 0.277, 0.415)),
+    (-117, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T0/T1/T2')) + _t('Sleeper'), 0.435, 0.435, 0.329, 0.435)),
+    (-118, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T0/T1/T2')) + _t('All'), 0.508, 0.474, 0.359, 0.488)),
+    (-119, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T3 (Some T5 Rooms)')) + _t('Drones'), 0.439, 0.522, 0.351, 0.435)),
+    (-120, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T3 (Some T5 Rooms)')) + _t('Overmind'), 0.643, 0.593, 0.435, 0.639)),
+    (-121, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T3 (Some T5 Rooms)')) + _t('Seeker'), 0.082, 0.082, 0, 0.082)),
+    (-122, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T3 (Some T5 Rooms)')) + _t('Triglavian'), 0.494, 0.41, 0.198, 0.376)),
+    (-123, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T3 (Some T5 Rooms)')) + _t('Drifter'), 0.415, 0.415, 0.191, 0.415)),
+    (-124, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T3 (Some T5 Rooms)')) + _t('Sleeper'), 0.435, 0.435, 0.268, 0.435)),
+    (-125, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T3 (Some T5 Rooms)')) + _t('All'), 0.508, 0.474, 0.276, 0.488)),
+    (-126, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T4/T5/T6')) + _t('Drones'), 0.439, 0.522, 0.293, 0.435)),
+    (-127, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T4/T5/T6')) + _t('Overmind'), 0.643, 0.593, 0.362, 0.639)),
+    (-128, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T4/T5/T6')) + _t('Seeker'), 0.082, 0.082, 0, 0.082)),
+    (-129, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T4/T5/T6')) + _t('Triglavian'), 0.494, 0.41, 0.122, 0.376)),
+    (-130, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T4/T5/T6')) + _t('Drifter'), 0.415, 0.415, 0.111, 0.415)),
+    (-131, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T4/T5/T6')) + _t('Sleeper'), 0.435, 0.435, 0.215, 0.435)),
+    (-132, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T4/T5/T6')) + _t('All'), 0.508, 0.474, 0.208, 0.488)),
+    (-133, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T0/T1/T2')) + _t('Drones'), 0.449, 0.54, 0.549, 0.336)),
+    (-134, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T0/T1/T2')) + _t('Overmind'), 0.619, 0.574, 0.612, 0.522)),
+    (-135, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T0/T1/T2')) + _t('Seeker'), 0.085, 0.085, 0.085, 0)),
+    (-136, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T0/T1/T2')) + _t('Triglavian'), 0.477, 0.4, 0.461, 0.202)),
+    (-137, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T0/T1/T2')) + _t('Drifter'), 0.437, 0.437, 0.437, 0.295)),
+    (-138, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T0/T1/T2')) + _t('Sleeper'), 0.435, 0.435, 0.435, 0.329)),
+    (-139, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T0/T1/T2')) + _t('All'), 0.493, 0.468, 0.492, 0.35)),
+    (-140, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T3 (Some T5 Rooms)')) + _t('Drones'), 0.449, 0.54, 0.549, 0.264)),
+    (-141, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T3 (Some T5 Rooms)')) + _t('Overmind'), 0.619, 0.574, 0.612, 0.449)),
+    (-142, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T3 (Some T5 Rooms)')) + _t('Seeker'), 0.085, 0.085, 0.085, 0)),
+    (-143, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T3 (Some T5 Rooms)')) + _t('Triglavian'), 0.477, 0.4, 0.461, 0.081)),
+    (-144, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T3 (Some T5 Rooms)')) + _t('Drifter'), 0.437, 0.437, 0.437, 0.206)),
+    (-145, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T3 (Some T5 Rooms)')) + _t('Sleeper'), 0.435, 0.435, 0.435, 0.268)),
+    (-146, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T3 (Some T5 Rooms)')) + _t('All'), 0.493, 0.468, 0.492, 0.264)),
+    (-147, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Drones'), 0.449, 0.54, 0.549, 0.197)),
+    (-148, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Overmind'), 0.619, 0.574, 0.612, 0.379)),
+    (-149, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Seeker'), 0.085, 0.085, 0.085, 0)),
+    (-150, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Triglavian'), 0.477, 0.4, 0.461, 0.034)),
+    (-151, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Drifter'), 0.437, 0.437, 0.437, 0.121)),
+    (-152, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Sleeper'), 0.435, 0.435, 0.435, 0.215)),
+    (-153, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('All'), 0.493, 0.468, 0.492, 0.196)),
     # Source: ticket #2265
-    (-148, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Dark Matter All Tiers')) + _t('Concord'), 0.324, 0.318, 0.369, 0.372)),
-    (-149, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Dark Matter All Tiers')) + _t('Sansha'), 0.137, 0.331, 0.332, 0.322)),
-    (-150, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Dark Matter All Tiers')) + _t('Angel'), 0.582, 0.508, 0.457, 0.416)),
-    (-151, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T0/T1/T2')) + _t('Concord'), 0.121, 0.318, 0.369, 0.372)),
-    (-152, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T0/T1/T2')) + _t('Sansha'), 0.034, 0.331, 0.332, 0.322)),
-    (-153, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T0/T1/T2')) + _t('Angel'), 0.456, 0.508, 0.457, 0.416)),
-    (-154, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T3 (Some T5 Rooms)')) + _t('Concord'), 0.025, 0.318, 0.369, 0.372)),
-    (-155, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T3 (Some T5 Rooms)')) + _t('Sansha'), 0.018, 0.331, 0.332, 0.322)),
-    (-156, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T3 (Some T5 Rooms)')) + _t('Angel'), 0.373, 0.508, 0.457, 0.416)),
-    (-157, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T4/T5/T6')) + _t('Concord'), 0.008, 0.318, 0.369, 0.372)),
-    (-158, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T4/T5/T6')) + _t('Sansha'), 0.009, 0.331, 0.332, 0.322)),
-    (-159, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T4/T5/T6')) + _t('Angel'), 0.3, 0.508, 0.457, 0.416)),
-    (-160, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T0/T1/T2')) + _t('Concord'), 0.324, 0.107, 0.369, 0.372)),
-    (-161, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T0/T1/T2')) + _t('Sansha'), 0.148, 0.181, 0.329, 0.328)),
-    (-162, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T0/T1/T2')) + _t('Angel'), 0.587, 0.342, 0.439, 0.39)),
-    (-163, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T3 (Some T5 Rooms)')) + _t('Concord'), 0.324, 0.016, 0.369, 0.372)),
-    (-164, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T3 (Some T5 Rooms)')) + _t('Sansha'), 0.148, 0.14, 0.329, 0.328)),
-    (-165, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T3 (Some T5 Rooms)')) + _t('Angel'), 0.587, 0.241, 0.439, 0.39)),
-    (-166, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T4/T5/T6')) + _t('Concord'), 0.324, 0.004, 0.369, 0.372)),
-    (-167, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T4/T5/T6')) + _t('Sansha'), 0.148, 0.106, 0.329, 0.328)),
-    (-168, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T4/T5/T6')) + _t('Angel'), 0.587, 0.172, 0.439, 0.39)),
-    (-169, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T0/T1/T2')) + _t('Concord'), 0.324, 0.318, 0.18, 0.372)),
-    (-170, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T0/T1/T2')) + _t('Sansha'), 0.137, 0.331, 0.166, 0.322)),
-    (-171, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T0/T1/T2')) + _t('Angel'), 0.582, 0.508, 0.295, 0.416)),
-    (-172, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T3 (Some T5 Rooms)')) + _t('Concord'), 0.324, 0.318, 0.089, 0.372)),
-    (-173, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T3 (Some T5 Rooms)')) + _t('Sansha'), 0.137, 0.331, 0.108, 0.322)),
-    (-174, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T3 (Some T5 Rooms)')) + _t('Angel'), 0.582, 0.508, 0.203, 0.416)),
-    (-175, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T4/T5/T6')) + _t('Concord'), 0.324, 0.318, 0.068, 0.372)),
-    (-176, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T4/T5/T6')) + _t('Sansha'), 0.137, 0.331, 0.073, 0.322)),
-    (-177, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T4/T5/T6')) + _t('Angel'), 0.582, 0.508, 0.14, 0.416)),
-    (-178, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T0/T1/T2')) + _t('Concord'), 0.324, 0.318, 0.369, 0.203)),
-    (-179, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T0/T1/T2')) + _t('Sansha'), 0.137, 0.355, 0.352, 0.16)),
-    (-180, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T0/T1/T2')) + _t('Angel'), 0.59, 0.528, 0.477, 0.286)),
-    (-181, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T3 (Some T5 Rooms)')) + _t('Concord'), 0.324, 0.318, 0.369, 0.112)),
-    (-182, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T3 (Some T5 Rooms)')) + _t('Sansha'), 0.137, 0.355, 0.352, 0.05)),
-    (-183, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T3 (Some T5 Rooms)')) + _t('Angel'), 0.59, 0.528, 0.477, 0.197)),
-    (-184, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Concord'), 0.324, 0.318, 0.369, 0.086)),
-    (-185, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Sansha'), 0.137, 0.355, 0.352, 0)),
-    (-186, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Angel'), 0.59, 0.528, 0.477, 0.126)),
-    (-187, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Drifter Entities'), 0.128, 0.375, 0.383, 0.383)),
-    (-188, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Rogue Drone Entities'), 0.104, 0.147, 0.147, 0.102)),
-    (-189, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Sleeper Entities'), 0.563, 0.563, 0.563, 0.563))])
+    (-154, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Dark Matter All Tiers')) + _t('Concord'), 0.324, 0.318, 0.369, 0.372)),
+    (-155, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Dark Matter All Tiers')) + _t('Sansha'), 0.137, 0.331, 0.332, 0.322)),
+    (-156, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Dark Matter All Tiers')) + _t('Angel'), 0.582, 0.508, 0.457, 0.416)),
+    (-157, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T0/T1/T2')) + _t('Concord'), 0.121, 0.318, 0.369, 0.372)),
+    (-158, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T0/T1/T2')) + _t('Sansha'), 0.034, 0.331, 0.332, 0.322)),
+    (-159, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T0/T1/T2')) + _t('Angel'), 0.456, 0.508, 0.457, 0.416)),
+    (-160, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T3 (Some T5 Rooms)')) + _t('Concord'), 0.025, 0.318, 0.369, 0.372)),
+    (-161, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T3 (Some T5 Rooms)')) + _t('Sansha'), 0.018, 0.331, 0.332, 0.322)),
+    (-162, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T3 (Some T5 Rooms)')) + _t('Angel'), 0.373, 0.508, 0.457, 0.416)),
+    (-163, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T4/T5/T6')) + _t('Concord'), 0.008, 0.318, 0.369, 0.372)),
+    (-164, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T4/T5/T6')) + _t('Sansha'), 0.009, 0.331, 0.332, 0.322)),
+    (-165, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Electrical T4/T5/T6')) + _t('Angel'), 0.3, 0.508, 0.457, 0.416)),
+    (-166, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T0/T1/T2')) + _t('Concord'), 0.324, 0.107, 0.369, 0.372)),
+    (-167, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T0/T1/T2')) + _t('Sansha'), 0.148, 0.181, 0.329, 0.328)),
+    (-168, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T0/T1/T2')) + _t('Angel'), 0.587, 0.342, 0.439, 0.39)),
+    (-169, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T3 (Some T5 Rooms)')) + _t('Concord'), 0.324, 0.016, 0.369, 0.372)),
+    (-170, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T3 (Some T5 Rooms)')) + _t('Sansha'), 0.148, 0.14, 0.329, 0.328)),
+    (-171, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T3 (Some T5 Rooms)')) + _t('Angel'), 0.587, 0.241, 0.439, 0.39)),
+    (-172, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T4/T5/T6')) + _t('Concord'), 0.324, 0.004, 0.369, 0.372)),
+    (-173, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T4/T5/T6')) + _t('Sansha'), 0.148, 0.106, 0.329, 0.328)),
+    (-174, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Firestorm T4/T5/T6')) + _t('Angel'), 0.587, 0.172, 0.439, 0.39)),
+    (-175, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T0/T1/T2')) + _t('Concord'), 0.324, 0.318, 0.18, 0.372)),
+    (-176, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T0/T1/T2')) + _t('Sansha'), 0.137, 0.331, 0.166, 0.322)),
+    (-177, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T0/T1/T2')) + _t('Angel'), 0.582, 0.508, 0.295, 0.416)),
+    (-178, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T3 (Some T5 Rooms)')) + _t('Concord'), 0.324, 0.318, 0.089, 0.372)),
+    (-179, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T3 (Some T5 Rooms)')) + _t('Sansha'), 0.137, 0.331, 0.108, 0.322)),
+    (-180, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T3 (Some T5 Rooms)')) + _t('Angel'), 0.582, 0.508, 0.203, 0.416)),
+    (-181, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T4/T5/T6')) + _t('Concord'), 0.324, 0.318, 0.068, 0.372)),
+    (-182, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T4/T5/T6')) + _t('Sansha'), 0.137, 0.331, 0.073, 0.322)),
+    (-183, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Exotic T4/T5/T6')) + _t('Angel'), 0.582, 0.508, 0.14, 0.416)),
+    (-184, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T0/T1/T2')) + _t('Concord'), 0.324, 0.318, 0.369, 0.203)),
+    (-185, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T0/T1/T2')) + _t('Sansha'), 0.137, 0.355, 0.352, 0.16)),
+    (-186, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T0/T1/T2')) + _t('Angel'), 0.59, 0.528, 0.477, 0.286)),
+    (-187, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T3 (Some T5 Rooms)')) + _t('Concord'), 0.324, 0.318, 0.369, 0.112)),
+    (-188, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T3 (Some T5 Rooms)')) + _t('Sansha'), 0.137, 0.355, 0.352, 0.05)),
+    (-189, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T3 (Some T5 Rooms)')) + _t('Angel'), 0.59, 0.528, 0.477, 0.197)),
+    (-190, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Concord'), 0.324, 0.318, 0.369, 0.086)),
+    (-191, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Sansha'), 0.137, 0.355, 0.352, 0)),
+    (-192, (_c(_t('NPC')) + _c(_t('Abyssal')) + _c(_t('Gamma T4/T5/T6')) + _t('Angel'), 0.59, 0.528, 0.477, 0.126)),
+    (-193, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Drifter Entities'), 0.128, 0.375, 0.383, 0.383)),
+    (-194, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Rogue Drone Entities'), 0.104, 0.147, 0.147, 0.102)),
+    (-195, (_c(_t('NPC')) + _c(_t('Invasion')) + _t('Sleeper Entities'), 0.563, 0.563, 0.563, 0.563))])
 
 
 class TargetProfile:

graphs/data/fitDamageStats/calc/application.py

@@ -211,7 +211,7 @@ def getDoomsdayMult(mod, tgt, distance, tgtSigRadius):
         # Disallow only against subcaps, allow against caps and tgt profiles
         if tgt.isFit and not tgt.item.ship.item.requiresSkill('Capital Ships'):
             return 0
-    damageSig = mod.getModifiedItemAttr('doomsdayDamageRadius') or mod.getModifiedItemAttr('signatureRadius')
+    damageSig = mod.getModifiedItemAttr('signatureRadius')
     if not damageSig:
         return 1
     return min(1, tgtSigRadius / damageSig)

graphs/data/fitShieldRegen/graph.py

@@ -66,7 +66,7 @@ class FitShieldRegenGraph(FitGraph):
         ('shieldAmount', '%'): lambda v, src, tgt: v / 100 * src.item.ship.getModifiedItemAttr('shieldCapacity'),
         ('shieldAmountT0', '%'): lambda v, src, tgt: None if v is None else v / 100 * src.item.ship.getModifiedItemAttr('shieldCapacity'),
         # Needed only for "x mark" support, to convert EHP x into normalized value
-        ('shieldAmount', 'EHP'): lambda v, src, tgt: v / src.item.damagePattern.effectivify(src.item, 1, 'shield')}
+        ('shieldAmount', 'EHP'): lambda v, src, tgt: v / src.item.damagePattern.effectivify(src.item.ship, 1, 'shield')}
     _limiters = {
         'shieldAmount': lambda src, tgt: (0, src.item.ship.getModifiedItemAttr('shieldCapacity')),
         'shieldAmountT0': lambda src, tgt: (0, src.item.ship.getModifiedItemAttr('shieldCapacity'))}
@@ -77,5 +77,5 @@ class FitShieldRegenGraph(FitGraph):
         ('shieldAmount', 'shieldRegen'): ShieldAmount2ShieldRegenGetter}
     _denormalizers = {
         ('shieldAmount', '%'): lambda v, src, tgt: v * 100 / src.item.ship.getModifiedItemAttr('shieldCapacity'),
-        ('shieldAmount', 'EHP'): lambda v, src, tgt: src.item.damagePattern.effectivify(src.item, v, 'shield'),
-        ('shieldRegen', 'EHP/s'): lambda v, src, tgt: src.item.damagePattern.effectivify(src.item, v, 'shield')}
+        ('shieldAmount', 'EHP'): lambda v, src, tgt: src.item.damagePattern.effectivify(src.item.ship, v, 'shield'),
+        ('shieldRegen', 'EHP/s'): lambda v, src, tgt: src.item.damagePattern.effectivify(src.item.ship, v, 'shield')}

graphs/gui/frame.py

@@ -114,7 +114,7 @@ class GraphFrame(AuxiliaryFrame):
         newW = max(curW, bestW)
         newH = max(curH, bestH)
         if newW > curW or newH > curH:
-            newSize = wx.Size(newW, newH)
+            newSize = wx.Size(round(newW), round(newH))
             self.SetSize(newSize)
             self.SetMinSize(newSize)
 

graphs/gui/vector.py

@@ -39,7 +39,7 @@ class VectorPicker(wx.Window):
         self._directionOnly = kwargs.pop('directionOnly', False)
         super().__init__(*args, **kwargs)
         self._fontsize = max(1, float(kwargs.pop('fontsize', 8 / self.GetContentScaleFactor())))
-        self._font = wx.Font(self._fontsize, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False)
+        self._font = wx.Font(round(self._fontsize), wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False)
         self._angle = 0
         self.__length = 1
         self._left = False
@@ -76,7 +76,7 @@ class VectorPicker(wx.Window):
         self.__length = newLength
 
     def DoGetBestSize(self):
-        return wx.Size(self._size, self._size)
+        return wx.Size(round(self._size), round(self._size))
 
     def AcceptsFocusFromKeyboard(self):
         return False
@@ -121,35 +121,37 @@ class VectorPicker(wx.Window):
 
         radius = min(width, height) / 2 - 2
         dc.SetBrush(wx.WHITE_BRUSH)
-        dc.DrawCircle(radius + 2, radius + 2, radius)
+        dc.DrawCircle(round(radius + 2), round(radius + 2), round(radius))
         a = math.radians(self._angle + self._offset)
         x = math.cos(a) * radius
         y = math.sin(a) * radius
         # See PR #2260 on why this is needed
         pointRadius = 2 / self.GetContentScaleFactor() if 'wxGTK' in wx.PlatformInfo else 2
-        dc.DrawLine(radius + 2, radius + 2, radius + 2 + x * self._length, radius + 2 - y * self._length)
+        dc.DrawLine(
+            round(radius + 2), round(radius + 2),
+            round(radius + 2 + x * self._length), round(radius + 2 - y * self._length))
         dc.SetBrush(wx.BLACK_BRUSH)
-        dc.DrawCircle(radius + 2 + x * self._length, radius + 2 - y * self._length, pointRadius)
+        dc.DrawCircle(round(radius + 2 + x * self._length), round(radius + 2 - y * self._length), round(pointRadius))
 
         if self._label:
             labelText = self._label
             labelTextW, labelTextH = dc.GetTextExtent(labelText)
             labelTextX = (radius * 2 + 4 - labelTextW) if (self._labelpos & 1) else 0
             labelTextY = (radius * 2 + 4 - labelTextH) if (self._labelpos & 2) else 0
-            dc.DrawText(labelText, labelTextX, labelTextY)
+            dc.DrawText(labelText, round(labelTextX), round(labelTextY))
 
         if not self._directionOnly:
             lengthText = '%d%%' % (100 * self._length,)
             lengthTextW, lengthTextH = dc.GetTextExtent(lengthText)
             lengthTextX = radius + 2 + x / 2 - y / 3 - lengthTextW / 2
             lengthTextY = radius + 2 - y / 2 - x / 3 - lengthTextH / 2
-            dc.DrawText(lengthText, lengthTextX, lengthTextY)
+            dc.DrawText(lengthText, round(lengthTextX), round(lengthTextY))
 
         angleText = '%d\u00B0' % (self._angle,)
         angleTextW, angleTextH = dc.GetTextExtent(angleText)
         angleTextX = radius + 2 - x / 2 - angleTextW / 2
         angleTextY = radius + 2 + y / 2 - angleTextH / 2
-        dc.DrawText(angleText, angleTextX, angleTextY)
+        dc.DrawText(angleText, round(angleTextX), round(angleTextY))
 
     def OnEraseBackground(self, event):
         pass

graphs/wrapper.py

@@ -199,7 +199,7 @@ def _getAutoResists(fit):
     armorHp = hpData['armor']
     hullHp = hpData['hull']
     uniformDamagePattern = DamagePattern(emAmount=25, thermalAmount=25, kineticAmount=25, explosiveAmount=25)
-    ehpData = uniformDamagePattern.calculateEhp(fit)
+    ehpData = uniformDamagePattern.calculateEhp(fit.ship)
     shieldEhp = ehpData['shield']
     armorEhp = ehpData['armor']
     hullEhp = ehpData['hull']

gui/attribute_gauge.py

@@ -212,7 +212,7 @@ class AttributeGauge(wx.Window):
             for x in range(1, 20):
                 dc.SetBrush(wx.Brush(wx.LIGHT_GREY))
                 dc.SetPen(wx.Pen(wx.LIGHT_GREY))
-                dc.DrawRectangle(x * 10, 1, 1, rect.height)
+                dc.DrawRectangle(round(x * 10), 1, 1, round(rect.height))
 
         dc.SetBrush(wx.Brush(colour))
         dc.SetPen(wx.Pen(colour))
@@ -222,19 +222,19 @@ class AttributeGauge(wx.Window):
 
         if value >= 0:
             padding = (half if is_even else math.ceil(half - 1)) + 1
-            dc.DrawRectangle(padding, 1, w, rect.height)
+            dc.DrawRectangle(round(padding), 1, round(w), round(rect.height))
         else:
             padding = half - w + 1 if is_even else math.ceil(half) - (w - 1)
-            dc.DrawRectangle(padding, 1, w, rect.height)
+            dc.DrawRectangle(round(padding), 1, round(w), round(rect.height))
 
         if self.leading_edge and (self.edge_on_neutral or value != 0):
             dc.SetPen(wx.Pen(wx.WHITE))
             dc.SetBrush(wx.Brush(wx.WHITE))
 
             if value > 0:
-                dc.DrawRectangle(min(padding + w, rect.width), 1, 1, rect.height)
+                dc.DrawRectangle(round(min(padding + w, rect.width)), 1, 1, round(rect.height))
             else:
-                dc.DrawRectangle(max(padding - 1, 1), 1, 1, rect.height)
+                dc.DrawRectangle(round(max(padding - 1, 1)), 1, 1, round(rect.height))
 
     def OnTimer(self, event):
         old_value = self._old_percentage

gui/bitmap_loader.py

@@ -103,10 +103,9 @@ class BitmapLoader:
             pyfalog.warning("Missing icon file: {0}/{1}".format(location, filename))
             return None
 
-        bmp: wx.Bitmap = img.ConvertToBitmap()
         if scale > 1:
-            bmp.SetSize((bmp.GetWidth() // scale, bmp.GetHeight() // scale))
-        return bmp
+            return img.Scale(round(img.GetWidth() // scale), round(img.GetHeight() // scale)).ConvertToBitmap()
+        return img.ConvertToBitmap()
 
     @classmethod
     def loadScaledBitmap(cls, name, location, scale=0):

gui/builtinAdditionPanes/droneView.py

@@ -66,6 +66,8 @@ class DroneView(Display):
         "Max Range",
         "Miscellanea",
         "attr:maxVelocity",
+        "Drone HP",
+        "Drone Regen",
         "Price",
     ]
 

gui/builtinAdditionPanes/fighterView.py

@@ -151,6 +151,8 @@ class FighterDisplay(d.Display):
                     # "Max Range",
                     # "Miscellanea",
                     "attr:maxVelocity",
+                    "Drone HP",
+                    "Drone Regen",
                     "Fighter Abilities",
                     "Price",
                     ]

gui/builtinContextMenus/__init__.py

@@ -11,6 +11,7 @@ from gui.builtinContextMenus import graphFitAmmoPicker
 from gui.builtinContextMenus import shipModeChange
 from gui.builtinContextMenus import moduleAmmoChange
 from gui.builtinContextMenus import moduleSpool
+from gui.builtinContextMenus import moduleRahPattern
 from gui.builtinContextMenus import boosterSideEffects
 from gui.builtinContextMenus import fighterAbilities
 from gui.builtinContextMenus import resistMode

gui/builtinContextMenus/commandFitAdd.py

@@ -44,7 +44,6 @@ class AddCommandFit(ContextMenuUnconditional):
     def display(self, callingWindow, srcContext):
         if self.mainFrame.getActiveFit() is None or len(self.__class__.commandFits) == 0 or srcContext != "commandView":
             return False
-
         return True
 
     def getText(self, callingWindow, itmContext):
@@ -52,6 +51,8 @@ class AddCommandFit(ContextMenuUnconditional):
 
     def addFit(self, menu, fit, includeShip=False):
         label = fit.name if not includeShip else "({}) {}".format(fit.ship.item.name, fit.name)
+        if not label:
+            label = ' '
         id = ContextMenuUnconditional.nextID()
         self.fitMenuItemIds[id] = fit
         menuItem = wx.MenuItem(menu, id, label)

gui/builtinContextMenus/damagePatternChange.py

@@ -1,20 +1,16 @@
-from collections import OrderedDict
-from itertools import chain
-
 # noinspection PyPackageRequirements
 import wx
 
 import gui.globalEvents as GE
 import gui.mainFrame
+from gui.builtinContextMenus.shared.patterns import DamagePatternMixin
 from gui.contextMenu import ContextMenuUnconditional
-from gui.utils.sorter import smartSort
-from service.damagePattern import DamagePattern as DmgPatternSvc
 from service.fit import Fit
 
 _t = wx.GetTranslation
 
 
-class ChangeDamagePattern(ContextMenuUnconditional):
+class ChangeDamagePattern(ContextMenuUnconditional, DamagePatternMixin):
 
     def __init__(self):
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
@@ -27,29 +23,12 @@ class ChangeDamagePattern(ContextMenuUnconditional):
         return self.mainFrame.getActiveFit() is not None
 
     def getText(self, callingWindow, itmContext):
-        sDP = DmgPatternSvc.getInstance()
         sFit = Fit.getInstance()
         fitID = self.mainFrame.getActiveFit()
         self.fit = sFit.getFit(fitID)
-
-        builtinPatterns = sDP.getBuiltinDamagePatternList()
-        userPatterns = sorted(sDP.getUserDamagePatternList(), key=lambda p: smartSort(p.fullName))
-        # Order here is important: patterns with duplicate names from the latter will overwrite
-        # patterns from the former
-        self.patterns = sorted(
-                chain(builtinPatterns, userPatterns),
-                key=lambda p: p.fullName not in ["Uniform", "Selected Ammo"])
-
         self.patternEventMap = {}
-        self.items = (OrderedDict(), OrderedDict())
-        for pattern in self.patterns:
-            container = self.items
-            for categoryName in pattern.hierarchy:
-                categoryName = _t(categoryName) if pattern.builtin else categoryName
-                container = container[1].setdefault(categoryName, (OrderedDict(), OrderedDict()))
-            shortName = _t(pattern.shortName) if pattern.builtin else pattern.shortName
-            container[0][shortName] = pattern
-
+        self.patterns = self._getPatterns()
+        self.items = self._getItems(self.patterns)
         return list(self.items[0].keys()) + list(self.items[1].keys())
 
     def _addPattern(self, parentMenu, pattern, name):

gui/builtinContextMenus/envEffectAdd.py

@@ -123,9 +123,9 @@ class AddEnvironmentEffect(ContextMenuUnconditional):
         data.groups[_t('Abyssal Weather')] = self.getAbyssalWeather()
         data.groups[_t('Sansha Incursion')] = self.getEffectBeacons(
             _t('ContextMenu|ProjectedEffectManipulation|Sansha Incursion'))
-        data.groups[_t('Triglavian Invasion')] = self.getEffectBeacons(
-            _t('ContextMenu|ProjectedEffectManipulation|Triglavian Invasion'))
-        data.groups[_t('Triglavian Invasion')].groups[_t('Destructible Beacons')] = self.getDestructibleBeacons()
+        data.groups[_t('Triglavian Invasion')] = self.getInvasionBeacons()
+        # data.groups[_t('Pirate Insurgency')] = self.getEffectBeacons(
+        #     _t('ContextMenu|ProjectedEffectManipulation|Insurgency'))
         return data
 
     def getEffectBeacons(self, *groups, extra_garbage=()):
@@ -233,5 +233,19 @@ class AddEnvironmentEffect(ContextMenuUnconditional):
         data.sort()
         return data
 
+    def getInvasionBeacons(self):
+        data = self.getDestructibleBeacons()
+        # Turnur weather
+        item = Market.getInstance().getItem(74002)
+        data.items.append(Entry(item.ID, item.name, item.name))
+        return data
+
+    def getInsurgencyBeacons(self):
+        data = self.getDestructibleBeacons()
+        # Suppression Interdiction Range Beacon
+        item = Market.getInstance().getItem(79839)
+        data.items.append(Entry(item.ID, item.name, item.name))
+        return data
+
 
 AddEnvironmentEffect.register()

gui/builtinContextMenus/moduleRahPattern.py

@@ -0,0 +1,97 @@
+from collections import OrderedDict
+
+# noinspection PyPackageRequirements
+import wx
+
+import gui.globalEvents as GE
+import gui.mainFrame
+from gui.builtinContextMenus.shared.patterns import DamagePatternMixin
+from gui.contextMenu import ContextMenuSingle
+from service.fit import Fit
+
+_t = wx.GetTranslation
+
+
+class ChangeRahPattern(ContextMenuSingle, DamagePatternMixin):
+
+    def __init__(self):
+        self.mainFrame = gui.mainFrame.MainFrame.getInstance()
+
+    def display(self, callingWindow, srcContext, mainItem):
+        if srcContext != 'fittingModule':
+            return False
+
+        if self.mainFrame.getActiveFit() is None:
+            return False
+
+        if (mainItem is None or getattr(mainItem, "isEmpty", False)) and srcContext != "fittingShip":
+            return False
+
+        if mainItem.item.group.name != 'Armor Resistance Shift Hardener':
+            return False
+
+        self.module = mainItem
+        self.patternEventMap = {}
+        self.patterns = self._getPatterns()
+        self.items = self._getItems(self.patterns)
+        return True
+
+    def getText(self, callingWindow, itmContext, mainItem):
+        return _t('RAH Damage Pattern')
+
+    def _addPattern(self, parentMenu, pattern, name):
+        id = ContextMenuSingle.nextID()
+        self.patternEventMap[id] = pattern
+        menuItem = wx.MenuItem(parentMenu, id, name, kind=wx.ITEM_CHECK)
+        parentMenu.Bind(wx.EVT_MENU, self.handlePatternSwitch, menuItem)
+
+        checked = self.module.rahPatternOverride is pattern
+        return menuItem, checked
+
+    def _addCategory(self, parentMenu, name):
+        id = ContextMenuSingle.nextID()
+        menuItem = wx.MenuItem(parentMenu, id, name)
+        parentMenu.Bind(wx.EVT_MENU, self.handlePatternSwitch, menuItem)
+        return menuItem
+
+    def getSubMenu(self, callingWindow, context, mainItem, rootMenu, i, pitem):
+        # Category as menu item - expands further
+        msw = "wxMSW" in wx.PlatformInfo
+
+        def makeMenu(container, parentMenu, root=False):
+            menu = wx.Menu()
+            if root:
+                menuItem, checked = self._addPattern(rootMenu if msw else parentMenu, None, 'Fit Pattern')
+                menu.Append(menuItem)
+                menuItem.Check(checked)
+                menuItem, checked = self._addPattern(rootMenu if msw else parentMenu, 'disable', 'Do Not Adapt')
+                menu.Append(menuItem)
+                menuItem.Check(checked)
+                menu.AppendSeparator()
+            for name, subcontainer in container[1].items():
+                menuItem = self._addCategory(rootMenu if msw else parentMenu, name)
+                subMenu = makeMenu(subcontainer, menu)
+                menuItem.SetSubMenu(subMenu)
+                menu.Append(menuItem)
+            for name, pattern in container[0].items():
+                menuItem, checked = self._addPattern(rootMenu if msw else parentMenu, pattern, name)
+                menu.Append(menuItem)
+                menuItem.Check(checked)
+            menu.Bind(wx.EVT_MENU, self.handlePatternSwitch)
+            return menu
+
+        subMenu = makeMenu(self.items, rootMenu, root=True)
+        return subMenu
+
+    def handlePatternSwitch(self, event):
+        pattern = self.patternEventMap.get(event.Id, False)
+        if pattern is False:
+            event.Skip()
+            return
+        sFit = Fit.getInstance()
+        fitID = self.mainFrame.getActiveFit()
+        sFit.setRahPattern(fitID, self.module, pattern)
+        wx.PostEvent(self.mainFrame, GE.FitChanged(fitIDs=(fitID,)))
+
+
+ChangeRahPattern.register()

gui/builtinContextMenus/shared/patterns.py

@@ -0,0 +1,35 @@
+from collections import OrderedDict
+from itertools import chain
+
+# noinspection PyPackageRequirements
+import wx
+
+from gui.utils.sorter import smartSort
+from service.damagePattern import DamagePattern as DmgPatternSvc
+
+_t = wx.GetTranslation
+
+
+class DamagePatternMixin:
+
+    def _getPatterns(self):
+        sDP = DmgPatternSvc.getInstance()
+        builtinPatterns = sDP.getBuiltinDamagePatternList()
+        userPatterns = sorted(sDP.getUserDamagePatternList(), key=lambda p: smartSort(p.fullName))
+        # Order here is important: patterns with duplicate names from the latter will overwrite
+        # patterns from the former
+        patterns = sorted(
+                chain(builtinPatterns, userPatterns),
+                key=lambda p: p.fullName not in ["Uniform", "Selected Ammo"])
+        return patterns
+
+    def _getItems(self, patterns):
+        items = (OrderedDict(), OrderedDict())
+        for pattern in patterns:
+            container = items
+            for categoryName in pattern.hierarchy:
+                categoryName = _t(categoryName) if pattern.builtin else categoryName
+                container = container[1].setdefault(categoryName, (OrderedDict(), OrderedDict()))
+            shortName = _t(pattern.shortName) if pattern.builtin else pattern.shortName
+            container[0][shortName] = pattern
+        return items

gui/builtinItemStatsViews/itemCompare.py

@@ -36,6 +36,8 @@ class ItemCompare(wx.Panel):
         self.item = item
         self.items = sorted(items, key=defaultSort)
         self.attrs = {}
+        self.HighlightOn = wx.Colour(255, 255, 0, wx.ALPHA_OPAQUE)
+        self.highlightedNames = []
 
         # get a dict of attrName: attrInfo of all unique attributes across all items
         for item in self.items:
@@ -88,6 +90,21 @@ class ItemCompare(wx.Panel):
         self.toggleViewBtn.Bind(wx.EVT_TOGGLEBUTTON, self.ToggleViewMode)
         self.Bind(wx.EVT_LIST_COL_CLICK, self.SortCompareCols)
 
+        self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.HighlightRow)
+
+    def HighlightRow(self, event):
+        itemIdx = event.GetIndex()
+        name = self.paramList.GetItem(itemIdx).Text
+        if name in self.highlightedNames:
+            self.highlightedNames.remove(name)
+        else:
+            self.highlightedNames.append(name)
+        self.Freeze()
+        self.paramList.ClearAll()
+        self.PopulateList()
+        self.Thaw()
+        event.Skip()
+
     def SortCompareCols(self, event):
         self.Freeze()
         self.paramList.ClearAll()
@@ -155,6 +172,8 @@ class ItemCompare(wx.Panel):
         self.paramList.InsertColumn(len(self.attrs) + 1, _t("Price"))
         self.paramList.SetColumnWidth(len(self.attrs) + 1, 60)
 
+        toHighlight = []
+
         for item in self.items:
             i = self.paramList.InsertItem(self.paramList.GetItemCount(), item.name)
             for x, attr in enumerate(self.attrs.keys()):
@@ -172,10 +191,19 @@ class ItemCompare(wx.Panel):
 
             # Add prices
             self.paramList.SetItem(i, len(self.attrs) + 1, formatAmount(item.price.price, 3, 3, 9, currency=True) if item.price.price else "")
+            if item.name in self.highlightedNames:
+                toHighlight.append(i)
 
         self.paramList.RefreshRows()
         self.Layout()
 
+        # Highlight after layout, otherwise colors are getting overwritten
+        for itemIdx in toHighlight:
+            listItem = self.paramList.GetItem(itemIdx)
+            listItem.SetBackgroundColour(self.HighlightOn)
+            listItem.SetFont(listItem.GetFont().MakeBold())
+            self.paramList.SetItem(listItem)
+
     @staticmethod
     def TranslateValueUnit(value, unitName, unitDisplayName):
         def itemIDCallback():

gui/builtinMarketBrowser/pfSearchBox.py

@@ -253,8 +253,8 @@ class PFSearchBox(wx.Window):
                 else:
                     spad = 0
 
-                dc.DrawBitmap(self.searchBitmapShadow, self.searchButtonX + 1, self.searchButtonY + 1)
-                dc.DrawBitmap(self.searchBitmap, self.searchButtonX + spad, self.searchButtonY + spad)
+                dc.DrawBitmap(self.searchBitmapShadow, round(self.searchButtonX + 1), round(self.searchButtonY + 1))
+                dc.DrawBitmap(self.searchBitmap, round(self.searchButtonX + spad), round(self.searchButtonY + spad))
 
         if self.isCancelButtonVisible:
             if self.cancelBitmap:
@@ -262,8 +262,8 @@ class PFSearchBox(wx.Window):
                     cpad = 1
                 else:
                     cpad = 0
-                dc.DrawBitmap(self.cancelBitmapShadow, self.cancelButtonX + 1, self.cancelButtonY + 1)
-                dc.DrawBitmap(self.cancelBitmap, self.cancelButtonX + cpad, self.cancelButtonY + cpad)
+                dc.DrawBitmap(self.cancelBitmapShadow, round(self.cancelButtonX + 1), round(self.cancelButtonY + 1))
+                dc.DrawBitmap(self.cancelBitmap, round(self.cancelButtonX + cpad), round(self.cancelButtonY + cpad))
 
         dc.SetPen(wx.Pen(sepColor, 1))
         dc.DrawLine(0, rect.height - 1, rect.width, rect.height - 1)

gui/builtinPreferenceViews/pyfaEnginePreferences.py

@@ -57,12 +57,6 @@ class PFFittingEnginePref(PreferenceView):
 
         mainSizer.Add(self.cbStrictSkillLevels, 0, wx.ALL | wx.EXPAND, 5)
 
-        self.cbUniversalAdaptiveArmorHardener = wx.CheckBox(panel, wx.ID_ANY,
-                                                            _t("When damage profile is Uniform, set Reactive Armor "
-                                                               "Hardener to match (old behavior)."),
-                                                            wx.DefaultPosition, wx.DefaultSize, 0)
-        mainSizer.Add(self.cbUniversalAdaptiveArmorHardener, 0, wx.ALL | wx.EXPAND, 5)
-
         spoolup_sizer = wx.BoxSizer(wx.HORIZONTAL)
 
         self.spool_up_label = wx.StaticText(panel, wx.ID_ANY, _t("Global Default Spoolup Percentage:"), wx.DefaultPosition, wx.DefaultSize, 0)
@@ -110,9 +104,6 @@ class PFFittingEnginePref(PreferenceView):
         self.cbStrictSkillLevels.SetValue(self.engine_settings.get("strictSkillLevels"))
         self.cbStrictSkillLevels.Bind(wx.EVT_CHECKBOX, self.OnCBStrictSkillLevelsChange)
 
-        self.cbUniversalAdaptiveArmorHardener.SetValue(self.engine_settings.get("useStaticAdaptiveArmorHardener"))
-        self.cbUniversalAdaptiveArmorHardener.Bind(wx.EVT_CHECKBOX, self.OnCBUniversalAdaptiveArmorHardenerChange)
-
         self.spoolup_value.SetValue(int(self.engine_settings.get("globalDefaultSpoolupPercentage") * 100))
         self.spoolup_value.Bind(wx.lib.intctrl.EVT_INT, self.OnSpoolupChange)
 
@@ -129,8 +120,6 @@ class PFFittingEnginePref(PreferenceView):
     def OnCBStrictSkillLevelsChange(self, event):
         self.engine_settings.set("strictSkillLevels", self.cbStrictSkillLevels.GetValue())
 
-    def OnCBUniversalAdaptiveArmorHardenerChange(self, event):
-        self.engine_settings.set("useStaticAdaptiveArmorHardener", self.cbUniversalAdaptiveArmorHardener.GetValue())
 
     def getImage(self):
         return BitmapLoader.getBitmap("settings_fitting", "gui")

gui/builtinPreferenceViews/pyfaEsiPreferences.py

@@ -34,6 +34,13 @@ class PFEsiPref(PreferenceView):
         self.stInfo.Wrap(dlgWidth - 50)
         mainSizer.Add(self.stInfo, 0, wx.EXPAND | wx.TOP | wx.BOTTOM, 5)
 
+        self.enforceJwtExpiration = wx.CheckBox(panel, wx.ID_ANY, _t("Enforce Token Expiration"), wx.DefaultPosition,
+                                        wx.DefaultSize,
+                                        0)
+        self.enforceJwtExpiration.SetToolTip(wx.ToolTip(_t("This option is a workaround in case you cannot log into EVE SSO "
+                                                       "due to 'Signature has expired' error")))
+        mainSizer.Add(self.enforceJwtExpiration, 0, wx.ALL | wx.EXPAND, 5)
+
         rbSizer = wx.BoxSizer(wx.HORIZONTAL)
         self.rbMode = wx.RadioBox(panel, -1, _t("Login Authentication Method"), wx.DefaultPosition, wx.DefaultSize,
                                   [_t('Local Server'), _t('Manual')], 1, wx.RA_SPECIFY_COLS)
@@ -43,11 +50,12 @@ class PFEsiPref(PreferenceView):
                                          " character login. Use this if having issues with the local server."))
 
         self.rbMode.SetSelection(self.settings.get('loginMode'))
+        self.enforceJwtExpiration.SetValue(self.settings.get("enforceJwtExpiration" or True))
 
         rbSizer.Add(self.rbMode, 1, wx.TOP | wx.RIGHT, 5)
 
         self.rbMode.Bind(wx.EVT_RADIOBOX, self.OnModeChange)
-
+        self.enforceJwtExpiration.Bind(wx.EVT_CHECKBOX, self.OnEnforceChange)
         mainSizer.Add(rbSizer, 1, wx.ALL | wx.EXPAND, 0)
 
         panel.SetSizer(mainSizer)
@@ -59,6 +67,10 @@ class PFEsiPref(PreferenceView):
     def OnModeChange(self, event):
         self.settings.set('loginMode', event.GetInt())
 
+    def OnEnforceChange(self, event):
+        self.settings.set('enforceJwtExpiration', self.enforceJwtExpiration.GetValue())
+        event.Skip()
+
     def getImage(self):
         return BitmapLoader.getBitmap("eve", "gui")
 

gui/builtinPreferenceViews/pyfaGeneralPreferences.py

@@ -40,7 +40,7 @@ class PFGeneralPref(PreferenceView):
 
         langSizer = wx.BoxSizer(wx.HORIZONTAL)
 
-        self.langChoices = sorted([langInfo for lang, langInfo in LocaleSettings.supported_langauges().items()], key=lambda x: x.Description)
+        self.langChoices = sorted([langInfo for lang, langInfo in LocaleSettings.supported_languages().items()], key=lambda x: x.Description)
         pyfaLangsEnabled = bool(self.langChoices)
 
         if pyfaLangsEnabled:
@@ -64,7 +64,7 @@ class PFGeneralPref(PreferenceView):
             langBox.Add(hl.HyperLinkCtrl(panel, -1,
                                          _t("Interested in helping with translations?"),
                                          URL="https://github.com/pyfa-org/Pyfa/blob/master/locale/README.md"
-                                         ), 0, wx.LEFT | wx.ALIGN_CENTER_VERTICAL, 15)
+                                         ), 0, wx.LEFT, 15)
         else:
             self.stLangLabel = wx.StaticText(panel, wx.ID_ANY, _t("Pyfa language selection disabled. Please check if .mo files have been generated.\nRefer to locale/README.md for info."), wx.DefaultPosition, wx.DefaultSize, 0)
             self.stLangLabel.Wrap(-1)
@@ -93,7 +93,7 @@ class PFGeneralPref(PreferenceView):
         langBox.Add(wx.StaticText(panel, wx.ID_ANY,
                                   _t("Auto will use the same language pyfa uses if available, otherwise English"),
                                   wx.DefaultPosition,
-                                  wx.DefaultSize, 0), 0, wx.LEFT | wx.ALIGN_CENTER_VERTICAL, 15)
+                                  wx.DefaultSize, 0), 0, wx.LEFT, 15)
 
         self.cbGlobalChar = wx.CheckBox(panel, wx.ID_ANY, _t("Use global character"), wx.DefaultPosition, wx.DefaultSize,
                                         0)

gui/builtinShipBrowser/categoryItem.py

@@ -104,14 +104,14 @@ class CategoryItem(SFBrowserItem):
         textColor = colorUtils.GetSuitable(windowColor, 1)
 
         mdc.SetTextForeground(textColor)
-        mdc.DrawBitmap(self.dropShadowBitmap, self.shipBmpx + 1, self.shipBmpy + 1)
-        mdc.DrawBitmap(self.shipBmp, self.shipBmpx, self.shipBmpy, 0)
+        mdc.DrawBitmap(self.dropShadowBitmap, round(self.shipBmpx + 1), round(self.shipBmpy + 1))
+        mdc.DrawBitmap(self.shipBmp, round(self.shipBmpx), round(self.shipBmpy), 0)
 
         mdc.SetFont(self.fontBig)
 
         categoryName, fittings = self.fittingInfo
 
-        mdc.DrawText(categoryName, self.catx, self.caty)
+        mdc.DrawText(categoryName, round(self.catx), round(self.caty))
 
 
 # =============================================================================

gui/builtinShipBrowser/fitItem.py

@@ -416,9 +416,18 @@ class FitItem(SFItem.SFBrowserItem):
         if self.dragging:
             if not self.dragged:
                 if self.dragMotionTrigger < 0:
+                    if not self.dragTLFBmp:
+                        tdc = wx.MemoryDC()
+                        bmpWidth = self.toolbarx if self.toolbarx < 200 else 200
+                        self.dragTLFBmp = wx.Bitmap(round(bmpWidth), round(self.GetRect().height))
+                        tdc.SelectObject(self.dragTLFBmp)
+                        tdc.SetBrush(wx.Brush(wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)))
+                        tdc.DrawRectangle(0, 0, bmpWidth, self.GetRect().height)
+                        self.DrawItem(tdc)
+                        tdc.SelectObject(wx.NullBitmap)
                     if not self.HasCapture():
                         self.CaptureMouse()
-                    self.dragWindow = PFBitmapFrame(self, pos, self.dragTLFBmp)
+                    self.dragWindow = PFBitmapFrame(self, pos, self.dragTLFBmp)  
                     self.dragWindow.Show()
                     self.dragged = True
                     self.dragMotionTrigger = self.dragMotionTrail
@@ -493,9 +502,9 @@ class FitItem(SFItem.SFBrowserItem):
         else:
             shipEffBk = self.shipEffBk
 
-        mdc.DrawBitmap(shipEffBk, self.shipEffx, self.shipEffy, 0)
+        mdc.DrawBitmap(shipEffBk, round(self.shipEffx), round(self.shipEffy), 0)
 
-        mdc.DrawBitmap(self.shipBmp, self.shipBmpx, self.shipBmpy, 0)
+        mdc.DrawBitmap(self.shipBmp, round(self.shipBmpx), round(self.shipBmpy), 0)
 
         mdc.SetFont(self.fontNormal)
 
@@ -504,26 +513,21 @@ class FitItem(SFItem.SFBrowserItem):
         pfdate = drawUtils.GetPartialText(mdc, fitLocalDate,
                                           self.toolbarx - self.textStartx - self.padding * 2 - self.thoverw)
 
-        mdc.DrawText(pfdate, self.textStartx, self.timestampy)
+        mdc.DrawText(pfdate, round(self.textStartx), round(self.timestampy))
 
         mdc.SetFont(self.fontSmall)
-        mdc.DrawText(self.toolbar.hoverLabel, self.thoverx, self.thovery)
+        mdc.DrawText(self.toolbar.hoverLabel, round(self.thoverx), round(self.thovery))
 
         mdc.SetFont(self.fontBig)
 
         psname = drawUtils.GetPartialText(mdc, self.fitName,
                                           self.toolbarx - self.textStartx - self.padding * 2 - self.thoverw)
 
-        mdc.DrawText(psname, self.textStartx, self.fitNamey)
+        mdc.DrawText(psname, round(self.textStartx), round(self.fitNamey))
 
         if self.tcFitName.IsShown():
             self.AdjustControlSizePos(self.tcFitName, self.textStartx, self.toolbarx - self.editWidth - self.padding)
 
-        tdc = wx.MemoryDC()
-        self.dragTLFBmp = wx.Bitmap((self.toolbarx if self.toolbarx < 200 else 200), rect.height, 24)
-        tdc.SelectObject(self.dragTLFBmp)
-        tdc.Blit(0, 0, (self.toolbarx if self.toolbarx < 200 else 200), rect.height, mdc, 0, 0, wx.COPY)
-        tdc.SelectObject(wx.NullBitmap)
 
     def AdjustControlSizePos(self, editCtl, start, end):
         fnEditSize = editCtl.GetSize()

gui/builtinShipBrowser/navigationPanel.py

@@ -231,7 +231,7 @@ class NavigationPanel(SFItem.SFBrowserItem):
 
         self.toolbar.SetPosition((self.toolbarx, self.toolbary))
         mdc.SetFont(self.fontSmall)
-        mdc.DrawText(self.toolbar.hoverLabel, self.thoverx, self.thovery)
+        mdc.DrawText(self.toolbar.hoverLabel, round(self.thoverx), round(self.thovery))
         mdc.SetPen(wx.Pen(sepColor, 1))
         mdc.DrawLine(0, rect.height - 1, rect.width, rect.height - 1)
 

gui/builtinShipBrowser/pfBitmapFrame.py

@@ -55,7 +55,7 @@ class PFBitmapFrame(wx.Frame):
         # todo: evaluate wx.DragImage, might make this class obsolete, however might also lose our customizations
         # (like the sexy fade-in animation)
         rect = self.GetRect()
-        canvas = wx.Bitmap(rect.width, rect.height)
+        canvas = wx.Bitmap(round(rect.width), round(rect.height))
         # todo: convert to context manager after updating to wxPython >v4.0.1 (4.0.1 has a bug, see #1421)
         # See #1418 for discussion
         mdc = wx.BufferedPaintDC(self)
@@ -63,4 +63,4 @@ class PFBitmapFrame(wx.Frame):
         mdc.DrawBitmap(self.bitmap, 0, 0)
         mdc.SetPen(wx.Pen("#000000", width=1))
         mdc.SetBrush(wx.TRANSPARENT_BRUSH)
-        mdc.DrawRectangle(0, 0, rect.width, rect.height)
+        mdc.DrawRectangle(0, 0, round(rect.width), round(rect.height))

gui/builtinShipBrowser/pfListPane.py

@@ -57,7 +57,7 @@ class PFListPane(wx.ScrolledWindow):
 
         posy = self.GetScrollPos(wx.VERTICAL)
         posy -= self.itemsHeight
-        self.Scroll(0, posy)
+        self.Scroll(0, round(posy))
 
         event.Skip()
 
@@ -65,7 +65,7 @@ class PFListPane(wx.ScrolledWindow):
 
         posy = self.GetScrollPos(wx.VERTICAL)
         posy += self.itemsHeight
-        self.Scroll(0, posy)
+        self.Scroll(0, round(posy))
 
         event.Skip()
 
@@ -109,7 +109,7 @@ class PFListPane(wx.ScrolledWindow):
 
         # if we need to adjust
         if new_vs_x != -1 or new_vs_y != -1:
-            self.Scroll(new_vs_x, new_vs_y)
+            self.Scroll(round(new_vs_x), round(new_vs_y))
 
     def AddWidget(self, widget):
         widget.Reparent(self)

gui/builtinShipBrowser/raceSelector.py

@@ -68,7 +68,7 @@ class RaceSelector(wx.Window):
             img = img.Rotate90(False)
         img.Replace(0, 0, 0, sysTextColour[0], sysTextColour[1], sysTextColour[2])
         if layout == wx.VERTICAL:
-            img = img.Scale(self.minWidth, 8, wx.IMAGE_QUALITY_HIGH)
+            img = img.Scale(round(self.minWidth), 8, wx.IMAGE_QUALITY_HIGH)
 
         self.bmpArrow = wx.Bitmap(img)
 
@@ -194,25 +194,25 @@ class RaceSelector(wx.Window):
                     bmp = wx.Bitmap(img)
 
                 if self.layout == wx.VERTICAL:
-                    mdc.DrawBitmap(dropShadow, rect.width - self.buttonsPadding - bmp.GetWidth() + 1, y + 1)
-                    mdc.DrawBitmap(bmp, rect.width - self.buttonsPadding - bmp.GetWidth(), y)
+                    mdc.DrawBitmap(dropShadow, round(rect.width - self.buttonsPadding - bmp.GetWidth() + 1), round(y + 1))
+                    mdc.DrawBitmap(bmp, round(rect.width - self.buttonsPadding - bmp.GetWidth()), round(y))
                     y += raceBmp.GetHeight() + self.buttonsPadding
                     mdc.SetPen(wx.Pen(sepColor, 1))
                     mdc.DrawLine(rect.width - 1, 0, rect.width - 1, rect.height)
                 else:
-                    mdc.DrawBitmap(dropShadow, x + 1, self.buttonsPadding + 1)
-                    mdc.DrawBitmap(bmp, x, self.buttonsPadding)
+                    mdc.DrawBitmap(dropShadow, round(x + 1), round(self.buttonsPadding + 1))
+                    mdc.DrawBitmap(bmp, round(x), round(self.buttonsPadding))
                     x += raceBmp.GetWidth() + self.buttonsPadding
                     mdc.SetPen(wx.Pen(sepColor, 1))
                     mdc.DrawLine(0, 0, rect.width, 0)
 
         if self.direction < 1:
             if self.layout == wx.VERTICAL:
-                mdc.DrawBitmap(self.bmpArrow, -2, (rect.height - self.bmpArrow.GetHeight()) / 2)
+                mdc.DrawBitmap(self.bmpArrow, -2, round((rect.height - self.bmpArrow.GetHeight()) / 2))
             else:
                 mdc.SetPen(wx.Pen(sepColor, 1))
                 mdc.DrawLine(0, 0, rect.width, 0)
-                mdc.DrawBitmap(self.bmpArrow, (rect.width - self.bmpArrow.GetWidth()) / 2, -2)
+                mdc.DrawBitmap(self.bmpArrow, round((rect.width - self.bmpArrow.GetWidth()) / 2), -2)
 
     def OnTimer(self, event):
         if event.GetId() == self.animTimerID:

gui/builtinShipBrowser/sfBrowserItem.py

@@ -233,8 +233,8 @@ class PFToolbar:
 
             bmpWidth = bmp.GetWidth()
 
-            pdc.DrawBitmap(dropShadowBmp, bx + self.padding / 2, self.toolbarY + self.padding / 2)
-            pdc.DrawBitmap(bmp, tbx, by)
+            pdc.DrawBitmap(dropShadowBmp, round(bx + self.padding / 2), round(self.toolbarY + self.padding / 2))
+            pdc.DrawBitmap(bmp, round(tbx), round(by))
 
             bx += bmpWidth + self.padding
 

gui/builtinShipBrowser/shipItem.py

@@ -247,12 +247,12 @@ class ShipItem(SFItem.SFBrowserItem):
         else:
             shipEffBk = self.shipEffBk
 
-        mdc.DrawBitmap(shipEffBk, self.shipEffx, self.shipEffy, 0)
+        mdc.DrawBitmap(shipEffBk, round(self.shipEffx), round(self.shipEffy), 0)
 
-        mdc.DrawBitmap(self.shipBmp, self.shipBmpx, self.shipBmpy, 0)
+        mdc.DrawBitmap(self.shipBmp, round(self.shipBmpx), round(self.shipBmpy), 0)
 
-        mdc.DrawBitmap(self.raceDropShadowBmp, self.raceBmpx + 1, self.raceBmpy + 1)
-        mdc.DrawBitmap(self.raceBmp, self.raceBmpx, self.raceBmpy)
+        mdc.DrawBitmap(self.raceDropShadowBmp, round(self.raceBmpx + 1), round(self.raceBmpy + 1))
+        mdc.DrawBitmap(self.raceBmp, round(self.raceBmpx), round(self.raceBmpy))
 
         shipName, shipTrait, fittings = self.shipFittingInfo
 
@@ -264,17 +264,17 @@ class ShipItem(SFItem.SFBrowserItem):
             fformat = "%d fits"
 
         mdc.SetFont(self.fontNormal)
-        mdc.DrawText(fformat % fittings if fittings > 0 else fformat, self.textStartx, self.fittingsy)
+        mdc.DrawText(fformat % fittings if fittings > 0 else fformat, round(self.textStartx), round(self.fittingsy))
 
         mdc.SetFont(self.fontSmall)
-        mdc.DrawText(self.toolbar.hoverLabel, self.thoverx, self.thovery)
+        mdc.DrawText(self.toolbar.hoverLabel, round(self.thoverx), round(self.thovery))
 
         mdc.SetFont(self.fontBig)
 
         psname = drawUtils.GetPartialText(mdc, shipName,
                                           self.toolbarx - self.textStartx - self.padding * 2 - self.thoverw)
 
-        mdc.DrawText(psname, self.textStartx, self.shipNamey)
+        mdc.DrawText(psname, round(self.textStartx), round(self.shipNamey))
 
         if self.tcFitName.IsShown():
             self.AdjustControlSizePos(self.tcFitName, self.textStartx, self.toolbarx - self.editWidth - self.padding)

gui/builtinStatsViews/resistancesViewFull.py

@@ -146,8 +146,8 @@ class ResistancesViewFull(StatsView):
 
                 lbl = PyGauge(contentPanel, font, 100)
                 lbl.SetMinSize((48, 16))
-                lbl.SetBackgroundColour(wx.Colour(bc[0], bc[1], bc[2]))
-                lbl.SetBarColour(wx.Colour(fc[0], fc[1], fc[2]))
+                lbl.SetBackgroundColour(wx.Colour(round(bc[0]), round(bc[1]), round(bc[2])))
+                lbl.SetBarColour(wx.Colour(round(fc[0]), round(fc[1]), round(fc[2])))
                 lbl.SetBarGradient()
                 lbl.SetFractionDigits(1)
 

gui/builtinStatsViews/targetingMiscViewMinimal.py

@@ -127,7 +127,9 @@ class TargetingMiscViewMinimal(StatsView):
             ("specialSalvageHoldCapacity", _t("Salvage hold")),
             ("specialCommandCenterHoldCapacity", _t("Command center hold")),
             ("specialPlanetaryCommoditiesHoldCapacity", _t("Planetary goods hold")),
-            ("specialQuafeHoldCapacity", _t("Quafe hold"))))
+            ("specialQuafeHoldCapacity", _t("Quafe hold")),
+            ("specialMobileDepotHoldCapacity", _t("Mobile depot hold")),
+        ))
 
         cargoValues = {
             "main": lambda: fit.ship.getModifiedItemAttr("capacity"),
@@ -148,7 +150,8 @@ class TargetingMiscViewMinimal(StatsView):
             "specialSalvageHoldCapacity": lambda: fit.ship.getModifiedItemAttr("specialSalvageHoldCapacity"),
             "specialCommandCenterHoldCapacity": lambda: fit.ship.getModifiedItemAttr("specialCommandCenterHoldCapacity"),
             "specialPlanetaryCommoditiesHoldCapacity": lambda: fit.ship.getModifiedItemAttr("specialPlanetaryCommoditiesHoldCapacity"),
-            "specialQuafeHoldCapacity": lambda: fit.ship.getModifiedItemAttr("specialQuafeHoldCapacity")
+            "specialQuafeHoldCapacity": lambda: fit.ship.getModifiedItemAttr("specialQuafeHoldCapacity"),
+            "specialMobileDepotHoldCapacity": lambda: fit.ship.getModifiedItemAttr("specialMobileDepotHoldCapacity"),
         }
 
         stats = (("labelTargets", {"main": lambda: fit.maxTargets}, 3, 0, 0, ""),

gui/builtinViewColumns/droneEhp.py

@@ -0,0 +1,87 @@
+# =============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# 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/>.
+# =============================================================================
+
+# noinspection PyPackageRequirements
+import wx
+
+import gui.mainFrame
+from eos.saveddata.drone import Drone
+from eos.saveddata.fighter import Fighter
+from service.attribute import Attribute
+from gui.viewColumn import ViewColumn
+from gui.bitmap_loader import BitmapLoader
+from gui.utils.numberFormatter import formatAmount
+
+
+_t = wx.GetTranslation
+
+
+class DroneEhpColumn(ViewColumn):
+    name = "Drone HP"
+
+    def __init__(self, fittingView, params=None):
+        self.mainFrame = gui.mainFrame.MainFrame.getInstance()
+        if params is None:
+            params = {"showIcon": True, "displayName": False}
+
+        ViewColumn.__init__(self, fittingView)
+
+        sAttr = Attribute.getInstance()
+        info = sAttr.getAttributeInfo("shieldCapacity")
+        self.info = info
+        if params["showIcon"]:
+            iconFile = info.iconID
+            if iconFile:
+                self.imageId = fittingView.imageList.GetImageIndex(iconFile, "icons")
+                self.bitmap = BitmapLoader.getBitmap(iconFile, "icons")
+            else:
+                self.imageId = -1
+            self.mask = wx.LIST_MASK_IMAGE
+        else:
+            self.imageId = -1
+
+        if params["displayName"] or self.imageId == -1:
+            self.columnText = info.displayName if info.displayName != "" else info.name
+            self.mask |= wx.LIST_MASK_TEXT
+
+    def getText(self, stuff):
+        if not isinstance(stuff, (Drone, Fighter)):
+            return ""
+        if self.mainFrame.statsPane.nameViewMap["resistancesViewFull"].showEffective:
+            ehp = sum(stuff.ehp.values())
+        else:
+            ehp = sum(stuff.hp.values())
+        return formatAmount(ehp, 3, 0, 9)
+
+    def getImageId(self, mod):
+        return -1
+
+    def getParameters(self):
+        return ("displayName", bool, False), ("showIcon", bool, True)
+
+    def getToolTip(self, stuff):
+        if not isinstance(stuff, (Drone, Fighter)):
+            return ""
+        if self.mainFrame.statsPane.nameViewMap["resistancesViewFull"].showEffective:
+            return _t("Effective HP")
+        else:
+            return _t("HP")
+
+
+DroneEhpColumn.register()

gui/builtinViewColumns/droneRegen.py

@@ -0,0 +1,81 @@
+# =============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# 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/>.
+# =============================================================================
+
+# noinspection PyPackageRequirements
+import wx
+
+import gui.mainFrame
+from eos.saveddata.drone import Drone
+from eos.saveddata.fighter import Fighter
+from gui.viewColumn import ViewColumn
+from gui.bitmap_loader import BitmapLoader
+from gui.utils.numberFormatter import formatAmount
+
+
+_t = wx.GetTranslation
+
+
+class DroneRegenColumn(ViewColumn):
+    name = "Drone Regen"
+
+    def __init__(self, fittingView, params=None):
+        self.mainFrame = gui.mainFrame.MainFrame.getInstance()
+        if params is None:
+            params = {"showIcon": True, "displayName": False}
+
+        ViewColumn.__init__(self, fittingView)
+
+        if params["showIcon"]:
+            self.imageId = fittingView.imageList.GetImageIndex("shieldPassive_small", "gui")
+            self.bitmap = BitmapLoader.getBitmap("shieldPassive_small", "gui")
+            self.mask = wx.LIST_MASK_IMAGE
+        else:
+            self.imageId = -1
+
+        if params["displayName"] or self.imageId == -1:
+            self.columnText = _("Misc data")
+            self.mask |= wx.LIST_MASK_TEXT
+
+    def getText(self, stuff):
+        if not isinstance(stuff, (Drone, Fighter)):
+            return ""
+        regen = stuff.calculateShieldRecharge()
+        if (
+            self.mainFrame.statsPane.nameViewMap["resistancesViewFull"].showEffective
+            and stuff.owner and stuff.owner.damagePattern is not None
+        ):
+            regen = stuff.owner.damagePattern.effectivify(stuff, regen, 'shield')
+        return '{}/s'.format(formatAmount(regen, 3, 0, 9))
+
+    def getImageId(self, mod):
+        return -1
+
+    def getParameters(self):
+        return ("displayName", bool, False), ("showIcon", bool, True)
+
+    def getToolTip(self, stuff):
+        if not isinstance(stuff, (Drone, Fighter)):
+            return ""
+        if self.mainFrame.statsPane.nameViewMap["resistancesViewFull"].showEffective:
+            return _t("Effective Shield Regeneration")
+        else:
+            return _t("Shield Regeneration")
+
+
+DroneRegenColumn.register()

gui/builtinViewColumns/misc.py

@@ -182,6 +182,13 @@ class Miscellanea(ViewColumn):
             text = "{0} | {1}".format(formatAmount(strength, 3, 0, 3), formatAmount(coherence, 3, 0, 3))
             tooltip = "Virus strength and coherence"
             return text, tooltip
+        elif itemGroup == "Damage Control":
+            duration = stuff.getModifiedItemAttr("duration")
+            if not duration:
+                return "", None
+            text = "{0}s".format(formatAmount(duration / 1000, 3, 0, 0))
+            tooltip = "Assault ability duration"
+            return text, tooltip
         elif itemGroup in ("Warp Scrambler", "Warp Core Stabilizer", "Structure Warp Scrambler"):
             scramStr = stuff.getModifiedItemAttr("warpScrambleStrength")
             if not scramStr:

gui/builtinViews/fittingView.py

@@ -895,7 +895,7 @@ class FittingView(d.Display):
                 opts.m_labelText = name
 
             if imgId != -1:
-                opts.m_labelBitmap = wx.Bitmap(isize, isize)
+                opts.m_labelBitmap = wx.Bitmap(round(isize), round(isize))
 
             width = render.DrawHeaderButton(self, tdc, (0, 0, 16, 16), sortArrow=wx.HDR_SORT_ICON_NONE, params=opts)
 
@@ -911,7 +911,7 @@ class FittingView(d.Display):
             maxWidth += columnsWidths[i]
 
         mdc = wx.MemoryDC()
-        mbmp = wx.Bitmap(maxWidth, maxRowHeight * rows + padding * 4 + headerSize)
+        mbmp = wx.Bitmap(round(maxWidth), round(maxRowHeight * rows + padding * 4 + headerSize))
 
         mdc.SelectObject(mbmp)
 
@@ -956,7 +956,7 @@ class FittingView(d.Display):
             cx = padding
 
             if slotMap[st.slot]:
-                mdc.DrawRectangle(cx, cy, maxWidth - cx, maxRowHeight)
+                mdc.DrawRectangle(round(cx), round(cy), round(maxWidth - cx), round(maxRowHeight))
 
             for i, col in enumerate(self.activeColumns):
                 if i > maxColumns:

gui/characterEditor.py

@@ -516,7 +516,10 @@ class SkillTreeView(wx.Panel):
     def populateSkillTreeSkillSearch(self, event=None):
         sChar = Character.getInstance()
         char = self.charEditor.entityEditor.getActiveEntity()
-        search = self.searchInput.GetLineText(0)
+        try:
+            search = self.searchInput.GetLineText(0)
+        except AttributeError:
+            search = self.searchInput.GetValue()
 
         root = self.root
         tree = self.skillTreeListCtrl
@@ -530,7 +533,7 @@ class SkillTreeView(wx.Panel):
                 iconId = self.skillBookDirtyImageId
 
             childId = tree.AppendItem(root, name, iconId, data=('skill', id))
-            tree.SetItemText(childId, 1, _t("Level {}d").format(int(level)) if isinstance(level, float) else level)
+            tree.SetItemText(childId, 1, _t("Level {}").format(int(level)) if isinstance(level, float) else level)
 
     def populateSkillTree(self, event=None):
         sChar = Character.getInstance()
@@ -588,7 +591,6 @@ class SkillTreeView(wx.Panel):
                     iconId = self.skillBookDirtyImageId
 
                 childId = tree.AppendItem(root, name, iconId, data=('skill', id))
-
                 tree.SetItemText(childId, 1, _t("Level {}").format(int(level)) if isinstance(level, float) else level)
 
     def spawnMenu(self, event):

gui/characterSelection.py

@@ -22,6 +22,7 @@ import traceback
 
 # noinspection PyPackageRequirements
 import wx
+import roman
 from logbook import Logger
 
 import config
@@ -105,6 +106,9 @@ class CharacterSelection(wx.Panel):
         exportItem = menu.Append(wx.ID_ANY, _t("Copy Missing Skills"))
         self.Bind(wx.EVT_MENU, self.exportSkills, exportItem)
 
+        exportItem = menu.Append(wx.ID_ANY, _t("Copy Missing Skills (EVEMon)"))
+        self.Bind(wx.EVT_MENU, self.exportSkillsEveMon, exportItem)
+
         self.PopupMenu(menu, pos)
 
         event.Skip()
@@ -264,6 +268,15 @@ class CharacterSelection(wx.Panel):
 
         toClipboard(list)
 
+    def exportSkillsEveMon(self, evt):
+        skillsMap = self._buildSkillsTooltipCondensed(self.reqs, skillsMap={})
+
+        list = ""
+        for key in sorted(skillsMap):
+            list += "%s %s\n" % (key, roman.toRoman(skillsMap[key][0]))
+
+        toClipboard(list)
+
     def _buildSkillsTooltip(self, reqs, currItem="", tabulationLevel=0):
         tip = ""
         sCharacter = Character.getInstance()

gui/chrome_tabs.py

@@ -514,7 +514,7 @@ class _TabRenderer:
         Creates the tab background bitmap based upon calculated dimension values
         and modified bitmaps via InitBitmaps()
         """
-        bk_bmp = wx.Bitmap(self.tab_width, self.tab_height)
+        bk_bmp = wx.Bitmap(round(self.tab_width), round(self.tab_height))
 
         mdc = wx.MemoryDC()
         mdc.SelectObject(bk_bmp)
@@ -525,16 +525,16 @@ class _TabRenderer:
 
         # convert middle bitmap and scale to tab width
         cm = self.ctab_middle_bmp.ConvertToImage()
-        mimg = cm.Scale(self.content_width, self.ctab_middle.GetHeight(),
+        mimg = cm.Scale(round(self.content_width), round(self.ctab_middle.GetHeight()),
                         wx.IMAGE_QUALITY_NORMAL)
         mbmp = wx.Bitmap(mimg)
 
         # draw middle bitmap, offset by left
-        mdc.DrawBitmap(mbmp, self.left_width, 0)
+        mdc.DrawBitmap(mbmp, round(self.left_width), 0)
 
         # draw right bitmap offset by left + middle
         mdc.DrawBitmap(self.ctab_right_bmp,
-                       self.content_width + self.left_width, 0)
+                       round(self.content_width + self.left_width), 0)
 
         mdc.SelectObject(wx.NullBitmap)
 
@@ -555,7 +555,7 @@ class _TabRenderer:
             + self.left_width \
             - self.ctab_close_bmp.GetWidth() / 2
         y_offset = (self.tab_height - self.ctab_close_bmp.GetHeight()) / 2
-        self.close_region.Offset(x_offset, y_offset)
+        self.close_region.Offset(round(x_offset), round(y_offset))
 
     def InitColors(self):
         """Determines colors used for tab, based on system settings"""
@@ -573,7 +573,7 @@ class _TabRenderer:
 
         height = self.tab_height
 
-        canvas = wx.Bitmap(self.tab_width, self.tab_height, 24)
+        canvas = wx.Bitmap(round(self.tab_width), round(self.tab_height), 24)
 
         mdc = wx.MemoryDC()
 
@@ -590,8 +590,8 @@ class _TabRenderer:
                 # Draw tab icon
                 mdc.DrawBitmap(
                     bmp,
-                    self.left_width + self.padding - bmp.GetWidth() / 2,
-                    (height - bmp.GetHeight()) / 2)
+                    round(self.left_width + self.padding - bmp.GetWidth() / 2),
+                    round((height - bmp.GetHeight()) / 2))
 
         # draw close button
         if self.closeable:
@@ -604,8 +604,8 @@ class _TabRenderer:
 
             mdc.DrawBitmap(
                 cbmp,
-                self.content_width + self.left_width - cbmp.GetWidth() / 2,
-                (height - cbmp.GetHeight()) / 2)
+                round(self.content_width + self.left_width - cbmp.GetWidth() / 2),
+                round((height - cbmp.GetHeight()) / 2))
 
         mdc.SelectObject(wx.NullBitmap)
 
@@ -640,7 +640,7 @@ class _TabRenderer:
         # draw text (with no ellipses)
         text = draw.GetPartialText(dc, self.text, maxsize, "")
         tx, ty = dc.GetTextExtent(text)
-        dc.DrawText(text, text_start + self.padding, height / 2 - ty / 2)
+        dc.DrawText(text, round(text_start + self.padding), round(height / 2 - ty / 2))
 
     def __repr__(self):
         return "_TabRenderer(text={}, disabled={}) at {}".format(
@@ -1005,7 +1005,7 @@ class _TabsContainer(wx.Panel):
 
         region = tab.GetCloseButtonRegion()
         posx, posy = tab.GetPosition()
-        region.Offset(posx, posy)
+        region.Offset(round(posx), round(posy))
 
         if region.Contains(x, y):
             index = self.tabs.index(tab)
@@ -1036,7 +1036,7 @@ class _TabsContainer(wx.Panel):
 
         region = self.add_button.GetRegion()
         ax, ay = self.add_button.GetPosition()
-        region.Offset(ax, ay)
+        region.Offset(round(ax), round(ay))
 
         if region.Contains(x, y):
             ev = PageAdding()
@@ -1058,7 +1058,7 @@ class _TabsContainer(wx.Panel):
         for tab in self.tabs:
             region = tab.GetCloseButtonRegion()
             posx, posy = tab.GetPosition()
-            region.Offset(posx, posy)
+            region.Offset(round(posx), round(posy))
 
             if region.Contains(x, y):
                 if not tab.GetCloseButtonHoverStatus():
@@ -1093,7 +1093,7 @@ class _TabsContainer(wx.Panel):
         tabRegion = tab.GetTabRegion()
         tabPos = tab.GetPosition()
         tabPosX, tabPosY = tabPos
-        tabRegion.Offset(tabPosX, tabPosY)
+        tabRegion.Offset(round(tabPosX), round(tabPosY))
 
         if tabRegion.Contains(x, y):
             return True
@@ -1166,7 +1166,7 @@ class _TabsContainer(wx.Panel):
 
         region = self.add_button.GetRegion()
         ax, ay = self.add_button.GetPosition()
-        region.Offset(ax, ay)
+        region.Offset(round(ax), round(ay))
 
         if region.Contains(x, y):
             if not self.add_button.IsHighlighted():
@@ -1198,7 +1198,7 @@ class _TabsContainer(wx.Panel):
 
         if self.show_add_button:
             ax, ay = self.add_button.GetPosition()
-            mdc.DrawBitmap(self.add_button.Render(), ax, ay, True)
+            mdc.DrawBitmap(self.add_button.Render(), round(ax), round(ay), True)
 
         for i in range(len(self.tabs) - 1, -1, -1):
             tab = self.tabs[i]
@@ -1206,14 +1206,14 @@ class _TabsContainer(wx.Panel):
 
             if not tab.IsSelected():
                 # drop shadow first
-                mdc.DrawBitmap(self.fxBmps[tab], posx, posy, True)
+                mdc.DrawBitmap(self.fxBmps[tab], round(posx), (posy), True)
                 bmp = tab.Render()
                 img = bmp.ConvertToImage()
                 img = img.AdjustChannels(1, 1, 1, 0.85)
                 bmp = wx.Bitmap(img)
-                mdc.DrawBitmap(bmp, posx, posy, True)
+                mdc.DrawBitmap(bmp, round(posx), (posy), True)
 
-                mdc.SetDeviceOrigin(posx, posy)
+                mdc.SetDeviceOrigin(round(posx), round(posy))
                 tab.DrawText(mdc)
                 mdc.SetDeviceOrigin(0, 0)
             else:
@@ -1224,7 +1224,7 @@ class _TabsContainer(wx.Panel):
         if selected:
             posx, posy = selected.GetPosition()
             # drop shadow first
-            mdc.DrawBitmap(self.fxBmps[selected], posx, posy, True)
+            mdc.DrawBitmap(self.fxBmps[selected], round(posx), round(posy), True)
 
             bmp = selected.Render()
 
@@ -1233,9 +1233,9 @@ class _TabsContainer(wx.Panel):
                 img = img.AdjustChannels(1.2, 1.2, 1.2, 0.7)
                 bmp = wx.Bitmap(img)
 
-            mdc.DrawBitmap(bmp, posx, posy, True)
+            mdc.DrawBitmap(bmp, round(posx), round(posy), True)
 
-            mdc.SetDeviceOrigin(posx, posy)
+            mdc.SetDeviceOrigin(round(posx), round(posy))
             selected.DrawText(mdc)
             mdc.SetDeviceOrigin(0, 0)
 
@@ -1501,7 +1501,7 @@ class PFNotebookPagePreview(wx.Frame):
 
     def OnWindowPaint(self, event):
         rect = self.GetRect()
-        canvas = wx.Bitmap(rect.width, rect.height)
+        canvas = wx.Bitmap(round(rect.width), round(rect.height))
         mdc = wx.BufferedPaintDC(self)
         mdc.SelectObject(canvas)
         color = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW)
@@ -1514,7 +1514,7 @@ class PFNotebookPagePreview(wx.Frame):
         x, y = mdc.GetTextExtent(self.title)
 
         mdc.SetBrush(wx.Brush(wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT)))
-        mdc.DrawRectangle(0, 0, rect.width, 16)
+        mdc.DrawRectangle(0, 0, round(rect.width), 16)
 
         mdc.SetTextForeground(wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOW))
 
@@ -1523,4 +1523,4 @@ class PFNotebookPagePreview(wx.Frame):
         mdc.SetPen(wx.Pen("#000000", width=1))
         mdc.SetBrush(wx.TRANSPARENT_BRUSH)
 
-        mdc.DrawRectangle(0, 16, rect.width, rect.height - 16)
+        mdc.DrawRectangle(0, 16, round(rect.width), round(rect.height - 16))

gui/copySelectDialog.py

@@ -193,7 +193,7 @@ class CopySelectDialog(wx.Dialog):
 
     def exportEsi(self, options, callback):
         fit = getFit(self.mainFrame.getActiveFit())
-        Port.exportESI(fit, True, callback)
+        Port.exportESI(fit, False, False, False, callback)
 
     def exportXml(self, options, callback):
         fit = getFit(self.mainFrame.getActiveFit())

gui/esiFittings.py

@@ -283,7 +283,7 @@ class ExportToEve(AuxiliaryFrame):
     def __init__(self, parent):
         super().__init__(
             parent, id=wx.ID_ANY, title=_t("Export fit to EVE"), pos=wx.DefaultPosition,
-            size=wx.Size(400, 140) if "wxGTK" in wx.PlatformInfo else wx.Size(350, 115), resizeable=True)
+            size=wx.Size(400, 175) if "wxGTK" in wx.PlatformInfo else wx.Size(350, 145), resizeable=True)
 
         self.mainFrame = parent
 
@@ -305,6 +305,16 @@ class ExportToEve(AuxiliaryFrame):
         self.exportChargesCb.Bind(wx.EVT_CHECKBOX, self.OnChargeExportChange)
         mainSizer.Add(self.exportChargesCb, 0, 0, 5)
 
+        self.exportImplantsCb = wx.CheckBox(self, wx.ID_ANY, _t('Export Implants'), wx.DefaultPosition, wx.DefaultSize, 0)
+        self.exportImplantsCb.SetValue(EsiSettings.getInstance().get('exportImplants'))
+        self.exportImplantsCb.Bind(wx.EVT_CHECKBOX, self.OnImplantsExportChange)
+        mainSizer.Add(self.exportImplantsCb, 0, 0, 5)
+
+        self.exportBoostersCb = wx.CheckBox(self, wx.ID_ANY, _t('Export Boosters'), wx.DefaultPosition, wx.DefaultSize, 0)
+        self.exportBoostersCb.SetValue(EsiSettings.getInstance().get('exportBoosters'))
+        self.exportBoostersCb.Bind(wx.EVT_CHECKBOX, self.OnBoostersExportChange)
+        mainSizer.Add(self.exportBoostersCb, 0, 0, 5)
+
         self.exportBtn.Bind(wx.EVT_BUTTON, self.exportFitting)
 
         self.statusbar = wx.StatusBar(self)
@@ -324,6 +334,14 @@ class ExportToEve(AuxiliaryFrame):
         EsiSettings.getInstance().set('exportCharges', self.exportChargesCb.GetValue())
         event.Skip()
 
+    def OnImplantsExportChange(self, event):
+        EsiSettings.getInstance().set('exportImplants', self.exportImplantsCb.GetValue())
+        event.Skip()
+
+    def OnBoostersExportChange(self, event):
+        EsiSettings.getInstance().set('exportBoosters', self.exportBoostersCb.GetValue())
+        event.Skip()
+
     def updateCharList(self):
         sEsi = Esi.getInstance()
         chars = sEsi.getSsoCharacters()
@@ -360,8 +378,10 @@ class ExportToEve(AuxiliaryFrame):
 
         sFit = Fit.getInstance()
         exportCharges = self.exportChargesCb.GetValue()
+        exportImplants = self.exportImplantsCb.GetValue()
+        exportBoosters = self.exportBoostersCb.GetValue()
         try:
-            data = sPort.exportESI(sFit.getFit(fitID), exportCharges)
+            data = sPort.exportESI(sFit.getFit(fitID), exportCharges, exportImplants, exportBoosters)
         except ESIExportException as e:
             msg = str(e)
             if not msg:

gui/fitCommands/helpers.py

@@ -58,7 +58,9 @@ class InternalCommandHistory:
 
 class ModuleInfo:
 
-    def __init__(self, itemID, baseItemID=None, mutaplasmidID=None, mutations=None, chargeID=None, state=None, spoolType=None, spoolAmount=None):
+    def __init__(
+            self, itemID, baseItemID=None, mutaplasmidID=None, mutations=None, chargeID=None,
+            state=None, spoolType=None, spoolAmount=None, rahPattern=None):
         self.itemID = itemID
         self.baseItemID = baseItemID
         self.mutaplasmidID = mutaplasmidID
@@ -67,6 +69,7 @@ class ModuleInfo:
         self.state = state
         self.spoolType = spoolType
         self.spoolAmount = spoolAmount
+        self.rahPattern = rahPattern
 
     @classmethod
     def fromModule(cls, mod, unmutate=False):
@@ -81,7 +84,8 @@ class ModuleInfo:
                 chargeID=mod.chargeID,
                 state=mod.state,
                 spoolType=mod.spoolType,
-                spoolAmount=mod.spoolAmount)
+                spoolAmount=mod.spoolAmount,
+                rahPattern=mod.rahPatternOverride)
         else:
             info = cls(
                 itemID=mod.itemID,
@@ -91,7 +95,8 @@ class ModuleInfo:
                 chargeID=mod.chargeID,
                 state=mod.state,
                 spoolType=mod.spoolType,
-                spoolAmount=mod.spoolAmount)
+                spoolAmount=mod.spoolAmount,
+                rahPattern=mod.rahPatternOverride)
         return info
 
     def toModule(self, fallbackState=None):
@@ -119,6 +124,8 @@ class ModuleInfo:
             mod.spoolType = self.spoolType
             mod.spoolAmount = self.spoolAmount
 
+        mod.rahPatternOverride = self.rahPattern
+
         if self.state is not None:
             if mod.isValidState(self.state):
                 mod.state = self.state
@@ -148,12 +155,13 @@ class ModuleInfo:
             self.chargeID == other.chargeID,
             self.state == other.state,
             self.spoolType == other.spoolType,
-            self.spoolAmount == other.spoolAmount))
+            self.spoolAmount == other.spoolAmount,
+            self.rahPattern == other.rahPattern))
 
     def __repr__(self):
         return makeReprStr(self, [
             'itemID', 'baseItemID', 'mutaplasmidID', 'mutations',
-            'chargeID', 'state', 'spoolType', 'spoolAmount'])
+            'chargeID', 'state', 'spoolType', 'spoolAmount', 'rahPattern'])
 
 
 class DroneInfo:

gui/patternEditor.py

@@ -42,7 +42,7 @@ class DmgPatternNameValidator(BaseValidator):
         return DmgPatternNameValidator()
 
     def Validate(self, win):
-        entityEditor = win.parent
+        entityEditor = win.Parent.parent
         textCtrl = self.GetWindow()
         text = textCtrl.GetValue().strip()
 

gui/pyfa_gauge.py

@@ -257,7 +257,7 @@ class PyGauge(wx.Window):
             else:
                 w = rect.width * (float(value) / 100)
             r = copy.copy(rect)
-            r.width = w
+            r.width = round(w)
             dc.DrawRectangle(r)
         else:
             # if bar color is not set, then we use pre-defined transitions
@@ -269,7 +269,7 @@ class PyGauge(wx.Window):
             else:
                 w = rect.width * (float(value) / 100)
             r = copy.copy(rect)
-            r.width = w
+            r.width = round(w)
 
             # determine transition range number and calculate xv (which is the
             # progress between the two transition ranges)
@@ -317,7 +317,7 @@ class PyGauge(wx.Window):
                 gradient_color
             )
             if gradient_bitmap is not None:
-                dc.DrawBitmap(gradient_bitmap, r.left, r.top)
+                dc.DrawBitmap(gradient_bitmap, round(r.left), round(r.top))
 
         # font stuff begins here
         dc.SetFont(self.font)

gui/setEditor.py

@@ -39,7 +39,7 @@ class ImplantTextValidor(BaseValidator):
         return ImplantTextValidor()
 
     def Validate(self, win):
-        entityEditor = win.parent
+        entityEditor = win.Parent.parent
         textCtrl = self.GetWindow()
         text = textCtrl.GetValue().strip()
 

gui/targetProfileEditor.py

@@ -62,7 +62,7 @@ class TargetProfileNameValidator(BaseValidator):
         return TargetProfileNameValidator()
 
     def Validate(self, win):
-        entityEditor = win.parent
+        entityEditor = win.Parent.parent
         textCtrl = self.GetWindow()
         text = textCtrl.GetValue().strip()
 

gui/utils/anim.py

@@ -80,7 +80,7 @@ class LoadAnimation(wx.Window):
                 bh = rect.height
                 y = 0
 
-            dc.DrawRectangle(x, y, barWidth, bh)
+            dc.DrawRectangle(round(x), round(y), round(barWidth), round(bh))
             x += barWidth
 
         textColor = wx.SystemSettings.GetColour(wx.SYS_COLOUR_WINDOWTEXT)

gui/utils/color.py

@@ -12,7 +12,7 @@ def Brighten(color, factor):
     b += (255 - b) * factor
     g += (255 - g) * factor
 
-    return wx.Colour(r, g, b, a)
+    return wx.Colour(round(r), round(g), round(b), round(a))
 
 
 def Darken(color, factor):
@@ -30,7 +30,7 @@ def Darken(color, factor):
     b = min(max(b, 0), 255)
     g = min(max(g, 0), 255)
 
-    return wx.Colour(r, g, b, a)
+    return wx.Colour(round(r), round(g), round(b), round(a))
 
 
 def _getBrightness(color):
@@ -70,4 +70,4 @@ def CalculateTransition(s_color, e_color, delta):
     tG = sG + (eG - sG) * delta
     tB = sB + (eB - sB) * delta
 
-    return wx.Colour(tR, tG, tB, (sA + eA) / 2)
+    return wx.Colour(round(tR), round(tG), round(tB), round((sA + eA) / 2))

gui/utils/draw.py

@@ -21,7 +21,7 @@ def RenderGradientBar(windowColor, width, height, sFactor, eFactor, mFactor=None
 
 
 def DrawFilledBitmap(width, height, color):
-    canvas = wx.Bitmap(width, height)
+    canvas = wx.Bitmap(round(width), round(height))
 
     mdc = wx.MemoryDC()
     mdc.SelectObject(canvas)
@@ -37,20 +37,20 @@ def DrawFilledBitmap(width, height, color):
 def DrawGradientBar(width, height, gStart, gEnd, gMid=None, fillRatio=4):
     if width == 0 or height == 0:
         return None
-    canvas = wx.Bitmap(width, height)
+    canvas = wx.Bitmap(round(width), round(height))
 
     mdc = wx.MemoryDC()
     mdc.SelectObject(canvas)
 
     r = wx.Rect(0, 0, width, height)
-    r.SetHeight(height / fillRatio)
+    r.SetHeight(round(height / fillRatio))
 
     if gMid is None:
         gMid = gStart
 
     mdc.GradientFillLinear(r, gStart, gMid, wx.SOUTH)
     r.SetTop(r.GetHeight())
-    r.SetHeight(height * (fillRatio - 1) / fillRatio + (1 if height % fillRatio != 0 else 0))
+    r.SetHeight(round(height * (fillRatio - 1) / fillRatio + (1 if height % fillRatio != 0 else 0)))
 
     mdc.GradientFillLinear(r, gMid, gEnd, wx.SOUTH)
 

gui/utils/exportHtml.py

@@ -244,7 +244,7 @@ class exportHtmlThread(threading.Thread):
                 # Market group header
                 HTML += (
                     '    <li data-role="collapsible" data-iconpos="right" data-shadow="false" data-corners="false">\n'
-                    '      <h2>' + group.groupName + ' <span class="ui-li-count">' + str(groupFits) + '</span></h2>\n'
+                    '      <h2>' + group.name + ' <span class="ui-li-count">' + str(groupFits) + '</span></h2>\n'
                     '      <ul data-role="listview" data-shadow="false" data-inset="true" data-corners="false">\n' +
                     HTMLgroup +
                     '      </ul>\n'

gui/viewColumn.py

@@ -78,6 +78,8 @@ from gui.builtinViewColumns import (  # noqa: E402, F401
     baseName,
     capacitorUse,
     dampScanRes,
+    droneEhp,
+    droneRegen,
     graphColor,
     graphLightness,
     graphLineStyle,