Merge remote-tracking branch 'origin/master' into singularity

2015-02-14 01:32:44 -05:00
parent 931e48d9a0 6c19f446be
commit 3ce673d8af
132 changed files with 1396 additions and 772 deletions
--- a/eos/effects/agilitymultipliereffect.py
+++ b/eos/effects/agilitymultipliereffect.py
@@ -1,9 +1,9 @@
 # agilityMultiplierEffect
 #
 # Used by:
-# Modules from group: Inertia Stabilizer (12 of 12)
-# Modules from group: Nanofiber Internal Structure (14 of 14)
-# Modules from group: Reinforced Bulkhead (12 of 12)
+# Modules from group: Inertial Stabilizer (7 of 7)
+# Modules from group: Nanofiber Internal Structure (7 of 7)
+# Modules from group: Reinforced Bulkhead (8 of 8)
 type = "passive"
 def handler(fit, module, context):
    fit.ship.boostItemAttr("agility",
--- a/eos/effects/capacitorcapacitymultiply.py
+++ b/eos/effects/capacitorcapacitymultiply.py
@@ -2,8 +2,8 @@
 #
 # Used by:
 # Modules from group: Capacitor Flux Coil (6 of 6)
-# Modules from group: Capacitor Power Relay (26 of 26)
-# Modules from group: Power Diagnostic System (31 of 31)
+# Modules from group: Capacitor Power Relay (20 of 20)
+# Modules from group: Power Diagnostic System (23 of 23)
 # Modules from group: Propulsion Module (107 of 107)
 # Modules from group: Reactor Control Unit (22 of 22)
 # Modules from group: Shield Flux Coil (11 of 11)
--- a/eos/effects/cargocapacitymultiply.py
+++ b/eos/effects/cargocapacitymultiply.py
@@ -1,9 +1,9 @@
 # cargoCapacityMultiply
 #
 # Used by:
-# Modules from group: Expanded Cargohold (13 of 13)
-# Modules from group: Overdrive Injector System (14 of 14)
-# Modules from group: Reinforced Bulkhead (12 of 12)
+# Modules from group: Expanded Cargohold (7 of 7)
+# Modules from group: Overdrive Injector System (7 of 7)
+# Modules from group: Reinforced Bulkhead (8 of 8)
 type = "passive"
 def handler(fit, module, context):
    fit.ship.multiplyItemAttr("capacity", module.getModifiedItemAttr("cargoCapacityMultiplier"))
--- a/eos/effects/drawbackarmorhp.py
+++ b/eos/effects/drawbackarmorhp.py
@@ -1,7 +1,7 @@
 # drawbackArmorHP
 #
 # Used by:
-# Modules from group: Rig Navigation (48 of 68)
+# Modules from group: Rig Navigation (48 of 64)
 type = "passive"
 def handler(fit, module, context):
    fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("drawback"))
--- a/eos/effects/drawbackwarpspeed.py
+++ b/eos/effects/drawbackwarpspeed.py
@@ -1,7 +1,7 @@
 # drawbackWarpSpeed
 #
 # Used by:
-# Modules named like: Higgs Anchor I (4 of 4)
+# Modules from group: Rig Anchor (4 of 4)
 type = "passive"
 def handler(fit, module, context):
    fit.ship.boostItemAttr("warpSpeedMultiplier", module.getModifiedItemAttr("drawback"), stackingPenalties=True)
--- a/eos/effects/dreadnoughtmd1projdmgbonus.py
+++ b/eos/effects/dreadnoughtmd1projdmgbonus.py
@@ -1,7 +1,7 @@
 # dreadnoughtMD1ProjDmgBonus
 #
 # Used by:
-# Ship: Naglfar
+# Ships named like: Naglfar (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("Minmatar Dreadnought").level
--- a/eos/effects/dreadnoughtmd3projrofbonus.py
+++ b/eos/effects/dreadnoughtmd3projrofbonus.py
@@ -1,7 +1,7 @@
 # dreadnoughtMD3ProjRoFBonus
 #
 # Used by:
-# Ship: Naglfar
+# Ships named like: Naglfar (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("Minmatar Dreadnought").level
--- a/eos/effects/dreadnoughtshipbonushybriddmgg1.py
+++ b/eos/effects/dreadnoughtshipbonushybriddmgg1.py
@@ -1,7 +1,7 @@
 # dreadnoughtShipBonusHybridDmgG1
 #
 # Used by:
-# Ship: Moros
+# Ships named like: Moros (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("Gallente Dreadnought").level
--- a/eos/effects/dreadnoughtshipbonushybridrofg2.py
+++ b/eos/effects/dreadnoughtshipbonushybridrofg2.py
@@ -1,7 +1,7 @@
 # dreadnoughtShipBonusHybridRoFG2
 #
 # Used by:
-# Ship: Moros
+# Ships named like: Moros (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("Gallente Dreadnought").level
--- a/eos/effects/dreadnoughtshipbonuslasercapneeda1.py
+++ b/eos/effects/dreadnoughtshipbonuslasercapneeda1.py
@@ -1,7 +1,7 @@
 # dreadnoughtShipBonusLaserCapNeedA1
 #
 # Used by:
-# Ship: Revelation
+# Ships named like: Revelation (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("Amarr Dreadnought").level
--- a/eos/effects/dreadnoughtshipbonuslaserrofa2.py
+++ b/eos/effects/dreadnoughtshipbonuslaserrofa2.py
@@ -1,7 +1,7 @@
 # dreadnoughtShipBonusLaserRofA2
 #
 # Used by:
-# Ship: Revelation
+# Ships named like: Revelation (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("Amarr Dreadnought").level
--- a/eos/effects/dreadnoughtshipbonusshieldresistancesc2.py
+++ b/eos/effects/dreadnoughtshipbonusshieldresistancesc2.py
@@ -1,7 +1,7 @@
 # dreadnoughtShipBonusShieldResistancesC2
 #
 # Used by:
-# Ship: Phoenix
+# Ships named like: Phoenix (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("Caldari Dreadnought").level
--- a/eos/effects/elitereconbonusassaultlauncherrof1.py
+++ b/eos/effects/elitereconbonusassaultlauncherrof1.py
@@ -1,10 +0,0 @@
-# eliteReconBonusAssaultLauncherROF1
-#
-# Used by:
-# Ship: Huginn
-# Ship: Lachesis
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Recon Ships").level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Light",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusReconShip1") * level)
--- a/eos/effects/elitereconbonusheavyassaultlauncherrof1.py
+++ b/eos/effects/elitereconbonusheavyassaultlauncherrof1.py
@@ -1,9 +0,0 @@
-# eliteReconBonusHeavyAssaultLauncherROF1
-#
-# Used by:
-# Ship: Huginn
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Recon Ships").level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusReconShip1") * level)
--- a/eos/effects/elitereconbonusheavylauncherrof1.py
+++ b/eos/effects/elitereconbonusheavylauncherrof1.py
@@ -1,10 +0,0 @@
-# eliteReconBonusHeavyLauncherROF1
-#
-# Used by:
-# Ship: Huginn
-# Ship: Lachesis
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Recon Ships").level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy",
-                                  "speed", ship.getModifiedItemAttr("eliteBonusReconShip1") * level)
--- a/eos/effects/elitereconbonusmhtoptimalrange1.py
+++ b/eos/effects/elitereconbonusmhtoptimalrange1.py
@@ -0,0 +1,9 @@
+# eliteReconBonusMHTOptimalRange1
+#
+# Used by:
+# Ship: Lachesis
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Recon Ships").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"),
+                                  "maxRange", ship.getModifiedItemAttr("eliteBonusReconShip1") * level)
--- a/eos/effects/elitereconbonusmptdamage1.py
+++ b/eos/effects/elitereconbonusmptdamage1.py
@@ -0,0 +1,9 @@
+# eliteReconBonusMPTdamage1
+#
+# Used by:
+# Ship: Huginn
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Recon Ships").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"),
+                                  "damageMultiplier", ship.getModifiedItemAttr("eliteBonusReconShip1") * level)
--- a/eos/effects/elitereconbonusneutrange3.py
+++ b/eos/effects/elitereconbonusneutrange3.py
@@ -0,0 +1,9 @@
+# eliteReconBonusNeutRange3
+#
+# Used by:
+# Ship: Pilgrim
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Recon Ships").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer",
+                                  "energyDestabilizationRange", ship.getModifiedItemAttr("eliteBonusReconShip3") * level)
--- a/eos/effects/elitereconbonusvamprange3.py
+++ b/eos/effects/elitereconbonusvamprange3.py
@@ -0,0 +1,9 @@
+# eliteReconBonusVampRange3
+#
+# Used by:
+# Ship: Pilgrim
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Recon Ships").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire",
+                                  "powerTransferRange", ship.getModifiedItemAttr("eliteBonusReconShip3") * level)
--- a/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py
+++ b/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py
@@ -1,9 +1,9 @@
 # evasiveManeuveringAgilityBonusPostPercentAgilityShip
 #
 # Used by:
+# Modules from group: Rig Anchor (4 of 4)
 # Implants named like: Eifyr and Co. 'Rogue' Evasive Maneuvering EM (6 of 6)
 # Implants named like: grade Nomad (10 of 12)
-# Modules named like: Higgs Anchor I (4 of 4)
 # Modules named like: Low Friction Nozzle Joints (8 of 8)
 # Implant: Genolution Core Augmentation CA-4
 # Skill: Evasive Maneuvering
--- a/eos/effects/freighteragilitybonus2o2.py
+++ b/eos/effects/freighteragilitybonus2o2.py
@@ -1,3 +1,7 @@
+# freighterAgilityBonus2O2
+#
+# Used by:
+# Ship: Bowhead
 type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("ORE Freighter").level
--- a/eos/effects/freightersmacapacitybonuso1.py
+++ b/eos/effects/freightersmacapacitybonuso1.py
@@ -1,3 +1,7 @@
+# freighterSMACapacityBonusO1
+#
+# Used by:
+# Ship: Bowhead
 type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("ORE Freighter").level
--- a/eos/effects/iceharvestcycletimemodulesrequiringiceharvestingonline.py
+++ b/eos/effects/iceharvestcycletimemodulesrequiringiceharvestingonline.py
@@ -1,7 +1,7 @@
 # iceHarvestCycleTimeModulesRequiringIceHarvestingOnline
 #
 # Used by:
-# Variations of module: Ice Harvester Upgrade I (6 of 6)
+# Variations of module: Ice Harvester Upgrade I (5 of 5)
 type = "passive"
 def handler(fit, module, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"),
--- a/eos/effects/iceminercpuusagepercent.py
+++ b/eos/effects/iceminercpuusagepercent.py
@@ -1,7 +1,7 @@
 # iceMinerCpuUsagePercent
 #
 # Used by:
-# Variations of module: Ice Harvester Upgrade I (6 of 6)
+# Variations of module: Ice Harvester Upgrade I (5 of 5)
 type = "passive"
 def handler(fit, module, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"),
--- a/eos/effects/increasesignatureradiusonline.py
+++ b/eos/effects/increasesignatureradiusonline.py
@@ -1,7 +1,7 @@
 # increaseSignatureRadiusOnline
 #
 # Used by:
-# Modules from group: Inertia Stabilizer (12 of 12)
+# Modules from group: Inertial Stabilizer (7 of 7)
 type = "passive"
 def handler(fit, module, context):
    fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusBonus"))
--- a/eos/effects/massreductionbonuspassive.py
+++ b/eos/effects/massreductionbonuspassive.py
@@ -1,7 +1,7 @@
 # massReductionBonusPassive
 #
 # Used by:
-# Modules named like: Higgs Anchor I (4 of 4)
+# Modules from group: Rig Anchor (4 of 4)
 type = "passive"
 def handler(fit, module, context):
    fit.ship.boostItemAttr("mass", module.getModifiedItemAttr("massBonusPercentage"), stackingPenalties=True)
--- a/eos/effects/minercpuusagemultiplypercent2.py
+++ b/eos/effects/minercpuusagemultiplypercent2.py
@@ -1,7 +1,7 @@
 # minerCpuUsageMultiplyPercent2
 #
 # Used by:
-# Variations of module: Mining Laser Upgrade I (6 of 6)
+# Variations of module: Mining Laser Upgrade I (5 of 5)
 type = "passive"
 def handler(fit, module, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
--- a/eos/effects/mininglaser.py
+++ b/eos/effects/mininglaser.py
@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules from group: Frequency Mining Laser (3 of 3)
-# Modules from group: Mining Laser (17 of 17)
+# Modules from group: Mining Laser (12 of 12)
 # Modules from group: Strip Miner (5 of 5)
 type = 'active'
 def handler(fit, module, context):
--- a/eos/effects/miningyieldmultiplypercent.py
+++ b/eos/effects/miningyieldmultiplypercent.py
@@ -1,7 +1,7 @@
 # miningYieldMultiplyPercent
 #
 # Used by:
-# Variations of module: Mining Laser Upgrade I (6 of 6)
+# Variations of module: Mining Laser Upgrade I (5 of 5)
 type = "passive"
 def handler(fit, module, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
--- a/eos/effects/modeagilitypostdiv.py
+++ b/eos/effects/modeagilitypostdiv.py
@@ -1,3 +1,7 @@
+# modeAgilityPostDiv
+#
+# Used by:
+# Module: Amarr Tactical Destroyer Propulsion Mode
 type = "passive"
 def handler(fit, module, context):
    fit.ship.multiplyItemAttr("agility", 1/module.getModifiedItemAttr("modeAgilityPostDiv"),
--- a/eos/effects/modearmorresonancepostdiv.py
+++ b/eos/effects/modearmorresonancepostdiv.py
@@ -1,3 +1,7 @@
+# modeArmorResonancePostDiv
+#
+# Used by:
+# Module: Amarr Tactical Destroyer Defense Mode
 type = "passive"
 def handler(fit, module, context):
    for resType in ("Em", "Explosive", "Kinetic"):
--- a/eos/effects/modesigradiuspostdiv.py
+++ b/eos/effects/modesigradiuspostdiv.py
@@ -1,5 +1,8 @@
+# modeSigRadiusPostDiv
+#
+# Used by:
+# Module: Amarr Tactical Destroyer Defense Mode
 type = "passive"
 def handler(fit, module, context):
-    level = fit.character.getSkill("Minmatar Destroyer").level
    fit.ship.multiplyItemAttr("signatureRadius", 1/module.getModifiedItemAttr("modeSignatureRadiusPostDiv"),
                           stackingPenalties = True, penaltyGroup="postDiv")
--- a/eos/effects/modevelocitypostdiv.py
+++ b/eos/effects/modevelocitypostdiv.py
@@ -1,3 +1,7 @@
+# modeVelocityPostDiv
+#
+# Used by:
+# Module: Amarr Tactical Destroyer Propulsion Mode
 type = "passive"
 def handler(fit, module, context):
    fit.ship.multiplyItemAttr("maxVelocity", 1/module.getModifiedItemAttr("modeVelocityPostDiv"),
--- a/eos/effects/modifymaxvelocityofshippassive.py
+++ b/eos/effects/modifymaxvelocityofshippassive.py
@@ -1,7 +1,7 @@
 # modifyMaxVelocityOfShipPassive
 #
 # Used by:
-# Modules from group: Expanded Cargohold (13 of 13)
+# Modules from group: Expanded Cargohold (7 of 7)
 type = "passive"
 def handler(fit, module, context):
    fit.ship.multiplyItemAttr("maxVelocity", module.getModifiedItemAttr("maxVelocityBonus"),
--- a/eos/effects/modifypowerrechargerate.py
+++ b/eos/effects/modifypowerrechargerate.py
@@ -2,9 +2,9 @@
 #
 # Used by:
 # Modules from group: Capacitor Flux Coil (6 of 6)
-# Modules from group: Capacitor Power Relay (26 of 26)
-# Modules from group: Capacitor Recharger (25 of 25)
-# Modules from group: Power Diagnostic System (31 of 31)
+# Modules from group: Capacitor Power Relay (20 of 20)
+# Modules from group: Capacitor Recharger (18 of 18)
+# Modules from group: Power Diagnostic System (23 of 23)
 # Modules from group: Reactor Control Unit (22 of 22)
 # Modules from group: Shield Flux Coil (11 of 11)
 # Modules from group: Shield Power Relay (11 of 11)
--- a/eos/effects/modifyshieldrechargerate.py
+++ b/eos/effects/modifyshieldrechargerate.py
@@ -2,8 +2,8 @@
 #
 # Used by:
 # Modules from group: Capacitor Flux Coil (6 of 6)
-# Modules from group: Capacitor Power Relay (26 of 26)
-# Modules from group: Power Diagnostic System (31 of 31)
+# Modules from group: Capacitor Power Relay (20 of 20)
+# Modules from group: Power Diagnostic System (23 of 23)
 # Modules from group: Reactor Control Unit (22 of 22)
 # Modules from group: Shield Flux Coil (11 of 11)
 # Modules from group: Shield Recharger (6 of 6)
--- a/eos/effects/mwdsignatureradiusrolebonus.py
+++ b/eos/effects/mwdsignatureradiusrolebonus.py
@@ -2,7 +2,7 @@
 #
 # Used by:
 # Ships from group: Assault Frigate (8 of 12)
-# Ships from group: Heavy Assault Cruiser (8 of 11)
+# Ships from group: Heavy Assault Cruiser (10 of 13)
 type = "passive"
 def handler(fit, ship, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
--- a/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py
+++ b/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py
@@ -1,9 +1,9 @@
 # navigationVelocityBonusPostPercentMaxVelocityShip
 #
 # Used by:
+# Modules from group: Rig Anchor (4 of 4)
 # Implants named like: grade Snake (16 of 18)
 # Modules named like: Auxiliary Thrusters (8 of 8)
-# Modules named like: Higgs Anchor I (4 of 4)
 # Implant: Quafe Zero
 # Skill: Navigation
 type = "passive"
--- a/eos/effects/poweroutputmultiply.py
+++ b/eos/effects/poweroutputmultiply.py
@@ -2,8 +2,8 @@
 #
 # Used by:
 # Modules from group: Capacitor Flux Coil (6 of 6)
-# Modules from group: Capacitor Power Relay (26 of 26)
-# Modules from group: Power Diagnostic System (31 of 31)
+# Modules from group: Capacitor Power Relay (20 of 20)
+# Modules from group: Power Diagnostic System (23 of 23)
 # Modules from group: Reactor Control Unit (22 of 22)
 # Modules from group: Shield Flux Coil (11 of 11)
 # Modules from group: Shield Power Relay (11 of 11)
--- a/eos/effects/probelaunchercpupercentbonustacticaldestroyer.py
+++ b/eos/effects/probelaunchercpupercentbonustacticaldestroyer.py
@@ -1,3 +1,7 @@
+# probeLauncherCPUPercentBonusTacticalDestroyer
+#
+# Used by:
+# Ship: Confessor
 type = "passive"
 def handler(fit, ship, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Astrometrics"),
--- a/eos/effects/rolebonusbulkheadcpu.py
+++ b/eos/effects/rolebonusbulkheadcpu.py
@@ -1,7 +1,7 @@
 # roleBonusBulkheadCPU
 #
 # Used by:
-# Ships from group: Freighter (4 of 4)
+# Ships from group: Freighter (4 of 5)
 # Ships from group: Jump Freighter (4 of 4)
 type = "passive"
 def handler(fit, ship, context):
--- a/eos/effects/shieldboostamplifier.py
+++ b/eos/effects/shieldboostamplifier.py
@@ -1,7 +1,7 @@
 # shieldBoostAmplifier
 #
 # Used by:
-# Modules from group: Capacitor Power Relay (26 of 26)
+# Modules from group: Capacitor Power Relay (20 of 20)
 # Modules from group: Shield Boost Amplifier (25 of 25)
 type = "passive"
 def handler(fit, module, context):
--- a/eos/effects/shieldcapacitymultiply.py
+++ b/eos/effects/shieldcapacitymultiply.py
@@ -2,8 +2,8 @@
 #
 # Used by:
 # Modules from group: Capacitor Flux Coil (6 of 6)
-# Modules from group: Capacitor Power Relay (26 of 26)
-# Modules from group: Power Diagnostic System (31 of 31)
+# Modules from group: Capacitor Power Relay (20 of 20)
+# Modules from group: Power Diagnostic System (23 of 23)
 # Modules from group: Reactor Control Unit (22 of 22)
 # Modules from group: Shield Flux Coil (11 of 11)
 # Modules from group: Shield Power Relay (11 of 11)
--- a/eos/effects/shipadvancedspaceshipcommandagilitybonus.py
+++ b/eos/effects/shipadvancedspaceshipcommandagilitybonus.py
@@ -1,7 +1,7 @@
 # shipAdvancedSpaceshipCommandAgilityBonus
 #
 # Used by:
-# Items from market group: Ships > Capital Ships (27 of 29)
+# Items from market group: Ships > Capital Ships (32 of 34)
 type = "passive"
 def handler(fit, ship, context):
    skill = fit.character.getSkill("Advanced Spaceship Command")
--- a/eos/effects/shipbonusdreadcitadelcruiserofc1.py
+++ b/eos/effects/shipbonusdreadcitadelcruiserofc1.py
@@ -1,7 +1,7 @@
 # shipBonusDreadCitadelCruiseRofC1
 #
 # Used by:
-# Ship: Phoenix
+# Ships named like: Phoenix (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("Caldari Dreadnought").level
--- a/eos/effects/shipbonusdreadcitadeltorprofc1.py
+++ b/eos/effects/shipbonusdreadcitadeltorprofc1.py
@@ -1,7 +1,7 @@
 # shipBonusDreadCitadelTorpRofC1
 #
 # Used by:
-# Ship: Phoenix
+# Ships named like: Phoenix (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("Caldari Dreadnought").level
--- a/eos/effects/shipbonusdronedamagemultipliergb2.py
+++ b/eos/effects/shipbonusdronedamagemultipliergb2.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Variations of ship: Dominix (3 of 3)
+# Ship: Dominix Quafe Edition
 # Ship: Nestor
 type = "passive"
 def handler(fit, ship, context):
--- a/eos/effects/shipbonusdronedamagemultipliergc2.py
+++ b/eos/effects/shipbonusdronedamagemultipliergc2.py
@@ -3,6 +3,7 @@
 # Used by:
 # Ships named like: Stratios (2 of 2)
 # Variations of ship: Vexor (3 of 4)
+# Ship: Vexor Quafe Edition
 type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("Gallente Cruiser").level
--- a/eos/effects/shipbonusdronehitpointsgb2.py
+++ b/eos/effects/shipbonusdronehitpointsgb2.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Variations of ship: Dominix (3 of 3)
+# Ship: Dominix Quafe Edition
 # Ship: Nestor
 type = "passive"
 def handler(fit, ship, context):
--- a/eos/effects/shipbonusdronehitpointsgc2.py
+++ b/eos/effects/shipbonusdronehitpointsgc2.py
@@ -3,6 +3,7 @@
 # Used by:
 # Ships named like: Stratios (2 of 2)
 # Variations of ship: Vexor (3 of 4)
+# Ship: Vexor Quafe Edition
 type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("Gallente Cruiser").level
--- a/eos/effects/shipbonusdronehitpointsgf.py
+++ b/eos/effects/shipbonusdronehitpointsgf.py
@@ -1,8 +1,8 @@
 # shipBonusDroneHitpointsGF
 #
 # Used by:
+# Ships named like: Tristan (2 of 2)
 # Ship: Astero
-# Ship: Tristan
 type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("Gallente Frigate").level
--- a/eos/effects/shipbonusdroneminingamountgc2.py
+++ b/eos/effects/shipbonusdroneminingamountgc2.py
@@ -1,8 +1,7 @@
 # shipBonusDroneMiningAmountGC2
 #
 # Used by:
-# Ship: Vexor
-# Ship: Vexor Navy Issue
+# Ships named like: Vexor (3 of 4)
 type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("Gallente Cruiser").level
--- a/eos/effects/shipbonusdroneoptimalrangegb.py
+++ b/eos/effects/shipbonusdroneoptimalrangegb.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Dominix
+# Ship: Dominix Quafe Edition
 type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("Gallente Battleship").level
--- a/eos/effects/shipbonusdronetrackinggb.py
+++ b/eos/effects/shipbonusdronetrackinggb.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Dominix
+# Ship: Dominix Quafe Edition
 type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("Gallente Battleship").level
--- a/eos/effects/shipbonusdronetrackinggf.py
+++ b/eos/effects/shipbonusdronetrackinggf.py
@@ -1,7 +1,7 @@
 # shipBonusDroneTrackingGF
 #
 # Used by:
-# Ship: Tristan
+# Ships named like: Tristan (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("Gallente Frigate").level
--- a/eos/effects/shipbonusheavyassaultlauncherrateoffirecc2.py
+++ b/eos/effects/shipbonusheavyassaultlauncherrateoffirecc2.py
@@ -1,9 +0,0 @@
-# shipBonusHeavyAssaultLauncherRateOfFireCC2
-#
-# Used by:
-# Ship: Rook
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Cruiser").level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault",
-                                  "speed", ship.getModifiedItemAttr("shipBonusCC2") * level)
--- a/eos/effects/shipbonusheavylauncherrateoffirecc2.py
+++ b/eos/effects/shipbonusheavylauncherrateoffirecc2.py
@@ -1,9 +0,0 @@
-# shipBonusHeavyLauncherRateOfFireCC2
-#
-# Used by:
-# Ship: Rook
-type = "passive"
-def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Cruiser").level
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy",
-                                  "speed", ship.getModifiedItemAttr("shipBonusCC2") * level)
--- a/eos/effects/shipbonushybridtrackinggf2.py
+++ b/eos/effects/shipbonushybridtrackinggf2.py
@@ -1,10 +1,10 @@
 # shipBonusHybridTrackingGF2
 #
 # Used by:
+# Ships named like: Tristan (2 of 2)
 # Ship: Ares
 # Ship: Federation Navy Comet
 # Ship: Police Pursuit Comet
-# Ship: Tristan
 type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("Gallente Frigate").level
--- a/eos/effects/shipbonusthermalmissiledamagegc2.py
+++ b/eos/effects/shipbonusthermalmissiledamagegc2.py
@@ -3,6 +3,7 @@
 # Used by:
 # Ship: Chameleon
 # Ship: Gila
+
 type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("Gallente Cruiser").level
--- a/eos/effects/shipheatdamageamarrtacticaldestroyer3.py
+++ b/eos/effects/shipheatdamageamarrtacticaldestroyer3.py
@@ -1,3 +1,7 @@
+# shipHeatDamageAmarrTacticalDestroyer3
+#
+# Used by:
+# Ship: Confessor
 type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("Amarr Tactical Destroyer").level
--- a/eos/effects/shiphtdmgbonusfixedgc.py
+++ b/eos/effects/shiphtdmgbonusfixedgc.py
@@ -2,13 +2,11 @@
 #
 # Used by:
 # Ships named like: Thorax (3 of 3)
+# Ships named like: Vexor (3 of 4)
 # Ship: Adrestia
 # Ship: Arazu
 # Ship: Deimos
 # Ship: Exequror Navy Issue
-# Ship: Guardian-Vexor
-# Ship: Lachesis
-# Ship: Vexor
 type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("Gallente Cruiser").level
--- a/eos/effects/shiphybridtrackinggc.py
+++ b/eos/effects/shiphybridtrackinggc.py
@@ -1,6 +1,7 @@
 # shipHybridTrackingGC
 #
 # Used by:
+# Ship: Lachesis
 # Ship: Phobos
 type = "passive"
 def handler(fit, ship, context):
--- a/eos/effects/shipmissilebonusemdmgmc.py
+++ b/eos/effects/shipmissilebonusemdmgmc.py
@@ -0,0 +1,9 @@
+# shipMissileBonusEMdmgMC
+#
+# Used by:
+# Ship: Rapier
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Minmatar Cruiser").level
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
+                                    "emDamage", ship.getModifiedItemAttr("shipBonusMC") * level)
--- a/eos/effects/shipmissilebonusexpdmgmc.py
+++ b/eos/effects/shipmissilebonusexpdmgmc.py
@@ -0,0 +1,9 @@
+# shipMissileBonusExpdmgMC
+#
+# Used by:
+# Ship: Rapier
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Minmatar Cruiser").level
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
+                                    "explosiveDamage", ship.getModifiedItemAttr("shipBonusMC") * level)
--- a/eos/effects/shipmissilebonuskindmgmc.py
+++ b/eos/effects/shipmissilebonuskindmgmc.py
@@ -0,0 +1,9 @@
+# shipMissileBonusKindmgMC
+#
+# Used by:
+# Ship: Rapier
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Minmatar Cruiser").level
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
+                                    "kineticDamage", ship.getModifiedItemAttr("shipBonusMC") * level)
--- a/eos/effects/shipmissilebonusthermdmgmc.py
+++ b/eos/effects/shipmissilebonusthermdmgmc.py
@@ -0,0 +1,9 @@
+# shipMissileBonusThermdmgMC
+#
+# Used by:
+# Ship: Rapier
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Minmatar Cruiser").level
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
+                                    "thermalDamage", ship.getModifiedItemAttr("shipBonusMC") * level)
--- a/eos/effects/shipmissilekindamagecc2.py
+++ b/eos/effects/shipmissilekindamagecc2.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Osprey Navy Issue
+# Ship: Rook
 type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("Caldari Cruiser").level
--- a/eos/effects/shipmissilelauncherrofad1fixed.py
+++ b/eos/effects/shipmissilelauncherrofad1fixed.py
@@ -0,0 +1,9 @@
+# shipMissileLauncherRoFAD1Fixed
+#
+# Used by:
+# Ship: Heretic
+type = "passive"
+def handler(fit, ship, context):
+    level = fit.character.getSkill("Amarr Destroyer").level
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),
+                                  "speed", ship.getModifiedItemAttr("shipBonusAD1") * level)
--- a/eos/effects/shipmodemaxtargetrangepostdiv.py
+++ b/eos/effects/shipmodemaxtargetrangepostdiv.py
@@ -1,3 +1,7 @@
+# shipModeMaxTargetRangePostDiv
+#
+# Used by:
+# Module: Amarr Tactical Destroyer Sharpshooter Mode
 type = "passive"
 def handler(fit, module, context):
    fit.ship.multiplyItemAttr("maxTargetRange", 1/module.getModifiedItemAttr("modeMaxTargetRangePostDiv"),
--- a/eos/effects/shipmodescanrespostdiv.py
+++ b/eos/effects/shipmodescanrespostdiv.py
@@ -1,3 +1,7 @@
+# shipModeScanResPostDiv
+#
+# Used by:
+# Module: Amarr Tactical Destroyer Sharpshooter Mode
 type = "passive"
 def handler(fit, module, context):
    fit.ship.multiplyItemAttr("scanResolution", 1/module.getModifiedItemAttr("modeScanResPostDiv"),
--- a/eos/effects/shipmodescanstrengthpostdiv.py
+++ b/eos/effects/shipmodescanstrengthpostdiv.py
@@ -1,3 +1,7 @@
+# shipModeScanStrengthPostDiv
+#
+# Used by:
+# Module: Amarr Tactical Destroyer Sharpshooter Mode
 type = "passive"
 def handler(fit, module, context):
    fit.ship.multiplyItemAttr("scanRadarStrength", 1/module.getModifiedItemAttr("modeRadarStrengthPostDiv"),
--- a/eos/effects/shipmodesetoptimalrangepostdiv.py
+++ b/eos/effects/shipmodesetoptimalrangepostdiv.py
@@ -1,3 +1,7 @@
+# shipModeSETOptimalRangePostDiv
+#
+# Used by:
+# Module: Amarr Tactical Destroyer Sharpshooter Mode
 type = "passive"
 def handler(fit, module, context):
    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Small Energy Turret"),
--- a/eos/effects/shippturretfalloffbonusgb.py
+++ b/eos/effects/shippturretfalloffbonusgb.py
@@ -6,4 +6,4 @@ type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("Gallente Battleship").level
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),
-                                  "falloff", ship.getModifiedItemAttr("shipBonusGB") * level)
+                                  "falloff", ship.getModifiedItemAttr("shipBonusGB") * level)
--- a/eos/effects/shippturretspeedbonusmc.py
+++ b/eos/effects/shippturretspeedbonusmc.py
@@ -5,7 +5,6 @@
 # Variations of ship: Rupture (3 of 3)
 # Variations of ship: Stabber (3 of 3)
 # Ship: Huginn
-# Ship: Rapier
 # Ship: Scythe Fleet Issue
 type = "passive"
 def handler(fit, ship, context):
--- a/eos/effects/shipsetcapneedamarrtacticaldestroyer2.py
+++ b/eos/effects/shipsetcapneedamarrtacticaldestroyer2.py
@@ -1,3 +1,7 @@
+# shipSETCapNeedAmarrTacticalDestroyer2
+#
+# Used by:
+# Ship: Confessor
 type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("Amarr Tactical Destroyer").level
--- a/eos/effects/shipsetdamageamarrtacticaldestroyer1.py
+++ b/eos/effects/shipsetdamageamarrtacticaldestroyer1.py
@@ -1,3 +1,7 @@
+# shipSETDamageAmarrTacticalDestroyer1
+#
+# Used by:
+# Ship: Confessor
 type = "passive"
 def handler(fit, ship, context):
    level = fit.character.getSkill("Amarr Tactical Destroyer").level
--- a/eos/effects/shipxlprojectiledamagerole.py
+++ b/eos/effects/shipxlprojectiledamagerole.py
@@ -1,7 +1,7 @@
 # shipXLProjectileDamageRole
 #
 # Used by:
-# Ship: Naglfar
+# Ships named like: Naglfar (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"),
--- a/eos/effects/structurehpmultiply.py
+++ b/eos/effects/structurehpmultiply.py
@@ -1,8 +1,8 @@
 # structureHPMultiply
 #
 # Used by:
-# Modules from group: Nanofiber Internal Structure (14 of 14)
-# Modules from group: Reinforced Bulkhead (12 of 12)
+# Modules from group: Nanofiber Internal Structure (7 of 7)
+# Modules from group: Reinforced Bulkhead (8 of 8)
 # Modules named like: QA Multiship Module Players (4 of 4)
 type = "passive"
 def handler(fit, module, context):
--- a/eos/effects/structurehpmultiplypassive.py
+++ b/eos/effects/structurehpmultiplypassive.py
@@ -1,7 +1,7 @@
 # structureHPMultiplyPassive
 #
 # Used by:
-# Modules from group: Expanded Cargohold (13 of 13)
+# Modules from group: Expanded Cargohold (7 of 7)
 type = "passive"
 def handler(fit, module, context):
    fit.ship.multiplyItemAttr("hp", module.getModifiedItemAttr("structureHPMultiplier"))
--- a/eos/effects/velocitybonusonline.py
+++ b/eos/effects/velocitybonusonline.py
@@ -1,8 +1,8 @@
 # velocityBonusOnline
 #
 # Used by:
-# Modules from group: Nanofiber Internal Structure (14 of 14)
-# Modules from group: Overdrive Injector System (14 of 14)
+# Modules from group: Nanofiber Internal Structure (7 of 7)
+# Modules from group: Overdrive Injector System (7 of 7)
 type = "passive"
 def handler(fit, module, context):
    fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("implantBonusVelocity"),