Bump stable

fixed syntax typo in modulebonusomnidirectionaltrackingenhancer.py

README.md

@@ -1,5 +1,7 @@
 # pyfa
 
+[![Join the chat at https://gitter.im/pyfa-org/Pyfa](https://badges.gitter.im/pyfa-org/Pyfa.svg)](https://gitter.im/pyfa-org/Pyfa?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 ![pyfa](https://cloud.githubusercontent.com/assets/3904767/10271512/af385ef2-6ade-11e5-8f67-52b8b1e4c797.PNG)
 
 ## What is it?
@@ -7,24 +9,44 @@
 pyfa, short for **py**thon **f**itting **a**ssistant, allows you to create, experiment with, and save ship fittings without being in game. Open source and written in Python, it is available on any platform where Python 2.x and wxWidgets are available, including Windows, Mac OS X, and Linux.
 
 ## Latest Version and Changelogs
-The latest version along with release notes can always be found on the projects [Releases](https://github.com/DarkFenX/Pyfa/releases) page. pyfa will notify you if you are running an outdated version.
+The latest version along with release notes can always be found on the project's [Releases](https://github.com/DarkFenX/Pyfa/releases) page. pyfa will notify you if you are running an outdated version.
 
-## Installing
-Windows and OS X users are supplied self-contained builds of pyfa that can be run without additional software. An `.exe` installer is also available for the Windows builds. There is no self-contained package for Linux users, which are expected to run pyfa through their distributions Python interpreter. However, there are a number of third-party packages available that handle the dependencies and updates for pyfa (for example, [pyfa for Arch Linux](https://aur.archlinux.org/packages/pyfa/)). Please check your distributions repositories.
+## 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.
 
-## Requirements
+#### OS X
+There are two different distributives for OS X: `-mac` and `-mac-deprecated`. 
+
+* `-mac`: based on wxPython 3.0.2.0 and has updated libraries. This is the recommended build.
+* `-mac-deprecated`: utilizes older binaries running on wxPython 2.8; because of this, some features are not available (currently CREST support and Attribute Overrides). Additionally, as development happens primarily on wxPython 3.0, a few GUI bugs may pop up as `-mac-deprecated` is not actively tested. However, due to some general issues with wxPython 3.0, especially on some newer OS X versions, `-mac-deprecated` is still offered for those that need it.
+
+There is also a [Homebrew](http://brew.sh) option for installing pyfa on OS X. Please note this is maintained by a third-party and is not tested by pyfa developers. Simply fire up in terminal:
+```
+$ brew install Caskroom/cask/pyfa
+```
+
+### Linux Distro-specific Packages
+The following is a list of pyfa packages available for certain distributions. Please note that these packages are maintained by third-parties and are not evaluated by the pyfa developers.
+
+* Debian/Ubuntu/derivitives: https://github.com/AdamMajer/Pyfa/releases
+* Arch: https://aur.archlinux.org/packages/pyfa/
+* openSUSE: https://build.opensuse.org/package/show/home:rmk2/pyfa
+* FreeBSD: http://www.freshports.org/games/pyfa/ (see [#484](https://github.com/pyfa-org/Pyfa/issues/484) for instructions)
+
+### Dependencies
 If you wish to help with development or simply need to run pyfa through a Python interpreter, the following software is required:
 
-* Python >= 2.6
+* Python 2.7
 * `wxPython` 2.8/3.0
 * `sqlalchemy` >= 0.6
 * `dateutil`
-* `matplotlib` (for some Linux distributions, you may need to install separate wxPython bindings, such as `python-matplotlib-wx`)
+* `matplotlib` (for some Linux distributions you may need to install separate wxPython bindings such as `python-matplotlib-wx`)
+* `requests`
 
 ## Bug Reporting
-The preferred method of reporting bugs is through the projects GitHub Issues interface. Alternatively, posting a report in the pyfa thread on the official EVE Online forums is acceptable. Guidelines for bug reporting can be found on [this wiki page](https://github.com/DarkFenX/Pyfa/wiki/Bug-Reporting). 
+The preferred method of reporting bugs is through the project's [GitHub Issues interface](https://github.com/pyfa-org/Pyfa/issues). Alternatively, posting a report in the [pyfa thread](http://forums.eveonline.com/default.aspx?g=posts&t=247609) on the official EVE Online forums is acceptable. Guidelines for bug reporting can be found on [this wiki page](https://github.com/DarkFenX/Pyfa/wiki/Bug-Reporting). 
 
-## Liscense
+## License
 pyfa is licensed under the GNU GPL v3.0, see LICENSE
 
 ## Resources
@@ -35,13 +57,11 @@ pyfa is licensed under the GNU GPL v3.0, see LICENSE
 * [EVE Online website](http://www.eveonline.com/)
 
 ## Contacts:
-* Kadesh Priestess
-    * GitHub: @DarkFenX
-    * [TweetFleet Slack](https://www.fuzzwork.co.uk/tweetfleet-slack-invites/): @kadesh
 * Sable Blitzmann
     * GitHub: @blitzmann
     * [TweetFleet Slack](https://www.fuzzwork.co.uk/tweetfleet-slack-invites/): @blitzmann
+    * [Gitter chat](https://gitter.im/pyfa-org/Pyfa): @ blitzmann
     * Email: sable.blitzmann@gmail.com
 
 ## CCP Copyright Notice
-EVE Online, the EVE logo, EVE and all associated logos and designs are the intellectual property of CCP hf. All artwork, screenshots, characters, vehicles, storylines, world facts or other recognizable features of the intellectual property relating to these trademarks are likewise the intellectual property of CCP hf. EVE Online and the EVE logo are the registered trademarks of CCP hf. All rights are reserved worldwide. All other trademarks are the property of their respective owners. CCP hf. has granted permission to Osmium to use EVE Online and all associated logos and designs for promotional and information purposes on its website but does not endorse, and is not in any way affiliated with, Osmium. CCP is in no way responsible for the content on or functioning of this website, nor can it be liable for any damage arising from the use of this website.
+EVE Online, the EVE logo, EVE and all associated logos and designs are the intellectual property of CCP hf. All artwork, screenshots, characters, vehicles, storylines, world facts or other recognizable features of the intellectual property relating to these trademarks are likewise the intellectual property of CCP hf. EVE Online and the EVE logo are the registered trademarks of CCP hf. All rights are reserved worldwide. All other trademarks are the property of their respective owners. CCP hf. has granted permission to pyfa to use EVE Online and all associated logos and designs for promotional and information purposes on its website but does not endorse, and is not in any way affiliated with, pyfa. CCP is in no way responsible for the content on or functioning of this program, nor can it be liable for any damage arising from the use of this program.

config.py

@@ -18,14 +18,12 @@ debug = False
 saveInRoot = False
 
 # Version data
-version = "1.15.1"
-tag = "git"
-expansionName = "Vanguard"
-expansionVersion = "1.0"
+version = "1.23.2"
+tag = "Stable"
+expansionName = "YC 118.7"
+expansionVersion = "1.4"
 evemonMinVersion = "4081"
 
-clientID = 'af87365240d644f7950af563b8418bad'
-
 pyfaPath = None
 savePath = None
 saveDB = None
@@ -62,7 +60,7 @@ def __createDirs(path):
     if not os.path.exists(path):
         os.makedirs(path)
 
-def defPaths():
+def defPaths(customSavePath):
     global debug
     global pyfaPath
     global savePath
@@ -89,13 +87,17 @@ def defPaths():
     else:
         savePath = getattr(configforced, "savePath", None)
         if savePath is None:
-            savePath = unicode(os.path.expanduser(os.path.join("~", ".pyfa")),
+            if customSavePath is None: # customSavePath is not overriden
+                savePath = unicode(os.path.expanduser(os.path.join("~", ".pyfa")),
                                sys.getfilesystemencoding())
+            else:
+                savePath = customSavePath
 
     __createDirs(savePath)
 
     if isFrozen():
         os.environ["REQUESTS_CA_BUNDLE"] = os.path.join(pyfaPath, "cacert.pem")
+        os.environ["SSL_CERT_FILE"] = os.path.join(pyfaPath, "cacert.pem")
 
     format = '%(asctime)s %(name)-24s %(levelname)-8s %(message)s'
     logging.basicConfig(format=format, level=logLevel)

eos/capSim.py

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

eos/db/__init__.py

@@ -68,14 +68,8 @@ from eos.db.gamedata import *
 from eos.db.saveddata import *
 
 #Import queries
-from eos.db.gamedata.queries import getItem, searchItems, getVariations, getItemsByCategory, directAttributeRequest, \
-                                    getMarketGroup, getGroup, getCategory, getAttributeInfo, getMetaData, getMetaGroup
-from eos.db.saveddata.queries import getUser, getCharacter, getFit, getFitsWithShip, countFitsWithShip, searchFits, \
-                                     getCharacterList, getPrice, getDamagePatternList, getDamagePattern, \
-                                     getFitList, getFleetList, getFleet, save, remove, commit, add, \
-                                     getCharactersForUser, getMiscData, getSquadsIDsWithFitID, getWing, \
-                                     getSquad, getBoosterFits, getProjectedFits, getTargetResistsList, getTargetResists,\
-                                     clearPrices, countAllFits, getCrestCharacters, getCrestCharacter
+from eos.db.gamedata.queries import *
+from eos.db.saveddata.queries import *
 
 #If using in memory saveddata, you'll want to reflect it so the data structure is good.
 if config.saveddata_connectionstring == "sqlite:///:memory:":

eos/db/gamedata/queries.py

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

eos/db/migration.py

@@ -4,6 +4,9 @@ import time
 import re
 import os
 import migrations
+import logging
+
+logger = logging.getLogger(__name__)
 
 def getVersion(db):
     cursor = db.execute('PRAGMA user_version')
@@ -30,10 +33,9 @@ def update(saveddata_engine):
         shutil.copyfile(config.saveDB, toFile)
 
         for version in xrange(dbVersion, appVersion):
-
             func = migrations.updates[version+1]
             if func:
-                print "applying update",version+1
+                logger.info("Applying database update: %d", version+1)
                 func(saveddata_engine)
 
         # when all is said and done, set version to current

eos/db/migrations/upgrade11.py

@@ -0,0 +1,116 @@
+"""
+Migration 11
+
+- Converts modules based on December Release 2015 Tiericide
+    Some modules have been unpublished (and unpublished module attributes are removed
+    from database), which causes pyfa to crash. We therefore replace these
+    modules with their new replacements
+"""
+
+
+CONVERSIONS = {
+    16467: (  # Medium Gremlin Compact Energy Neutralizer
+        16471,  # Medium Unstable Power Fluctuator I
+    ),
+    22947: (  # 'Beatnik' Small Remote Armor Repairer
+        23414,  # 'Brotherhood' Small Remote Armor Repairer
+    ),
+    8295: (  # Type-D Restrained Shield Flux Coil
+        8293,  # Beta Reactor Control: Shield Flux I
+    ),
+    16499: (  # Heavy Knave Scoped Energy Nosferatu
+        16501,  # E500 Prototype Energy Vampire
+    ),
+    16477: (  # Heavy Infectious Scoped Energy Neutralizer
+        16473,  # Heavy Rudimentary Energy Destabilizer I
+    ),
+    16475: (  # Heavy Gremlin Compact Energy Neutralizer
+        16479,  # Heavy Unstable Power Fluctuator I
+    ),
+    16447: (  # Medium Solace Scoped Remote Armor Repairer
+        16445,  # Medium 'Arup' Remote Armor Repairer
+    ),
+    508: (  # 'Basic' Shield Flux Coil
+        8325,  # Alpha Reactor Shield Flux
+        8329,  # Marked Generator Refitting: Shield Flux
+        8323,  # Partial Power Plant Manager: Shield Flux
+        8327,  # Type-E Power Core Modification: Shield Flux
+    ),
+    1419: (  # 'Basic' Shield Power Relay
+        8341,  # Alpha Reactor Shield Power Relay
+        8345,  # Marked Generator Refitting: Shield Power Relay
+        8339,  # Partial Power Plant Manager: Shield Power Relay
+        8343,  # Type-E Power Core Modification: Shield Power Relay
+    ),
+    16439: (  # Small Solace Scoped Remote Armor Repairer
+        16437,  # Small 'Arup' Remote Armor Repairer
+    ),
+    16505: (  # Medium Ghoul Compact Energy Nosferatu
+        16511,  # Medium Diminishing Power System Drain I
+    ),
+    8297: (  # Mark I Compact Shield Flux Coil
+        8291,  # Local Power Plant Manager: Reaction Shield Flux I
+    ),
+    16455: (  # Large Solace Scoped Remote Armor Repairer
+        16453,  # Large 'Arup' Remote Armor Repairer
+    ),
+    6485: (  # M51 Benefactor Compact Shield Recharger
+        6491,  # Passive Barrier Compensator I
+        6489,  # 'Benefactor' Ward Reconstructor
+        6487,  # Supplemental Screen Generator I
+    ),
+    5137: (  # Small Knave Scoped Energy Nosferatu
+        5135,  # E5 Prototype Energy Vampire
+    ),
+    8579: (  # Medium Murky Compact Remote Shield Booster
+        8581,  # Medium 'Atonement' Remote Shield Booster
+    ),
+    8531: (  # Small Murky Compact Remote Shield Booster
+        8533,  # Small 'Atonement' Remote Shield Booster
+    ),
+    16497: (  # Heavy Ghoul Compact Energy Nosferatu
+        16503,  # Heavy Diminishing Power System Drain I
+    ),
+    4477: (  # Small Gremlin Compact Energy Neutralizer
+        4475,  # Small Unstable Power Fluctuator I
+    ),
+    8337: (  # Mark I Compact Shield Power Relay
+        8331,  # Local Power Plant Manager: Reaction Shield Power Relay I
+    ),
+    23416: (  # 'Peace' Large Remote Armor Repairer
+        22951,  # 'Pacifier' Large Remote Armor Repairer
+    ),
+    5141: (  # Small Ghoul Compact Energy Nosferatu
+        5139,  # Small Diminishing Power System Drain I
+    ),
+    4471: (  # Small Infectious Scoped Energy Neutralizer
+        4473,  # Small Rudimentary Energy Destabilizer I
+    ),
+    16469: (  # Medium Infectious Scoped Energy Neutralizer
+        16465,  # Medium Rudimentary Energy Destabilizer I
+    ),
+    8335: (  # Type-D Restrained Shield Power Relay
+        8333,  # Beta Reactor Control: Shield Power Relay I
+    ),
+    405: (  # 'Micro' Remote Shield Booster
+        8631,  # Micro Asymmetric Remote Shield Booster
+        8627,  # Micro Murky Remote Shield Booster
+        8629,  # Micro 'Atonement' Remote Shield Booster
+        8633,  # Micro S95a Remote Shield Booster
+    ),
+    8635: (  # Large Murky Compact Remote Shield Booster
+        8637,  # Large 'Atonement' Remote Shield Booster
+    ),
+    16507: (  # Medium Knave Scoped Energy Nosferatu
+        16509,  # E50 Prototype Energy Vampire
+    ),
+}
+
+def upgrade(saveddata_engine):
+
+    # Convert modules
+    for replacement_item, list in CONVERSIONS.iteritems():
+        for retired_item in list:
+            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+

eos/db/migrations/upgrade12.py

@@ -0,0 +1,340 @@
+"""
+Migration 12
+
+- Converts modules based on March 2016 Module Tiericide
+    Some modules have been unpublished (and unpublished module attributes are removed
+    from database), which causes pyfa to crash. We therefore replace these
+    modules with their new replacements
+"""
+
+
+CONVERSIONS = {
+    16457: (  # Crosslink Compact Ballistic Control System
+        16459,  # Muon Coil Bolt Array I
+        16461,  # Multiphasic Bolt Array I
+        16463,  # 'Pandemonium' Ballistic Enhancement
+    ),
+    5281: (  # Coadjunct Scoped Remote Sensor Booster
+        7218,  # Piercing ECCM Emitter I
+    ),
+    5365: (  # Cetus Scoped Burst Jammer
+        5359,  # 1Z-3 Subversive ECM Eruption
+    ),
+    1973: (  # Sensor Booster I
+        1947,  # ECCM - Radar I
+        2002,  # ECCM - Ladar I
+        2003,  # ECCM - Magnetometric I
+        2004,  # ECCM - Gravimetric I
+        2005,  # ECCM - Omni I
+    ),
+    1951: (  # 'Basic' Tracking Enhancer
+        6322,  # Beta-Nought Tracking Mode
+        6323,  # Azimuth Descalloping Tracking Enhancer
+        6324,  # F-AQ Delay-Line Scan Tracking Subroutines
+        6321,  # Beam Parallax Tracking Program
+    ),
+    521: (  # 'Basic' Damage Control
+        5829,  # GLFF Containment Field
+        5831,  # Interior Force Field Array
+        5835,  # F84 Local Damage System
+        5833,  # Systematic Damage Control
+    ),
+    22925: (  # 'Bootleg' Remote Sensor Booster
+        22939,  # 'Boss' Remote Sensor Booster
+        22941,  # 'Entrepreneur' Remote Sensor Booster
+    ),
+    5443: (  # Faint Epsilon Scoped Warp Scrambler
+        5441,  # Fleeting Progressive Warp Scrambler I
+    ),
+    1963: (  # Remote Sensor Booster I
+        1959,  # ECCM Projector I
+    ),
+    6325: (  # Fourier Compact Tracking Enhancer
+        6326,  # Sigma-Nought Tracking Mode I
+        6327,  # Auto-Gain Control Tracking Enhancer I
+        6328,  # F-aQ Phase Code Tracking Subroutines
+    ),
+    21486: (  # 'Kindred' Gyrostabilizer
+        21488,  # Monophonic Stabilization Actuator I
+    ),
+    19927: (  # Hypnos Scoped Magnetometric ECM
+        9518,  # Initiated Ion Field ECM I
+    ),
+    10188: (  # 'Basic' Magnetic Field Stabilizer
+        11111,  # Insulated Stabilizer Array
+        11109,  # Linear Flux Stabilizer
+        11115,  # Gauss Field Balancer
+        11113,  # Magnetic Vortex Stabilizer
+    ),
+    22919: (  # 'Monopoly' Magnetic Field Stabilizer
+        22917,  # 'Capitalist' Magnetic Field Stabilizer I
+    ),
+    5839: (  # IFFA Compact Damage Control
+        5841,  # Emergency Damage Control I
+        5843,  # F85 Peripheral Damage System I
+        5837,  # Pseudoelectron Containment Field I
+    ),
+    522: (  # 'Micro' Cap Battery
+        4747,  # Micro Ld-Acid Capacitor Battery I
+        4751,  # Micro Ohm Capacitor Reserve I
+        4745,  # Micro F-4a Ld-Sulfate Capacitor Charge Unit
+        4749,  # Micro Peroxide Capacitor Power Cell
+        3480,  # Micro Capacitor Battery II
+    ),
+    518: (  # 'Basic' Gyrostabilizer
+        5915,  # Lateral Gyrostabilizer
+        5919,  # F-M2 Weapon Inertial Suspensor
+        5913,  # Hydraulic Stabilization Actuator
+        5917,  # Stabilized Weapon Mounts
+    ),
+    19931: (  # Compulsive Scoped Multispectral ECM
+        19933,  # 'Hypnos' Multispectral ECM I
+    ),
+    5403: (  # Faint Scoped Warp Disruptor
+        5401,  # Fleeting Warp Disruptor I
+    ),
+    23902: (  # 'Trebuchet' Heat Sink I
+        23900,  # 'Mangonel' Heat Sink I
+    ),
+    1893: (  # 'Basic' Heat Sink
+        5845,  # Heat Exhaust System
+        5856,  # C3S Convection Thermal Radiator
+        5855,  # 'Boreas' Coolant System
+        5854,  # Stamped Heat Sink
+    ),
+    6160: (  # F-90 Compact Sensor Booster
+        20214,  # Extra Radar ECCM Scanning Array I
+        20220,  # Extra Ladar ECCM Scanning Array I
+        20226,  # Extra Gravimetric ECCM Scanning Array I
+        20232,  # Extra Magnetometric ECCM Scanning Array I
+        7948,  # Gravimetric Positional ECCM Sensor System I
+        7964,  # Radar Positional ECCM Sensor System I
+        7965,  # Omni Positional ECCM Sensor System I
+        7966,  # Ladar Positional ECCM Sensor System I
+        7970,  # Magnetometric Positional ECCM Sensor System I
+        20218,  # Conjunctive Radar ECCM Scanning Array I
+        20224,  # Conjunctive Ladar ECCM Scanning Array I
+        20230,  # Conjunctive Gravimetric ECCM Scanning Array I
+        20236,  # Conjunctive Magnetometric ECCM Scanning Array I
+        6157,  # Supplemental Scanning CPU I
+    ),
+    23418: (  # 'Radical' Damage Control
+        22893,  # 'Gonzo' Damage Control I
+    ),
+    19952: (  # Umbra Scoped Radar ECM
+        9520,  # 'Penumbra' White Noise ECM
+    ),
+    1952: (  # Sensor Booster II
+        2258,  # ECCM - Omni II
+        2259,  # ECCM - Gravimetric II
+        2260,  # ECCM - Ladar II
+        2261,  # ECCM - Magnetometric II
+        2262,  # ECCM - Radar II
+    ),
+    5282: (  # Linked Enduring Sensor Booster
+        7219,  # Scattering ECCM Projector I
+    ),
+    1986: (  # Signal Amplifier I
+        2579,  # Gravimetric Backup Array I
+        2583,  # Ladar Backup Array I
+        2587,  # Magnetometric Backup Array I
+        2591,  # Multi Sensor Backup Array I
+        4013,  # RADAR Backup Array I
+    ),
+    4871: (  # Large Compact Pb-Acid Cap Battery
+        4875,  # Large Ohm Capacitor Reserve I
+        4869,  # Large F-4a Ld-Sulfate Capacitor Charge Unit
+        4873,  # Large Peroxide Capacitor Power Cell
+    ),
+    1964: (  # Remote Sensor Booster II
+        1960,  # ECCM Projector II
+    ),
+    5933: (  # Counterbalanced Compact Gyrostabilizer
+        5931,  # Cross-Lateral Gyrostabilizer I
+        5935,  # F-M3 Munition Inertial Suspensor
+        5929,  # Pneumatic Stabilization Actuator I
+    ),
+    4025: (  # X5 Enduring Stasis Webifier
+        4029,  # 'Langour' Drive Disruptor I
+    ),
+    4027: (  # Fleeting Compact Stasis Webifier
+        4031,  # Patterned Stasis Web I
+    ),
+    22937: (  # 'Enterprise' Remote Tracking Computer
+        22935,  # 'Tycoon' Remote Tracking Computer
+    ),
+    22929: (  # 'Marketeer' Tracking Computer
+        22927,  # 'Economist' Tracking Computer I
+    ),
+    1987: (  # Signal Amplifier II
+        2580,  # Gravimetric Backup Array II
+        2584,  # Ladar Backup Array II
+        2588,  # Magnetometric Backup Array II
+        2592,  # Multi Sensor Backup Array II
+        4014,  # RADAR Backup Array II
+    ),
+    19939: (  # Enfeebling Scoped Ladar ECM
+        9522,  # Faint Phase Inversion ECM I
+    ),
+    5340: (  # P-S Compact Remote Tracking Computer
+        5341,  # 'Prayer' Remote Tracking Computer
+    ),
+    19814: (  # Phased Scoped Target Painter
+        19808,  # Partial Weapon Navigation
+    ),
+    1949: (  # 'Basic' Signal Amplifier
+        1946,  # Basic RADAR Backup Array
+        1982,  # Basic Ladar Backup Array
+        1983,  # Basic Gravimetric Backup Array
+        1984,  # Basic Magnetometric Backup Array
+        1985,  # Basic Multi Sensor Backup Array
+        6193,  # Emergency Magnetometric Scanners
+        6194,  # Emergency Multi-Frequency Scanners
+        6202,  # Emergency RADAR Scanners
+        6216,  # Emergency Ladar Scanners
+        6217,  # Emergency Gravimetric Scanners
+        6225,  # Sealed RADAR Backup Cluster
+        6238,  # Sealed Magnetometric Backup Cluster
+        6239,  # Sealed Multi-Frequency Backup Cluster
+        6241,  # Sealed Ladar Backup Cluster
+        6242,  # Sealed Gravimetric Backup Cluster
+        6257,  # Surplus RADAR Reserve Array
+        6258,  # F-42 Reiterative RADAR Backup Sensors
+        6283,  # Surplus Magnetometric Reserve Array
+        6284,  # F-42 Reiterative Magnetometric Backup Sensors
+        6285,  # Surplus Multi-Frequency Reserve Array
+        6286,  # F-42 Reiterative Multi-Frequency Backup Sensors
+        6289,  # Surplus Ladar Reserve Array
+        6290,  # F-42 Reiterative Ladar Backup Sensors
+        6291,  # Surplus Gravimetric Reserve Array
+        6292,  # F-42 Reiterative Gravimetric Backup Sensors
+        6309,  # Amplitude Signal Enhancer
+        6310,  # 'Acolyth' Signal Booster
+        6311,  # Type-E Discriminative Signal Augmentation
+        6312,  # F-90 Positional Signal Amplifier
+    ),
+    21527: (  # 'Firewall' Signal Amplifier
+        21521,  # Gravimetric Firewall
+        21523,  # Ladar Firewall
+        21525,  # Magnetometric Firewall
+        21527,  # Multi Sensor Firewall
+        21529,  # RADAR Firewall
+    ),
+    23416: (  # 'Peace' Large Remote Armor Repairer
+        None,  # 'Pacifier' Large Remote Armor Repairer
+    ),
+    6176: (  # F-12 Enduring Tracking Computer
+        6174,  # Monopulse Tracking Mechanism I
+    ),
+    6159: (  # Alumel-Wired Enduring Sensor Booster
+        7917,  # Alumel Radar ECCM Sensor Array I
+        7918,  # Alumel Ladar ECCM Sensor Array I
+        7922,  # Alumel Gravimetric ECCM Sensor Array I
+        7926,  # Alumel Omni ECCM Sensor Array I
+        7937,  # Alumel Magnetometric ECCM Sensor Array I
+        7867,  # Supplemental Ladar ECCM Scanning Array I
+        7869,  # Supplemental Gravimetric ECCM Scanning Array I
+        7870,  # Supplemental Omni ECCM Scanning Array I
+        7887,  # Supplemental Radar ECCM Scanning Array I
+        7889,  # Supplemental Magnetometric ECCM Scanning Array I
+        20216,  # Incremental Radar ECCM Scanning Array I
+        20222,  # Incremental Ladar ECCM Scanning Array I
+        20228,  # Incremental Gravimetric ECCM Scanning Array I
+        20234,  # Incremental Magnetometric ECCM Scanning Array I
+        7892,  # Prototype ECCM Radar Sensor Cluster
+        7893,  # Prototype ECCM Ladar Sensor Cluster
+        7895,  # Prototype ECCM Gravimetric Sensor Cluster
+        7896,  # Prototype ECCM Omni Sensor Cluster
+        7914,  # Prototype ECCM Magnetometric Sensor Cluster
+        6158,  # Prototype Sensor Booster
+    ),
+    5849: (  # Extruded Compact Heat Sink
+        5846,  # Thermal Exhaust System I
+        5858,  # C4S Coiled Circuit Thermal Radiator
+        5857,  # 'Skadi' Coolant System I
+    ),
+    22895: (  # 'Shady' Sensor Booster
+        22897,  # 'Forger' ECCM - Magnetometric I
+    ),
+    11105: (  # Vortex Compact Magnetic Field Stabilizer
+        11103,  # Insulated Stabilizer Array I
+        11101,  # Linear Flux Stabilizer I
+        11107,  # Gauss Field Balancer I
+    ),
+    22945: (  # 'Executive' Remote Sensor Dampener
+        22943,  # 'Broker' Remote Sensor Dampener I
+    ),
+    6173: (  # Optical Compact Tracking Computer
+        6175,  # 'Orion' Tracking CPU I
+    ),
+    5279: (  # F-23 Compact Remote Sensor Booster
+        7217,  # Spot Pulsing ECCM I
+        7220,  # Phased Muon ECCM Caster I
+        5280,  # Connected Remote Sensor Booster
+    ),
+    4787: (  # Small Compact Pb-Acid Cap Battery
+        4791,  # Small Ohm Capacitor Reserve I
+        4785,  # Small F-4a Ld-Sulfate Capacitor Charge Unit
+        4789,  # Small Peroxide Capacitor Power Cell
+    ),
+    19946: (  # BZ-5 Scoped Gravimetric ECM
+        9519,  # FZ-3 Subversive Spatial Destabilizer ECM
+    ),
+    6073: (  # Medium Compact Pb-Acid Cap Battery
+        6097,  # Medium Ohm Capacitor Reserve I
+        6111,  # Medium F-4a Ld-Sulfate Capacitor Charge Unit
+        6083,  # Medium Peroxide Capacitor Power Cell
+    ),
+    21484: (  # 'Full Duplex' Ballistic Control System
+        21482,  # Ballistic 'Purge' Targeting System I
+    ),
+    6296: (  # F-89 Compact Signal Amplifier
+        6218,  # Protected Gravimetric Backup Cluster I
+        6222,  # Protected Ladar Backup Cluster I
+        6226,  # Protected Magnetometric Backup Cluster I
+        6230,  # Protected Multi-Frequency Backup Cluster I
+        6234,  # Protected RADAR Backup Cluster I
+        6195,  # Reserve Gravimetric Scanners
+        6199,  # Reserve Ladar Scanners
+        6203,  # Reserve Magnetometric Scanners
+        6207,  # Reserve Multi-Frequency Scanners
+        6212,  # Reserve RADAR Scanners
+        20238,  # Secure Gravimetric Backup Cluster I
+        20244,  # Secure Ladar Backup Cluster I
+        20250,  # Secure Magnetometric Backup Cluster I
+        20260,  # Secure Radar Backup Cluster I
+        6244,  # F-43 Repetitive Gravimetric Backup Sensors
+        6252,  # F-43 Repetitive Ladar Backup Sensors
+        6260,  # F-43 Repetitive Magnetometric Backup Sensors
+        6268,  # F-43 Repetitive Multi-Frequency Backup Sensors
+        6276,  # F-43 Repetitive RADAR Backup Sensors
+        20240,  # Shielded Gravimetric Backup Cluster I
+        20246,  # Shielded Ladar Backup Cluster I
+        20252,  # Shielded Magnetometric Backup Cluster I
+        20262,  # Shielded Radar Backup Cluster I
+        6243,  # Surrogate Gravimetric Reserve Array I
+        6251,  # Surrogate Ladar Reserve Array I
+        6259,  # Surrogate Magnetometric Reserve Array I
+        6267,  # Surrogate Multi-Frequency Reserve Array I
+        6275,  # Surrogate RADAR Reserve Array I
+        20242,  # Warded Gravimetric Backup Cluster I
+        20248,  # Warded Ladar Backup Cluster I
+        20254,  # Warded Magnetometric Backup Cluster I
+        20264,  # Warded Radar Backup Cluster I
+        6294,  # 'Mendicant' Signal Booster I
+        6293,  # Wavelength Signal Enhancer I
+        6295,  # Type-D Attenuation Signal Augmentation
+    ),
+    5302: (  # Phased Muon Scoped Sensor Dampener
+        5300,  # Indirect Scanning Dampening Unit I
+    ),
+}
+
+def upgrade(saveddata_engine):
+
+    # Convert modules
+    for replacement_item, list in CONVERSIONS.iteritems():
+        for retired_item in list:
+            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?', (replacement_item, retired_item))
+

eos/db/migrations/upgrade13.py

@@ -0,0 +1,15 @@
+"""
+Migration 13
+
+- Alters fits table to introduce implant location attribute
+"""
+
+import sqlalchemy
+
+def upgrade(saveddata_engine):
+    # Update fits schema to include implant location attribute
+    try:
+        saveddata_engine.execute("SELECT implantLocation FROM fits LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE fits ADD COLUMN implantLocation INTEGER;")
+        saveddata_engine.execute("UPDATE fits SET implantLocation = 0")

eos/db/migrations/upgrade14.py

@@ -0,0 +1,19 @@
+"""
+Migration 14
+
+- This should take care of issue #586.
+"""
+
+import sqlalchemy
+
+def upgrade(saveddata_engine):
+    if saveddata_engine.execute("SELECT name FROM sqlite_master WHERE type='table' AND name='fighters'").scalar() == 'fighters':
+        # Fighters table exists
+        try:
+            saveddata_engine.execute("SELECT active FROM fighters LIMIT 1")
+        except sqlalchemy.exc.DatabaseError:
+            # if we don't have the active column, we are on an old pre-release version. Drop the tables and move on
+            # (they will be recreated)
+
+            saveddata_engine.execute("DROP TABLE fighters")
+            saveddata_engine.execute("DROP TABLE fightersAbilities")

eos/db/migrations/upgrade15.py

@@ -0,0 +1,21 @@
+"""
+Migration 15
+
+- Delete projected modules on citadels
+"""
+
+import sqlalchemy
+
+def upgrade(saveddata_engine):
+
+    sql = """
+    DELETE FROM modules WHERE ID IN
+    (
+        SELECT m.ID FROM modules AS m
+        JOIN fits AS f ON m.fitID = f.ID
+        WHERE f.shipID IN ("35832", "35833", "35834", "40340")
+        AND m.projected = 1
+    )
+    """
+
+    saveddata_engine.execute(sql)

eos/db/saveddata/__init__.py

@@ -1,3 +1,20 @@
-__all__ = ["character", "fit", "module", "user", "crest", "skill", "price",
-           "booster", "drone", "implant", "fleet", "damagePattern",
-           "miscData", "targetResists"]
+__all__ = [
+    "character",
+    "fit",
+    "module",
+    "user",
+    "skill",
+    "price",
+    "booster",
+    "drone",
+    "implant",
+    "fleet",
+    "damagePattern",
+    "miscData",
+    "targetResists",
+    "override",
+    "crest",
+    "implantSet",
+    "loadDefaultDatabaseValues"
+]
+

eos/db/saveddata/character.py

@@ -36,9 +36,23 @@ characters_table = Table("characters", saveddata_meta,
                          Column("ownerID", ForeignKey("users.ID"), nullable = True))
 
 mapper(Character, characters_table,
-       properties = {"_Character__owner" : relation(User, backref = "characters"),
-                     "_Character__skills" : relation(Skill, backref="character", cascade = "all,delete-orphan"),
-                     "_Character__implants" : relation(Implant, collection_class = HandledImplantBoosterList, cascade='all,delete-orphan', single_parent=True,
-                                                       primaryjoin = charImplants_table.c.charID == characters_table.c.ID,
-                                                       secondaryjoin = charImplants_table.c.implantID == Implant.ID,
-                                                       secondary = charImplants_table),})
+        properties = {
+            "savedName": characters_table.c.name,
+            "_Character__owner": relation(
+                User,
+                backref = "characters"),
+            "_Character__skills": relation(
+                Skill,
+                backref="character",
+                cascade = "all,delete-orphan"),
+            "_Character__implants": relation(
+                Implant,
+                collection_class = HandledImplantBoosterList,
+                cascade='all,delete-orphan',
+                backref='character',
+                single_parent=True,
+                primaryjoin = charImplants_table.c.charID == characters_table.c.ID,
+                secondaryjoin = charImplants_table.c.implantID == Implant.ID,
+                secondary = charImplants_table),
+        }
+)

eos/db/saveddata/fighter.py

@@ -0,0 +1,52 @@
+#===============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# This file is part of eos.
+#
+# eos is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# eos is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with eos.  If not, see <http://www.gnu.org/licenses/>.
+#===============================================================================
+
+from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean
+from sqlalchemy.orm import mapper
+from eos.db import saveddata_meta
+from eos.types import Fighter, Fit
+from sqlalchemy.orm import *
+from sqlalchemy.sql import and_
+from eos.effectHandlerHelpers import *
+from eos.types import FighterAbility
+
+
+fighters_table = Table("fighters", saveddata_meta,
+                     Column("groupID", Integer, primary_key=True),
+                     Column("fitID", Integer, ForeignKey("fits.ID"), nullable = False, index = True),
+                     Column("itemID", Integer, nullable = False),
+                     Column("active", Boolean, nullable=True),
+                     Column("amount", Integer, nullable = False),
+                     Column("projected", Boolean, default = False))
+
+fighter_abilities_table = Table("fightersAbilities", saveddata_meta,
+                     Column("groupID", Integer, ForeignKey("fighters.groupID"), primary_key=True, index = True),
+                     Column("effectID", Integer, nullable = False, primary_key=True),
+                     Column("active", Boolean, default = False))
+
+mapper(Fighter, fighters_table,
+       properties = {
+            "owner": relation(Fit),
+            "_Fighter__abilities": relation(
+                FighterAbility,
+                backref="fighter",
+                cascade='all, delete, delete-orphan'),
+       })
+
+mapper(FighterAbility, fighter_abilities_table)

eos/db/saveddata/fit.py

@@ -26,9 +26,10 @@ from sqlalchemy.orm.collections import attribute_mapped_collection
 from eos.db import saveddata_meta
 from eos.db.saveddata.module import modules_table
 from eos.db.saveddata.drone import drones_table
+from eos.db.saveddata.fighter import fighters_table
 from eos.db.saveddata.cargo import cargo_table
 from eos.db.saveddata.implant import fitImplants_table
-from eos.types import Fit, Module, User, Booster, Drone, Cargo, Implant, Character, DamagePattern, TargetResists
+from eos.types import Fit, Module, User, Booster, Drone, Fighter, Cargo, Implant, Character, DamagePattern, TargetResists, ImplantLocation
 from eos.effectHandlerHelpers import *
 
 fits_table = Table("fits", saveddata_meta,
@@ -42,6 +43,7 @@ fits_table = Table("fits", saveddata_meta,
                          Column("booster", Boolean, nullable = False, index = True, default = 0),
                          Column("targetResistsID", ForeignKey("targetResists.ID"), nullable=True),
                          Column("modeID", Integer, nullable=True),
+                         Column("implantLocation", Integer, nullable=False, default=ImplantLocation.FIT),
 )
 
 projectedFits_table = Table("projectedFits", saveddata_meta,
@@ -117,6 +119,12 @@ mapper(Fit, fits_table,
                 cascade='all, delete, delete-orphan',
                 single_parent=True,
                 primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == False)),
+            "_Fit__fighters": relation(
+                Fighter,
+                collection_class=HandledDroneCargoList,
+                cascade='all, delete, delete-orphan',
+                single_parent=True,
+                primaryjoin=and_(fighters_table.c.fitID == fits_table.c.ID, fighters_table.c.projected == False)),
             "_Fit__cargo": relation(
                 Cargo,
                 collection_class=HandledDroneCargoList,
@@ -129,6 +137,12 @@ mapper(Fit, fits_table,
                 cascade='all, delete, delete-orphan',
                 single_parent=True,
                 primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == True)),
+            "_Fit__projectedFighters": relation(
+                Fighter,
+                collection_class=HandledProjectedDroneList,
+                cascade='all, delete, delete-orphan',
+                single_parent=True,
+                primaryjoin=and_(fighters_table.c.fitID == fits_table.c.ID, fighters_table.c.projected == True)),
             "_Fit__implants": relation(
                 Implant,
                 collection_class=HandledImplantBoosterList,

eos/db/saveddata/implant.py

@@ -36,4 +36,8 @@ charImplants_table = Table("charImplants", saveddata_meta,
                            Column("charID", ForeignKey("characters.ID"), index = True),
                            Column("implantID", ForeignKey("implants.ID"), primary_key = True))
 
+implantsSetMap_table = Table("implantSetMap", saveddata_meta,
+                             Column("setID", ForeignKey("implantSets.ID"), index = True),
+                             Column("implantID", ForeignKey("implants.ID"), primary_key = True))
+
 mapper(Implant, implants_table)

eos/db/saveddata/implantSet.py

@@ -0,0 +1,45 @@
+#===============================================================================
+# Copyright (C) 2016 Ryan Holmes
+#
+# This file is part of eos.
+#
+# eos is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# eos is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with eos.  If not, see <http://www.gnu.org/licenses/>.
+#===============================================================================
+
+from sqlalchemy import Table, Column, Integer, ForeignKey, String
+from sqlalchemy.orm import relation, mapper
+
+from eos.db import saveddata_meta
+from eos.db.saveddata.implant import implantsSetMap_table
+from eos.types import Implant, ImplantSet
+from eos.effectHandlerHelpers import HandledImplantBoosterList
+
+implant_set_table = Table("implantSets", saveddata_meta,
+                         Column("ID", Integer, primary_key = True),
+                         Column("name", String, nullable = False),
+)
+
+mapper(ImplantSet, implant_set_table,
+        properties = {
+            "_ImplantSet__implants": relation(
+                Implant,
+                collection_class = HandledImplantBoosterList,
+                cascade='all, delete, delete-orphan',
+                backref='set',
+                single_parent=True,
+                primaryjoin = implantsSetMap_table.c.setID == implant_set_table.c.ID,
+                secondaryjoin = implantsSetMap_table.c.implantID == Implant.ID,
+                secondary = implantsSetMap_table),
+        }
+)

eos/db/saveddata/loadDefaultDatabaseValues.py

@@ -0,0 +1,190 @@
+#===============================================================================
+# 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/>.
+#===============================================================================
+
+import eos.db
+import eos.types
+
+class ImportError(Exception):
+    pass
+
+class DefaultDatabaseValues():
+    instance = None
+
+    @classmethod
+    def importDamageProfileDefaults(self):
+        damageProfileList = []
+        damageProfileList.append(["Uniform", "25", "25", "25", "25"])
+        damageProfileList.append(["[Generic]EM", "100", "0", "0", "0"])
+        damageProfileList.append(["[Generic]Thermal", "0", "100", "0", "0"])
+        damageProfileList.append(["[Generic]Kinetic", "0", "0", "100", "0"])
+        damageProfileList.append(["[Generic]Explosive", "0", "0", "0", "100"])
+        damageProfileList.append(["[NPC][Asteroid] Blood Raiders", "5067", "4214", "0", "0"])
+        damageProfileList.append(["[Bombs]Concussion Bomb", "0", "0", "6400", "0"])
+        damageProfileList.append(["[Bombs]Electron Bomb", "6400", "0", "0", "0"])
+        damageProfileList.append(["[Bombs]Scorch Bomb", "0", "6400", "0", "0"])
+        damageProfileList.append(["[Bombs]Shrapnel Bomb", "0", "0", "0", "6400"])
+        damageProfileList.append(["[Frequency Crystals][T2] Gleam", "56", "56", "0", "0"])
+        damageProfileList.append(["[Frequency Crystals][T2] Aurora", "40", "24", "0", "0"])
+        damageProfileList.append(["[Frequency Crystals][T2] Scorch", "72", "16", "0", "0"])
+        damageProfileList.append(["[Frequency Crystals][T2] Conflagration", "61.6", "61.6", "0", "0"])
+        damageProfileList.append(["[Frequency Crystals]Gamma", "61.6", "35.2", "0", "0"])
+        damageProfileList.append(["[Frequency Crystals]Infrared", "44", "17.6", "0", "0"])
+        damageProfileList.append(["[Frequency Crystals]Microwave", "35.2", "17.6", "0", "0"])
+        damageProfileList.append(["[Frequency Crystals]Multifrequency", "61.6", "44", "0", "0"])
+        damageProfileList.append(["[Frequency Crystals]Radio", "44", "0", "0", "0"])
+        damageProfileList.append(["[Frequency Crystals]Standard", "44", "26.4", "0", "0"])
+        damageProfileList.append(["[Frequency Crystals]Ultraviolet", "52.8", "26.4", "0", "0"])
+        damageProfileList.append(["[Frequency Crystals]Xray", "52.8", "35.2", "0", "0"])
+        damageProfileList.append(["[Hybrid Charges][T2] Void", "0", "61.6", "61.6", "0"])
+        damageProfileList.append(["[Hybrid Charges][T2] Null", "0", "48", "40", "0"])
+        damageProfileList.append(["[Hybrid Charges][T2] Javelin", "0", "64", "48", "0"])
+        damageProfileList.append(["[Hybrid Charges][T2] Spike", "0", "32", "32", "0"])
+        damageProfileList.append(["[Hybrid Charges]Antimatter", "0", "48", "67.2", "0"])
+        damageProfileList.append(["[Hybrid Charges]Iridium", "0", "28.8", "38.4", "0"])
+        damageProfileList.append(["[Hybrid Charges]Iron", "0", "19.2", "28.8", "0"])
+        damageProfileList.append(["[Hybrid Charges]Lead", "0", "28.8", "48", "0"])
+        damageProfileList.append(["[Hybrid Charges]Plutonium", "0", "48", "57.6", "0"])
+        damageProfileList.append(["[Hybrid Charges]Thorium", "0", "38.4", "48", "0"])
+        damageProfileList.append(["[Hybrid Charges]Tungsten", "0", "19.2", "38.4", "0"])
+        damageProfileList.append(["[Hybrid Charges]Uranium", "0", "38.4", "57.6", "0"])
+        damageProfileList.append(["[Missiles]Mjolnir", "100", "0", "0", "0"])
+        damageProfileList.append(["[Missiles]Inferno", "0", "100", "0", "0"])
+        damageProfileList.append(["[Missiles]Scourge", "0", "0", "100", "0"])
+        damageProfileList.append(["[Missiles]Nova", "0", "0", "0", "100"])
+        damageProfileList.append(["[Missiles][Structure) Standup Missile", "100", "100", "100", "100"])
+        damageProfileList.append(["[Projectile Ammo][T2] Tremor", "0", "0", "24", "40"])
+        damageProfileList.append(["[Projectile Ammo][T2] Quake", "0", "0", "40", "72"])
+        damageProfileList.append(["[Projectile Ammo][T2] Hail", "0", "0", "26.4", "96.8"])
+        damageProfileList.append(["[Projectile Ammo][T2] Barrage", "0", "0", "40", "48"])
+        damageProfileList.append(["[Projectile Ammo]Carbonized Lead", "0", "0", "35.2", "8.8"])
+        damageProfileList.append(["[Projectile Ammo]Depleted Uranium", "0", "26.4", "17.6", "26.4"])
+        damageProfileList.append(["[Projectile Ammo]EMP", "79.2", "0", "8.8", "17.6"])
+        damageProfileList.append(["[Projectile Ammo]Fusion", "0", "0", "17.6", "88"])
+        damageProfileList.append(["[Projectile Ammo]Nuclear", "0", "0", "8.8", "35.2"])
+        damageProfileList.append(["[Projectile Ammo]Phased Plasma", "0", "88", "17.6", "0"])
+        damageProfileList.append(["[Projectile Ammo]Proton", "26.4", "0", "17.6", "0"])
+        damageProfileList.append(["[Projectile Ammo]Titanium Sabot", "0", "0", "52.8", "176"])
+        damageProfileList.append(["[NPC][Burner] Cruor (Blood Raiders)", "90", "90", "0", "0"])
+        damageProfileList.append(["[NPC][Burner] Dramiel (Angel)", "55", "0", "20", "96"])
+        damageProfileList.append(["[NPC][Burner] Daredevil (Serpentis)", "0", "110", "154", "0"])
+        damageProfileList.append(["[NPC][Burner] Succubus (Sanshas Nation)", "135", "30", "0", "0"])
+        damageProfileList.append(["[NPC][Burner] Worm (Guristas)", "0", "0", "228", "0"])
+        damageProfileList.append(["[NPC][Burner] Enyo", "0", "147", "147", "0"])
+        damageProfileList.append(["[NPC][Burner] Hawk", "0", "0", "247", "0"])
+        damageProfileList.append(["[NPC][Burner] Jaguar", "36", "0", "50", "182"])
+        damageProfileList.append(["[NPC][Burner] Vengeance", "232", "0", "0", "0"])
+        damageProfileList.append(["[NPC][Burner] Ashimmu (Blood Raiders)", "260", "100", "0", "0"])
+        damageProfileList.append(["[NPC][Burner] Talos", "0", "413", "413", "0"])
+        damageProfileList.append(["[NPC][Burner] Sentinel", "0", "75", "0", "90"])
+        damageProfileList.append(["[NPC][Asteroid] Angel Cartel", "1838", "562", "2215", "3838"])
+        damageProfileList.append(["[NPC][Deadspace] Angel Cartel", "369", "533", "1395", "3302"])
+        damageProfileList.append(["[NPC][Deadspace] Blood Raiders", "6040", "5052", "10", "15"])
+        damageProfileList.append(["[NPC][Asteroid] Guristas", "0", "1828", "7413", "0"])
+        damageProfileList.append(["[NPC][Deadspace] Guristas", "0", "1531", "9680", "0"])
+        damageProfileList.append(["[NPC][Asteroid] Rogue Drone", "394", "666", "1090", "1687"])
+        damageProfileList.append(["[NPC][Deadspace] Rogue Drone", "276", "1071", "1069", "871"])
+        damageProfileList.append(["[NPC][Asteroid] Sanshas Nation", "5586", "4112", "0", "0"])
+        damageProfileList.append(["[NPC][Deadspace] Sanshas Nation", "3009", "2237", "0", "0"])
+        damageProfileList.append(["[NPC][Asteroid] Serpentis", "0", "5373", "4813", "0"])
+        damageProfileList.append(["[NPC][Deadspace] Serpentis", "0", "3110", "1929", "0"])
+        damageProfileList.append(["[NPC][Mission] Amarr Empire", "4464", "3546", "97", "0"])
+        damageProfileList.append(["[NPC][Mission] Caldari State", "0", "2139", "4867", "0"])
+        damageProfileList.append(["[NPC][Mission] CONCORD", "336", "134", "212", "412"])
+        damageProfileList.append(["[NPC][Mission] Gallente Federation", "9", "3712", "2758", "0"])
+        damageProfileList.append(["[NPC][Mission] Khanid", "612", "483", "43", "6"])
+        damageProfileList.append(["[NPC][Mission] Minmatar Republic", "1024", "388", "1655", "4285"])
+        damageProfileList.append(["[NPC][Mission] Mordus Legion", "25", "262", "625", "0"])
+        damageProfileList.append(["[NPC][Mission] Thukker", "0", "52", "10", "79"])
+        damageProfileList.append(["[NPC][Other] Sleepers", "1472", "1472", "1384", "1384"])
+        damageProfileList.append(["[NPC][Other] Sansha Incursion", "1682", "1347", "3678", "3678"])
+
+        for damageProfileRow in damageProfileList:
+            name, em, therm, kin, exp = damageProfileRow
+            damageProfile = eos.db.getDamagePattern(name)
+            if damageProfile is None:
+                damageProfile = eos.types.DamagePattern(em, therm, kin, exp)
+                damageProfile.name = name
+                eos.db.save(damageProfile)
+
+    @classmethod
+    def importResistProfileDefaults(self):
+        targetResistProfileList = []
+        targetResistProfileList.append(["Uniform (25%)", "0.25", "0.25", "0.25", "0.25"])
+        targetResistProfileList.append(["Uniform (50%)", "0.50", "0.50", "0.50", "0.50"])
+        targetResistProfileList.append(["Uniform (75%)", "0.75", "0.75", "0.75", "0.75"])
+        targetResistProfileList.append(["[T1 Resist]Shield", "0.0", "0.20", "0.40", "0.50"])
+        targetResistProfileList.append(["[T1 Resist]Armor", "0.50", "0.45", "0.25", "0.10"])
+        targetResistProfileList.append(["[T1 Resist]Hull", "0.33", "0.33", "0.33", "0.33"])
+        targetResistProfileList.append(["[T1 Resist]Shield (+T2 DCU)", "0.125", "0.30", "0.475", "0.562"])
+        targetResistProfileList.append(["[T1 Resist]Armor (+T2 DCU)", "0.575", "0.532", "0.363", "0.235"])
+        targetResistProfileList.append(["[T1 Resist]Hull (+T2 DCU)", "0.598", "0.598", "0.598", "0.598"])
+        targetResistProfileList.append(["[NPC][Asteroid] Angel Cartel", "0.54", "0.42", "0.37", "0.32"])
+        targetResistProfileList.append(["[NPC][Asteroid] Blood Raiders", "0.34", "0.39", "0.45", "0.52"])
+        targetResistProfileList.append(["[NPC][Asteroid] Guristas", "0.55", "0.35", "0.3", "0.48"])
+        targetResistProfileList.append(["[NPC][Asteroid] Rogue Drones", "0.35", "0.38", "0.44", "0.49"])
+        targetResistProfileList.append(["[NPC][Asteroid] Sanshas Nation", "0.35", "0.4", "0.47", "0.53"])
+        targetResistProfileList.append(["[NPC][Asteroid] Serpentis", "0.49", "0.38", "0.29", "0.51"])
+        targetResistProfileList.append(["[NPC][Deadspace] Angel Cartel", "0.59", "0.48", "0.4", "0.32"])
+        targetResistProfileList.append(["[NPC][Deadspace] Blood Raiders", "0.31", "0.39", "0.47", "0.56"])
+        targetResistProfileList.append(["[NPC][Deadspace] Guristas", "0.57", "0.39", "0.31", "0.5"])
+        targetResistProfileList.append(["[NPC][Deadspace] Rogue Drones", "0.42", "0.42", "0.47", "0.49"])
+        targetResistProfileList.append(["[NPC][Deadspace] Sanshas Nation", "0.31", "0.39", "0.47", "0.56"])
+        targetResistProfileList.append(["[NPC][Deadspace] Serpentis", "0.49", "0.38", "0.29", "0.56"])
+        targetResistProfileList.append(["[NPC][Mission] Amarr Empire", "0.34", "0.38", "0.42", "0.46"])
+        targetResistProfileList.append(["[NPC][Mission] Caldari State", "0.51", "0.38", "0.3", "0.51"])
+        targetResistProfileList.append(["[NPC][Mission] CONCORD", "0.47", "0.46", "0.47", "0.47"])
+        targetResistProfileList.append(["[NPC][Mission] Gallente Federation", "0.51", "0.38", "0.31", "0.52"])
+        targetResistProfileList.append(["[NPC][Mission] Khanid", "0.51", "0.42", "0.36", "0.4"])
+        targetResistProfileList.append(["[NPC][Mission] Minmatar Republic", "0.51", "0.46", "0.41", "0.35"])
+        targetResistProfileList.append(["[NPC][Mission] Mordus Legion", "0.32", "0.48", "0.4", "0.62"])
+        targetResistProfileList.append(["[NPC][Other] Sleeper", "0.61", "0.61", "0.61", "0.61"])
+        targetResistProfileList.append(["[NPC][Other] Sansha Incursion", "0.65", "0.63", "0.64", "0.65"])
+        targetResistProfileList.append(["[NPC][Burner] Cruor (Blood Raiders)", "0.8", "0.73", "0.69", "0.67"])
+        targetResistProfileList.append(["[NPC][Burner] Dramiel (Angel)", "0.35", "0.48", "0.61", "0.68"])
+        targetResistProfileList.append(["[NPC][Burner] Daredevil (Serpentis)", "0.69", "0.59", "0.59", "0.43"])
+        targetResistProfileList.append(["[NPC][Burner] Succubus (Sanshas Nation)", "0.35", "0.48", "0.61", "0.68"])
+        targetResistProfileList.append(["[NPC][Burner] Worm (Guristas)", "0.48", "0.58", "0.69", "0.74"])
+        targetResistProfileList.append(["[NPC][Burner] Enyo", "0.58", "0.72", "0.86", "0.24"])
+        targetResistProfileList.append(["[NPC][Burner] Hawk", "0.3", "0.86", "0.79", "0.65"])
+        targetResistProfileList.append(["[NPC][Burner] Jaguar", "0.78", "0.65", "0.48", "0.56"])
+        targetResistProfileList.append(["[NPC][Burner] Vengeance", "0.66", "0.56", "0.75", "0.86"])
+        targetResistProfileList.append(["[NPC][Burner] Ashimmu (Blood Raiders)", "0.8", "0.76", "0.68", "0.7"])
+        targetResistProfileList.append(["[NPC][Burner] Talos", "0.68", "0.59", "0.59", "0.43"])
+        targetResistProfileList.append(["[NPC][Burner] Sentinel", "0.58", "0.45", "0.52", "0.66"])
+
+        for targetResistProfileRow in targetResistProfileList:
+            name, em, therm, kin, exp = targetResistProfileRow
+            resistsProfile = eos.db.eos.db.getTargetResists(name)
+            if resistsProfile is None:
+                resistsProfile = eos.types.TargetResists(em, therm, kin, exp)
+                resistsProfile.name = name
+                eos.db.save(resistsProfile)
+
+    @classmethod
+    def importRequiredDefaults(self):
+        damageProfileList = []
+        damageProfileList.append(["Uniform", "25", "25", "25", "25"])
+
+        for damageProfileRow in damageProfileList:
+            name, em, therm, kin, exp = damageProfileRow
+            damageProfile = eos.db.getDamagePattern(name)
+            if damageProfile is None:
+                damageProfile = eos.types.DamagePattern(em, therm, kin, exp)
+                damageProfile.name = name
+                eos.db.save(damageProfile)

eos/db/saveddata/override.py

@@ -0,0 +1,31 @@
+#===============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# This file is part of eos.
+#
+# eos is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# eos is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with eos.  If not, see <http://www.gnu.org/licenses/>.
+#===============================================================================
+
+from sqlalchemy import Table, Column, Integer, Float
+from sqlalchemy.orm import mapper
+
+from eos.db import saveddata_meta
+from eos.types import Override
+
+overrides_table = Table("overrides", saveddata_meta,
+                     Column("itemID", Integer, primary_key=True, index = True),
+                     Column("attrID", Integer, primary_key=True, index = True),
+                     Column("value", Float, nullable = False))
+
+mapper(Override, overrides_table)

eos/db/saveddata/queries.py

@@ -19,7 +19,8 @@
 
 from eos.db.util import processEager, processWhere
 from eos.db import saveddata_session, sd_lock
-from eos.types import User, Character, Fit, Price, DamagePattern, Fleet, MiscData, Wing, Squad, TargetResists, CrestChar
+
+from eos.types import *
 from eos.db.saveddata.fleet import squadmembers_table
 from eos.db.saveddata.fit import projectedFits_table
 from sqlalchemy.sql import and_
@@ -153,7 +154,7 @@ def getCharacter(lookfor, eager=None):
     elif isinstance(lookfor, basestring):
         eager = processEager(eager)
         with sd_lock:
-            character = saveddata_session.query(Character).options(*eager).filter(Character.name == lookfor).first()
+            character = saveddata_session.query(Character).options(*eager).filter(Character.savedName == lookfor).first()
     else:
         raise TypeError("Need integer or string as argument")
     return character
@@ -182,7 +183,7 @@ def getFit(lookfor, eager=None):
         else:
             eager = processEager(eager)
             with sd_lock:
-                fit = saveddata_session.query(Fit).options(*eager).filter(Fit.ID == fitID).first()
+                fit = saveddata_session.query(Fit).options(*eager).filter(Fit.ID == lookfor).first()
     else:
         raise TypeError("Need integer as argument")
 
@@ -348,6 +349,12 @@ def getTargetResistsList(eager=None):
         patterns = saveddata_session.query(TargetResists).options(*eager).all()
     return patterns
 
+def getImplantSetList(eager=None):
+    eager = processEager(eager)
+    with sd_lock:
+        sets = saveddata_session.query(ImplantSet).options(*eager).all()
+    return sets
+
 @cachedQuery(DamagePattern, 1, "lookfor")
 def getDamagePattern(lookfor, eager=None):
     if isinstance(lookfor, int):
@@ -384,6 +391,24 @@ def getTargetResists(lookfor, eager=None):
         raise TypeError("Need integer or string as argument")
     return pattern
 
+@cachedQuery(ImplantSet, 1, "lookfor")
+def getImplantSet(lookfor, eager=None):
+    if isinstance(lookfor, int):
+        if eager is None:
+            with sd_lock:
+                pattern = saveddata_session.query(ImplantSet).get(lookfor)
+        else:
+            eager = processEager(eager)
+            with sd_lock:
+                pattern = saveddata_session.query(ImplantSet).options(*eager).filter(TargetResists.ID == lookfor).first()
+    elif isinstance(lookfor, basestring):
+        eager = processEager(eager)
+        with sd_lock:
+            pattern = saveddata_session.query(ImplantSet).options(*eager).filter(TargetResists.name == lookfor).first()
+    else:
+        raise TypeError("Improper argument")
+    return pattern
+
 def searchFits(nameLike, where=None, eager=None):
     if not isinstance(nameLike, basestring):
         raise TypeError("Need string as argument")
@@ -440,6 +465,21 @@ def getCrestCharacter(lookfor, eager=None):
         raise TypeError("Need integer or string as argument")
     return character
 
+def getOverrides(itemID, eager=None):
+    if isinstance(itemID, int):
+        return saveddata_session.query(Override).filter(Override.itemID == itemID).all()
+    else:
+        raise TypeError("Need integer as argument")
+
+def clearOverrides():
+    with sd_lock:
+        deleted_rows = saveddata_session.query(Override).delete()
+    commit()
+    return deleted_rows
+
+def getAllOverrides(eager=None):
+    return saveddata_session.query(Override).all()
+
 def removeInvalid(fits):
     invalids = [f for f in fits if f.isInvalid]
 

eos/db/util.py

@@ -18,7 +18,7 @@
 #===============================================================================
 
 from sqlalchemy.orm import eagerload
-from sqlalchemy.sql import and_
+from sqlalchemy.sql import and_, or_
 
 replace = {"attributes": "_Item__attributes",
            "modules": "_Fit__modules",

eos/effectHandlerHelpers.py

@@ -135,6 +135,11 @@ class HandledModuleList(HandledList):
         HandledList.append(self, mod)
         if mod.isInvalid:
             self.remove(mod)
+            return
+
+        # fix for #529, where a module may be in incorrect state after CCP changes mechanics of module
+        if not mod.isValidState(mod.state):
+            mod.state = eos.types.State.ONLINE
 
     def insert(self, index, mod):
         mod.position = index

eos/effects/adaptivearmorhardener.py

@@ -6,5 +6,13 @@ type = "active"
 def handler(fit, module, context):
     for type in ("kinetic", "thermal", "explosive", "em"):
         attr = "armor%sDamageResonance" % type.capitalize()
-        fit.ship.multiplyItemAttr(attr, module.getModifiedItemAttr(attr),
-                                  stackingPenalties=True, penaltyGroup="preMul")
+
+        #Adjust RAH to match the current damage pattern
+        damagePattern = fit.damagePattern
+        if damagePattern:
+            attrDamagePattern = "%sAmount" % type
+            damagePatternModifier = getattr(damagePattern,attrDamagePattern)/float(sum((damagePattern.emAmount,damagePattern.thermalAmount,damagePattern.kineticAmount,damagePattern.explosiveAmount)))
+            modifiedResistModifier = (1-(((1-module.getModifiedItemAttr(attr))*4)*(damagePatternModifier)))
+            module.forceItemAttr(attr, modifiedResistModifier)
+
+        fit.ship.multiplyItemAttr(attr, module.getModifiedItemAttr(attr), stackingPenalties=True, penaltyGroup="preMul")

eos/effects/addtosignatureradius2.py

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

eos/effects/advanceddroneinterfacingmaxgroupdcuskilllevel.py

@@ -4,5 +4,5 @@
 # Skill: Advanced Drone Interfacing
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Drone Control Unit",
+    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Fighter Support Unit",
                                      "maxGroupActive", skill.level)

eos/effects/ammofallofmultiplier.py

@@ -1,12 +1,12 @@
 # ammoFallofMultiplier
 #
 # Used by:
-# Charges from group: Advanced Artillery Ammo (6 of 6)
-# Charges from group: Advanced Autocannon Ammo (6 of 6)
-# Charges from group: Advanced Beam Laser Crystal (6 of 6)
-# Charges from group: Advanced Blaster Charge (6 of 6)
-# Charges from group: Advanced Pulse Laser Crystal (6 of 6)
-# Charges from group: Advanced Railgun Charge (6 of 6)
+# Charges from group: Advanced Artillery Ammo (8 of 8)
+# Charges from group: Advanced Autocannon Ammo (8 of 8)
+# Charges from group: Advanced Beam Laser Crystal (8 of 8)
+# Charges from group: Advanced Blaster Charge (8 of 8)
+# Charges from group: Advanced Pulse Laser Crystal (8 of 8)
+# Charges from group: Advanced Railgun Charge (8 of 8)
 type = "passive"
 def handler(fit, module, context):
     module.multiplyItemAttr("falloff", module.getModifiedChargeAttr("fallofMultiplier") or 1)

eos/effects/ammoinfluencecapneed.py

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

eos/effects/ammoinfluencerange.py

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

eos/effects/ammotrackingmultiplier.py

@@ -1,12 +1,12 @@
 # ammoTrackingMultiplier
 #
 # Used by:
-# Charges from group: Advanced Artillery Ammo (6 of 6)
-# Charges from group: Advanced Autocannon Ammo (6 of 6)
-# Charges from group: Advanced Beam Laser Crystal (6 of 6)
-# Charges from group: Advanced Blaster Charge (6 of 6)
-# Charges from group: Advanced Pulse Laser Crystal (6 of 6)
-# Charges from group: Advanced Railgun Charge (6 of 6)
+# Charges from group: Advanced Artillery Ammo (8 of 8)
+# Charges from group: Advanced Autocannon Ammo (8 of 8)
+# Charges from group: Advanced Beam Laser Crystal (8 of 8)
+# Charges from group: Advanced Blaster Charge (8 of 8)
+# Charges from group: Advanced Pulse Laser Crystal (8 of 8)
+# Charges from group: Advanced Railgun Charge (8 of 8)
 # Charges from group: Projectile Ammo (129 of 129)
 type = "passive"
 def handler(fit, module, context):

eos/effects/angelsetbonus.py

@@ -5,7 +5,7 @@
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
-    fit.implants.filteredItemMultiply(
+    fit.appliedImplants.filteredItemMultiply(
         lambda implant: "signatureRadiusBonus" in implant.itemModifiedAttributes and "implantSetAngel" in implant.itemModifiedAttributes,
         "signatureRadiusBonus",
         implant.getModifiedItemAttr("implantSetAngel"))

eos/effects/armorallrepairsystemsamountbonuspassive.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Implants named like: Exile Booster (4 of 4)
+# Implant: Antipharmakon Kosybo
 type = "passive"
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Capital Repair Systems"),

eos/effects/armorhpbonusadd.py

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

eos/effects/armorreinforcermassadd.py

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

eos/effects/armorrepair.py

@@ -1,7 +1,7 @@
 # armorRepair
 #
 # Used by:
-# Modules from group: Armor Repair Unit (100 of 100)
+# Modules from group: Armor Repair Unit (105 of 105)
 runTime = "late"
 type = "active"
 def handler(fit, module, context):

eos/effects/armorrepairamountbonussubcap.py

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

eos/effects/armorrepairprojectorfalloffbonus.py

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

eos/effects/armorrepairprojectormaxrangebonus.py

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

eos/effects/armorwarfarearmorhpreplacer.py

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

eos/effects/boosterarmorhppenalty.py

@@ -1,7 +1,7 @@
 # boosterArmorHpPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 39)
+# Implants from group: Booster (12 of 45)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.ship.boostItemAttr("armorHP", booster.getModifiedItemAttr("boosterArmorHPPenalty"))

eos/effects/boosterarmorrepairamountpenalty.py

@@ -1,7 +1,9 @@
 # boosterArmorRepairAmountPenalty
 #
 # Used by:
-# Implants from group: Booster (9 of 39)
+# Implants named like: Drop Booster (3 of 4)
+# Implants named like: Mindflood Booster (3 of 4)
+# Implants named like: Sooth Sayer Booster (3 of 4)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Unit",

eos/effects/boostermaxvelocitypenalty.py

@@ -1,7 +1,7 @@
 # boosterMaxVelocityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 39)
+# Implants from group: Booster (12 of 45)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.ship.boostItemAttr("maxVelocity", booster.getModifiedItemAttr("boosterMaxVelocityPenalty"))

eos/effects/boostershieldcapacitypenalty.py

@@ -1,7 +1,7 @@
 # boosterShieldCapacityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 39)
+# Implants from group: Booster (12 of 45)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.ship.boostItemAttr("shieldCapacity", booster.getModifiedItemAttr("boosterShieldCapacityPenalty"))

eos/effects/boosterturretoptimalrangepenalty.py

@@ -1,7 +1,9 @@
 # boosterTurretOptimalRangePenalty
 #
 # Used by:
-# Implants from group: Booster (9 of 39)
+# Implants named like: Blue Pill Booster (3 of 5)
+# Implants named like: Mindflood Booster (3 of 4)
+# Implants named like: Sooth Sayer Booster (3 of 4)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),

eos/effects/caldarisetbonus3.py

@@ -5,5 +5,5 @@
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
-    fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
+    fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
                                       "scanGravimetricStrengthPercent", implant.getModifiedItemAttr("implantSetCaldariNavy"))

eos/effects/caldarisetlgbonus.py

@@ -5,5 +5,5 @@
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
-    fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
+    fit.appliedImplants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
                                       "scanGravimetricStrengthModifier", implant.getModifiedItemAttr("implantSetLGCaldariNavy"))

eos/effects/caldarishipecmburstoptimalrangecb3.py

@@ -4,5 +4,5 @@
 # Ship: Scorpion
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM Burst",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Jammer",
                                   "ecmBurstRange", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")

eos/effects/caldarishipewcapacitorneedcf2.py

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

eos/effects/caldarishipewfalloffrangecb3.py

@@ -5,4 +5,4 @@
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "falloff", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")
+                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")

eos/effects/caldarishipewfalloffrangecc2.py

@@ -5,4 +5,4 @@
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "falloff", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
+                                  "falloffEffectiveness", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")

eos/effects/capacitorcapacitymultiply.py

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

eos/effects/capitallauncherskillcitadelemdamage.py

@@ -2,9 +2,9 @@
 #
 # Used by:
 # Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
-# Skill: Citadel Torpedoes
+# Skill: XL Torpedoes
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Torpedoes"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"),
                                     "emDamage", container.getModifiedItemAttr("damageMultiplierBonus") * level)

eos/effects/capitallauncherskillcitadelexplosivedamage.py

@@ -2,9 +2,9 @@
 #
 # Used by:
 # Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
-# Skill: Citadel Torpedoes
+# Skill: XL Torpedoes
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Torpedoes"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"),
                                     "explosiveDamage", container.getModifiedItemAttr("damageMultiplierBonus") * level)

eos/effects/capitallauncherskillcitadelkineticdamage.py

@@ -2,9 +2,9 @@
 #
 # Used by:
 # Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
-# Skill: Citadel Torpedoes
+# Skill: XL Torpedoes
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Torpedoes"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"),
                                     "kineticDamage", container.getModifiedItemAttr("damageMultiplierBonus") * level)

eos/effects/capitallauncherskillcitadelthermaldamage.py

@@ -2,9 +2,9 @@
 #
 # Used by:
 # Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
-# Skill: Citadel Torpedoes
+# Skill: XL Torpedoes
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Torpedoes"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"),
                                     "thermalDamage", container.getModifiedItemAttr("damageMultiplierBonus") * level)

eos/effects/capitallauncherskillcruisecitadelemdamage1.py

@@ -1,8 +1,8 @@
-# 	capitalLauncherSkillCruiseCitadelEmDamage1
+# capitalLauncherSkillCruiseCitadelEmDamage1
 #
 # Used by:
-# Skill: Citadel Cruise Missiles
+# Skill: XL Cruise Missiles
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Cruise Missiles"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"),
                                     "emDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)

eos/effects/capitallauncherskillcruisecitadelexplosivedamage1.py

@@ -1,8 +1,8 @@
 # capitalLauncherSkillCruiseCitadelExplosiveDamage1
 #
 # Used by:
-# Skill: Citadel Cruise Missiles
+# Skill: XL Cruise Missiles
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Cruise Missiles"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"),
                                     "explosiveDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)

eos/effects/capitallauncherskillcruisecitadelkineticdamage1.py

@@ -1,8 +1,8 @@
 # capitalLauncherSkillCruiseCitadelKineticDamage1
 #
 # Used by:
-# Skill: Citadel Cruise Missiles
+# Skill: XL Cruise Missiles
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Cruise Missiles"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"),
                                     "kineticDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)

eos/effects/capitallauncherskillcruisecitadelthermaldamage1.py

@@ -1,8 +1,8 @@
 # capitalLauncherSkillCruiseCitadelThermalDamage1
 #
 # Used by:
-# Skill: Citadel Cruise Missiles
+# Skill: XL Cruise Missiles
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Cruise Missiles"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"),
                                     "thermalDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)

eos/effects/carrieramarrarmorenergytransferrange3.py

@@ -8,4 +8,4 @@ def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
                                   "maxRange", ship.getModifiedItemAttr("carrierAmarrBonus3"), skill="Amarr Carrier")
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Capacitor Emission Systems"),
-                                  "powerTransferRange", ship.getModifiedItemAttr("carrierAmarrBonus3"), skill="Amarr Carrier")
+                                  "maxRange", ship.getModifiedItemAttr("carrierAmarrBonus3"), skill="Amarr Carrier")

eos/effects/carrieramarrarmortransferfalloff3.py

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

eos/effects/carriercaldarishieldenergytransferrange3.py

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

eos/effects/carriercaldarishieldtransferfalloff3.py

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

eos/effects/carriergallentearmorshieldtransferfalloff3.py

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

eos/effects/carriergallentearmorshieldtransferrange3.py

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

eos/effects/carrierminmatararmorshieldtransferfalloff3.py

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

eos/effects/carrierminmatararmorshieldtransferrange3.py

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

eos/effects/cloakingtargetingdelaybonuslrsmcloakingpassive.py

@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules named like: Targeting Systems Stabilizer (8 of 8)
-type = "offline"
+type = "passive"
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda module: module.item.requiresSkill("Cloaking"),
                                   "cloakingTargetingDelay", module.getModifiedItemAttr("cloakingTargetingDelayBonus"))

eos/effects/commandbonustdmultiplywithcommandbonushidden.py

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

eos/effects/commandbonustpmultiplywithcommandbonushidden.py

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

eos/effects/covertopsandreconopscloakmoduledelaybonus.py

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

eos/effects/covertopscloakcpupercentbonus1.py

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

eos/effects/covertopscloakcpupercentbonuspiratefaction.py

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

eos/effects/covertopsstealthbombertargettingdelaybonus.py

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

eos/effects/damagecontrol.py

@@ -1,8 +1,9 @@
 # damageControl
 #
 # Used by:
-# Modules from group: Damage Control (14 of 14)
-type = "active"
+# Variations of module: Damage Control I (16 of 16)
+# Module: Civilian Damage Control
+type = "passive"
 def handler(fit, module, context):
     for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')):
         for damageType in ('Kinetic', 'Thermal', 'Explosive', 'Em'):

eos/effects/decreasetargetspeed.py

@@ -1,8 +1,4 @@
-# decreaseTargetSpeed
-#
-# Used by:
-# Drones from group: Stasis Webifying Drone (3 of 3)
-# Modules from group: Stasis Web (19 of 19)
+# Not used by any item
 type = "active", "projected"
 def handler(fit, module, context):
     if "projected" not in context:

eos/effects/dohacking.py

@@ -1,7 +1,7 @@
 # doHacking
 #
 # Used by:
-# Modules from group: Data Miners (13 of 14)
+# Modules from group: Data Miners (15 of 16)
 # Module: QA Cross Protocol Analyzer
 type = "active"
 def handler(fit, module, context):

eos/effects/drawbackcpuoutput.py

@@ -1,7 +1,7 @@
 # drawbackCPUOutput
 #
 # Used by:
-# Modules from group: Rig Drones (64 of 64)
+# Modules from group: Rig Drones (58 of 64)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.boostItemAttr("cpuOutput", module.getModifiedItemAttr("drawback"))

eos/effects/dronearmordamagebonuseffect.py

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

eos/effects/dronedamagebonusonline.py

@@ -1,7 +1,7 @@
 # droneDamageBonusOnline
 #
 # Used by:
-# Modules from group: Drone Damage Modules (10 of 10)
+# Modules from group: Drone Damage Modules (11 of 11)
 type = "passive"
 def handler(fit, module, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),

eos/effects/dronedamagebonusrequringdrones.py

@@ -1,7 +1,4 @@
-# droneDamageBonusRequringDrones
-#
-# Used by:
-# Skill: Drone Interfacing
+# Not used by any item
 type = "passive"
 def handler(fit, skill, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),

eos/effects/dronedmgbonus.py

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

eos/effects/dronedurabilityarmorhpbonus.py

@@ -1,7 +1,7 @@
 # droneDurabilityArmorHPBonus
 #
 # Used by:
-# Modules named like: Drone Durability Enhancer (8 of 8)
+# Modules named like: Drone Durability Enhancer (6 of 8)
 type = "passive"
 def handler(fit, module, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),

eos/effects/dronedurabilityhpbonus.py

@@ -1,8 +1,7 @@
 # droneDurabilityHPBonus
 #
 # Used by:
-# Modules named like: Drone Durability Enhancer (8 of 8)
-# Skill: Drone Durability
+# Modules named like: Drone Durability Enhancer (6 of 8)
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1

eos/effects/dronedurabilityshieldcapbonus.py

@@ -1,7 +1,7 @@
 # droneDurabilityShieldCapBonus
 #
 # Used by:
-# Modules named like: Drone Durability Enhancer (8 of 8)
+# Modules named like: Drone Durability Enhancer (6 of 8)
 type = "passive"
 def handler(fit, module, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),

eos/effects/dronehullrepairbonuseffect.py

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

eos/effects/dronemaxrangebonus.py

@@ -1,8 +1,7 @@
 # droneMaxRangeBonus
 #
 # Used by:
-# Modules named like: Drone Scope Chip (8 of 8)
-# Skill: Drone Sharpshooting
+# Modules named like: Drone Scope Chip (6 of 8)
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1

eos/effects/dronemaxvelocitybonus.py

@@ -1,8 +1,7 @@
 # droneMaxVelocityBonus
 #
 # Used by:
-# Modules named like: Drone Speed Augmentor (8 of 8)
-# Skill: Drone Navigation
+# Modules named like: Drone Speed Augmentor (6 of 8)
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1

eos/effects/droneshieldbonusbonuseffect.py

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

eos/effects/dronetrackingcomputerbonus.py

@@ -1,7 +1,7 @@
 # droneTrackingComputerBonus
 #
 # Used by:
-# Modules from group: Drone Tracking Modules (8 of 8)
+# Modules from group: Drone Tracking Modules (10 of 10)
 type = "active"
 def handler(fit, module, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),

eos/effects/dronetrackingenhancerbonus.py

@@ -1,7 +1,7 @@
 # droneTrackingEnhancerBonus
 #
 # Used by:
-# Modules from group: Drone Tracking Enhancer (9 of 9)
+# Modules from group: Drone Tracking Enhancer (10 of 10)
 type = "passive"
 def handler(fit, module, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),

eos/effects/ecmburst.py

@@ -1,7 +1,7 @@
 # ecmBurst
 #
 # Used by:
-# Modules from group: ECM Burst (7 of 7)
+# Modules from group: Burst Jammer (11 of 11)
 type = "active"
 def handler(fit, module, context):
     pass

eos/effects/ecmburstjammer.py

@@ -0,0 +1,5 @@
+# Used by:
+# Modules from group: Burst Jammer (11 of 11)
+type = "active"
+def handler(fit, module, context):
+    pass

eos/effects/elitebonusblackopsecmburstgravandladarandmagnetoandradar.py

@@ -6,5 +6,5 @@ type = "passive"
 def handler(fit, ship, context):
     sensorTypes = ("Gravimetric", "Ladar", "Magnetometric", "Radar")
     for type in sensorTypes:
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM Burst", "scan{0}StrengthBonus".format(type),
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Jammer", "scan{0}StrengthBonus".format(type),
                                       ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops")

eos/effects/elitebonuscommanddestroyerarmored1.py

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

eos/effects/elitebonuscommanddestroyerinfo1.py

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

eos/effects/elitebonuscommanddestroyerinfohidden1.py

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

eos/effects/elitebonuscommanddestroyermjfgspool2.py

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

eos/effects/elitebonuscommanddestroyermwdsigradius3.py

@@ -0,0 +1,4 @@
+# Not used by any item
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"), "signatureRadiusBonus", src.getModifiedItemAttr("eliteBonusCommandDestroyer3"), skill="Command Destroyers")

eos/effects/elitebonuscommanddestroyersiege1.py

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

eos/effects/elitebonuscommanddestroyerskirmish1.py

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