Merge pull request #1382 from pyfa-org/release/v1.35.0

Release/v1.35.0

.gitignore

@@ -117,3 +117,4 @@ ENV/
 # Pycharm project settings
 .idea
 eos.iml
+gitversion

ISSUE_TEMPLATE.md

@@ -1,11 +1,13 @@
-# Submit a bug report bug report or feature request
+<!--
+
+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
 

README.md

@@ -52,7 +52,7 @@ pyfa is licensed under the GNU GPL v3.0, see LICENSE
 
 ## Resources
 * Development repository: [https://github.com/pyfa-org/Pyfa](https://github.com/pyfa-org/Pyfa)
-* [EVE forum thread](https://forums.eveonline.com/default.aspx?g=posts&t=466425)
+* [EVE forum thread](https://forums.eveonline.com/t/27156)
 * [EVE University guide using pyfa](http://wiki.eveuniversity.org/Guide_to_using_PYFA)
 * [EVE Online website](http://www.eveonline.com/)
 

config.py

@@ -19,10 +19,10 @@ debug = False
 saveInRoot = False
 
 # Version data
-version = "1.29.2"
+version = "1.35.0"
 tag = "Stable"
-expansionName = "YC119.5"
-expansionVersion = "1.0"
+expansionName = "YC120.2"
+expansionVersion = "1.1"
 evemonMinVersion = "4081"
 
 pyfaPath = None

eos/db/gamedata/item.py

@@ -47,7 +47,7 @@ mapper(Item, items_table,
        properties={
            "group"            : relation(Group, backref="items"),
            "icon"             : relation(Icon),
-           "_Item__attributes": relation(Attribute, collection_class=attribute_mapped_collection('name')),
+           "_Item__attributes": relation(Attribute, cascade='all, delete, delete-orphan', collection_class=attribute_mapped_collection('name')),
            "effects": relation(Effect, secondary=typeeffects_table, collection_class=attribute_mapped_collection('name')),
            "metaGroup"        : relation(MetaType,
                                          primaryjoin=metatypes_table.c.typeID == items_table.c.typeID,

eos/db/gamedata/queries.py

@@ -317,7 +317,7 @@ def getVariations(itemids, groupIDs=None, where=None, eager=None):
         vars = gamedata_session.query(Item).options(*processEager(eager)).join((groups_table, joinon)).filter(
                 filter).all()
 
-        return vars
+    return vars
 
 
 @cachedQuery(1, "attr")

eos/db/migrations/upgrade17.py

@@ -16,23 +16,27 @@ def upgrade(saveddata_engine):
           JOIN wings w on w.ID = s.wingID
           JOIN gangs g on g.ID = w.gangID
           """
+    try:
+        results = saveddata_session.execute(sql)
 
-    results = saveddata_session.execute(sql)
+        inserts = []
 
-    inserts = []
+        for row in results:
+            boosted = row["boostedFit"]
+            types = ("squad", "wing", "gang")
+            for x in types:
+                value = row["{}Boost".format(x)]
+                if value is None:
+                    continue
 
-    for row in results:
-        boosted = row["boostedFit"]
-        types = ("squad", "wing", "gang")
-        for x in types:
-            value = row["{}Boost".format(x)]
-            if value is None:
-                continue
-
-            inserts.append({"boosterID": value, "boostedID": boosted, "active": 1})
-            try:
-                saveddata_session.execute(commandFits_table.insert(),
-                                          {"boosterID": value, "boostedID": boosted, "active": 1})
-            except Exception:
-                pass
-    saveddata_session.commit()
+                inserts.append({"boosterID": value, "boostedID": boosted, "active": 1})
+                try:
+                    saveddata_session.execute(commandFits_table.insert(),
+                                              {"boosterID": value, "boostedID": boosted, "active": 1})
+                except Exception:
+                    pass
+        saveddata_session.commit()
+    except:
+        # Shouldn't fail unless you have updated database without the old fleet schema and manually modify the database version
+        # If it does, simply fail. Fleet data migration isn't critically important here
+        pass

eos/db/migrations/upgrade26.py

@@ -0,0 +1,9 @@
+"""
+Migration 26
+
+- Deletes invalid command fit relationships caused by a bug (see #1244)
+"""
+
+
+def upgrade(saveddata_engine):
+    saveddata_engine.execute("DELETE FROM commandFits WHERE boosterID NOT IN (SELECT ID FROM fits) OR boostedID NOT IN (SELECT ID FROM fits)")

eos/db/migrations/upgrade27.py

@@ -0,0 +1,9 @@
+"""
+Migration 27
+
+- Resets all alpha clones to 1 (CCP consolidated all alpha's into one skillset)
+"""
+
+
+def upgrade(saveddata_engine):
+    saveddata_engine.execute("UPDATE characters SET alphaCloneID = 1 WHERE alphaCloneID IS NOT NULL")

eos/db/migrations/upgrade6.py

@@ -7,5 +7,5 @@ Overwrites damage profile 0 to reset bad uniform values (bad values set with bug
 
 def upgrade(saveddata_engine):
     saveddata_engine.execute('DELETE FROM damagePatterns WHERE name LIKE ? OR ID LIKE ?', ("Uniform", "1"))
-    saveddata_engine.execute('INSERT INTO damagePatterns VALUES (?, ?, ?, ?, ?, ?, ?)',
+    saveddata_engine.execute('INSERT INTO damagePatterns (ID, name, emAmount, thermalAmount, kineticAmount, explosiveAmount, ownerID) VALUES (?, ?, ?, ?, ?, ?, ?)',
                              (1, "Uniform", 25, 25, 25, 25, None))

eos/db/saveddata/booster.py

@@ -18,35 +18,38 @@
 # ===============================================================================
 
 from sqlalchemy import Table, Column, ForeignKey, Integer, Boolean, DateTime
-from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.orm import mapper, relation
 import datetime
 
 from eos.db import saveddata_meta
 from eos.saveddata.booster import Booster
+from eos.saveddata.boosterSideEffect import BoosterSideEffect
 
 boosters_table = Table("boosters", saveddata_meta,
-                        Column("ID", Integer, primary_key=True),
-                        Column("itemID", Integer),
-                        Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False),
-                        Column("active", Boolean),
-                        Column("created", DateTime, nullable=True, default=datetime.datetime.now),
-                        Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now),
+                       Column("ID", Integer, primary_key=True),
+                       Column("itemID", Integer),
+                       Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False),
+                       Column("active", Boolean),
+                       Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                       Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now),
                        )
 
-# Legacy booster side effect code, should disable but a mapper relies on it.
-activeSideEffects_table = Table("boostersActiveSideEffects", saveddata_meta,
-                                Column("boosterID", ForeignKey("boosters.ID"), primary_key=True),
-                                Column("effectID", Integer, primary_key=True))
+
+booster_side_effect_table = Table("boosterSideEffects", saveddata_meta,
+                                  Column("boosterID", Integer, ForeignKey("boosters.ID"), primary_key=True, index=True),
+                                  Column("effectID", Integer, nullable=False, primary_key=True),
+                                  Column("active", Boolean, default=False)
+                                  )
 
 
-class ActiveSideEffectsDummy(object):
-    def __init__(self, effectID):
-        self.effectID = effectID
-
-
-mapper(ActiveSideEffectsDummy, activeSideEffects_table)
 mapper(Booster, boosters_table,
-       properties={"_Booster__activeSideEffectDummies": relation(ActiveSideEffectsDummy)})
+       properties={
+        "_Booster__sideEffects": relation(
+            BoosterSideEffect,
+            backref="booster",
+            cascade='all, delete, delete-orphan'),
+       }
+       )
 
-Booster._Booster__activeSideEffectIDs = association_proxy("_Booster__activeSideEffectDummies", "effectID")
+
+mapper(BoosterSideEffect, booster_side_effect_table)

eos/db/saveddata/price.py

@@ -25,8 +25,10 @@ from eos.saveddata.price import Price
 
 prices_table = Table("prices", saveddata_meta,
                      Column("typeID", Integer, primary_key=True),
-                     Column("price", Float),
+                     Column("price", Float, default=0.0),
                      Column("time", Integer, nullable=False),
                      Column("failed", Integer))
 
-mapper(Price, prices_table)
+mapper(Price, prices_table, properties={
+    "_Price__price": prices_table.c.price,
+})

eos/db/saveddata/queries.py

@@ -17,6 +17,8 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 # ===============================================================================
 
+import sys
+
 from sqlalchemy.sql import and_
 from sqlalchemy import desc, select
 
@@ -539,5 +541,10 @@ def remove(stuff):
 
 def commit():
     with sd_lock:
-        saveddata_session.commit()
-        saveddata_session.flush()
+        try:
+            saveddata_session.commit()
+            saveddata_session.flush()
+        except Exception:
+            saveddata_session.rollback()
+            exc_info = sys.exc_info()
+            raise exc_info[0], exc_info[1], exc_info[2]

eos/effects/accessdifficultybonusmodifierrequiringhacking.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Modules named like: Memetic Algorithm Bank (8 of 8)
+# Implant: Neural Lace 'Blackglass' Net Intrusion 920-40
 # Implant: Poteque 'Prospector' Environmental Analysis EY-1005
 # Implant: Poteque 'Prospector' Hacking HC-905
 type = "passive"

eos/effects/agilitybonus.py

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

eos/effects/ammoinfluencecapneed.py

@@ -1,9 +1,7 @@
 # ammoInfluenceCapNeed
 #
 # Used by:
-# Items from category: Charge (466 of 913)
-# Charges from group: Frequency Crystal (185 of 185)
-# Charges from group: Hybrid Charge (209 of 209)
+# Items from category: Charge (478 of 925)
 type = "passive"
 
 

eos/effects/ammoinfluencerange.py

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

eos/effects/ammospeedmultiplier.py

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

eos/effects/ammotrackingmultiplier.py

@@ -7,7 +7,7 @@
 # Charges from group: Advanced Blaster Charge (8 of 8)
 # Charges from group: Advanced Pulse Laser Crystal (8 of 8)
 # Charges from group: Advanced Railgun Charge (8 of 8)
-# Charges from group: Projectile Ammo (129 of 129)
+# Charges from group: Projectile Ammo (128 of 128)
 type = "passive"
 
 

eos/effects/antiwarpscramblingpassive.py

@@ -6,4 +6,4 @@ type = "passive"
 
 
 def handler(fit, module, context):
-    fit.ship.increaseItemAttr("warmScrambleStatus", module.getModifiedItemAttr("warpScrambleStrength"))
+    fit.ship.increaseItemAttr("warpScrambleStatus", module.getModifiedItemAttr("warpScrambleStrength"))

eos/effects/armorhpbonusaddpassive.py

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

eos/effects/boosterarmorhppenalty.py

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

eos/effects/boosterarmorrepairamountpenalty.py

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

eos/effects/boostercapacitorcapacitypenalty.py

@@ -4,8 +4,13 @@
 # Implants named like: Blue Pill Booster (3 of 5)
 # Implants named like: Exile Booster (3 of 4)
 type = "boosterSideEffect"
-activeByDefault = False
+
+# User-friendly name for the side effect
+displayName = "Cap Capacity"
+
+# Attribute that this effect targets
+attr = "boosterCapacitorCapacityPenalty"
 
 
 def handler(fit, booster, context):
-    fit.ship.boostItemAttr("capacitorCapacity", booster.getModifiedItemAttr("boosterCapacitorCapacityPenalty"))
+    fit.ship.boostItemAttr("capacitorCapacity", booster.getModifiedItemAttr(attr))

eos/effects/boostermaxvelocitypenalty.py

@@ -1,10 +1,15 @@
 # boosterMaxVelocityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 48)
+# Implants from group: Booster (12 of 54)
 type = "boosterSideEffect"
-activeByDefault = False
+
+# User-friendly name for the side effect
+displayName = "Velocity"
+
+# Attribute that this effect targets
+attr = "boosterMaxVelocityPenalty"
 
 
 def handler(fit, booster, context):
-    fit.ship.boostItemAttr("maxVelocity", booster.getModifiedItemAttr("boosterMaxVelocityPenalty"))
+    fit.ship.boostItemAttr("maxVelocity", booster.getModifiedItemAttr(attr))

eos/effects/boostermissileexplosioncloudpenaltyfixed.py

@@ -4,9 +4,14 @@
 # Implants named like: Exile Booster (3 of 4)
 # Implants named like: Mindflood Booster (3 of 4)
 type = "boosterSideEffect"
-activeByDefault = False
+
+# User-friendly name for the side effect
+displayName = "Missile Explosion Radius"
+
+# Attribute that this effect targets
+attr = "boosterMissileAOECloudPenalty"
 
 
 def handler(fit, booster, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "aoeCloudSize", booster.getModifiedItemAttr("boosterMissileAOECloudPenalty"))
+                                    "aoeCloudSize", booster.getModifiedItemAttr(attr))

eos/effects/boostermissileexplosionvelocitypenalty.py

@@ -3,9 +3,14 @@
 # Used by:
 # Implants named like: Blue Pill Booster (3 of 5)
 type = "boosterSideEffect"
-activeByDefault = False
+
+# User-friendly name for the side effect
+displayName = "Missile Explosion Velocity"
+
+# Attribute that this effect targets
+attr = "boosterAOEVelocityPenalty"
 
 
 def handler(fit, booster, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "aoeVelocity", booster.getModifiedItemAttr("boosterAOEVelocityPenalty"))
+                                    "aoeVelocity", booster.getModifiedItemAttr(attr))

eos/effects/boostermissilevelocitypenalty.py

@@ -4,9 +4,14 @@
 # Implants named like: Crash Booster (3 of 4)
 # Implants named like: X Instinct Booster (3 of 4)
 type = "boosterSideEffect"
-activeByDefault = False
+
+# User-friendly name for the side effect
+displayName = "Missile Velocity"
+
+# Attribute that this effect targets
+attr = "boosterMissileVelocityPenalty"
 
 
 def handler(fit, booster, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", "boosterMissileVelocityPenalty")
+                                    "maxVelocity", booster.getModifiedItemAttr(attr))

eos/effects/boostermodifyboosterturretpenalty.py

@@ -9,7 +9,7 @@ type = "passive"
 
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
-    attrs = ("boosterTurretFalloffPenalty", "boosterTurretOptimalRange", "boosterTurretTrackingPenalty")
+    attrs = ("boosterTurretFalloffPenalty", "boosterTurretOptimalRangePenalty", "boosterTurretTrackingPenalty")
     for attr in attrs:
         fit.boosters.filteredItemBoost(lambda booster: True, attr,
                                        container.getModifiedItemAttr("boosterAttributeModifier") * level)

eos/effects/boostershieldboostamountpenaltyshieldskills.py

@@ -0,0 +1,20 @@
+# boosterShieldBoostAmountPenaltyShieldSkills
+#
+# Used by:
+# Implants named like: Crash Booster (3 of 4)
+# Implants named like: Frentix Booster (3 of 4)
+# Implants named like: Mindflood Booster (3 of 4)
+type = "boosterSideEffect"
+
+# User-friendly name for the side effect
+displayName = "Shield Boost"
+
+# Attribute that this effect targets
+attr = "boosterShieldBoostAmountPenalty"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"), "shieldBonus",
+                                  src.getModifiedItemAttr("boosterShieldBoostAmountPenalty"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation"), "shieldBonus",
+                                  src.getModifiedItemAttr("boosterShieldBoostAmountPenalty"))

eos/effects/boostershieldcapacitypenalty.py

@@ -1,10 +1,15 @@
 # boosterShieldCapacityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 48)
+# Implants from group: Booster (12 of 54)
 type = "boosterSideEffect"
-activeByDefault = False
+
+# User-friendly name for the side effect
+displayName = "Shield Capacity"
+
+# Attribute that this effect targets
+attr = "boosterShieldCapacityPenalty"
 
 
 def handler(fit, booster, context):
-    fit.ship.boostItemAttr("shieldCapacity", booster.getModifiedItemAttr("boosterShieldCapacityPenalty"))
+    fit.ship.boostItemAttr("shieldCapacity", booster.getModifiedItemAttr(attr))

eos/effects/boosterturretfalloffpenalty.py

@@ -4,9 +4,14 @@
 # Implants named like: Drop Booster (3 of 4)
 # Implants named like: X Instinct Booster (3 of 4)
 type = "boosterSideEffect"
-activeByDefault = False
+
+# User-friendly name for the side effect
+displayName = "Turret Falloff"
+
+# Attribute that this effect targets
+attr = "boosterTurretFalloffPenalty"
 
 
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "falloff", booster.getModifiedItemAttr("boosterTurretFalloffPenalty"))
+                                  "falloff", booster.getModifiedItemAttr(attr))

eos/effects/boosterturretoptimalrangepenalty.py

@@ -5,9 +5,14 @@
 # Implants named like: Mindflood Booster (3 of 4)
 # Implants named like: Sooth Sayer Booster (3 of 4)
 type = "boosterSideEffect"
-activeByDefault = False
+
+# User-friendly name for the side effect
+displayName = "Turret Optimal Range"
+
+# Attribute that this effect targets
+attr = "boosterTurretOptimalRangePenalty"
 
 
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "maxRange", booster.getModifiedItemAttr("boosterTurretOptimalRange"))
+                                  "maxRange", booster.getModifiedItemAttr(attr))

eos/effects/boosterturrettrackingpenalty.py

@@ -4,9 +4,14 @@
 # Implants named like: Exile Booster (3 of 4)
 # Implants named like: Frentix Booster (3 of 4)
 type = "boosterSideEffect"
-activeByDefault = False
+
+# User-friendly name for the side effect
+displayName = "Turret Tracking"
+
+# Attribute that this effect targets
+attr = "boosterTurretTrackingPenalty"
 
 
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "trackingSpeed", booster.getModifiedItemAttr("boosterTurretTrackingPenalty"))
+                                  "trackingSpeed", booster.getModifiedItemAttr(attr))

eos/effects/capacitorcapacityaddpassive.py

@@ -1,11 +1,9 @@
 # capacitorCapacityAddPassive
 #
 # Used by:
-# Subsystems from group: Engineering Systems (16 of 16)
-# Subsystem: Tengu Offensive - Magnetic Infusion Basin
+# Items from category: Subsystem (20 of 48)
 type = "passive"
 
 
 def handler(fit, module, context):
-    fit.ship.increaseItemAttr("capacitorCapacity",
-                              module.getModifiedItemAttr("capacitorCapacity"))
+    fit.ship.increaseItemAttr("capacitorCapacity", module.getModifiedItemAttr("capacitorCapacity") or 0)

eos/effects/capacityaddpassive.py

@@ -1,9 +1,10 @@
 # capacityAddPassive
 #
 # Used by:
-# Subsystems from group: Defensive Systems (16 of 16)
+# Subsystems named like: Defensive Covert Reconfiguration (4 of 4)
+# Subsystem: Legion Defensive - Nanobot Injector
 type = "passive"
 
 
 def handler(fit, subsystem, context):
-    fit.ship.increaseItemAttr("capacity", subsystem.getModifiedItemAttr("capacity") or 0)
+    fit.ship.increaseItemAttr("capacity", subsystem.getModifiedItemAttr("cargoCapacityAdd") or 0)

eos/effects/commandburstaoebonus.py

@@ -8,6 +8,5 @@ type = "passive"
 
 
 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"),
-                                  "maxRange",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"), "maxRange",
                                   src.getModifiedItemAttr("areaOfEffectBonus") * src.level)

eos/effects/commandburstaoerolebonus.py

@@ -4,10 +4,10 @@
 # Ships from group: Carrier (4 of 4)
 # Ships from group: Combat Battlecruiser (13 of 13)
 # Ships from group: Command Ship (8 of 8)
-# Ships from group: Force Auxiliary (5 of 5)
+# Ships from group: Force Auxiliary (6 of 6)
 # Ships from group: Supercarrier (6 of 6)
-# Ships from group: Titan (6 of 6)
-# Subsystems named like: Defensive Warfare Processor (4 of 4)
+# Ships from group: Titan (7 of 7)
+# Subsystems named like: Offensive Support Processor (4 of 4)
 # Ship: Orca
 # Ship: Rorqual
 type = "passive"

eos/effects/concordsecstatustankbonus.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Enforcer
+# Ship: Marshal
 # Ship: Pacifier
 type = "passive"
 

eos/effects/covertcynocpupenalty.py

@@ -1,7 +1,7 @@
 # covertCynoCpuPenalty
 #
 # Used by:
-# Subsystems from group: Offensive Systems (12 of 16)
+# Subsystems from group: Defensive Systems (8 of 12)
 type = "passive"
 
 

eos/effects/covertopsandreconopscloakmoduledelaybonus.py

@@ -1,14 +1,14 @@
 # covertOpsAndReconOpsCloakModuleDelayBonus
 #
 # Used by:
-# Ships from group: Black Ops (4 of 4)
+# Ships from group: Black Ops (5 of 5)
 # Ships from group: Blockade Runner (4 of 4)
 # Ships from group: Covert Ops (7 of 7)
 # Ships from group: Expedition Frigate (2 of 2)
-# Ships from group: Force Recon Ship (7 of 7)
-# Ships from group: Stealth Bomber (4 of 4)
+# Ships from group: Force Recon Ship (8 of 8)
+# Ships from group: Stealth Bomber (5 of 5)
 # Ships named like: Stratios (2 of 2)
-# Subsystems named like: Offensive Covert Reconfiguration (4 of 4)
+# Subsystems named like: Defensive Covert Reconfiguration (4 of 4)
 # Ship: Astero
 # Ship: Rabisu
 type = "passive"

eos/effects/covertopscloakcpupenalty.py

@@ -1,7 +1,7 @@
 # covertOpsCloakCpuPenalty
 #
 # Used by:
-# Subsystems from group: Offensive Systems (12 of 16)
+# Subsystems from group: Defensive Systems (8 of 12)
 type = "passive"
 
 

eos/effects/covertopscloakcpupercentbonus1.py

@@ -8,4 +8,4 @@ runTime = "early"
 
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Cloaking"),
-                                  "cpu", ship.getModifiedItemAttr("eliteBonusCoverOps1"), skill="Covert Ops")
+                                  "cpu", ship.getModifiedItemAttr("eliteBonusCovertOps1"), skill="Covert Ops")

eos/effects/covertopscloakcpupercentrolebonus.py

@@ -5,7 +5,9 @@
 # Ship: Astero
 # Ship: Enforcer
 # Ship: Pacifier
+# Ship: Victor
 # Ship: Victorieux Luxury Yacht
+# Ship: Virtuoso
 type = "passive"
 runTime = "early"
 

eos/effects/covertopscpubonus1.py

@@ -1,8 +1,8 @@
 # covertOpsCpuBonus1
 #
 # Used by:
-# Ships from group: Stealth Bomber (4 of 4)
-# Subsystems named like: Offensive Covert Reconfiguration (4 of 4)
+# Ships from group: Stealth Bomber (4 of 5)
+# Subsystems named like: Defensive Covert Reconfiguration (4 of 4)
 type = "passive"
 
 

eos/effects/covertopsstealthbombersiegemissilelaunchercpuneedbonus.py

@@ -0,0 +1,10 @@
+# covertOpsStealthBomberSiegeMissileLauncherCPUNeedBonus
+#
+# Used by:
+# Ship: Virtuoso
+type = "passive"
+
+
+def handler(fit, ship, context):
+    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Missile Launcher Torpedo",
+                                     "cpu", ship.getModifiedItemAttr("stealthBomberLauncherCPU"))

eos/effects/covertopsstealthbombersiegemissilelauncherpowerneedbonus.py

@@ -1,7 +1,7 @@
-# covertOpsStealthBomberSiegeMissileLauncerPowerNeedBonus
+# covertOpsStealthBomberSiegeMissileLauncherPowerNeedBonus
 #
 # Used by:
-# Ships from group: Stealth Bomber (4 of 4)
+# Ships from group: Stealth Bomber (5 of 5)
 type = "passive"
 
 

eos/effects/covertopsstealthbombertargettingdelaybonus.py

@@ -1,8 +1,8 @@
 # covertOpsStealthBomberTargettingDelayBonus
 #
 # Used by:
-# Ships from group: Black Ops (4 of 4)
-# Ships from group: Stealth Bomber (4 of 4)
+# Ships from group: Black Ops (5 of 5)
+# Ships from group: Stealth Bomber (5 of 5)
 # Ship: Caedes
 # Ship: Chremoas
 # Ship: Endurance

eos/effects/cpuoutputaddcpuoutputpassive.py

@@ -1,7 +1,7 @@
 # cpuOutputAddCpuOutputPassive
 #
 # Used by:
-# Items from category: Subsystem (40 of 80)
+# Subsystems from group: Offensive Systems (8 of 12)
 type = "passive"
 
 

eos/effects/cynosuraldurationbonus.py

@@ -1,7 +1,7 @@
 # cynosuralDurationBonus
 #
 # Used by:
-# Ships from group: Force Recon Ship (6 of 7)
+# Ships from group: Force Recon Ship (7 of 8)
 type = "passive"
 
 

eos/effects/cynosuraltheoryconsumptionbonus.py

@@ -1,7 +1,7 @@
 # cynosuralTheoryConsumptionBonus
 #
 # Used by:
-# Ships from group: Force Recon Ship (6 of 7)
+# Ships from group: Force Recon Ship (7 of 8)
 # Skill: Cynosural Field Theory
 type = "passive"
 

eos/effects/damagecontrol.py

@@ -1,8 +1,7 @@
 # damageControl
 #
 # Used by:
-# Variations of module: Damage Control I (16 of 16)
-# Module: Civilian Damage Control
+# Modules from group: Damage Control (22 of 27)
 type = "passive"
 
 

eos/effects/dohacking.py

@@ -1,7 +1,7 @@
 # doHacking
 #
 # Used by:
-# Modules from group: Data Miners (15 of 16)
+# Modules from group: Data Miners (9 of 9)
 type = "active"
 
 

eos/effects/doomsdayaoeecm.py

@@ -0,0 +1,18 @@
+# doomsdayAOEECM
+#
+# Used by:
+# Module: ECM Jammer Burst Projector
+from eos.modifiedAttributeDict import ModifiedAttributeDict
+
+type = "projected", "active"
+
+
+def handler(fit, module, context, **kwargs):
+    if "projected" in context:
+        # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
+        strModifier = 1 - module.getModifiedItemAttr("scan{0}StrengthBonus".format(fit.scanType)) / fit.scanStrength
+
+        if 'effect' in kwargs:
+            strModifier *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+        fit.ecmProjectedStr *= strModifier

eos/effects/dronebandwidthaddpassive.py

@@ -1,8 +1,7 @@
 # droneBandwidthAddPassive
 #
 # Used by:
-# Subsystems from group: Engineering Systems (13 of 16)
-# Subsystems from group: Offensive Systems (16 of 16)
+# Subsystems from group: Offensive Systems (12 of 12)
 type = "passive"
 
 

eos/effects/dronecapacityadddronecapacitypassive.py

@@ -1,7 +1,7 @@
 # droneCapacityAdddroneCapacityPassive
 #
 # Used by:
-# Items from category: Subsystem (42 of 80)
+# Subsystems from group: Offensive Systems (12 of 12)
 type = "passive"
 
 

eos/effects/electronicscpuoutputbonuspostpercentcpuoutputlocationshipgroupcomputer.py

@@ -3,6 +3,7 @@
 # Used by:
 # Implants named like: Zainou 'Gypsy' CPU Management EE (6 of 6)
 # Modules named like: Processor Overclocking Unit (8 of 8)
+# Subsystems named like: Core Electronic Efficiency Gate (2 of 2)
 # Implant: Genolution Core Augmentation CA-2
 # Skill: CPU Management
 type = "passive"

eos/effects/elitebonusblackopscloakvelocity2.py

@@ -1,7 +1,7 @@
 # eliteBonusBlackOpsCloakVelocity2
 #
 # Used by:
-# Ships from group: Black Ops (4 of 4)
+# Ships from group: Black Ops (5 of 5)
 type = "passive"
 
 

eos/effects/elitebonusblackopsscramblerrange4.py

@@ -0,0 +1,10 @@
+# eliteBonusBlackOpsScramblerRange4
+#
+# Used by:
+# Ship: Marshal
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler", "maxRange",
+                                  src.getModifiedItemAttr("eliteBonusBlackOps4"), stackingPenalties=True, skill="Black Ops")

eos/effects/elitebonusblackopswarpvelocity1.py

@@ -0,0 +1,9 @@
+# eliteBonusBlackOpsWarpVelocity1
+#
+# Used by:
+# Ship: Marshal
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("eliteBonusBlackOps1"), stackingPenalties=True, skill="Black Ops")

eos/effects/elitebonusblackopswebrange3.py

@@ -0,0 +1,10 @@
+# eliteBonusBlackOpsWebRange3
+#
+# Used by:
+# Ship: Marshal
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange",
+                                  src.getModifiedItemAttr("eliteBonusBlackOps3"), stackingPenalties=True, skill="Black Ops")

eos/effects/elitebonuscoveropsbombemdmg1.py

@@ -7,4 +7,4 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                    "emDamage", ship.getModifiedItemAttr("eliteBonusCoverOps1"), skill="Covert Ops")
+                                    "emDamage", ship.getModifiedItemAttr("eliteBonusCovertOps1"), skill="Covert Ops")

eos/effects/elitebonuscoveropsbombexplosivedmg1.py

@@ -2,10 +2,11 @@
 #
 # Used by:
 # Ship: Hound
+# Ship: Virtuoso
 type = "passive"
 
 
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("eliteBonusCoverOps1"),
+                                    "explosiveDamage", ship.getModifiedItemAttr("eliteBonusCovertOps1"),
                                     skill="Covert Ops")

eos/effects/elitebonuscoveropsbombkineticdmg1.py

@@ -7,5 +7,5 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                    "kineticDamage", ship.getModifiedItemAttr("eliteBonusCoverOps1"),
+                                    "kineticDamage", ship.getModifiedItemAttr("eliteBonusCovertOps1"),
                                     skill="Covert Ops")

eos/effects/elitebonuscoveropsbombthermaldmg1.py

@@ -2,10 +2,11 @@
 #
 # Used by:
 # Ship: Nemesis
+# Ship: Virtuoso
 type = "passive"
 
 
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                    "thermalDamage", ship.getModifiedItemAttr("eliteBonusCoverOps1"),
+                                    "thermalDamage", ship.getModifiedItemAttr("eliteBonusCovertOps1"),
                                     skill="Covert Ops")

eos/effects/elitebonuscoveropsnosneutfalloff1.py

@@ -7,5 +7,5 @@ type = "passive"
 
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Energy Nosferatu", "Energy Neutralizer"),
-                                  "falloffEffectiveness", src.getModifiedItemAttr("eliteBonusCoverOps1"),
+                                  "falloffEffectiveness", src.getModifiedItemAttr("eliteBonusCovertOps1"),
                                   stackingPenalties=True, skill="Covert Ops")

eos/effects/elitebonuscoveropsscanprobestrength2.py

@@ -7,5 +7,5 @@ type = "passive"
 
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe",
-                                    "baseSensorStrength", ship.getModifiedItemAttr("eliteBonusCoverOps2"),
+                                    "baseSensorStrength", ship.getModifiedItemAttr("eliteBonusCovertOps2"),
                                     skill="Covert Ops")

eos/effects/elitebonuscoveropswarpvelocity1.py

@@ -6,4 +6,4 @@ type = "passive"
 
 
 def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("eliteBonusCoverOps1"), skill="Covert Ops")
+    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("eliteBonusCovertOps1"), skill="Covert Ops")

eos/effects/elitebonuscovertopsshtdamage3.py

@@ -0,0 +1,10 @@
+# eliteBonusCovertOpsSHTDamage3
+#
+# Used by:
+# Ship: Virtuoso
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), "damageMultiplier",
+                                  src.getModifiedItemAttr("eliteBonusCovertOps3"), skill="Covert Ops")

eos/effects/elitebonusgunshipdronecapacity2.py

@@ -1,7 +1,4 @@
-# eliteBonusGunshipDroneCapacity2
-#
-# Used by:
-# Ship: Ishkur
+# Not used by any item
 type = "passive"
 
 

eos/effects/elitebonusgunshipdronetracking2.py

@@ -0,0 +1,7 @@
+# Not used by any item
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "trackingSpeed",
+                                 src.getModifiedItemAttr("eliteBonusGunship2"), stackingPenalties=True, skill="Assault Frigates")

eos/effects/elitebonusgunshipemmissiledamage1.py

@@ -0,0 +1,10 @@
+# eliteBonusGunshipEMMissileDamage1
+#
+# Used by:
+# Ship: Jaguar
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "emDamage",
+                                    src.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")

eos/effects/elitebonusgunshipexplosionvelocity2.py

@@ -0,0 +1,10 @@
+# eliteBonusGunshipExplosionVelocity2
+#
+# Used by:
+# Ship: Jaguar
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "aoeVelocity",
+                                    src.getModifiedItemAttr("eliteBonusGunship2"), stackingPenalties=True, skill="Assault Frigates")

eos/effects/elitebonusgunshipexplosivemissiledamage1.py

@@ -0,0 +1,10 @@
+# eliteBonusGunshipExplosiveMissileDamage1
+#
+# Used by:
+# Ship: Jaguar
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "explosiveDamage",
+                                    src.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")

eos/effects/elitebonusgunshipkineticmissiledamage1.py

@@ -0,0 +1,10 @@
+# eliteBonusGunshipKineticMissileDamage1
+#
+# Used by:
+# Ship: Jaguar
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "kineticDamage",
+                                    src.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")

eos/effects/elitebonusgunshipprojectiledamage2.py

@@ -1,7 +1,4 @@
-# eliteBonusGunshipProjectileDamage2
-#
-# Used by:
-# Ship: Jaguar
+# Not used by any item
 type = "passive"
 
 

eos/effects/elitebonusgunshipprojectileoptimal1.py

@@ -1,7 +1,4 @@
-# eliteBonusGunshipProjectileOptimal1
-#
-# Used by:
-# Ship: Jaguar
+# Not used by any item
 type = "passive"
 
 

eos/effects/elitebonusgunshipthermalmissiledamage1.py

@@ -0,0 +1,10 @@
+# eliteBonusGunshipThermalMissileDamage1
+#
+# Used by:
+# Ship: Jaguar
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "thermalDamage",
+                                    src.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")

eos/effects/elitecovertopsbonusarmorrepamount4.py

@@ -0,0 +1,10 @@
+# eliteCovertOpsBonusArmorRepAmount4
+#
+# Used by:
+# Ship: Virtuoso
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), "armorDamageAmount",
+                                  src.getModifiedItemAttr("eliteBonusCovertOps4"), skill="Covert Ops")

eos/effects/elitereconbonusarmorrepamount3.py

@@ -0,0 +1,10 @@
+# eliteReconBonusArmorRepAmount3
+#
+# Used by:
+# Ship: Victor
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), "armorDamageAmount",
+                                  src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")

eos/effects/elitereconbonusmhtdamage1.py

@@ -0,0 +1,10 @@
+# eliteReconBonusMHTDamage1
+#
+# Used by:
+# Ship: Victor
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), "damageMultiplier",
+                                  src.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")

eos/effects/elitereconstasiswebbonus2.py

@@ -4,6 +4,7 @@
 # Ship: Huginn
 # Ship: Moracha
 # Ship: Rapier
+# Ship: Victor
 type = "passive"
 
 

eos/effects/energynosferatufalloff.py

@@ -12,7 +12,7 @@ def handler(fit, src, context, **kwargs):
     amount = src.getModifiedItemAttr("powerTransferAmount")
     time = src.getModifiedItemAttr("duration")
 
-    if 'effect' in kwargs:
+    if 'effect' in kwargs and "projected" in context:
         amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
 
     if "projected" in context:

eos/effects/engineeringpowerengineeringoutputbonuspostpercentpoweroutputlocationshipgrouppowercore.py

@@ -3,6 +3,7 @@
 # Used by:
 # Implants named like: Inherent Implants 'Squire' Power Grid Management EG (6 of 6)
 # Modules named like: Ancillary Current Router (8 of 8)
+# Subsystems named like: Core Augmented Reactor (4 of 4)
 # Implant: Genolution Core Augmentation CA-1
 # Skill: Power Grid Management
 type = "passive"

eos/effects/entosisdurationmultiply.py

@@ -1,7 +1,7 @@
 # entosisDurationMultiply
 #
 # Used by:
-# Items from market group: Ships > Capital Ships (28 of 37)
+# Items from market group: Ships > Capital Ships (31 of 40)
 type = "passive"
 
 

eos/effects/fighterabilityecm.py

@@ -11,13 +11,14 @@ displayName = "ECM"
 prefix = "fighterAbilityECM"
 
 type = "projected", "active"
+grouped = True
 
 
 def handler(fit, module, context, **kwargs):
     if "projected" not in context:
         return
     # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
-    strModifier = 1 - module.getModifiedItemAttr("{}Strength{}".format(prefix, fit.scanType)) / fit.scanStrength
+    strModifier = 1 - (module.getModifiedItemAttr("{}Strength{}".format(prefix, fit.scanType)) * module.amountActive) / fit.scanStrength
 
     if 'effect' in kwargs:
         strModifier *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])

eos/effects/fighterabilityenergyneutralizer.py

@@ -9,11 +9,12 @@ from eos.modifiedAttributeDict import ModifiedAttributeDict
 displayName = "Energy Neutralizer"
 prefix = "fighterAbilityEnergyNeutralizer"
 type = "active", "projected"
+grouped = True
 
 
 def handler(fit, src, context, **kwargs):
     if "projected" in context:
-        amount = src.getModifiedItemAttr("{}Amount".format(prefix))
+        amount = src.getModifiedItemAttr("{}Amount".format(prefix)) * src.amountActive
         time = src.getModifiedItemAttr("{}Duration".format(prefix))
 
         if 'effect' in kwargs:

eos/effects/fighterabilitymicrowarpdrive.py

@@ -14,7 +14,8 @@ runTime = "late"
 
 
 def handler(fit, module, context):
-    module.boostItemAttr("maxVelocity", module.getModifiedItemAttr("fighterAbilityMicroWarpDriveSpeedBonus"))
+    module.boostItemAttr("maxVelocity", module.getModifiedItemAttr("fighterAbilityMicroWarpDriveSpeedBonus"),
+                         stackingPenalties=True)
     module.boostItemAttr("signatureRadius",
                          module.getModifiedItemAttr("fighterAbilityMicroWarpDriveSignatureRadiusBonus"),
                          stackingPenalties=True)

eos/effects/fighterabilitystasiswebifier.py

@@ -6,13 +6,13 @@ effects, and thus this effect file contains some custom information useful only
 
 # User-friendly name for the ability
 displayName = "Stasis Webifier"
-
 prefix = "fighterAbilityStasisWebifier"
-
 type = "active", "projected"
+grouped = True
 
 
 def handler(fit, src, context):
     if "projected" not in context:
         return
-    fit.ship.boostItemAttr("maxVelocity", src.getModifiedItemAttr("{}SpeedPenalty".format(prefix)))
+    fit.ship.boostItemAttr("maxVelocity", src.getModifiedItemAttr("{}SpeedPenalty".format(prefix)) * src.amountActive,
+                           stackingPenalties=True)

eos/effects/fighterabilitywarpdisruption.py

@@ -8,9 +8,10 @@ effects, and thus this effect file contains some custom information useful only
 displayName = "Warp Disruption"
 prefix = "fighterAbilityWarpDisruption"
 type = "active", "projected"
+grouped = True
 
 
 def handler(fit, src, context):
     if "projected" not in context:
         return
-    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("{}PointStrength".format(prefix)))
+    fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("{}PointStrength".format(prefix)) * src.amountActive)

eos/effects/hackingskillvirusbonus.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Modules named like: Memetic Algorithm Bank (8 of 8)
+# Implant: Neural Lace 'Blackglass' Net Intrusion 920-40
 # Implant: Poteque 'Prospector' Environmental Analysis EY-1005
 # Implant: Poteque 'Prospector' Hacking HC-905
 # Skill: Hacking

eos/effects/hackingvirusstrengthbonus.py

@@ -0,0 +1,9 @@
+# hackingVirusStrengthBonus
+#
+# Used by:
+# Implant: Neural Lace 'Blackglass' Net Intrusion 920-40
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Hacking"), "virusStrength", src.getModifiedItemAttr("virusStrengthBonus"))

eos/effects/hardpointmodifiereffect.py

@@ -1,8 +1,7 @@
 # hardPointModifierEffect
 #
 # Used by:
-# Subsystems from group: Engineering Systems (16 of 16)
-# Subsystems from group: Offensive Systems (16 of 16)
+# Subsystems from group: Offensive Systems (12 of 12)
 type = "passive"
 
 

eos/effects/massaddpassive.py

@@ -1,7 +1,4 @@
-# massAddPassive
-#
-# Used by:
-# Items from category: Subsystem (80 of 80)
+# Not used by any item
 type = "passive"
 
 

eos/effects/maxtargetrangeaddpassive.py

@@ -1,7 +1,7 @@
 # maxTargetRangeAddPassive
 #
 # Used by:
-# Subsystems from group: Electronic Systems (16 of 16)
+# Subsystems named like: Propulsion Interdiction Nullifier (4 of 4)
 type = "passive"
 
 

eos/effects/maxvelocityaddpassive.py

@@ -1,7 +1,4 @@
-# maxVelocityAddPassive
-#
-# Used by:
-# Subsystems from group: Propulsion Systems (16 of 16)
+# Not used by any item
 type = "passive"
 
 

eos/effects/mediumremoterepfittingadjustment.py

@@ -0,0 +1,13 @@
+# mediumRemoteRepFittingAdjustment
+#
+# Used by:
+# Variations of module: Medium Remote Armor Repairer I (12 of 12)
+# Variations of module: Medium Remote Shield Booster I (11 of 11)
+# Module: Medium Ancillary Remote Armor Repairer
+# Module: Medium Ancillary Remote Shield Booster
+type = "passive"
+
+
+def handler(fit, module, context):
+    module.multiplyItemAttr("power", module.getModifiedItemAttr("mediumRemoteRepFittingMultiplier"))
+    module.multiplyItemAttr("cpu", module.getModifiedItemAttr("mediumRemoteRepFittingMultiplier"))

eos/effects/minigamevirusstrengthbonus.py

@@ -3,7 +3,7 @@
 # Used by:
 # Ships from group: Covert Ops (7 of 7)
 # Ships named like: Stratios (2 of 2)
-# Subsystems named like: Electronics Emergent Locus Analyzer (4 of 4)
+# Subsystems named like: Defensive Covert Reconfiguration (4 of 4)
 # Ship: Astero
 # Ship: Heron
 # Ship: Imicus

eos/effects/mininginfomultiplier.py

@@ -1,8 +1,8 @@
 # miningInfoMultiplier
 #
 # Used by:
-# Charges from group: Mining Crystal (30 of 30)
-# Charges named like: Mining Crystal (32 of 32)
+# Charges from group: Mining Crystal (40 of 40)
+# Charges named like: Mining Crystal (42 of 42)
 type = "passive"