Update effects

2017-11-22 23:04:32 -05:00
parent 7058018aed
commit f0baba10df
71 changed files with 155 additions and 56 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -117,3 +117,4 @@ ENV/
 # Pycharm project settings
 .idea
 eos.iml
+gitversion
--- a/eos/effects/boosterarmorhppenalty.py
+++ b/eos/effects/boosterarmorhppenalty.py
@@ -1,7 +1,7 @@
 # boosterArmorHpPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 52)
+# Implants from group: Booster (12 of 54)
 type = "boosterSideEffect"

 # User-friendly name for the side effect
--- a/eos/effects/boostermaxvelocitypenalty.py
+++ b/eos/effects/boostermaxvelocitypenalty.py
@@ -1,7 +1,7 @@
 # boosterMaxVelocityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 52)
+# Implants from group: Booster (12 of 54)
 type = "boosterSideEffect"

 # User-friendly name for the side effect
--- a/eos/effects/boostermodifyboosterturretpenalty.py
+++ b/eos/effects/boostermodifyboosterturretpenalty.py
@@ -9,7 +9,7 @@ type = "passive"

 def handler(fit, container, context):
    level = container.level if "skill" in context else 1
-    attrs = ("boosterTurretFalloffPenalty", "boosterTurretOptimalRange", "boosterTurretTrackingPenalty")
+    attrs = ("boosterTurretFalloffPenalty", "boosterTurretOptimalRangePenalty", "boosterTurretTrackingPenalty")
    for attr in attrs:
        fit.boosters.filteredItemBoost(lambda booster: True, attr,
                                       container.getModifiedItemAttr("boosterAttributeModifier") * level)
--- a/eos/effects/boostershieldcapacitypenalty.py
+++ b/eos/effects/boostershieldcapacitypenalty.py
@@ -1,7 +1,7 @@
 # boosterShieldCapacityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 52)
+# Implants from group: Booster (12 of 54)
 type = "boosterSideEffect"

 # User-friendly name for the side effect
--- a/eos/effects/boosterturretoptimalrangepenalty.py
+++ b/eos/effects/boosterturretoptimalrangepenalty.py
@@ -10,7 +10,7 @@ type = "boosterSideEffect"
 displayName = "Turret Optimal Range"

 # Attribute that this effect targets
-attr = "boosterTurretOptimalRange"
+attr = "boosterTurretOptimalRangePenalty"


 def handler(fit, booster, context):
--- a/eos/effects/covertopsandreconopscloakmoduledelaybonus.py
+++ b/eos/effects/covertopsandreconopscloakmoduledelaybonus.py
@@ -5,8 +5,8 @@
 # Ships from group: Blockade Runner (4 of 4)
 # Ships from group: Covert Ops (7 of 7)
 # Ships from group: Expedition Frigate (2 of 2)
-# Ships from group: Force Recon Ship (7 of 8)
-# Ships from group: Stealth Bomber (4 of 5)
+# Ships from group: Force Recon Ship (8 of 8)
+# Ships from group: Stealth Bomber (5 of 5)
 # Ships named like: Stratios (2 of 2)
 # Subsystems named like: Defensive Covert Reconfiguration (4 of 4)
 # Ship: Astero
--- a/eos/effects/covertopscloakcpupercentbonus1.py
+++ b/eos/effects/covertopscloakcpupercentbonus1.py
@@ -8,4 +8,4 @@ runTime = "early"

 def handler(fit, ship, context):
    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Cloaking"),
-                                  "cpu", ship.getModifiedItemAttr("eliteBonusCoverOps1"), skill="Covert Ops")
+                                  "cpu", ship.getModifiedItemAttr("eliteBonusCovertOps1"), skill="Covert Ops")
--- a/eos/effects/covertopscloakcpupercentrolebonus.py
+++ b/eos/effects/covertopscloakcpupercentrolebonus.py
@@ -5,7 +5,9 @@
 # Ship: Astero
 # Ship: Enforcer
 # Ship: Pacifier
+# Ship: Victor
 # Ship: Victorieux Luxury Yacht
+# Ship: Virtuoso
 type = "passive"
 runTime = "early"

--- a/eos/effects/covertopsstealthbombersiegemissilelaunchercpuneedbonus.py
+++ b/eos/effects/covertopsstealthbombersiegemissilelaunchercpuneedbonus.py
@@ -0,0 +1,10 @@
+# covertOpsStealthBomberSiegeMissileLauncherCPUNeedBonus
+#
+# Used by:
+# Ship: Virtuoso
+type = "passive"
+
+
+def handler(fit, ship, context):
+    fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Missile Launcher Torpedo",
+                                     "cpu", ship.getModifiedItemAttr("stealthBomberLauncherCPU"))
--- a/eos/effects/covertopsstealthbombersiegemissilelauncherpowerneedbonus.py
+++ b/eos/effects/covertopsstealthbombersiegemissilelauncherpowerneedbonus.py
@@ -1,7 +1,7 @@
-# covertOpsStealthBomberSiegeMissileLauncerPowerNeedBonus
+# covertOpsStealthBomberSiegeMissileLauncherPowerNeedBonus
 #
 # Used by:
-# Ships from group: Stealth Bomber (4 of 5)
+# Ships from group: Stealth Bomber (5 of 5)
 type = "passive"


--- a/eos/effects/covertopsstealthbombertargettingdelaybonus.py
+++ b/eos/effects/covertopsstealthbombertargettingdelaybonus.py
@@ -2,7 +2,7 @@
 #
 # Used by:
 # Ships from group: Black Ops (5 of 5)
-# Ships from group: Stealth Bomber (4 of 5)
+# Ships from group: Stealth Bomber (5 of 5)
 # Ship: Caedes
 # Ship: Chremoas
 # Ship: Endurance
--- a/eos/effects/cynosuraldurationbonus.py
+++ b/eos/effects/cynosuraldurationbonus.py
@@ -1,7 +1,7 @@
 # cynosuralDurationBonus
 #
 # Used by:
-# Ships from group: Force Recon Ship (6 of 8)
+# Ships from group: Force Recon Ship (7 of 8)
 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 (6 of 8)
+# Ships from group: Force Recon Ship (7 of 8)
 # Skill: Cynosural Field Theory
 type = "passive"

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

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


 def handler(fit, ship, context):
    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("eliteBonusCoverOps1"),
+                                    "explosiveDamage", ship.getModifiedItemAttr("eliteBonusCovertOps1"),
                                    skill="Covert Ops")
--- a/eos/effects/elitebonuscoveropsbombkineticdmg1.py
+++ b/eos/effects/elitebonuscoveropsbombkineticdmg1.py
@@ -7,5 +7,5 @@ type = "passive"

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


 def handler(fit, ship, context):
    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Bomb Deployment"),
-                                    "thermalDamage", ship.getModifiedItemAttr("eliteBonusCoverOps1"),
+                                    "thermalDamage", ship.getModifiedItemAttr("eliteBonusCovertOps1"),
                                    skill="Covert Ops")
--- a/eos/effects/elitebonuscoveropsnosneutfalloff1.py
+++ b/eos/effects/elitebonuscoveropsnosneutfalloff1.py
@@ -7,5 +7,5 @@ type = "passive"

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

 def handler(fit, ship, context):
    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe",
-                                    "baseSensorStrength", ship.getModifiedItemAttr("eliteBonusCoverOps2"),
+                                    "baseSensorStrength", ship.getModifiedItemAttr("eliteBonusCovertOps2"),
                                    skill="Covert Ops")
--- a/eos/effects/elitebonuscoveropswarpvelocity1.py
+++ b/eos/effects/elitebonuscoveropswarpvelocity1.py
@@ -6,4 +6,4 @@ type = "passive"


 def handler(fit, src, context):
-    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("eliteBonusCoverOps1"), skill="Covert Ops")
+    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("eliteBonusCovertOps1"), skill="Covert Ops")
--- a/eos/effects/elitebonuscovertopsshtdamage3.py
+++ b/eos/effects/elitebonuscovertopsshtdamage3.py
@@ -0,0 +1,7 @@
+# eliteBonusCovertOpsSHTDamage3
+#
+# Used by:
+# Ship: Virtuoso
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), "damageMultiplier", src.getModifiedItemAttr("eliteBonusCovertOps3"), skill="Covert Ops")
--- a/eos/effects/elitecovertopsbonusarmorrepamount4.py
+++ b/eos/effects/elitecovertopsbonusarmorrepamount4.py
@@ -0,0 +1,7 @@
+# eliteCovertOpsBonusArmorRepAmount4
+#
+# Used by:
+# Ship: Virtuoso
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), "armorDamageAmount", src.getModifiedItemAttr("eliteBonusCovertOps4"), skill="Covert Ops")
--- a/eos/effects/elitereconbonusarmorrepamount3.py
+++ b/eos/effects/elitereconbonusarmorrepamount3.py
@@ -0,0 +1,7 @@
+# eliteReconBonusArmorRepAmount3
+#
+# Used by:
+# Ship: Victor
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), "armorDamageAmount", src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
--- a/eos/effects/elitereconbonusmhtdamage1.py
+++ b/eos/effects/elitereconbonusmhtdamage1.py
@@ -0,0 +1,7 @@
+# eliteReconBonusMHTDamage1
+#
+# Used by:
+# Ship: Victor
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), "damageMultiplier", src.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")
--- a/eos/effects/elitereconstasiswebbonus2.py
+++ b/eos/effects/elitereconstasiswebbonus2.py
@@ -4,6 +4,7 @@
 # Ship: Huginn
 # Ship: Moracha
 # Ship: Rapier
+# Ship: Victor
 type = "passive"


--- a/eos/effects/missileskillwarheadupgradesemdamagebonus.py
+++ b/eos/effects/missileskillwarheadupgradesemdamagebonus.py
@@ -1,7 +1,7 @@
 # missileSkillWarheadUpgradesEmDamageBonus
 #
 # Used by:
-# Implants named like: Agency Damage Booster (3 of 3)
+# Implants named like: Agency 'Pyrolancea' DB Dose (3 of 3)
 # Skill: Warhead Upgrades
 type = "passive"

--- a/eos/effects/missileskillwarheadupgradesexplosivedamagebonus.py
+++ b/eos/effects/missileskillwarheadupgradesexplosivedamagebonus.py
@@ -1,7 +1,7 @@
 # missileSkillWarheadUpgradesExplosiveDamageBonus
 #
 # Used by:
-# Implants named like: Agency Damage Booster (3 of 3)
+# Implants named like: Agency 'Pyrolancea' DB Dose (3 of 3)
 # Skill: Warhead Upgrades
 type = "passive"

--- a/eos/effects/missileskillwarheadupgradeskineticdamagebonus.py
+++ b/eos/effects/missileskillwarheadupgradeskineticdamagebonus.py
@@ -1,7 +1,7 @@
 # missileSkillWarheadUpgradesKineticDamageBonus
 #
 # Used by:
-# Implants named like: Agency Damage Booster (3 of 3)
+# Implants named like: Agency 'Pyrolancea' DB Dose (3 of 3)
 # Skill: Warhead Upgrades
 type = "passive"

--- a/eos/effects/missileskillwarheadupgradesthermaldamagebonus.py
+++ b/eos/effects/missileskillwarheadupgradesthermaldamagebonus.py
@@ -1,7 +1,7 @@
 # missileSkillWarheadUpgradesThermalDamageBonus
 #
 # Used by:
-# Implants named like: Agency Damage Booster (3 of 3)
+# Implants named like: Agency 'Pyrolancea' DB Dose (3 of 3)
 # Skill: Warhead Upgrades
 type = "passive"

--- a/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py
+++ b/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py
@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules from group: Rig Anchor (4 of 4)
-# Implants named like: Agency Speed Booster (3 of 3)
+# Implants named like: Agency 'Overclocker' SB Dose (3 of 3)
 # Implants named like: grade Snake (16 of 18)
 # Modules named like: Auxiliary Thrusters (8 of 8)
 # Implant: Quafe Zero
--- a/eos/effects/rolebonus2boosterpenaltyreduction.py
+++ b/eos/effects/rolebonus2boosterpenaltyreduction.py
@@ -0,0 +1,19 @@
+# roleBonus2BoosterPenaltyReduction
+#
+# Used by:
+# Ship: Victor
+# Ship: Virtuoso
+type = "passive"
+def handler(fit, src, context):
+    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterMissileAOECloudPenalty", src.getModifiedItemAttr("shipBonusRole2"))
+    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterCapacitorCapacityPenalty", src.getModifiedItemAttr("shipBonusRole2"))
+    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterAOEVelocityPenalty", src.getModifiedItemAttr("shipBonusRole2"))
+    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterArmorRepairAmountPenalty", src.getModifiedItemAttr("shipBonusRole2"))
+    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterMissileVelocityPenalty", src.getModifiedItemAttr("shipBonusRole2"))
+    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterTurretTrackingPenalty", src.getModifiedItemAttr("shipBonusRole2"))
+    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterShieldCapacityPenalty", src.getModifiedItemAttr("shipBonusRole2"))
+    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterTurretOptimalRangePenalty", src.getModifiedItemAttr("shipBonusRole2"))
+    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterShieldBoostAmountPenalty", src.getModifiedItemAttr("shipBonusRole2"))
+    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterTurretFalloffPenalty", src.getModifiedItemAttr("shipBonusRole2"))
+    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterArmorHPPenalty", src.getModifiedItemAttr("shipBonusRole2"))
+    fit.boosters.filteredItemBoost(lambda mod: mod.item.group.name == "Booster", "boosterMaxVelocityPenalty", src.getModifiedItemAttr("shipBonusRole2"))
--- a/eos/effects/rolebonusbomblauncherpwgcpu3.py
+++ b/eos/effects/rolebonusbomblauncherpwgcpu3.py
@@ -0,0 +1,8 @@
+# roleBonusBombLauncherPWGCPU3
+#
+# Used by:
+# Ship: Virtuoso
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Bomb Deployment"), "power", src.getModifiedItemAttr("shipBonusRole3"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Bomb Deployment"), "cpu", src.getModifiedItemAttr("shipBonusRole3"))
--- a/eos/effects/rolebonusmhtdamage1.py
+++ b/eos/effects/rolebonusmhtdamage1.py
@@ -0,0 +1,7 @@
+# roleBonusMHTDamage1
+#
+# Used by:
+# Ship: Victor
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), "damageMultiplier", src.getModifiedItemAttr("shipBonusRole1"))
--- a/eos/effects/rolebonustorprof1.py
+++ b/eos/effects/rolebonustorprof1.py
@@ -0,0 +1,7 @@
+# roleBonusTorpRoF1
+#
+# Used by:
+# Ship: Virtuoso
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Torpedo", "speed", src.getModifiedItemAttr("shipBonusRole1"))
--- a/eos/effects/shieldboostamplifierpassive.py
+++ b/eos/effects/shieldboostamplifierpassive.py
@@ -1,7 +1,7 @@
 # shieldBoostAmplifierPassive
 #
 # Used by:
-# Implants named like: Agency Tank Booster (3 of 3)
+# Implants named like: Agency 'Hardshell' TB Dose (3 of 3)
 # Implants named like: grade Crystal (15 of 18)
 type = "passive"

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

 def handler(fit, ship, context):
    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "emDamage", ship.getModifiedItemAttr("eliteBonusCoverOps2"), skill="Covert Ops")
+                                    "emDamage", ship.getModifiedItemAttr("eliteBonusCovertOps2"), skill="Covert Ops")
--- a/eos/effects/shipbonuselitecover2torpedoexplosivedamage.py
+++ b/eos/effects/shipbonuselitecover2torpedoexplosivedamage.py
@@ -2,10 +2,11 @@
 #
 # Used by:
 # Ship: Hound
+# Ship: Virtuoso
 type = "passive"


 def handler(fit, ship, context):
    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "explosiveDamage", ship.getModifiedItemAttr("eliteBonusCoverOps2"),
+                                    "explosiveDamage", ship.getModifiedItemAttr("eliteBonusCovertOps2"),
                                    skill="Covert Ops")
--- a/eos/effects/shipbonuselitecover2torpedokineticdamage.py
+++ b/eos/effects/shipbonuselitecover2torpedokineticdamage.py
@@ -7,5 +7,5 @@ type = "passive"

 def handler(fit, ship, context):
    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "kineticDamage", ship.getModifiedItemAttr("eliteBonusCoverOps2"),
+                                    "kineticDamage", ship.getModifiedItemAttr("eliteBonusCovertOps2"),
                                    skill="Covert Ops")
--- a/eos/effects/shipbonuselitecover2torpedothermaldamage.py
+++ b/eos/effects/shipbonuselitecover2torpedothermaldamage.py
@@ -2,10 +2,11 @@
 #
 # Used by:
 # Ship: Nemesis
+# Ship: Virtuoso
 type = "passive"


 def handler(fit, ship, context):
    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"),
-                                    "thermalDamage", ship.getModifiedItemAttr("eliteBonusCoverOps2"),
+                                    "thermalDamage", ship.getModifiedItemAttr("eliteBonusCovertOps2"),
                                    skill="Covert Ops")
--- a/eos/effects/shipbonusemshieldresistancecb2.py
+++ b/eos/effects/shipbonusemshieldresistancecb2.py
@@ -1,7 +1,7 @@
 # shipBonusEmShieldResistanceCB2
 #
 # Used by:
-# Ships named like: Rattlesnake (2 of 2)
+# Ship: Rattlesnake
 # Ship: Rokh
 # Ship: Scorpion Navy Issue
 type = "passive"
--- a/eos/effects/shipbonusexplosiveshieldresistancecb2.py
+++ b/eos/effects/shipbonusexplosiveshieldresistancecb2.py
@@ -1,7 +1,7 @@
 # shipBonusExplosiveShieldResistanceCB2
 #
 # Used by:
-# Ships named like: Rattlesnake (2 of 2)
+# Ship: Rattlesnake
 # Ship: Rokh
 # Ship: Scorpion Navy Issue
 type = "passive"
--- a/eos/effects/shipbonusforceauxiliaryc1remoteboostandcapamount.py
+++ b/eos/effects/shipbonusforceauxiliaryc1remoteboostandcapamount.py
@@ -1,7 +1,6 @@
 # shipBonusForceAuxiliaryC1RemoteBoostAndCapAmount
 #
 # Used by:
-# Ship: Loggerhead
 # Ship: Minokawa
 type = "passive"

--- a/eos/effects/shipbonusheavydronearmorhppiratefaction.py
+++ b/eos/effects/shipbonusheavydronearmorhppiratefaction.py
@@ -1,7 +1,7 @@
 # shipBonusHeavyDroneArmorHpPirateFaction
 #
 # Used by:
-# Ships named like: Rattlesnake (2 of 2)
+# Ship: Rattlesnake
 type = "passive"


--- a/eos/effects/shipbonusheavydronedamagemultiplierpiratefaction.py
+++ b/eos/effects/shipbonusheavydronedamagemultiplierpiratefaction.py
@@ -1,7 +1,7 @@
 # shipBonusHeavyDroneDamageMultiplierPirateFaction
 #
 # Used by:
-# Ships named like: Rattlesnake (2 of 2)
+# Ship: Rattlesnake
 type = "passive"


--- a/eos/effects/shipbonusheavydronehppiratefaction.py
+++ b/eos/effects/shipbonusheavydronehppiratefaction.py
@@ -1,7 +1,7 @@
 # shipBonusHeavyDroneHPPirateFaction
 #
 # Used by:
-# Ships named like: Rattlesnake (2 of 2)
+# Ship: Rattlesnake
 type = "passive"


--- a/eos/effects/shipbonusheavydroneshieldhppiratefaction.py
+++ b/eos/effects/shipbonusheavydroneshieldhppiratefaction.py
@@ -1,7 +1,7 @@
 # shipBonusHeavyDroneShieldHpPirateFaction
 #
 # Used by:
-# Ships named like: Rattlesnake (2 of 2)
+# Ship: Rattlesnake
 type = "passive"


--- a/eos/effects/shipbonuskineticmissiledamagegb2.py
+++ b/eos/effects/shipbonuskineticmissiledamagegb2.py
@@ -1,7 +1,7 @@
 # shipBonusKineticMissileDamageGB2
 #
 # Used by:
-# Ships named like: Rattlesnake (2 of 2)
+# Ship: Rattlesnake
 type = "passive"


--- a/eos/effects/shipbonuskineticshieldresistancecb2.py
+++ b/eos/effects/shipbonuskineticshieldresistancecb2.py
@@ -1,7 +1,7 @@
 # shipBonusKineticShieldResistanceCB2
 #
 # Used by:
-# Ships named like: Rattlesnake (2 of 2)
+# Ship: Rattlesnake
 # Ship: Rokh
 # Ship: Scorpion Navy Issue
 type = "passive"
--- a/eos/effects/shipbonusmf1torpedoexplosionvelocity.py
+++ b/eos/effects/shipbonusmf1torpedoexplosionvelocity.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Hound
+# Ship: Virtuoso
 type = "passive"


--- a/eos/effects/shipbonusmf1torpedoflighttime.py
+++ b/eos/effects/shipbonusmf1torpedoflighttime.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Hound
+# Ship: Virtuoso
 type = "passive"


--- a/eos/effects/shipbonussentrydronearmorhppiratefaction.py
+++ b/eos/effects/shipbonussentrydronearmorhppiratefaction.py
@@ -1,7 +1,7 @@
 # shipBonusSentryDroneArmorHpPirateFaction
 #
 # Used by:
-# Ships named like: Rattlesnake (2 of 2)
+# Ship: Rattlesnake
 type = "passive"


--- a/eos/effects/shipbonussentrydronedamagemultiplierpiratefaction.py
+++ b/eos/effects/shipbonussentrydronedamagemultiplierpiratefaction.py
@@ -1,7 +1,7 @@
 # shipBonusSentryDroneDamageMultiplierPirateFaction
 #
 # Used by:
-# Ships named like: Rattlesnake (2 of 2)
+# Ship: Rattlesnake
 type = "passive"


--- a/eos/effects/shipbonussentrydronehppiratefaction.py
+++ b/eos/effects/shipbonussentrydronehppiratefaction.py
@@ -1,7 +1,7 @@
 # shipBonusSentryDroneHPPirateFaction
 #
 # Used by:
-# Ships named like: Rattlesnake (2 of 2)
+# Ship: Rattlesnake
 type = "passive"


--- a/eos/effects/shipbonussentrydroneshieldhppiratefaction.py
+++ b/eos/effects/shipbonussentrydroneshieldhppiratefaction.py
@@ -1,7 +1,7 @@
 # shipBonusSentryDroneShieldHpPirateFaction
 #
 # Used by:
-# Ships named like: Rattlesnake (2 of 2)
+# Ship: Rattlesnake
 type = "passive"


--- a/eos/effects/shipbonusshtfalloffgf1.py
+++ b/eos/effects/shipbonusshtfalloffgf1.py
@@ -0,0 +1,7 @@
+# shipBonusSHTFalloffGF1
+#
+# Used by:
+# Ship: Virtuoso
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), "falloff", src.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate")
--- a/eos/effects/shipbonusshtfalloffgf2.py
+++ b/eos/effects/shipbonusshtfalloffgf2.py
@@ -1,4 +1,4 @@
-# shipFalloffBonusGF
+# shipBonusSHTFalloffGF2
 #
 # Used by:
 # Ship: Atron
--- a/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py
+++ b/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py
@@ -7,5 +7,5 @@ type = "passive"

 def handler(fit, ship, context):
    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Survey Probe",
-                                    "explosionDelay", ship.getModifiedItemAttr("eliteBonusCoverOps3"),
+                                    "explosionDelay", ship.getModifiedItemAttr("eliteBonusCovertOps3"),
                                    skill="Covert Ops")
--- a/eos/effects/shipbonusthermalmissiledamagegb2.py
+++ b/eos/effects/shipbonusthermalmissiledamagegb2.py
@@ -1,7 +1,7 @@
 # shipBonusThermalMissileDamageGB2
 #
 # Used by:
-# Ships named like: Rattlesnake (2 of 2)
+# Ship: Rattlesnake
 type = "passive"


--- a/eos/effects/shipbonusthermicshieldresistancecb2.py
+++ b/eos/effects/shipbonusthermicshieldresistancecb2.py
@@ -1,7 +1,7 @@
 # shipBonusThermicShieldResistanceCB2
 #
 # Used by:
-# Ships named like: Rattlesnake (2 of 2)
+# Ship: Rattlesnake
 # Ship: Rokh
 # Ship: Scorpion Navy Issue
 type = "passive"
--- a/eos/effects/shipbonustitang2emexplosivedamagebonus.py
+++ b/eos/effects/shipbonustitang2emexplosivedamagebonus.py
@@ -1,4 +1,4 @@
-# shipBonusTitanG2AllDamageBonus
+# shipBonusTitanG2EMExplosiveDamageBonus
 #
 # Used by:
 # Ship: Komodo
--- a/eos/effects/shipbonustorpedovelocitygf2.py
+++ b/eos/effects/shipbonustorpedovelocitygf2.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Nemesis
+# Ship: Virtuoso
 type = "passive"


--- a/eos/effects/shiphturretfalloffbonusgc.py
+++ b/eos/effects/shiphturretfalloffbonusgc.py
@@ -1,6 +1,7 @@
 # shipHTurretFalloffBonusGC
 #
 # Used by:
+# Ship: Victor
 # Ship: Vigilant
 type = "passive"

--- a/eos/effects/shipshtdmgbonusrookie.py
+++ b/eos/effects/shipshtdmgbonusrookie.py
@@ -3,6 +3,7 @@
 # Used by:
 # Ship: Velator
 # Ship: Violator
+# Ship: Virtuoso
 type = "passive"


--- a/eos/effects/shipstasiswebstrengthbonusmc2.py
+++ b/eos/effects/shipstasiswebstrengthbonusmc2.py
@@ -1,6 +1,7 @@
 # shipStasisWebStrengthBonusMC2
 #
 # Used by:
+# Ship: Victor
 # Ship: Vigilant
 type = "passive"

--- a/eos/effects/shipstasiswebstrengthbonusmf2.py
+++ b/eos/effects/shipstasiswebstrengthbonusmf2.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Daredevil
+# Ship: Virtuoso
 type = "passive"


--- a/eos/effects/structuralanalysiseffect.py
+++ b/eos/effects/structuralanalysiseffect.py
@@ -1,7 +1,7 @@
 # structuralAnalysisEffect
 #
 # Used by:
-# Implants named like: Agency Tank Booster (3 of 3)
+# Implants named like: Agency 'Hardshell' TB Dose (3 of 3)
 # Implants named like: Inherent Implants 'Noble' Repair Proficiency RP (6 of 6)
 # Modules named like: Auxiliary Nano Pump (8 of 8)
 # Implant: Imperial Navy Modified 'Noble' Implant
--- a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py
+++ b/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py
@@ -1,7 +1,7 @@
 # surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringGunnery
 #
 # Used by:
-# Implants named like: Agency Damage Booster (3 of 3)
+# Implants named like: Agency 'Pyrolancea' DB Dose (3 of 3)
 # Implants named like: Eifyr and Co. 'Gunslinger' Surgical Strike SS (6 of 6)
 # Implant: Standard Cerebral Accelerator
 type = "passive"
--- a/eve.db
+++ b/eve.db
--- a/scripts/effectUsedBy.py
+++ b/scripts/effectUsedBy.py
@@ -405,10 +405,11 @@ if options.effects:
 else:
    effect_list = []
    for effect_file in os.listdir(effects_path):
-        file_name, file_extension = effect_file.rsplit('.', 1)
-        # Ignore non-py files and exclude implementation-specific 'effects'
-        if file_extension == "py" and not file_name in ("__init__"):
-            effect_list.append(file_name)
+        if not effect_file.startswith('__'):
+            file_name, file_extension = effect_file.rsplit('.', 1)
+            # Ignore non-py files and exclude implementation-specific 'effects'
+            if file_extension == "py" and not file_name in ("__init__"):
+                effect_list.append(file_name)

 # Stage 2

--- a/service/market.py
+++ b/service/market.py
@@ -228,8 +228,6 @@ class Market(object):
            "Guristas Shuttle"                         : False,
            "Mobile Decoy Unit"                        : False,  # Seems to be left over test mod for deployables
            "Tournament Micro Jump Unit"               : False,  # Normally seen only on tournament arenas
-            "Victor": False,  # See GH Issue 1323
-            "Virtuoso": False,  # See GH Issue 1323
        }

        # do not publish ships that we convert