Merge branch 'bug/resist-effects' (also includes current work on sisi branch).

This fixes the ewar resists (and possibly implements remote repair impedance, not tested)
2017-05-06 12:04:10 -04:00
parent 283cb1e50c 622efb624d
commit 1f7858f853
141 changed files with 504 additions and 274 deletions
--- a/eos/db/gamedata/effect.py
+++ b/eos/db/gamedata/effect.py
@@ -22,7 +22,7 @@ from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.orm import mapper, synonym, relation, deferred

 from eos.db import gamedata_meta
-from eos.gamedata import Effect, EffectInfo
+from eos.gamedata import Effect, ItemEffect

 typeeffects_table = Table("dgmtypeeffects", gamedata_meta,
                          Column("typeID", Integer, ForeignKey("invtypes.typeID"), primary_key=True, index=True),
@@ -34,21 +34,15 @@ effects_table = Table("dgmeffects", gamedata_meta,
                      Column("description", String),
                      Column("published", Boolean),
                      Column("isAssistance", Boolean),
-                      Column("isOffensive", Boolean))
+                      Column("isOffensive", Boolean),
+                      Column("resistanceID", Integer))

-mapper(EffectInfo, effects_table,
+mapper(Effect, effects_table,
       properties={
           "ID"         : synonym("effectID"),
           "name"       : synonym("effectName"),
           "description": deferred(effects_table.c.description)
       })

-mapper(Effect, typeeffects_table,
-       properties={
-           "ID"  : synonym("effectID"),
-           "info": relation(EffectInfo, lazy=False)
-       })
+mapper(ItemEffect, typeeffects_table)

-Effect.name = association_proxy("info", "name")
-Effect.description = association_proxy("info", "description")
-Effect.published = association_proxy("info", "published")
--- a/eos/db/gamedata/item.py
+++ b/eos/db/gamedata/item.py
@@ -21,6 +21,7 @@ from sqlalchemy import Column, String, Integer, Boolean, ForeignKey, Table, Floa
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.orm import relation, mapper, synonym, deferred
 from sqlalchemy.orm.collections import attribute_mapped_collection
+from eos.db.gamedata.effect import typeeffects_table

 from eos.db import gamedata_meta
 from eos.gamedata import Attribute, Effect, Group, Icon, Item, MetaType, Traits
@@ -47,7 +48,7 @@ mapper(Item, items_table,
           "group"            : relation(Group, backref="items"),
           "icon"             : relation(Icon),
           "_Item__attributes": relation(Attribute, collection_class=attribute_mapped_collection('name')),
-           "effects"          : relation(Effect, 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,
                                         uselist=False),
--- a/eos/db/migrations/upgrade23.py
+++ b/eos/db/migrations/upgrade23.py
@@ -0,0 +1,14 @@
+"""
+Migration 23
+
+- Adds a sec status field to the character table
+"""
+import sqlalchemy
+
+
+def upgrade(saveddata_engine):
+    try:
+        saveddata_engine.execute("SELECT secStatus FROM characters LIMIT 1")
+    except sqlalchemy.exc.DatabaseError:
+        saveddata_engine.execute("ALTER TABLE characters ADD COLUMN secStatus FLOAT;")
+
--- a/eos/db/saveddata/character.py
+++ b/eos/db/saveddata/character.py
@@ -17,7 +17,7 @@
 # along with eos.  If not, see <http://www.gnu.org/licenses/>.
 # ===============================================================================

-from sqlalchemy import Table, Column, Integer, ForeignKey, String, DateTime
+from sqlalchemy import Table, Column, Integer, ForeignKey, String, DateTime, Float
 from sqlalchemy.orm import relation, mapper
 import sqlalchemy.sql.functions as func

@@ -38,6 +38,7 @@ characters_table = Table("characters", saveddata_meta,
                         Column("defaultLevel", Integer, nullable=True),
                         Column("alphaCloneID", Integer, nullable=True),
                         Column("ownerID", ForeignKey("users.ID"), nullable=True),
+                         Column("secStatus", Float, nullable=True, default=0.0),
                         Column("created", DateTime, nullable=True, default=func.now()),
                         Column("modified", DateTime, nullable=True, onupdate=func.now()))

--- a/eos/effects/ammoinfluencecapneed.py
+++ b/eos/effects/ammoinfluencecapneed.py
@@ -1,7 +1,7 @@
 # ammoInfluenceCapNeed
 #
 # Used by:
-# Items from category: Charge (465 of 912)
+# Items from category: Charge (466 of 913)
 # Charges from group: Frequency Crystal (185 of 185)
 # Charges from group: Hybrid Charge (209 of 209)
 type = "passive"
--- a/eos/effects/ammoinfluencerange.py
+++ b/eos/effects/ammoinfluencerange.py
@@ -1,7 +1,7 @@
 # ammoInfluenceRange
 #
 # Used by:
-# Items from category: Charge (571 of 912)
+# Items from category: Charge (571 of 913)
 type = "passive"


--- a/eos/effects/commandburstaoerolebonus.py
+++ b/eos/effects/commandburstaoerolebonus.py
@@ -4,9 +4,9 @@
 # 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 (4 of 4)
+# Ships from group: Force Auxiliary (5 of 5)
 # Ships from group: Supercarrier (6 of 6)
-# Ships from group: Titan (5 of 5)
+# Ships from group: Titan (6 of 6)
 # Subsystems named like: Defensive Warfare Processor (4 of 4)
 # Ship: Orca
 # Ship: Rorqual
--- a/eos/effects/concordsecstatustankbonus.py
+++ b/eos/effects/concordsecstatustankbonus.py
@@ -0,0 +1,15 @@
+type = "passive"
+def handler(fit, src, context):
+
+    # Get pilot sec status bonus directly here, instead of going through the intermediary effects
+    # via https://forums.eveonline.com/default.aspx?g=posts&t=515826
+    try:
+        bonus = max(0, min(50.0, (src.parent.character.secStatus * 10)))
+    except:
+        bonus = None
+
+    if bonus is not None:
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
+                                  "armorDamageAmount", bonus, stackingPenalties=True)
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
+                                  "shieldBonus", bonus, stackingPenalties=True)
--- a/eos/effects/covertopsandreconopscloakmoduledelaybonus.py
+++ b/eos/effects/covertopsandreconopscloakmoduledelaybonus.py
@@ -3,9 +3,9 @@
 # Used by:
 # Ships from group: Black Ops (4 of 4)
 # Ships from group: Blockade Runner (4 of 4)
-# Ships from group: Covert Ops (6 of 6)
+# Ships from group: Covert Ops (7 of 7)
 # Ships from group: Expedition Frigate (2 of 2)
-# Ships from group: Force Recon Ship (6 of 6)
+# Ships from group: Force Recon Ship (7 of 7)
 # Ships from group: Stealth Bomber (4 of 4)
 # Ships named like: Stratios (2 of 2)
 # Subsystems named like: Offensive Covert Reconfiguration (4 of 4)
--- a/eos/effects/covertopscloakcpupercentbonus1.py
+++ b/eos/effects/covertopscloakcpupercentbonus1.py
@@ -1,7 +1,7 @@
 # covertOpsCloakCpuPercentBonus1
 #
 # Used by:
-# Ships from group: Covert Ops (5 of 6)
+# Ships from group: Covert Ops (5 of 7)
 type = "passive"
 runTime = "early"

--- a/eos/effects/covertopscloakcpupercentbonuspiratefaction.py
+++ b/eos/effects/covertopscloakcpupercentbonuspiratefaction.py
@@ -1,8 +1,10 @@
-# covertOpsCloakCPUPercentBonusPirateFaction
+# covertOpsCloakCPUPercentRoleBonus
 #
 # Used by:
 # Ships from group: Expedition Frigate (2 of 2)
 # Ship: Astero
+# Ship: Enforcer
+# Ship: Pacifier
 # Ship: Victorieux Luxury Yacht
 type = "passive"
 runTime = "early"
@@ -10,4 +12,4 @@ runTime = "early"

 def handler(fit, ship, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Cloaking"),
-                                  "cpu", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                  "cpu", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/cynosuraldurationbonus.py
+++ b/eos/effects/cynosuraldurationbonus.py
@@ -1,7 +1,7 @@
 # cynosuralDurationBonus
 #
 # Used by:
-# Ships from group: Force Recon Ship (5 of 6)
+# Ships from group: Force Recon Ship (6 of 7)
 type = "passive"


--- a/eos/effects/cynosuraltheoryconsumptionbonus.py
+++ b/eos/effects/cynosuraltheoryconsumptionbonus.py
@@ -1,7 +1,7 @@
 # cynosuralTheoryConsumptionBonus
 #
 # Used by:
-# Ships from group: Force Recon Ship (5 of 6)
+# Ships from group: Force Recon Ship (6 of 7)
 # Skill: Cynosural Field Theory
 type = "passive"

--- a/eos/effects/elitebonuscoveropsscanprobestrength2.py
+++ b/eos/effects/elitebonuscoveropsscanprobestrength2.py
@@ -1,7 +1,7 @@
 # eliteBonusCoverOpsScanProbeStrength2
 #
 # Used by:
-# Ships from group: Covert Ops (6 of 6)
+# Ships from group: Covert Ops (7 of 7)
 type = "passive"


--- a/eos/effects/elitebonuscoveropswarpvelocity1.py
+++ b/eos/effects/elitebonuscoveropswarpvelocity1.py
@@ -0,0 +1,7 @@
+# eliteBonusCoverOpsWarpVelocity1
+#
+# Used by:
+# Ship: Pacifier
+type = "passive"
+def handler(fit, src, context):
+    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("eliteBonusCoverOps1"), skill="Covert Ops")
--- a/eos/effects/elitebonusreconwarpvelocity3.py
+++ b/eos/effects/elitebonusreconwarpvelocity3.py
@@ -0,0 +1,7 @@
+# eliteBonusReconWarpVelocity3
+#
+# Used by:
+# Ship: Enforcer
+type = "passive"
+def handler(fit, src, context):
+    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
--- a/eos/effects/elitereconjumpscramblerrangebonus2.py
+++ b/eos/effects/elitereconjumpscramblerrangebonus2.py
@@ -1,7 +1,8 @@
-# eliteReconJumpScramblerRangeBonus2
+# eliteReconScramblerRangeBonus2
 #
 # Used by:
 # Ship: Arazu
+# Ship: Enforcer
 # Ship: Lachesis
 type = "passive"

--- a/eos/effects/elitereconstasiswebbonus1.py
+++ b/eos/effects/elitereconstasiswebbonus1.py
@@ -0,0 +1,7 @@
+# eliteReconStasisWebBonus1
+#
+# Used by:
+# Ship: Enforcer
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange", src.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
--- a/eos/effects/entosisdurationmultiply.py
+++ b/eos/effects/entosisdurationmultiply.py
@@ -1,12 +1,7 @@
 # entosisDurationMultiply
 #
 # Used by:
-# Ships from group: Carrier (4 of 4)
-# Ships from group: Dreadnought (5 of 5)
-# Ships from group: Force Auxiliary (4 of 4)
-# Ships from group: Supercarrier (6 of 6)
-# Ships from group: Titan (5 of 5)
-# Ship: Rorqual
+# Items from market group: Ships > Capital Ships (28 of 37)
 type = "passive"


--- a/eos/effects/minigamevirusstrengthbonus.py
+++ b/eos/effects/minigamevirusstrengthbonus.py
@@ -1,7 +1,7 @@
 # minigameVirusStrengthBonus
 #
 # Used by:
-# Ships from group: Covert Ops (6 of 6)
+# 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)
 # Ship: Astero
--- a/eos/effects/miningforemanburstbonusorecapital2.py
+++ b/eos/effects/miningforemanburstbonusorecapital2.py
@@ -6,13 +6,13 @@ type = "passive"


 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Multiplier",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Value",
                                  src.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Multiplier",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Value",
                                  src.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Multiplier",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Value",
                                  src.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Multiplier",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Value",
                                  src.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships")
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "buffDuration",
                                  src.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships")
--- a/eos/effects/npcentityweapondisruptor.py
+++ b/eos/effects/npcentityweapondisruptor.py
@@ -5,14 +5,14 @@
 type = "projected", "active"


-def handler(fit, module, context):
+def handler(fit, module, context, *args, **kwargs):
    if "projected" in context:
        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                      "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                      stackingPenalties=True, remoteResists=True)
+                                      stackingPenalties=True, *args, **kwargs)
        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                      "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                      stackingPenalties=True, remoteResists=True)
+                                      stackingPenalties=True, *args, **kwargs)
        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
                                      "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                      stackingPenalties=True, remoteResists=True)
+                                      stackingPenalties=True, *args, **kwargs)
--- a/eos/effects/reconshipcloakcpubonus1.py
+++ b/eos/effects/reconshipcloakcpubonus1.py
@@ -1,7 +1,7 @@
 # reconShipCloakCpuBonus1
 #
 # Used by:
-# Ships from group: Force Recon Ship (6 of 6)
+# Ships from group: Force Recon Ship (6 of 7)
 type = "passive"
 runTime = "early"

--- a/eos/effects/remotesensordampentity.py
+++ b/eos/effects/remotesensordampentity.py
@@ -5,12 +5,12 @@
 type = "projected", "active"


-def handler(fit, module, context):
+def handler(fit, module, context, *args, **kwargs):
    if "projected" not in context:
        return

    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties=True, remoteResists=True)
+                           stackingPenalties=True, *args, **kwargs)

    fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
-                           stackingPenalties=True, remoteResists=True)
+                           stackingPenalties=True, *args, **kwargs)
--- a/eos/effects/remotesensordampfalloff.py
+++ b/eos/effects/remotesensordampfalloff.py
@@ -5,12 +5,12 @@
 type = "projected", "active"


-def handler(fit, module, context):
+def handler(fit, module, context, *args, **kwargs):
    if "projected" not in context:
        return

    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties=True, remoteResists=True)
+                           stackingPenalties=True, *args, **kwargs)

    fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
-                           stackingPenalties=True, remoteResists=True)
+                           stackingPenalties=True, *args, **kwargs)
--- a/eos/effects/remotetargetpaintentity.py
+++ b/eos/effects/remotetargetpaintentity.py
@@ -5,7 +5,7 @@
 type = "projected", "active"


-def handler(fit, container, context):
+def handler(fit, container, context, *args, **kwargs):
    if "projected" in context:
        fit.ship.boostItemAttr("signatureRadius", container.getModifiedItemAttr("signatureRadiusBonus"),
-                               stackingPenalties=True, remoteResists=True)
+                               stackingPenalties=True, *args, **kwargs)
--- a/eos/effects/remotetargetpaintfalloff.py
+++ b/eos/effects/remotetargetpaintfalloff.py
@@ -5,7 +5,7 @@
 type = "projected", "active"


-def handler(fit, container, context):
+def handler(fit, container, context, *args, **kwargs):
    if "projected" in context:
        fit.ship.boostItemAttr("signatureRadius", container.getModifiedItemAttr("signatureRadiusBonus"),
-                               stackingPenalties=True, remoteResists=True)
+                               stackingPenalties=True, *args, **kwargs)
--- a/eos/effects/remotewebifierentity.py
+++ b/eos/effects/remotewebifierentity.py
@@ -5,8 +5,8 @@
 type = "active", "projected"


-def handler(fit, module, context):
+def handler(fit, module, context, *args, **kwargs):
    if "projected" not in context:
        return
    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor"),
-                           stackingPenalties=True, remoteResists=True)
+                           stackingPenalties=True, *args, **kwargs)
--- a/eos/effects/remotewebifierfalloff.py
+++ b/eos/effects/remotewebifierfalloff.py
@@ -6,8 +6,8 @@
 type = "active", "projected"


-def handler(fit, module, context):
+def handler(fit, module, context, *args, **kwargs):
    if "projected" not in context:
        return
    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor"),
-                           stackingPenalties=True, remoteResists=True)
+                           stackingPenalties=True, *args, **kwargs)
--- a/eos/effects/scriptdurationbonus.py
+++ b/eos/effects/scriptdurationbonus.py
@@ -1,7 +1,7 @@
 # scriptDurationBonus
 #
 # Used by:
-# Charge: Focused Warp Disruption Script
+# Charges from group: Warp Disruption Script (2 of 2)
 type = "passive"


--- a/eos/effects/scriptmassbonuspercentagebonus.py
+++ b/eos/effects/scriptmassbonuspercentagebonus.py
@@ -1,7 +1,7 @@
 # scriptMassBonusPercentageBonus
 #
 # Used by:
-# Charge: Focused Warp Disruption Script
+# Charges from group: Warp Disruption Script (2 of 2)
 type = "passive"
 runTime = "early"

--- a/eos/effects/scriptsignatureradiusbonusbonus.py
+++ b/eos/effects/scriptsignatureradiusbonusbonus.py
@@ -1,7 +1,7 @@
 # scriptSignatureRadiusBonusBonus
 #
 # Used by:
-# Charge: Focused Warp Disruption Script
+# Charges from group: Warp Disruption Script (2 of 2)
 type = "passive"
 runTime = "early"

--- a/eos/effects/scriptspeedboostfactorbonusbonus.py
+++ b/eos/effects/scriptspeedboostfactorbonusbonus.py
@@ -1,7 +1,7 @@
 # scriptSpeedBoostFactorBonusBonus
 #
 # Used by:
-# Charge: Focused Warp Disruption Script
+# Charges from group: Warp Disruption Script (2 of 2)
 type = "passive"
 runTime = "early"

--- a/eos/effects/scriptspeedfactorbonusbonus.py
+++ b/eos/effects/scriptspeedfactorbonusbonus.py
@@ -1,7 +1,7 @@
 # scriptSpeedFactorBonusBonus
 #
 # Used by:
-# Charge: Focused Warp Disruption Script
+# Charges from group: Warp Disruption Script (2 of 2)
 type = "passive"
 runTime = "early"

--- a/eos/effects/scriptwarpdisruptionfieldgeneratorsetdisallowinempirespace.py
+++ b/eos/effects/scriptwarpdisruptionfieldgeneratorsetdisallowinempirespace.py
@@ -1,7 +1,7 @@
 # scriptWarpDisruptionFieldGeneratorSetDisallowInEmpireSpace
 #
 # Used by:
-# Charge: Focused Warp Disruption Script
+# Charges from group: Warp Disruption Script (2 of 2)
 type = "passive"


--- a/eos/effects/scriptwarpscramblerangebonus.py
+++ b/eos/effects/scriptwarpscramblerangebonus.py
@@ -1,7 +1,7 @@
 # scriptWarpScrambleRangeBonus
 #
 # Used by:
-# Charge: Focused Warp Disruption Script
+# Charges from group: Warp Disruption Script (2 of 2)
 type = "passive"


--- a/eos/effects/shieldcommandburstbonusorecapital3.py
+++ b/eos/effects/shieldcommandburstbonusorecapital3.py
@@ -6,13 +6,13 @@ type = "passive"


 def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Multiplier",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Value",
                                  src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships")
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "buffDuration",
                                  src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Multiplier",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Value",
                                  src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Multiplier",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Value",
                                  src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships")
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Multiplier",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Value",
                                  src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships")
--- a/eos/effects/shieldmanagementshieldcapacitybonuspostpercentcapacitylocationshipgroupshield.py
+++ b/eos/effects/shieldmanagementshieldcapacitybonuspostpercentcapacitylocationshipgroupshield.py
@@ -3,7 +3,6 @@
 # Used by:
 # Implants named like: Zainou 'Gnome' Shield Management SM (6 of 6)
 # Modules named like: Core Defense Field Extender (8 of 8)
-# Modules named like: QA Multiship Module Players (4 of 4)
 # Implant: Genolution Core Augmentation CA-3
 # Implant: Sansha Modified 'Gnome' Implant
 # Skill: Shield Management
--- a/eos/effects/shipadvancedspaceshipcommandagilitybonus.py
+++ b/eos/effects/shipadvancedspaceshipcommandagilitybonus.py
@@ -1,7 +1,7 @@
 # shipAdvancedSpaceshipCommandAgilityBonus
 #
 # Used by:
-# Items from market group: Ships > Capital Ships (34 of 34)
+# Items from market group: Ships > Capital Ships (37 of 37)
 type = "passive"


--- a/eos/effects/shipbonusdreadnoughta1energywarfareamountbonus.py
+++ b/eos/effects/shipbonusdreadnoughta1energywarfareamountbonus.py
@@ -0,0 +1,8 @@
+# shipBonusDreadnoughtA1EnergyWarfareAmountBonus
+#
+# Used by:
+# Ship: Chemosh
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferAmount", src.getModifiedItemAttr("shipBonusDreadnoughtA1"), skill="Amarr Dreadnought")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyNeutralizerAmount", src.getModifiedItemAttr("shipBonusDreadnoughtA1"), skill="Amarr Dreadnought")
--- a/eos/effects/shipbonusdreadnoughtm1webrangebonus.py
+++ b/eos/effects/shipbonusdreadnoughtm1webrangebonus.py
@@ -0,0 +1,7 @@
+# shipBonusDreadnoughtM1WebRangeBonus
+#
+# Used by:
+# Ship: Chemosh
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange", src.getModifiedItemAttr("shipBonusDreadnoughtM1"), skill="Minmatar Dreadnought")
--- a/eos/effects/shipbonusdreadnoughtm1webstrengthbonus.py
+++ b/eos/effects/shipbonusdreadnoughtm1webstrengthbonus.py
@@ -1,4 +1,4 @@
-# shipBonusDreadnoughtM1WebBonus
+# shipBonusDreadnoughtM1WebStrengthBonus
 #
 # Used by:
 # Ship: Vehement
--- a/eos/effects/shipbonusdronemwdboostrole.py
+++ b/eos/effects/shipbonusdronemwdboostrole.py
@@ -8,4 +8,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),
-                                 "maxVelocity", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "maxVelocity", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipbonusforceauxiliarya1nosferatudrainamount.py
+++ b/eos/effects/shipbonusforceauxiliarya1nosferatudrainamount.py
@@ -0,0 +1,7 @@
+# shipBonusForceAuxiliaryA1NosferatuDrainAmount
+#
+# Used by:
+# Ship: Dagon
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"), skill="Amarr Carrier")
--- a/eos/effects/shipbonusforceauxiliarya1nosferaturangebonus.py
+++ b/eos/effects/shipbonusforceauxiliarya1nosferaturangebonus.py
@@ -0,0 +1,8 @@
+# shipBonusForceAuxiliaryA1NosferatuRangeBonus
+#
+# Used by:
+# Ship: Dagon
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"), skill="Amarr Carrier")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"), skill="Amarr Carrier")
--- a/eos/effects/shipbonusforceauxiliarym1remotearmorrepairduration.py
+++ b/eos/effects/shipbonusforceauxiliarym1remotearmorrepairduration.py
@@ -0,0 +1,7 @@
+# shipBonusForceAuxiliaryM1RemoteArmorRepairDuration
+#
+# Used by:
+# Ship: Dagon
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "duration", src.getModifiedItemAttr("shipBonusForceAuxiliaryM1"), skill="Minmatar Carrier")
--- a/eos/effects/shipbonusforceauxiliarym1remotecycletime.py
+++ b/eos/effects/shipbonusforceauxiliarym1remotecycletime.py
@@ -1,4 +1,4 @@
-# shipBonusForceAuxiliaryM1RemoteCycleTime
+# shipBonusForceAuxiliaryM1RemoteDuration
 #
 # Used by:
 # Ship: Lif
--- a/eos/effects/shipbonusheavydronearmorhppiratefaction.py
+++ b/eos/effects/shipbonusheavydronearmorhppiratefaction.py
@@ -7,4 +7,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "armorHP", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipbonusheavydronedamagemultiplierpiratefaction.py
+++ b/eos/effects/shipbonusheavydronedamagemultiplierpiratefaction.py
@@ -7,4 +7,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipbonusheavydronehppiratefaction.py
+++ b/eos/effects/shipbonusheavydronehppiratefaction.py
@@ -7,4 +7,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "hp", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipbonusheavydroneshieldhppiratefaction.py
+++ b/eos/effects/shipbonusheavydroneshieldhppiratefaction.py
@@ -7,4 +7,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipbonushybridtrackinggf2.py
+++ b/eos/effects/shipbonushybridtrackinggf2.py
@@ -3,6 +3,7 @@
 # Used by:
 # Ship: Ares
 # Ship: Federation Navy Comet
+# Ship: Pacifier
 # Ship: Tristan
 type = "passive"

--- a/eos/effects/shipbonusletoptimalrangepiratefaction.py
+++ b/eos/effects/shipbonusletoptimalrangepiratefaction.py
@@ -7,4 +7,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                  "maxRange", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipbonuslightdronearmorhppiratefaction.py
+++ b/eos/effects/shipbonuslightdronearmorhppiratefaction.py
@@ -8,4 +8,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "armorHP", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipbonuslightdronedamagemultiplierpiratefaction.py
+++ b/eos/effects/shipbonuslightdronedamagemultiplierpiratefaction.py
@@ -8,4 +8,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipbonuslightdronehppiratefaction.py
+++ b/eos/effects/shipbonuslightdronehppiratefaction.py
@@ -8,4 +8,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "hp", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipbonuslightdroneshieldhppiratefaction.py
+++ b/eos/effects/shipbonuslightdroneshieldhppiratefaction.py
@@ -8,4 +8,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipbonusmediumdronearmorhppiratefaction.py
+++ b/eos/effects/shipbonusmediumdronearmorhppiratefaction.py
@@ -8,4 +8,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "armorHP", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipbonusmediumdronedamagemultiplierpiratefaction.py
+++ b/eos/effects/shipbonusmediumdronedamagemultiplierpiratefaction.py
@@ -8,4 +8,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipbonusmediumdronehppiratefaction.py
+++ b/eos/effects/shipbonusmediumdronehppiratefaction.py
@@ -8,4 +8,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "hp", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipbonusmediumdroneshieldhppiratefaction.py
+++ b/eos/effects/shipbonusmediumdroneshieldhppiratefaction.py
@@ -8,4 +8,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipbonusmediumenergyturretdamagepiratefaction.py
+++ b/eos/effects/shipbonusmediumenergyturretdamagepiratefaction.py
@@ -10,4 +10,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipbonusmedmissileflighttimecc2.py
+++ b/eos/effects/shipbonusmedmissileflighttimecc2.py
@@ -0,0 +1,8 @@
+# shipBonusMedMissileFlightTimeCC2
+#
+# Used by:
+# Ship: Enforcer
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "explosionDelay", src.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), "explosionDelay", src.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")
--- a/eos/effects/shipbonusmetoptimalac2.py
+++ b/eos/effects/shipbonusmetoptimalac2.py
@@ -1,6 +1,7 @@
 # shipBonusMETOptimalAC2
 #
 # Used by:
+# Ship: Enforcer
 # Ship: Omen Navy Issue
 type = "passive"

--- a/eos/effects/shipbonusmetoptimalrangepiratefaction.py
+++ b/eos/effects/shipbonusmetoptimalrangepiratefaction.py
@@ -7,4 +7,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"),
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                  "maxRange", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipbonuspiratefrigateprojdamage.py
+++ b/eos/effects/shipbonuspiratefrigateprojdamage.py
@@ -10,4 +10,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipbonuspiratesmallhybriddmg.py
+++ b/eos/effects/shipbonuspiratesmallhybriddmg.py
@@ -9,4 +9,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipbonusremoterepairamountpiratefaction.py
+++ b/eos/effects/shipbonusremoterepairamountpiratefaction.py
@@ -7,4 +7,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                  "armorDamageAmount", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipbonusrole1capitalhybriddamagebonus.py
+++ b/eos/effects/shipbonusrole1capitalhybriddamagebonus.py
@@ -1,4 +1,4 @@
-# shipBonusDreadnoughtRole1DamageBonus
+# shipBonusRole1CapitalHybridDamageBonus
 #
 # Used by:
 # Ship: Vehement
--- a/eos/effects/shipbonusforceauxiliaryrole1cpubonus.py
+++ b/eos/effects/shipbonusforceauxiliaryrole1cpubonus.py
@@ -1,7 +1,7 @@
-# shipBonusForceAuxiliaryRole1CPUBonus
+# shipBonusRole1CommandBurstCPUBonus
 #
 # Used by:
-# Ships from group: Force Auxiliary (4 of 4)
+# Ships from group: Force Auxiliary (5 of 5)
 type = "passive"


--- a/eos/effects/shipbonustitanrole1numwarfarelinks.py
+++ b/eos/effects/shipbonustitanrole1numwarfarelinks.py
@@ -1,7 +1,7 @@
-# shipBonusTitanRole1NumWarfareLinks
+# shipBonusRole1NumWarfareLinks
 #
 # Used by:
-# Ships from group: Titan (5 of 5)
+# Ships from group: Titan (6 of 6)
 type = "passive"


--- a/eos/effects/shipbonusrole2armorplatesshieldextendersbonus.py
+++ b/eos/effects/shipbonusrole2armorplatesshieldextendersbonus.py
@@ -1,7 +1,7 @@
-# shipBonusTitanRole2ArmorShieldModuleBonus
+# shipBonusRole2ArmorPlates&ShieldExtendersBonus
 #
 # Used by:
-# Ships from group: Titan (5 of 5)
+# Ships from group: Titan (6 of 6)
 type = "passive"


--- a/eos/effects/shipbonusforceauxiliaryrole2logisticdronebonus.py
+++ b/eos/effects/shipbonusforceauxiliaryrole2logisticdronebonus.py
@@ -1,7 +1,7 @@
-# shipBonusForceAuxiliaryRole2LogisticDroneBonus
+# shipBonusRole2LogisticDroneBonus
 #
 # Used by:
-# Ships from group: Force Auxiliary (4 of 4)
+# Ships from group: Force Auxiliary (5 of 5)
 type = "passive"


--- a/eos/effects/shipbonusrole3capitalenergydamagebonus.py
+++ b/eos/effects/shipbonusrole3capitalenergydamagebonus.py
@@ -0,0 +1,8 @@
+# shipBonusRole3CapitalEnergyDamageBonus
+#
+# Used by:
+# Ship: Chemosh
+# Ship: Molok
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"), "damageMultiplier", src.getModifiedItemAttr("shipBonusRole3"))
--- a/eos/effects/shipbonusrole3capitalhybriddamagebonus.py
+++ b/eos/effects/shipbonusrole3capitalhybriddamagebonus.py
@@ -1,4 +1,4 @@
-# shipBonusTitanRole3DamageBonus
+# shipBonusRole3CapitalHybridDamageBonus
 #
 # Used by:
 # Ship: Vanquisher
--- a/eos/effects/shipbonusforceauxiliaryrole3numwarfarelinks.py
+++ b/eos/effects/shipbonusforceauxiliaryrole3numwarfarelinks.py
@@ -1,7 +1,7 @@
-# shipBonusForceAuxiliaryRole3NumWarfareLinks
+# shipBonusRole3NumWarfareLinks
 #
 # Used by:
-# Ships from group: Force Auxiliary (4 of 4)
+# Ships from group: Force Auxiliary (5 of 5)
 type = "passive"


--- a/eos/effects/shipbonusrole4nosferatucpubonus.py
+++ b/eos/effects/shipbonusrole4nosferatucpubonus.py
@@ -0,0 +1,8 @@
+# shipBonusRole4NosferatuCPUBonus
+#
+# Used by:
+# Ship: Dagon
+# Ship: Rabisu
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "cpu", src.getModifiedItemAttr("shipBonusRole4"))
--- a/eos/effects/shipbonusrole5capitalremotearmorrepairpowergridbonus.py
+++ b/eos/effects/shipbonusrole5capitalremotearmorrepairpowergridbonus.py
@@ -0,0 +1,7 @@
+# shipBonusRole5CapitalRemoteArmorRepairPowergridBonus
+#
+# Used by:
+# Ship: Dagon
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"), "power", src.getModifiedItemAttr("shipBonusRole5"))
--- a/eos/effects/shipbonusrole5remotearmorrepairpowergridbonus.py
+++ b/eos/effects/shipbonusrole5remotearmorrepairpowergridbonus.py
@@ -1,4 +1,4 @@
-# remoteArmorPowerNeedBonusEffect
+# shipBonusRole5RemoteArmorRepairPowergridBonus
 #
 # Used by:
 # Ships from group: Logistics (3 of 6)
@@ -7,4 +7,4 @@ type = "passive"

 def handler(fit, src, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "power",
-                                  src.getModifiedItemAttr("remoteArmorPowerNeedBonus"))
+                                  src.getModifiedItemAttr("shipBonusRole5"))
--- a/eos/effects/shipbonussentrydronearmorhppiratefaction.py
+++ b/eos/effects/shipbonussentrydronearmorhppiratefaction.py
@@ -7,4 +7,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "armorHP", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "armorHP", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipbonussentrydronedamagemultiplierpiratefaction.py
+++ b/eos/effects/shipbonussentrydronedamagemultiplierpiratefaction.py
@@ -7,4 +7,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipbonussentrydronehppiratefaction.py
+++ b/eos/effects/shipbonussentrydronehppiratefaction.py
@@ -7,4 +7,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "hp", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "hp", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipbonussentrydroneshieldhppiratefaction.py
+++ b/eos/effects/shipbonussentrydroneshieldhppiratefaction.py
@@ -7,4 +7,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"),
-                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                 "shieldCapacity", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipbonussmallenergyturretdamagepiratefaction.py
+++ b/eos/effects/shipbonussmallenergyturretdamagepiratefaction.py
@@ -12,4 +12,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipbonussmallmissileflighttimecf1.py
+++ b/eos/effects/shipbonussmallmissileflighttimecf1.py
@@ -0,0 +1,8 @@
+# shipBonusSmallMissileFlightTimeCF1
+#
+# Used by:
+# Ship: Pacifier
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "explosionDelay", src.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"), "explosionDelay", src.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate")
--- a/eos/effects/shipbonussmallmissilerofcf2.py
+++ b/eos/effects/shipbonussmallmissilerofcf2.py
@@ -1,8 +1,9 @@
-# shipMissileSpeedBonusCF
+# shipBonusSmallMissileRoFCF2
 #
 # Used by:
 # Ship: Buzzard
 # Ship: Hawk
+# Ship: Pacifier
 type = "passive"


--- a/eos/effects/shipbonussptfalloffmf2.py
+++ b/eos/effects/shipbonussptfalloffmf2.py
@@ -1,6 +1,7 @@
 # shipBonusSPTFalloffMF2
 #
 # Used by:
+# Ship: Pacifier
 # Ship: Rifter
 type = "passive"

--- a/eos/effects/shipbonussptrofmf.py
+++ b/eos/effects/shipbonussptrofmf.py
@@ -0,0 +1,7 @@
+# shipBonusSPTRoFMF
+#
+# Used by:
+# Ship: Pacifier
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), "speed", src.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate")
--- a/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py
+++ b/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py
@@ -1,7 +1,7 @@
 # shipBonusSurveyProbeExplosionDelaySkillSurveyCovertOps3
 #
 # Used by:
-# Ships from group: Covert Ops (4 of 6)
+# Ships from group: Covert Ops (5 of 7)
 type = "passive"


--- a/eos/effects/shipbonustitana1energywarfareamountbonus.py
+++ b/eos/effects/shipbonustitana1energywarfareamountbonus.py
@@ -0,0 +1,8 @@
+# shipBonusTitanA1EnergyWarfareAmountBonus
+#
+# Used by:
+# Ship: Molok
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferAmount", src.getModifiedItemAttr("shipBonusTitanA1"), skill="Amarr Titan")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyNeutralizerAmount", src.getModifiedItemAttr("shipBonusTitanA1"), skill="Amarr Titan")
--- a/eos/effects/shipbonustitana3warpstrength.py
+++ b/eos/effects/shipbonustitana3warpstrength.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Avatar
+# Ship: Molok
 type = "passive"


--- a/eos/effects/shipbonustitanm1webrangebonus.py
+++ b/eos/effects/shipbonustitanm1webrangebonus.py
@@ -0,0 +1,7 @@
+# shipBonusTitanM1WebRangeBonus
+#
+# Used by:
+# Ship: Molok
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange", src.getModifiedItemAttr("shipBonusTitanM1"), skill="Minmatar Titan")
--- a/eos/effects/shipbonustitanm1webstrengthbonus.py
+++ b/eos/effects/shipbonustitanm1webstrengthbonus.py
@@ -1,4 +1,4 @@
-# shipBonusTitanM1WebBonus
+# shipBonusTitanM1WebStrengthBonus
 #
 # Used by:
 # Ship: Vanquisher
--- a/eos/effects/shipbonustitanm3warpstrength.py
+++ b/eos/effects/shipbonustitanm3warpstrength.py
@@ -1,8 +1,7 @@
 # shipBonusTitanM3WarpStrength
 #
 # Used by:
-# Ship: Ragnarok
-# Ship: Vanquisher
+# Ships from group: Titan (3 of 6)
 type = "passive"


--- a/eos/effects/shipcapitalagilitybonus.py
+++ b/eos/effects/shipcapitalagilitybonus.py
@@ -1,12 +1,7 @@
 # shipCapitalAgilityBonus
 #
 # Used by:
-# Ships from group: Carrier (4 of 4)
-# Ships from group: Dreadnought (5 of 5)
-# Ships from group: Force Auxiliary (4 of 4)
-# Ships from group: Supercarrier (6 of 6)
-# Ships from group: Titan (5 of 5)
-# Ship: Rorqual
+# Items from market group: Ships > Capital Ships (28 of 37)
 type = "passive"


--- a/eos/effects/shipetdamageaf.py
+++ b/eos/effects/shipetdamageaf.py
@@ -4,6 +4,7 @@
 # Ship: Crucifier Navy Issue
 # Ship: Crusader
 # Ship: Imperial Navy Slicer
+# Ship: Pacifier
 type = "passive"


--- a/eos/effects/shipetoptimalrange2af.py
+++ b/eos/effects/shipetoptimalrange2af.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Imperial Navy Slicer
+# Ship: Pacifier
 type = "passive"


--- a/eos/effects/shipheavyassaultmissileemdmgpiratecruiser.py
+++ b/eos/effects/shipheavyassaultmissileemdmgpiratecruiser.py
@@ -7,4 +7,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "emDamage", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                    "emDamage", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipheavyassaultmissileexpdmgpiratecruiser.py
+++ b/eos/effects/shipheavyassaultmissileexpdmgpiratecruiser.py
@@ -7,4 +7,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/eos/effects/shipheavyassaultmissilekindmgpiratecruiser.py
+++ b/eos/effects/shipheavyassaultmissilekindmgpiratecruiser.py
@@ -7,4 +7,4 @@ type = "passive"

 def handler(fit, ship, context):
    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"),
-                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusPirateFaction"))
+                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusRole7"))
--- a/Show More
+++ b/Show More