Bump stable

Tox fixes, and catching a few things lost in the merge.

.gitattributes

@@ -14,7 +14,7 @@
 *.py3 		text eol=crlf
 *.pyw 		text eol=crlf
 *.pyx  		text eol=crlf
-
+pyfa.py     text eol=lf
 
 # Denote all files that are truly binary and should not be modified.
 # Binary files

ISSUE_TEMPLATE.md

@@ -0,0 +1,32 @@
+# Submit a bug report bug report or feature request
+
+Here you can inform pyfa developers of potential bugs or suggest features / improvements to the project. Please check
+to make sure that the bug hasn't been reported or feature requested before submitting. If you have general questions
+about the project and want to reach out to the developers personally, please check out out our [Slack]
+(https://pyfainvite.azurewebsites.net/).
+
+---
+
+## Bug Report
+
+
+### Expected behavior:
+
+
+### Actual behavior:
+
+
+### Detailed steps to reproduce:
+
+
+### Fits involved in EFT format (Edit > To Clipboard > EFT):
+
+
+### Release or development git branch? Please note the release version or commit hash:
+
+
+### Operating system and version (eg: Windows 10, OS X 10.9, OS X 10.11, Ubuntu 16.10):
+
+
+### Other relevant information:
+

README.md

@@ -1,6 +1,6 @@
 # pyfa
 
-[![Join us on Slack!](https://pyfainvite.azurewebsites.net/badge.svg)](https://pyfainvite.azurewebsites.net/)
+[![Join us on Slack!](https://pyfainvite.azurewebsites.net/badge.svg)](https://pyfainvite.azurewebsites.net/) [![Build Status](https://travis-ci.org/pyfa-org/Pyfa.svg?branch=master)](https://travis-ci.org/pyfa-org/Pyfa)
 
 ![pyfa](https://cloud.githubusercontent.com/assets/3904767/10271512/af385ef2-6ade-11e5-8f67-52b8b1e4c797.PNG)
 

_development/Pyfa_CodeStyle.xml

@@ -0,0 +1,13 @@
+<code_scheme name="Pyfa">
+  <option name="LINE_SEPARATOR" value="&#xD;&#xA;" />
+  <option name="RIGHT_MARGIN" value="165" />
+  <Python>
+    <option name="NEW_LINE_AFTER_COLON" value="true" />
+    <option name="DICT_ALIGNMENT" value="2" />
+    <option name="DICT_NEW_LINE_AFTER_LEFT_BRACE" value="true" />
+    <option name="DICT_NEW_LINE_BEFORE_RIGHT_BRACE" value="true" />
+    <option name="USE_CONTINUATION_INDENT_FOR_ARGUMENTS" value="true" />
+    <option name="OPTIMIZE_IMPORTS_SORT_NAMES_IN_FROM_IMPORTS" value="true" />
+    <option name="OPTIMIZE_IMPORTS_JOIN_FROM_IMPORTS_WITH_SAME_SOURCE" value="true" />
+  </Python>
+</code_scheme>

_development/Pyfa_Inspections.xml

@@ -0,0 +1,54 @@
+<profile version="1.0">
+  <option name="myName" value="Pyfa" />
+  <inspection_tool class="IgnoreUnusedEntry" enabled="false" level="UNUSED ENTRY" enabled_by_default="false" />
+  <inspection_tool class="InconsistentLineSeparators" enabled="true" level="ERROR" enabled_by_default="true" />
+  <inspection_tool class="ProblematicWhitespace" enabled="true" level="WARNING" enabled_by_default="true" />
+  <inspection_tool class="PyBehaveInspection" enabled="true" level="WARNING" enabled_by_default="true" />
+  <inspection_tool class="PyClassicStyleClassInspection" enabled="true" level="WARNING" enabled_by_default="true" />
+  <inspection_tool class="PyCompatibilityInspection" enabled="true" level="WARNING" enabled_by_default="true">
+    <option name="ourVersions">
+      <value>
+        <list size="1">
+          <item index="0" class="java.lang.String" itemvalue="2.7" />
+        </list>
+      </value>
+    </option>
+  </inspection_tool>
+  <inspection_tool class="PyMissingTypeHintsInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+  <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
+    <option name="ignoredPackages">
+      <value>
+        <list size="1">
+          <item index="0" class="java.lang.String" itemvalue="wxPython" />
+        </list>
+      </value>
+    </option>
+  </inspection_tool>
+  <inspection_tool class="PyPep8Inspection" enabled="true" level="TYPO" enabled_by_default="true">
+    <option name="ignoredErrors">
+      <list>
+        <option value="E203" />
+        <option value="E127" />
+        <option value="E128" />
+        <option value="E126" />
+      </list>
+    </option>
+  </inspection_tool>
+  <inspection_tool class="PyPep8NamingInspection" enabled="true" level="TYPO" enabled_by_default="true">
+    <option name="ignoredErrors">
+      <list>
+        <option value="N802" />
+        <option value="N806" />
+        <option value="N803" />
+        <option value="N814" />
+      </list>
+    </option>
+  </inspection_tool>
+  <inspection_tool class="PyShadowingBuiltinsInspection" enabled="true" level="WARNING" enabled_by_default="true" />
+  <inspection_tool class="PyShadowingNamesInspection" enabled="true" level="WARNING" enabled_by_default="true" />
+  <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
+    <option name="processCode" value="true" />
+    <option name="processLiterals" value="true" />
+    <option name="processComments" value="true" />
+  </inspection_tool>
+</profile>

config.py

@@ -18,9 +18,9 @@ debug = False
 saveInRoot = False
 
 # Version data
-version = "1.26.1"
+version = "1.27.0"
-tag = "git"
+tag = "Stable"
-expansionName = "YC118.10"
+expansionName = "YC119.2"
 expansionVersion = "1.2"
 evemonMinVersion = "4081"
 

eos/__init__.py

@@ -1,8 +1,2 @@
-version = "0.2.3"
+version = "0.2.3"
-tag = "git"
+tag = "git"
-
-
-def test():
-    import tests.runTests
-    import unittest
-    unittest.main(defaultTest="discover", testLoader=tests.runTests.loader)

eos/db/__init__.py

@@ -20,10 +20,7 @@
 import threading
 
 from sqlalchemy import MetaData, create_engine
-from sqlalchemy.orm import sessionmaker, scoped_session
+from sqlalchemy.orm import sessionmaker
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy import pool
-
 
 import migration
 from eos import config
@@ -62,16 +59,22 @@ if saveddata_connectionstring is not None:
     saveddata_meta = MetaData()
     saveddata_meta.bind = saveddata_engine
     saveddata_session = sessionmaker(bind=saveddata_engine, autoflush=False, expire_on_commit=False)()
+else:
+    saveddata_meta = None
 
 # Lock controlling any changes introduced to session
 sd_lock = threading.Lock()
 
 # Import all the definitions for all our database stuff
-from eos.db.gamedata import *
+# noinspection PyPep8
-from eos.db.saveddata import *
+from eos.db.gamedata import alphaClones, attribute, category, effect, group, icon, item, marketGroup, metaData, metaGroup, queries, traits, unit
+# noinspection PyPep8
+from eos.db.saveddata import booster, cargo, character, crest, damagePattern, databaseRepair, drone, fighter, fit, implant, implantSet, loadDefaultDatabaseValues, miscData, module, override, price, queries, skill, targetResists, user
 
 # Import queries
+# noinspection PyPep8
 from eos.db.gamedata.queries import *
+# noinspection PyPep8
 from eos.db.saveddata.queries import *
 
 # If using in memory saveddata, you'll want to reflect it so the data structure is good.

eos/db/gamedata/alphaClones.py

@@ -21,18 +21,22 @@ from sqlalchemy import Column, String, Integer, Table, ForeignKey
 from sqlalchemy.orm import relation, mapper, synonym
 
 from eos.db import gamedata_meta
-from eos.types import AlphaClone, AlphaCloneSkill
+from eos.gamedata import AlphaClone, AlphaCloneSkill
 
-alphaclones_table = Table("alphaClones", gamedata_meta,
+alphaclones_table = Table(
-                         Column("alphaCloneID", Integer, primary_key=True),
+        "alphaClones",
-                         Column("alphaCloneName", String),
+        gamedata_meta,
-                        )
+        Column("alphaCloneID", Integer, primary_key=True),
+        Column("alphaCloneName", String),
+)
 
-alphacloneskskills_table = Table("alphaCloneSkills", gamedata_meta,
+alphacloneskskills_table = Table(
-                         Column("alphaCloneID", Integer, ForeignKey("alphaClones.alphaCloneID"), primary_key=True),
+        "alphaCloneSkills",
-                         Column("typeID", Integer, primary_key=True),
+        gamedata_meta,
-                         Column("level", Integer),
+        Column("alphaCloneID", Integer, ForeignKey("alphaClones.alphaCloneID"), primary_key=True),
-                         )
+        Column("typeID", Integer, primary_key=True),
+        Column("level", Integer),
+)
 
 mapper(AlphaClone, alphaclones_table,
        properties={

eos/db/gamedata/attribute.py

@@ -22,7 +22,7 @@ from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.orm import relation, mapper, synonym, deferred
 
 from eos.db import gamedata_meta
-from eos.types import Attribute, Icon, AttributeInfo, Unit
+from eos.gamedata import Attribute, AttributeInfo, Unit, Icon
 
 typeattributes_table = Table("dgmtypeattribs", gamedata_meta,
                              Column("value", Float),

eos/db/gamedata/category.py

@@ -21,7 +21,7 @@ from sqlalchemy import Column, String, Integer, ForeignKey, Boolean, Table
 from sqlalchemy.orm import relation, mapper, synonym, deferred
 
 from eos.db import gamedata_meta
-from eos.types import Category, Icon
+from eos.gamedata import Category, Icon
 
 categories_table = Table("invcategories", gamedata_meta,
                          Column("categoryID", Integer, primary_key=True),

eos/db/gamedata/effect.py

@@ -22,7 +22,7 @@ from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.orm import mapper, synonym, relation, deferred
 
 from eos.db import gamedata_meta
-from eos.types import Effect, EffectInfo
+from eos.gamedata import Effect, EffectInfo
 
 typeeffects_table = Table("dgmtypeeffects", gamedata_meta,
                           Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True, index=True),

eos/db/gamedata/group.py

@@ -21,7 +21,7 @@ from sqlalchemy import Column, String, Integer, Boolean, ForeignKey, Table
 from sqlalchemy.orm import relation, mapper, synonym, deferred
 
 from eos.db import gamedata_meta
-from eos.types import Group, Icon, Category
+from eos.gamedata import Category, Group, Icon
 
 groups_table = Table("invgroups", gamedata_meta,
                      Column("groupID", Integer, primary_key=True),

eos/db/gamedata/icon.py

@@ -21,7 +21,7 @@ from sqlalchemy import Column, String, Integer, Table
 from sqlalchemy.orm import mapper, synonym, deferred
 
 from eos.db import gamedata_meta
-from eos.types import Icon
+from eos.gamedata import Icon
 
 icons_table = Table("icons", gamedata_meta,
                     Column("iconID", Integer, primary_key=True),

eos/db/gamedata/item.py

@@ -23,7 +23,7 @@ from sqlalchemy.orm import relation, mapper, synonym, deferred
 from sqlalchemy.orm.collections import attribute_mapped_collection
 
 from eos.db import gamedata_meta
-from eos.types import Icon, Attribute, Item, Effect, MetaType, Group, Traits
+from eos.gamedata import Attribute, Effect, Group, Icon, Item, MetaType, Traits
 
 items_table = Table("invtypes", gamedata_meta,
                     Column("typeID", Integer, primary_key=True),
@@ -39,8 +39,8 @@ items_table = Table("invtypes", gamedata_meta,
                     Column("iconID", Integer, ForeignKey("icons.iconID")),
                     Column("groupID", Integer, ForeignKey("invgroups.groupID"), index=True))
 
-from .metaGroup import metatypes_table # noqa
+from .metaGroup import metatypes_table  # noqa
-from .traits import traits_table # noqa
+from .traits import traits_table  # noqa
 
 mapper(Item, items_table,
        properties={"group": relation(Group, backref="items"),

eos/db/gamedata/marketGroup.py

@@ -21,7 +21,7 @@ from sqlalchemy import Column, String, Integer, Boolean, ForeignKey, Table
 from sqlalchemy.orm import relation, mapper, synonym, deferred
 
 from eos.db import gamedata_meta
-from eos.types import Item, MarketGroup, Icon
+from eos.gamedata import Icon, Item, MarketGroup
 
 marketgroups_table = Table("invmarketgroups", gamedata_meta,
                            Column("marketGroupID", Integer, primary_key=True),

eos/db/gamedata/metaData.py

@@ -1,30 +1,30 @@
-# ===============================================================================
+# ===============================================================================
-# Copyright (C) 2010 Diego Duclos
+# Copyright (C) 2010 Diego Duclos
-#
+#
-# This file is part of eos.
+# This file is part of eos.
-#
+#
-# eos is free software: you can redistribute it and/or modify
+# 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
+# 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
+# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
+# (at your option) any later version.
-#
+#
-# eos is distributed in the hope that it will be useful,
+# eos is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
+# GNU Lesser General Public License for more details.
-#
+#
-# You should have received a copy of the GNU Lesser General Public License
+# You should have received a copy of the GNU Lesser General Public License
-# along with eos.  If not, see <http://www.gnu.org/licenses/>.
+# along with eos.  If not, see <http://www.gnu.org/licenses/>.
-# ===============================================================================
+# ===============================================================================
-
+
-from sqlalchemy import Column, Table, String
+from sqlalchemy import Column, Table, String
-from sqlalchemy.orm import mapper
+from sqlalchemy.orm import mapper
-
+
-from eos.db import gamedata_meta
+from eos.db import gamedata_meta
-from eos.types import MetaData
+from eos.gamedata import MetaData
-
+
-metadata_table = Table("metadata", gamedata_meta,
+metadata_table = Table("metadata", gamedata_meta,
-                       Column("field_name", String, primary_key=True),
+                       Column("field_name", String, primary_key=True),
-                       Column("field_value", String))
+                       Column("field_value", String))
-
+
-mapper(MetaData, metadata_table)
+mapper(MetaData, metadata_table)

eos/db/gamedata/metaGroup.py

@@ -23,7 +23,7 @@ from sqlalchemy.orm import relation, mapper, synonym
 
 from eos.db import gamedata_meta
 from eos.db.gamedata.item import items_table
-from eos.types import MetaGroup, Item, MetaType
+from eos.gamedata import Item, MetaGroup, MetaType
 
 metagroups_table = Table("invmetagroups", gamedata_meta,
                          Column("metaGroupID", Integer, primary_key=True),

eos/db/gamedata/queries.py

@@ -21,13 +21,10 @@ from sqlalchemy.orm import join, exc
 from sqlalchemy.sql import and_, or_, select
 
 import eos.config
-# TODO: Unsure which item the code below needs :(
-# from eos.gamedata import Item
-from eos.gamedata import Attribute
 from eos.db import gamedata_session
 from eos.db.gamedata.metaGroup import metatypes_table, items_table
 from eos.db.util import processEager, processWhere
-from eos.types import Item, Category, Group, MarketGroup, AttributeInfo, MetaData, MetaGroup, AlphaClone
+from eos.gamedata import AlphaClone, Attribute, Category, Group, Item, MarketGroup, MetaGroup, AttributeInfo, MetaData
 
 configVal = getattr(eos.config, "gamedataCache", None)
 if configVal is True:

eos/db/gamedata/traits.py

@@ -2,7 +2,7 @@ from sqlalchemy import Column, Table, Integer, String, ForeignKey
 from sqlalchemy.orm import mapper
 
 from eos.db import gamedata_meta
-from eos.types import Traits
+from eos.gamedata import Traits
 
 traits_table = Table("invtraits", gamedata_meta,
                      Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True),

eos/db/gamedata/unit.py

@@ -21,7 +21,7 @@ from sqlalchemy import Column, Table, Integer, String
 from sqlalchemy.orm import mapper, synonym
 
 from eos.db import gamedata_meta
-from eos.types import Unit
+from eos.gamedata import Unit
 
 groups_table = Table("dgmunits", gamedata_meta,
                      Column("unitID", Integer, primary_key=True),

eos/db/migrations/upgrade15.py

@@ -4,8 +4,6 @@ Migration 15
 - Delete projected modules on citadels
 """
 
-import sqlalchemy
-
 
 def upgrade(saveddata_engine):
     sql = """

eos/db/migrations/upgrade17.py

@@ -4,8 +4,6 @@ Migration 17
 - Moves all fleet boosters to the new schema
 """
 
-import sqlalchemy
-
 
 def upgrade(saveddata_engine):
     from eos.db import saveddata_session

eos/db/migrations/upgrade19.py

@@ -4,8 +4,6 @@ Migration 19
 - Deletes broken references to fits from the commandFits table (see GH issue #844)
 """
 
-import sqlalchemy
-
 
 def upgrade(saveddata_engine):
     from eos.db import saveddata_session

eos/db/migrations/upgrade21.py

@@ -0,0 +1,10 @@
+"""
+Migration 21
+
+- Fixes discrepancy in drone table where we may have an amount active that is not equal to the amount in the stack
+  (we don't support activating only 2/5 drones). See GH issue #728
+"""
+
+
+def upgrade(saveddata_engine):
+    saveddata_engine.execute("UPDATE drones SET amountActive = amount where amountActive > 0 AND amountActive <> amount;")

eos/db/saveddata/booster.py

@@ -22,7 +22,7 @@ from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.orm import mapper, relation
 
 from eos.db import saveddata_meta
-from eos.types import Booster
+from eos.saveddata.booster import Booster
 
 boosters_table = Table("boosters", saveddata_meta,
                        Column("ID", Integer, primary_key=True),

eos/db/saveddata/cargo.py

@@ -21,7 +21,7 @@ from sqlalchemy import Table, Column, Integer, ForeignKey
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
-from eos.types import Cargo
+from eos.saveddata.cargo import Cargo
 
 cargo_table = Table("cargo", saveddata_meta,
                     Column("ID", Integer, primary_key=True),

eos/db/saveddata/character.py

@@ -23,7 +23,9 @@ from sqlalchemy.orm import relation, mapper
 from eos.db import saveddata_meta
 from eos.db.saveddata.implant import charImplants_table
 from eos.effectHandlerHelpers import HandledImplantBoosterList
-from eos.types import Character, User, Skill, Implant
+from eos.saveddata.implant import Implant
+from eos.saveddata.user import User
+from eos.saveddata.character import Character, Skill
 
 characters_table = Table("characters", saveddata_meta,
                          Column("ID", Integer, primary_key=True),

eos/db/saveddata/crest.py

@@ -21,7 +21,7 @@ from sqlalchemy import Table, Column, Integer, String
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
-from eos.types import CrestChar
+from eos.saveddata.crestchar import CrestChar
 
 crest_table = Table("crest", saveddata_meta,
                     Column("ID", Integer, primary_key=True),

eos/db/saveddata/damagePattern.py

@@ -21,7 +21,7 @@ from sqlalchemy import Table, Column, Integer, ForeignKey, String
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
-from eos.types import DamagePattern
+from eos.saveddata.damagePattern import DamagePattern
 
 damagePatterns_table = Table("damagePatterns", saveddata_meta,
                              Column("ID", Integer, primary_key=True),

eos/db/saveddata/databaseRepair.py

@@ -17,13 +17,13 @@
 # along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
 # ===============================================================================
 
-import sqlalchemy
+from sqlalchemy.exc import DatabaseError
 import logging
 
 logger = logging.getLogger(__name__)
 
 
-class DatabaseCleanup:
+class DatabaseCleanup(object):
     def __init__(self):
         pass
 
@@ -32,8 +32,8 @@ class DatabaseCleanup:
         try:
             results = saveddata_engine.execute(query)
             return results
-        except sqlalchemy.exc.DatabaseError:
+        except DatabaseError:
-            logger.error("Failed to connect to database or error executing query:\n%s",query)
+            logger.error("Failed to connect to database or error executing query:\n%s", query)
             return None
 
     @staticmethod
@@ -85,8 +85,8 @@ class DatabaseCleanup:
                 logger.error("More than one uniform damage pattern found.")
             else:
                 uniform_damage_pattern_id = rows[0]['ID']
-                update_query = "UPDATE 'fits' SET 'damagePatternID' = " + str(uniform_damage_pattern_id) + \
+                update_query = "UPDATE 'fits' SET 'damagePatternID' = {} " \
-                               " WHERE damagePatternID NOT IN (SELECT ID FROM damagePatterns) OR damagePatternID IS NULL"
+                               "WHERE damagePatternID NOT IN (SELECT ID FROM damagePatterns) OR damagePatternID IS NULL".format(uniform_damage_pattern_id)
                 update_results = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, update_query)
                 logger.error("Database corruption found. Cleaning up %d records.", update_results.rowcount)
 
@@ -118,7 +118,7 @@ class DatabaseCleanup:
                 logger.error("More than one 'All 5' character found.")
             else:
                 all5_id = rows[0]['ID']
-                update_query = "UPDATE 'fits' SET 'characterID' = " + str(all5_id) +  \
+                update_query = "UPDATE 'fits' SET 'characterID' = " + str(all5_id) + \
                                " WHERE characterID not in (select ID from characters) OR characterID IS NULL"
                 update_results = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, update_query)
                 logger.error("Database corruption found. Cleaning up %d records.", update_results.rowcount)
@@ -160,3 +160,80 @@ class DatabaseCleanup:
             query = "DELETE FROM targetResists WHERE name IS NULL OR name = ''"
             delete = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
             logger.error("Database corruption found. Cleaning up %d records.", delete.rowcount)
+
+    @staticmethod
+    def OrphanedFitIDItemID(saveddata_engine):
+        # Orphaned items that are missing the fit ID or item ID.
+        # See issue #954
+        for table in ['drones', 'cargo', 'fighters']:
+            logger.debug("Running database cleanup for orphaned %s items.", table)
+            query = "SELECT COUNT(*) AS num FROM {} WHERE itemID IS NULL OR itemID = '' or itemID = '0' or fitID IS NULL OR fitID = '' or fitID = '0'".format(
+                table)
+            results = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
+
+            if results is None:
+                return
+
+            row = results.first()
+
+            if row and row['num']:
+                query = "DELETE FROM {} WHERE itemID IS NULL OR itemID = '' or itemID = '0' or fitID IS NULL OR fitID = '' or fitID = '0'".format(
+                    table)
+                delete = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
+                logger.error("Database corruption found. Cleaning up %d records.", delete.rowcount)
+
+        for table in ['modules']:
+            logger.debug("Running database cleanup for orphaned %s items.", table)
+            query = "SELECT COUNT(*) AS num FROM {} WHERE itemID = '0' or fitID IS NULL OR fitID = '' or fitID = '0'".format(
+                table)
+            results = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
+
+            if results is None:
+                return
+
+            row = results.first()
+
+            if row and row['num']:
+                query = "DELETE FROM {} WHERE itemID = '0' or fitID IS NULL OR fitID = '' or fitID = '0'".format(table)
+                delete = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
+                logger.error("Database corruption found. Cleaning up %d records.", delete.rowcount)
+
+    @staticmethod
+    def NullDamageTargetPatternValues(saveddata_engine):
+        # Find patterns that have null values
+        # See issue #954
+        for profileType in ['damagePatterns', 'targetResists']:
+            for damageType in ['em', 'thermal', 'kinetic', 'explosive']:
+                logger.debug("Running database cleanup for null %s values. (%s)", profileType, damageType)
+                query = "SELECT COUNT(*) AS num FROM {0} WHERE {1}Amount IS NULL OR {1}Amount = ''".format(profileType,
+                                                                                                           damageType)
+                results = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
+
+                if results is None:
+                    return
+
+                row = results.first()
+
+                if row and row['num']:
+                    query = "UPDATE '{0}' SET '{1}Amount' = '0' WHERE {1}Amount IS NULL OR Amount = ''".format(profileType,
+                                                                                                               damageType)
+                    delete = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
+                    logger.error("Database corruption found. Cleaning up %d records.", delete.rowcount)
+
+    @staticmethod
+    def DuplicateSelectedAmmoName(saveddata_engine):
+        # Orphaned items that are missing the fit ID or item ID.
+        # See issue #954
+        logger.debug("Running database cleanup for duplicated selected ammo profiles.")
+        query = "SELECT COUNT(*) AS num FROM damagePatterns WHERE name = 'Selected Ammo'"
+        results = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
+
+        if results is None:
+            return
+
+        row = results.first()
+
+        if row and row['num'] > 1:
+            query = "DELETE FROM damagePatterns WHERE name = 'Selected Ammo'"
+            delete = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query)
+            logger.error("Database corruption found. Cleaning up %d records.", delete.rowcount)

eos/db/saveddata/drone.py

@@ -21,7 +21,7 @@ from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
-from eos.types import Drone
+from eos.saveddata.drone import Drone
 
 drones_table = Table("drones", saveddata_meta,
                      Column("groupID", Integer, primary_key=True),

eos/db/saveddata/fighter.py

@@ -21,8 +21,9 @@ from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean
 from sqlalchemy.orm import mapper, relation
 
 from eos.db import saveddata_meta
-from eos.types import Fighter, Fit
+from eos.saveddata.fighterAbility import FighterAbility
-from eos.types import FighterAbility
+from eos.saveddata.fighter import Fighter
+from eos.saveddata.fit import Fit
 
 fighters_table = Table("fighters", saveddata_meta,
                        Column("groupID", Integer, primary_key=True),

eos/db/saveddata/fit.py

@@ -32,8 +32,17 @@ from eos.db.saveddata.implant import fitImplants_table
 from eos.db.saveddata.module import modules_table
 from eos.effectHandlerHelpers import HandledModuleList, HandledImplantBoosterList, HandledProjectedModList, \
     HandledDroneCargoList, HandledProjectedDroneList
-from eos.types import Fit as es_Fit, Module, User, Booster, Drone, Fighter, Cargo, Implant, Character, DamagePattern, \
+from eos.saveddata.implant import Implant
-    TargetResists, ImplantLocation
+from eos.saveddata.character import Character
+from eos.saveddata.user import User
+from eos.saveddata.fighter import Fighter
+from eos.saveddata.fit import Fit as es_Fit, ImplantLocation
+from eos.saveddata.drone import Drone
+from eos.saveddata.booster import Booster
+from eos.saveddata.module import Module
+from eos.saveddata.cargo import Cargo
+from eos.saveddata.damagePattern import DamagePattern
+from eos.saveddata.targetResists import TargetResists
 
 fits_table = Table("fits", saveddata_meta,
                    Column("ID", Integer, primary_key=True),
@@ -131,7 +140,7 @@ mapper(es_Fit, fits_table,
            "_Fit__modules": relation(
                Module,
                collection_class=HandledModuleList,
-               primaryjoin=and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == False), # noqa
+               primaryjoin=and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == False),  # noqa
                order_by=modules_table.c.position,
                cascade='all, delete, delete-orphan'),
            "_Fit__projectedModules": relation(
@@ -139,7 +148,7 @@ mapper(es_Fit, fits_table,
                collection_class=HandledProjectedModList,
                cascade='all, delete, delete-orphan',
                single_parent=True,
-               primaryjoin=and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == True)), # noqa
+               primaryjoin=and_(modules_table.c.fitID == fits_table.c.ID, modules_table.c.projected == True)),  # noqa
            "owner": relation(
                User,
                backref="fits"),
@@ -155,13 +164,13 @@ mapper(es_Fit, fits_table,
                collection_class=HandledDroneCargoList,
                cascade='all, delete, delete-orphan',
                single_parent=True,
-               primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == False)), # noqa
+               primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == False)),  # noqa
            "_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)), # noqa
+               primaryjoin=and_(fighters_table.c.fitID == fits_table.c.ID, fighters_table.c.projected == False)),  # noqa
            "_Fit__cargo": relation(
                Cargo,
                collection_class=HandledDroneCargoList,
@@ -173,13 +182,13 @@ mapper(es_Fit, fits_table,
                collection_class=HandledProjectedDroneList,
                cascade='all, delete, delete-orphan',
                single_parent=True,
-               primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == True)), # noqa
+               primaryjoin=and_(drones_table.c.fitID == fits_table.c.ID, drones_table.c.projected == True)),  # noqa
            "_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)), # noqa
+               primaryjoin=and_(fighters_table.c.fitID == fits_table.c.ID, fighters_table.c.projected == True)),  # noqa
            "_Fit__implants": relation(
                Implant,
                collection_class=HandledImplantBoosterList,

eos/db/saveddata/implant.py

@@ -21,7 +21,7 @@ from sqlalchemy import Table, Column, Integer, ForeignKey, Boolean
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
-from eos.types import Implant
+from eos.saveddata.implant import Implant
 
 implants_table = Table("implants", saveddata_meta,
                        Column("ID", Integer, primary_key=True),

eos/db/saveddata/implantSet.py

@@ -23,7 +23,8 @@ from sqlalchemy.orm import relation, mapper
 from eos.db import saveddata_meta
 from eos.db.saveddata.implant import implantsSetMap_table
 from eos.effectHandlerHelpers import HandledImplantBoosterList
-from eos.types import Implant, ImplantSet
+from eos.saveddata.implant import Implant
+from eos.saveddata.implantSet import ImplantSet
 
 implant_set_table = Table("implantSets", saveddata_meta,
                           Column("ID", Integer, primary_key=True),

eos/db/saveddata/loadDefaultDatabaseValues.py

@@ -26,7 +26,7 @@ class ImportError(Exception):
     pass
 
 
-class DefaultDatabaseValues():
+class DefaultDatabaseValues(object):
     def __init__(self):
         pass
 

eos/db/saveddata/miscData.py

@@ -21,7 +21,7 @@ from sqlalchemy import Column, Table, String
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
-from eos.types import MiscData
+from eos.saveddata.miscData import MiscData
 
 miscdata_table = Table("miscdata", saveddata_meta,
                        Column("fieldName", String, primary_key=True),

eos/db/saveddata/module.py

@@ -21,7 +21,8 @@ from sqlalchemy import Table, Column, Integer, ForeignKey, CheckConstraint, Bool
 from sqlalchemy.orm import relation, mapper
 
 from eos.db import saveddata_meta
-from eos.types import Module, Fit
+from eos.saveddata.module import Module
+from eos.saveddata.fit import Fit
 
 modules_table = Table("modules", saveddata_meta,
                       Column("ID", Integer, primary_key=True),

eos/db/saveddata/override.py

@@ -21,7 +21,7 @@ from sqlalchemy import Table, Column, Integer, Float
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
-from eos.types import Override
+from eos.saveddata.override import Override
 
 overrides_table = Table("overrides", saveddata_meta,
                         Column("itemID", Integer, primary_key=True, index=True),

eos/db/saveddata/price.py

@@ -21,7 +21,7 @@ from sqlalchemy import Table, Column, Float, Integer
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
-from eos.types import Price
+from eos.saveddata.price import Price
 
 prices_table = Table("prices", saveddata_meta,
                      Column("typeID", Integer, primary_key=True),

eos/db/saveddata/queries.py

@@ -22,11 +22,17 @@ from sqlalchemy.sql import and_
 from eos.db import saveddata_session, sd_lock
 from eos.db.saveddata.fit import projectedFits_table
 from eos.db.util import processEager, processWhere
-from eos.db import saveddata_session, sd_lock
+from eos.saveddata.price import Price
+from eos.saveddata.user import User
+from eos.saveddata.crestchar import CrestChar
+from eos.saveddata.damagePattern import DamagePattern
+from eos.saveddata.targetResists import TargetResists
+from eos.saveddata.character import Character
+from eos.saveddata.implantSet import ImplantSet
+from eos.saveddata.fit import Fit
+from eos.saveddata.miscData import MiscData
+from eos.saveddata.override import Override
 
-from eos.types import *
-from eos.db.saveddata.fit import projectedFits_table
-from sqlalchemy.sql import and_
 import eos.config
 
 configVal = getattr(eos.config, "saveddataCache", None)
@@ -62,6 +68,7 @@ if configVal is True:
             def checkAndReturn(*args, **kwargs):
                 useCache = kwargs.pop("useCache", True)
                 cacheKey = []
+                items = None
                 cacheKey.extend(args)
                 for keyword in keywords:
                     cacheKey.append(kwargs.get(keyword))

eos/db/saveddata/skill.py

@@ -21,7 +21,7 @@ from sqlalchemy import Table, Column, Integer, ForeignKey
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
-from eos.types import Skill
+from eos.saveddata.character import Skill
 
 skills_table = Table("characterSkills", saveddata_meta,
                      Column("characterID", ForeignKey("characters.ID"), primary_key=True, index=True),

eos/db/saveddata/targetResists.py

@@ -21,7 +21,7 @@ from sqlalchemy import Table, Column, Integer, Float, ForeignKey, String
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
-from eos.types import TargetResists
+from eos.saveddata.targetResists import TargetResists
 
 targetResists_table = Table("targetResists", saveddata_meta,
                             Column("ID", Integer, primary_key=True),

eos/db/saveddata/user.py

@@ -21,7 +21,7 @@ from sqlalchemy import Table, Column, Integer, String, Boolean
 from sqlalchemy.orm import mapper
 
 from eos.db import saveddata_meta
-from eos.types import User
+from eos.saveddata.user import User
 
 users_table = Table("users", saveddata_meta,
                     Column("ID", Integer, primary_key=True),

eos/effectHandlerHelpers.py

@@ -17,11 +17,8 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 # ===============================================================================
 
-# from sqlalchemy.orm.attributes import flag_modified
 import logging
 
-import eos.db
-
 logger = logging.getLogger(__name__)
 
 
@@ -139,10 +136,6 @@ class HandledModuleList(HandledList):
             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
         i = index
@@ -162,7 +155,7 @@ class HandledModuleList(HandledList):
     def toDummy(self, index):
         mod = self[index]
         if not mod.isEmpty:
-            dummy = eos.types.Module.buildEmpty(mod.slot)
+            dummy = mod.buildEmpty(mod.slot)
             dummy.position = index
             self[index] = dummy
 

eos/effects/adaptivearmorhardener.py

@@ -15,8 +15,6 @@ def handler(fit, module, context):
 
     # Skip if there is no damage pattern. Example: projected ships or fleet boosters
     if damagePattern:
-        # logger.debug("Damage Pattern: %f/%f/%f/%f", damagePattern.emAmount, damagePattern.thermalAmount, damagePattern.kineticAmount, damagePattern.explosiveAmount)
-        # logger.debug("Original Armor Resists: %f/%f/%f/%f", fit.ship.getModifiedItemAttr('armorEmDamageResonance'), fit.ship.getModifiedItemAttr('armorThermalDamageResonance'), fit.ship.getModifiedItemAttr('armorKineticDamageResonance'), fit.ship.getModifiedItemAttr('armorExplosiveDamageResonance'))
 
         # Populate a tuple with the damage profile modified by current armor resists.
         baseDamageTaken = (
@@ -50,7 +48,6 @@ def handler(fit, module, context):
                 (2, baseDamageTaken[2] * RAHResistance[2], RAHResistance[2]),
                 (1, baseDamageTaken[1] * RAHResistance[1], RAHResistance[1]),
             ]
-            # logger.debug("Damage taken this cycle: %f/%f/%f/%f", damagePattern_tuples[0][1], damagePattern_tuples[3][1], damagePattern_tuples[2][1], damagePattern_tuples[1][1])
 
             # Sort the tuple to drop the highest damage value to the bottom
             sortedDamagePattern_tuples = sorted(damagePattern_tuples, key=lambda damagePattern: damagePattern[1])

eos/effects/ammoinfluencecapneed.py

@@ -1,7 +1,7 @@
 # ammoInfluenceCapNeed
 #
 # Used by:
-# Items from category: Charge (465 of 899)
+# Items from category: Charge (465 of 912)
 # Charges from group: Frequency Crystal (185 of 185)
 # Charges from group: Hybrid Charge (209 of 209)
 type = "passive"

eos/effects/ammoinfluencerange.py

@@ -1,7 +1,7 @@
 # ammoInfluenceRange
 #
 # Used by:
-# Items from category: Charge (571 of 899)
+# Items from category: Charge (571 of 912)
 type = "passive"
 
 

eos/effects/ammospeedmultiplier.py

@@ -1,7 +1,7 @@
 # ammoSpeedMultiplier
 #
 # Used by:
-# Charges from group: Festival Charges (9 of 9)
+# Charges from group: Festival Charges (22 of 22)
 # Charges from group: Interdiction Probe (2 of 2)
 # Charges from group: Survey Probe (3 of 3)
 type = "passive"

eos/effects/armorhpmultiply.py

@@ -3,7 +3,6 @@
 # Used by:
 # Modules from group: Armor Coating (202 of 202)
 # Modules from group: Armor Plating Energized (187 of 187)
-# Modules named like: QA Multiship Module Players (4 of 4)
 type = "passive"
 
 

eos/effects/armorrepairamountbonussubcap.py

@@ -1,7 +1,7 @@
 # armorRepairAmountBonusSubcap
 #
 # Used by:
-# Implants named like: Grade Asklepian (15 of 16)
+# Implants named like: grade Asklepian (15 of 18)
 type = "passive"
 
 

eos/effects/chargebonuswarfarecharge.py

@@ -4,7 +4,8 @@
 # Items from market group: Ammunition & Charges > Command Burst Charges (15 of 15)
 type = "active"
 
+
 def handler(fit, module, context):
     for x in xrange(1, 4):
         value = module.getModifiedChargeAttr("warfareBuff{}Multiplier".format(x))
-        module.multiplyItemAttr("warfareBuff{}Value".format(x), value)
+        module.multiplyItemAttr("warfareBuff{}Value".format(x), value)

eos/effects/dohacking.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Modules from group: Data Miners (15 of 16)
-# Module: QA Cross Protocol Analyzer
 type = "active"
 
 

eos/effects/electronicattributemodifyonline.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Modules from group: Automated Targeting System (6 of 6)
-# Module: QA Damage Module
 type = "passive"
 
 

eos/effects/elitebonuscommanddestroyerinfohidden1.py

@@ -3,4 +3,7 @@ type = "passive"
 
 
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"), "commandBonusHidden", src.getModifiedItemAttr("eliteBonusCommandDestroyer1"), skill="Command Destroyers")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"),
+                                  "commandBonusHidden",
+                                  src.getModifiedItemAttr("eliteBonusCommandDestroyer1"),
+                                  skill="Command Destroyers")

eos/effects/elitebonuscommandshipinformationhiddencs3.py

@@ -1,5 +1,7 @@
 # Not used by any item
 type = "passive"
+
+
 def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command Specialist"),
                                   "commandBonusHidden", module.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships")

eos/effects/elitebonuslogisticremotearmorrepairoptimalfalloff1.py

@@ -3,6 +3,14 @@
 # Used by:
 # Ship: Rabisu
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "maxRange", src.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics Cruisers")
+                                  "falloffEffectiveness",
+                                  src.getModifiedItemAttr("eliteBonusLogistics1"),
+                                  skill="Logistics Cruisers")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
+                                  "maxRange",
+                                  src.getModifiedItemAttr("eliteBonusLogistics1"),
+                                  skill="Logistics Cruisers")

eos/effects/energydestabilizationnew.py

@@ -1,12 +1,11 @@
 # Not used by any item
-from eos.types import State
+from eos.saveddata.module import State
 
 type = "active", "projected"
 
 
 def handler(fit, src, context):
-    if "projected" in context and (
+    if "projected" in context and ((hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")):
-                (hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")):
         multiplier = src.amountActive if hasattr(src, "amountActive") else 1
         amount = src.getModifiedItemAttr("energyNeutralizerAmount")
         time = src.getModifiedItemAttr("duration")

eos/effects/energyneutralizerfalloff.py

@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules from group: Energy Neutralizer (51 of 51)
-from eos.types import State
+from eos.saveddata.module import State
 
 type = "active", "projected"
 

eos/effects/energyweapondamagemultiply.py

@@ -2,8 +2,6 @@
 #
 # Used by:
 # Modules from group: Heat Sink (18 of 18)
-# Modules named like: QA Multiship Module Players (4 of 4)
-# Module: QA Damage Module
 type = "passive"
 
 

eos/effects/entityenergyneutralizerfalloff.py

@@ -2,7 +2,7 @@
 #
 # Used by:
 # Drones from group: Energy Neutralizer Drone (3 of 3)
-from eos.types import State
+from eos.saveddata.module import State
 
 type = "active", "projected"
 

eos/effects/gunneryfalloffbonusonline.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Modules from group: Tracking Enhancer (10 of 10)
-# Module: QA Damage Module
 type = "passive"
 
 

eos/effects/gunnerymaxrangebonusonline.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Modules from group: Tracking Enhancer (10 of 10)
-# Module: QA Damage Module
 type = "passive"
 
 

eos/effects/gunnerytrackingspeedbonusonline.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Modules from group: Tracking Enhancer (10 of 10)
-# Module: QA Damage Module
 type = "passive"
 
 

eos/effects/hybridweapondamagemultiply.py

@@ -2,8 +2,6 @@
 #
 # Used by:
 # Modules from group: Magnetic Field Stabilizer (14 of 14)
-# Modules named like: QA Multiship Module Players (4 of 4)
-# Module: QA Damage Module
 type = "passive"
 
 

eos/effects/iceharvestingdroneoperationdurationbonus.py

@@ -4,6 +4,8 @@
 # Modules named like: Drone Mining Augmentor (8 of 8)
 # Skill: Ice Harvesting Drone Operation
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level if "skill" in context else 1
     fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting Drone Operation"), "duration", src.getModifiedItemAttr("rofBonus") * lvl)

eos/effects/miningforemanburstbonusics2.py

@@ -6,13 +6,13 @@ type = "passive"
 
 
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Multiplier",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Value",
                                   src.getModifiedItemAttr("shipBonusICS2"), skill="Industrial Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Multiplier",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Value",
                                   src.getModifiedItemAttr("shipBonusICS2"), skill="Industrial Command Ships")
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "buffDuration",
                                   src.getModifiedItemAttr("shipBonusICS2"), skill="Industrial Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Multiplier",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Value",
                                   src.getModifiedItemAttr("shipBonusICS2"), skill="Industrial Command Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Multiplier",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Value",
                                   src.getModifiedItemAttr("shipBonusICS2"), skill="Industrial Command Ships")

eos/effects/miningforemanstrengthbonus.py

@@ -3,9 +3,11 @@
 # Used by:
 # Skill: Mining Director
 type = "passive"
+
+
 def handler(fit, src, context):
     lvl = src.level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)

eos/effects/missiledmgbonus.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Modules from group: Ballistic Control system (17 of 17)
-# Modules named like: QA Multiship Module Players (4 of 4)
 type = "passive"
 
 

eos/effects/modifyactivearmorresonancepostpercent.py

@@ -1,13 +1,13 @@
-# modifyActiveArmorResonancePostPercent
+# modifyActiveArmorResonancePostPercent
-#
+#
-# Used by:
+# Used by:
-# Modules from group: Armor Hardener (156 of 156)
+# Modules from group: Armor Hardener (156 of 156)
-# Modules from group: Flex Armor Hardener (4 of 4)
+# Modules from group: Flex Armor Hardener (4 of 4)
-type = "active"
+type = "active"
-
+
-
+
-def handler(fit, module, context):
+def handler(fit, module, context):
-    for damageType in ("kinetic", "thermal", "explosive", "em"):
+    for damageType in ("kinetic", "thermal", "explosive", "em"):
-        fit.ship.boostItemAttr("armor%sDamageResonance" % damageType.capitalize(),
+        fit.ship.boostItemAttr("armor%sDamageResonance" % damageType.capitalize(),
-                               module.getModifiedItemAttr("%sDamageResistanceBonus" % damageType),
+                               module.getModifiedItemAttr("%sDamageResistanceBonus" % damageType),
-                               stackingPenalties=True)
+                               stackingPenalties=True)

eos/effects/modifyactiveshieldresonancepostpercent.py

@@ -1,13 +1,13 @@
-# modifyActiveShieldResonancePostPercent
+# modifyActiveShieldResonancePostPercent
-#
+#
-# Used by:
+# Used by:
-# Modules from group: Flex Shield Hardener (5 of 5)
+# Modules from group: Flex Shield Hardener (5 of 5)
-# Modules from group: Shield Hardener (97 of 97)
+# Modules from group: Shield Hardener (97 of 97)
-type = "active"
+type = "active"
-
+
-
+
-def handler(fit, module, context):
+def handler(fit, module, context):
-    for damageType in ("kinetic", "thermal", "explosive", "em"):
+    for damageType in ("kinetic", "thermal", "explosive", "em"):
-        fit.ship.boostItemAttr("shield" + damageType.capitalize() + "DamageResonance",
+        fit.ship.boostItemAttr("shield" + damageType.capitalize() + "DamageResonance",
-                               module.getModifiedItemAttr(damageType + "DamageResistanceBonus"),
+                               module.getModifiedItemAttr(damageType + "DamageResistanceBonus"),
-                               stackingPenalties=True)
+                               stackingPenalties=True)

eos/effects/modifyshieldrechargerate.py

@@ -6,7 +6,6 @@
 # Modules from group: Reactor Control Unit (22 of 22)
 # Modules from group: Shield Recharger (4 of 4)
 # Modules named like: Flux Coil (12 of 12)
-# Modules named like: QA Multiship Module Players (4 of 4)
 type = "passive"
 
 

eos/effects/modulebonuswarfarelinkarmor.py

@@ -13,6 +13,8 @@ which warfareBuffID to run (shouldn't need this right now, but better safe than
 '''
 
 type = "active", "gang"
+
+
 def handler(fit, module, context, **kwargs):
     for x in xrange(1, 5):
         if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
@@ -21,5 +23,3 @@ def handler(fit, module, context, **kwargs):
 
             if id:
                 fit.addCommandBonus(id, value, module, kwargs['effect'])
-
-

eos/effects/modulebonuswarfarelinkinfo.py

@@ -4,6 +4,8 @@
 # Variations of module: Information Command Burst I (2 of 2)
 
 type = "active", "gang"
+
+
 def handler(fit, module, context, **kwargs):
     for x in xrange(1, 5):
         if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
@@ -11,4 +13,4 @@ def handler(fit, module, context, **kwargs):
             id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
 
             if id:
-                fit.addCommandBonus(id, value, module, kwargs['effect'])
+                fit.addCommandBonus(id, value, module, kwargs['effect'])

eos/effects/modulebonuswarfarelinkmining.py

@@ -4,6 +4,8 @@
 # Variations of module: Mining Foreman Burst I (2 of 2)
 
 type = "active", "gang"
+
+
 def handler(fit, module, context, **kwargs):
     for x in xrange(1, 5):
         if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
@@ -11,4 +13,4 @@ def handler(fit, module, context, **kwargs):
             id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
 
             if id:
-                fit.addCommandBonus(id, value, module, kwargs['effect'])
+                fit.addCommandBonus(id, value, module, kwargs['effect'])

eos/effects/modulebonuswarfarelinkshield.py

@@ -4,6 +4,8 @@
 # Variations of module: Shield Command Burst I (2 of 2)
 
 type = "active", "gang"
+
+
 def handler(fit, module, context, **kwargs):
     for x in xrange(1, 5):
         if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
@@ -11,4 +13,4 @@ def handler(fit, module, context, **kwargs):
             id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
 
             if id:
-                fit.addCommandBonus(id, value, module, kwargs['effect'])
+                fit.addCommandBonus(id, value, module, kwargs['effect'])

eos/effects/modulebonuswarfarelinkskirmish.py

@@ -4,6 +4,8 @@
 # Variations of module: Skirmish Command Burst I (2 of 2)
 
 type = "active", "gang"
+
+
 def handler(fit, module, context, **kwargs):
     for x in xrange(1, 5):
         if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
@@ -11,4 +13,4 @@ def handler(fit, module, context, **kwargs):
             id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
 
             if id:
-                fit.addCommandBonus(id, value, module, kwargs['effect'])
+                fit.addCommandBonus(id, value, module, kwargs['effect'])

eos/effects/moduletitaneffectgenerator.py

@@ -3,6 +3,8 @@
 # Used by:
 # Modules from group: Titan Phenomena Generator (4 of 4)
 type = "active", "gang"
+
+
 def handler(fit, module, context, **kwargs):
     for x in xrange(1, 5):
         if module.getModifiedItemAttr("warfareBuff{}ID".format(x)):
@@ -11,7 +13,3 @@ def handler(fit, module, context, **kwargs):
 
             if id:
                 fit.addCommandBonus(id, value, module, kwargs['effect'])
-
-
-
-

eos/effects/npcentityweapondisruptor.py

@@ -1,4 +1,4 @@
-# remoteWeaponDisruptEntity
+# npcEntityWeaponDisruptor
 #
 # Used by:
 # Drones named like: TD (3 of 3)

eos/effects/overloadselfdurationbonus.py

@@ -11,8 +11,6 @@
 # Modules from group: Smart Bomb (118 of 118)
 # Modules from group: Warp Disrupt Field Generator (7 of 7)
 # Modules named like: Ancillary Remote (8 of 8)
-# Module: QA Remote Armor Repair System - 5 Players
-# Module: QA Shield Transporter - 5 Players
 # Module: Reactive Armor Hardener
 # Module: Target Spectrum Breaker
 type = "overheat"

eos/effects/projectileweapondamagemultiply.py

@@ -2,8 +2,6 @@
 #
 # Used by:
 # Modules from group: Gyrostabilizer (13 of 13)
-# Modules named like: QA Multiship Module Players (4 of 4)
-# Module: QA Damage Module
 type = "passive"
 
 

eos/effects/remotehullrepair.py

@@ -4,7 +4,8 @@ runTime = "late"
 
 
 def handler(fit, module, context):
-    if "projected" not in context: return
+    if "projected" not in context:
+        return
     bonus = module.getModifiedItemAttr("structureDamageAmount")
     duration = module.getModifiedItemAttr("duration") / 1000.0
     fit.extraAttributes.increase("hullRepair", bonus / duration)

eos/effects/rolebonusremotearmorrepairoptimalfalloff.py

@@ -3,6 +3,12 @@
 # Used by:
 # Ship: Rabisu
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "falloffEffectiveness", src.getModifiedItemAttr("roleBonusRepairRange"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "maxRange", src.getModifiedItemAttr("roleBonusRepairRange"))
+                                  "falloffEffectiveness",
+                                  src.getModifiedItemAttr("roleBonusRepairRange"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
+                                  "maxRange",
+                                  src.getModifiedItemAttr("roleBonusRepairRange"))

eos/effects/scanstrengthbonuspercentactivate.py

@@ -1,7 +1,4 @@
-# scanStrengthBonusPercentActivate
+# Not used by any item
-#
-# Used by:
-# Module: QA ECCM
 type = "active"
 
 

eos/effects/scanstrengthbonuspercentpassive.py

@@ -1,7 +1,7 @@
 # scanStrengthBonusPercentPassive
 #
 # Used by:
-# Implants named like: High grade (20 of 61)
+# Implants named like: High grade (20 of 66)
 type = "passive"
 
 

eos/effects/setbonusasklepian.py

@@ -1,8 +1,7 @@
 # setBonusAsklepian
 #
 # Used by:
-# Implants named like: Grade Asklepian (16 of 16)
+# Implants named like: grade Asklepian (18 of 18)
-# Implants named like: grade Asklepian Omega (2 of 2)
 runTime = "early"
 type = "passive"
 

eos/effects/shieldtransfer.py

@@ -1,7 +1,4 @@
-# shieldTransfer
+# Not used by any item
-#
-# Used by:
-# Module: QA Shield Transporter - 5 Players
 type = "projected", "active"
 
 

eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py

@@ -3,9 +3,21 @@
 # Used by:
 # Ship: Apostle
 type = "passive"
+
+
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"), "warfareBuff4Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"), "warfareBuff3Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
+                                              mod.item.requiresSkill("Information Command"),
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"), "warfareBuff1Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
+                                  "warfareBuff4Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"), "buffDuration", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or mod.item.requiresSkill("Information Command"), "warfareBuff2Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
+                                              mod.item.requiresSkill("Information Command"),
+                                  "warfareBuff3Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or
+                                              mod.item.requiresSkill("Information Command"),
+                                  "warfareBuff1Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or
+                                              mod.item.requiresSkill("Information Command"),
+                                  "buffDuration", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command") or
+                                              mod.item.requiresSkill("Information Command"),
+                                  "warfareBuff2Value", src.getModifiedItemAttr("shipBonusForceAuxiliaryA4"), skill="Amarr Carrier")

eos/effects/shipbonusrepairsystemsbonusatc2.py

@@ -1,10 +1,10 @@
-# shipBonusRepairSystemsBonusATC2
+# shipBonusRepairSystemsBonusATC2
-#
+#
-# Used by:
+# Used by:
-# Ship: Vangel
+# Ship: Vangel
-type = "passive"
+type = "passive"
-
+
-
+
-def handler(fit, ship, context):
+def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusATC2"))
+                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusATC2"))

eos/effects/shipenergyneutralizertransferamountbonusab.py

@@ -1,11 +1,11 @@
-# shipEnergyNeutralizerTransferAmountBonusAB
+# shipEnergyNeutralizerTransferAmountBonusAB
-#
+#
-# Used by:
+# Used by:
-# Ship: Bhaalgorn
+# Ship: Bhaalgorn
-type = "passive"
+type = "passive"
-
+
-
+
-def handler(fit, ship, context):
+def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
-                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("shipBonusAB"),
+                                  "energyNeutralizerAmount", ship.getModifiedItemAttr("shipBonusAB"),
-                                  skill="Amarr Battleship")
+                                  skill="Amarr Battleship")

eos/effects/shipmodesmallmissiledamagepostdiv.py

@@ -11,5 +11,5 @@ def handler(fit, module, context):
         fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
                                            "{}Damage".format(type),
                                            1 / module.getModifiedItemAttr("modeDamageBonusPostDiv"),
-                                           stackingPenalties = True,
+                                           stackingPenalties=True,
                                            penaltyGroup="postDiv")

eos/effects/shipmoduleguidancedisruptor.py

@@ -1,4 +1,4 @@
-# remoteGuidanceDisruptFalloff
+# shipModuleGuidanceDisruptor
 #
 # Used by:
 # Variations of module: Guidance Disruptor I (6 of 6)

eos/effects/shipmoduleremotetrackingcomputer.py

@@ -1,4 +1,4 @@
-# remoteTrackingAssistFalloff
+# shipModuleRemoteTrackingComputer
 #
 # Used by:
 # Modules from group: Remote Tracking Computer (8 of 8)

eos/effects/shipmoduletrackingdisruptor.py

@@ -1,4 +1,4 @@
-# remoteTrackingDisruptFalloff
+# shipModuleTrackingDisruptor
 #
 # Used by:
 # Variations of module: Tracking Disruptor I (6 of 6)

eos/effects/shipscanresolutionbonusonline.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Modules from group: Signal Amplifier (7 of 7)
-# Module: QA Damage Module
 type = "passive"
 
 

eos/effects/skillreactivearmorhardenercapneedbonus.py

@@ -1,13 +1,13 @@
-# skillReactiveArmorHardenerCapNeedBonus
+# skillReactiveArmorHardenerCapNeedBonus
-#
+#
-# Used by:
+# Used by:
-# Skill: Resistance Phasing
+# Skill: Resistance Phasing
-type = "passive"
+type = "passive"
-
+
-
+
-def handler(fit, src, context):
+def handler(fit, src, context):
-    lvl = src.level
+    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Resistance Shift Hardener", "capacitorNeed",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Resistance Shift Hardener", "capacitorNeed",
-                                  src.getModifiedItemAttr("capNeedBonus") * lvl)
+                                  src.getModifiedItemAttr("capNeedBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Resistance Phasing"), "capacitorNeed",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Resistance Phasing"), "capacitorNeed",
-                                  src.getModifiedItemAttr("capNeedBonus") * lvl)
+                                  src.getModifiedItemAttr("capNeedBonus") * lvl)

eos/effects/skillreactivearmorhardenerdurationbonus.py

@@ -1,13 +1,13 @@
-# skillReactiveArmorHardenerDurationBonus
+# skillReactiveArmorHardenerDurationBonus
-#
+#
-# Used by:
+# Used by:
-# Skill: Resistance Phasing
+# Skill: Resistance Phasing
-type = "passive"
+type = "passive"
-
+
-
+
-def handler(fit, src, context):
+def handler(fit, src, context):
-    lvl = src.level
+    lvl = src.level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Resistance Shift Hardener", "duration",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Resistance Shift Hardener", "duration",
-                                  src.getModifiedItemAttr("durationBonus") * lvl)
+                                  src.getModifiedItemAttr("durationBonus") * lvl)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Resistance Phasing"), "duration",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Resistance Phasing"), "duration",
-                                  src.getModifiedItemAttr("durationBonus") * lvl)
+                                  src.getModifiedItemAttr("durationBonus") * lvl)

eos/effects/standardmissilesskillboostmissilevelocitybonus.py

@@ -1,10 +0,0 @@
-# standardMissilesSkillBoostMissileVelocityBonus
-#
-# Used by:
-# Skill: Defender Missiles
-type = "passive"
-
-
-def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Defender Missiles"),
-                                    "maxVelocity", skill.getModifiedItemAttr("missileVelocityBonus") * skill.level)

eos/effects/structuralanalysiseffect.py

@@ -3,7 +3,6 @@
 # Used by:
 # Implants named like: Inherent Implants 'Noble' Repair Proficiency RP (6 of 6)
 # Modules named like: Auxiliary Nano Pump (8 of 8)
-# Modules named like: QA Multiship Module Players (4 of 4)
 # Implant: Imperial Navy Modified 'Noble' Implant
 type = "passive"