Do not penalize effects modifying structure resistance

Update .gitignore

.gitignore

@@ -12,3 +12,7 @@
 #Patch files
 *.patch
 #Personal
+/saveddata
+
+#Pyfa file
+pyfaFits.html

config.py

@@ -13,10 +13,10 @@ debug = False
 saveInRoot = False
 
 # Version data
-version = "1.1.17"
-tag = "Stable"
+version = "1.1.23"
+tag = "git"
 expansionName = "Rubicon"
-expansionVersion = "1.0"
+expansionVersion = "1.3"
 evemonMinVersion = "4081"
 
 pyfaPath = None
@@ -34,9 +34,10 @@ def defPaths():
     global saveInRoot
     # The main pyfa directory which contains run.py
     # Python 2.X uses ANSI by default, so we need to convert the character encoding
-    pyfaPath = getattr(configforced, "pyfaPath", None)
+    pyfaPath = getattr(configforced, "pyfaPath", pyfaPath)
     if pyfaPath is None:
-        pyfaPath = unicode(os.path.dirname(os.path.abspath(sys.modules['__main__'].__file__)), sys.getfilesystemencoding())
+        pyfaPath = unicode(os.path.dirname(os.path.realpath(os.path.abspath(
+            sys.modules['__main__'].__file__))), sys.getfilesystemencoding())
 
     # Where we store the saved fits etc, default is the current users home directory
     if saveInRoot is True:
@@ -46,7 +47,8 @@ def defPaths():
     else:
         savePath = getattr(configforced, "savePath", None)
         if savePath is None:
-            savePath = unicode(os.path.expanduser(os.path.join("~", ".pyfa")), sys.getfilesystemencoding())
+            savePath = unicode(os.path.expanduser(os.path.join("~", ".pyfa")),
+                               sys.getfilesystemencoding())
 
     # Redirect stderr to file if we're requested to do so
     stderrToFile = getattr(configforced, "stderrToFile", None)
@@ -62,7 +64,8 @@ def defPaths():
             os.mkdir(savePath)
         sys.stdout = open(os.path.join(savePath, "output_log.txt"), "w")
 
-    # Static EVE Data from the staticdata repository, should be in the staticdata directory in our pyfa directory
+    # Static EVE Data from the staticdata repository, should be in the staticdata
+    # directory in our pyfa directory
     staticPath = os.path.join(pyfaPath, "staticdata")
 
     # The database where we store all the fits etc

eos/db/__init__.py

@@ -66,7 +66,7 @@ from eos.db.saveddata.queries import getUser, getCharacter, getFit, getFitsWithS
                                      getCharacterList, getPrice, getDamagePatternList, getDamagePattern, \
                                      getFitList, getFleetList, getFleet, save, remove, commit, add, \
                                      getCharactersForUser, getMiscData, getSquadsIDsWithFitID, getWing, \
-                                     getSquad
+                                     getSquad, getBoosterFits
 
 #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/item.py

@@ -23,7 +23,7 @@ from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.orm.collections import attribute_mapped_collection
 
 from eos.db import gamedata_meta
-from eos.types import Icon, Attribute, Item, Effect, MetaType, Group
+from eos.types import Icon, Attribute, Item, Effect, MetaType, Group, Traits
 
 items_table = Table("invtypes", gamedata_meta,
                     Column("typeID", Integer, primary_key = True),
@@ -38,9 +38,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
+from .traits import traits_table
 
 mapper(Item, items_table,
        properties = {"group" : relation(Group, backref = "items"),
@@ -52,6 +51,11 @@ mapper(Item, items_table,
                                             uselist = False),
                      "ID" : synonym("typeID"),
                      "name" : synonym("typeName"),
-                     "description" : deferred(items_table.c.description)})
+                     "description" : deferred(items_table.c.description),
+                     "traits" : relation(Traits,
+                                            primaryjoin = traits_table.c.typeID == items_table.c.typeID,
+                                            order_by = traits_table.c.typeID,
+                                            uselist = True)
+                    })
 
 Item.category = association_proxy("group", "category")

eos/db/gamedata/queries.py

@@ -184,8 +184,6 @@ def getItemsByCategory(filter, where=None, eager=None):
 def searchItems(nameLike, where=None, join=None, eager=None):
     if not isinstance(nameLike, basestring):
         raise TypeError("Need string as argument")
-    # Prepare our string for request
-    nameLike = u"%{0}%".format(sqlizeString(nameLike))
 
     if join is None:
         join = tuple()
@@ -193,8 +191,11 @@ def searchItems(nameLike, where=None, join=None, eager=None):
     if not hasattr(join, "__iter__"):
         join = (join,)
 
-    filter = processWhere(Item.name.like(nameLike, escape="\\"), where)
-    items = gamedata_session.query(Item).options(*processEager(eager)).join(*join).filter(filter).all()
+    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))
+    items = items.limit(100).all()
     return items
 
 @cachedQuery(2, "where", "itemids")

eos/db/gamedata/traits.py

@@ -0,0 +1,22 @@
+
+from sqlalchemy import Column, Table, Integer, String, ForeignKey, and_, select
+from sqlalchemy.orm import mapper, column_property
+from eos.types import Item, Traits
+from eos.db import gamedata_meta
+
+traits_table = Table("invtraits", gamedata_meta,
+                     Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True),
+                     Column("skillID", Integer, ForeignKey("invtypes.typeID"), primary_key=True),
+                     Column("bonusText", String, primary_key=True))
+
+
+from .item import items_table
+
+mapper(Traits, traits_table,
+        properties = {"skillName" : column_property(
+                                             select([items_table.c.typeName],
+                                                and_(
+                                                    items_table.c.typeID == traits_table.c.skillID,
+                                                    traits_table.c.skillID != -1
+                                                )))
+        });

eos/db/migration.py

@@ -3,7 +3,7 @@ import sqlalchemy
 def update(saveddata_engine):
     checkPriceFailures(saveddata_engine)
     checkApiDefaultChar(saveddata_engine)
-
+    checkFitBooster(saveddata_engine)
 
 def checkPriceFailures(saveddata_engine):
     # Check if we have 'failed' column
@@ -39,3 +39,21 @@ def checkApiDefaultChar(saveddata_engine):
         except sqlalchemy.exc.DatabaseError:
             saveddata_engine.execute("ALTER TABLE characters ADD COLUMN defaultChar INTEGER;")
             saveddata_engine.execute("ALTER TABLE characters ADD COLUMN chars VARCHAR;")
+
+def checkFitBooster(saveddata_engine):
+    try:
+        saveddata_engine.execute("SELECT * FROM fits LIMIT 1")
+    # If table doesn't exist, it means we're doing everything from scratch
+    # and sqlalchemy will process everything as needed
+    except sqlalchemy.exc.DatabaseError:
+        pass
+    # If not, we're running on top of existing DB
+    else:
+        # Check that we have columns
+        try:
+            saveddata_engine.execute("SELECT booster FROM fits LIMIT 1")
+        # If we don't, create them
+        except sqlalchemy.exc.DatabaseError:
+            saveddata_engine.execute("ALTER TABLE fits ADD COLUMN booster BOOLEAN;")
+        # Set NULL data to 0 (needed in case of downgrade, see GH issue #62
+        saveddata_engine.execute("UPDATE fits SET booster = 0 WHERE booster IS NULL;")

eos/db/saveddata/fit.py

@@ -17,7 +17,7 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 #===============================================================================
 
-from sqlalchemy import Table, Column, Integer, ForeignKey, String
+from sqlalchemy import Table, Column, Integer, ForeignKey, String, Boolean
 from sqlalchemy.orm import relation, mapper
 from sqlalchemy.sql import and_
 
@@ -36,7 +36,8 @@ fits_table = Table("fits", saveddata_meta,
                          Column("name", String, nullable = False),
                          Column("timestamp", Integer, nullable = False),
                          Column("characterID", ForeignKey("characters.ID"), nullable = True),
-                         Column("damagePatternID", ForeignKey("damagePatterns.ID"), nullable=True))
+                         Column("damagePatternID", ForeignKey("damagePatterns.ID"), nullable=True),
+                         Column("booster", Boolean, nullable = False, index = True, default = 0))
 
 projectedFits_table = Table("projectedFits", saveddata_meta,
                             Column("sourceID", ForeignKey("fits.ID"), primary_key = True),

eos/db/saveddata/queries.py

@@ -248,6 +248,24 @@ def getFitsWithShip(shipID, ownerID=None, where=None, eager=None):
         raise TypeError("ShipID must be integer")
     return fits
 
+def getBoosterFits(ownerID=None, where=None, eager=None):
+    """
+    Get all the fits that are flagged as a boosting ship
+    If no user is passed, do this for all users.
+    """
+
+    if ownerID is not None and not isinstance(ownerID, int):
+        raise TypeError("OwnerID must be integer")
+    filter = Fit.booster == 1
+    if ownerID is not None:
+        filter = and_(filter, Fit.ownerID == ownerID)
+
+    filter = processWhere(filter, where)
+    eager = processEager(eager)
+    with sd_lock:
+        fits = saveddata_session.query(Fit).options(*eager).filter(filter).all()
+    return fits
+
 def countFitsWithShip(shipID, ownerID=None, where=None, eager=None):
     """
     Get all the fits using a certain ship.

eos/effects/capacitorcapacitymultiply.py

@@ -1,6 +1,6 @@
 # Used by:
 # Modules from group: Capacitor Flux Coil (12 of 12)
-# Modules from group: Capacitor Power Relay (25 of 25)
+# Modules from group: Capacitor Power Relay (26 of 26)
 # Modules from group: Power Diagnostic System (31 of 31)
 # Modules from group: Propulsion Module (107 of 107)
 # Modules from group: Reactor Control Unit (28 of 28)

eos/effects/capitalremoteenergytransfercapneedbonusskill.py

@@ -1,6 +1,6 @@
 # Used by:
-# Skill: Capital Energy Emission Systems
+# Skill: Capital Capacitor Emission Systems
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Emission Systems"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Capacitor Emission Systems"),
                                   "capacitorNeed", skill.getModifiedItemAttr("capNeedBonus") * skill.level)

eos/effects/carrieramarrarmorenergytransferrange3.py

@@ -6,6 +6,6 @@ def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Carrier").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
                                   "maxRange", ship.getModifiedItemAttr("carrierAmarrBonus3") * level)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Emission Systems"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Capacitor Emission Systems"),
                                   "powerTransferRange", ship.getModifiedItemAttr("carrierAmarrBonus3") * level)
     

eos/effects/carriercaldarishieldenergytransferrange3.py

@@ -7,5 +7,5 @@ def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Carrier").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
                                   "shieldTransferRange", ship.getModifiedItemAttr("carrierCaldariBonus3") * level)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Emission Systems"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Capacitor Emission Systems"),
                                   "powerTransferRange", ship.getModifiedItemAttr("carrierCaldariBonus3") * level)

eos/effects/commandbonusrsdmultiplywithcommandbonushidden.py

@@ -5,7 +5,8 @@ gangBoost = "ewarStrRSD"
 type = "active", "gang"
 def handler(fit, module, context):
     if "gang" not in context: return
-    for bonus in ("scanResolutionBonus", "maxTargetRangeBonus"):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Sensor Damper",
-                                      bonus, module.getModifiedItemAttr("commandBonusRSD"),
-                                      stackingPenalties = True)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Sensor Damper",
+                                  "maxTargetRangeBonus", module.getModifiedItemAttr("commandBonusRSD"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Sensor Damper",
+                                  "scanResolutionBonus", module.getModifiedItemAttr("commandBonusRSD"),
+                                  stackingPenalties=True)

eos/effects/commandbonustdmultiplywithcommandbonushidden.py

@@ -5,6 +5,5 @@ gangBoost = "ewarStrTD"
 type = "active", "gang"
 def handler(fit, module, context):
     for bonus in ("maxRangeBonus", "falloffBonus", "trackingSpeedBonus"):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor",
-                                      bonus, module.getModifiedItemAttr("commandBonusTD"),
-                                      stackingPenalties = True)
+        fit.modules.filteredItemBoost(lambda mod: lambda mod: mod.item.requiresSkill("Weapon Disruption"),
+                                      bonus, module.getModifiedItemAttr("commandBonusTD"))

eos/effects/covertopsandreconopscloakmoduledelaybonus.py

@@ -4,7 +4,9 @@
 # Ships from group: Covert Ops (5 of 5)
 # Ships from group: Force Recon Ship (5 of 5)
 # 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
 type = "passive"
 def handler(fit, container, context):
     fit.modules.filteredItemForce(lambda mod: mod.item.group.name == "Cloaking Device",

eos/effects/damagecontrol.py

@@ -7,5 +7,6 @@ def handler(fit, module, context):
             bonus = "%s%sDamageResonance" % (attrPrefix, damageType)
             bonus = "%s%s" % (bonus[0].lower(), bonus[1:])
             booster = "%s%sDamageResonance" % (layer, damageType)
+            penalize = False if layer == 'hull' else True
             fit.ship.multiplyItemAttr(bonus, module.getModifiedItemAttr(booster),
-                                      stackingPenalties=True, penaltyGroup="preMul")
+                                      stackingPenalties=penalize, penaltyGroup="preMul")

eos/effects/dronetrackingcomputerbonus.py

@@ -0,0 +1,14 @@
+# Used by:
+# Modules from group: Drone Tracking Modules (7 of 7)
+type = "active"
+def handler(fit, module, context):
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
+                                 "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
+                                 stackingPenalties=True)
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
+                                 "falloff", module.getModifiedItemAttr("falloffBonus"),
+                                 stackingPenalties=True)
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
+                                 "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
+                                 stackingPenalties=True)
+

eos/effects/dronetrackingcomputermultiply.py

@@ -1,10 +0,0 @@
-# Used by:
-# Modules from group: Drone Tracking Modules (7 of 7)
-type = "passive"
-def handler(fit, module, context):
-    fit.drones.filteredItemMultiply(lambda drone: drone.item.requiresSkill("Drones"),
-                                    "trackingSpeed", module.getModifiedItemAttr("trackingSpeedMultiplier"),
-                                    stackingPenalties = True, penaltyGroup="postMul")
-    fit.drones.filteredItemMultiply(lambda drone: drone.item.requiresSkill("Drones"),
-                                    "maxRange", module.getModifiedItemAttr("maxRangeMultiplier"),
-                                    stackingPenalties = True, penaltyGroup="postMul")

eos/effects/elitebonusviolatorsrepairsystemsarmordamageamount2.py

@@ -1,6 +1,6 @@
-# Used by:
-# Ship: Kronos
-# Ship: Paladin
+# Used by:
+# Ship: Kronos
+# Ship: Paladin
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Marauders").level

eos/effects/eliteindustrialarmorrepairamountelite1.py

@@ -1,7 +1,7 @@
-# Used by:
-# Ship: Impel
-# Ship: Occator
-# Ship: Prorator
+# Used by:
+# Ship: Impel
+# Ship: Occator
+# Ship: Prorator
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Transport Ships").level

eos/effects/eliteindustrialarmorrepairdurationelite2.py

@@ -1,5 +1,5 @@
-# Used by:
-# Ship: Viator
+# Used by:
+# Ship: Viator
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Transport Ships").level

eos/effects/ewskillsignalsuppressionscanresolutionbonus.py

@@ -4,5 +4,7 @@
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
+    penalized = False if "skill" in context else True
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Sensor Damper",
-                                  "scanResolutionBonus", container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level)
+                                  "scanResolutionBonus", container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level,
+                                  stackingPenalties=penalized)

eos/effects/ewskilltrackingdisruptionrangedisruptionbonus.py

@@ -5,6 +5,5 @@ type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
     for attr in ("maxRangeBonus", "falloffBonus"):
-        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor",
-                                      attr, container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level,
-                                      stackingPenalties = "skill" not in context)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
+                                      attr, container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level)

eos/effects/hybridweapondamagemultiply.py

@@ -1,5 +1,5 @@
 # Used by:
-# Modules from group: Magnetic Field Stabilizer (19 of 19)
+# Modules from group: Magnetic Field Stabilizer (20 of 20)
 # Modules named like: QA Multiship Module Players (4 of 4)
 # Module: QA Damage Module
 type = "passive"

eos/effects/hybridweaponspeedmultiply.py

@@ -1,5 +1,5 @@
 # Used by:
-# Modules from group: Magnetic Field Stabilizer (19 of 19)
+# Modules from group: Magnetic Field Stabilizer (20 of 20)
 type = "passive"
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Hybrid Weapon",

eos/effects/maraudermodeeffect26.py

@@ -9,8 +9,9 @@ def handler(fit, module, context):
             bonus = "%s%sDamageResonance" % (attrPrefix, damageType)
             bonus = "%s%s" % (bonus[0].lower(), bonus[1:])
             booster = "%s%sDamageResonance" % (layer, damageType)
+            penalize = False if layer == 'hull' else True
             fit.ship.multiplyItemAttr(bonus, module.getModifiedItemAttr(booster),
-                                      stackingPenalties=True, penaltyGroup="preMul")
+                                      stackingPenalties=penalize, penaltyGroup="preMul")
 
     # Turrets
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret") or \
@@ -26,7 +27,8 @@ def handler(fit, module, context):
 
     # Missiles
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes") or \
-                                    mod.charge.requiresSkill("Cruise Missiles"),
+                                    mod.charge.requiresSkill("Cruise Missiles") or \
+                                    mod.charge.requiresSkill("Heavy Missiles"),
                                     "maxVelocity", module.getModifiedItemAttr("missileVelocityBonus"))
 
     # Tanking

eos/effects/minigamevirusstrengthbonus.py

@@ -1,8 +1,13 @@
 # Used by:
 # Ships from group: Covert Ops (5 of 5)
-# Ships from group: Frigate (10 of 43)
 # Ships named like: Stratios (2 of 2)
 # Subsystems named like: Electronics Emergent Locus Analyzer (4 of 4)
+# Variations of ship: Heron (3 of 3)
+# Variations of ship: Imicus (3 of 3)
+# Variations of ship: Magnate (4 of 6)
+# Variations of ship: Probe (3 of 3)
+# Ship: Astero
+# Ship: Nestor
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1

eos/effects/missileskillaoecloudsizebonusallincludingcapitals.py

@@ -1,6 +1,6 @@
-# Used by:
-# Implants named like: Crash Booster (4 of 4)
-type = "passive"
-def handler(fit, implant, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "aoeCloudSize", implant.getModifiedItemAttr("aoeCloudSizeBonus"))
+# Used by:
+# Implants named like: Crash Booster (4 of 4)
+type = "passive"
+def handler(fit, implant, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
+                                    "aoeCloudSize", implant.getModifiedItemAttr("aoeCloudSizeBonus"))

eos/effects/modifyactivearmorresonancepostpercent.py

@@ -1,5 +1,5 @@
-# Used by:
-# Modules from group: Armor Hardener (156 of 156)
+# Used by:
+# Modules from group: Armor Hardener (156 of 156)
 type = "active"
 def handler(fit, module, context):
     for damageType in ("kinetic", "thermal", "explosive", "em"):

eos/effects/modifyactiveshieldresonancepostpercent.py

@@ -1,5 +1,5 @@
-# Used by:
-# Modules from group: Shield Hardener (97 of 97)
+# Used by:
+# Modules from group: Shield Hardener (97 of 97)
 type = "active"
 def handler(fit, module, context):
     for damageType in ("kinetic", "thermal", "explosive", "em"):

eos/effects/modifypowerrechargerate.py

@@ -1,6 +1,6 @@
 # Used by:
 # Modules from group: Capacitor Flux Coil (12 of 12)
-# Modules from group: Capacitor Power Relay (25 of 25)
+# Modules from group: Capacitor Power Relay (26 of 26)
 # Modules from group: Capacitor Recharger (25 of 25)
 # Modules from group: Power Diagnostic System (31 of 31)
 # Modules from group: Reactor Control Unit (28 of 28)

eos/effects/modifyshieldrechargerate.py

@@ -1,6 +1,6 @@
 # Used by:
 # Modules from group: Capacitor Flux Coil (12 of 12)
-# Modules from group: Capacitor Power Relay (25 of 25)
+# Modules from group: Capacitor Power Relay (26 of 26)
 # Modules from group: Power Diagnostic System (31 of 31)
 # Modules from group: Reactor Control Unit (28 of 28)
 # Modules from group: Shield Flux Coil (11 of 11)

eos/effects/modifyshieldrechargeratepassive.py

@@ -1,5 +1,5 @@
 # Used by:
-# Modules named like: Processor Overclocking Unit II (4 of 4)
+# Modules named like: Processor Overclocking Unit (8 of 8)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.multiplyItemAttr("shieldRechargeRate", module.getModifiedItemAttr("shieldRechargeRateMultiplier"))

eos/effects/overloadrofbonus.py

@@ -2,12 +2,10 @@
 # Modules from group: Energy Weapon (100 of 183)
 # Modules from group: Hybrid Weapon (110 of 199)
 # Modules from group: Missile Launcher Citadel (4 of 4)
-# Modules from group: Missile Launcher Cruise (20 of 20)
 # Modules from group: Missile Launcher Heavy (12 of 12)
 # Modules from group: Missile Launcher Rocket (14 of 14)
-# Modules from group: Missile Launcher Torpedo (21 of 21)
 # Modules from group: Projectile Weapon (60 of 143)
-# Modules named like: Missile Launcher (81 of 82)
+# Modules named like: Launcher (124 of 137)
 type = "overheat"
 def handler(fit, module, context):
     module.boostItemAttr("speed", module.getModifiedItemAttr("overloadRofBonus"))

eos/effects/overloadselfdurationbonus.py

@@ -6,9 +6,11 @@
 # Modules from group: Remote Armor Repairer (38 of 38)
 # Modules from group: Remote Capacitor Transmitter (38 of 38)
 # Modules from group: Remote Shield Booster (39 of 39)
+# Modules from group: Smart Bomb (118 of 118)
 # Module: QA Remote Armor Repair System - 5 Players
 # Module: QA Shield Transporter - 5 Players
 # Module: Reactive Armor Hardener
+# Module: Target Spectrum Breaker
 type = "overheat"
 def handler(fit, module, context):
-    module.boostItemAttr("duration", module.getModifiedItemAttr("overloadSelfDurationBonus"))
+    module.boostItemAttr("duration", module.getModifiedItemAttr("overloadSelfDurationBonus") or 0)

eos/effects/overloadselfeccmstrenghtbonus.py

@@ -1,8 +1,8 @@
 # Used by:
 # Modules from group: ECCM (44 of 44)
+# Modules from group: Projected ECCM (7 of 7)
 type = "overheat"
 def handler(fit, module, context):
     for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
         module.boostItemAttr("scan%sStrengthPercent" % scanType,
-                             module.getModifiedItemAttr("overloadECCMStrenghtBonus"),
-                             stackingPenalties = True)
+                             module.getModifiedItemAttr("overloadECCMStrenghtBonus"))

eos/effects/overloadselfecmstrenghtbonus.py

@@ -1,5 +1,6 @@
 # Used by:
 # Modules from group: ECM (44 of 44)
+# Modules from group: ECM Burst (7 of 7)
 type = "overheat"
 def handler(fit, module, context):
     for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):

eos/effects/overloadselfpainterbonus.py

@@ -0,0 +1,5 @@
+# Used by:
+# Modules from group: Target Painter (9 of 9)
+type = "overheat"
+def handler(fit, module, context):
+    module.boostItemAttr("signatureRadiusBonus", module.getModifiedItemAttr("overloadPainterStrengthBonus") or 0)

eos/effects/overloadselfsensormodulebonus.py

@@ -0,0 +1,9 @@
+# Used by:
+# Modules from group: Remote Sensor Booster (8 of 8)
+# Modules from group: Remote Sensor Damper (9 of 9)
+# Modules from group: Sensor Booster (12 of 12)
+type = "overheat"
+def handler(fit, module, context):
+    module.boostItemAttr("maxTargetRangeBonus", module.getModifiedItemAttr("overloadSensorModuleStrengthBonus"))
+    module.boostItemAttr("scanResolutionBonus", module.getModifiedItemAttr("overloadSensorModuleStrengthBonus"),
+                         stackingPenalties=True)

eos/effects/overloadselftrackingmodulebonus.py

@@ -0,0 +1,10 @@
+# Used by:
+# Modules from group: Drone Tracking Modules (7 of 7)
+# Modules from group: Remote Tracking Computer (10 of 10)
+# Modules from group: Tracking Computer (14 of 14)
+# Modules from group: Tracking Disruptor (10 of 10)
+type = "overheat"
+def handler(fit, module, context):
+    module.boostItemAttr("maxRangeBonus", module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus"))
+    module.boostItemAttr("falloffBonus", module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus"))
+    module.boostItemAttr("trackingSpeedBonus", module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus"))

eos/effects/poweroutputmultiply.py

@@ -1,6 +1,6 @@
 # Used by:
 # Modules from group: Capacitor Flux Coil (12 of 12)
-# Modules from group: Capacitor Power Relay (25 of 25)
+# Modules from group: Capacitor Power Relay (26 of 26)
 # Modules from group: Power Diagnostic System (31 of 31)
 # Modules from group: Reactor Control Unit (28 of 28)
 # Modules from group: Shield Flux Coil (11 of 11)

eos/effects/remotehullrepair.py

@@ -1,5 +1,6 @@
 # Used by:
 # Modules from group: Remote Hull Repairer (7 of 7)
+# Drones named like: Hull Maintenance Bot (6 of 6)
 type = "projected", "active"
 runTime = "late"
 def handler(fit, module, context):

eos/effects/repairdronehullbonusbonus.py

@@ -0,0 +1,8 @@
+# Used by:
+# Modules named like: Drone Repair Augmentor (8 of 8)
+# Skill: Repair Drone Operation
+type = "passive"
+def handler(fit, container, context):
+    level = container.level if "skill" in context else 1
+    fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Logistic Drone",
+                                 "structureDamageAmount", container.getModifiedItemAttr("damageHP") * level)

eos/effects/scanstrengthbonuspercentpassive.py

@@ -1,5 +1,5 @@
 # Used by:
-# Implants from group: Cyberimplant (20 of 155)
+# Implants from group: Cyberimplant (20 of 157)
 type = "passive"
 def handler(fit, implant, context):
     for type in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):

eos/effects/shieldboostamplifier.py

@@ -1,5 +1,5 @@
 # Used by:
-# Modules from group: Capacitor Power Relay (25 of 25)
+# Modules from group: Capacitor Power Relay (26 of 26)
 # Modules from group: Shield Boost Amplifier (25 of 25)
 type = "passive"
 def handler(fit, module, context):

eos/effects/shieldcapacitymultiply.py

@@ -1,6 +1,6 @@
 # Used by:
 # Modules from group: Capacitor Flux Coil (12 of 12)
-# Modules from group: Capacitor Power Relay (25 of 25)
+# Modules from group: Capacitor Power Relay (26 of 26)
 # Modules from group: Power Diagnostic System (31 of 31)
 # Modules from group: Reactor Control Unit (28 of 28)
 # Modules from group: Shield Flux Coil (11 of 11)

eos/effects/shiparmoremresistanceaf1.py

@@ -1,7 +1,7 @@
 # Used by:
+# Ships named like: Punisher (2 of 2)
 # Ship: Astero
 # Ship: Malice
-# Ship: Punisher
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Frigate").level

eos/effects/shiparmorexresistanceaf1.py

@@ -1,7 +1,7 @@
 # Used by:
+# Ships named like: Punisher (2 of 2)
 # Ship: Astero
 # Ship: Malice
-# Ship: Punisher
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Frigate").level

eos/effects/shiparmorknresistanceaf1.py

@@ -1,7 +1,7 @@
 # Used by:
+# Ships named like: Punisher (2 of 2)
 # Ship: Astero
 # Ship: Malice
-# Ship: Punisher
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Frigate").level

eos/effects/shiparmorrepairinggf2.py

@@ -1,7 +1,7 @@
-# Used by:
-# Ship: Incursus
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Gallente Frigate").level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGF2") * level)
+# Used by:
+# Ships named like: Incursus (2 of 2)
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Gallente Frigate").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
+                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGF2") * level)

eos/effects/shiparmorthresistanceaf1.py

@@ -1,7 +1,7 @@
 # Used by:
+# Ships named like: Punisher (2 of 2)
 # Ship: Astero
 # Ship: Malice
-# Ship: Punisher
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Frigate").level

eos/effects/shipbonusarmorresistab.py

@@ -1,5 +1,6 @@
 # Used by:
-# Ship: Abaddon
+# Ships named like: Abaddon (2 of 2)
+# Ship: Nestor
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Battleship").level

eos/effects/shipbonuscargomi.py

@@ -1,6 +1,7 @@
 # Used by:
 # Variations of ship: Mammoth (2 of 2)
 # Variations of ship: Wreathe (2 of 2)
+# Ship: Mammoth Nefantar Edition
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Industrial").level

eos/effects/shipbonusdreadcitadelcruiserofc1.py

@@ -3,5 +3,5 @@
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Dreadnought").level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Citadel",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Citadel Cruise Missiles"),
                                   "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusC1") * level)

eos/effects/shipbonusdreadcitadeltorprofc1.py

@@ -0,0 +1,7 @@
+# Used by:
+# Ship: Phoenix
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Caldari Dreadnought").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Citadel Torpedoes"),
+                                  "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusC1") * level)

eos/effects/shipbonusdronedamagemultipliergb2.py

@@ -1,5 +1,6 @@
 # Used by:
 # Variations of ship: Dominix (3 of 3)
+# Ship: Nestor
 # Ship: Rattlesnake
 type = "passive"
 def handler(fit, ship, context):

eos/effects/shipbonusdronehitpointsgb2.py

@@ -1,5 +1,6 @@
 # Used by:
 # Variations of ship: Dominix (3 of 3)
+# Ship: Nestor
 # Ship: Rattlesnake
 type = "passive"
 def handler(fit, ship, context):

eos/effects/shipbonusemshieldresistancecb2.py

@@ -1,6 +1,6 @@
 # Used by:
+# Ships named like: Rokh (2 of 2)
 # Ship: Rattlesnake
-# Ship: Rokh
 # Ship: Scorpion Navy Issue
 type = "passive"
 def handler(fit, ship, context):

eos/effects/shipbonusewweapondisruptionmaxrangebonusaf1.py

@@ -1,9 +0,0 @@
-# Used by:
-# Ship: Crucifier
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Amarr Frigate").level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor",
-                                  "maxRangeBonus", ship.getModifiedItemAttr("shipBonusAF") * level)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor",
-                                  "falloffBonus", ship.getModifiedItemAttr("shipBonusAF") * level)

eos/effects/shipbonusewweapondisruptionrangedisruptionbonusac1.py

@@ -3,7 +3,7 @@
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Cruiser").level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
                                   "maxRangeBonus", ship.getModifiedItemAttr("shipBonusAC") * level)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
                                   "falloffBonus", ship.getModifiedItemAttr("shipBonusAC") * level)

eos/effects/shipbonusewweapondisruptionrangedisruptionbonusaf2.py

@@ -1,9 +1,9 @@
 # Used by:
-# Ship: Sentinel
+# Variations of ship: Crucifier (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Frigate").level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
                                   "maxRangeBonus", ship.getModifiedItemAttr("shipBonus2AF") * level)
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
                                   "falloffBonus", ship.getModifiedItemAttr("shipBonus2AF") * level)

eos/effects/shipbonusewweapondisruptionrangedisruptionrookie.py

@@ -2,7 +2,7 @@
 # Ship: Impairor
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
                                   "maxRangeBonus", ship.getModifiedItemAttr("rookieWeaponDisruptionBonus"))
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
                                   "falloffBonus", ship.getModifiedItemAttr("rookieWeaponDisruptionBonus"))

eos/effects/shipbonusexplosiveshieldresistancecb2.py

@@ -1,6 +1,6 @@
 # Used by:
+# Ships named like: Rokh (2 of 2)
 # Ship: Rattlesnake
-# Ship: Rokh
 # Ship: Scorpion Navy Issue
 type = "passive"
 def handler(fit, ship, context):

eos/effects/shipbonushtfalloffgb2.py

@@ -0,0 +1,7 @@
+# Used by:
+# Ship: Kronos
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Gallente Battleship").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),
+                                  "falloff", ship.getModifiedItemAttr("shipBonusGB2") * level)

eos/effects/shipbonushybridoptimalcb.py

@@ -1,5 +1,5 @@
 # Used by:
-# Ship: Rokh
+# Ships named like: Rokh (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Battleship").level

eos/effects/shipbonushybridtrackinggf2.py

@@ -1,6 +1,7 @@
 # Used by:
 # Ship: Ares
 # Ship: Federation Navy Comet
+# Ship: Police Pursuit Comet
 # Ship: Tristan
 type = "passive"
 def handler(fit, ship, context):

eos/effects/shipbonuskineticshieldresistancecb2.py

@@ -1,6 +1,6 @@
 # Used by:
+# Ships named like: Rokh (2 of 2)
 # Ship: Rattlesnake
-# Ship: Rokh
 # Ship: Scorpion Navy Issue
 type = "passive"
 def handler(fit, ship, context):

eos/effects/shipbonuslargeenergyturretmaxrangeab.py

@@ -0,0 +1,7 @@
+# Used by:
+# Ship: Paladin
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Amarr Battleship").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
+                                  "maxRange", ship.getModifiedItemAttr("shipBonusAB") * level)

eos/effects/shipbonuslargeenergyweapondamageab2.py

@@ -1,5 +1,5 @@
 # Used by:
-# Ship: Abaddon
+# Ships named like: Abaddon (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Battleship").level

eos/effects/shipbonusletoptimalrangepiratefaction.py

@@ -0,0 +1,6 @@
+# Used by:
+# Ship: Nestor
+type = "passive"
+def handler(fit, ship, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
+                                  "maxRange", ship.getModifiedItemAttr("shipBonusPirateFaction"))

eos/effects/shipbonusremoterepairamountpiratefaction.py

@@ -0,0 +1,6 @@
+# Used by:
+# Ship: Nestor
+type = "passive"
+def handler(fit, ship, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
+                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusPirateFaction"))

eos/effects/shipbonusremoterepairrangepiratefaction2.py

@@ -0,0 +1,6 @@
+# Used by:
+# Ship: Nestor
+type = "passive"
+def handler(fit, ship, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
+                                  "maxRange", ship.getModifiedItemAttr("shipBonusPirateFaction2"))

eos/effects/shipbonusrepairsystemsarmorrepairamountgb2.py

@@ -1,7 +1,7 @@
-# Used by:
-# Ship: Hyperion
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Gallente Battleship").level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGB2") * level)
+# Used by:
+# Ships named like: Hyperion (2 of 2)
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Gallente Battleship").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
+                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGB2") * level)

eos/effects/shipbonusrepairsystemsbonusatc2.py

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

eos/effects/shipbonusshieldboostermb1a.py

@@ -1,5 +1,5 @@
 # Used by:
-# Ship: Maelstrom
+# Ships named like: Maelstrom (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Battleship").level

eos/effects/shipbonussptfalloffmf2.py

@@ -0,0 +1,7 @@
+# Used by:
+# Ships named like: Rifter (2 of 2)
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Minmatar Frigate").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
+                                  "falloff", ship.getModifiedItemAttr("shipBonusMF2") * level)

eos/effects/shipbonusthermicshieldresistancecb2.py

@@ -1,6 +1,6 @@
 # Used by:
+# Ships named like: Rokh (2 of 2)
 # Ship: Rattlesnake
-# Ship: Rokh
 # Ship: Scorpion Navy Issue
 type = "passive"
 def handler(fit, ship, context):

eos/effects/shipenergyneutralizertransferamountbonusab.py

@@ -1,5 +1,5 @@
-# Used by:
-# Ship: Bhaalgorn
+# Used by:
+# Ship: Bhaalgorn
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Battleship").level

eos/effects/shiphtdmgbonusgb.py

@@ -1,6 +1,6 @@
 # Used by:
+# Ships named like: Hyperion (2 of 2)
 # Ship: Dominix Navy Issue
-# Ship: Hyperion
 # Ship: Kronos
 # Ship: Megathron Federate Issue
 # Ship: Sin

eos/effects/shiphybriddamagebonuscf2.py

@@ -1,5 +1,5 @@
 # Used by:
-# Ship: Merlin
+# Ships named like: Merlin (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Frigate").level

eos/effects/shipmissilerofmf2.py

@@ -0,0 +1,9 @@
+# Used by:
+# Ship: Breacher
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Minmatar Frigate").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
+                                  "speed", ship.getModifiedItemAttr("shipBonusMF2") * level)
+
+

eos/effects/shippdmgbonusmf.py

@@ -4,6 +4,7 @@
 # Ship: Cheetah
 # Ship: Freki
 # Ship: Republic Fleet Firetail
+# Ship: Rifter Krusual Edition
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Frigate").level

eos/effects/shipprojectiletrackingmf2.py

@@ -1,7 +1,8 @@
 # Used by:
-# Variations of ship: Rifter (3 of 3)
 # Variations of ship: Slasher (3 of 3)
+# Ship: Jaguar
 # Ship: Republic Fleet Firetail
+# Ship: Wolf
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Frigate").level

eos/effects/shipptspeedbonusmb2.py

@@ -1,6 +1,6 @@
 # Used by:
+# Ships named like: Maelstrom (2 of 2)
 # Variations of ship: Tempest (4 of 4)
-# Ship: Maelstrom
 # Ship: Panther
 # Ship: Typhoon Fleet Issue
 type = "passive"

eos/effects/shipscanprobestrengthbonuspiratefaction.py

@@ -0,0 +1,6 @@
+# Used by:
+# Ship: Nestor
+type = "passive"
+def handler(fit, ship, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"),
+                                    "baseSensorStrength", ship.getModifiedItemAttr("shipBonusPirateFaction"))

eos/effects/shipsetdmgbonus2af.py

@@ -1,5 +1,5 @@
 # Used by:
-# Ship: Punisher
+# Ships named like: Punisher (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Frigate").level

eos/effects/shipshieldemresistancecf2.py

@@ -1,6 +1,7 @@
 # Used by:
 # Variations of ship: Merlin (3 of 4)
 # Ship: Cambion
+# Ship: Merlin Nugoeihuvi Edition
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Frigate").level

eos/effects/shipshieldexplosiveresistancecf2.py

@@ -1,6 +1,7 @@
 # Used by:
 # Variations of ship: Merlin (3 of 4)
 # Ship: Cambion
+# Ship: Merlin Nugoeihuvi Edition
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Frigate").level

eos/effects/shipshieldkineticresistancecf2.py

@@ -1,6 +1,7 @@
 # Used by:
 # Variations of ship: Merlin (3 of 4)
 # Ship: Cambion
+# Ship: Merlin Nugoeihuvi Edition
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Frigate").level

eos/effects/shipshieldthermalresistancecf2.py

@@ -1,6 +1,7 @@
 # Used by:
 # Variations of ship: Merlin (3 of 4)
 # Ship: Cambion
+# Ship: Merlin Nugoeihuvi Edition
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Frigate").level

eos/effects/shipshtdmgbonusgf.py

@@ -3,6 +3,8 @@
 # Ship: Atron
 # Ship: Federation Navy Comet
 # Ship: Helios
+# Ship: Incursus Aliastra Edition
+# Ship: Police Pursuit Comet
 # Ship: Taranis
 type = "passive"
 def handler(fit, ship, context):

eos/effects/shipsmallmissileemdmgmf2.py

@@ -1,7 +0,0 @@
-# Used by:
-# Ship: Breacher
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Minmatar Frigate").level
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusMF2") * level)

eos/effects/shipsmallmissileexpdmgmf2.py

@@ -1,7 +0,0 @@
-# Used by:
-# Ship: Breacher
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Minmatar Frigate").level
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusMF2") * level)

eos/effects/shipsmallmissilekindmgmf2.py

@@ -1,7 +0,0 @@
-# Used by:
-# Ship: Breacher
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Minmatar Frigate").level
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusMF2") * level)

eos/effects/shipsmallmissilethermdmgmf2.py

@@ -1,7 +0,0 @@
-# Used by:
-# Ship: Breacher
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Minmatar Frigate").level
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"),
-                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusMF2") * level)

eos/effects/shipvelocitybonusmi.py

@@ -1,6 +1,7 @@
 # Used by:
 # Variations of ship: Mammoth (2 of 2)
 # Ship: Hoarder
+# Ship: Mammoth Nefantar Edition
 # Ship: Prowler
 type = "passive"
 def handler(fit, ship, context):

eos/effects/siegemodeeffect6.py

@@ -7,14 +7,12 @@ def handler(fit, module, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret") or \
                                   mod.item.requiresSkill("Capital Hybrid Turret") or \
                                   mod.item.requiresSkill("Capital Projectile Turret"),
-                                  "damageMultiplier", module.getModifiedItemAttr("damageMultiplierBonus"),
-                                  stackingPenalties=True)
+                                  "damageMultiplier", module.getModifiedItemAttr("damageMultiplierBonus"))
 
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret") or \
                                   mod.item.requiresSkill("Capital Hybrid Turret") or \
                                   mod.item.requiresSkill("Capital Projectile Turret"),
-                                  "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                  stackingPenalties=True)
+                                  "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"))
 
     #Missiles
     for type in ("kinetic", "thermal", "explosive", "em"):

eos/effects/skillreactivearmorhardenercapneedbonus.py

@@ -1,5 +1,5 @@
-# Used by:
-# Skill: Armor Resistance Phasing
+# Used by:
+# Skill: Armor Resistance Phasing
 type = "passive"
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Resistance Shift Hardener",