Merge commit 'refs/tags/v1.34.0^{}' into singularity

# Conflicts:
#	eve.db
#	gui/builtinViewColumns/misc.py

.gitignore

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

config.py

@@ -19,9 +19,9 @@ debug = False
 saveInRoot = False
 
 # Version data
-version = "1.33.0"
-tag = "git"
-expansionName = "YC119.9"
+version = "1.34.0"
+tag = "Stable"
+expansionName = " Arms Race"
 expansionVersion = "1.3"
 evemonMinVersion = "4081"
 

eos/db/migrations/upgrade27.py

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

eos/effects/ammoinfluencecapneed.py

@@ -1,9 +1,7 @@
 # ammoInfluenceCapNeed
 #
 # Used by:
-# Items from category: Charge (464 of 910)
-# Charges from group: Frequency Crystal (184 of 184)
-# Charges from group: Hybrid Charge (208 of 208)
+# Items from category: Charge (478 of 924)
 type = "passive"
 
 

eos/effects/ammoinfluencerange.py

@@ -1,7 +1,7 @@
 # ammoInfluenceRange
 #
 # Used by:
-# Items from category: Charge (568 of 910)
+# Items from category: Charge (572 of 924)
 type = "passive"
 
 

eos/effects/antiwarpscramblingpassive.py

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

eos/effects/boosterarmorhppenalty.py

@@ -1,7 +1,7 @@
 # boosterArmorHpPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 49)
+# Implants from group: Booster (12 of 54)
 type = "boosterSideEffect"
 
 # User-friendly name for the side effect

eos/effects/boostermaxvelocitypenalty.py

@@ -1,7 +1,7 @@
 # boosterMaxVelocityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 49)
+# Implants from group: Booster (12 of 54)
 type = "boosterSideEffect"
 
 # User-friendly name for the side effect

eos/effects/boostermodifyboosterturretpenalty.py

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

eos/effects/boostershieldboostamountpenaltyshieldskills.py

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

eos/effects/boostershieldcapacitypenalty.py

@@ -1,7 +1,7 @@
 # boosterShieldCapacityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 49)
+# Implants from group: Booster (12 of 54)
 type = "boosterSideEffect"
 
 # User-friendly name for the side effect

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):

eos/effects/commandburstaoerolebonus.py

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

eos/effects/concordsecstatustankbonus.py

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

eos/effects/covertopsandreconopscloakmoduledelaybonus.py

@@ -1,12 +1,12 @@
 # covertOpsAndReconOpsCloakModuleDelayBonus
 #
 # Used by:
-# Ships from group: Black Ops (4 of 4)
+# Ships from group: Black Ops (5 of 5)
 # Ships from group: Blockade Runner (4 of 4)
 # Ships from group: Covert Ops (7 of 7)
 # Ships from group: Expedition Frigate (2 of 2)
-# Ships from group: Force Recon Ship (7 of 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

eos/effects/covertopscloakcpupercentbonus1.py

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

eos/effects/covertopscloakcpupercentrolebonus.py

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

eos/effects/covertopsstealthbombersiegemissilelaunchercpuneedbonus.py

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

eos/effects/covertopsstealthbombersiegemissilelauncherpowerneedbonus.py

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

eos/effects/covertopsstealthbombertargettingdelaybonus.py

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

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"
 
 

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"
 

eos/effects/dohacking.py

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

eos/effects/elitebonusblackopscloakvelocity2.py

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

eos/effects/elitebonusblackopsscramblerrange4.py

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

eos/effects/elitebonusblackopswarpvelocity1.py

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

eos/effects/elitebonusblackopswebrange3.py

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

eos/effects/elitebonuscoveropsbombemdmg1.py

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

eos/effects/elitebonuscoveropsbombexplosivedmg1.py

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

eos/effects/elitebonuscoveropsbombkineticdmg1.py

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

eos/effects/elitebonuscoveropsbombthermaldmg1.py

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

eos/effects/elitebonuscoveropsnosneutfalloff1.py

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

eos/effects/elitebonuscoveropsscanprobestrength2.py

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

eos/effects/elitebonuscoveropswarpvelocity1.py

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

eos/effects/elitebonuscovertopsshtdamage3.py

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

eos/effects/elitecovertopsbonusarmorrepamount4.py

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

eos/effects/elitereconbonusarmorrepamount3.py

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

eos/effects/elitereconbonusmhtdamage1.py

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

eos/effects/elitereconstasiswebbonus2.py

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

eos/effects/entosisdurationmultiply.py

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

eos/effects/hackingvirusstrengthbonus.py

@@ -0,0 +1,6 @@
+# Not used by any item
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Hacking"), "virusStrength", src.getModifiedItemAttr("virusStrengthBonus"))

eos/effects/mininginfomultiplier.py

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

eos/effects/missileskillfofaoecloudsizebonus.py

@@ -1,7 +1,7 @@
 # missileSkillFoFAoeCloudSizeBonus
 #
 # Used by:
-# Implants named like: Zainou 'Snapshot' FOF Explosion Radius FR (6 of 6)
+# Implants named like: Zainou 'Snapshot' Auto Targeting Explosion Radius FR (6 of 6)
 type = "passive"
 
 

eos/effects/missileskillwarheadupgradesemdamagebonus.py

@@ -1,10 +1,12 @@
 # missileSkillWarheadUpgradesEmDamageBonus
 #
 # Used by:
+# Implants named like: Agency 'Pyrolancea' DB Dose (3 of 3)
 # Skill: Warhead Upgrades
 type = "passive"
 
 
-def handler(fit, skill, context):
+def handler(fit, src, context):
+    mod = src.level if "skill" in context else 1
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "emDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
+                                    "emDamage", src.getModifiedItemAttr("damageMultiplierBonus") * mod)

eos/effects/missileskillwarheadupgradesexplosivedamagebonus.py

@@ -1,10 +1,12 @@
 # missileSkillWarheadUpgradesExplosiveDamageBonus
 #
 # Used by:
+# Implants named like: Agency 'Pyrolancea' DB Dose (3 of 3)
 # Skill: Warhead Upgrades
 type = "passive"
 
 
-def handler(fit, skill, context):
+def handler(fit, src, context):
+    mod = src.level if "skill" in context else 1
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "explosiveDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
+                                    "explosiveDamage", src.getModifiedItemAttr("damageMultiplierBonus") * mod)

eos/effects/missileskillwarheadupgradeskineticdamagebonus.py

@@ -1,10 +1,12 @@
 # missileSkillWarheadUpgradesKineticDamageBonus
 #
 # Used by:
+# Implants named like: Agency 'Pyrolancea' DB Dose (3 of 3)
 # Skill: Warhead Upgrades
 type = "passive"
 
 
-def handler(fit, skill, context):
+def handler(fit, src, context):
+    mod = src.level if "skill" in context else 1
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "kineticDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
+                                    "kineticDamage", src.getModifiedItemAttr("damageMultiplierBonus") * mod)

eos/effects/missileskillwarheadupgradesthermaldamagebonus.py

@@ -1,10 +1,12 @@
 # missileSkillWarheadUpgradesThermalDamageBonus
 #
 # Used by:
+# Implants named like: Agency 'Pyrolancea' DB Dose (3 of 3)
 # Skill: Warhead Upgrades
 type = "passive"
 
 
-def handler(fit, skill, context):
+def handler(fit, src, context):
+    mod = src.level if "skill" in context else 1
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "thermalDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)
+                                    "thermalDamage", src.getModifiedItemAttr("damageMultiplierBonus") * mod)

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

eos/effects/overloadselfdamagebonus.py

@@ -1,7 +1,7 @@
 # overloadSelfDamageBonus
 #
 # Used by:
-# Modules from group: Energy Weapon (101 of 209)
+# Modules from group: Energy Weapon (101 of 213)
 # Modules from group: Hybrid Weapon (105 of 221)
 # Modules from group: Projectile Weapon (99 of 165)
 type = "overheat"

eos/effects/rolebonus2boosterpenaltyreduction.py

@@ -0,0 +1,21 @@
+# 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"))

eos/effects/rolebonusbomblauncherpwgcpu3.py

@@ -0,0 +1,10 @@
+# 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"))

eos/effects/rolebonusmhtdamage1.py

@@ -0,0 +1,9 @@
+# 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"))

eos/effects/rolebonustorprof1.py

@@ -0,0 +1,9 @@
+# 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"))

eos/effects/salvaging.py

@@ -1,7 +1,7 @@
 # salvaging
 #
 # Used by:
-# Modules from group: Salvager (2 of 2)
+# Modules from group: Salvager (3 of 3)
 type = "active"
 
 

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"
 

eos/effects/shipadvancedspaceshipcommandagilitybonus.py

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

eos/effects/shipbonusdreadnoughtc2shieldresists.py

@@ -1,6 +1,7 @@
 # shipBonusDreadnoughtC2ShieldResists
 #
 # Used by:
+# Ship: Caiman
 # Ship: Phoenix
 type = "passive"
 

eos/effects/shipbonusdreadnoughtg1kinthermdamagebonus.py

@@ -0,0 +1,20 @@
+# shipBonusDreadnoughtG1KinThermDamageBonus
+#
+# Used by:
+# Ship: Caiman
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "kineticDamage",
+                                  src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Torpedoes"), "thermalDamage",
+                                  src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "kineticDamage",
+                                  src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"), "thermalDamage",
+                                  src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "thermalDamage",
+                                  src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")
+    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"), "kineticDamage",
+                                  src.getModifiedItemAttr("shipBonusDreadnoughtG1"), skill="Gallente Dreadnought")

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")

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")

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")

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")

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"

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"

eos/effects/shipbonusforceauxiliaryc1remoteboostandcapamount.py

@@ -6,6 +6,9 @@ type = "passive"
 
 
 def handler(fit, src, context):
+    if src.getModifiedItemAttr("shipBonusForceAuxiliaryC1") is None:
+        return  # See GH Issue 1321
+
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capacitor Emission Systems") or
                                               mod.item.requiresSkill("Capital Capacitor Emission Systems"),
                                   "powerTransferAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryC1"),

eos/effects/shipbonusforceauxiliaryc2shieldresists.py

@@ -1,6 +1,7 @@
 # shipBonusForceAuxiliaryC2ShieldResists
 #
 # Used by:
+# Ship: Loggerhead
 # Ship: Minokawa
 type = "passive"
 

eos/effects/shipbonusforceauxiliaryg1remoteshieldboostamount.py

@@ -0,0 +1,10 @@
+# shipBonusForceAuxiliaryG1RemoteShieldBoostAmount
+#
+# Used by:
+# Ship: Loggerhead
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"), "shieldBonus",
+                                  src.getModifiedItemAttr("shipBonusForceAuxiliaryG1"), skill="Gallente Carrier")

eos/effects/shipbonusheavydronearmorhppiratefaction.py

@@ -1,7 +1,7 @@
 # shipBonusHeavyDroneArmorHpPirateFaction
 #
 # Used by:
-# Ships named like: Rattlesnake (2 of 2)
+# Ship: Rattlesnake
 type = "passive"
 
 

eos/effects/shipbonusheavydronedamagemultiplierpiratefaction.py

@@ -1,7 +1,7 @@
 # shipBonusHeavyDroneDamageMultiplierPirateFaction
 #
 # Used by:
-# Ships named like: Rattlesnake (2 of 2)
+# Ship: Rattlesnake
 type = "passive"
 
 

eos/effects/shipbonusheavydronehppiratefaction.py

@@ -1,7 +1,7 @@
 # shipBonusHeavyDroneHPPirateFaction
 #
 # Used by:
-# Ships named like: Rattlesnake (2 of 2)
+# Ship: Rattlesnake
 type = "passive"
 
 

eos/effects/shipbonusheavydroneshieldhppiratefaction.py

@@ -1,7 +1,7 @@
 # shipBonusHeavyDroneShieldHpPirateFaction
 #
 # Used by:
-# Ships named like: Rattlesnake (2 of 2)
+# Ship: Rattlesnake
 type = "passive"
 
 

eos/effects/shipbonuskineticmissiledamagegb2.py

@@ -1,7 +1,7 @@
 # shipBonusKineticMissileDamageGB2
 #
 # Used by:
-# Ships named like: Rattlesnake (2 of 2)
+# Ship: Rattlesnake
 type = "passive"
 
 

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"

eos/effects/shipbonuslargeenergyturretmaxrangeab.py

@@ -1,6 +1,7 @@
 # shipBonusLargeEnergyTurretMaxRangeAB
 #
 # Used by:
+# Ship: Marshal
 # Ship: Paladin
 type = "passive"
 

eos/effects/shipbonuslargeenergyweapondamageab2.py

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

eos/effects/shipbonuslargemissileflighttimecb1.py

@@ -0,0 +1,12 @@
+# shipBonusLargeMissileFlightTimeCB1
+#
+# Used by:
+# Ship: Marshal
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), "explosionDelay",
+                                    src.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), "explosionDelay",
+                                    src.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")

eos/effects/shipbonuslauncherrof2cb.py

@@ -0,0 +1,14 @@
+# shipBonusLauncherRoF2CB
+#
+# Used by:
+# Ship: Marshal
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Cruise", "speed",
+                                  src.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Torpedo", "speed",
+                                  src.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Heavy", "speed",
+                                  src.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship")

eos/effects/shipbonusmf1torpedoexplosionvelocity.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Hound
+# Ship: Virtuoso
 type = "passive"
 
 

eos/effects/shipbonusmf1torpedoflighttime.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Hound
+# Ship: Virtuoso
 type = "passive"
 
 

eos/effects/shipbonusptfalloffmb1.py

@@ -1,6 +1,7 @@
 # shipBonusPTFalloffMB1
 #
 # Used by:
+# Ship: Marshal
 # Ship: Vargur
 type = "passive"
 

eos/effects/shipbonusrole1commandburstcpubonus.py

@@ -1,7 +1,7 @@
 # shipBonusRole1CommandBurstCPUBonus
 #
 # Used by:
-# Ships from group: Force Auxiliary (5 of 5)
+# Ships from group: Force Auxiliary (6 of 6)
 type = "passive"
 
 

eos/effects/shipbonusrole1numwarfarelinks.py

@@ -1,7 +1,7 @@
 # shipBonusRole1NumWarfareLinks
 #
 # Used by:
-# Ships from group: Titan (6 of 6)
+# Ships from group: Titan (7 of 7)
 type = "passive"
 
 

eos/effects/shipbonusrole2armorplatesshieldextendersbonus.py

@@ -1,7 +1,7 @@
 # shipBonusRole2ArmorPlates&ShieldExtendersBonus
 #
 # Used by:
-# Ships from group: Titan (6 of 6)
+# Ships from group: Titan (7 of 7)
 type = "passive"
 
 

eos/effects/shipbonusrole2logisticdronerepamountandhitpointbonus.py

@@ -0,0 +1,20 @@
+# shipBonusRole2LogisticDroneRepAmountAndHitpointBonus
+#
+# Used by:
+# Ship: Loggerhead
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Repair Drone Operation"),
+                                    "structureDamageAmount", src.getModifiedItemAttr("shipBonusRole2"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Repair Drone Operation"),
+                                    "shieldBonus", src.getModifiedItemAttr("shipBonusRole2"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Repair Drone Operation"),
+                                    "armorDamageAmount", src.getModifiedItemAttr("shipBonusRole2"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Repair Drone Operation"),
+                                    "armorHP", src.getModifiedItemAttr("shipBonusRole2"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Repair Drone Operation"),
+                                    "shieldCapacity", src.getModifiedItemAttr("shipBonusRole2"))
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Repair Drone Operation"),
+                                    "hp", src.getModifiedItemAttr("shipBonusRole2"))

eos/effects/shipbonusrole2logisticdronerepamountbonus.py

@@ -1,7 +1,7 @@
-# shipBonusRole2LogisticDroneBonus
+# shipBonusRole2LogisticDroneRepAmountBonus
 #
 # Used by:
-# Ships from group: Force Auxiliary (5 of 5)
+# Ships from group: Force Auxiliary (5 of 6)
 type = "passive"
 
 

eos/effects/shipbonusrole3numwarfarelinks.py

@@ -1,7 +1,7 @@
 # shipBonusRole3NumWarfareLinks
 #
 # Used by:
-# Ships from group: Force Auxiliary (5 of 5)
+# Ships from group: Force Auxiliary (6 of 6)
 type = "passive"
 
 

eos/effects/shipbonusrole3xltorpdeovelocitybonus.py

@@ -1,6 +1,7 @@
-# shipBonusTitanRole3TorpdeoVelocityBonus
+# shipBonusRole3XLTorpdeoVelocityBonus
 #
 # Used by:
+# Ship: Komodo
 # Ship: Leviathan
 type = "passive"
 

eos/effects/shipbonusrole4fighterdamageandhitpoints.py

@@ -0,0 +1,17 @@
+# shipBonusRole4FighterDamageAndHitpoints
+#
+# Used by:
+# Ship: Caiman
+# Ship: Komodo
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity",
+                                   src.getModifiedItemAttr("shipBonusRole4"))
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusRole4"))
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusRole4"))
+    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDamageMultiplier",
+                                   src.getModifiedItemAttr("shipBonusRole4"))

eos/effects/shipbonussentrydronearmorhppiratefaction.py

@@ -1,7 +1,7 @@
 # shipBonusSentryDroneArmorHpPirateFaction
 #
 # Used by:
-# Ships named like: Rattlesnake (2 of 2)
+# Ship: Rattlesnake
 type = "passive"
 
 

eos/effects/shipbonussentrydronedamagemultiplierpiratefaction.py

@@ -1,7 +1,7 @@
 # shipBonusSentryDroneDamageMultiplierPirateFaction
 #
 # Used by:
-# Ships named like: Rattlesnake (2 of 2)
+# Ship: Rattlesnake
 type = "passive"
 
 

eos/effects/shipbonussentrydronehppiratefaction.py

@@ -1,7 +1,7 @@
 # shipBonusSentryDroneHPPirateFaction
 #
 # Used by:
-# Ships named like: Rattlesnake (2 of 2)
+# Ship: Rattlesnake
 type = "passive"
 
 

eos/effects/shipbonussentrydroneshieldhppiratefaction.py

@@ -1,7 +1,7 @@
 # shipBonusSentryDroneShieldHpPirateFaction
 #
 # Used by:
-# Ships named like: Rattlesnake (2 of 2)
+# Ship: Rattlesnake
 type = "passive"
 
 

eos/effects/shipbonusshtfalloffgf1.py

@@ -0,0 +1,10 @@
+# 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")

eos/effects/shipbonusshtfalloffgf2.py

@@ -1,4 +1,4 @@
-# shipFalloffBonusGF
+# shipBonusSHTFalloffGF2
 #
 # Used by:
 # Ship: Atron

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")

eos/effects/shipbonusthermalmissiledamagegb2.py

@@ -1,7 +1,7 @@
 # shipBonusThermalMissileDamageGB2
 #
 # Used by:
-# Ships named like: Rattlesnake (2 of 2)
+# Ship: Rattlesnake
 type = "passive"
 
 

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"

eos/effects/shipbonustitanc1shieldresists.py

@@ -0,0 +1,12 @@
+# shipBonusTitanC1ShieldResists
+#
+# Used by:
+# Ship: Komodo
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.ship.boostItemAttr("shieldKineticDamageResonance", src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
+    fit.ship.boostItemAttr("shieldEmDamageResonance", src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
+    fit.ship.boostItemAttr("shieldExplosiveDamageResonance", src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")
+    fit.ship.boostItemAttr("shieldThermalDamageResonance", src.getModifiedItemAttr("shipBonusTitanC1"), skill="Caldari Titan")

eos/effects/shipbonustitanc2rofbonus.py

@@ -1,6 +1,7 @@
 # shipBonusTitanC2ROFBonus
 #
 # Used by:
+# Ship: Komodo
 # Ship: Leviathan
 type = "passive"
 

eos/effects/shipbonustitanc3warpstrength.py

@@ -1,6 +1,7 @@
 # shipBonusTitanC3WarpStrength
 #
 # Used by:
+# Ship: Komodo
 # Ship: Leviathan
 type = "passive"