Update some effects and headers

eos/effects/armoredcommandmindlink.py

@@ -6,8 +6,8 @@
 # Implant: Imperial Navy Command Mindlink
 type = "passive"
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff2Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff2Modifier", src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff1Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff1Modifier", src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff4Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff4Modifier", src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff3Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff3Modifier", src.getModifiedItemAttr("mindlinkBonus"))
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "buffDuration", src.getModifiedItemAttr("mindlinkBonus"))

eos/effects/armoredcommandstrengthbonus.py

@@ -5,7 +5,7 @@
 type = "passive"
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff1Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff1Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff2Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff2Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff4Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff4Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff3Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff3Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl)

eos/effects/chargebonuswarfarecharge.py

@@ -100,7 +100,7 @@ def handler(fit, module, context, **kwargs):
 
     for x in xrange(1, 4):
         if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
-            value = module.getModifiedChargeAttr("warfareBuff{}Value".format(x))
+            value = module.getModifiedChargeAttr("warfareBuff{}Modifier".format(x))
             id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
             print "Buff ID: ",id," value: ",value
             if id:

eos/effects/iceharvestingdronespecbonus.py

@@ -0,0 +1,9 @@
+# iceHarvestingDroneSpecBonus
+#
+# Used by:
+# Skill: Ice Harvesting Drone Specialization
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Ice Harvesting Drone Specialization"), "duration", src.getModifiedItemAttr("rofBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Ice Harvesting Drone Specialization"), "maxVelocity", src.getModifiedItemAttr("maxVelocityBonus") * lvl)

eos/effects/industrialcommandshipskilllevelmultiplierics3.py

@@ -0,0 +1,8 @@
+# industrialCommandShipSkillLevelMultiplierICS3
+#
+# Used by:
+# Skill: Industrial Command Ships
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.ship.multiplyItemAttr("shipBonusICS3", src.getModifiedItemAttr("skillLevel") * lvl)

eos/effects/industrialcommandshipskilllevelmultiplierics4.py

@@ -0,0 +1,8 @@
+# industrialCommandShipSkillLevelMultiplierICS4
+#
+# Used by:
+# Skill: Industrial Command Ships
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.ship.multiplyItemAttr("shipBonusICS4", src.getModifiedItemAttr("skillLevel") * lvl)

eos/effects/industrialcommandshipskilllevelmultiplierics5.py

@@ -0,0 +1,8 @@
+# industrialCommandShipSkillLevelMultiplierICS5
+#
+# Used by:
+# Skill: Industrial Command Ships
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.ship.multiplyItemAttr("shipBonusICS5", src.getModifiedItemAttr("skillLevel") * lvl)

eos/effects/industrialcoreeffect2.py

@@ -7,6 +7,9 @@ runTime = "early"
 
 
 def handler(fit, module, context):
+    return
+
+    # @todo: finish this
     fit.extraAttributes["siege"] = True
     fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor"))
     fit.ship.multiplyItemAttr("mass", module.getModifiedItemAttr("siegeMassMultiplier"))
@@ -20,7 +23,7 @@ def handler(fit, module, context):
                                                  (
                                                      "Shield Command",
                                                  ),
-                                     "warfareBuff4Value",
+                                     "warfareBuff4Modifier",
-                                     src.getModifiedItemAttr("shipBonusORECapital3"),
+                                     module.getModifiedItemAttr("shipBonusORECapital3"),
                                      skill="Capital Industrial Ships",
                                      )

eos/effects/informationcommandmindlink.py

@@ -6,8 +6,8 @@
 # Implant: Information Command Mindlink
 type = "passive"
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff4Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff4Modifier", src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff3Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff3Modifier", src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff1Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff1Modifier", src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff2Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff2Modifier", src.getModifiedItemAttr("mindlinkBonus"))
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "buffDuration", src.getModifiedItemAttr("mindlinkBonus"))

eos/effects/informationcommandstrengthbonus.py

@@ -5,7 +5,7 @@
 type = "passive"
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff2Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff2Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff1Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff1Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff3Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff3Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff4Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff4Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl)

eos/effects/invulnerabilitycoredurationbonus.py

@@ -0,0 +1,9 @@
+# invulnerabilityCoreDurationBonus
+#
+# Used by:
+# Skill: Invulnerability Core Operation
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Invulnerability Core Operation"), "buffDuration", src.getModifiedItemAttr("durationBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Invulnerability Core Operation"), "duration", src.getModifiedItemAttr("durationBonus") * lvl)

eos/effects/miningforemanburstbonusics2.py

@@ -3,72 +3,9 @@
 # Used by:
 # Ships from group: Industrial Command Ship (2 of 2)
 type = "passive"
-
-
 def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Modifier", src.getModifiedItemAttr("shipBonusICS2"), skill="Industrial Command Ships")
-                                                 (
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Modifier", src.getModifiedItemAttr("shipBonusICS2"), skill="Industrial Command Ships")
-                                                     "Command Burst",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "buffDuration", src.getModifiedItemAttr("shipBonusICS2"), skill="Industrial Command Ships")
-                                                 ) and
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Modifier", src.getModifiedItemAttr("shipBonusICS2"), skill="Industrial Command Ships")
-                                                 mod.item.requiresSkill in
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Modifier", src.getModifiedItemAttr("shipBonusICS2"), skill="Industrial Command Ships")
-                                                 (
-                                                     "Mining Foreman",
-                                                 ),
-                                     "buffDuration",
-                                     src.getModifiedItemAttr("shipBonusICS2"),
-                                     skill="Industrial Command Ships",
-                                     )
-
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in
-                                                 (
-                                                     "Command Burst",
-                                                 ) and
-                                                 mod.item.requiresSkill in
-                                                 (
-                                                     "Mining Foreman",
-                                                 ),
-                                     "warfareBuff1Value",
-                                     src.getModifiedItemAttr("shipBonusICS2"),
-                                     skill="Industrial Command Ships",
-                                     )
-
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in
-                                                 (
-                                                     "Command Burst",
-                                                 ) and
-                                                 mod.item.requiresSkill in
-                                                 (
-                                                     "Mining Foreman",
-                                                 ),
-                                     "warfareBuff2Value",
-                                     src.getModifiedItemAttr("shipBonusICS2"),
-                                     skill="Industrial Command Ships",
-                                     )
-
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in
-                                                 (
-                                                     "Command Burst",
-                                                 ) and
-                                                 mod.item.requiresSkill in
-                                                 (
-                                                     "Mining Foreman",
-                                                 ),
-                                     "warfareBuff3Value",
-                                     src.getModifiedItemAttr("shipBonusICS2"),
-                                     skill="Industrial Command Ships",
-                                     )
-
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in
-                                                 (
-                                                     "Command Burst",
-                                                 ) and
-                                                 mod.item.requiresSkill in
-                                                 (
-                                                     "Mining Foreman",
-                                                 ),
-                                     "warfareBuff4Value",
-                                     src.getModifiedItemAttr("shipBonusICS2"),
-                                     skill="Industrial Command Ships",
-                                     )
-
-#  TODO: test

eos/effects/miningforemanburstbonusorecapital2.py

@@ -3,68 +3,9 @@
 # Used by:
 # Ship: Rorqual
 type = "passive"
-
-
 def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Modifier", src.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships")
-                                                 (
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Modifier", src.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships")
-                                                     "Command Burst",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Modifier", src.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships")
-                                                 ) and
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Modifier", src.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships")
-                                                 mod.item.requiresSkill in
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "buffDuration", src.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships")
-                                                 (
-                                                     "Mining Foreman",
-                                                 ),
-                                     "buffDuration",
-                                     src.getModifiedItemAttr("shipBonusORECapital2"),
-                                     )
-
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in
-                                                 (
-                                                     "Command Burst",
-                                                 ) and
-                                                 mod.item.requiresSkill in
-                                                 (
-                                                     "Mining Foreman",
-                                                 ),
-                                     "warfareBuff1Value",
-                                     src.getModifiedItemAttr("shipBonusORECapital2"),
-                                     )
-
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in
-                                                 (
-                                                     "Command Burst",
-                                                 ) and
-                                                 mod.item.requiresSkill in
-                                                 (
-                                                     "Mining Foreman",
-                                                 ),
-                                     "warfareBuff2Value",
-                                     src.getModifiedItemAttr("shipBonusORECapital2"),
-                                     )
-
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in
-                                                 (
-                                                     "Command Burst",
-                                                 ) and
-                                                 mod.item.requiresSkill in
-                                                 (
-                                                     "Mining Foreman",
-                                                 ),
-                                     "warfareBuff3Value",
-                                     src.getModifiedItemAttr("shipBonusORECapital2"),
-                                     )
-
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in
-                                                 (
-                                                     "Command Burst",
-                                                 ) and
-                                                 mod.item.requiresSkill in
-                                                 (
-                                                     "Mining Foreman",
-                                                 ),
-                                     "warfareBuff4Value",
-                                     src.getModifiedItemAttr("shipBonusORECapital2"),
-                                     skill="Capital Industrial Ships",
-                                     )
-
-#  TODO: test

eos/effects/miningforemanmindlink.py

@@ -5,8 +5,8 @@
 # Implant: ORE Mining Director Mindlink
 type = "passive"
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Modifier", src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Modifier", src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Modifier", src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Modifier", src.getModifiedItemAttr("mindlinkBonus"))
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "buffDuration", src.getModifiedItemAttr("mindlinkBonus"))

eos/effects/miningforemanstrengthbonus.py

@@ -5,7 +5,7 @@
 type = "passive"
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl)

eos/effects/moduletitaneffectgenerator.py

@@ -64,7 +64,7 @@ def handler(fit, module, context, **kwargs):
 
     for x in xrange(1, 4):
         if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
-            value = module.getModifiedChargeAttr("warfareBuff{}Value".format(x))
+            value = module.getModifiedChargeAttr("warfareBuff{}Modifier".format(x))
             id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
 
             if id:

eos/effects/orecapitalshipskillmultiplier5.py

@@ -0,0 +1,8 @@
+# oreCapitalShipSkillMultiplier5
+#
+# Used by:
+# Skill: Capital Industrial Ships
+type = "passive"
+def handler(fit, src, context):
+    lvl = src.level
+    fit.ship.multiplyItemAttr("shipBonusORECapital5", src.getModifiedItemAttr("skillLevel") * lvl)

eos/effects/shieldcommandburstbonusics3.py

@@ -3,72 +3,9 @@
 # Used by:
 # Ship: Orca
 type = "passive"
-
-
 def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Modifier", src.getModifiedItemAttr("shipBonusICS3"), skill="Industrial Command Ships")
-                                                 (
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Modifier", src.getModifiedItemAttr("shipBonusICS3"), skill="Industrial Command Ships")
-                                                     "Command Burst",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Modifier", src.getModifiedItemAttr("shipBonusICS3"), skill="Industrial Command Ships")
-                                                 ) and
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Modifier", src.getModifiedItemAttr("shipBonusICS3"), skill="Industrial Command Ships")
-                                                 mod.item.requiresSkill in
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "buffDuration", src.getModifiedItemAttr("shipBonusICS3"), skill="Industrial Command Ships")
-                                                 (
-                                                     "Shield Command",
-                                                 ),
-                                     "buffDuration",
-                                     src.getModifiedItemAttr("shipBonusICS3"),
-                                     skill="Industrial Command Ships",
-                                     )
-
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in
-                                                 (
-                                                     "Command Burst",
-                                                 ) and
-                                                 mod.item.requiresSkill in
-                                                 (
-                                                     "Shield Command",
-                                                 ),
-                                     "warfareBuff1Value",
-                                     src.getModifiedItemAttr("shipBonusICS3"),
-                                     skill="Industrial Command Ships",
-                                     )
-
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in
-                                                 (
-                                                     "Command Burst",
-                                                 ) and
-                                                 mod.item.requiresSkill in
-                                                 (
-                                                     "Shield Command",
-                                                 ),
-                                     "warfareBuff2Value",
-                                     src.getModifiedItemAttr("shipBonusICS3"),
-                                     skill="Industrial Command Ships",
-                                     )
-
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in
-                                                 (
-                                                     "Command Burst",
-                                                 ) and
-                                                 mod.item.requiresSkill in
-                                                 (
-                                                     "Shield Command",
-                                                 ),
-                                     "warfareBuff3Value",
-                                     src.getModifiedItemAttr("shipBonusICS3"),
-                                     skill="Industrial Command Ships",
-                                     )
-
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in
-                                                 (
-                                                     "Command Burst",
-                                                 ) and
-                                                 mod.item.requiresSkill in
-                                                 (
-                                                     "Shield Command"
-                                                 ),
-                                     "warfareBuff4Value",
-                                     src.getModifiedItemAttr("shipBonusICS3"),
-                                     skill="Industrial Command Ships",
-                                     )
-
-#  TODO: test

eos/effects/shieldcommandburstbonusorecapital3.py

@@ -3,72 +3,9 @@
 # Used by:
 # Ship: Rorqual
 type = "passive"
-
-
 def handler(fit, src, context):
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Modifier", 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")
-                                                     "Command Burst",
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Modifier", src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships")
-                                                 ) and
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Modifier", src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships")
-                                                 mod.item.requiresSkill in
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Modifier", src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships")
-                                                 (
-                                                     "Shield Command",
-                                                 ),
-                                     "buffDuration",
-                                     src.getModifiedItemAttr("shipBonusORECapital3"),
-                                     skill="Capital Industrial Ships",
-                                     )
-
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in
-                                                 (
-                                                     "Command Burst",
-                                                 ) and
-                                                 mod.item.requiresSkill in
-                                                 (
-                                                     "Shield Command",
-                                                 ),
-                                     "warfareBuff1Value",
-                                     src.getModifiedItemAttr("shipBonusORECapital3"),
-                                     skill="Capital Industrial Ships",
-                                     )
-
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in
-                                                 (
-                                                     "Command Burst",
-                                                 ) and
-                                                 mod.item.requiresSkill in
-                                                 (
-                                                     "Shield Command",
-                                                 ),
-                                     "warfareBuff2Value",
-                                     src.getModifiedItemAttr("shipBonusORECapital3"),
-                                     skill="Capital Industrial Ships",
-                                     )
-
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in
-                                                 (
-                                                     "Command Burst",
-                                                 ) and
-                                                 mod.item.requiresSkill in
-                                                 (
-                                                     "Shield Command",
-                                                 ),
-                                     "warfareBuff3Value",
-                                     src.getModifiedItemAttr("shipBonusORECapital3"),
-                                     skill="Capital Industrial Ships",
-                                     )
-
-    fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in
-                                                 (
-                                                     "Command Burst",
-                                                 ) and
-                                                 mod.item.requiresSkill in
-                                                 (
-                                                     "Shield Command",
-                                                 ),
-                                     "warfareBuff4Value",
-                                     src.getModifiedItemAttr("shipBonusORECapital3"),
-                                     skill="Capital Industrial Ships",
-                                     )
-
-#  TODO: test

eos/effects/shieldcommandmindlink.py

@@ -4,8 +4,8 @@
 # Implants from group: Cyber Leadership (4 of 10)
 type = "passive"
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Modifier", src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Modifier", src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Modifier", src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Modifier", src.getModifiedItemAttr("mindlinkBonus"))
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "buffDuration", src.getModifiedItemAttr("mindlinkBonus"))

eos/effects/shieldcommandstrengthbonus.py

@@ -5,7 +5,7 @@
 type = "passive"
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl)

eos/effects/shipbonusdronehpdamageminingics4.py

@@ -36,4 +36,3 @@ def handler(fit, src, context):
                                  skill="Industrial Command Ships"
                                  )
 
-#  TODO: test

eos/effects/shipbonusdronehpdamageminingorecapital4.py

@@ -36,4 +36,3 @@ def handler(fit, src, context):
                                  skill="Capital Industrial Ships"
                                  )
 
-#  TODO: test

eos/effects/shipbonusdroneiceharvestingics5.py

@@ -11,5 +11,3 @@ def handler(fit, src, context):
                                  src.getModifiedItemAttr("shipBonusICS5"),
                                  skill="Industrial Command Ships"
                                  )
-
-#  TODO: test

eos/effects/shipbonusdroneiceharvestingorecapital5.py

@@ -11,5 +11,3 @@ def handler(fit, src, context):
                                  src.getModifiedItemAttr("shipBonusORECapital5"),
                                  skill="Capital Industrial Ships"
                                  )
-
-#  TODO: test

eos/effects/shipbonusdroneiceharvestingrole.py

@@ -3,12 +3,5 @@
 # Used by:
 # Ship: Orca
 type = "passive"
-
-
 def handler(fit, src, context):
-    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Ice Harvesting Drone Operation"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Ice Harvesting Drone Operation"), "duration", src.getModifiedItemAttr("roleBonusDroneIceHarvestingSpeed"))
-                                 "duration",
-                                 src.getModifiedItemAttr("roleBonusDroneIceHarvestingSpeed")
-                                 )
-
-#  TODO: test

eos/effects/shipbonusdroneminingamountrole.py

@@ -10,5 +10,3 @@ def handler(fit, src, context):
                                  "miningAmount",
                                  src.getModifiedItemAttr("roleBonusDroneMiningYield"),
                                  )
-
-#  TODO: test

eos/effects/skirmishcommandmindlink.py

@@ -6,8 +6,8 @@
 # Implant: Skirmish Command Mindlink
 type = "passive"
 def handler(fit, src, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff3Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff3Modifier", src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff4Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff4Modifier", src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff2Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff2Modifier", src.getModifiedItemAttr("mindlinkBonus"))
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff1Value", src.getModifiedItemAttr("mindlinkBonus"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff1Modifier", src.getModifiedItemAttr("mindlinkBonus"))
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "buffDuration", src.getModifiedItemAttr("mindlinkBonus"))

eos/effects/skirmishcommandstrengthbonus.py

@@ -5,7 +5,7 @@
 type = "passive"
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff3Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff3Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff4Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff4Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff1Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff1Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff2Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff2Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl)

eos/effects/techtwocommandburstbonus.py

@@ -4,4 +4,4 @@ runTime = "late"
 
 def handler(fit, module, context):
     for x in xrange(1, 4):
-        module.boostChargeAttr("warfareBuff{}Value".format(x), module.getModifiedItemAttr("commandBurstStrengthBonus"))
+        module.boostChargeAttr("warfareBuff{}Modifier".format(x), module.getModifiedItemAttr("commandBurstStrengthBonus"))