diff --git a/eos/effects/blockaderunnercloakcpupercentbonus.py b/eos/effects/blockaderunnercloakcpupercentbonus.py index 70cc5f132c..aaca38f6ae 100644 --- a/eos/effects/blockaderunnercloakcpupercentbonus.py +++ b/eos/effects/blockaderunnercloakcpupercentbonus.py @@ -5,6 +5,5 @@ type = "passive" runTime = "early" def handler(fit, ship, context): - level = fit.character.getSkill("Transport Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cloaking Device", - "cpu", ship.getModifiedItemAttr("eliteIndustrialCovertCloakBonus") * level) + "cpu", ship.getModifiedItemAttr("eliteIndustrialCovertCloakBonus"), skill="Transport Ships") diff --git a/eos/effects/caldarishipecmburstoptimalrangecb3.py b/eos/effects/caldarishipecmburstoptimalrangecb3.py index 4cb1863dd1..7675fd758a 100644 --- a/eos/effects/caldarishipecmburstoptimalrangecb3.py +++ b/eos/effects/caldarishipecmburstoptimalrangecb3.py @@ -4,6 +4,5 @@ # Ship: Scorpion type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM Burst", - "ecmBurstRange", ship.getModifiedItemAttr("shipBonusCB3") * level) \ No newline at end of file + "ecmBurstRange", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship") diff --git a/eos/effects/caldarishipewcapacitorneedcc.py b/eos/effects/caldarishipewcapacitorneedcc.py index e30f969993..9224e27280 100644 --- a/eos/effects/caldarishipewcapacitorneedcc.py +++ b/eos/effects/caldarishipewcapacitorneedcc.py @@ -6,6 +6,5 @@ # 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 == "ECM", - "capacitorNeed", ship.getModifiedItemAttr("shipBonusCC") * level) + "capacitorNeed", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser") diff --git a/eos/effects/caldarishipewcapacitorneedcf2.py b/eos/effects/caldarishipewcapacitorneedcf2.py index 1c244dd2b5..58c2e34a04 100644 --- a/eos/effects/caldarishipewcapacitorneedcf2.py +++ b/eos/effects/caldarishipewcapacitorneedcf2.py @@ -4,6 +4,5 @@ # Variations of ship: Griffin (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", - "capacitorNeed", ship.getModifiedItemAttr("shipBonusCF2") * level) + "capacitorNeed", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate") diff --git a/eos/effects/caldarishipewfalloffrangecb3.py b/eos/effects/caldarishipewfalloffrangecb3.py index 53c0c30fb9..c5e520bee0 100644 --- a/eos/effects/caldarishipewfalloffrangecb3.py +++ b/eos/effects/caldarishipewfalloffrangecb3.py @@ -4,6 +4,5 @@ # Ship: Scorpion type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", - "falloff", ship.getModifiedItemAttr("shipBonusCB3") * level) \ No newline at end of file + "falloff", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship") diff --git a/eos/effects/caldarishipewfalloffrangecc2.py b/eos/effects/caldarishipewfalloffrangecc2.py index 0b8d78379c..c1a05d6d68 100644 --- a/eos/effects/caldarishipewfalloffrangecc2.py +++ b/eos/effects/caldarishipewfalloffrangecc2.py @@ -4,6 +4,5 @@ # Ship: Blackbird type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", - "falloff", ship.getModifiedItemAttr("shipBonusCC2") * level) + "falloff", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser") diff --git a/eos/effects/caldarishipewoptimalrangecb3.py b/eos/effects/caldarishipewoptimalrangecb3.py index 22a59a00c7..53794d2679 100644 --- a/eos/effects/caldarishipewoptimalrangecb3.py +++ b/eos/effects/caldarishipewoptimalrangecb3.py @@ -4,6 +4,5 @@ # Ship: Scorpion type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", - "maxRange", ship.getModifiedItemAttr("shipBonusCB3") * level) \ No newline at end of file + "maxRange", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship") diff --git a/eos/effects/caldarishipewoptimalrangecc2.py b/eos/effects/caldarishipewoptimalrangecc2.py index db80957bdd..d6e8b850ea 100644 --- a/eos/effects/caldarishipewoptimalrangecc2.py +++ b/eos/effects/caldarishipewoptimalrangecc2.py @@ -4,6 +4,5 @@ # Ship: Blackbird type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", - "maxRange", ship.getModifiedItemAttr("shipBonusCC2") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser") diff --git a/eos/effects/caldarishipewstrengthcb.py b/eos/effects/caldarishipewstrengthcb.py index 6807037181..1ac5a01c03 100644 --- a/eos/effects/caldarishipewstrengthcb.py +++ b/eos/effects/caldarishipewstrengthcb.py @@ -4,8 +4,7 @@ # Ship: Scorpion type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level for sensorType in ("Gravimetric", "Ladar", "Magnetometric", "Radar"): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "scan{0}StrengthBonus".format(sensorType), - ship.getModifiedItemAttr("shipBonusCB") * level) + ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship") diff --git a/eos/effects/carrieramarrarmorenergytransferrange3.py b/eos/effects/carrieramarrarmorenergytransferrange3.py index 92cf893371..cfe150ded0 100644 --- a/eos/effects/carrieramarrarmorenergytransferrange3.py +++ b/eos/effects/carrieramarrarmorenergytransferrange3.py @@ -5,9 +5,7 @@ # Ship: Archon type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Carrier").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"), - "maxRange", ship.getModifiedItemAttr("carrierAmarrBonus3") * level) + "maxRange", ship.getModifiedItemAttr("carrierAmarrBonus3"), skill="Amarr Carrier") fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Capacitor Emission Systems"), - "powerTransferRange", ship.getModifiedItemAttr("carrierAmarrBonus3") * level) - \ No newline at end of file + "powerTransferRange", ship.getModifiedItemAttr("carrierAmarrBonus3"), skill="Amarr Carrier") diff --git a/eos/effects/carrieramarrarmorresist2.py b/eos/effects/carrieramarrarmorresist2.py index c10204b66c..c4ff2e9dd6 100644 --- a/eos/effects/carrieramarrarmorresist2.py +++ b/eos/effects/carrieramarrarmorresist2.py @@ -5,7 +5,6 @@ # Ship: Archon type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Carrier").level for resType in ("Em", "Explosive", "Kinetic", "Thermal"): fit.ship.boostItemAttr("armor{0}DamageResonance".format(resType), - ship.getModifiedItemAttr("carrierAmarrBonus2") * level) + ship.getModifiedItemAttr("carrierAmarrBonus2"), skill="Amarr Carrier") diff --git a/eos/effects/carrieramarrdronemax1.py b/eos/effects/carrieramarrdronemax1.py index f91b6d3d80..0908e0cf60 100644 --- a/eos/effects/carrieramarrdronemax1.py +++ b/eos/effects/carrieramarrdronemax1.py @@ -5,6 +5,4 @@ # Ship: Archon type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Carrier").level - amount = ship.getModifiedItemAttr("carrierAmarrBonus1") - fit.extraAttributes.increase("maxActiveDrones", amount * level) + fit.extraAttributes.increase("maxActiveDrones", ship.getModifiedItemAttr("carrierAmarrBonus1"), skill="Amarr Carrier") diff --git a/eos/effects/carrieramarrfighterbombermaxvelocity2.py b/eos/effects/carrieramarrfighterbombermaxvelocity2.py index b48ebd3cf8..8a3a49b7a7 100644 --- a/eos/effects/carrieramarrfighterbombermaxvelocity2.py +++ b/eos/effects/carrieramarrfighterbombermaxvelocity2.py @@ -4,6 +4,5 @@ # Ship: Revenant type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Carrier").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighter Bombers"), - "maxVelocity", ship.getModifiedItemAttr("carrierAmarrBonus2") * level) + "maxVelocity", ship.getModifiedItemAttr("carrierAmarrBonus2"), skill="Amarr Carrier") diff --git a/eos/effects/carrieramarrfightermaxvelocity2.py b/eos/effects/carrieramarrfightermaxvelocity2.py index abb9dd0050..085ddf5083 100644 --- a/eos/effects/carrieramarrfightermaxvelocity2.py +++ b/eos/effects/carrieramarrfightermaxvelocity2.py @@ -4,6 +4,5 @@ # Ship: Revenant type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Carrier").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighters"), - "maxVelocity", ship.getModifiedItemAttr("carrierAmarrBonus2") * level) + "maxVelocity", ship.getModifiedItemAttr("carrierAmarrBonus2"), skill="Amarr Carrier") diff --git a/eos/effects/carrieramarrleadershipmaxgroupactive4.py b/eos/effects/carrieramarrleadershipmaxgroupactive4.py index e78dd541d9..6b46d82a58 100644 --- a/eos/effects/carrieramarrleadershipmaxgroupactive4.py +++ b/eos/effects/carrieramarrleadershipmaxgroupactive4.py @@ -5,6 +5,5 @@ # Ship: Revenant type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Carrier").level fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator", - "maxGroupActive", ship.getModifiedItemAttr("carrierAmarrBonus4") * level) + "maxGroupActive", ship.getModifiedItemAttr("carrierAmarrBonus4"), skill="Amarr Carrier") diff --git a/eos/effects/carriercaldaridronemax1.py b/eos/effects/carriercaldaridronemax1.py index 7bae734701..aa9f9f69ae 100644 --- a/eos/effects/carriercaldaridronemax1.py +++ b/eos/effects/carriercaldaridronemax1.py @@ -5,6 +5,4 @@ # Ship: Wyvern type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Carrier").level - amount = ship.getModifiedItemAttr("carrierCaldariBonus1") - fit.extraAttributes.increase("maxActiveDrones", amount * level) + fit.extraAttributes.increase("maxActiveDrones", ship.getModifiedItemAttr("carrierCaldariBonus1"), skill="Caldari Carrier") diff --git a/eos/effects/carriercaldarifightersandbomberssig1.py b/eos/effects/carriercaldarifightersandbomberssig1.py index 3689bdd7c9..3602e72e75 100644 --- a/eos/effects/carriercaldarifightersandbomberssig1.py +++ b/eos/effects/carriercaldarifightersandbomberssig1.py @@ -4,6 +4,5 @@ # Ship: Revenant type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Carrier").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighters") or drone.item.requiresSkill("Fighter Bombers"), - "signatureRadius", ship.getModifiedItemAttr("carrierCaldariBonus1") * level) + "signatureRadius", ship.getModifiedItemAttr("carrierCaldariBonus1"), skill="Caldari Carrier") diff --git a/eos/effects/carriercaldarileadershipmaxgroupactive4.py b/eos/effects/carriercaldarileadershipmaxgroupactive4.py index 3bf0fd44b4..118bef11da 100644 --- a/eos/effects/carriercaldarileadershipmaxgroupactive4.py +++ b/eos/effects/carriercaldarileadershipmaxgroupactive4.py @@ -4,6 +4,5 @@ # Ship: Wyvern type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Carrier").level fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator", - "maxGroupActive", ship.getModifiedItemAttr("carrierCaldariBonus4") * level) + "maxGroupActive", ship.getModifiedItemAttr("carrierCaldariBonus4"), skill="Caldari Carrier") diff --git a/eos/effects/carriercaldarishieldenergytransferrange3.py b/eos/effects/carriercaldarishieldenergytransferrange3.py index 3874ed4b08..4d75090c5e 100644 --- a/eos/effects/carriercaldarishieldenergytransferrange3.py +++ b/eos/effects/carriercaldarishieldenergytransferrange3.py @@ -6,8 +6,7 @@ # Ship: Wyvern type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Carrier").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"), - "shieldTransferRange", ship.getModifiedItemAttr("carrierCaldariBonus3") * level) + "shieldTransferRange", ship.getModifiedItemAttr("carrierCaldariBonus3"), skill="Caldari Carrier") fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Capacitor Emission Systems"), - "powerTransferRange", ship.getModifiedItemAttr("carrierCaldariBonus3") * level) + "powerTransferRange", ship.getModifiedItemAttr("carrierCaldariBonus3"), skill="Caldari Carrier") diff --git a/eos/effects/carriercaldarishieldresist2.py b/eos/effects/carriercaldarishieldresist2.py index 3699782e28..29e4de20a9 100644 --- a/eos/effects/carriercaldarishieldresist2.py +++ b/eos/effects/carriercaldarishieldresist2.py @@ -5,7 +5,6 @@ # Ship: Wyvern type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Carrier").level for resType in ("Em", "Explosive", "Kinetic", "Thermal"): fit.ship.boostItemAttr("shield{0}DamageResonance".format(resType), - ship.getModifiedItemAttr("carrierCaldariBonus2") * level) + ship.getModifiedItemAttr("carrierCaldariBonus2"), skill="Caldari Carrier") diff --git a/eos/effects/carriergallentearmorshieldtransferrange3.py b/eos/effects/carriergallentearmorshieldtransferrange3.py index cd13920fa7..76f9958895 100644 --- a/eos/effects/carriergallentearmorshieldtransferrange3.py +++ b/eos/effects/carriergallentearmorshieldtransferrange3.py @@ -5,8 +5,7 @@ # Ship: Thanatos type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Carrier").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"), - "shieldTransferRange", ship.getModifiedItemAttr("carrierGallenteBonus3") * level) + "shieldTransferRange", ship.getModifiedItemAttr("carrierGallenteBonus3"), skill="Gallente Carrier") fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"), - "maxRange", ship.getModifiedItemAttr("carrierGallenteBonus3") * level) + "maxRange", ship.getModifiedItemAttr("carrierGallenteBonus3"), skill="Gallente Carrier") diff --git a/eos/effects/carriergallentebomberdroneowndmg2.py b/eos/effects/carriergallentebomberdroneowndmg2.py index 94de6ff25f..3dafc54f86 100644 --- a/eos/effects/carriergallentebomberdroneowndmg2.py +++ b/eos/effects/carriergallentebomberdroneowndmg2.py @@ -4,6 +4,5 @@ # Ship: Nyx type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Carrier").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighter Bombers"), - "damageMultiplier", ship.getModifiedItemAttr("carrierGallenteBonus2") * level) + "damageMultiplier", ship.getModifiedItemAttr("carrierGallenteBonus2"), skill="Gallente Carrier") diff --git a/eos/effects/carriergallentedronemax1.py b/eos/effects/carriergallentedronemax1.py index 93dcfcfa40..8f05ba0be2 100644 --- a/eos/effects/carriergallentedronemax1.py +++ b/eos/effects/carriergallentedronemax1.py @@ -5,6 +5,4 @@ # Ship: Thanatos type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Carrier").level - amount = ship.getModifiedItemAttr("carrierGallenteBonus1") - fit.extraAttributes.increase("maxActiveDrones", amount * level) + fit.extraAttributes.increase("maxActiveDrones", ship.getModifiedItemAttr("carrierGallenteBonus1"), skill="Gallente Carrier") diff --git a/eos/effects/carriergallentedroneowndmg2.py b/eos/effects/carriergallentedroneowndmg2.py index 06fcb12fb2..a9fcc279bc 100644 --- a/eos/effects/carriergallentedroneowndmg2.py +++ b/eos/effects/carriergallentedroneowndmg2.py @@ -5,6 +5,5 @@ # Ship: Thanatos type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Carrier").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighters"), - "damageMultiplier", ship.getModifiedItemAttr("carrierGallenteBonus2") * level) + "damageMultiplier", ship.getModifiedItemAttr("carrierGallenteBonus2"), skill="Gallente Carrier") diff --git a/eos/effects/carriergallenteleadershipmaxgroupactive4.py b/eos/effects/carriergallenteleadershipmaxgroupactive4.py index b265b67180..a82ea857d3 100644 --- a/eos/effects/carriergallenteleadershipmaxgroupactive4.py +++ b/eos/effects/carriergallenteleadershipmaxgroupactive4.py @@ -4,6 +4,5 @@ # Ship: Nyx type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Carrier").level fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator", - "maxGroupActive", ship.getModifiedItemAttr("carrierGallenteBonus4") * level) + "maxGroupActive", ship.getModifiedItemAttr("carrierGallenteBonus4"), skill="Gallente Carrier") diff --git a/eos/effects/carrierminmatararmorshieldamount.py b/eos/effects/carrierminmatararmorshieldamount.py index a29634ecd6..b8a5fbfb30 100644 --- a/eos/effects/carrierminmatararmorshieldamount.py +++ b/eos/effects/carrierminmatararmorshieldamount.py @@ -5,8 +5,7 @@ # Ship: Nidhoggur type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Carrier").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", - "shieldBonus", ship.getModifiedItemAttr("carrierMinmatarBonus2") * level) + "shieldBonus", ship.getModifiedItemAttr("carrierMinmatarBonus2"), skill="Minmatar Carrier") fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", - "armorDamageAmount", ship.getModifiedItemAttr("carrierMinmatarBonus2") * level) + "armorDamageAmount", ship.getModifiedItemAttr("carrierMinmatarBonus2"), skill="Minmatar Carrier") diff --git a/eos/effects/carrierminmatararmorshieldtransferrange3.py b/eos/effects/carrierminmatararmorshieldtransferrange3.py index aeb4813af6..3bb5b7caf2 100644 --- a/eos/effects/carrierminmatararmorshieldtransferrange3.py +++ b/eos/effects/carrierminmatararmorshieldtransferrange3.py @@ -5,8 +5,7 @@ # Ship: Nidhoggur type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Carrier").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"), - "shieldTransferRange", ship.getModifiedItemAttr("carrierMinmatarBonus3") * level) + "shieldTransferRange", ship.getModifiedItemAttr("carrierMinmatarBonus3"), skill="Minmatar Carrier") fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"), - "maxRange", ship.getModifiedItemAttr("carrierMinmatarBonus3") * level) + "maxRange", ship.getModifiedItemAttr("carrierMinmatarBonus3"), skill="Minmatar Carrier") diff --git a/eos/effects/carrierminmatardronemax1.py b/eos/effects/carrierminmatardronemax1.py index adb5da559b..58e3e69176 100644 --- a/eos/effects/carrierminmatardronemax1.py +++ b/eos/effects/carrierminmatardronemax1.py @@ -5,6 +5,4 @@ # Ship: Nidhoggur type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Carrier").level - amount = ship.getModifiedItemAttr("carrierMinmatarBonus1") - fit.extraAttributes.increase("maxActiveDrones", amount * level) + fit.extraAttributes.increase("maxActiveDrones", ship.getModifiedItemAttr("carrierMinmatarBonus1"), skill="Minmatar Carrier") diff --git a/eos/effects/carrierminmatarleadershipmaxgroupactive4.py b/eos/effects/carrierminmatarleadershipmaxgroupactive4.py index 1183687e3c..449cc1bd37 100644 --- a/eos/effects/carrierminmatarleadershipmaxgroupactive4.py +++ b/eos/effects/carrierminmatarleadershipmaxgroupactive4.py @@ -4,6 +4,5 @@ # Ship: Hel type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Carrier").level fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator", - "maxGroupActive", ship.getModifiedItemAttr("carrierMinmatarBonus4") * level) + "maxGroupActive", ship.getModifiedItemAttr("carrierMinmatarBonus4"), skill="Minmatar Carrier") diff --git a/eos/effects/covertopscloakcpupercentbonus1.py b/eos/effects/covertopscloakcpupercentbonus1.py index 199c502e24..cdd6719131 100644 --- a/eos/effects/covertopscloakcpupercentbonus1.py +++ b/eos/effects/covertopscloakcpupercentbonus1.py @@ -5,6 +5,5 @@ type = "passive" runTime = "early" def handler(fit, ship, context): - level = fit.character.getSkill("Covert Ops").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cloaking Device", - "cpu", ship.getModifiedItemAttr("eliteBonusCoverOps1") * level) + "cpu", ship.getModifiedItemAttr("eliteBonusCoverOps1"), skill="Covert Ops") diff --git a/eos/effects/dreadnoughtmd1projdmgbonus.py b/eos/effects/dreadnoughtmd1projdmgbonus.py index 303d8b87fc..33115de5ae 100644 --- a/eos/effects/dreadnoughtmd1projdmgbonus.py +++ b/eos/effects/dreadnoughtmd1projdmgbonus.py @@ -4,6 +4,5 @@ # Ship: Naglfar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Dreadnought").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"), - "damageMultiplier", ship.getModifiedItemAttr("dreadnoughtShipBonusM1") * level) + "damageMultiplier", ship.getModifiedItemAttr("dreadnoughtShipBonusM1"), skill="Minmatar Dreadnought") diff --git a/eos/effects/dreadnoughtmd3projrofbonus.py b/eos/effects/dreadnoughtmd3projrofbonus.py index 639985a44b..1dd5f70966 100644 --- a/eos/effects/dreadnoughtmd3projrofbonus.py +++ b/eos/effects/dreadnoughtmd3projrofbonus.py @@ -4,6 +4,5 @@ # Ship: Naglfar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Dreadnought").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"), - "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusM3") * level) + "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusM3"), skill="Minmatar Dreadnought") diff --git a/eos/effects/dreadnoughtshipbonushybriddmgg1.py b/eos/effects/dreadnoughtshipbonushybriddmgg1.py index c0921b5d35..316e4b01f8 100644 --- a/eos/effects/dreadnoughtshipbonushybriddmgg1.py +++ b/eos/effects/dreadnoughtshipbonushybriddmgg1.py @@ -4,6 +4,5 @@ # Ship: Moros type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Dreadnought").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), - "damageMultiplier", ship.getModifiedItemAttr("dreadnoughtShipBonusG1") * level) + "damageMultiplier", ship.getModifiedItemAttr("dreadnoughtShipBonusG1"), skill="Gallente Dreadnought") diff --git a/eos/effects/dreadnoughtshipbonushybridrofg2.py b/eos/effects/dreadnoughtshipbonushybridrofg2.py index ca1a8325eb..251e7c4087 100644 --- a/eos/effects/dreadnoughtshipbonushybridrofg2.py +++ b/eos/effects/dreadnoughtshipbonushybridrofg2.py @@ -4,6 +4,5 @@ # Ship: Moros type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Dreadnought").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), - "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusG2") * level) + "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusG2"), skill="Gallente Dreadnought") diff --git a/eos/effects/dreadnoughtshipbonuslasercapneeda1.py b/eos/effects/dreadnoughtshipbonuslasercapneeda1.py index 53912cfb1c..f6d86d71bc 100644 --- a/eos/effects/dreadnoughtshipbonuslasercapneeda1.py +++ b/eos/effects/dreadnoughtshipbonuslasercapneeda1.py @@ -4,6 +4,5 @@ # Ship: Revelation type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Dreadnought").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"), - "capacitorNeed", ship.getModifiedItemAttr("dreadnoughtShipBonusA1") * level) + "capacitorNeed", ship.getModifiedItemAttr("dreadnoughtShipBonusA1"), skill="Amarr Dreadnought") diff --git a/eos/effects/dreadnoughtshipbonuslaserrofa2.py b/eos/effects/dreadnoughtshipbonuslaserrofa2.py index d01246d24d..a1563282db 100644 --- a/eos/effects/dreadnoughtshipbonuslaserrofa2.py +++ b/eos/effects/dreadnoughtshipbonuslaserrofa2.py @@ -4,6 +4,5 @@ # Ship: Revelation type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Dreadnought").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"), - "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusA2") * level) + "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusA2"), skill="Amarr Dreadnought") diff --git a/eos/effects/dreadnoughtshipbonusshieldresistancesc2.py b/eos/effects/dreadnoughtshipbonusshieldresistancesc2.py index a837c7a368..2d8266e690 100644 --- a/eos/effects/dreadnoughtshipbonusshieldresistancesc2.py +++ b/eos/effects/dreadnoughtshipbonusshieldresistancesc2.py @@ -4,7 +4,6 @@ # Ship: Phoenix type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Dreadnought").level for damageType in ("em", "thermal", "explosive", "kinetic"): fit.ship.boostItemAttr("shield{}DamageResonance".format(damageType.capitalize()), - ship.getModifiedItemAttr("dreadnoughtShipBonusC2") * level) + ship.getModifiedItemAttr("dreadnoughtShipBonusC2"), skill="Caldari Dreadnought") diff --git a/eos/effects/elitebargebonusiceharvestingcycletimebarge3.py b/eos/effects/elitebargebonusiceharvestingcycletimebarge3.py index 9f8b3d19c2..0dcb9f4b73 100644 --- a/eos/effects/elitebargebonusiceharvestingcycletimebarge3.py +++ b/eos/effects/elitebargebonusiceharvestingcycletimebarge3.py @@ -4,6 +4,5 @@ # Ships from group: Exhumer (3 of 3) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Exhumers").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"), - "duration", ship.getModifiedItemAttr("eliteBonusBarge2") * level) + "duration", ship.getModifiedItemAttr("eliteBonusBarge2"), skill="Exhumers") diff --git a/eos/effects/elitebargebonusminingdurationbarge2.py b/eos/effects/elitebargebonusminingdurationbarge2.py index c0ac3476b5..d664e7b673 100644 --- a/eos/effects/elitebargebonusminingdurationbarge2.py +++ b/eos/effects/elitebargebonusminingdurationbarge2.py @@ -4,6 +4,5 @@ # Ships from group: Exhumer (3 of 3) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Exhumers").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"), - "duration", ship.getModifiedItemAttr("eliteBonusBarge2") * level) + "duration", ship.getModifiedItemAttr("eliteBonusBarge2"), skill="Exhumers") diff --git a/eos/effects/elitebargeshieldresistance1.py b/eos/effects/elitebargeshieldresistance1.py index b336ae6151..e9d1b0d2e4 100644 --- a/eos/effects/elitebargeshieldresistance1.py +++ b/eos/effects/elitebargeshieldresistance1.py @@ -4,7 +4,6 @@ # Ships from group: Exhumer (3 of 3) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Exhumers").level for damageType in ("em", "thermal", "explosive", "kinetic"): fit.ship.boostItemAttr("shield{}DamageResonance".format(damageType.capitalize()), - ship.getModifiedItemAttr("eliteBonusBarge1") * level) + ship.getModifiedItemAttr("eliteBonusBarge1"), skill="Exhumers") diff --git a/eos/effects/elitebonusassaultshiplightmissilerof.py b/eos/effects/elitebonusassaultshiplightmissilerof.py index 34ddd205fd..d85fb7b455 100644 --- a/eos/effects/elitebonusassaultshiplightmissilerof.py +++ b/eos/effects/elitebonusassaultshiplightmissilerof.py @@ -4,6 +4,5 @@ # Ship: Cambion type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Assault Frigates").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Light", - "speed", ship.getModifiedItemAttr("eliteBonusGunship1") * level) + "speed", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates") diff --git a/eos/effects/elitebonusassaultshipmissilevelocity1.py b/eos/effects/elitebonusassaultshipmissilevelocity1.py index 3ae157043d..7cf9c2e739 100644 --- a/eos/effects/elitebonusassaultshipmissilevelocity1.py +++ b/eos/effects/elitebonusassaultshipmissilevelocity1.py @@ -4,6 +4,5 @@ # Ship: Hawk type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Assault Frigates").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "maxVelocity", ship.getModifiedItemAttr("eliteBonusGunship1") * level) \ No newline at end of file + "maxVelocity", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates") \ No newline at end of file diff --git a/eos/effects/elitebonusassaultshiprocketrof.py b/eos/effects/elitebonusassaultshiprocketrof.py index e8f9deefd3..6964fa1885 100644 --- a/eos/effects/elitebonusassaultshiprocketrof.py +++ b/eos/effects/elitebonusassaultshiprocketrof.py @@ -4,6 +4,5 @@ # Ship: Cambion type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Assault Frigates").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rocket", - "speed", ship.getModifiedItemAttr("eliteBonusGunship1") * level) + "speed", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates") diff --git a/eos/effects/elitebonusblackopsagiliy1.py b/eos/effects/elitebonusblackopsagiliy1.py index 91df914f78..b71a307162 100644 --- a/eos/effects/elitebonusblackopsagiliy1.py +++ b/eos/effects/elitebonusblackopsagiliy1.py @@ -4,5 +4,4 @@ # Ship: Sin type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Black Ops").level - fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("eliteBonusBlackOps1") * level) \ No newline at end of file + fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops") \ No newline at end of file diff --git a/eos/effects/elitebonusblackopscloakvelocity2.py b/eos/effects/elitebonusblackopscloakvelocity2.py index 149abc8aaf..557a23df94 100644 --- a/eos/effects/elitebonusblackopscloakvelocity2.py +++ b/eos/effects/elitebonusblackopscloakvelocity2.py @@ -5,5 +5,4 @@ type = "passive" def handler(fit, ship, context): if fit.extraAttributes["cloaked"]: - level = fit.character.getSkill("Black Ops").level - fit.ship.multiplyItemAttr("maxVelocity", ship.getModifiedItemAttr("eliteBonusBlackOps2") * level) + fit.ship.multiplyItemAttr("maxVelocity", ship.getModifiedItemAttr("eliteBonusBlackOps2"), skill="Black Ops") diff --git a/eos/effects/elitebonusblackopsecmburstgravandladarandmagnetoandradar.py b/eos/effects/elitebonusblackopsecmburstgravandladarandmagnetoandradar.py index e8a0e89ceb..3611c52ff0 100644 --- a/eos/effects/elitebonusblackopsecmburstgravandladarandmagnetoandradar.py +++ b/eos/effects/elitebonusblackopsecmburstgravandladarandmagnetoandradar.py @@ -4,8 +4,7 @@ # Ship: Widow type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Black Ops").level sensorTypes = ("Gravimetric", "Ladar", "Magnetometric", "Radar") for type in sensorTypes: fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM Burst", "scan{0}StrengthBonus".format(type), - ship.getModifiedItemAttr("eliteBonusBlackOps1") * level) + ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops") diff --git a/eos/effects/elitebonusblackopsecmgravandladarandmagnetometricandradarstrength1.py b/eos/effects/elitebonusblackopsecmgravandladarandmagnetometricandradarstrength1.py index 46abc4ffd8..d5251486bd 100644 --- a/eos/effects/elitebonusblackopsecmgravandladarandmagnetometricandradarstrength1.py +++ b/eos/effects/elitebonusblackopsecmgravandladarandmagnetometricandradarstrength1.py @@ -4,8 +4,7 @@ # Ship: Widow type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Black Ops").level sensorTypes = ("Gravimetric", "Ladar", "Magnetometric", "Radar") for type in sensorTypes: fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "scan{0}StrengthBonus".format(type), - ship.getModifiedItemAttr("eliteBonusBlackOps1") * level) + ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops") diff --git a/eos/effects/elitebonusblackopslargeenergyturrettracking1.py b/eos/effects/elitebonusblackopslargeenergyturrettracking1.py index cc98a186e1..1cc54e4829 100644 --- a/eos/effects/elitebonusblackopslargeenergyturrettracking1.py +++ b/eos/effects/elitebonusblackopslargeenergyturrettracking1.py @@ -4,6 +4,5 @@ # Ship: Redeemer type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Black Ops").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"), - "trackingSpeed", ship.getModifiedItemAttr("eliteBonusBlackOps1") * level) + "trackingSpeed", ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops") diff --git a/eos/effects/elitebonusblackopsmaxvelocity1.py b/eos/effects/elitebonusblackopsmaxvelocity1.py index e3e2255c95..98ff1dc287 100644 --- a/eos/effects/elitebonusblackopsmaxvelocity1.py +++ b/eos/effects/elitebonusblackopsmaxvelocity1.py @@ -4,5 +4,4 @@ # Ship: Panther type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Black Ops").level - fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("eliteBonusBlackOps1") * level) \ No newline at end of file + fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("eliteBonusBlackOps1"), skill="Black Ops") \ No newline at end of file diff --git a/eos/effects/elitebonuscommandshiparmoredcs3.py b/eos/effects/elitebonuscommandshiparmoredcs3.py index 06531d6dc0..d801e659d9 100644 --- a/eos/effects/elitebonuscommandshiparmoredcs3.py +++ b/eos/effects/elitebonuscommandshiparmoredcs3.py @@ -4,6 +4,5 @@ # Ships from group: Command Ship (4 of 8) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Command Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), - "commandBonus", ship.getModifiedItemAttr("eliteBonusCommandShips3") * level) + "commandBonus", ship.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships") diff --git a/eos/effects/elitebonuscommandshiparmorhp1.py b/eos/effects/elitebonuscommandshiparmorhp1.py index ebf52b647c..81ef932b1a 100644 --- a/eos/effects/elitebonuscommandshiparmorhp1.py +++ b/eos/effects/elitebonuscommandshiparmorhp1.py @@ -4,5 +4,4 @@ # Ship: Damnation type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Command Ships").level - fit.ship.boostItemAttr("armorHP", ship.getModifiedItemAttr("eliteBonusCommandShips1") * level) \ No newline at end of file + fit.ship.boostItemAttr("armorHP", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships") \ No newline at end of file diff --git a/eos/effects/elitebonuscommandshiphamrofcs1.py b/eos/effects/elitebonuscommandshiphamrofcs1.py index 17c537f7b5..63eaf51a97 100644 --- a/eos/effects/elitebonuscommandshiphamrofcs1.py +++ b/eos/effects/elitebonuscommandshiphamrofcs1.py @@ -5,6 +5,5 @@ # Ship: Nighthawk type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Command Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault", - "speed", ship.getModifiedItemAttr("eliteBonusCommandShips1") * level) + "speed", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships") diff --git a/eos/effects/elitebonuscommandshipheavyassaultmissiledamagecs2.py b/eos/effects/elitebonuscommandshipheavyassaultmissiledamagecs2.py index d4b791853b..18aa69a30d 100644 --- a/eos/effects/elitebonuscommandshipheavyassaultmissiledamagecs2.py +++ b/eos/effects/elitebonuscommandshipheavyassaultmissiledamagecs2.py @@ -4,8 +4,7 @@ # Ship: Damnation type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Command Ships").level damageTypes = ("em", "explosive", "kinetic", "thermal") for damageType in damageTypes: fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), - "{0}Damage".format(damageType), ship.getModifiedItemAttr("eliteBonusCommandShips2") * level) + "{0}Damage".format(damageType), ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships") diff --git a/eos/effects/elitebonuscommandshipheavydronetrackingcs2.py b/eos/effects/elitebonuscommandshipheavydronetrackingcs2.py index 4eacfeee3b..1bcf86d542 100644 --- a/eos/effects/elitebonuscommandshipheavydronetrackingcs2.py +++ b/eos/effects/elitebonuscommandshipheavydronetrackingcs2.py @@ -4,6 +4,5 @@ # Ship: Eos type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Command Ships").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"), - "trackingSpeed", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level) + "trackingSpeed", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships") diff --git a/eos/effects/elitebonuscommandshipheavydronevelocitycs2.py b/eos/effects/elitebonuscommandshipheavydronevelocitycs2.py index 1a8cfe6f57..b71aab5bd9 100644 --- a/eos/effects/elitebonuscommandshipheavydronevelocitycs2.py +++ b/eos/effects/elitebonuscommandshipheavydronevelocitycs2.py @@ -4,6 +4,5 @@ # Ship: Eos type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Command Ships").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"), - "maxVelocity", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level) + "maxVelocity", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships") diff --git a/eos/effects/elitebonuscommandshipheavymissiledamagecs2.py b/eos/effects/elitebonuscommandshipheavymissiledamagecs2.py index 9d2b3de080..0c77bf2316 100644 --- a/eos/effects/elitebonuscommandshipheavymissiledamagecs2.py +++ b/eos/effects/elitebonuscommandshipheavymissiledamagecs2.py @@ -4,8 +4,7 @@ # Ship: Damnation type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Command Ships").level damageTypes = ("em", "explosive", "kinetic", "thermal") for damageType in damageTypes: fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), - "{0}Damage".format(damageType), ship.getModifiedItemAttr("eliteBonusCommandShips2") * level) + "{0}Damage".format(damageType), ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships") diff --git a/eos/effects/elitebonuscommandshiphmrofcs1.py b/eos/effects/elitebonuscommandshiphmrofcs1.py index 281e1b4985..cfb685d19b 100644 --- a/eos/effects/elitebonuscommandshiphmrofcs1.py +++ b/eos/effects/elitebonuscommandshiphmrofcs1.py @@ -5,6 +5,5 @@ # Ship: Nighthawk type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Command Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy", - "speed", ship.getModifiedItemAttr("eliteBonusCommandShips1") * level) + "speed", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships") diff --git a/eos/effects/elitebonuscommandshiphybridfalloffcs2.py b/eos/effects/elitebonuscommandshiphybridfalloffcs2.py index a66a3ebc25..785a1e69ad 100644 --- a/eos/effects/elitebonuscommandshiphybridfalloffcs2.py +++ b/eos/effects/elitebonuscommandshiphybridfalloffcs2.py @@ -4,6 +4,5 @@ # Ship: Astarte type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Command Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "falloff", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level) + "falloff", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships") diff --git a/eos/effects/elitebonuscommandshiphybridoptimalcs1.py b/eos/effects/elitebonuscommandshiphybridoptimalcs1.py index 73a52b132c..706a6876fb 100644 --- a/eos/effects/elitebonuscommandshiphybridoptimalcs1.py +++ b/eos/effects/elitebonuscommandshiphybridoptimalcs1.py @@ -4,6 +4,5 @@ # Ship: Vulture type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Command Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "maxRange", ship.getModifiedItemAttr("eliteBonusCommandShips1") * level) + "maxRange", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships") diff --git a/eos/effects/elitebonuscommandshipinformationcs3.py b/eos/effects/elitebonuscommandshipinformationcs3.py index 374e4e1690..0a982f2d11 100644 --- a/eos/effects/elitebonuscommandshipinformationcs3.py +++ b/eos/effects/elitebonuscommandshipinformationcs3.py @@ -4,6 +4,5 @@ # Ships from group: Command Ship (4 of 8) type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Command Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), - "commandBonus", module.getModifiedItemAttr("eliteBonusCommandShips3") * level) + "commandBonus", module.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships") diff --git a/eos/effects/elitebonuscommandshipinformationhiddencs3.py b/eos/effects/elitebonuscommandshipinformationhiddencs3.py index 6f480e4525..fee3ea437a 100644 --- a/eos/effects/elitebonuscommandshipinformationhiddencs3.py +++ b/eos/effects/elitebonuscommandshipinformationhiddencs3.py @@ -4,6 +4,5 @@ # Ships from group: Command Ship (4 of 8) type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Command Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), - "commandBonusHidden", module.getModifiedItemAttr("eliteBonusCommandShips3") * level) + "commandBonusHidden", module.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships") diff --git a/eos/effects/elitebonuscommandshiplaserdamagecs1.py b/eos/effects/elitebonuscommandshiplaserdamagecs1.py index 42f08204ab..9dc55f3d47 100644 --- a/eos/effects/elitebonuscommandshiplaserdamagecs1.py +++ b/eos/effects/elitebonuscommandshiplaserdamagecs1.py @@ -4,6 +4,5 @@ # Ship: Absolution type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Command Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"), - "damageMultiplier", ship.getModifiedItemAttr("eliteBonusCommandShips1") * level) + "damageMultiplier", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships") diff --git a/eos/effects/elitebonuscommandshiplaserrofcs2.py b/eos/effects/elitebonuscommandshiplaserrofcs2.py index 3b8176a8df..0df96f5bf2 100644 --- a/eos/effects/elitebonuscommandshiplaserrofcs2.py +++ b/eos/effects/elitebonuscommandshiplaserrofcs2.py @@ -4,6 +4,5 @@ # Ship: Absolution type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Command Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"), - "speed", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level) + "speed", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships") diff --git a/eos/effects/elitebonuscommandshipmediumhybriddamagecs2.py b/eos/effects/elitebonuscommandshipmediumhybriddamagecs2.py index e39fcc6d1a..e5910f8f70 100644 --- a/eos/effects/elitebonuscommandshipmediumhybriddamagecs2.py +++ b/eos/effects/elitebonuscommandshipmediumhybriddamagecs2.py @@ -4,6 +4,5 @@ # Ship: Vulture type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Command Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "damageMultiplier", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level) + "damageMultiplier", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships") diff --git a/eos/effects/elitebonuscommandshipmediumhybridrofcs1.py b/eos/effects/elitebonuscommandshipmediumhybridrofcs1.py index 70cdc5767f..bd5344ef2d 100644 --- a/eos/effects/elitebonuscommandshipmediumhybridrofcs1.py +++ b/eos/effects/elitebonuscommandshipmediumhybridrofcs1.py @@ -4,6 +4,5 @@ # Ship: Astarte type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Command Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "speed", ship.getModifiedItemAttr("eliteBonusCommandShips1") * level) + "speed", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships") diff --git a/eos/effects/elitebonuscommandshipmediumhybridtrackingcs1.py b/eos/effects/elitebonuscommandshipmediumhybridtrackingcs1.py index 408e53e626..b1662054ec 100644 --- a/eos/effects/elitebonuscommandshipmediumhybridtrackingcs1.py +++ b/eos/effects/elitebonuscommandshipmediumhybridtrackingcs1.py @@ -4,6 +4,5 @@ # Ship: Eos type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Command Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "trackingSpeed", ship.getModifiedItemAttr("eliteBonusCommandShips1") * level) + "trackingSpeed", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships") diff --git a/eos/effects/elitebonuscommandshipprojectiledamagecs1.py b/eos/effects/elitebonuscommandshipprojectiledamagecs1.py index b0e929740f..6929f463de 100644 --- a/eos/effects/elitebonuscommandshipprojectiledamagecs1.py +++ b/eos/effects/elitebonuscommandshipprojectiledamagecs1.py @@ -4,6 +4,5 @@ # Ship: Sleipnir type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Command Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), - "damageMultiplier", ship.getModifiedItemAttr("eliteBonusCommandShips1") * level) + "damageMultiplier", ship.getModifiedItemAttr("eliteBonusCommandShips1"), skill="Command Ships") diff --git a/eos/effects/elitebonuscommandshipprojectilefalloffcs2.py b/eos/effects/elitebonuscommandshipprojectilefalloffcs2.py index e90c371389..93833cb9a4 100644 --- a/eos/effects/elitebonuscommandshipprojectilefalloffcs2.py +++ b/eos/effects/elitebonuscommandshipprojectilefalloffcs2.py @@ -4,6 +4,5 @@ # Ship: Sleipnir type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Command Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), - "falloff", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level) + "falloff", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships") diff --git a/eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionradiuscs2.py b/eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionradiuscs2.py index cc149aa629..fd81ed8441 100644 --- a/eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionradiuscs2.py +++ b/eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionradiuscs2.py @@ -4,6 +4,5 @@ # Ship: Nighthawk type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Command Ships").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), - "aoeCloudSize", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level) + "aoeCloudSize", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships") diff --git a/eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionvelocitycs2.py b/eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionvelocitycs2.py index 7af905c49a..0d64070192 100644 --- a/eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionvelocitycs2.py +++ b/eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionvelocitycs2.py @@ -4,6 +4,5 @@ # Ship: Claymore type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Command Ships").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), - "aoeVelocity", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level) + "aoeVelocity", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships") diff --git a/eos/effects/elitebonuscommandshipsheavymissileexplosionradiuscs2.py b/eos/effects/elitebonuscommandshipsheavymissileexplosionradiuscs2.py index d0799135c9..22c395a969 100644 --- a/eos/effects/elitebonuscommandshipsheavymissileexplosionradiuscs2.py +++ b/eos/effects/elitebonuscommandshipsheavymissileexplosionradiuscs2.py @@ -4,6 +4,5 @@ # Ship: Nighthawk type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Command Ships").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), - "aoeCloudSize", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level) + "aoeCloudSize", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships") diff --git a/eos/effects/elitebonuscommandshipsheavymissileexplosionvelocitycs2.py b/eos/effects/elitebonuscommandshipsheavymissileexplosionvelocitycs2.py index 11f917fc06..626a5525c8 100644 --- a/eos/effects/elitebonuscommandshipsheavymissileexplosionvelocitycs2.py +++ b/eos/effects/elitebonuscommandshipsheavymissileexplosionvelocitycs2.py @@ -4,6 +4,5 @@ # Ship: Claymore type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Command Ships").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), - "aoeVelocity", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level) + "aoeVelocity", ship.getModifiedItemAttr("eliteBonusCommandShips2"), skill="Command Ships") diff --git a/eos/effects/elitebonuscommandshipsiegecs3.py b/eos/effects/elitebonuscommandshipsiegecs3.py index 19a79f987b..879e873073 100644 --- a/eos/effects/elitebonuscommandshipsiegecs3.py +++ b/eos/effects/elitebonuscommandshipsiegecs3.py @@ -4,6 +4,5 @@ # Ships from group: Command Ship (4 of 8) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Command Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), - "commandBonus", ship.getModifiedItemAttr("eliteBonusCommandShips3") * level) + "commandBonus", ship.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships") diff --git a/eos/effects/elitebonuscommandshipskirmishcs3.py b/eos/effects/elitebonuscommandshipskirmishcs3.py index 8dde383727..aa9c020b5e 100644 --- a/eos/effects/elitebonuscommandshipskirmishcs3.py +++ b/eos/effects/elitebonuscommandshipskirmishcs3.py @@ -4,6 +4,5 @@ # Ships from group: Command Ship (4 of 8) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Command Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), - "commandBonus", ship.getModifiedItemAttr("eliteBonusCommandShips3") * level) + "commandBonus", ship.getModifiedItemAttr("eliteBonusCommandShips3"), skill="Command Ships") diff --git a/eos/effects/elitebonuscoveropsbombemdmg1.py b/eos/effects/elitebonuscoveropsbombemdmg1.py index 95b290c17c..4c965a7223 100644 --- a/eos/effects/elitebonuscoveropsbombemdmg1.py +++ b/eos/effects/elitebonuscoveropsbombemdmg1.py @@ -4,6 +4,5 @@ # Ship: Purifier type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Covert Ops").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Bomb Deployment"), - "emDamage", ship.getModifiedItemAttr("eliteBonusCoverOps1") * level) + "emDamage", ship.getModifiedItemAttr("eliteBonusCoverOps1"), skill="Covert Ops") diff --git a/eos/effects/elitebonuscoveropsbombexplosivedmg1.py b/eos/effects/elitebonuscoveropsbombexplosivedmg1.py index d89252a5ba..a9e0e21933 100644 --- a/eos/effects/elitebonuscoveropsbombexplosivedmg1.py +++ b/eos/effects/elitebonuscoveropsbombexplosivedmg1.py @@ -4,6 +4,5 @@ # Ship: Hound type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Covert Ops").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Bomb Deployment"), - "explosiveDamage", ship.getModifiedItemAttr("eliteBonusCoverOps1") * level) + "explosiveDamage", ship.getModifiedItemAttr("eliteBonusCoverOps1"), skill="Covert Ops") diff --git a/eos/effects/elitebonuscoveropsbombkineticdmg1.py b/eos/effects/elitebonuscoveropsbombkineticdmg1.py index 0946cb367f..401d5ab4f7 100644 --- a/eos/effects/elitebonuscoveropsbombkineticdmg1.py +++ b/eos/effects/elitebonuscoveropsbombkineticdmg1.py @@ -4,6 +4,5 @@ # Ship: Manticore type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Covert Ops").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Bomb Deployment"), - "kineticDamage", ship.getModifiedItemAttr("eliteBonusCoverOps1") * level) + "kineticDamage", ship.getModifiedItemAttr("eliteBonusCoverOps1"), skill="Covert Ops") diff --git a/eos/effects/elitebonuscoveropsbombthermaldmg1.py b/eos/effects/elitebonuscoveropsbombthermaldmg1.py index 63d37056d7..4859ab88c0 100644 --- a/eos/effects/elitebonuscoveropsbombthermaldmg1.py +++ b/eos/effects/elitebonuscoveropsbombthermaldmg1.py @@ -4,6 +4,5 @@ # Ship: Nemesis type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Covert Ops").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Bomb Deployment"), - "thermalDamage", ship.getModifiedItemAttr("eliteBonusCoverOps1") * level) + "thermalDamage", ship.getModifiedItemAttr("eliteBonusCoverOps1"), skill="Covert Ops") diff --git a/eos/effects/elitebonuscoveropsscanprobestrength2.py b/eos/effects/elitebonuscoveropsscanprobestrength2.py index 2905d536b3..fd767798c9 100644 --- a/eos/effects/elitebonuscoveropsscanprobestrength2.py +++ b/eos/effects/elitebonuscoveropsscanprobestrength2.py @@ -4,6 +4,5 @@ # Ships from group: Covert Ops (5 of 5) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Covert Ops").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe", - "baseSensorStrength", ship.getModifiedItemAttr("eliteBonusCoverOps2") * level) + "baseSensorStrength", ship.getModifiedItemAttr("eliteBonusCoverOps2"), skill="Covert Ops") diff --git a/eos/effects/elitebonuselectronicattackshipcapacitorcapacity2.py b/eos/effects/elitebonuselectronicattackshipcapacitorcapacity2.py index 1053bf7ebb..3113f1b809 100644 --- a/eos/effects/elitebonuselectronicattackshipcapacitorcapacity2.py +++ b/eos/effects/elitebonuselectronicattackshipcapacitorcapacity2.py @@ -4,5 +4,4 @@ # Ship: Kitsune type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Electronic Attack Ships").level - fit.ship.boostItemAttr("capacitorCapacity", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip2") * level) + fit.ship.boostItemAttr("capacitorCapacity", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip2"), skill="Electronic Attack Ships") diff --git a/eos/effects/elitebonuselectronicattackshipecmoptimalrange1.py b/eos/effects/elitebonuselectronicattackshipecmoptimalrange1.py index 7723b19f8a..8c0f338f15 100644 --- a/eos/effects/elitebonuselectronicattackshipecmoptimalrange1.py +++ b/eos/effects/elitebonuselectronicattackshipecmoptimalrange1.py @@ -4,6 +4,5 @@ # Ship: Kitsune type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Electronic Attack Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", - "maxRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1") * level) + "maxRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"), skill="Electronic Attack Ships") diff --git a/eos/effects/elitebonuselectronicattackshipenergyneutrange1.py b/eos/effects/elitebonuselectronicattackshipenergyneutrange1.py index 3333d25daa..d443e20c9a 100644 --- a/eos/effects/elitebonuselectronicattackshipenergyneutrange1.py +++ b/eos/effects/elitebonuselectronicattackshipenergyneutrange1.py @@ -4,6 +4,5 @@ # Ship: Sentinel type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Electronic Attack Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer", - "energyDestabilizationRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1") * level) + "energyDestabilizationRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"), skill="Electronic Attack Ships") diff --git a/eos/effects/elitebonuselectronicattackshipenergyvampirerange1.py b/eos/effects/elitebonuselectronicattackshipenergyvampirerange1.py index eed92d963e..9bc17e7525 100644 --- a/eos/effects/elitebonuselectronicattackshipenergyvampirerange1.py +++ b/eos/effects/elitebonuselectronicattackshipenergyvampirerange1.py @@ -4,6 +4,5 @@ # Ship: Sentinel type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Electronic Attack Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire", - "powerTransferRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1") * level) + "powerTransferRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"), skill="Electronic Attack Ships") diff --git a/eos/effects/elitebonuselectronicattackshiprechargerate2.py b/eos/effects/elitebonuselectronicattackshiprechargerate2.py index 2eedd833a1..268ab14837 100644 --- a/eos/effects/elitebonuselectronicattackshiprechargerate2.py +++ b/eos/effects/elitebonuselectronicattackshiprechargerate2.py @@ -4,5 +4,4 @@ # Ship: Sentinel type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Electronic Attack Ships").level - fit.ship.boostItemAttr("rechargeRate", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip2") * level) + fit.ship.boostItemAttr("rechargeRate", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip2"), skill="Electronic Attack Ships") diff --git a/eos/effects/elitebonuselectronicattackshipsignatureradius2.py b/eos/effects/elitebonuselectronicattackshipsignatureradius2.py index 3e5084085b..c484c89aa4 100644 --- a/eos/effects/elitebonuselectronicattackshipsignatureradius2.py +++ b/eos/effects/elitebonuselectronicattackshipsignatureradius2.py @@ -4,5 +4,4 @@ # Ship: Hyena type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Electronic Attack Ships").level - fit.ship.boostItemAttr("signatureRadius", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip2") * level) + fit.ship.boostItemAttr("signatureRadius", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip2"), skill="Electronic Attack Ships") diff --git a/eos/effects/elitebonuselectronicattackshipstasiswebmaxrange1.py b/eos/effects/elitebonuselectronicattackshipstasiswebmaxrange1.py index 1b56814d96..9929787f36 100644 --- a/eos/effects/elitebonuselectronicattackshipstasiswebmaxrange1.py +++ b/eos/effects/elitebonuselectronicattackshipstasiswebmaxrange1.py @@ -4,6 +4,5 @@ # Ship: Hyena type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Electronic Attack Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", - "maxRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1") * level) + "maxRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"), skill="Electronic Attack Ships") diff --git a/eos/effects/elitebonuselectronicattackshipwarpscramblercapneed2.py b/eos/effects/elitebonuselectronicattackshipwarpscramblercapneed2.py index 7f4fb814c3..61d9a842bd 100644 --- a/eos/effects/elitebonuselectronicattackshipwarpscramblercapneed2.py +++ b/eos/effects/elitebonuselectronicattackshipwarpscramblercapneed2.py @@ -4,6 +4,5 @@ # Ship: Keres type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Electronic Attack Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler", - "capacitorNeed", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip2") * level) \ No newline at end of file + "capacitorNeed", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip2"), skill="Electronic Attack Ships") diff --git a/eos/effects/elitebonuselectronicattackshipwarpscramblermaxrange1.py b/eos/effects/elitebonuselectronicattackshipwarpscramblermaxrange1.py index 8de1f42d42..bc32c86519 100644 --- a/eos/effects/elitebonuselectronicattackshipwarpscramblermaxrange1.py +++ b/eos/effects/elitebonuselectronicattackshipwarpscramblermaxrange1.py @@ -4,6 +4,5 @@ # Ship: Keres type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Electronic Attack Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler", - "maxRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1") * level) + "maxRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"), skill="Electronic Attack Ships") diff --git a/eos/effects/elitebonusexpeditionmining1.py b/eos/effects/elitebonusexpeditionmining1.py index 51dc7423d3..a2b899efbf 100644 --- a/eos/effects/elitebonusexpeditionmining1.py +++ b/eos/effects/elitebonusexpeditionmining1.py @@ -4,6 +4,5 @@ # Ship: Prospect type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Expedition Frigates").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"), - "miningAmount", module.getModifiedItemAttr("eliteBonusExpedition1") * level) + "miningAmount", module.getModifiedItemAttr("eliteBonusExpedition1"), skill="Expedition Frigates") diff --git a/eos/effects/elitebonusexpeditionsigradius2.py b/eos/effects/elitebonusexpeditionsigradius2.py index da66e866d6..323d167cd8 100644 --- a/eos/effects/elitebonusexpeditionsigradius2.py +++ b/eos/effects/elitebonusexpeditionsigradius2.py @@ -4,5 +4,4 @@ # Ship: Prospect type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Expedition Frigates").level - fit.ship.boostItemAttr("signatureRadius", ship.getModifiedItemAttr("eliteBonusExpedition2") * level) + fit.ship.boostItemAttr("signatureRadius", ship.getModifiedItemAttr("eliteBonusExpedition2"), skill="Expedition Frigates") diff --git a/eos/effects/elitebonusgunshiparmoremresistance1.py b/eos/effects/elitebonusgunshiparmoremresistance1.py index 563bcb8b18..7bfc78fa60 100644 --- a/eos/effects/elitebonusgunshiparmoremresistance1.py +++ b/eos/effects/elitebonusgunshiparmoremresistance1.py @@ -4,5 +4,4 @@ # Ship: Vengeance type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Assault Frigates").level - fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("eliteBonusGunship1") * level) \ No newline at end of file + fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates") diff --git a/eos/effects/elitebonusgunshiparmorexplosiveresistance1.py b/eos/effects/elitebonusgunshiparmorexplosiveresistance1.py index ab443daf22..1fbee4376c 100644 --- a/eos/effects/elitebonusgunshiparmorexplosiveresistance1.py +++ b/eos/effects/elitebonusgunshiparmorexplosiveresistance1.py @@ -4,5 +4,4 @@ # Ship: Vengeance type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Assault Frigates").level - fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("eliteBonusGunship1") * level) \ No newline at end of file + fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates") \ No newline at end of file diff --git a/eos/effects/elitebonusgunshiparmorkineticresistance1.py b/eos/effects/elitebonusgunshiparmorkineticresistance1.py index 41b5049c5b..08bb87f3a8 100644 --- a/eos/effects/elitebonusgunshiparmorkineticresistance1.py +++ b/eos/effects/elitebonusgunshiparmorkineticresistance1.py @@ -4,5 +4,4 @@ # Ship: Vengeance type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Assault Frigates").level - fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("eliteBonusGunship1") * level) \ No newline at end of file + fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates") \ No newline at end of file diff --git a/eos/effects/elitebonusgunshiparmorthermalresistance1.py b/eos/effects/elitebonusgunshiparmorthermalresistance1.py index 43a03753e4..b348472b78 100644 --- a/eos/effects/elitebonusgunshiparmorthermalresistance1.py +++ b/eos/effects/elitebonusgunshiparmorthermalresistance1.py @@ -4,5 +4,4 @@ # Ship: Vengeance type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Assault Frigates").level - fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("eliteBonusGunship1") * level) \ No newline at end of file + fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates") \ No newline at end of file diff --git a/eos/effects/elitebonusgunshipcaprecharge2.py b/eos/effects/elitebonusgunshipcaprecharge2.py index f56af6b143..a53903eb02 100644 --- a/eos/effects/elitebonusgunshipcaprecharge2.py +++ b/eos/effects/elitebonusgunshipcaprecharge2.py @@ -4,5 +4,4 @@ # Ship: Vengeance type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Assault Frigates").level - fit.ship.boostItemAttr("rechargeRate", ship.getModifiedItemAttr("eliteBonusGunship2") * level) \ No newline at end of file + fit.ship.boostItemAttr("rechargeRate", ship.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates") \ No newline at end of file diff --git a/eos/effects/elitebonusgunshipdronecapacity2.py b/eos/effects/elitebonusgunshipdronecapacity2.py index bbf682b36a..29763eb8c9 100644 --- a/eos/effects/elitebonusgunshipdronecapacity2.py +++ b/eos/effects/elitebonusgunshipdronecapacity2.py @@ -4,5 +4,4 @@ # Ship: Ishkur type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Assault Frigates").level - fit.ship.increaseItemAttr("droneCapacity", ship.getModifiedItemAttr("eliteBonusGunship2") * level) \ No newline at end of file + fit.ship.increaseItemAttr("droneCapacity", ship.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates") \ No newline at end of file diff --git a/eos/effects/elitebonusgunshiphybriddmg2.py b/eos/effects/elitebonusgunshiphybriddmg2.py index f79c5708bc..3ca3ec64a6 100644 --- a/eos/effects/elitebonusgunshiphybriddmg2.py +++ b/eos/effects/elitebonusgunshiphybriddmg2.py @@ -4,6 +4,5 @@ # Ship: Harpy type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Assault Frigates").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), - "damageMultiplier", ship.getModifiedItemAttr("eliteBonusGunship2") * level) \ No newline at end of file + "damageMultiplier", ship.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates") \ No newline at end of file diff --git a/eos/effects/elitebonusgunshiphybridoptimal1.py b/eos/effects/elitebonusgunshiphybridoptimal1.py index f5eaf196bb..0e39580e64 100644 --- a/eos/effects/elitebonusgunshiphybridoptimal1.py +++ b/eos/effects/elitebonusgunshiphybridoptimal1.py @@ -6,6 +6,5 @@ # Ship: Ishkur type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Assault Frigates").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), - "maxRange", ship.getModifiedItemAttr("eliteBonusGunship1") * level) \ No newline at end of file + "maxRange", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates") \ No newline at end of file diff --git a/eos/effects/elitebonusgunshiphybridtracking2.py b/eos/effects/elitebonusgunshiphybridtracking2.py index 2513702d21..816b2d8c32 100644 --- a/eos/effects/elitebonusgunshiphybridtracking2.py +++ b/eos/effects/elitebonusgunshiphybridtracking2.py @@ -4,6 +4,5 @@ # Ship: Enyo type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Assault Frigates").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), - "trackingSpeed", ship.getModifiedItemAttr("eliteBonusGunship2") * level) \ No newline at end of file + "trackingSpeed", ship.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates") \ No newline at end of file diff --git a/eos/effects/elitebonusgunshiplaserdamage2.py b/eos/effects/elitebonusgunshiplaserdamage2.py index fa875b5386..4f75755de9 100644 --- a/eos/effects/elitebonusgunshiplaserdamage2.py +++ b/eos/effects/elitebonusgunshiplaserdamage2.py @@ -4,6 +4,5 @@ # Ship: Retribution type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Assault Frigates").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), - "damageMultiplier", ship.getModifiedItemAttr("eliteBonusGunship2") * level) \ No newline at end of file + "damageMultiplier", ship.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates") \ No newline at end of file diff --git a/eos/effects/elitebonusgunshiplaseroptimal1.py b/eos/effects/elitebonusgunshiplaseroptimal1.py index a1c2b148a7..d9a7ffc33c 100644 --- a/eos/effects/elitebonusgunshiplaseroptimal1.py +++ b/eos/effects/elitebonusgunshiplaseroptimal1.py @@ -4,6 +4,5 @@ # Ship: Retribution type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Assault Frigates").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), - "maxRange", ship.getModifiedItemAttr("eliteBonusGunship1") * level) \ No newline at end of file + "maxRange", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates") \ No newline at end of file diff --git a/eos/effects/elitebonusgunshipprojectiledamage1.py b/eos/effects/elitebonusgunshipprojectiledamage1.py index bc8de5b25a..977f6fc9c0 100644 --- a/eos/effects/elitebonusgunshipprojectiledamage1.py +++ b/eos/effects/elitebonusgunshipprojectiledamage1.py @@ -4,6 +4,5 @@ # Ship: Wolf type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Assault Frigates").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), - "damageMultiplier", ship.getModifiedItemAttr("eliteBonusGunship1") * level) \ No newline at end of file + "damageMultiplier", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates") \ No newline at end of file diff --git a/eos/effects/elitebonusgunshipprojectiledamage2.py b/eos/effects/elitebonusgunshipprojectiledamage2.py index 773a7b3203..a9819287f1 100644 --- a/eos/effects/elitebonusgunshipprojectiledamage2.py +++ b/eos/effects/elitebonusgunshipprojectiledamage2.py @@ -4,6 +4,5 @@ # Ship: Jaguar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Assault Frigates").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), - "damageMultiplier", ship.getModifiedItemAttr("eliteBonusGunship2") * level) \ No newline at end of file + "damageMultiplier", ship.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates") \ No newline at end of file diff --git a/eos/effects/elitebonusgunshipprojectilefalloff2.py b/eos/effects/elitebonusgunshipprojectilefalloff2.py index 4dc2401e06..90e636405b 100644 --- a/eos/effects/elitebonusgunshipprojectilefalloff2.py +++ b/eos/effects/elitebonusgunshipprojectilefalloff2.py @@ -4,6 +4,5 @@ # Ship: Wolf type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Assault Frigates").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), - "falloff", ship.getModifiedItemAttr("eliteBonusGunship2") * level) \ No newline at end of file + "falloff", ship.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates") \ No newline at end of file diff --git a/eos/effects/elitebonusgunshipprojectileoptimal1.py b/eos/effects/elitebonusgunshipprojectileoptimal1.py index 27c38257e7..31fe35fbb3 100644 --- a/eos/effects/elitebonusgunshipprojectileoptimal1.py +++ b/eos/effects/elitebonusgunshipprojectileoptimal1.py @@ -4,6 +4,5 @@ # Ship: Jaguar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Assault Frigates").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), - "maxRange", ship.getModifiedItemAttr("eliteBonusGunship1") * level) \ No newline at end of file + "maxRange", ship.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates") \ No newline at end of file diff --git a/eos/effects/elitebonusgunshipshieldboost2.py b/eos/effects/elitebonusgunshipshieldboost2.py index b74488dc2a..b8ce48c2f4 100644 --- a/eos/effects/elitebonusgunshipshieldboost2.py +++ b/eos/effects/elitebonusgunshipshieldboost2.py @@ -4,6 +4,5 @@ # Ship: Hawk type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Assault Frigates").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"), - "shieldBonus", ship.getModifiedItemAttr("eliteBonusGunship2") * level) + "shieldBonus", ship.getModifiedItemAttr("eliteBonusGunship2"), skill="Assault Frigates") diff --git a/eos/effects/elitebonusheavygunshipassaultmissileflighttime1.py b/eos/effects/elitebonusheavygunshipassaultmissileflighttime1.py index 5c12f839b2..3c2d4208f7 100644 --- a/eos/effects/elitebonusheavygunshipassaultmissileflighttime1.py +++ b/eos/effects/elitebonusheavygunshipassaultmissileflighttime1.py @@ -4,6 +4,5 @@ # Ship: Cerberus type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Assault Cruisers").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), - "explosionDelay", ship.getModifiedItemAttr("eliteBonusHeavyGunship1") * level) + "explosionDelay", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"), skill="Heavy Assault Cruisers") diff --git a/eos/effects/elitebonusheavygunshipassaultmissilelaunhcerrof2.py b/eos/effects/elitebonusheavygunshipassaultmissilelaunhcerrof2.py index 1d7fcc7be9..c18d7932a6 100644 --- a/eos/effects/elitebonusheavygunshipassaultmissilelaunhcerrof2.py +++ b/eos/effects/elitebonusheavygunshipassaultmissilelaunhcerrof2.py @@ -4,6 +4,5 @@ # Ship: Cerberus type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Assault Cruisers").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Light", - "speed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2") * level) + "speed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"), skill="Heavy Assault Cruisers") diff --git a/eos/effects/elitebonusheavygunshipdronecontrolrange1.py b/eos/effects/elitebonusheavygunshipdronecontrolrange1.py index 50a9e1e7e5..b21e057b03 100644 --- a/eos/effects/elitebonusheavygunshipdronecontrolrange1.py +++ b/eos/effects/elitebonusheavygunshipdronecontrolrange1.py @@ -4,6 +4,4 @@ # Ship: Ishtar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Assault Cruisers").level - amount = ship.getModifiedItemAttr("eliteBonusHeavyGunship1") * level - fit.extraAttributes.increase("droneControlRange", amount) + fit.extraAttributes.increase("droneControlRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"), skill="Heavy Assault Cruisers") diff --git a/eos/effects/elitebonusheavygunshipheavyandheavyassaultandassaultmissilelauncherrof.py b/eos/effects/elitebonusheavygunshipheavyandheavyassaultandassaultmissilelauncherrof.py index 912017df1f..4792576436 100644 --- a/eos/effects/elitebonusheavygunshipheavyandheavyassaultandassaultmissilelauncherrof.py +++ b/eos/effects/elitebonusheavygunshipheavyandheavyassaultandassaultmissilelauncherrof.py @@ -4,7 +4,6 @@ # Ship: Sacrilege type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Assault Cruisers").level groups = ("Missile Launcher Rapid Light", "Missile Launcher Heavy Assault", "Missile Launcher Heavy") fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, - "speed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2") * level) + "speed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"), skill="Heavy Assault Cruisers") diff --git a/eos/effects/elitebonusheavygunshipheavyassaultmissilelaunhcerrof2.py b/eos/effects/elitebonusheavygunshipheavyassaultmissilelaunhcerrof2.py index 7e06f6e707..41c8274a96 100644 --- a/eos/effects/elitebonusheavygunshipheavyassaultmissilelaunhcerrof2.py +++ b/eos/effects/elitebonusheavygunshipheavyassaultmissilelaunhcerrof2.py @@ -4,6 +4,5 @@ # Ship: Cerberus type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Assault Cruisers").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault", - "speed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2") * level) + "speed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"), skill="Heavy Assault Cruisers") diff --git a/eos/effects/elitebonusheavygunshipheavymissileflighttime1.py b/eos/effects/elitebonusheavygunshipheavymissileflighttime1.py index efc622c1a4..5cf9a92989 100644 --- a/eos/effects/elitebonusheavygunshipheavymissileflighttime1.py +++ b/eos/effects/elitebonusheavygunshipheavymissileflighttime1.py @@ -4,6 +4,5 @@ # Ship: Cerberus type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Assault Cruisers").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), - "explosionDelay", ship.getModifiedItemAttr("eliteBonusHeavyGunship1") * level) + "explosionDelay", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"), skill="Heavy Assault Cruisers") diff --git a/eos/effects/elitebonusheavygunshipheavymissilelaunhcerrof2.py b/eos/effects/elitebonusheavygunshipheavymissilelaunhcerrof2.py index 335a1d9212..c6e7fe20a4 100644 --- a/eos/effects/elitebonusheavygunshipheavymissilelaunhcerrof2.py +++ b/eos/effects/elitebonusheavygunshipheavymissilelaunhcerrof2.py @@ -4,6 +4,5 @@ # Ship: Cerberus type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Assault Cruisers").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy", - "speed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2") * level) + "speed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"), skill="Heavy Assault Cruisers") diff --git a/eos/effects/elitebonusheavygunshiphybriddmg2.py b/eos/effects/elitebonusheavygunshiphybriddmg2.py index 002156a4bb..154fa6ea20 100644 --- a/eos/effects/elitebonusheavygunshiphybriddmg2.py +++ b/eos/effects/elitebonusheavygunshiphybriddmg2.py @@ -5,6 +5,5 @@ # Ship: Eagle type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Assault Cruisers").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "damageMultiplier", ship.getModifiedItemAttr("eliteBonusHeavyGunship2") * level) + "damageMultiplier", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"), skill="Heavy Assault Cruisers") diff --git a/eos/effects/elitebonusheavygunshiphybridfalloff1.py b/eos/effects/elitebonusheavygunshiphybridfalloff1.py index 504dc9e581..3940ad2d8e 100644 --- a/eos/effects/elitebonusheavygunshiphybridfalloff1.py +++ b/eos/effects/elitebonusheavygunshiphybridfalloff1.py @@ -4,6 +4,5 @@ # Ship: Deimos type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Assault Cruisers").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "falloff", ship.getModifiedItemAttr("eliteBonusHeavyGunship1") * level) + "falloff", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"), skill="Heavy Assault Cruisers") diff --git a/eos/effects/elitebonusheavygunshiphybridoptimal1.py b/eos/effects/elitebonusheavygunshiphybridoptimal1.py index 983c3c420f..8416942c70 100644 --- a/eos/effects/elitebonusheavygunshiphybridoptimal1.py +++ b/eos/effects/elitebonusheavygunshiphybridoptimal1.py @@ -4,6 +4,5 @@ # Ship: Eagle type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Assault Cruisers").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship1") * level) + "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"), skill="Heavy Assault Cruisers") diff --git a/eos/effects/elitebonusheavygunshiplaserdmg2.py b/eos/effects/elitebonusheavygunshiplaserdmg2.py index 90a12df3d6..fa06cd039b 100644 --- a/eos/effects/elitebonusheavygunshiplaserdmg2.py +++ b/eos/effects/elitebonusheavygunshiplaserdmg2.py @@ -4,6 +4,5 @@ # Ship: Zealot type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Assault Cruisers").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"), - "damageMultiplier", ship.getModifiedItemAttr("eliteBonusHeavyGunship2") * level) + "damageMultiplier", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"), skill="Heavy Assault Cruisers") diff --git a/eos/effects/elitebonusheavygunshiplaseroptimal1.py b/eos/effects/elitebonusheavygunshiplaseroptimal1.py index 6bc21be23e..99fe315c49 100644 --- a/eos/effects/elitebonusheavygunshiplaseroptimal1.py +++ b/eos/effects/elitebonusheavygunshiplaseroptimal1.py @@ -4,6 +4,5 @@ # Ship: Zealot type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Assault Cruisers").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"), - "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship1") * level) + "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"), skill="Heavy Assault Cruisers") diff --git a/eos/effects/elitebonusheavygunshiplightmissileflighttime1.py b/eos/effects/elitebonusheavygunshiplightmissileflighttime1.py index dc917791ab..a2b2979148 100644 --- a/eos/effects/elitebonusheavygunshiplightmissileflighttime1.py +++ b/eos/effects/elitebonusheavygunshiplightmissileflighttime1.py @@ -4,6 +4,5 @@ # Ship: Cerberus type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Assault Cruisers").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"), - "explosionDelay", ship.getModifiedItemAttr("eliteBonusHeavyGunship1") * level) + "explosionDelay", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"), skill="Heavy Assault Cruisers") diff --git a/eos/effects/elitebonusheavygunshipprojectiledmg2.py b/eos/effects/elitebonusheavygunshipprojectiledmg2.py index 0b70c32832..b3c4bd1ed6 100644 --- a/eos/effects/elitebonusheavygunshipprojectiledmg2.py +++ b/eos/effects/elitebonusheavygunshipprojectiledmg2.py @@ -4,6 +4,5 @@ # Ship: Vagabond type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Assault Cruisers").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), - "damageMultiplier", ship.getModifiedItemAttr("eliteBonusHeavyGunship2") * level) + "damageMultiplier", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"), skill="Heavy Assault Cruisers") diff --git a/eos/effects/elitebonusheavygunshipprojectilefalloff1.py b/eos/effects/elitebonusheavygunshipprojectilefalloff1.py index eaea83fc79..094d92c8e1 100644 --- a/eos/effects/elitebonusheavygunshipprojectilefalloff1.py +++ b/eos/effects/elitebonusheavygunshipprojectilefalloff1.py @@ -4,6 +4,5 @@ # Ship: Vagabond type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Assault Cruisers").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), - "falloff", ship.getModifiedItemAttr("eliteBonusHeavyGunship1") * level) + "falloff", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"), skill="Heavy Assault Cruisers") diff --git a/eos/effects/elitebonusheavygunshipprojectileoptimal1.py b/eos/effects/elitebonusheavygunshipprojectileoptimal1.py index 32171708a9..c03dd91c8a 100644 --- a/eos/effects/elitebonusheavygunshipprojectileoptimal1.py +++ b/eos/effects/elitebonusheavygunshipprojectileoptimal1.py @@ -4,6 +4,5 @@ # Ship: Muninn type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Assault Cruisers").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), - "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship1") * level) + "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"), skill="Heavy Assault Cruisers") diff --git a/eos/effects/elitebonusheavygunshipprojectiletracking2.py b/eos/effects/elitebonusheavygunshipprojectiletracking2.py index 85d1049af5..6d4f337035 100644 --- a/eos/effects/elitebonusheavygunshipprojectiletracking2.py +++ b/eos/effects/elitebonusheavygunshipprojectiletracking2.py @@ -4,6 +4,5 @@ # Ship: Muninn type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Assault Cruisers").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), - "trackingSpeed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2") * level) + "trackingSpeed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"), skill="Heavy Assault Cruisers") diff --git a/eos/effects/elitebonusheavyinterdictorheavyassaultmissilevelocitybonus.py b/eos/effects/elitebonusheavyinterdictorheavyassaultmissilevelocitybonus.py index f08819af3a..8117c86865 100644 --- a/eos/effects/elitebonusheavyinterdictorheavyassaultmissilevelocitybonus.py +++ b/eos/effects/elitebonusheavyinterdictorheavyassaultmissilevelocitybonus.py @@ -4,6 +4,5 @@ # Ship: Onyx type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Interdiction Cruisers").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), - "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1") * level) + "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"), skill="Heavy Interdiction Cruisers") diff --git a/eos/effects/elitebonusheavyinterdictorheavymissilevelocitybonus1.py b/eos/effects/elitebonusheavyinterdictorheavymissilevelocitybonus1.py index 30fae4d3dc..e8a71bde1c 100644 --- a/eos/effects/elitebonusheavyinterdictorheavymissilevelocitybonus1.py +++ b/eos/effects/elitebonusheavyinterdictorheavymissilevelocitybonus1.py @@ -4,6 +4,5 @@ # Ship: Onyx type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Interdiction Cruisers").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), - "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1") * level) + "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"), skill="Heavy Interdiction Cruisers") diff --git a/eos/effects/elitebonusheavyinterdictorlightmissilevelocitybonus.py b/eos/effects/elitebonusheavyinterdictorlightmissilevelocitybonus.py index fb3d8e6b46..a5e6173b20 100644 --- a/eos/effects/elitebonusheavyinterdictorlightmissilevelocitybonus.py +++ b/eos/effects/elitebonusheavyinterdictorlightmissilevelocitybonus.py @@ -4,6 +4,5 @@ # Ship: Onyx type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Interdiction Cruisers").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"), - "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1") * level) + "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"), skill="Heavy Interdiction Cruisers") diff --git a/eos/effects/elitebonusheavyinterdictorshybridoptimal1.py b/eos/effects/elitebonusheavyinterdictorshybridoptimal1.py index d3ab00f750..cd63ce6b39 100644 --- a/eos/effects/elitebonusheavyinterdictorshybridoptimal1.py +++ b/eos/effects/elitebonusheavyinterdictorshybridoptimal1.py @@ -4,6 +4,5 @@ # Ship: Phobos type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Interdiction Cruisers").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1") * level) + "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"), skill="Heavy Interdiction Cruisers") diff --git a/eos/effects/elitebonusheavyinterdictorsmetoptimal.py b/eos/effects/elitebonusheavyinterdictorsmetoptimal.py index e7f159fe28..c6bace5fc2 100644 --- a/eos/effects/elitebonusheavyinterdictorsmetoptimal.py +++ b/eos/effects/elitebonusheavyinterdictorsmetoptimal.py @@ -4,6 +4,5 @@ # Ship: Devoter type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Interdiction Cruisers").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"), - "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1") * level) + "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"), skill="Heavy Interdiction Cruisers") diff --git a/eos/effects/elitebonusheavyinterdictorsprojectilefalloff1.py b/eos/effects/elitebonusheavyinterdictorsprojectilefalloff1.py index 30bf44c37f..745cc760d3 100644 --- a/eos/effects/elitebonusheavyinterdictorsprojectilefalloff1.py +++ b/eos/effects/elitebonusheavyinterdictorsprojectilefalloff1.py @@ -4,6 +4,5 @@ # Ship: Broadsword type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Interdiction Cruisers").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), - "falloff", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1") * level) + "falloff", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors1"), skill="Heavy Interdiction Cruisers") diff --git a/eos/effects/elitebonusheavyinterdictorswarpdisruptfieldgeneratorwarpscramblerange2.py b/eos/effects/elitebonusheavyinterdictorswarpdisruptfieldgeneratorwarpscramblerange2.py index 9c8dc50469..f733267830 100644 --- a/eos/effects/elitebonusheavyinterdictorswarpdisruptfieldgeneratorwarpscramblerange2.py +++ b/eos/effects/elitebonusheavyinterdictorswarpdisruptfieldgeneratorwarpscramblerange2.py @@ -4,6 +4,5 @@ # Ships from group: Heavy Interdiction Cruiser (4 of 5) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Interdiction Cruisers").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Disrupt Field Generator", - "warpScrambleRange", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors2") * level) \ No newline at end of file + "warpScrambleRange", ship.getModifiedItemAttr("eliteBonusHeavyInterdictors2"), skill="Heavy Interdiction Cruisers") \ No newline at end of file diff --git a/eos/effects/elitebonusinterdictorsarmorresist1.py b/eos/effects/elitebonusinterdictorsarmorresist1.py index e470d11ca7..5fe8c49606 100644 --- a/eos/effects/elitebonusinterdictorsarmorresist1.py +++ b/eos/effects/elitebonusinterdictorsarmorresist1.py @@ -4,7 +4,6 @@ # Ship: Heretic type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Interdictors").level for damageType in ("Em", "Thermal", "Explosive", "Kinetic"): fit.ship.boostItemAttr("armor%sDamageResonance" % damageType, - ship.getModifiedItemAttr("eliteBonusInterdictors1") * level) + ship.getModifiedItemAttr("eliteBonusInterdictors1"), skill="Interdictors") diff --git a/eos/effects/elitebonusinterdictorsmissilekineticdamage1.py b/eos/effects/elitebonusinterdictorsmissilekineticdamage1.py index ba267abe21..b8dd6e07fa 100644 --- a/eos/effects/elitebonusinterdictorsmissilekineticdamage1.py +++ b/eos/effects/elitebonusinterdictorsmissilekineticdamage1.py @@ -4,6 +4,5 @@ # Ship: Flycatcher type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Interdictors").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles") or mod.charge.requiresSkill("Rockets"), - "kineticDamage", ship.getModifiedItemAttr("eliteBonusInterdictors1") * level) + "kineticDamage", ship.getModifiedItemAttr("eliteBonusInterdictors1"), skill="Interdictors") diff --git a/eos/effects/elitebonusinterdictorsmwdsigradius2.py b/eos/effects/elitebonusinterdictorsmwdsigradius2.py index f0636809db..2ced01dde4 100644 --- a/eos/effects/elitebonusinterdictorsmwdsigradius2.py +++ b/eos/effects/elitebonusinterdictorsmwdsigradius2.py @@ -4,6 +4,5 @@ # Ships from group: Interdictor (4 of 4) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Interdictors").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"), - "signatureRadiusBonus", ship.getModifiedItemAttr("eliteBonusInterdictors2") * level) + "signatureRadiusBonus", ship.getModifiedItemAttr("eliteBonusInterdictors2"), skill="Interdictors") diff --git a/eos/effects/elitebonusinterdictorsprojectilefalloff1.py b/eos/effects/elitebonusinterdictorsprojectilefalloff1.py index 996502ab5e..b23c1cddc8 100644 --- a/eos/effects/elitebonusinterdictorsprojectilefalloff1.py +++ b/eos/effects/elitebonusinterdictorsprojectilefalloff1.py @@ -4,6 +4,5 @@ # Ship: Sabre type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Interdictors").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), - "falloff", ship.getModifiedItemAttr("eliteBonusInterdictors1") * level) + "falloff", ship.getModifiedItemAttr("eliteBonusInterdictors1"), skill="Interdictors") diff --git a/eos/effects/elitebonusinterdictorsshtrof1.py b/eos/effects/elitebonusinterdictorsshtrof1.py index 82f076a897..4b9b2796c7 100644 --- a/eos/effects/elitebonusinterdictorsshtrof1.py +++ b/eos/effects/elitebonusinterdictorsshtrof1.py @@ -4,6 +4,5 @@ # Ship: Eris type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Interdictors").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), - "speed", ship.getModifiedItemAttr("eliteBonusInterdictors1") * level) \ No newline at end of file + "speed", ship.getModifiedItemAttr("eliteBonusInterdictors1"), skill="Interdictors") \ No newline at end of file diff --git a/eos/effects/elitebonusjumpfreighterarmorhp1.py b/eos/effects/elitebonusjumpfreighterarmorhp1.py index 950fd7460a..97d53e9b79 100644 --- a/eos/effects/elitebonusjumpfreighterarmorhp1.py +++ b/eos/effects/elitebonusjumpfreighterarmorhp1.py @@ -5,5 +5,4 @@ # Ship: Ark type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Jump Freighters").level - fit.ship.boostItemAttr("armorHP", ship.getModifiedItemAttr("eliteBonusJumpFreighter1") * level) + fit.ship.boostItemAttr("armorHP", ship.getModifiedItemAttr("eliteBonusJumpFreighter1"), skill="Jump Freighters") diff --git a/eos/effects/elitebonusjumpfreighterhullhp1.py b/eos/effects/elitebonusjumpfreighterhullhp1.py index f3c7b4e742..db20223b0f 100644 --- a/eos/effects/elitebonusjumpfreighterhullhp1.py +++ b/eos/effects/elitebonusjumpfreighterhullhp1.py @@ -4,5 +4,4 @@ # Ships from group: Jump Freighter (4 of 4) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Jump Freighters").level - fit.ship.boostItemAttr("hp", ship.getModifiedItemAttr("eliteBonusJumpFreighter1") * level) + fit.ship.boostItemAttr("hp", ship.getModifiedItemAttr("eliteBonusJumpFreighter1"), skill="Jump Freighters") diff --git a/eos/effects/elitebonusjumpfreighterjumpdriveconsumptionamount2.py b/eos/effects/elitebonusjumpfreighterjumpdriveconsumptionamount2.py index 516e185130..9d241d1765 100644 --- a/eos/effects/elitebonusjumpfreighterjumpdriveconsumptionamount2.py +++ b/eos/effects/elitebonusjumpfreighterjumpdriveconsumptionamount2.py @@ -4,5 +4,4 @@ # Ships from group: Jump Freighter (4 of 4) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Jump Freighters").level - fit.ship.boostItemAttr("jumpDriveConsumptionAmount", ship.getModifiedItemAttr("eliteBonusJumpFreighter2") * level) + fit.ship.boostItemAttr("jumpDriveConsumptionAmount", ship.getModifiedItemAttr("eliteBonusJumpFreighter2"), skill="Jump Freighters") diff --git a/eos/effects/elitebonusjumpfreightershieldhp1.py b/eos/effects/elitebonusjumpfreightershieldhp1.py index 9271219bf9..fc36cdd0d3 100644 --- a/eos/effects/elitebonusjumpfreightershieldhp1.py +++ b/eos/effects/elitebonusjumpfreightershieldhp1.py @@ -5,5 +5,4 @@ # Ship: Rhea type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Jump Freighters").level - fit.ship.boostItemAttr("shieldCapacity", ship.getModifiedItemAttr("eliteBonusJumpFreighter1") * level) + fit.ship.boostItemAttr("shieldCapacity", ship.getModifiedItemAttr("eliteBonusJumpFreighter1"), skill="Jump Freighters") diff --git a/eos/effects/elitebonuslogisticenergytransfercapneed1.py b/eos/effects/elitebonuslogisticenergytransfercapneed1.py index 1d4a4ef5d4..a2978184db 100644 --- a/eos/effects/elitebonuslogisticenergytransfercapneed1.py +++ b/eos/effects/elitebonuslogisticenergytransfercapneed1.py @@ -4,6 +4,5 @@ # Ship: Guardian type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Logistics").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter", - "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics1") * level) + "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics") diff --git a/eos/effects/elitebonuslogisticenergytransfercapneed2.py b/eos/effects/elitebonuslogisticenergytransfercapneed2.py index a39cedf3ac..9b31da9fe0 100644 --- a/eos/effects/elitebonuslogisticenergytransfercapneed2.py +++ b/eos/effects/elitebonuslogisticenergytransfercapneed2.py @@ -5,6 +5,5 @@ # Ship: Etana type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Logistics").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter", - "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics2") * level) + "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics") diff --git a/eos/effects/elitebonuslogisticremotearmorrepaircapneed1.py b/eos/effects/elitebonuslogisticremotearmorrepaircapneed1.py index 27f0f62e03..e03cbf3a1b 100644 --- a/eos/effects/elitebonuslogisticremotearmorrepaircapneed1.py +++ b/eos/effects/elitebonuslogisticremotearmorrepaircapneed1.py @@ -4,6 +4,5 @@ # Ship: Oneiros type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Logistics").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", - "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics1") * level) + "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics") diff --git a/eos/effects/elitebonuslogisticremotearmorrepaircapneed2.py b/eos/effects/elitebonuslogisticremotearmorrepaircapneed2.py index 0a57309efe..1e05d0d22f 100644 --- a/eos/effects/elitebonuslogisticremotearmorrepaircapneed2.py +++ b/eos/effects/elitebonuslogisticremotearmorrepaircapneed2.py @@ -4,6 +4,5 @@ # Ship: Guardian type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Logistics").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", - "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics2") * level) + "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics") diff --git a/eos/effects/elitebonuslogisticshieldtransfercapneed1.py b/eos/effects/elitebonuslogisticshieldtransfercapneed1.py index 28add09441..40cf695d8e 100644 --- a/eos/effects/elitebonuslogisticshieldtransfercapneed1.py +++ b/eos/effects/elitebonuslogisticshieldtransfercapneed1.py @@ -5,6 +5,5 @@ # Ship: Etana type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Logistics").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", - "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics1") * level) + "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics") diff --git a/eos/effects/elitebonuslogisticshieldtransfercapneed2.py b/eos/effects/elitebonuslogisticshieldtransfercapneed2.py index 493562c2e0..b94f69ca7f 100644 --- a/eos/effects/elitebonuslogisticshieldtransfercapneed2.py +++ b/eos/effects/elitebonuslogisticshieldtransfercapneed2.py @@ -4,6 +4,5 @@ # Ship: Scimitar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Logistics").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", - "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics2") * level) + "capacitorNeed", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics") diff --git a/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus1.py b/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus1.py index 6163bb1a23..d9da9e025c 100644 --- a/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus1.py +++ b/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus1.py @@ -4,6 +4,5 @@ # Ship: Scimitar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Logistics").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer", - "falloffBonus", ship.getModifiedItemAttr("eliteBonusLogistics1") * level) + "falloffBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics") diff --git a/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus2.py b/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus2.py index 9ee2e1eeba..48c6bc5c60 100644 --- a/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus2.py +++ b/eos/effects/elitebonuslogisticstrackinglinkfalloffbonus2.py @@ -4,6 +4,5 @@ # Ship: Oneiros type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Logistics").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer", - "falloffBonus", ship.getModifiedItemAttr("eliteBonusLogistics2") * level) + "falloffBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics") diff --git a/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus1.py b/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus1.py index 4dbe35b2b1..ecbd5b3704 100644 --- a/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus1.py +++ b/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus1.py @@ -4,6 +4,5 @@ # Ship: Scimitar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Logistics").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer", - "maxRangeBonus", ship.getModifiedItemAttr("eliteBonusLogistics1") * level) + "maxRangeBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics") diff --git a/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus2.py b/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus2.py index 465a1f7c00..280cb4ac3a 100644 --- a/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus2.py +++ b/eos/effects/elitebonuslogisticstrackinglinkmaxrangebonus2.py @@ -4,6 +4,5 @@ # Ship: Oneiros type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Logistics").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer", - "maxRangeBonus", ship.getModifiedItemAttr("eliteBonusLogistics2") * level) + "maxRangeBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics") diff --git a/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus1.py b/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus1.py index 58f678efcf..c7a42d4605 100644 --- a/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus1.py +++ b/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus1.py @@ -4,6 +4,5 @@ # Ship: Scimitar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Logistics").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer", - "trackingSpeedBonus", ship.getModifiedItemAttr("eliteBonusLogistics1") * level) + "trackingSpeedBonus", ship.getModifiedItemAttr("eliteBonusLogistics1"), skill="Logistics") diff --git a/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus2.py b/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus2.py index 43372ff919..1ab6ad2852 100644 --- a/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus2.py +++ b/eos/effects/elitebonuslogisticstrackinglinktrackingspeedbonus2.py @@ -4,6 +4,5 @@ # Ship: Oneiros type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Logistics").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer", - "trackingSpeedBonus", ship.getModifiedItemAttr("eliteBonusLogistics2") * level) + "trackingSpeedBonus", ship.getModifiedItemAttr("eliteBonusLogistics2"), skill="Logistics") diff --git a/eos/effects/elitebonusmaraudershieldbonus2a.py b/eos/effects/elitebonusmaraudershieldbonus2a.py index fd15a32166..5e14681d56 100644 --- a/eos/effects/elitebonusmaraudershieldbonus2a.py +++ b/eos/effects/elitebonusmaraudershieldbonus2a.py @@ -5,6 +5,5 @@ # Ship: Vargur type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Marauders").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"), - "shieldBonus", ship.getModifiedItemAttr("eliteBonusViolators2") * level) + "shieldBonus", ship.getModifiedItemAttr("eliteBonusViolators2"), skill="Marauders") diff --git a/eos/effects/elitebonusvampiredrainamount2.py b/eos/effects/elitebonusvampiredrainamount2.py index fdb4d884a9..96b934a878 100644 --- a/eos/effects/elitebonusvampiredrainamount2.py +++ b/eos/effects/elitebonusvampiredrainamount2.py @@ -5,6 +5,5 @@ # 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", - "powerTransferAmount", ship.getModifiedItemAttr("eliteBonusReconShip2") * level) + "powerTransferAmount", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships") diff --git a/eos/effects/elitebonusviolatorsewtargetpainting1.py b/eos/effects/elitebonusviolatorsewtargetpainting1.py index 3bcc86f256..a6ba7f86e1 100644 --- a/eos/effects/elitebonusviolatorsewtargetpainting1.py +++ b/eos/effects/elitebonusviolatorsewtargetpainting1.py @@ -4,6 +4,5 @@ # Ship: Golem type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Marauders").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter", - "signatureRadiusBonus", ship.getModifiedItemAttr("eliteBonusViolators1") * level) + "signatureRadiusBonus", ship.getModifiedItemAttr("eliteBonusViolators1"), skill="Marauders") diff --git a/eos/effects/elitebonusviolatorslargeenergyturretdamage1.py b/eos/effects/elitebonusviolatorslargeenergyturretdamage1.py index 19c257162d..dc7c316ef1 100644 --- a/eos/effects/elitebonusviolatorslargeenergyturretdamage1.py +++ b/eos/effects/elitebonusviolatorslargeenergyturretdamage1.py @@ -4,6 +4,5 @@ # Ship: Paladin type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Marauders").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"), - "damageMultiplier", ship.getModifiedItemAttr("eliteBonusViolators1") * level) + "damageMultiplier", ship.getModifiedItemAttr("eliteBonusViolators1"), skill="Marauders") diff --git a/eos/effects/elitebonusviolatorslargehybridturrettracking1.py b/eos/effects/elitebonusviolatorslargehybridturrettracking1.py index 5c7b1fded3..2f0acdf46e 100644 --- a/eos/effects/elitebonusviolatorslargehybridturrettracking1.py +++ b/eos/effects/elitebonusviolatorslargehybridturrettracking1.py @@ -4,6 +4,5 @@ # Ship: Kronos type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Marauders").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"), - "trackingSpeed", ship.getModifiedItemAttr("eliteBonusViolators1") * level) + "trackingSpeed", ship.getModifiedItemAttr("eliteBonusViolators1"), skill="Marauders") diff --git a/eos/effects/elitebonusviolatorslargeprojectileturrettracking1.py b/eos/effects/elitebonusviolatorslargeprojectileturrettracking1.py index ac03e4dcfc..474e61091c 100644 --- a/eos/effects/elitebonusviolatorslargeprojectileturrettracking1.py +++ b/eos/effects/elitebonusviolatorslargeprojectileturrettracking1.py @@ -4,6 +4,5 @@ # Ship: Vargur type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Marauders").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"), - "trackingSpeed", ship.getModifiedItemAttr("eliteBonusViolators1") * level) + "trackingSpeed", ship.getModifiedItemAttr("eliteBonusViolators1"), skill="Marauders") diff --git a/eos/effects/elitebonusviolatorsrepairsystemsarmordamageamount2.py b/eos/effects/elitebonusviolatorsrepairsystemsarmordamageamount2.py index a1d7ce8e12..4a82b6f142 100644 --- a/eos/effects/elitebonusviolatorsrepairsystemsarmordamageamount2.py +++ b/eos/effects/elitebonusviolatorsrepairsystemsarmordamageamount2.py @@ -5,6 +5,5 @@ # Ship: Paladin type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Marauders").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), - "armorDamageAmount", ship.getModifiedItemAttr("eliteBonusViolators2") * level) + "armorDamageAmount", ship.getModifiedItemAttr("eliteBonusViolators2"), skill="Marauders") diff --git a/eos/effects/eliteindustrialarmorresists2.py b/eos/effects/eliteindustrialarmorresists2.py index 05b2aca3c5..e7b3091776 100644 --- a/eos/effects/eliteindustrialarmorresists2.py +++ b/eos/effects/eliteindustrialarmorresists2.py @@ -5,7 +5,5 @@ # Ship: Occator type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Transport Ships").level - for damageType in ("em", "thermal", "explosive", "kinetic"): fit.ship.boostItemAttr("armor{}DamageResonance".format(damageType.capitalize()), - ship.getModifiedItemAttr("eliteBonusIndustrial2") * level) + ship.getModifiedItemAttr("eliteBonusIndustrial2"), skill="Transport Ships") diff --git a/eos/effects/eliteindustrialfleetcapacity1.py b/eos/effects/eliteindustrialfleetcapacity1.py index 83345c183b..717be0d22e 100644 --- a/eos/effects/eliteindustrialfleetcapacity1.py +++ b/eos/effects/eliteindustrialfleetcapacity1.py @@ -4,5 +4,4 @@ # Ships from group: Deep Space Transport (4 of 4) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Transport Ships").level - fit.ship.boostItemAttr("fleetHangarCapacity", ship.getModifiedItemAttr("eliteBonusIndustrial1") * level) + fit.ship.boostItemAttr("fleetHangarCapacity", ship.getModifiedItemAttr("eliteBonusIndustrial1"), skill="Transport Ships") diff --git a/eos/effects/eliteindustrialshieldresists2.py b/eos/effects/eliteindustrialshieldresists2.py index 78cc6e62ff..923855efe4 100644 --- a/eos/effects/eliteindustrialshieldresists2.py +++ b/eos/effects/eliteindustrialshieldresists2.py @@ -5,7 +5,6 @@ # Ship: Mastodon type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Transport Ships").level for damageType in ("em", "thermal", "explosive", "kinetic"): fit.ship.boostItemAttr("shield{}DamageResonance".format(damageType.capitalize()), - ship.getModifiedItemAttr("eliteBonusIndustrial2") * level) + ship.getModifiedItemAttr("eliteBonusIndustrial2"), skill="Transport Ships") diff --git a/eos/effects/eliteindustrialwarpspeedbonus1.py b/eos/effects/eliteindustrialwarpspeedbonus1.py index 73c62d1a0d..e4e2456f43 100644 --- a/eos/effects/eliteindustrialwarpspeedbonus1.py +++ b/eos/effects/eliteindustrialwarpspeedbonus1.py @@ -4,5 +4,4 @@ # Ships from group: Blockade Runner (4 of 4) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Transport Ships").level - fit.ship.boostItemAttr("warpSpeedMultiplier", ship.getModifiedItemAttr("eliteBonusIndustrial1") * level) + fit.ship.boostItemAttr("warpSpeedMultiplier", ship.getModifiedItemAttr("eliteBonusIndustrial1"), skill="Transport Ships") diff --git a/eos/effects/elitereconbonusenergyneutamount2.py b/eos/effects/elitereconbonusenergyneutamount2.py index 5a7df6bbb6..940318998a 100644 --- a/eos/effects/elitereconbonusenergyneutamount2.py +++ b/eos/effects/elitereconbonusenergyneutamount2.py @@ -5,6 +5,5 @@ # 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", - "energyDestabilizationAmount", ship.getModifiedItemAttr("eliteBonusReconShip2") * level) + "energyDestabilizationAmount", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships") diff --git a/eos/effects/elitereconbonusenergyneutrange1.py b/eos/effects/elitereconbonusenergyneutrange1.py index 02aae420d0..566b9e8685 100644 --- a/eos/effects/elitereconbonusenergyneutrange1.py +++ b/eos/effects/elitereconbonusenergyneutrange1.py @@ -4,6 +4,5 @@ # Ship: Curse 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("eliteBonusReconShip1") * level) + "energyDestabilizationRange", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships") diff --git a/eos/effects/elitereconbonusgravimetricstrength2.py b/eos/effects/elitereconbonusgravimetricstrength2.py index 7a747fd3fc..bd24450e98 100644 --- a/eos/effects/elitereconbonusgravimetricstrength2.py +++ b/eos/effects/elitereconbonusgravimetricstrength2.py @@ -6,6 +6,5 @@ # Ship: Rook type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Recon Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", - "scanGravimetricStrengthBonus", ship.getModifiedItemAttr("eliteBonusReconShip2") * level) + "scanGravimetricStrengthBonus", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships") diff --git a/eos/effects/elitereconbonusheavyassaultmissilevelocity.py b/eos/effects/elitereconbonusheavyassaultmissilevelocity.py index fc11e678c8..539bc49953 100644 --- a/eos/effects/elitereconbonusheavyassaultmissilevelocity.py +++ b/eos/effects/elitereconbonusheavyassaultmissilevelocity.py @@ -4,6 +4,5 @@ # Ship: Rook type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Recon Ships").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), - "maxVelocity", ship.getModifiedItemAttr("eliteBonusReconShip1") * level) + "maxVelocity", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships") diff --git a/eos/effects/elitereconbonusheavymissilevelocity.py b/eos/effects/elitereconbonusheavymissilevelocity.py index 97338e5e5d..2d41b55690 100644 --- a/eos/effects/elitereconbonusheavymissilevelocity.py +++ b/eos/effects/elitereconbonusheavymissilevelocity.py @@ -4,6 +4,5 @@ # Ship: Rook type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Recon Ships").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), - "maxVelocity", ship.getModifiedItemAttr("eliteBonusReconShip1") * level) + "maxVelocity", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships") diff --git a/eos/effects/elitereconbonusladarstrength2.py b/eos/effects/elitereconbonusladarstrength2.py index 0f7ed9482d..b530f6b7b7 100644 --- a/eos/effects/elitereconbonusladarstrength2.py +++ b/eos/effects/elitereconbonusladarstrength2.py @@ -6,6 +6,5 @@ # Ship: Rook type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Recon Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", - "scanLadarStrengthBonus", ship.getModifiedItemAttr("eliteBonusReconShip2") * level) + "scanLadarStrengthBonus", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships") diff --git a/eos/effects/elitereconbonusmagnetometricstrength2.py b/eos/effects/elitereconbonusmagnetometricstrength2.py index 02f41033c0..5bedc18212 100644 --- a/eos/effects/elitereconbonusmagnetometricstrength2.py +++ b/eos/effects/elitereconbonusmagnetometricstrength2.py @@ -6,6 +6,5 @@ # Ship: Rook type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Recon Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", - "scanMagnetometricStrengthBonus", ship.getModifiedItemAttr("eliteBonusReconShip2") * level) + "scanMagnetometricStrengthBonus", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships") diff --git a/eos/effects/elitereconbonusmhtoptimalrange1.py b/eos/effects/elitereconbonusmhtoptimalrange1.py index 4f9ad6048f..0d7d063913 100644 --- a/eos/effects/elitereconbonusmhtoptimalrange1.py +++ b/eos/effects/elitereconbonusmhtoptimalrange1.py @@ -4,6 +4,5 @@ # 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) + "maxRange", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships") diff --git a/eos/effects/elitereconbonusmptdamage1.py b/eos/effects/elitereconbonusmptdamage1.py index 1a8b12924b..cf0909b323 100644 --- a/eos/effects/elitereconbonusmptdamage1.py +++ b/eos/effects/elitereconbonusmptdamage1.py @@ -4,6 +4,5 @@ # 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) + "damageMultiplier", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships") diff --git a/eos/effects/elitereconbonusneutrange3.py b/eos/effects/elitereconbonusneutrange3.py index 88b6ecb036..4bb877b0b4 100644 --- a/eos/effects/elitereconbonusneutrange3.py +++ b/eos/effects/elitereconbonusneutrange3.py @@ -4,6 +4,5 @@ # 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) + "energyDestabilizationRange", ship.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships") diff --git a/eos/effects/elitereconbonusradarstrength2.py b/eos/effects/elitereconbonusradarstrength2.py index c30bfdcf89..78566d3c22 100644 --- a/eos/effects/elitereconbonusradarstrength2.py +++ b/eos/effects/elitereconbonusradarstrength2.py @@ -6,6 +6,5 @@ # Ship: Rook type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Recon Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", - "scanRadarStrengthBonus", ship.getModifiedItemAttr("eliteBonusReconShip2") * level) + "scanRadarStrengthBonus", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships") diff --git a/eos/effects/elitereconbonusvamprange3.py b/eos/effects/elitereconbonusvamprange3.py index dfafdd3a35..c870e93ae5 100644 --- a/eos/effects/elitereconbonusvamprange3.py +++ b/eos/effects/elitereconbonusvamprange3.py @@ -4,6 +4,5 @@ # 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) + "powerTransferRange", ship.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships") diff --git a/eos/effects/elitereconenergyvampirerangebonus1.py b/eos/effects/elitereconenergyvampirerangebonus1.py index a147787c9d..23ccc34cc5 100644 --- a/eos/effects/elitereconenergyvampirerangebonus1.py +++ b/eos/effects/elitereconenergyvampirerangebonus1.py @@ -4,6 +4,5 @@ # Ship: Curse 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("eliteBonusReconShip1") * level) + "powerTransferRange", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships") diff --git a/eos/effects/elitereconjumpscramblerrangebonus2.py b/eos/effects/elitereconjumpscramblerrangebonus2.py index 654785ffd5..760164db82 100644 --- a/eos/effects/elitereconjumpscramblerrangebonus2.py +++ b/eos/effects/elitereconjumpscramblerrangebonus2.py @@ -5,6 +5,5 @@ # 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 == "Warp Scrambler", - "maxRange", ship.getModifiedItemAttr("eliteBonusReconShip2") * level) + "maxRange", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships") diff --git a/eos/effects/elitereconstasiswebbonus2.py b/eos/effects/elitereconstasiswebbonus2.py index c1f4f0d37e..a36bef9de3 100644 --- a/eos/effects/elitereconstasiswebbonus2.py +++ b/eos/effects/elitereconstasiswebbonus2.py @@ -6,6 +6,5 @@ # Ship: Rapier type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Recon Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", - "maxRange", ship.getModifiedItemAttr("eliteBonusReconShip2") * level) + "maxRange", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships") diff --git a/eos/effects/emshieldcompensationhardeningbonusgroupshieldamp.py b/eos/effects/emshieldcompensationhardeningbonusgroupshieldamp.py index 91a2309525..b71bbe25dc 100644 --- a/eos/effects/emshieldcompensationhardeningbonusgroupshieldamp.py +++ b/eos/effects/emshieldcompensationhardeningbonusgroupshieldamp.py @@ -4,6 +4,5 @@ # Skill: EM Shield Compensation type = "passive" def handler(fit, skill, context): - level = fit.character.getSkill("EM Shield Compensation").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Amplifier", - "emDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * level) \ No newline at end of file + "emDamageResistanceBonus", skill.getModifiedItemAttr("hardeningBonus") * skill.level) \ No newline at end of file diff --git a/eos/effects/freighteragilitybonus2o2.py b/eos/effects/freighteragilitybonus2o2.py index 2472ae51f8..5a990918e7 100644 --- a/eos/effects/freighteragilitybonus2o2.py +++ b/eos/effects/freighteragilitybonus2o2.py @@ -4,5 +4,4 @@ # Ship: Bowhead type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("ORE Freighter").level - fit.ship.boostItemAttr("shipMaintenanceBayCapacity", ship.getModifiedItemAttr("freighterBonusO1")*level) + fit.ship.boostItemAttr("shipMaintenanceBayCapacity", ship.getModifiedItemAttr("freighterBonusO1"), skill="ORE Freighter") diff --git a/eos/effects/freighteragilitybonusa1.py b/eos/effects/freighteragilitybonusa1.py index 17dd28ab9a..2595d7d857 100644 --- a/eos/effects/freighteragilitybonusa1.py +++ b/eos/effects/freighteragilitybonusa1.py @@ -4,5 +4,4 @@ # Ship: Ark type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Freighter").level - fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusA1") * level) + fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusA1"), skill="Amarr Freighter") diff --git a/eos/effects/freighteragilitybonusc1.py b/eos/effects/freighteragilitybonusc1.py index 6219968cec..157b2a432a 100644 --- a/eos/effects/freighteragilitybonusc1.py +++ b/eos/effects/freighteragilitybonusc1.py @@ -4,5 +4,4 @@ # Ship: Rhea type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Freighter").level - fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusC1") * level) + fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusC1"), skill="Caldari Freighter") diff --git a/eos/effects/freighteragilitybonusg1.py b/eos/effects/freighteragilitybonusg1.py index ec9d7757bc..f68d099f7a 100644 --- a/eos/effects/freighteragilitybonusg1.py +++ b/eos/effects/freighteragilitybonusg1.py @@ -4,5 +4,4 @@ # Ship: Anshar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Freighter").level - fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusG1") * level) + fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusG1"), skill="Gallente Freighter") diff --git a/eos/effects/freighteragilitybonusm1.py b/eos/effects/freighteragilitybonusm1.py index b26da4dc89..999ac61b90 100644 --- a/eos/effects/freighteragilitybonusm1.py +++ b/eos/effects/freighteragilitybonusm1.py @@ -4,5 +4,4 @@ # Ship: Nomad type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Freighter").level - fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusM1") * level) + fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusM1"), skill="Minmatar Freighter") diff --git a/eos/effects/freightercargobonusa2.py b/eos/effects/freightercargobonusa2.py index 1202617870..66834b2df7 100644 --- a/eos/effects/freightercargobonusa2.py +++ b/eos/effects/freightercargobonusa2.py @@ -4,5 +4,4 @@ # Variations of ship: Providence (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Freighter").level - fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("freighterBonusA2") * level) + fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("freighterBonusA2"), skill="Amarr Freighter") diff --git a/eos/effects/freightercargobonusc2.py b/eos/effects/freightercargobonusc2.py index c6c4efabd0..d024c2c540 100644 --- a/eos/effects/freightercargobonusc2.py +++ b/eos/effects/freightercargobonusc2.py @@ -4,5 +4,4 @@ # Variations of ship: Charon (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Freighter").level - fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("freighterBonusC2") * level) + fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("freighterBonusC2"), skill="Caldari Freighter") diff --git a/eos/effects/freightercargobonusg2.py b/eos/effects/freightercargobonusg2.py index 9a2e19bef1..43c5bb04b0 100644 --- a/eos/effects/freightercargobonusg2.py +++ b/eos/effects/freightercargobonusg2.py @@ -4,5 +4,4 @@ # Variations of ship: Obelisk (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Freighter").level - fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("freighterBonusG2") * level) + fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("freighterBonusG2"), skill="Gallente Freighter") diff --git a/eos/effects/freightercargobonusm2.py b/eos/effects/freightercargobonusm2.py index ac3b0242a8..5b8ed9fd80 100644 --- a/eos/effects/freightercargobonusm2.py +++ b/eos/effects/freightercargobonusm2.py @@ -4,5 +4,4 @@ # Variations of ship: Fenrir (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Freighter").level - fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("freighterBonusM2") * level) + fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("freighterBonusM2"), skill="Minmatar Freighter") diff --git a/eos/effects/freightermaxvelocitybonusa1.py b/eos/effects/freightermaxvelocitybonusa1.py index 10f42aca13..70d2e724ce 100644 --- a/eos/effects/freightermaxvelocitybonusa1.py +++ b/eos/effects/freightermaxvelocitybonusa1.py @@ -4,5 +4,4 @@ # Ship: Providence type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Freighter").level - fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("freighterBonusA1") * level) + fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("freighterBonusA1"), skill="Amarr Freighter") diff --git a/eos/effects/freightermaxvelocitybonusc1.py b/eos/effects/freightermaxvelocitybonusc1.py index e398b395de..219e7ea8b5 100644 --- a/eos/effects/freightermaxvelocitybonusc1.py +++ b/eos/effects/freightermaxvelocitybonusc1.py @@ -4,5 +4,4 @@ # Ship: Charon type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Freighter").level - fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("freighterBonusC1") * level) + fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("freighterBonusC1"), skill="Caldari Freighter") diff --git a/eos/effects/freightermaxvelocitybonusg1.py b/eos/effects/freightermaxvelocitybonusg1.py index 244cf32551..83d5a3bced 100644 --- a/eos/effects/freightermaxvelocitybonusg1.py +++ b/eos/effects/freightermaxvelocitybonusg1.py @@ -4,5 +4,4 @@ # Ship: Obelisk type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Freighter").level - fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("freighterBonusG1") * level) + fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("freighterBonusG1"), skill="Gallente Freighter") diff --git a/eos/effects/freightermaxvelocitybonusm1.py b/eos/effects/freightermaxvelocitybonusm1.py index 8aa9bb944e..7adad4fc66 100644 --- a/eos/effects/freightermaxvelocitybonusm1.py +++ b/eos/effects/freightermaxvelocitybonusm1.py @@ -4,5 +4,4 @@ # Ship: Fenrir type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Freighter").level - fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("freighterBonusM1") * level) + fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("freighterBonusM1"), skill="Minmatar Freighter") diff --git a/eos/effects/freightersmacapacitybonuso1.py b/eos/effects/freightersmacapacitybonuso1.py index ff58611378..b57f862167 100644 --- a/eos/effects/freightersmacapacitybonuso1.py +++ b/eos/effects/freightersmacapacitybonuso1.py @@ -4,6 +4,6 @@ # Ship: Bowhead type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("ORE Freighter").level - fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusO2")*level, + # todo: stacking? + fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("freighterBonusO2"), skill="ORE Freighter", stackingPenalties = True) diff --git a/eos/effects/interceptor2hybridtracking.py b/eos/effects/interceptor2hybridtracking.py index bca5b3abfb..f1a720f415 100644 --- a/eos/effects/interceptor2hybridtracking.py +++ b/eos/effects/interceptor2hybridtracking.py @@ -4,6 +4,5 @@ # Ship: Taranis type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Interceptors").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), - "trackingSpeed", ship.getModifiedItemAttr("eliteBonusInterceptor2") * level) \ No newline at end of file + "trackingSpeed", ship.getModifiedItemAttr("eliteBonusInterceptor2"), skill="Interceptors") \ No newline at end of file diff --git a/eos/effects/interceptor2lasertracking.py b/eos/effects/interceptor2lasertracking.py index 7498998365..b7ff9327ea 100644 --- a/eos/effects/interceptor2lasertracking.py +++ b/eos/effects/interceptor2lasertracking.py @@ -4,6 +4,5 @@ # Ship: Crusader type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Interceptors").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), - "trackingSpeed", ship.getModifiedItemAttr("eliteBonusInterceptor2") * level) \ No newline at end of file + "trackingSpeed", ship.getModifiedItemAttr("eliteBonusInterceptor2"), skill="Interceptors") \ No newline at end of file diff --git a/eos/effects/interceptor2projectiledamage.py b/eos/effects/interceptor2projectiledamage.py index c7e4e157f8..a8f9761752 100644 --- a/eos/effects/interceptor2projectiledamage.py +++ b/eos/effects/interceptor2projectiledamage.py @@ -4,6 +4,5 @@ # Ship: Claw type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Interceptors").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), - "damageMultiplier", ship.getModifiedItemAttr("eliteBonusInterceptor2") * level) + "damageMultiplier", ship.getModifiedItemAttr("eliteBonusInterceptor2"), skill="Interceptors") diff --git a/eos/effects/interceptor2shieldresist.py b/eos/effects/interceptor2shieldresist.py index ec13b2d839..9a74e396ff 100644 --- a/eos/effects/interceptor2shieldresist.py +++ b/eos/effects/interceptor2shieldresist.py @@ -4,7 +4,6 @@ # Ship: Raptor type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Interceptors").level damageTypes = ("Em", "Explosive", "Kinetic", "Thermal") for damageType in damageTypes: - fit.ship.boostItemAttr("shield{0}DamageResonance".format(damageType), ship.getModifiedItemAttr("eliteBonusInterceptor2") * level) + fit.ship.boostItemAttr("shield{0}DamageResonance".format(damageType), ship.getModifiedItemAttr("eliteBonusInterceptor2"), skill="Interceptors") diff --git a/eos/effects/interceptor2warpscramblerange.py b/eos/effects/interceptor2warpscramblerange.py index 8de21fae97..e188fe9c64 100644 --- a/eos/effects/interceptor2warpscramblerange.py +++ b/eos/effects/interceptor2warpscramblerange.py @@ -4,6 +4,5 @@ # Ships from group: Interceptor (5 of 10) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Interceptors").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler", - "maxRange", ship.getModifiedItemAttr("eliteBonusInterceptor2") * level) \ No newline at end of file + "maxRange", ship.getModifiedItemAttr("eliteBonusInterceptor2"), skill="Interceptors") \ No newline at end of file diff --git a/eos/effects/interceptormwdsignatureradiusbonus.py b/eos/effects/interceptormwdsignatureradiusbonus.py index 9dedb49a4c..8b52a1147a 100644 --- a/eos/effects/interceptormwdsignatureradiusbonus.py +++ b/eos/effects/interceptormwdsignatureradiusbonus.py @@ -4,6 +4,5 @@ # Ships from group: Interceptor (9 of 10) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Interceptors").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"), - "signatureRadiusBonus", ship.getModifiedItemAttr("eliteBonusInterceptor") * level) + "signatureRadiusBonus", ship.getModifiedItemAttr("eliteBonusInterceptor"), skill="Interceptors") diff --git a/eos/effects/minmatarshipewtargetpaintermc1.py b/eos/effects/minmatarshipewtargetpaintermc1.py index bc6088a6b1..77cdb088b5 100644 --- a/eos/effects/minmatarshipewtargetpaintermc1.py +++ b/eos/effects/minmatarshipewtargetpaintermc1.py @@ -5,6 +5,5 @@ # Ship: Rapier type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter", - "signatureRadiusBonus", ship.getModifiedItemAttr("shipBonusMC") * level) + "signatureRadiusBonus", ship.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser") diff --git a/eos/effects/minmatarshipewtargetpaintermc2.py b/eos/effects/minmatarshipewtargetpaintermc2.py index 7867bcd1cf..899ef2036e 100644 --- a/eos/effects/minmatarshipewtargetpaintermc2.py +++ b/eos/effects/minmatarshipewtargetpaintermc2.py @@ -4,6 +4,5 @@ # Ship: Huginn type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter", - "signatureRadiusBonus", ship.getModifiedItemAttr("shipBonusMC2") * level) + "signatureRadiusBonus", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser") diff --git a/eos/effects/minmatarshipewtargetpaintermf2.py b/eos/effects/minmatarshipewtargetpaintermf2.py index 394fed1ad4..43dcdcc78e 100644 --- a/eos/effects/minmatarshipewtargetpaintermf2.py +++ b/eos/effects/minmatarshipewtargetpaintermf2.py @@ -4,6 +4,5 @@ # Variations of ship: Vigil (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter", - "signatureRadiusBonus", ship.getModifiedItemAttr("shipBonusMF2") * level) + "signatureRadiusBonus", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate") diff --git a/eos/effects/missilebombardmentmaxflighttimebonuspostpercentexplosiondelayownercharmodulesrequiringmissilelauncheroperation.py b/eos/effects/missilebombardmentmaxflighttimebonuspostpercentexplosiondelayownercharmodulesrequiringmissilelauncheroperation.py index fa5dd3eb0d..2576aa361a 100644 --- a/eos/effects/missilebombardmentmaxflighttimebonuspostpercentexplosiondelayownercharmodulesrequiringmissilelauncheroperation.py +++ b/eos/effects/missilebombardmentmaxflighttimebonuspostpercentexplosiondelayownercharmodulesrequiringmissilelauncheroperation.py @@ -7,5 +7,7 @@ type = "passive" def handler(fit, container, context): level = container.level if "skill" in context else 1 + penalized = False if "skill" in context or "implant" in context else True fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "explosionDelay", container.getModifiedItemAttr("maxFlightTimeBonus") * level) + "explosionDelay", container.getModifiedItemAttr("maxFlightTimeBonus") * level, + stackingPenalties=penalized) diff --git a/eos/effects/missileskillmissileprojectilevelocitybonus.py b/eos/effects/missileskillmissileprojectilevelocitybonus.py index e67441c80b..2168de284c 100644 --- a/eos/effects/missileskillmissileprojectilevelocitybonus.py +++ b/eos/effects/missileskillmissileprojectilevelocitybonus.py @@ -7,6 +7,7 @@ type = "passive" def handler(fit, container, context): level = container.level if "skill" in context else 1 + penalized = False if "skill" in context or "implant" in context else True fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "maxVelocity", container.getModifiedItemAttr("speedFactor") * level, - stackingPenalties = "skill" not in context and "implant" not in context) + stackingPenalties=penalized) diff --git a/eos/effects/orecapitalshipshieldtransferrange.py b/eos/effects/orecapitalshipshieldtransferrange.py index 76d91c3658..bb5ed29725 100644 --- a/eos/effects/orecapitalshipshieldtransferrange.py +++ b/eos/effects/orecapitalshipshieldtransferrange.py @@ -4,6 +4,5 @@ # Ship: Rorqual type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Capital Industrial Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"), - "shieldTransferRange", ship.getModifiedItemAttr("shipBonusORECapital3") * level) + "shieldTransferRange", ship.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships") diff --git a/eos/effects/reconshipcloakcpubonus1.py b/eos/effects/reconshipcloakcpubonus1.py index b371e15501..e302d47ce8 100644 --- a/eos/effects/reconshipcloakcpubonus1.py +++ b/eos/effects/reconshipcloakcpubonus1.py @@ -5,6 +5,5 @@ type = "passive" runTime = "early" def handler(fit, ship, context): - level = fit.character.getSkill("Recon Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cloaking Device", - "cpu", ship.getModifiedItemAttr("eliteBonusReconShip1") * level) + "cpu", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships") diff --git a/eos/effects/shipadvancedspaceshipcommandagilitybonus.py b/eos/effects/shipadvancedspaceshipcommandagilitybonus.py index e6370d5aa4..a9eab85dda 100644 --- a/eos/effects/shipadvancedspaceshipcommandagilitybonus.py +++ b/eos/effects/shipadvancedspaceshipcommandagilitybonus.py @@ -4,5 +4,4 @@ # Items from market group: Ships > Capital Ships (27 of 28) type = "passive" def handler(fit, ship, context): - skill = fit.character.getSkill("Advanced Spaceship Command") - fit.ship.boostItemAttr("agility", skill.getModifiedItemAttr("agilityBonus") * skill.level) + fit.ship.boostItemAttr("agility", skill.getModifiedItemAttr("agilityBonus"), skill="Advanced Spaceship Command") diff --git a/eos/effects/shiparmoremandexpandkinandthmresistanceac2.py b/eos/effects/shiparmoremandexpandkinandthmresistanceac2.py index c96a71b610..546bc98c9f 100644 --- a/eos/effects/shiparmoremandexpandkinandthmresistanceac2.py +++ b/eos/effects/shiparmoremandexpandkinandthmresistanceac2.py @@ -6,7 +6,6 @@ # Ship: Vangel type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level damageTypes = ("Em", "Explosive", "Kinetic", "Thermal") for damageType in damageTypes: - fit.ship.boostItemAttr("armor{0}DamageResonance".format(damageType), ship.getModifiedItemAttr("shipBonusAC2") * level) + fit.ship.boostItemAttr("armor{0}DamageResonance".format(damageType), ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser") diff --git a/eos/effects/shiparmoremresistance1abc1.py b/eos/effects/shiparmoremresistance1abc1.py index 5d6a53cd43..c30eed18de 100644 --- a/eos/effects/shiparmoremresistance1abc1.py +++ b/eos/effects/shiparmoremresistance1abc1.py @@ -5,5 +5,4 @@ # Ship: Absolution type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battlecruiser").level - fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("shipBonusABC1") * level) + fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("shipBonusABC1"), skill="Amarr Battlecruiser") diff --git a/eos/effects/shiparmoremresistanceac2.py b/eos/effects/shiparmoremresistanceac2.py index 7b937bd730..b20f70b089 100644 --- a/eos/effects/shiparmoremresistanceac2.py +++ b/eos/effects/shiparmoremresistanceac2.py @@ -4,5 +4,4 @@ # Ship: Maller type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level - fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("shipBonusAC2") * level) + fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser") diff --git a/eos/effects/shiparmoremresistanceaf1.py b/eos/effects/shiparmoremresistanceaf1.py index 492b245411..e891735904 100644 --- a/eos/effects/shiparmoremresistanceaf1.py +++ b/eos/effects/shiparmoremresistanceaf1.py @@ -6,5 +6,4 @@ # Ship: Punisher type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level - fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("shipBonusAF") * level) + fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate") diff --git a/eos/effects/shiparmoremresistancemc2.py b/eos/effects/shiparmoremresistancemc2.py index a7178f8322..2be5737de4 100644 --- a/eos/effects/shiparmoremresistancemc2.py +++ b/eos/effects/shiparmoremresistancemc2.py @@ -4,5 +4,4 @@ # Ship: Mimir type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Cruiser").level - fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("shipBonusMC2") * level) + fit.ship.boostItemAttr("armorEmDamageResonance", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser") diff --git a/eos/effects/shiparmorexplosiveresistance1abc1.py b/eos/effects/shiparmorexplosiveresistance1abc1.py index 300fefccc1..b80f3d3eb6 100644 --- a/eos/effects/shiparmorexplosiveresistance1abc1.py +++ b/eos/effects/shiparmorexplosiveresistance1abc1.py @@ -5,5 +5,4 @@ # Ship: Absolution type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battlecruiser").level - fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusABC1") * level) + fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusABC1"), skill="Amarr Battlecruiser") diff --git a/eos/effects/shiparmorexplosiveresistanceac2.py b/eos/effects/shiparmorexplosiveresistanceac2.py index 9d8094d0aa..68b1c30b3d 100644 --- a/eos/effects/shiparmorexplosiveresistanceac2.py +++ b/eos/effects/shiparmorexplosiveresistanceac2.py @@ -4,5 +4,4 @@ # Ship: Maller type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level - fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusAC2") * level) + fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser") diff --git a/eos/effects/shiparmorexplosiveresistancemc2.py b/eos/effects/shiparmorexplosiveresistancemc2.py index e3f117f4f1..5f3e48b1f8 100644 --- a/eos/effects/shiparmorexplosiveresistancemc2.py +++ b/eos/effects/shiparmorexplosiveresistancemc2.py @@ -4,5 +4,4 @@ # Ship: Mimir type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Cruiser").level - fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusMC2") * level) + fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser") diff --git a/eos/effects/shiparmorexresistanceaf1.py b/eos/effects/shiparmorexresistanceaf1.py index 3d5473ba9e..898ed3df3f 100644 --- a/eos/effects/shiparmorexresistanceaf1.py +++ b/eos/effects/shiparmorexresistanceaf1.py @@ -6,5 +6,4 @@ # Ship: Punisher type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level - fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusAF") * level) + fit.ship.boostItemAttr("armorExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate") diff --git a/eos/effects/shiparmorhpac2.py b/eos/effects/shiparmorhpac2.py index 66385aa2aa..5a20e5fafa 100644 --- a/eos/effects/shiparmorhpac2.py +++ b/eos/effects/shiparmorhpac2.py @@ -4,5 +4,4 @@ # Ship: Augoror Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level - fit.ship.boostItemAttr("armorHP", ship.getModifiedItemAttr("shipBonusAC2") * level) + fit.ship.boostItemAttr("armorHP", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser") diff --git a/eos/effects/shiparmorkineticresistance1abc1.py b/eos/effects/shiparmorkineticresistance1abc1.py index 4ddff96697..09018a2956 100644 --- a/eos/effects/shiparmorkineticresistance1abc1.py +++ b/eos/effects/shiparmorkineticresistance1abc1.py @@ -5,5 +5,4 @@ # Ship: Absolution type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battlecruiser").level - fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusABC1") * level) + fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusABC1"), skill="Amarr Battlecruiser") diff --git a/eos/effects/shiparmorkineticresistanceac2.py b/eos/effects/shiparmorkineticresistanceac2.py index 974835cab3..a2ea82540c 100644 --- a/eos/effects/shiparmorkineticresistanceac2.py +++ b/eos/effects/shiparmorkineticresistanceac2.py @@ -4,5 +4,4 @@ # Ship: Maller type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level - fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusAC2") * level) + fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser") diff --git a/eos/effects/shiparmorkineticresistancemc2.py b/eos/effects/shiparmorkineticresistancemc2.py index dd80c59ca1..8d9bf0a3ef 100644 --- a/eos/effects/shiparmorkineticresistancemc2.py +++ b/eos/effects/shiparmorkineticresistancemc2.py @@ -4,5 +4,4 @@ # Ship: Mimir type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Cruiser").level - fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusMC2") * level) + fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser") diff --git a/eos/effects/shiparmorknresistanceaf1.py b/eos/effects/shiparmorknresistanceaf1.py index 3461e2a1ef..6263ace6ef 100644 --- a/eos/effects/shiparmorknresistanceaf1.py +++ b/eos/effects/shiparmorknresistanceaf1.py @@ -6,5 +6,4 @@ # Ship: Punisher type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level - fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusAF") * level) + fit.ship.boostItemAttr("armorKineticDamageResonance", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate") diff --git a/eos/effects/shiparmorrepairing1gbc2.py b/eos/effects/shiparmorrepairing1gbc2.py index 57f427e4aa..a7dc3a8b9e 100644 --- a/eos/effects/shiparmorrepairing1gbc2.py +++ b/eos/effects/shiparmorrepairing1gbc2.py @@ -6,6 +6,5 @@ # Ship: Brutix type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Battlecruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), - "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGBC2") * level) + "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGBC2"), skill="Gallente Battlecruiser") diff --git a/eos/effects/shiparmorrepairinggf2.py b/eos/effects/shiparmorrepairinggf2.py index 1d9245700b..40370add35 100644 --- a/eos/effects/shiparmorrepairinggf2.py +++ b/eos/effects/shiparmorrepairinggf2.py @@ -4,6 +4,5 @@ # Ship: Incursus type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), - "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGF2") * level) + "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate") diff --git a/eos/effects/shiparmorresistanceaf1.py b/eos/effects/shiparmorresistanceaf1.py index 6b1f559887..8c210c9651 100644 --- a/eos/effects/shiparmorresistanceaf1.py +++ b/eos/effects/shiparmorresistanceaf1.py @@ -4,7 +4,6 @@ # Ship: Malediction type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level damageTypes = ("Em", "Explosive", "Kinetic", "Thermal") for damageType in damageTypes: - fit.ship.boostItemAttr("armor{0}DamageResonance".format(damageType), ship.getModifiedItemAttr("shipBonusAF") * level) + fit.ship.boostItemAttr("armor{0}DamageResonance".format(damageType), ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate") diff --git a/eos/effects/shiparmorthermalresistanceac2.py b/eos/effects/shiparmorthermalresistanceac2.py index 7fca5a7c91..7226fb62c8 100644 --- a/eos/effects/shiparmorthermalresistanceac2.py +++ b/eos/effects/shiparmorthermalresistanceac2.py @@ -4,5 +4,4 @@ # Ship: Maller type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level - fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusAC2") * level) + fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser") diff --git a/eos/effects/shiparmorthermalresistancemc2.py b/eos/effects/shiparmorthermalresistancemc2.py index 10aa11b9b8..3435ca29c7 100644 --- a/eos/effects/shiparmorthermalresistancemc2.py +++ b/eos/effects/shiparmorthermalresistancemc2.py @@ -4,5 +4,4 @@ # Ship: Mimir type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Cruiser").level - fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusMC2") * level) + fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser") diff --git a/eos/effects/shiparmorthermresistance1abc1.py b/eos/effects/shiparmorthermresistance1abc1.py index 59b395516f..766a6fee0d 100644 --- a/eos/effects/shiparmorthermresistance1abc1.py +++ b/eos/effects/shiparmorthermresistance1abc1.py @@ -5,5 +5,4 @@ # Ship: Absolution type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battlecruiser").level - fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusABC1") * level) + fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusABC1"), skill="Amarr Battlecruiser") diff --git a/eos/effects/shiparmorthresistanceaf1.py b/eos/effects/shiparmorthresistanceaf1.py index 43b869ce9d..231eb73502 100644 --- a/eos/effects/shiparmorthresistanceaf1.py +++ b/eos/effects/shiparmorthresistanceaf1.py @@ -6,5 +6,4 @@ # Ship: Punisher type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level - fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusAF") * level) + fit.ship.boostItemAttr("armorThermalDamageResonance", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate") diff --git a/eos/effects/shipbonusaf1torpedoexplosionvelocity.py b/eos/effects/shipbonusaf1torpedoexplosionvelocity.py index a38caef081..805ba8b4c9 100644 --- a/eos/effects/shipbonusaf1torpedoexplosionvelocity.py +++ b/eos/effects/shipbonusaf1torpedoexplosionvelocity.py @@ -4,6 +4,5 @@ # Ship: Purifier type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), - "aoeVelocity", ship.getModifiedItemAttr("shipBonusAF") * level) + "aoeVelocity", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate") diff --git a/eos/effects/shipbonusaf1torpedoflighttime.py b/eos/effects/shipbonusaf1torpedoflighttime.py index 171d5937d7..cc5e5ed7b5 100644 --- a/eos/effects/shipbonusaf1torpedoflighttime.py +++ b/eos/effects/shipbonusaf1torpedoflighttime.py @@ -4,6 +4,5 @@ # Ship: Purifier type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), - "explosionDelay", ship.getModifiedItemAttr("shipBonusAF") * level) + "explosionDelay", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate") diff --git a/eos/effects/shipbonusafterburnerspeedfactor2cb.py b/eos/effects/shipbonusafterburnerspeedfactor2cb.py index b84767d21a..5ffa2685b1 100644 --- a/eos/effects/shipbonusafterburnerspeedfactor2cb.py +++ b/eos/effects/shipbonusafterburnerspeedfactor2cb.py @@ -4,6 +4,5 @@ # Ship: Nightmare type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"), - "speedFactor", module.getModifiedItemAttr("shipBonus2CB") * level) + "speedFactor", module.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship") diff --git a/eos/effects/shipbonusafterburnerspeedfactorcc2.py b/eos/effects/shipbonusafterburnerspeedfactorcc2.py index 20bb3e082d..98b0296718 100644 --- a/eos/effects/shipbonusafterburnerspeedfactorcc2.py +++ b/eos/effects/shipbonusafterburnerspeedfactorcc2.py @@ -4,6 +4,5 @@ # Ship: Phantasm type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"), - "speedFactor", module.getModifiedItemAttr("shipBonusCC2") * level) + "speedFactor", module.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser") diff --git a/eos/effects/shipbonusafterburnerspeedfactorcf2.py b/eos/effects/shipbonusafterburnerspeedfactorcf2.py index 51fd5ee459..7163262044 100644 --- a/eos/effects/shipbonusafterburnerspeedfactorcf2.py +++ b/eos/effects/shipbonusafterburnerspeedfactorcf2.py @@ -4,6 +4,5 @@ # Ship: Succubus type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"), - "speedFactor", module.getModifiedItemAttr("shipBonusCF2") * level) + "speedFactor", module.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate") diff --git a/eos/effects/shipbonusagilityai2.py b/eos/effects/shipbonusagilityai2.py index 1f329d668d..d92a8edb9c 100644 --- a/eos/effects/shipbonusagilityai2.py +++ b/eos/effects/shipbonusagilityai2.py @@ -4,5 +4,4 @@ # Ship: Sigil type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Industrial").level - fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("shipBonusAI2") * level) + fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("shipBonusAI2"), skill="Amarr Industrial") diff --git a/eos/effects/shipbonusagilityci2.py b/eos/effects/shipbonusagilityci2.py index 2be8591ad5..479786f708 100644 --- a/eos/effects/shipbonusagilityci2.py +++ b/eos/effects/shipbonusagilityci2.py @@ -4,5 +4,4 @@ # Ship: Badger type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Industrial").level - fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("shipBonusCI2") * level) + fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("shipBonusCI2"), skill="Caldari Industrial") diff --git a/eos/effects/shipbonusagilitygi2.py b/eos/effects/shipbonusagilitygi2.py index 1db6ef335f..26dba42a9c 100644 --- a/eos/effects/shipbonusagilitygi2.py +++ b/eos/effects/shipbonusagilitygi2.py @@ -4,5 +4,4 @@ # Ship: Nereus type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Industrial").level - fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("shipBonusGI2") * level) + fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("shipBonusGI2"), skill="Gallente Industrial") diff --git a/eos/effects/shipbonusagilitymi2.py b/eos/effects/shipbonusagilitymi2.py index 045000923a..8c5a1fb499 100644 --- a/eos/effects/shipbonusagilitymi2.py +++ b/eos/effects/shipbonusagilitymi2.py @@ -4,5 +4,4 @@ # Ship: Wreathe type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Industrial").level - fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("shipBonusMI2") * level) + fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("shipBonusMI2"), skill="Minmatar Industrial") diff --git a/eos/effects/shipbonusammobaymi2.py b/eos/effects/shipbonusammobaymi2.py index b812c9bf4c..d17a65aa36 100644 --- a/eos/effects/shipbonusammobaymi2.py +++ b/eos/effects/shipbonusammobaymi2.py @@ -4,5 +4,4 @@ # Ship: Hoarder type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Industrial").level - fit.ship.boostItemAttr("specialAmmoHoldCapacity", ship.getModifiedItemAttr("shipBonusMI2") * level) + fit.ship.boostItemAttr("specialAmmoHoldCapacity", ship.getModifiedItemAttr("shipBonusMI2"), skill="Minmatar Industrial") diff --git a/eos/effects/shipbonusaoevelocitycruiseandtorpedocb2.py b/eos/effects/shipbonusaoevelocitycruiseandtorpedocb2.py index 75678d3f38..9fcd68b867 100644 --- a/eos/effects/shipbonusaoevelocitycruiseandtorpedocb2.py +++ b/eos/effects/shipbonusaoevelocitycruiseandtorpedocb2.py @@ -4,6 +4,5 @@ # Ship: Golem type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles") or mod.charge.requiresSkill("Torpedoes"), - "aoeVelocity", ship.getModifiedItemAttr("shipBonus2CB") * level) + "aoeVelocity", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship") diff --git a/eos/effects/shipbonusaoevelocitycruisemissilesmb2.py b/eos/effects/shipbonusaoevelocitycruisemissilesmb2.py index 53f1f6004a..90abc91df2 100644 --- a/eos/effects/shipbonusaoevelocitycruisemissilesmb2.py +++ b/eos/effects/shipbonusaoevelocitycruisemissilesmb2.py @@ -4,6 +4,5 @@ # Ship: Typhoon type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), - "aoeVelocity", ship.getModifiedItemAttr("shipBonusMB2") * level) + "aoeVelocity", ship.getModifiedItemAttr("shipBonusMB2"), skill="Minmatar Battleship") diff --git a/eos/effects/shipbonusaoevelocityrocketscd2.py b/eos/effects/shipbonusaoevelocityrocketscd2.py index 1b3d12beb4..8d4a1f11be 100644 --- a/eos/effects/shipbonusaoevelocityrocketscd2.py +++ b/eos/effects/shipbonusaoevelocityrocketscd2.py @@ -4,6 +4,5 @@ # Ship: Corax type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Destroyer").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), - "aoeVelocity", ship.getModifiedItemAttr("shipBonusCD2") * level) + "aoeVelocity", ship.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer") diff --git a/eos/effects/shipbonusaoevelocitystandardmissilescd2.py b/eos/effects/shipbonusaoevelocitystandardmissilescd2.py index 9e1a2e2f0c..7e396fca5f 100644 --- a/eos/effects/shipbonusaoevelocitystandardmissilescd2.py +++ b/eos/effects/shipbonusaoevelocitystandardmissilescd2.py @@ -4,6 +4,5 @@ # Ship: Corax type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Destroyer").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"), - "aoeVelocity", ship.getModifiedItemAttr("shipBonusCD2") * level) + "aoeVelocity", ship.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer") diff --git a/eos/effects/shipbonusarmorrepairai2.py b/eos/effects/shipbonusarmorrepairai2.py index 46fbf7260b..4eb27de160 100644 --- a/eos/effects/shipbonusarmorrepairai2.py +++ b/eos/effects/shipbonusarmorrepairai2.py @@ -4,6 +4,5 @@ # Ship: Impel type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Industrial").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), - "armorDamageAmount", ship.getModifiedItemAttr("shipBonusAI2") * level) + "armorDamageAmount", ship.getModifiedItemAttr("shipBonusAI2"), skill="Amarr Industrial") diff --git a/eos/effects/shipbonusarmorrepairgi2.py b/eos/effects/shipbonusarmorrepairgi2.py index 97c3e2d8be..ea4216fb3e 100644 --- a/eos/effects/shipbonusarmorrepairgi2.py +++ b/eos/effects/shipbonusarmorrepairgi2.py @@ -4,6 +4,5 @@ # Ship: Occator type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Industrial").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), - "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGI2") * level) + "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGI2"), skill="Gallente Industrial") diff --git a/eos/effects/shipbonusarmorrepamountgc2.py b/eos/effects/shipbonusarmorrepamountgc2.py index 3a4b2b5aa5..7b5e66cadf 100644 --- a/eos/effects/shipbonusarmorrepamountgc2.py +++ b/eos/effects/shipbonusarmorrepamountgc2.py @@ -4,6 +4,5 @@ # Ship: Deimos type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), - "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGC2") * level) + "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonusarmorresistab.py b/eos/effects/shipbonusarmorresistab.py index ae0d083baf..7eed166670 100644 --- a/eos/effects/shipbonusarmorresistab.py +++ b/eos/effects/shipbonusarmorresistab.py @@ -5,6 +5,5 @@ # Ship: Nestor type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battleship").level for type in ("Em", "Explosive", "Kinetic", "Thermal"): - fit.ship.boostItemAttr("armor{0}DamageResonance".format(type), ship.getModifiedItemAttr("shipBonusAB") * level) + fit.ship.boostItemAttr("armor{0}DamageResonance".format(type), ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship") diff --git a/eos/effects/shipbonuscapcapab.py b/eos/effects/shipbonuscapcapab.py index 39104bcf1c..7e28253c78 100644 --- a/eos/effects/shipbonuscapcapab.py +++ b/eos/effects/shipbonuscapcapab.py @@ -5,5 +5,4 @@ # Ship: Paladin type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battleship").level - fit.ship.boostItemAttr("capacitorCapacity", ship.getModifiedItemAttr("shipBonusAB2") * level) + fit.ship.boostItemAttr("capacitorCapacity", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship") diff --git a/eos/effects/shipbonuscargo2gi.py b/eos/effects/shipbonuscargo2gi.py index fdbabac070..95b1530f78 100644 --- a/eos/effects/shipbonuscargo2gi.py +++ b/eos/effects/shipbonuscargo2gi.py @@ -6,11 +6,10 @@ # Ship: Iteron Mark V type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Industrial").level # TODO: investigate if we can live without such ifs or hardcoding # Viator doesn't have GI bonus if "shipBonusGI" in fit.ship.item.attributes: bonusAttr = "shipBonusGI" else: bonusAttr = "shipBonusGI2" - fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr(bonusAttr) * level) + fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr(bonusAttr), skill="Gallente Industrial") diff --git a/eos/effects/shipbonuscargoci.py b/eos/effects/shipbonuscargoci.py index 5f8bfa00af..3381551642 100644 --- a/eos/effects/shipbonuscargoci.py +++ b/eos/effects/shipbonuscargoci.py @@ -5,5 +5,4 @@ # Ship: Tayra type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Industrial").level - fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("shipBonusCI") * level) + fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("shipBonusCI"), skill="Caldari Industrial") diff --git a/eos/effects/shipbonuscargomi.py b/eos/effects/shipbonuscargomi.py index cc23db73b2..f8adc0250b 100644 --- a/eos/effects/shipbonuscargomi.py +++ b/eos/effects/shipbonuscargomi.py @@ -5,5 +5,4 @@ # Ship: Mammoth type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Industrial").level - fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("shipBonusMI") * level) + fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("shipBonusMI"), skill="Minmatar Industrial") diff --git a/eos/effects/shipbonuscf1torpedoexplosionvelocity.py b/eos/effects/shipbonuscf1torpedoexplosionvelocity.py index 6d681ed681..3c18d96fb4 100644 --- a/eos/effects/shipbonuscf1torpedoexplosionvelocity.py +++ b/eos/effects/shipbonuscf1torpedoexplosionvelocity.py @@ -4,6 +4,5 @@ # Ship: Manticore type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), - "aoeVelocity", ship.getModifiedItemAttr("shipBonusCF") * level) + "aoeVelocity", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate") diff --git a/eos/effects/shipbonuscf1torpedoflighttime.py b/eos/effects/shipbonuscf1torpedoflighttime.py index 7168d294df..b107b5bc3b 100644 --- a/eos/effects/shipbonuscf1torpedoflighttime.py +++ b/eos/effects/shipbonuscf1torpedoflighttime.py @@ -4,6 +4,5 @@ # Ship: Manticore type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), - "explosionDelay", ship.getModifiedItemAttr("shipBonusCF") * level) + "explosionDelay", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate") diff --git a/eos/effects/shipbonuscruisemissileemdmgmb.py b/eos/effects/shipbonuscruisemissileemdmgmb.py index 82d5830f93..4de20283af 100644 --- a/eos/effects/shipbonuscruisemissileemdmgmb.py +++ b/eos/effects/shipbonuscruisemissileemdmgmb.py @@ -4,6 +4,5 @@ # Ship: Typhoon Fleet Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), - "emDamage", ship.getModifiedItemAttr("shipBonusMB") * level) + "emDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship") diff --git a/eos/effects/shipbonuscruisemissileexplodmgmb.py b/eos/effects/shipbonuscruisemissileexplodmgmb.py index 3eac7134d4..43579fd904 100644 --- a/eos/effects/shipbonuscruisemissileexplodmgmb.py +++ b/eos/effects/shipbonuscruisemissileexplodmgmb.py @@ -4,6 +4,5 @@ # Ship: Typhoon Fleet Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), - "explosiveDamage", ship.getModifiedItemAttr("shipBonusMB") * level) + "explosiveDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship") diff --git a/eos/effects/shipbonuscruisemissilekineticdmgmb.py b/eos/effects/shipbonuscruisemissilekineticdmgmb.py index 9ce64df003..291f941e18 100644 --- a/eos/effects/shipbonuscruisemissilekineticdmgmb.py +++ b/eos/effects/shipbonuscruisemissilekineticdmgmb.py @@ -4,6 +4,5 @@ # Ship: Typhoon Fleet Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), - "kineticDamage", ship.getModifiedItemAttr("shipBonusMB") * level) + "kineticDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship") diff --git a/eos/effects/shipbonuscruisemissilethermdmgmb.py b/eos/effects/shipbonuscruisemissilethermdmgmb.py index 72e7e83d8c..b5b094dfdf 100644 --- a/eos/effects/shipbonuscruisemissilethermdmgmb.py +++ b/eos/effects/shipbonuscruisemissilethermdmgmb.py @@ -4,6 +4,5 @@ # Ship: Typhoon Fleet Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), - "thermalDamage", ship.getModifiedItemAttr("shipBonusMB") * level) + "thermalDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship") diff --git a/eos/effects/shipbonuscruiserofmb.py b/eos/effects/shipbonuscruiserofmb.py index 5e77cce0c7..31d7e53940 100644 --- a/eos/effects/shipbonuscruiserofmb.py +++ b/eos/effects/shipbonuscruiserofmb.py @@ -4,6 +4,5 @@ # Ship: Typhoon type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Cruise", - "speed", ship.getModifiedItemAttr("shipBonusMB") * level) + "speed", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship") diff --git a/eos/effects/shipbonusdreadcitadelcruiserofc1.py b/eos/effects/shipbonusdreadcitadelcruiserofc1.py index d97580dbca..34f6d176ca 100644 --- a/eos/effects/shipbonusdreadcitadelcruiserofc1.py +++ b/eos/effects/shipbonusdreadcitadelcruiserofc1.py @@ -4,6 +4,5 @@ # Ship: Phoenix type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Dreadnought").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Citadel Cruise Missiles"), - "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusC1") * level) + "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusC1"), skill="Caldari Dreadnought") diff --git a/eos/effects/shipbonusdreadcitadeltorprofc1.py b/eos/effects/shipbonusdreadcitadeltorprofc1.py index ae624dbd5d..095344f109 100644 --- a/eos/effects/shipbonusdreadcitadeltorprofc1.py +++ b/eos/effects/shipbonusdreadcitadeltorprofc1.py @@ -4,6 +4,5 @@ # Ship: Phoenix type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Dreadnought").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Citadel Torpedoes"), - "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusC1") * level) + "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusC1"), skill="Caldari Dreadnought") diff --git a/eos/effects/shipbonusdronearmorhitpointsab.py b/eos/effects/shipbonusdronearmorhitpointsab.py index c5214d90af..366217f227 100644 --- a/eos/effects/shipbonusdronearmorhitpointsab.py +++ b/eos/effects/shipbonusdronearmorhitpointsab.py @@ -4,6 +4,5 @@ # Ship: Armageddon type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battleship").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - "armorHP", ship.getModifiedItemAttr("shipBonusAB") * level) + "armorHP", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship") diff --git a/eos/effects/shipbonusdronearmorhitpointsgf2.py b/eos/effects/shipbonusdronearmorhitpointsgf2.py index fc2fb063be..ffab2d3fac 100644 --- a/eos/effects/shipbonusdronearmorhitpointsgf2.py +++ b/eos/effects/shipbonusdronearmorhitpointsgf2.py @@ -4,6 +4,5 @@ # Ship: Ishkur type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - "armorHP", ship.getModifiedItemAttr("shipBonusGF2") * level) + "armorHP", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate") diff --git a/eos/effects/shipbonusdronedamagegf2.py b/eos/effects/shipbonusdronedamagegf2.py index 4b29306244..ac5f556437 100644 --- a/eos/effects/shipbonusdronedamagegf2.py +++ b/eos/effects/shipbonusdronedamagegf2.py @@ -4,6 +4,5 @@ # Ship: Utu type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusGF2") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate") diff --git a/eos/effects/shipbonusdronedamagemultiplierab.py b/eos/effects/shipbonusdronedamagemultiplierab.py index 21a21ac909..dc0f2f271e 100644 --- a/eos/effects/shipbonusdronedamagemultiplierab.py +++ b/eos/effects/shipbonusdronedamagemultiplierab.py @@ -4,6 +4,5 @@ # Ship: Armageddon type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battleship").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusAB") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship") diff --git a/eos/effects/shipbonusdronedamagemultiplierabc2.py b/eos/effects/shipbonusdronedamagemultiplierabc2.py index 0b0738be55..a87f57a3be 100644 --- a/eos/effects/shipbonusdronedamagemultiplierabc2.py +++ b/eos/effects/shipbonusdronedamagemultiplierabc2.py @@ -4,6 +4,5 @@ # Ship: Prophecy type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battlecruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusABC2") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusABC2"), skill="Amarr Battlecruiser") diff --git a/eos/effects/shipbonusdronedamagemultiplierac2.py b/eos/effects/shipbonusdronedamagemultiplierac2.py index 51b50683d2..9e7f823a80 100644 --- a/eos/effects/shipbonusdronedamagemultiplierac2.py +++ b/eos/effects/shipbonusdronedamagemultiplierac2.py @@ -4,6 +4,5 @@ # Variations of ship: Arbitrator (3 of 3) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusAC2") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser") diff --git a/eos/effects/shipbonusdronedamagemultiplierad1.py b/eos/effects/shipbonusdronedamagemultiplierad1.py index 4bd489fdf3..7e70551d76 100644 --- a/eos/effects/shipbonusdronedamagemultiplierad1.py +++ b/eos/effects/shipbonusdronedamagemultiplierad1.py @@ -4,6 +4,5 @@ # Ship: Dragoon type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Destroyer").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusAD1") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer") diff --git a/eos/effects/shipbonusdronedamagemultipliergb2.py b/eos/effects/shipbonusdronedamagemultipliergb2.py index c65feca5a5..776ac9abf3 100644 --- a/eos/effects/shipbonusdronedamagemultipliergb2.py +++ b/eos/effects/shipbonusdronedamagemultipliergb2.py @@ -5,6 +5,5 @@ # Ship: Nestor type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Battleship").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusGB2") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusGB2"), skill="Gallente Battleship") diff --git a/eos/effects/shipbonusdronedamagemultipliergbc1.py b/eos/effects/shipbonusdronedamagemultipliergbc1.py index 869a9a2bab..ab07e9c71c 100644 --- a/eos/effects/shipbonusdronedamagemultipliergbc1.py +++ b/eos/effects/shipbonusdronedamagemultipliergbc1.py @@ -4,6 +4,5 @@ # Variations of ship: Myrmidon (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Battlecruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusGBC1") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusGBC1"), skill="Gallente Battlecruiser") diff --git a/eos/effects/shipbonusdronedamagemultipliergc2.py b/eos/effects/shipbonusdronedamagemultipliergc2.py index 38d87217b9..e2933b8320 100644 --- a/eos/effects/shipbonusdronedamagemultipliergc2.py +++ b/eos/effects/shipbonusdronedamagemultipliergc2.py @@ -6,6 +6,5 @@ # Ship: Vexor Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC2") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonusdronedamagemultipliergd1.py b/eos/effects/shipbonusdronedamagemultipliergd1.py index 563750cab1..b753cddff8 100644 --- a/eos/effects/shipbonusdronedamagemultipliergd1.py +++ b/eos/effects/shipbonusdronedamagemultipliergd1.py @@ -4,6 +4,5 @@ # Ship: Algos type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Destroyer").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusGD1") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer") diff --git a/eos/effects/shipbonusdronehitpointsabc2.py b/eos/effects/shipbonusdronehitpointsabc2.py index d1c3a9ce0e..209241457e 100644 --- a/eos/effects/shipbonusdronehitpointsabc2.py +++ b/eos/effects/shipbonusdronehitpointsabc2.py @@ -4,7 +4,6 @@ # Ship: Prophecy type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battlecruiser").level for layer in ("shieldCapacity", "armorHP", "hp"): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - layer, ship.getModifiedItemAttr("shipBonusABC2") * level) + layer, ship.getModifiedItemAttr("shipBonusABC2"), skill="Amarr Battlecruiser") diff --git a/eos/effects/shipbonusdronehitpointsad1.py b/eos/effects/shipbonusdronehitpointsad1.py index f951b5739a..d3dd36216d 100644 --- a/eos/effects/shipbonusdronehitpointsad1.py +++ b/eos/effects/shipbonusdronehitpointsad1.py @@ -4,7 +4,6 @@ # Ship: Dragoon type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Destroyer").level for layer in ("shieldCapacity", "armorHP", "hp"): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - layer, ship.getModifiedItemAttr("shipBonusAD1") * level) + layer, ship.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer") diff --git a/eos/effects/shipbonusdronehitpointsfixedac2.py b/eos/effects/shipbonusdronehitpointsfixedac2.py index 5882f8a654..36dbd19072 100644 --- a/eos/effects/shipbonusdronehitpointsfixedac2.py +++ b/eos/effects/shipbonusdronehitpointsfixedac2.py @@ -4,7 +4,6 @@ # Variations of ship: Arbitrator (3 of 3) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level for type in ("shieldCapacity", "armorHP", "hp"): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - type, ship.getModifiedItemAttr("shipBonusAC2") * level) + type, ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser") diff --git a/eos/effects/shipbonusdronehitpointsgb2.py b/eos/effects/shipbonusdronehitpointsgb2.py index 0a526d7e1e..3570eee628 100644 --- a/eos/effects/shipbonusdronehitpointsgb2.py +++ b/eos/effects/shipbonusdronehitpointsgb2.py @@ -5,7 +5,6 @@ # Ship: Nestor type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Battleship").level for type in ("shieldCapacity", "armorHP", "hp"): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - type, ship.getModifiedItemAttr("shipBonusGB2") * level) + type, ship.getModifiedItemAttr("shipBonusGB2"), skill="Gallente Battleship") diff --git a/eos/effects/shipbonusdronehitpointsgbc1.py b/eos/effects/shipbonusdronehitpointsgbc1.py index 04fcd60ae0..9b6d29c11b 100644 --- a/eos/effects/shipbonusdronehitpointsgbc1.py +++ b/eos/effects/shipbonusdronehitpointsgbc1.py @@ -4,7 +4,6 @@ # Variations of ship: Myrmidon (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Battlecruiser").level for layer in ("shieldCapacity", "armorHP", "hp"): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - layer, ship.getModifiedItemAttr("shipBonusGBC1") * level) + layer, ship.getModifiedItemAttr("shipBonusGBC1"), skill="Gallente Battlecruiser") diff --git a/eos/effects/shipbonusdronehitpointsgc2.py b/eos/effects/shipbonusdronehitpointsgc2.py index 620290a64a..6b3b8ce66b 100644 --- a/eos/effects/shipbonusdronehitpointsgc2.py +++ b/eos/effects/shipbonusdronehitpointsgc2.py @@ -6,7 +6,6 @@ # Ship: Vexor Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level for type in ("shieldCapacity", "armorHP", "hp"): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - type, ship.getModifiedItemAttr("shipBonusGC2") * level) + type, ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonusdronehitpointsgd1.py b/eos/effects/shipbonusdronehitpointsgd1.py index de80375326..975b0ae31d 100644 --- a/eos/effects/shipbonusdronehitpointsgd1.py +++ b/eos/effects/shipbonusdronehitpointsgd1.py @@ -4,7 +4,6 @@ # Ship: Algos type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Destroyer").level for layer in ("shieldCapacity", "armorHP", "hp"): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - layer, ship.getModifiedItemAttr("shipBonusGD1") * level) + layer, ship.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer") diff --git a/eos/effects/shipbonusdronehitpointsgf.py b/eos/effects/shipbonusdronehitpointsgf.py index d1892d7c8c..2ca7e2a3e3 100644 --- a/eos/effects/shipbonusdronehitpointsgf.py +++ b/eos/effects/shipbonusdronehitpointsgf.py @@ -5,7 +5,6 @@ # Ship: Tristan type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level for layer in ("shieldCapacity", "armorHP", "hp"): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - layer, ship.getModifiedItemAttr("shipBonusGF") * level) + layer, ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate") diff --git a/eos/effects/shipbonusdronehitpointsgf2.py b/eos/effects/shipbonusdronehitpointsgf2.py index e91a9e16cc..1b9c0d3826 100644 --- a/eos/effects/shipbonusdronehitpointsgf2.py +++ b/eos/effects/shipbonusdronehitpointsgf2.py @@ -4,6 +4,5 @@ # Ship: Ishkur type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - "hp", ship.getModifiedItemAttr("shipBonusGF2") * level) + "hp", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate") diff --git a/eos/effects/shipbonusdroneminingamountac2.py b/eos/effects/shipbonusdroneminingamountac2.py index 7106ee47ef..b268d74437 100644 --- a/eos/effects/shipbonusdroneminingamountac2.py +++ b/eos/effects/shipbonusdroneminingamountac2.py @@ -4,6 +4,5 @@ # Ship: Arbitrator type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Mining Drone", - "miningAmount", ship.getModifiedItemAttr("shipBonusAC2") * level) + "miningAmount", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser") diff --git a/eos/effects/shipbonusdroneminingamountgc2.py b/eos/effects/shipbonusdroneminingamountgc2.py index 60a66e2822..eb904aebd2 100644 --- a/eos/effects/shipbonusdroneminingamountgc2.py +++ b/eos/effects/shipbonusdroneminingamountgc2.py @@ -5,6 +5,5 @@ # Ship: Vexor Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Mining Drone", - "miningAmount", ship.getModifiedItemAttr("shipBonusGC2") * level) + "miningAmount", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonusdronemwdboostgc.py b/eos/effects/shipbonusdronemwdboostgc.py index 8ee1d6ce21..b89433e4f0 100644 --- a/eos/effects/shipbonusdronemwdboostgc.py +++ b/eos/effects/shipbonusdronemwdboostgc.py @@ -4,6 +4,5 @@ # Ship: Vexor Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - "maxVelocity", ship.getModifiedItemAttr("shipBonusGC") * level) + "maxVelocity", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonusdroneoptimalrangegb.py b/eos/effects/shipbonusdroneoptimalrangegb.py index 746b74c2a6..0b7cf2d8d9 100644 --- a/eos/effects/shipbonusdroneoptimalrangegb.py +++ b/eos/effects/shipbonusdroneoptimalrangegb.py @@ -4,6 +4,5 @@ # Ship: Dominix type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Battleship").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - "maxRange", ship.getModifiedItemAttr("shipBonusGB") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusGB"), skill="Gallente Battleship") diff --git a/eos/effects/shipbonusdroneshieldhitpointsab.py b/eos/effects/shipbonusdroneshieldhitpointsab.py index 0355cc00d8..45583dc411 100644 --- a/eos/effects/shipbonusdroneshieldhitpointsab.py +++ b/eos/effects/shipbonusdroneshieldhitpointsab.py @@ -4,6 +4,5 @@ # Ship: Armageddon type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battleship").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - "shieldCapacity", ship.getModifiedItemAttr("shipBonusAB") * level) + "shieldCapacity", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship") diff --git a/eos/effects/shipbonusdroneshieldhitpointsgf2.py b/eos/effects/shipbonusdroneshieldhitpointsgf2.py index a27f1c12a6..01f4c61220 100644 --- a/eos/effects/shipbonusdroneshieldhitpointsgf2.py +++ b/eos/effects/shipbonusdroneshieldhitpointsgf2.py @@ -4,6 +4,5 @@ # Ship: Ishkur type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - "shieldCapacity", ship.getModifiedItemAttr("shipBonusGF2") * level) + "shieldCapacity", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate") diff --git a/eos/effects/shipbonusdronestructurehitpointsab.py b/eos/effects/shipbonusdronestructurehitpointsab.py index bdbe27916d..3fc42ee653 100644 --- a/eos/effects/shipbonusdronestructurehitpointsab.py +++ b/eos/effects/shipbonusdronestructurehitpointsab.py @@ -4,6 +4,5 @@ # Ship: Armageddon type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battleship").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - "hp", ship.getModifiedItemAttr("shipBonusAB") * level) + "hp", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship") diff --git a/eos/effects/shipbonusdronetrackinggb.py b/eos/effects/shipbonusdronetrackinggb.py index 192608c97d..f82784f41e 100644 --- a/eos/effects/shipbonusdronetrackinggb.py +++ b/eos/effects/shipbonusdronetrackinggb.py @@ -4,6 +4,5 @@ # Ship: Dominix type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Battleship").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - "trackingSpeed", ship.getModifiedItemAttr("shipBonusGB") * level) + "trackingSpeed", ship.getModifiedItemAttr("shipBonusGB"), skill="Gallente Battleship") diff --git a/eos/effects/shipbonusdronetrackinggc.py b/eos/effects/shipbonusdronetrackinggc.py index e4ee4dd2f0..e6ce626d9e 100644 --- a/eos/effects/shipbonusdronetrackinggc.py +++ b/eos/effects/shipbonusdronetrackinggc.py @@ -4,6 +4,5 @@ # Ship: Vexor Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - "trackingSpeed", ship.getModifiedItemAttr("shipBonusGC") * level) + "trackingSpeed", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonusdronetrackinggf.py b/eos/effects/shipbonusdronetrackinggf.py index 9f666dfe49..a2996a41e1 100644 --- a/eos/effects/shipbonusdronetrackinggf.py +++ b/eos/effects/shipbonusdronetrackinggf.py @@ -4,6 +4,5 @@ # Ship: Tristan type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - "trackingSpeed", ship.getModifiedItemAttr("shipBonusGF") * level) + "trackingSpeed", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate") diff --git a/eos/effects/shipbonusecmstrengthbonuscc.py b/eos/effects/shipbonusecmstrengthbonuscc.py index 69f7bf88c8..0865be8946 100644 --- a/eos/effects/shipbonusecmstrengthbonuscc.py +++ b/eos/effects/shipbonusecmstrengthbonuscc.py @@ -4,7 +4,6 @@ # Ship: Blackbird type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level for type in ("Gravimetric", "Magnetometric", "Ladar", "Radar"): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", - "scan{0}StrengthBonus".format(type), ship.getModifiedItemAttr("shipBonusCC") * level) + "scan{0}StrengthBonus".format(type), ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser") diff --git a/eos/effects/shipbonuselitecover2torpedoemdamage.py b/eos/effects/shipbonuselitecover2torpedoemdamage.py index 22dca55b45..03dd494666 100644 --- a/eos/effects/shipbonuselitecover2torpedoemdamage.py +++ b/eos/effects/shipbonuselitecover2torpedoemdamage.py @@ -4,6 +4,5 @@ # Ship: Purifier type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Covert Ops").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), - "emDamage", ship.getModifiedItemAttr("eliteBonusCoverOps2") * level) + "emDamage", ship.getModifiedItemAttr("eliteBonusCoverOps2"), skill="Covert Ops") diff --git a/eos/effects/shipbonuselitecover2torpedoexplosivedamage.py b/eos/effects/shipbonuselitecover2torpedoexplosivedamage.py index 573dc9a4ab..f9a3b9203c 100644 --- a/eos/effects/shipbonuselitecover2torpedoexplosivedamage.py +++ b/eos/effects/shipbonuselitecover2torpedoexplosivedamage.py @@ -4,6 +4,5 @@ # Ship: Hound type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Covert Ops").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), - "explosiveDamage", ship.getModifiedItemAttr("eliteBonusCoverOps2") * level) + "explosiveDamage", ship.getModifiedItemAttr("eliteBonusCoverOps2"), skill="Covert Ops") diff --git a/eos/effects/shipbonuselitecover2torpedokineticdamage.py b/eos/effects/shipbonuselitecover2torpedokineticdamage.py index fdac534153..4389f1de36 100644 --- a/eos/effects/shipbonuselitecover2torpedokineticdamage.py +++ b/eos/effects/shipbonuselitecover2torpedokineticdamage.py @@ -4,6 +4,5 @@ # Ship: Manticore type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Covert Ops").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), - "kineticDamage", ship.getModifiedItemAttr("eliteBonusCoverOps2") * level) + "kineticDamage", ship.getModifiedItemAttr("eliteBonusCoverOps2"), skill="Covert Ops") diff --git a/eos/effects/shipbonuselitecover2torpedothermaldamage.py b/eos/effects/shipbonuselitecover2torpedothermaldamage.py index 0136c43046..5cc0957d29 100644 --- a/eos/effects/shipbonuselitecover2torpedothermaldamage.py +++ b/eos/effects/shipbonuselitecover2torpedothermaldamage.py @@ -4,6 +4,5 @@ # Ship: Nemesis type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Covert Ops").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), - "thermalDamage", ship.getModifiedItemAttr("eliteBonusCoverOps2") * level) + "thermalDamage", ship.getModifiedItemAttr("eliteBonusCoverOps2"), skill="Covert Ops") diff --git a/eos/effects/shipbonusemshieldresistancecb2.py b/eos/effects/shipbonusemshieldresistancecb2.py index d8f617eaf8..145d4b3b3b 100644 --- a/eos/effects/shipbonusemshieldresistancecb2.py +++ b/eos/effects/shipbonusemshieldresistancecb2.py @@ -6,5 +6,4 @@ # Ship: Scorpion Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level - fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("shipBonus2CB") * level) + fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship") diff --git a/eos/effects/shipbonusenergyneutrangeab2.py b/eos/effects/shipbonusenergyneutrangeab2.py index 3c54013fd4..dee87f0fbb 100644 --- a/eos/effects/shipbonusenergyneutrangeab2.py +++ b/eos/effects/shipbonusenergyneutrangeab2.py @@ -4,6 +4,5 @@ # Ship: Armageddon type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer", - "energyDestabilizationRange", ship.getModifiedItemAttr("shipBonusAB2") * level) + "energyDestabilizationRange", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship") diff --git a/eos/effects/shipbonusenergyneutrangead2.py b/eos/effects/shipbonusenergyneutrangead2.py index 8e2a12dc1d..d5531edd7e 100644 --- a/eos/effects/shipbonusenergyneutrangead2.py +++ b/eos/effects/shipbonusenergyneutrangead2.py @@ -4,6 +4,5 @@ # Ship: Dragoon type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Destroyer").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer", - "energyDestabilizationRange", ship.getModifiedItemAttr("shipBonusAD2") * level) + "energyDestabilizationRange", ship.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer") diff --git a/eos/effects/shipbonusenergyvampirerangeab2.py b/eos/effects/shipbonusenergyvampirerangeab2.py index e9e52f0a57..2dded07945 100644 --- a/eos/effects/shipbonusenergyvampirerangeab2.py +++ b/eos/effects/shipbonusenergyvampirerangeab2.py @@ -4,6 +4,5 @@ # Ship: Armageddon type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire", - "powerTransferRange", ship.getModifiedItemAttr("shipBonusAB2") * level) + "powerTransferRange", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship") diff --git a/eos/effects/shipbonusenergyvampirerangead2.py b/eos/effects/shipbonusenergyvampirerangead2.py index c6c4461c1f..d3fe343785 100644 --- a/eos/effects/shipbonusenergyvampirerangead2.py +++ b/eos/effects/shipbonusenergyvampirerangead2.py @@ -4,6 +4,5 @@ # Ship: Dragoon type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Destroyer").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire", - "powerTransferRange", ship.getModifiedItemAttr("shipBonusAD2") * level) + "powerTransferRange", ship.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer") diff --git a/eos/effects/shipbonusewremotesensordampenerfalloffbonusgc1.py b/eos/effects/shipbonusewremotesensordampenerfalloffbonusgc1.py index badb1fa2d7..7ecc88cbc3 100644 --- a/eos/effects/shipbonusewremotesensordampenerfalloffbonusgc1.py +++ b/eos/effects/shipbonusewremotesensordampenerfalloffbonusgc1.py @@ -4,6 +4,5 @@ # Ship: Celestis type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Sensor Damper", - "falloff", ship.getModifiedItemAttr("shipBonusGC") * level) + "falloff", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusgc2.py b/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusgc2.py index 9b67435c87..cafcea20d4 100644 --- a/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusgc2.py +++ b/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusgc2.py @@ -4,6 +4,5 @@ # Variations of ship: Celestis (3 of 3) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Sensor Damper", - "maxTargetRangeBonus", ship.getModifiedItemAttr("shipBonusGC2") * level) + "maxTargetRangeBonus", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusgf2.py b/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusgf2.py index a8610093b1..9b48c6bf5a 100644 --- a/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusgf2.py +++ b/eos/effects/shipbonusewremotesensordampenermaxtargetrangebonusgf2.py @@ -4,6 +4,5 @@ # Variations of ship: Maulus (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Sensor Damper", - "maxTargetRangeBonus", ship.getModifiedItemAttr("shipBonusGF2") * level) + "maxTargetRangeBonus", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate") diff --git a/eos/effects/shipbonusewremotesensordampeneroptimalbonusgc1.py b/eos/effects/shipbonusewremotesensordampeneroptimalbonusgc1.py index 66af48b646..1a7adcda93 100644 --- a/eos/effects/shipbonusewremotesensordampeneroptimalbonusgc1.py +++ b/eos/effects/shipbonusewremotesensordampeneroptimalbonusgc1.py @@ -4,6 +4,5 @@ # Ship: Celestis type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Sensor Damper", - "maxRange", ship.getModifiedItemAttr("shipBonusGC") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusgc2.py b/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusgc2.py index 5c6457faae..59c963ba3d 100644 --- a/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusgc2.py +++ b/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusgc2.py @@ -4,6 +4,5 @@ # Variations of ship: Celestis (3 of 3) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Sensor Damper", - "scanResolutionBonus", ship.getModifiedItemAttr("shipBonusGC2") * level) + "scanResolutionBonus", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusgf2.py b/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusgf2.py index 9166bde99a..11d937af2e 100644 --- a/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusgf2.py +++ b/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusgf2.py @@ -4,6 +4,5 @@ # Variations of ship: Maulus (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Sensor Damper", - "scanResolutionBonus", ship.getModifiedItemAttr("shipBonusGF2") * level) + "scanResolutionBonus", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate") diff --git a/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusrookie.py b/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusrookie.py index e2adb8aeab..2dd755e1f3 100644 --- a/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusrookie.py +++ b/eos/effects/shipbonusewremotesensordampenerscanresolutionbonusrookie.py @@ -4,6 +4,5 @@ # Ship: Velator type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Sensor Damper", "scanResolutionBonus", ship.getModifiedItemAttr("rookieDampStrengthBonus")) diff --git a/eos/effects/shipbonusewweapondisruptionrangedisruptionbonusac1.py b/eos/effects/shipbonusewweapondisruptionrangedisruptionbonusac1.py index 937f21538c..5cb0b2285e 100644 --- a/eos/effects/shipbonusewweapondisruptionrangedisruptionbonusac1.py +++ b/eos/effects/shipbonusewweapondisruptionrangedisruptionbonusac1.py @@ -4,8 +4,7 @@ # Variations of ship: Arbitrator (3 of 3) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), - "maxRangeBonus", ship.getModifiedItemAttr("shipBonusAC") * level) + "maxRangeBonus", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), - "falloffBonus", ship.getModifiedItemAttr("shipBonusAC") * level) + "falloffBonus", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") diff --git a/eos/effects/shipbonusewweapondisruptionrangedisruptionbonusaf2.py b/eos/effects/shipbonusewweapondisruptionrangedisruptionbonusaf2.py index dc9887e840..f72ad1a0db 100644 --- a/eos/effects/shipbonusewweapondisruptionrangedisruptionbonusaf2.py +++ b/eos/effects/shipbonusewweapondisruptionrangedisruptionbonusaf2.py @@ -4,8 +4,7 @@ # Variations of ship: Crucifier (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), - "maxRangeBonus", ship.getModifiedItemAttr("shipBonus2AF") * level) + "maxRangeBonus", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), - "falloffBonus", ship.getModifiedItemAttr("shipBonus2AF") * level) + "falloffBonus", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") diff --git a/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusac1.py b/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusac1.py index 43106d10be..4b7638db94 100644 --- a/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusac1.py +++ b/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusac1.py @@ -4,6 +4,5 @@ # Variations of ship: Arbitrator (3 of 3) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor", - "trackingSpeedBonus", ship.getModifiedItemAttr("shipBonusAC") * level) + "trackingSpeedBonus", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") diff --git a/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusaf2.py b/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusaf2.py index 1745e0ce41..cc6eb07cb3 100644 --- a/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusaf2.py +++ b/eos/effects/shipbonusewweapondisruptiontrackingspeedbonusaf2.py @@ -4,6 +4,5 @@ # Variations of ship: Crucifier (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), - "trackingSpeedBonus", ship.getModifiedItemAttr("shipBonus2AF") * level) + "trackingSpeedBonus", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") diff --git a/eos/effects/shipbonusexplosiveshieldresistancecb2.py b/eos/effects/shipbonusexplosiveshieldresistancecb2.py index 0a18bb8c89..7932112ccd 100644 --- a/eos/effects/shipbonusexplosiveshieldresistancecb2.py +++ b/eos/effects/shipbonusexplosiveshieldresistancecb2.py @@ -6,5 +6,4 @@ # Ship: Scorpion Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level - fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonus2CB") * level) + fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship") diff --git a/eos/effects/shipbonusfrigatesizedlightmissileexplosivedamagemd1.py b/eos/effects/shipbonusfrigatesizedlightmissileexplosivedamagemd1.py index f7d468ec6a..d27d304937 100644 --- a/eos/effects/shipbonusfrigatesizedlightmissileexplosivedamagemd1.py +++ b/eos/effects/shipbonusfrigatesizedlightmissileexplosivedamagemd1.py @@ -4,6 +4,5 @@ # Ship: Talwar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Destroyer").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"), - "explosiveDamage", ship.getModifiedItemAttr("shipBonusMD1") * level) + "explosiveDamage", ship.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer") diff --git a/eos/effects/shipbonusfrigatesizedmissilekineticdamagecd1.py b/eos/effects/shipbonusfrigatesizedmissilekineticdamagecd1.py index 0c3f5e9e46..b1be299087 100644 --- a/eos/effects/shipbonusfrigatesizedmissilekineticdamagecd1.py +++ b/eos/effects/shipbonusfrigatesizedmissilekineticdamagecd1.py @@ -4,6 +4,5 @@ # Ship: Corax type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Destroyer").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"), - "kineticDamage", ship.getModifiedItemAttr("shipBonusCD1") * level) + "kineticDamage", ship.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer") diff --git a/eos/effects/shipbonusgf1torpedoflighttime.py b/eos/effects/shipbonusgf1torpedoflighttime.py index 35548e384d..9ed770b3bc 100644 --- a/eos/effects/shipbonusgf1torpedoflighttime.py +++ b/eos/effects/shipbonusgf1torpedoflighttime.py @@ -4,6 +4,5 @@ # Ship: Nemesis type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), - "explosionDelay", ship.getModifiedItemAttr("shipBonusGF") * level) + "explosionDelay", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate") diff --git a/eos/effects/shipbonusgftorpedoexplosionvelocity.py b/eos/effects/shipbonusgftorpedoexplosionvelocity.py index 484bfa543c..b653c749ec 100644 --- a/eos/effects/shipbonusgftorpedoexplosionvelocity.py +++ b/eos/effects/shipbonusgftorpedoexplosionvelocity.py @@ -4,6 +4,5 @@ # Ship: Nemesis type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), - "aoeVelocity", ship.getModifiedItemAttr("shipBonusGF") * level) \ No newline at end of file + "aoeVelocity", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate") \ No newline at end of file diff --git a/eos/effects/shipbonushamvelocityelitebonusheavygunship1.py b/eos/effects/shipbonushamvelocityelitebonusheavygunship1.py index 8fbe271efa..0b529bf001 100644 --- a/eos/effects/shipbonushamvelocityelitebonusheavygunship1.py +++ b/eos/effects/shipbonushamvelocityelitebonusheavygunship1.py @@ -4,6 +4,5 @@ # Ship: Sacrilege type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Assault Cruisers").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), - "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyGunship1") * level) + "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"), skill="Heavy Assault Cruisers") diff --git a/eos/effects/shipbonusheavyassaultmissilealldamagemc2.py b/eos/effects/shipbonusheavyassaultmissilealldamagemc2.py index 5f089797fa..4e0334dd1b 100644 --- a/eos/effects/shipbonusheavyassaultmissilealldamagemc2.py +++ b/eos/effects/shipbonusheavyassaultmissilealldamagemc2.py @@ -5,7 +5,6 @@ # Ship: Scythe Fleet Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Cruiser").level for damageType in ("em", "explosive", "kinetic", "thermal"): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), - "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusMC2") * level) + "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser") diff --git a/eos/effects/shipbonusheavyassaultmissilekineticdamagecbc1.py b/eos/effects/shipbonusheavyassaultmissilekineticdamagecbc1.py index f09d45143b..425b3024e9 100644 --- a/eos/effects/shipbonusheavyassaultmissilekineticdamagecbc1.py +++ b/eos/effects/shipbonusheavyassaultmissilekineticdamagecbc1.py @@ -5,6 +5,5 @@ # Ship: Nighthawk type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battlecruiser").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), - "kineticDamage", ship.getModifiedItemAttr("shipBonusCBC1") * level) + "kineticDamage", ship.getModifiedItemAttr("shipBonusCBC1"), skill="Caldari Battlecruiser") diff --git a/eos/effects/shipbonusheavyassaultmissilelauncherrofmbc2.py b/eos/effects/shipbonusheavyassaultmissilelauncherrofmbc2.py index f33fea953a..dbae3e20f9 100644 --- a/eos/effects/shipbonusheavyassaultmissilelauncherrofmbc2.py +++ b/eos/effects/shipbonusheavyassaultmissilelauncherrofmbc2.py @@ -4,6 +4,5 @@ # Variations of ship: Cyclone (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battlecruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault", - "speed", ship.getModifiedItemAttr("shipBonusMBC2") * level) + "speed", ship.getModifiedItemAttr("shipBonusMBC2"), skill="Minmatar Battlecruiser") diff --git a/eos/effects/shipbonusheavydronearmorhpgc2.py b/eos/effects/shipbonusheavydronearmorhpgc2.py index 55a3a93395..5f9a3e2adf 100644 --- a/eos/effects/shipbonusheavydronearmorhpgc2.py +++ b/eos/effects/shipbonusheavydronearmorhpgc2.py @@ -4,6 +4,5 @@ # Ship: Ishtar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"), - "armorHP", ship.getModifiedItemAttr("shipBonusGC2") * level) + "armorHP", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonusheavydronedamagemultipliergc2.py b/eos/effects/shipbonusheavydronedamagemultipliergc2.py index ac7e9ec087..3932beba39 100644 --- a/eos/effects/shipbonusheavydronedamagemultipliergc2.py +++ b/eos/effects/shipbonusheavydronedamagemultipliergc2.py @@ -4,6 +4,5 @@ # Ship: Ishtar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC2") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonusheavydronehpgc2.py b/eos/effects/shipbonusheavydronehpgc2.py index 6e5a858ebf..64ef5aea27 100644 --- a/eos/effects/shipbonusheavydronehpgc2.py +++ b/eos/effects/shipbonusheavydronehpgc2.py @@ -4,6 +4,5 @@ # Ship: Ishtar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"), - "hp", ship.getModifiedItemAttr("shipBonusGC2") * level) + "hp", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonusheavydroneshieldhpgc2.py b/eos/effects/shipbonusheavydroneshieldhpgc2.py index 66e33b8a9f..e3155d4d8f 100644 --- a/eos/effects/shipbonusheavydroneshieldhpgc2.py +++ b/eos/effects/shipbonusheavydroneshieldhpgc2.py @@ -4,6 +4,5 @@ # Ship: Ishtar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"), - "shieldCapacity", ship.getModifiedItemAttr("shipBonusGC2") * level) + "shieldCapacity", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonusheavydronespeedgc.py b/eos/effects/shipbonusheavydronespeedgc.py index bbc357f51c..f318379624 100644 --- a/eos/effects/shipbonusheavydronespeedgc.py +++ b/eos/effects/shipbonusheavydronespeedgc.py @@ -4,6 +4,5 @@ # Ship: Ishtar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"), - "maxVelocity", ship.getModifiedItemAttr("shipBonusGC") * level) + "maxVelocity", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonusheavydronetrackinggc.py b/eos/effects/shipbonusheavydronetrackinggc.py index a2576a1c5a..aac4f04225 100644 --- a/eos/effects/shipbonusheavydronetrackinggc.py +++ b/eos/effects/shipbonusheavydronetrackinggc.py @@ -4,6 +4,5 @@ # Ship: Ishtar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"), - "trackingSpeed", ship.getModifiedItemAttr("shipBonusGC") * level) + "trackingSpeed", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonusheavymissilealldamagemc2.py b/eos/effects/shipbonusheavymissilealldamagemc2.py index ed2309bef0..b4b1fbb039 100644 --- a/eos/effects/shipbonusheavymissilealldamagemc2.py +++ b/eos/effects/shipbonusheavymissilealldamagemc2.py @@ -5,7 +5,6 @@ # Ship: Scythe Fleet Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Cruiser").level for damageType in ("em", "explosive", "kinetic", "thermal"): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), - "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusMC2") * level) + "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser") diff --git a/eos/effects/shipbonusheavymissileemdmgmb.py b/eos/effects/shipbonusheavymissileemdmgmb.py index 2315471a6b..6055232bfc 100644 --- a/eos/effects/shipbonusheavymissileemdmgmb.py +++ b/eos/effects/shipbonusheavymissileemdmgmb.py @@ -4,6 +4,5 @@ # Ship: Typhoon Fleet Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), - "emDamage", ship.getModifiedItemAttr("shipBonusMB") * level) + "emDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship") diff --git a/eos/effects/shipbonusheavymissileexplodmgmb.py b/eos/effects/shipbonusheavymissileexplodmgmb.py index d43c470ac0..a191d1f46b 100644 --- a/eos/effects/shipbonusheavymissileexplodmgmb.py +++ b/eos/effects/shipbonusheavymissileexplodmgmb.py @@ -4,6 +4,5 @@ # Ship: Typhoon Fleet Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), - "explosiveDamage", ship.getModifiedItemAttr("shipBonusMB") * level) + "explosiveDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship") diff --git a/eos/effects/shipbonusheavymissilekineticdamagecbc1.py b/eos/effects/shipbonusheavymissilekineticdamagecbc1.py index 6920869c0d..37d20993f7 100644 --- a/eos/effects/shipbonusheavymissilekineticdamagecbc1.py +++ b/eos/effects/shipbonusheavymissilekineticdamagecbc1.py @@ -5,6 +5,5 @@ # Ship: Nighthawk type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battlecruiser").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), - "kineticDamage", ship.getModifiedItemAttr("shipBonusCBC1") * level) + "kineticDamage", ship.getModifiedItemAttr("shipBonusCBC1"), skill="Caldari Battlecruiser") diff --git a/eos/effects/shipbonusheavymissilekineticdmgmb.py b/eos/effects/shipbonusheavymissilekineticdmgmb.py index af25673413..507fe97e88 100644 --- a/eos/effects/shipbonusheavymissilekineticdmgmb.py +++ b/eos/effects/shipbonusheavymissilekineticdmgmb.py @@ -4,6 +4,5 @@ # Ship: Typhoon Fleet Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), - "kineticDamage", ship.getModifiedItemAttr("shipBonusMB") * level) + "kineticDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship") diff --git a/eos/effects/shipbonusheavymissilelauncherrofmbc2.py b/eos/effects/shipbonusheavymissilelauncherrofmbc2.py index e238a096d3..41d41d1db8 100644 --- a/eos/effects/shipbonusheavymissilelauncherrofmbc2.py +++ b/eos/effects/shipbonusheavymissilelauncherrofmbc2.py @@ -4,6 +4,5 @@ # Variations of ship: Cyclone (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battlecruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy", - "speed", ship.getModifiedItemAttr("shipBonusMBC2") * level) + "speed", ship.getModifiedItemAttr("shipBonusMBC2"), skill="Minmatar Battlecruiser") diff --git a/eos/effects/shipbonusheavymissilethermdmgmb.py b/eos/effects/shipbonusheavymissilethermdmgmb.py index 15120d6872..3059a0b343 100644 --- a/eos/effects/shipbonusheavymissilethermdmgmb.py +++ b/eos/effects/shipbonusheavymissilethermdmgmb.py @@ -4,6 +4,5 @@ # Ship: Typhoon Fleet Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), - "thermalDamage", ship.getModifiedItemAttr("shipBonusMB") * level) + "thermalDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship") diff --git a/eos/effects/shipbonushmlemdamageac.py b/eos/effects/shipbonushmlemdamageac.py index a7b0d399bc..73e0215ab0 100644 --- a/eos/effects/shipbonushmlemdamageac.py +++ b/eos/effects/shipbonushmlemdamageac.py @@ -4,6 +4,5 @@ # Ship: Sacrilege type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), - "emDamage", ship.getModifiedItemAttr("shipBonusAC") * level) + "emDamage", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") diff --git a/eos/effects/shipbonushmlexplodamageac.py b/eos/effects/shipbonushmlexplodamageac.py index 8f601ea7ed..aae93767b5 100644 --- a/eos/effects/shipbonushmlexplodamageac.py +++ b/eos/effects/shipbonushmlexplodamageac.py @@ -4,6 +4,5 @@ # Ship: Sacrilege type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), - "explosiveDamage", ship.getModifiedItemAttr("shipBonusAC") * level) + "explosiveDamage", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") diff --git a/eos/effects/shipbonushmlkineticdamageac.py b/eos/effects/shipbonushmlkineticdamageac.py index d3580ae58f..e5caa6f6b7 100644 --- a/eos/effects/shipbonushmlkineticdamageac.py +++ b/eos/effects/shipbonushmlkineticdamageac.py @@ -4,6 +4,5 @@ # Ship: Sacrilege type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), - "kineticDamage", ship.getModifiedItemAttr("shipBonusAC") * level) + "kineticDamage", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") diff --git a/eos/effects/shipbonushmlthermdamageac.py b/eos/effects/shipbonushmlthermdamageac.py index 21a55f39c7..0951cbcb2f 100644 --- a/eos/effects/shipbonushmlthermdamageac.py +++ b/eos/effects/shipbonushmlthermdamageac.py @@ -4,6 +4,5 @@ # Ship: Sacrilege type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), - "thermalDamage", ship.getModifiedItemAttr("shipBonusAC") * level) + "thermalDamage", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") diff --git a/eos/effects/shipbonushmlvelocityelitebonusheavygunship1.py b/eos/effects/shipbonushmlvelocityelitebonusheavygunship1.py index 8a3e2d59eb..0e77373b22 100644 --- a/eos/effects/shipbonushmlvelocityelitebonusheavygunship1.py +++ b/eos/effects/shipbonushmlvelocityelitebonusheavygunship1.py @@ -4,6 +4,5 @@ # Ship: Sacrilege type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Assault Cruisers").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), - "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyGunship1") * level) + "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyGunship1"), skill="Heavy Assault Cruisers") diff --git a/eos/effects/shipbonushtfalloffgb2.py b/eos/effects/shipbonushtfalloffgb2.py index 449d46d8c4..b359b64d8b 100644 --- a/eos/effects/shipbonushtfalloffgb2.py +++ b/eos/effects/shipbonushtfalloffgb2.py @@ -4,6 +4,5 @@ # Ship: Kronos type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"), - "falloff", ship.getModifiedItemAttr("shipBonusGB2") * level) + "falloff", ship.getModifiedItemAttr("shipBonusGB2"), skill="Gallente Battleship") diff --git a/eos/effects/shipbonushybridoptimalcb.py b/eos/effects/shipbonushybridoptimalcb.py index e0164fa0a4..b94cde8d24 100644 --- a/eos/effects/shipbonushybridoptimalcb.py +++ b/eos/effects/shipbonushybridoptimalcb.py @@ -4,6 +4,5 @@ # Ship: Rokh type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"), - "maxRange", ship.getModifiedItemAttr("shipBonusCB") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship") diff --git a/eos/effects/shipbonushybridtrackinggf2.py b/eos/effects/shipbonushybridtrackinggf2.py index ccbddc1eb8..2f3cb4e100 100644 --- a/eos/effects/shipbonushybridtrackinggf2.py +++ b/eos/effects/shipbonushybridtrackinggf2.py @@ -6,6 +6,5 @@ # Ship: Tristan type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), - "trackingSpeed", ship.getModifiedItemAttr("shipBonusGF2") * level) + "trackingSpeed", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate") diff --git a/eos/effects/shipbonusiceharvesterdurationore3.py b/eos/effects/shipbonusiceharvesterdurationore3.py index ff0dc08a29..f984510d0a 100644 --- a/eos/effects/shipbonusiceharvesterdurationore3.py +++ b/eos/effects/shipbonusiceharvesterdurationore3.py @@ -5,6 +5,5 @@ # Ships from group: Mining Barge (3 of 3) type = "passive" def handler(fit, container, context): - level = fit.character.getSkill("Mining Barge").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"), - "duration", container.getModifiedItemAttr("shipBonusORE3") * level) \ No newline at end of file + "duration", container.getModifiedItemAttr("shipBonusORE3"), skill=("Mining Barge")) \ No newline at end of file diff --git a/eos/effects/shipbonuskineticmissiledamagegb2.py b/eos/effects/shipbonuskineticmissiledamagegb2.py index f3f327697c..5c47215ddc 100644 --- a/eos/effects/shipbonuskineticmissiledamagegb2.py +++ b/eos/effects/shipbonuskineticmissiledamagegb2.py @@ -4,6 +4,5 @@ # Ships named like: Rattlesnake (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "kineticDamage", ship.getModifiedItemAttr("shipBonusGB2") * level) + "kineticDamage", ship.getModifiedItemAttr("shipBonusGB2"), skill="Gallente Battleship") diff --git a/eos/effects/shipbonuskineticmissiledamagegc2.py b/eos/effects/shipbonuskineticmissiledamagegc2.py index 5ca6f40a40..21a2ab9980 100644 --- a/eos/effects/shipbonuskineticmissiledamagegc2.py +++ b/eos/effects/shipbonuskineticmissiledamagegc2.py @@ -5,6 +5,5 @@ # Ship: Gila type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "kineticDamage", ship.getModifiedItemAttr("shipBonusGC2") * level) + "kineticDamage", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonuskineticmissiledamagegf.py b/eos/effects/shipbonuskineticmissiledamagegf.py index c656d47467..2b52b828a9 100644 --- a/eos/effects/shipbonuskineticmissiledamagegf.py +++ b/eos/effects/shipbonuskineticmissiledamagegf.py @@ -5,6 +5,5 @@ # Ship: Worm type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "kineticDamage", ship.getModifiedItemAttr("shipBonusGF") * level) + "kineticDamage", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate") diff --git a/eos/effects/shipbonuskineticshieldresistancecb2.py b/eos/effects/shipbonuskineticshieldresistancecb2.py index d7c2c5e5ea..00da5e4d76 100644 --- a/eos/effects/shipbonuskineticshieldresistancecb2.py +++ b/eos/effects/shipbonuskineticshieldresistancecb2.py @@ -6,5 +6,4 @@ # Ship: Scorpion Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level - fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonus2CB") * level) + fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship") diff --git a/eos/effects/shipbonuslargeenergyturretmaxrangeab.py b/eos/effects/shipbonuslargeenergyturretmaxrangeab.py index 90e39e39a7..1d392745aa 100644 --- a/eos/effects/shipbonuslargeenergyturretmaxrangeab.py +++ b/eos/effects/shipbonuslargeenergyturretmaxrangeab.py @@ -4,6 +4,5 @@ # Ship: Paladin type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"), - "maxRange", ship.getModifiedItemAttr("shipBonusAB") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship") diff --git a/eos/effects/shipbonuslargeenergyturretmaxrangeab2.py b/eos/effects/shipbonuslargeenergyturretmaxrangeab2.py index 14b92c06b6..6505715091 100644 --- a/eos/effects/shipbonuslargeenergyturretmaxrangeab2.py +++ b/eos/effects/shipbonuslargeenergyturretmaxrangeab2.py @@ -5,6 +5,5 @@ # Ship: Apocalypse Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"), - "maxRange", ship.getModifiedItemAttr("shipBonusAB2") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship") diff --git a/eos/effects/shipbonuslargeenergyturrettrackingab.py b/eos/effects/shipbonuslargeenergyturrettrackingab.py index 4e4b5dfb5e..1dc6274492 100644 --- a/eos/effects/shipbonuslargeenergyturrettrackingab.py +++ b/eos/effects/shipbonuslargeenergyturrettrackingab.py @@ -5,6 +5,5 @@ # Ship: Apocalypse Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"), - "trackingSpeed", ship.getModifiedItemAttr("shipBonusAB") * level) + "trackingSpeed", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship") diff --git a/eos/effects/shipbonuslargeenergyweapondamageab2.py b/eos/effects/shipbonuslargeenergyweapondamageab2.py index 4ed3cf92dd..af3e9d8eae 100644 --- a/eos/effects/shipbonuslargeenergyweapondamageab2.py +++ b/eos/effects/shipbonuslargeenergyweapondamageab2.py @@ -4,6 +4,5 @@ # Ship: Abaddon type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusAB2") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship") diff --git a/eos/effects/shipbonuslightdronearmorhpgc2.py b/eos/effects/shipbonuslightdronearmorhpgc2.py index 99c1aa07f2..b3db8ca7f7 100644 --- a/eos/effects/shipbonuslightdronearmorhpgc2.py +++ b/eos/effects/shipbonuslightdronearmorhpgc2.py @@ -4,6 +4,5 @@ # Ship: Ishtar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"), - "armorHP", ship.getModifiedItemAttr("shipBonusGC2") * level) \ No newline at end of file + "armorHP", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") \ No newline at end of file diff --git a/eos/effects/shipbonuslightdronedamagemultipliergc2.py b/eos/effects/shipbonuslightdronedamagemultipliergc2.py index 104b7f5a14..f06eb81d39 100644 --- a/eos/effects/shipbonuslightdronedamagemultipliergc2.py +++ b/eos/effects/shipbonuslightdronedamagemultipliergc2.py @@ -4,6 +4,5 @@ # Ship: Ishtar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC2") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonuslightdronehpgc2.py b/eos/effects/shipbonuslightdronehpgc2.py index 7a9328b1ea..ec66ebcc8a 100644 --- a/eos/effects/shipbonuslightdronehpgc2.py +++ b/eos/effects/shipbonuslightdronehpgc2.py @@ -4,6 +4,5 @@ # Ship: Ishtar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"), - "hp", ship.getModifiedItemAttr("shipBonusGC2") * level) + "hp", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonuslightdroneshieldhpgc2.py b/eos/effects/shipbonuslightdroneshieldhpgc2.py index d6b6dd4924..b46703c5b5 100644 --- a/eos/effects/shipbonuslightdroneshieldhpgc2.py +++ b/eos/effects/shipbonuslightdroneshieldhpgc2.py @@ -4,6 +4,5 @@ # Ship: Ishtar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Light Drone Operation"), - "shieldCapacity", ship.getModifiedItemAttr("shipBonusGC2") * level) + "shieldCapacity", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonuslightmissilealldamagemc2.py b/eos/effects/shipbonuslightmissilealldamagemc2.py index 43cd3189cf..1f12783b5a 100644 --- a/eos/effects/shipbonuslightmissilealldamagemc2.py +++ b/eos/effects/shipbonuslightmissilealldamagemc2.py @@ -5,7 +5,6 @@ # Ship: Scythe Fleet Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Cruiser").level for damageType in ("em", "explosive", "kinetic", "thermal"): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"), - "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusMC2") * level) + "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser") diff --git a/eos/effects/shipbonusmediumdronearmorhpgc2.py b/eos/effects/shipbonusmediumdronearmorhpgc2.py index 2439abe965..609e5dfbd9 100644 --- a/eos/effects/shipbonusmediumdronearmorhpgc2.py +++ b/eos/effects/shipbonusmediumdronearmorhpgc2.py @@ -4,6 +4,5 @@ # Ship: Ishtar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"), - "armorHP", ship.getModifiedItemAttr("shipBonusGC2") * level) + "armorHP", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonusmediumdronedamagemultipliergc2.py b/eos/effects/shipbonusmediumdronedamagemultipliergc2.py index b5d2da3bf2..871ec5da92 100644 --- a/eos/effects/shipbonusmediumdronedamagemultipliergc2.py +++ b/eos/effects/shipbonusmediumdronedamagemultipliergc2.py @@ -4,6 +4,5 @@ # Ship: Ishtar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC2") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonusmediumdronehpgc2.py b/eos/effects/shipbonusmediumdronehpgc2.py index 74644acb04..376f835a38 100644 --- a/eos/effects/shipbonusmediumdronehpgc2.py +++ b/eos/effects/shipbonusmediumdronehpgc2.py @@ -4,6 +4,5 @@ # Ship: Ishtar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"), - "hp", ship.getModifiedItemAttr("shipBonusGC2") * level) + "hp", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonusmediumdroneshieldhpgc2.py b/eos/effects/shipbonusmediumdroneshieldhpgc2.py index 210cc6eb83..a076da9011 100644 --- a/eos/effects/shipbonusmediumdroneshieldhpgc2.py +++ b/eos/effects/shipbonusmediumdroneshieldhpgc2.py @@ -4,6 +4,5 @@ # Ship: Ishtar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"), - "shieldCapacity", ship.getModifiedItemAttr("shipBonusGC2") * level) + "shieldCapacity", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonusmediumenergyturrettrackingac2.py b/eos/effects/shipbonusmediumenergyturrettrackingac2.py index b9a51a3614..27b622b719 100644 --- a/eos/effects/shipbonusmediumenergyturrettrackingac2.py +++ b/eos/effects/shipbonusmediumenergyturrettrackingac2.py @@ -4,6 +4,5 @@ # Ship: Phantasm type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"), - "trackingSpeed", ship.getModifiedItemAttr("shipBonusAC2") * level) + "trackingSpeed", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser") diff --git a/eos/effects/shipbonusmediumhybriddmgcc2.py b/eos/effects/shipbonusmediumhybriddmgcc2.py index 782386f740..ac1b0a5660 100644 --- a/eos/effects/shipbonusmediumhybriddmgcc2.py +++ b/eos/effects/shipbonusmediumhybriddmgcc2.py @@ -4,6 +4,5 @@ # Ship: Falcon type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusCC2") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser") diff --git a/eos/effects/shipbonusmetoptimalac2.py b/eos/effects/shipbonusmetoptimalac2.py index 9e3d7579e8..18a09ba848 100644 --- a/eos/effects/shipbonusmetoptimalac2.py +++ b/eos/effects/shipbonusmetoptimalac2.py @@ -4,6 +4,5 @@ # Ship: Omen Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"), - "maxRange", ship.getModifiedItemAttr("shipBonusAC2") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser") diff --git a/eos/effects/shipbonusmf1torpedoexplosionvelocity.py b/eos/effects/shipbonusmf1torpedoexplosionvelocity.py index 3e7ab143bf..4ae858dfa3 100644 --- a/eos/effects/shipbonusmf1torpedoexplosionvelocity.py +++ b/eos/effects/shipbonusmf1torpedoexplosionvelocity.py @@ -4,6 +4,5 @@ # Ship: Hound type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), - "aoeVelocity", ship.getModifiedItemAttr("shipBonusMF") * level) \ No newline at end of file + "aoeVelocity", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate") \ No newline at end of file diff --git a/eos/effects/shipbonusmf1torpedoflighttime.py b/eos/effects/shipbonusmf1torpedoflighttime.py index 8772667ca5..10b8500fee 100644 --- a/eos/effects/shipbonusmf1torpedoflighttime.py +++ b/eos/effects/shipbonusmf1torpedoflighttime.py @@ -4,6 +4,5 @@ # Ship: Hound type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), - "explosionDelay", ship.getModifiedItemAttr("shipBonusMF") * level) + "explosionDelay", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate") diff --git a/eos/effects/shipbonusmineralbaygi2.py b/eos/effects/shipbonusmineralbaygi2.py index 64466c6b7d..7ac219899b 100644 --- a/eos/effects/shipbonusmineralbaygi2.py +++ b/eos/effects/shipbonusmineralbaygi2.py @@ -4,5 +4,4 @@ # Ship: Kryos type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Industrial").level - fit.ship.boostItemAttr("specialMineralHoldCapacity", ship.getModifiedItemAttr("shipBonusGI2") * level) + fit.ship.boostItemAttr("specialMineralHoldCapacity", ship.getModifiedItemAttr("shipBonusGI2"), skill="Gallente Industrial") diff --git a/eos/effects/shipbonusminingdurationore3.py b/eos/effects/shipbonusminingdurationore3.py index f92bc15274..b2c69f664a 100644 --- a/eos/effects/shipbonusminingdurationore3.py +++ b/eos/effects/shipbonusminingdurationore3.py @@ -5,6 +5,5 @@ # Ships from group: Mining Barge (3 of 3) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Mining Barge").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"), - "duration", ship.getModifiedItemAttr("shipBonusORE3") * level) + "duration", ship.getModifiedItemAttr("shipBonusORE3"), skill=("Mining Barge")) diff --git a/eos/effects/shipbonusminingiceharvestingrangeore2.py b/eos/effects/shipbonusminingiceharvestingrangeore2.py index f9f4aac2fa..288aeb4e4c 100644 --- a/eos/effects/shipbonusminingiceharvestingrangeore2.py +++ b/eos/effects/shipbonusminingiceharvestingrangeore2.py @@ -4,6 +4,5 @@ # Variations of ship: Covetor (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Mining Barge").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining") or mod.item.requiresSkill("Ice Harvesting"), - "maxRange", ship.getModifiedItemAttr("shipBonusORE2") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusORE2"), skill=("Mining Barge")) diff --git a/eos/effects/shipbonusmissileaoevelocitymb2.py b/eos/effects/shipbonusmissileaoevelocitymb2.py index d4d99e088c..ba5e38e0c8 100644 --- a/eos/effects/shipbonusmissileaoevelocitymb2.py +++ b/eos/effects/shipbonusmissileaoevelocitymb2.py @@ -4,6 +4,5 @@ # Ship: Typhoon type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), - "aoeVelocity", ship.getModifiedItemAttr("shipBonusMB2") * level) + "aoeVelocity", ship.getModifiedItemAttr("shipBonusMB2"), skill="Minmatar Battleship") diff --git a/eos/effects/shipbonusmissilevelocityad2.py b/eos/effects/shipbonusmissilevelocityad2.py index 0bbf13ce03..e498e22313 100644 --- a/eos/effects/shipbonusmissilevelocityad2.py +++ b/eos/effects/shipbonusmissilevelocityad2.py @@ -4,6 +4,5 @@ # Ship: Heretic type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Destroyer").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "maxVelocity", ship.getModifiedItemAttr("shipBonusAD2") * level) + "maxVelocity", ship.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer") diff --git a/eos/effects/shipbonusmissilevelocitycc2.py b/eos/effects/shipbonusmissilevelocitycc2.py index 61fef993d5..1886163f50 100644 --- a/eos/effects/shipbonusmissilevelocitycc2.py +++ b/eos/effects/shipbonusmissilevelocitycc2.py @@ -4,6 +4,5 @@ # Ship: Cerberus type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "maxVelocity", ship.getModifiedItemAttr("shipBonusCC2") * level) + "maxVelocity", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser") diff --git a/eos/effects/shipbonusmwdsignatureradiusmd2.py b/eos/effects/shipbonusmwdsignatureradiusmd2.py index adda160ed9..5d3ba376ee 100644 --- a/eos/effects/shipbonusmwdsignatureradiusmd2.py +++ b/eos/effects/shipbonusmwdsignatureradiusmd2.py @@ -4,6 +4,5 @@ # Ship: Talwar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Destroyer").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"), - "signatureRadiusBonus", ship.getModifiedItemAttr("shipBonusMD2") * level) + "signatureRadiusBonus", ship.getModifiedItemAttr("shipBonusMD2"), skill="Minmatar Destroyer") diff --git a/eos/effects/shipbonusnoctissalvagecycle.py b/eos/effects/shipbonusnoctissalvagecycle.py index 8b4ac3e50c..dd2780d33b 100644 --- a/eos/effects/shipbonusnoctissalvagecycle.py +++ b/eos/effects/shipbonusnoctissalvagecycle.py @@ -4,6 +4,5 @@ # Ship: Noctis type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("ORE Industrial").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Salvaging"), - "duration", ship.getModifiedItemAttr("shipBonusOreIndustrial1") * level) + "duration", ship.getModifiedItemAttr("shipBonusOreIndustrial1"), skill="ORE Industrial") diff --git a/eos/effects/shipbonusnoctistractorcycle.py b/eos/effects/shipbonusnoctistractorcycle.py index 4c83e3cde1..8543ccf069 100644 --- a/eos/effects/shipbonusnoctistractorcycle.py +++ b/eos/effects/shipbonusnoctistractorcycle.py @@ -4,6 +4,5 @@ # Ship: Noctis type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("ORE Industrial").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", - "duration", ship.getModifiedItemAttr("shipBonusOreIndustrial1") * level) + "duration", ship.getModifiedItemAttr("shipBonusOreIndustrial1"), skill="ORE Industrial") diff --git a/eos/effects/shipbonusnoctistractorrange.py b/eos/effects/shipbonusnoctistractorrange.py index b6991b8ee3..58a8799e08 100644 --- a/eos/effects/shipbonusnoctistractorrange.py +++ b/eos/effects/shipbonusnoctistractorrange.py @@ -4,6 +4,5 @@ # Ship: Noctis type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("ORE Industrial").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", - "maxRange", ship.getModifiedItemAttr("shipBonusOreIndustrial2") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusOreIndustrial2"), skill="ORE Industrial") diff --git a/eos/effects/shipbonusnoctistractorvelocity.py b/eos/effects/shipbonusnoctistractorvelocity.py index bc738b405f..bf7030612f 100644 --- a/eos/effects/shipbonusnoctistractorvelocity.py +++ b/eos/effects/shipbonusnoctistractorvelocity.py @@ -4,6 +4,5 @@ # Ship: Noctis type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("ORE Industrial").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", - "maxTractorVelocity", ship.getModifiedItemAttr("shipBonusOreIndustrial2") * level) + "maxTractorVelocity", ship.getModifiedItemAttr("shipBonusOreIndustrial2"), skill="ORE Industrial") diff --git a/eos/effects/shipbonusorecapacitygi2.py b/eos/effects/shipbonusorecapacitygi2.py index 0e5b1fad7c..b73c405892 100644 --- a/eos/effects/shipbonusorecapacitygi2.py +++ b/eos/effects/shipbonusorecapacitygi2.py @@ -4,5 +4,4 @@ # Ship: Miasmos type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Industrial").level - fit.ship.boostItemAttr("specialOreHoldCapacity", ship.getModifiedItemAttr("shipBonusGI2") * level) + fit.ship.boostItemAttr("specialOreHoldCapacity", ship.getModifiedItemAttr("shipBonusGI2"), skill="Gallente Industrial") diff --git a/eos/effects/shipbonusorecapshipdronearmorhpandshieldhpandhpbonus.py b/eos/effects/shipbonusorecapshipdronearmorhpandshieldhpandhpbonus.py index 4c79d5f22f..c97e7f30f1 100644 --- a/eos/effects/shipbonusorecapshipdronearmorhpandshieldhpandhpbonus.py +++ b/eos/effects/shipbonusorecapshipdronearmorhpandshieldhpandhpbonus.py @@ -4,7 +4,6 @@ # Ship: Rorqual type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Capital Industrial Ships").level for type in ("shieldCapacity", "armorHP", "hp"): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - type, ship.getModifiedItemAttr("shipBonusORECapital4") * level) + type, ship.getModifiedItemAttr("shipBonusORECapital4"), skill="Capital Industrial Ships") diff --git a/eos/effects/shipbonusorecapshipdronedmgbonus.py b/eos/effects/shipbonusorecapshipdronedmgbonus.py index f486279ac8..5dce4fd887 100644 --- a/eos/effects/shipbonusorecapshipdronedmgbonus.py +++ b/eos/effects/shipbonusorecapshipdronedmgbonus.py @@ -4,6 +4,5 @@ # Ship: Rorqual type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Capital Industrial Ships").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusORECapital4") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusORECapital4"), skill="Capital Industrial Ships") diff --git a/eos/effects/shipbonusoreholdore2.py b/eos/effects/shipbonusoreholdore2.py index 2221ef72a0..e55e55ea2d 100644 --- a/eos/effects/shipbonusoreholdore2.py +++ b/eos/effects/shipbonusoreholdore2.py @@ -4,5 +4,4 @@ # Variations of ship: Retriever (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Mining Barge").level - fit.ship.boostItemAttr("specialOreHoldCapacity", ship.getModifiedItemAttr("shipBonusORE2") * level) \ No newline at end of file + fit.ship.boostItemAttr("specialOreHoldCapacity", ship.getModifiedItemAttr("shipBonusORE2"), skill=("Mining Barge")) \ No newline at end of file diff --git a/eos/effects/shipbonuspicommoditiesholdgi2.py b/eos/effects/shipbonuspicommoditiesholdgi2.py index 14632a8ea8..2b52715763 100644 --- a/eos/effects/shipbonuspicommoditiesholdgi2.py +++ b/eos/effects/shipbonuspicommoditiesholdgi2.py @@ -4,5 +4,4 @@ # Ship: Epithal type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Industrial").level - fit.ship.boostItemAttr("specialPlanetaryCommoditiesHoldCapacity", ship.getModifiedItemAttr("shipBonusGI2") * level) + fit.ship.boostItemAttr("specialPlanetaryCommoditiesHoldCapacity", ship.getModifiedItemAttr("shipBonusGI2"), skill="Gallente Industrial") diff --git a/eos/effects/shipbonusprojectiledamagembc1.py b/eos/effects/shipbonusprojectiledamagembc1.py index d4ef667fe8..0d693b2365 100644 --- a/eos/effects/shipbonusprojectiledamagembc1.py +++ b/eos/effects/shipbonusprojectiledamagembc1.py @@ -4,6 +4,5 @@ # Ships named like: Hurricane (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battlecruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusMBC1") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusMBC1"), skill="Minmatar Battlecruiser") diff --git a/eos/effects/shipbonusprojectiledamagembc2.py b/eos/effects/shipbonusprojectiledamagembc2.py index c9f3a96d37..8128831f19 100644 --- a/eos/effects/shipbonusprojectiledamagembc2.py +++ b/eos/effects/shipbonusprojectiledamagembc2.py @@ -4,6 +4,5 @@ # Ship: Sleipnir type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battlecruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusMBC2") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusMBC2"), skill="Minmatar Battlecruiser") diff --git a/eos/effects/shipbonusprojectiletrackingmc2.py b/eos/effects/shipbonusprojectiletrackingmc2.py index 0ed3df37d0..579fb18647 100644 --- a/eos/effects/shipbonusprojectiletrackingmc2.py +++ b/eos/effects/shipbonusprojectiletrackingmc2.py @@ -4,6 +4,5 @@ # Ship: Stabber Fleet Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), - "trackingSpeed", ship.getModifiedItemAttr("shipBonusMC2") * level) + "trackingSpeed", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser") diff --git a/eos/effects/shipbonusptfalloffmb1.py b/eos/effects/shipbonusptfalloffmb1.py index d4ac35b167..b72a45b935 100644 --- a/eos/effects/shipbonusptfalloffmb1.py +++ b/eos/effects/shipbonusptfalloffmb1.py @@ -4,6 +4,5 @@ # Ship: Vargur type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"), - "falloff", ship.getModifiedItemAttr("shipBonusMB") * level) + "falloff", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship") diff --git a/eos/effects/shipbonusremotearmorrepairamount2af.py b/eos/effects/shipbonusremotearmorrepairamount2af.py index 9071f7cc86..f63032c9ad 100644 --- a/eos/effects/shipbonusremotearmorrepairamount2af.py +++ b/eos/effects/shipbonusremotearmorrepairamount2af.py @@ -4,6 +4,5 @@ # Ship: Inquisitor type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", - "armorDamageAmount", ship.getModifiedItemAttr("shipBonus2AF") * level) + "armorDamageAmount", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") diff --git a/eos/effects/shipbonusremotearmorrepairamountac2.py b/eos/effects/shipbonusremotearmorrepairamountac2.py index 2e6e719095..5d90469a3a 100644 --- a/eos/effects/shipbonusremotearmorrepairamountac2.py +++ b/eos/effects/shipbonusremotearmorrepairamountac2.py @@ -4,6 +4,5 @@ # Ship: Augoror type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", - "armorDamageAmount", ship.getModifiedItemAttr("shipBonusAC2") * level) + "armorDamageAmount", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser") diff --git a/eos/effects/shipbonusremotearmorrepairamountgc2.py b/eos/effects/shipbonusremotearmorrepairamountgc2.py index 6a8a7f481a..fbd04f0b20 100644 --- a/eos/effects/shipbonusremotearmorrepairamountgc2.py +++ b/eos/effects/shipbonusremotearmorrepairamountgc2.py @@ -4,6 +4,5 @@ # Ship: Exequror type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", - "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGC2") * level) + "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonusremotearmorrepairamountgf2.py b/eos/effects/shipbonusremotearmorrepairamountgf2.py index a98bab6e57..44c6285a5b 100644 --- a/eos/effects/shipbonusremotearmorrepairamountgf2.py +++ b/eos/effects/shipbonusremotearmorrepairamountgf2.py @@ -4,6 +4,5 @@ # Ship: Navitas type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", - "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGF2") * level) + "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate") diff --git a/eos/effects/shipbonusremotearmorrepaircapneedac1.py b/eos/effects/shipbonusremotearmorrepaircapneedac1.py index 5a8e9e6427..d93489454d 100644 --- a/eos/effects/shipbonusremotearmorrepaircapneedac1.py +++ b/eos/effects/shipbonusremotearmorrepaircapneedac1.py @@ -4,6 +4,5 @@ # Ship: Augoror type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", - "capacitorNeed", ship.getModifiedItemAttr("shipBonusAC") * level) + "capacitorNeed", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") diff --git a/eos/effects/shipbonusremotearmorrepaircapneedaf.py b/eos/effects/shipbonusremotearmorrepaircapneedaf.py index bf0561e259..924fb5e8b7 100644 --- a/eos/effects/shipbonusremotearmorrepaircapneedaf.py +++ b/eos/effects/shipbonusremotearmorrepaircapneedaf.py @@ -4,6 +4,5 @@ # Ship: Inquisitor type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", - "capacitorNeed", ship.getModifiedItemAttr("shipBonusAF") * level) + "capacitorNeed", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate") diff --git a/eos/effects/shipbonusremotearmorrepaircapneedgc1.py b/eos/effects/shipbonusremotearmorrepaircapneedgc1.py index 5102bc9454..022e514773 100644 --- a/eos/effects/shipbonusremotearmorrepaircapneedgc1.py +++ b/eos/effects/shipbonusremotearmorrepaircapneedgc1.py @@ -4,6 +4,5 @@ # Ship: Exequror type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", - "capacitorNeed", ship.getModifiedItemAttr("shipBonusGC") * level) + "capacitorNeed", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonusremotearmorrepaircapneedgf.py b/eos/effects/shipbonusremotearmorrepaircapneedgf.py index 93563edabd..6e7bbf8f6c 100644 --- a/eos/effects/shipbonusremotearmorrepaircapneedgf.py +++ b/eos/effects/shipbonusremotearmorrepaircapneedgf.py @@ -4,6 +4,5 @@ # Ship: Navitas type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", - "capacitorNeed", ship.getModifiedItemAttr("shipBonusGF") * level) + "capacitorNeed", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate") diff --git a/eos/effects/shipbonusrepairsystemsarmorrepairamountgb2.py b/eos/effects/shipbonusrepairsystemsarmorrepairamountgb2.py index c1b0541917..ae83eaa6ee 100644 --- a/eos/effects/shipbonusrepairsystemsarmorrepairamountgb2.py +++ b/eos/effects/shipbonusrepairsystemsarmorrepairamountgb2.py @@ -4,6 +4,5 @@ # Ship: Hyperion type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), - "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGB2") * level) + "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGB2"), skill="Gallente Battleship") diff --git a/eos/effects/shipbonusrhmlrof2cb.py b/eos/effects/shipbonusrhmlrof2cb.py index bbbc91a77a..172c479f9f 100644 --- a/eos/effects/shipbonusrhmlrof2cb.py +++ b/eos/effects/shipbonusrhmlrof2cb.py @@ -5,6 +5,5 @@ # Ship: Widow type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Heavy", - "speed", ship.getModifiedItemAttr("shipBonus2CB") * level) + "speed", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship") diff --git a/eos/effects/shipbonusrhmlrofcb.py b/eos/effects/shipbonusrhmlrofcb.py index 058aa2b9e8..728a0710da 100644 --- a/eos/effects/shipbonusrhmlrofcb.py +++ b/eos/effects/shipbonusrhmlrofcb.py @@ -4,6 +4,5 @@ # Ship: Scorpion Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Heavy", - "speed", ship.getModifiedItemAttr("shipBonusCB") * level) + "speed", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship") diff --git a/eos/effects/shipbonusrhmlrofmb.py b/eos/effects/shipbonusrhmlrofmb.py index 65213af78c..575e39727a 100644 --- a/eos/effects/shipbonusrhmlrofmb.py +++ b/eos/effects/shipbonusrhmlrofmb.py @@ -4,6 +4,5 @@ # Ship: Typhoon type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Heavy", - "speed", ship.getModifiedItemAttr("shipBonusMB") * level) + "speed", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship") diff --git a/eos/effects/shipbonussalvagecycleaf.py b/eos/effects/shipbonussalvagecycleaf.py index 252fa183e3..9b4f3b372d 100644 --- a/eos/effects/shipbonussalvagecycleaf.py +++ b/eos/effects/shipbonussalvagecycleaf.py @@ -4,6 +4,5 @@ # Ship: Magnate type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Salvaging"), - "duration", ship.getModifiedItemAttr("shipBonusAF") * level) + "duration", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate") diff --git a/eos/effects/shipbonussalvagecyclecf.py b/eos/effects/shipbonussalvagecyclecf.py index 7832af2b66..bdf4d4b9d6 100644 --- a/eos/effects/shipbonussalvagecyclecf.py +++ b/eos/effects/shipbonussalvagecyclecf.py @@ -4,6 +4,5 @@ # Ship: Heron type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Salvaging"), - "duration", ship.getModifiedItemAttr("shipBonusCF") * level) + "duration", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate") diff --git a/eos/effects/shipbonussalvagecyclegf.py b/eos/effects/shipbonussalvagecyclegf.py index 9e32df3a8e..095ea42b83 100644 --- a/eos/effects/shipbonussalvagecyclegf.py +++ b/eos/effects/shipbonussalvagecyclegf.py @@ -4,6 +4,5 @@ # Ship: Imicus type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Salvaging"), - "duration", ship.getModifiedItemAttr("shipBonusGF") * level) + "duration", ship.getModifiedItemAttr("shipBonusGF"), skill="Amarr Frigate") diff --git a/eos/effects/shipbonussalvagecyclemf.py b/eos/effects/shipbonussalvagecyclemf.py index 6d61589196..f4544c74b2 100644 --- a/eos/effects/shipbonussalvagecyclemf.py +++ b/eos/effects/shipbonussalvagecyclemf.py @@ -4,6 +4,5 @@ # Ship: Probe type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Salvaging"), - "duration", ship.getModifiedItemAttr("shipBonusMF") * level) + "duration", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate") diff --git a/eos/effects/shipbonusscanprobestrength2af.py b/eos/effects/shipbonusscanprobestrength2af.py index 1be48b032e..f1e0c05d9e 100644 --- a/eos/effects/shipbonusscanprobestrength2af.py +++ b/eos/effects/shipbonusscanprobestrength2af.py @@ -4,6 +4,5 @@ # Ship: Magnate type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe", - "baseSensorStrength", ship.getModifiedItemAttr("shipBonus2AF") * level) + "baseSensorStrength", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") diff --git a/eos/effects/shipbonusscanprobestrengthcf.py b/eos/effects/shipbonusscanprobestrengthcf.py index 7528d42220..06d8c2a59a 100644 --- a/eos/effects/shipbonusscanprobestrengthcf.py +++ b/eos/effects/shipbonusscanprobestrengthcf.py @@ -4,6 +4,5 @@ # Ship: Heron type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe", - "baseSensorStrength", ship.getModifiedItemAttr("shipBonusCF2") * level) \ No newline at end of file + "baseSensorStrength", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate") \ No newline at end of file diff --git a/eos/effects/shipbonusscanprobestrengthgf.py b/eos/effects/shipbonusscanprobestrengthgf.py index 06276bbc1f..0d419793ba 100644 --- a/eos/effects/shipbonusscanprobestrengthgf.py +++ b/eos/effects/shipbonusscanprobestrengthgf.py @@ -4,6 +4,5 @@ # Ship: Imicus type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe", - "baseSensorStrength", ship.getModifiedItemAttr("shipBonusGF2") * level) + "baseSensorStrength", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate") diff --git a/eos/effects/shipbonusscanprobestrengthmf.py b/eos/effects/shipbonusscanprobestrengthmf.py index 6287ba5ac5..27375af1bc 100644 --- a/eos/effects/shipbonusscanprobestrengthmf.py +++ b/eos/effects/shipbonusscanprobestrengthmf.py @@ -4,6 +4,5 @@ # Ship: Probe type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe", - "baseSensorStrength", ship.getModifiedItemAttr("shipBonusMF2") * level) + "baseSensorStrength", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate") diff --git a/eos/effects/shipbonussentryarmorhpgc3.py b/eos/effects/shipbonussentryarmorhpgc3.py index 80dc34d01c..ebf024b2a2 100644 --- a/eos/effects/shipbonussentryarmorhpgc3.py +++ b/eos/effects/shipbonussentryarmorhpgc3.py @@ -4,6 +4,5 @@ # Ship: Ishtar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"), - "armorHP", ship.getModifiedItemAttr("shipBonusGC3") * level) + "armorHP", ship.getModifiedItemAttr("shipBonusGC3"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonussentrydamagemultipliergc3.py b/eos/effects/shipbonussentrydamagemultipliergc3.py index 73987a70b2..40e9489d44 100644 --- a/eos/effects/shipbonussentrydamagemultipliergc3.py +++ b/eos/effects/shipbonussentrydamagemultipliergc3.py @@ -4,6 +4,5 @@ # Ship: Ishtar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC3") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC3"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonussentrydroneoptimalrangeelitebonusheavygunship2.py b/eos/effects/shipbonussentrydroneoptimalrangeelitebonusheavygunship2.py index 8cec3fc772..6c5f64edc2 100644 --- a/eos/effects/shipbonussentrydroneoptimalrangeelitebonusheavygunship2.py +++ b/eos/effects/shipbonussentrydroneoptimalrangeelitebonusheavygunship2.py @@ -4,6 +4,5 @@ # Ship: Ishtar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Assault Cruisers").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"), - "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship2") * level) + "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"), skill="Heavy Assault Cruisers") diff --git a/eos/effects/shipbonussentrydronetrackingelitebonusheavygunship2.py b/eos/effects/shipbonussentrydronetrackingelitebonusheavygunship2.py index 90a40a0561..5e3cad2588 100644 --- a/eos/effects/shipbonussentrydronetrackingelitebonusheavygunship2.py +++ b/eos/effects/shipbonussentrydronetrackingelitebonusheavygunship2.py @@ -4,6 +4,5 @@ # Ship: Ishtar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Assault Cruisers").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"), - "trackingSpeed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2") * level) + "trackingSpeed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2"), skill="Heavy Assault Cruisers") diff --git a/eos/effects/shipbonussentryhpgc3.py b/eos/effects/shipbonussentryhpgc3.py index 633c8267e3..4ab87a24e9 100644 --- a/eos/effects/shipbonussentryhpgc3.py +++ b/eos/effects/shipbonussentryhpgc3.py @@ -4,6 +4,5 @@ # Ship: Ishtar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"), - "hp", ship.getModifiedItemAttr("shipBonusGC3") * level) + "hp", ship.getModifiedItemAttr("shipBonusGC3"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonussentryshieldhpgc3.py b/eos/effects/shipbonussentryshieldhpgc3.py index 64bb46455c..6f968c1e3b 100644 --- a/eos/effects/shipbonussentryshieldhpgc3.py +++ b/eos/effects/shipbonussentryshieldhpgc3.py @@ -4,6 +4,5 @@ # Ship: Ishtar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"), - "shieldCapacity", ship.getModifiedItemAttr("shipBonusGC3") * level) + "shieldCapacity", ship.getModifiedItemAttr("shipBonusGC3"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonusshieldboostamountmc2.py b/eos/effects/shipbonusshieldboostamountmc2.py index 0aa75c1a87..97d7eb3ed7 100644 --- a/eos/effects/shipbonusshieldboostamountmc2.py +++ b/eos/effects/shipbonusshieldboostamountmc2.py @@ -4,6 +4,5 @@ # Ship: Vagabond type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"), - "shieldBonus", ship.getModifiedItemAttr("shipBonusMC2") * level) + "shieldBonus", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser") diff --git a/eos/effects/shipbonusshieldboostci2.py b/eos/effects/shipbonusshieldboostci2.py index f6b211fb70..b4c6011469 100644 --- a/eos/effects/shipbonusshieldboostci2.py +++ b/eos/effects/shipbonusshieldboostci2.py @@ -4,6 +4,5 @@ # Ship: Bustard type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Industrial").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"), - "shieldBonus", ship.getModifiedItemAttr("shipBonusCI2") * level) + "shieldBonus", ship.getModifiedItemAttr("shipBonusCI2"), skill="Caldari Industrial") diff --git a/eos/effects/shipbonusshieldboostermb1a.py b/eos/effects/shipbonusshieldboostermb1a.py index d7e5579134..708bb712e0 100644 --- a/eos/effects/shipbonusshieldboostermb1a.py +++ b/eos/effects/shipbonusshieldboostermb1a.py @@ -4,6 +4,5 @@ # Ship: Maelstrom type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Shield Booster", - "shieldBonus", ship.getModifiedItemAttr("shipBonusMB") * level) + "shieldBonus", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship") diff --git a/eos/effects/shipbonusshieldboostmi2.py b/eos/effects/shipbonusshieldboostmi2.py index 0dbd8c669a..34325c73a1 100644 --- a/eos/effects/shipbonusshieldboostmi2.py +++ b/eos/effects/shipbonusshieldboostmi2.py @@ -4,6 +4,5 @@ # Ship: Mastodon type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Industrial").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"), - "shieldBonus", ship.getModifiedItemAttr("shipBonusMI2") * level) + "shieldBonus", ship.getModifiedItemAttr("shipBonusMI2"), skill="Minmatar Industrial") diff --git a/eos/effects/shipbonusshieldcapacityore2.py b/eos/effects/shipbonusshieldcapacityore2.py index e1b10a6985..497f29f570 100644 --- a/eos/effects/shipbonusshieldcapacityore2.py +++ b/eos/effects/shipbonusshieldcapacityore2.py @@ -4,5 +4,4 @@ # Variations of ship: Procurer (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Mining Barge").level - fit.ship.boostItemAttr("shieldCapacity", ship.getModifiedItemAttr("shipBonusORE2") * level) + fit.ship.boostItemAttr("shieldCapacity", ship.getModifiedItemAttr("shipBonusORE2"), skill=("Mining Barge")) diff --git a/eos/effects/shipbonusshieldtransferboostamountcc2.py b/eos/effects/shipbonusshieldtransferboostamountcc2.py index 566d3f3a44..6d26b7cf2b 100644 --- a/eos/effects/shipbonusshieldtransferboostamountcc2.py +++ b/eos/effects/shipbonusshieldtransferboostamountcc2.py @@ -4,6 +4,5 @@ # Ship: Osprey type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), - "shieldBonus", ship.getModifiedItemAttr("shipBonusCC2") * level) + "shieldBonus", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser") diff --git a/eos/effects/shipbonusshieldtransferboostamountcf2.py b/eos/effects/shipbonusshieldtransferboostamountcf2.py index b6dfe9080f..8831ac6e89 100644 --- a/eos/effects/shipbonusshieldtransferboostamountcf2.py +++ b/eos/effects/shipbonusshieldtransferboostamountcf2.py @@ -4,6 +4,5 @@ # Ship: Bantam type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), - "shieldBonus", ship.getModifiedItemAttr("shipBonusCF2") * level) + "shieldBonus", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate") diff --git a/eos/effects/shipbonusshieldtransferboostamountmc2.py b/eos/effects/shipbonusshieldtransferboostamountmc2.py index 4ea9356c63..e427eaead3 100644 --- a/eos/effects/shipbonusshieldtransferboostamountmc2.py +++ b/eos/effects/shipbonusshieldtransferboostamountmc2.py @@ -4,6 +4,5 @@ # Ship: Scythe type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), - "shieldBonus", ship.getModifiedItemAttr("shipBonusMC2") * level) + "shieldBonus", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser") diff --git a/eos/effects/shipbonusshieldtransferboostamountmf2.py b/eos/effects/shipbonusshieldtransferboostamountmf2.py index b6717501c1..aeed31fe22 100644 --- a/eos/effects/shipbonusshieldtransferboostamountmf2.py +++ b/eos/effects/shipbonusshieldtransferboostamountmf2.py @@ -4,6 +4,5 @@ # Ship: Burst type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), - "shieldBonus", ship.getModifiedItemAttr("shipBonusMF2") * level) + "shieldBonus", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate") diff --git a/eos/effects/shipbonusshieldtransfercapneed1.py b/eos/effects/shipbonusshieldtransfercapneed1.py index 74f8a6c98a..922d3804fe 100644 --- a/eos/effects/shipbonusshieldtransfercapneed1.py +++ b/eos/effects/shipbonusshieldtransfercapneed1.py @@ -4,6 +4,5 @@ # Ship: Osprey type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", - "capacitorNeed", ship.getModifiedItemAttr("shipBonusCC") * level) + "capacitorNeed", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser") diff --git a/eos/effects/shipbonusshieldtransfercapneedcf.py b/eos/effects/shipbonusshieldtransfercapneedcf.py index 35984a02ba..28fbbf8fbc 100644 --- a/eos/effects/shipbonusshieldtransfercapneedcf.py +++ b/eos/effects/shipbonusshieldtransfercapneedcf.py @@ -4,6 +4,5 @@ # Ship: Bantam type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), - "capacitorNeed", ship.getModifiedItemAttr("shipBonusCF") * level) + "capacitorNeed", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate") diff --git a/eos/effects/shipbonusshieldtransfercapneedmc1.py b/eos/effects/shipbonusshieldtransfercapneedmc1.py index 2a8970872f..ffab0d6a6a 100644 --- a/eos/effects/shipbonusshieldtransfercapneedmc1.py +++ b/eos/effects/shipbonusshieldtransfercapneedmc1.py @@ -4,6 +4,5 @@ # Ship: Scythe type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), - "capacitorNeed", ship.getModifiedItemAttr("shipBonusMC") * level) + "capacitorNeed", ship.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser") diff --git a/eos/effects/shipbonusshieldtransfercapneedmf.py b/eos/effects/shipbonusshieldtransfercapneedmf.py index ab223014f3..426c8a834b 100644 --- a/eos/effects/shipbonusshieldtransfercapneedmf.py +++ b/eos/effects/shipbonusshieldtransfercapneedmf.py @@ -4,6 +4,5 @@ # Ship: Burst type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), - "capacitorNeed", ship.getModifiedItemAttr("shipBonusMF") * level) + "capacitorNeed", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate") diff --git a/eos/effects/shipbonussmallenergyturrettracking2af.py b/eos/effects/shipbonussmallenergyturrettracking2af.py index eb810aae03..502014a929 100644 --- a/eos/effects/shipbonussmallenergyturrettracking2af.py +++ b/eos/effects/shipbonussmallenergyturrettracking2af.py @@ -4,6 +4,5 @@ # Ship: Succubus type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), - "trackingSpeed", ship.getModifiedItemAttr("shipBonus2AF") * level) + "trackingSpeed", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") diff --git a/eos/effects/shipbonussmallmissileexplosionradiuscd2.py b/eos/effects/shipbonussmallmissileexplosionradiuscd2.py index 34e30403c1..df0731eaf7 100644 --- a/eos/effects/shipbonussmallmissileexplosionradiuscd2.py +++ b/eos/effects/shipbonussmallmissileexplosionradiuscd2.py @@ -4,6 +4,5 @@ # Ship: Flycatcher type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Destroyer").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"), - "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCD2") * level) + "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer") diff --git a/eos/effects/shipbonussmallmissileexplosionradiuscf2.py b/eos/effects/shipbonussmallmissileexplosionradiuscf2.py index 9b353b4468..f6fb52ef2a 100644 --- a/eos/effects/shipbonussmallmissileexplosionradiuscf2.py +++ b/eos/effects/shipbonussmallmissileexplosionradiuscf2.py @@ -4,6 +4,5 @@ # Ship: Crow type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"), - "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCF2") * level) + "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate") diff --git a/eos/effects/shipbonussptfalloffmf2.py b/eos/effects/shipbonussptfalloffmf2.py index d9b2fb6cde..2d65eb1f66 100644 --- a/eos/effects/shipbonussptfalloffmf2.py +++ b/eos/effects/shipbonussptfalloffmf2.py @@ -4,6 +4,5 @@ # Ship: Rifter type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), - "falloff", ship.getModifiedItemAttr("shipBonusMF2") * level) + "falloff", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate") diff --git a/eos/effects/shipbonusstasismf2.py b/eos/effects/shipbonusstasismf2.py index 0a0d2ba1aa..4b364d15c2 100644 --- a/eos/effects/shipbonusstasismf2.py +++ b/eos/effects/shipbonusstasismf2.py @@ -5,6 +5,5 @@ # Ship: Freki type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", - "maxRange", ship.getModifiedItemAttr("shipBonusMF2") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate") diff --git a/eos/effects/shipbonusstasiswebspeedfactormb.py b/eos/effects/shipbonusstasiswebspeedfactormb.py index 5af3f586db..9d4a0aa861 100644 --- a/eos/effects/shipbonusstasiswebspeedfactormb.py +++ b/eos/effects/shipbonusstasiswebspeedfactormb.py @@ -4,6 +4,5 @@ # Ship: Vindicator type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", - "speedFactor", ship.getModifiedItemAttr("shipBonusMB") * level) + "speedFactor", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship") diff --git a/eos/effects/shipbonusstrategiccruiseramarrheatdamage.py b/eos/effects/shipbonusstrategiccruiseramarrheatdamage.py index 9a7aad8d0a..084d27cd75 100644 --- a/eos/effects/shipbonusstrategiccruiseramarrheatdamage.py +++ b/eos/effects/shipbonusstrategiccruiseramarrheatdamage.py @@ -4,6 +4,5 @@ # Ship: Legion type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Strategic Cruiser").level fit.modules.filteredItemBoost(lambda mod: True, "heatDamage", - ship.getModifiedItemAttr("shipBonusStrategicCruiserAmarr") * level) + ship.getModifiedItemAttr("shipBonusStrategicCruiserAmarr"), skill="Amarr Strategic Cruiser") diff --git a/eos/effects/shipbonusstrategiccruisercaldariheatdamage.py b/eos/effects/shipbonusstrategiccruisercaldariheatdamage.py index e634fa26f6..30e53b90bf 100644 --- a/eos/effects/shipbonusstrategiccruisercaldariheatdamage.py +++ b/eos/effects/shipbonusstrategiccruisercaldariheatdamage.py @@ -4,6 +4,5 @@ # Ship: Tengu type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Strategic Cruiser").level fit.modules.filteredItemBoost(lambda mod: True, "heatDamage", - ship.getModifiedItemAttr("shipBonusStrategicCruiserCaldari") * level) + ship.getModifiedItemAttr("shipBonusStrategicCruiserCaldari"), skill="Caldari Strategic Cruiser") diff --git a/eos/effects/shipbonusstrategiccruisergallenteheatdamage.py b/eos/effects/shipbonusstrategiccruisergallenteheatdamage.py index 2426761d04..71ad1a2e6d 100644 --- a/eos/effects/shipbonusstrategiccruisergallenteheatdamage.py +++ b/eos/effects/shipbonusstrategiccruisergallenteheatdamage.py @@ -4,6 +4,5 @@ # Ship: Proteus type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Strategic Cruiser").level fit.modules.filteredItemBoost(lambda mod: True, "heatDamage", - ship.getModifiedItemAttr("shipBonusStrategicCruiserGallente") * level) + ship.getModifiedItemAttr("shipBonusStrategicCruiserGallente"), skill="Gallente Strategic Cruiser") diff --git a/eos/effects/shipbonusstrategiccruiserminmatarheatdamage.py b/eos/effects/shipbonusstrategiccruiserminmatarheatdamage.py index 244ef2939a..a53f4c61df 100644 --- a/eos/effects/shipbonusstrategiccruiserminmatarheatdamage.py +++ b/eos/effects/shipbonusstrategiccruiserminmatarheatdamage.py @@ -4,6 +4,5 @@ # Ship: Loki type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Strategic Cruiser").level fit.modules.filteredItemBoost(lambda mod: True, "heatDamage", - ship.getModifiedItemAttr("shipBonusStrategicCruiserMinmatar") * level) + ship.getModifiedItemAttr("shipBonusStrategicCruiserMinmatar"), skill="Minmatar Strategic Cruiser") diff --git a/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py b/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py index 7e965e7c0e..2e1ede7067 100644 --- a/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py +++ b/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py @@ -4,6 +4,5 @@ # Ships from group: Covert Ops (4 of 5) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Covert Ops").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Survey Probe", - "explosionDelay", ship.getModifiedItemAttr("eliteBonusCoverOps3") * level) + "explosionDelay", ship.getModifiedItemAttr("eliteBonusCoverOps3"), skill="Covert Ops") diff --git a/eos/effects/shipbonustargetpainteroptimalmf1.py b/eos/effects/shipbonustargetpainteroptimalmf1.py index c0d1e2ec62..f45fe8a1dc 100644 --- a/eos/effects/shipbonustargetpainteroptimalmf1.py +++ b/eos/effects/shipbonustargetpainteroptimalmf1.py @@ -4,6 +4,5 @@ # Variations of ship: Vigil (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Target Painting"), - "maxRange", ship.getModifiedItemAttr("shipBonusMF") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate") diff --git a/eos/effects/shipbonustdoptimalbonusaf1.py b/eos/effects/shipbonustdoptimalbonusaf1.py index 51dcf1e23b..5903beac5f 100644 --- a/eos/effects/shipbonustdoptimalbonusaf1.py +++ b/eos/effects/shipbonustdoptimalbonusaf1.py @@ -4,6 +4,5 @@ # Ship: Crucifier type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), - "maxRange", ship.getModifiedItemAttr("shipBonusAF") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate") diff --git a/eos/effects/shipbonusthermalmissiledamagegb2.py b/eos/effects/shipbonusthermalmissiledamagegb2.py index 67438e1730..fc08b37dba 100644 --- a/eos/effects/shipbonusthermalmissiledamagegb2.py +++ b/eos/effects/shipbonusthermalmissiledamagegb2.py @@ -4,6 +4,5 @@ # Ships named like: Rattlesnake (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "thermalDamage", ship.getModifiedItemAttr("shipBonusGB2") * level) + "thermalDamage", ship.getModifiedItemAttr("shipBonusGB2"), skill="Gallente Battleship") diff --git a/eos/effects/shipbonusthermalmissiledamagegc2.py b/eos/effects/shipbonusthermalmissiledamagegc2.py index 19fefc9c70..8f1c23eb7c 100644 --- a/eos/effects/shipbonusthermalmissiledamagegc2.py +++ b/eos/effects/shipbonusthermalmissiledamagegc2.py @@ -6,6 +6,5 @@ type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "thermalDamage", ship.getModifiedItemAttr("shipBonusGC2") * level) + "thermalDamage", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonusthermalmissiledamagegf.py b/eos/effects/shipbonusthermalmissiledamagegf.py index 025971260d..903dd9804c 100644 --- a/eos/effects/shipbonusthermalmissiledamagegf.py +++ b/eos/effects/shipbonusthermalmissiledamagegf.py @@ -5,6 +5,5 @@ # Ship: Worm type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "thermalDamage", ship.getModifiedItemAttr("shipBonusGF") * level) + "thermalDamage", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate") diff --git a/eos/effects/shipbonusthermicshieldresistancecb2.py b/eos/effects/shipbonusthermicshieldresistancecb2.py index 522f69ded9..0819cd08e6 100644 --- a/eos/effects/shipbonusthermicshieldresistancecb2.py +++ b/eos/effects/shipbonusthermicshieldresistancecb2.py @@ -6,5 +6,4 @@ # Ship: Scorpion Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level - fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonus2CB") * level) + fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship") diff --git a/eos/effects/shipbonustorpedomissileemdmgmb.py b/eos/effects/shipbonustorpedomissileemdmgmb.py index c44d32b1ee..6659b52d2a 100644 --- a/eos/effects/shipbonustorpedomissileemdmgmb.py +++ b/eos/effects/shipbonustorpedomissileemdmgmb.py @@ -4,6 +4,5 @@ # Ship: Typhoon Fleet Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), - "emDamage", ship.getModifiedItemAttr("shipBonusMB") * level) + "emDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship") diff --git a/eos/effects/shipbonustorpedomissileexplodmgmb.py b/eos/effects/shipbonustorpedomissileexplodmgmb.py index e7342fecdb..284046faad 100644 --- a/eos/effects/shipbonustorpedomissileexplodmgmb.py +++ b/eos/effects/shipbonustorpedomissileexplodmgmb.py @@ -4,6 +4,5 @@ # Ship: Typhoon Fleet Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), - "explosiveDamage", ship.getModifiedItemAttr("shipBonusMB") * level) + "explosiveDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship") diff --git a/eos/effects/shipbonustorpedomissilekineticdmgmb.py b/eos/effects/shipbonustorpedomissilekineticdmgmb.py index fd7b9c01b2..f13096e491 100644 --- a/eos/effects/shipbonustorpedomissilekineticdmgmb.py +++ b/eos/effects/shipbonustorpedomissilekineticdmgmb.py @@ -4,6 +4,5 @@ # Ship: Typhoon Fleet Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), - "kineticDamage", ship.getModifiedItemAttr("shipBonusMB") * level) + "kineticDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship") diff --git a/eos/effects/shipbonustorpedomissilethermdmgmb.py b/eos/effects/shipbonustorpedomissilethermdmgmb.py index 4b0eec9982..693f6ee7a1 100644 --- a/eos/effects/shipbonustorpedomissilethermdmgmb.py +++ b/eos/effects/shipbonustorpedomissilethermdmgmb.py @@ -4,6 +4,5 @@ # Ship: Typhoon Fleet Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), - "thermalDamage", ship.getModifiedItemAttr("shipBonusMB") * level) + "thermalDamage", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship") diff --git a/eos/effects/shipbonustorpedorofmb.py b/eos/effects/shipbonustorpedorofmb.py index a67a55fa43..3234d5a2ae 100644 --- a/eos/effects/shipbonustorpedorofmb.py +++ b/eos/effects/shipbonustorpedorofmb.py @@ -4,6 +4,5 @@ # Ship: Typhoon type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Torpedo", - "speed", ship.getModifiedItemAttr("shipBonusMB") * level) + "speed", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship") diff --git a/eos/effects/shipbonustorpedovelocity2af.py b/eos/effects/shipbonustorpedovelocity2af.py index 2d6ff35d8b..7f0bc64ac1 100644 --- a/eos/effects/shipbonustorpedovelocity2af.py +++ b/eos/effects/shipbonustorpedovelocity2af.py @@ -4,6 +4,5 @@ # Ship: Purifier type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), - "maxVelocity", ship.getModifiedItemAttr("shipBonus2AF") * level) + "maxVelocity", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") diff --git a/eos/effects/shipbonustorpedovelocitycf2.py b/eos/effects/shipbonustorpedovelocitycf2.py index f08aeafe34..374186aa26 100644 --- a/eos/effects/shipbonustorpedovelocitycf2.py +++ b/eos/effects/shipbonustorpedovelocitycf2.py @@ -4,6 +4,5 @@ # Ship: Manticore type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), - "maxVelocity", ship.getModifiedItemAttr("shipBonusCF2") * level) + "maxVelocity", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate") diff --git a/eos/effects/shipbonustorpedovelocitygf2.py b/eos/effects/shipbonustorpedovelocitygf2.py index cc2b176be0..91a13f1fa9 100644 --- a/eos/effects/shipbonustorpedovelocitygf2.py +++ b/eos/effects/shipbonustorpedovelocitygf2.py @@ -4,6 +4,5 @@ # Ship: Nemesis type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), - "maxVelocity", ship.getModifiedItemAttr("shipBonusGF2") * level) + "maxVelocity", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate") diff --git a/eos/effects/shipbonustorpedovelocitymf2.py b/eos/effects/shipbonustorpedovelocitymf2.py index 48f4c7f169..e74cb86bff 100644 --- a/eos/effects/shipbonustorpedovelocitymf2.py +++ b/eos/effects/shipbonustorpedovelocitymf2.py @@ -4,6 +4,5 @@ # Ship: Hound type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), - "maxVelocity", ship.getModifiedItemAttr("shipBonusMF2") * level) + "maxVelocity", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate") diff --git a/eos/effects/shipbonusvelocityci.py b/eos/effects/shipbonusvelocityci.py index d1124fcc2c..ed272f31ab 100644 --- a/eos/effects/shipbonusvelocityci.py +++ b/eos/effects/shipbonusvelocityci.py @@ -5,5 +5,4 @@ # Ship: Crane type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Industrial").level - fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("shipBonusCI") * level) + fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("shipBonusCI"), skill="Caldari Industrial") diff --git a/eos/effects/shipbonusvelocitygi.py b/eos/effects/shipbonusvelocitygi.py index 2895f6bc1c..5e06833d1a 100644 --- a/eos/effects/shipbonusvelocitygi.py +++ b/eos/effects/shipbonusvelocitygi.py @@ -8,11 +8,10 @@ # Ship: Viator type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Industrial").level # TODO: investigate if we can live without such ifs or hardcoding # Viator doesn't have GI bonus if "shipBonusGI" in fit.ship.item.attributes: bonusAttr = "shipBonusGI" else: bonusAttr = "shipBonusGI2" - fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr(bonusAttr) * level) + fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr(bonusAttr), skill="Gallente Industrial") diff --git a/eos/effects/shipbonuswarpscramblemaxrangegb.py b/eos/effects/shipbonuswarpscramblemaxrangegb.py index 69cd0a1aa7..36586ab3c6 100644 --- a/eos/effects/shipbonuswarpscramblemaxrangegb.py +++ b/eos/effects/shipbonuswarpscramblemaxrangegb.py @@ -4,6 +4,5 @@ # Ship: Barghest type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler", - "maxRange", ship.getModifiedItemAttr("shipBonusGB") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusGB"), skill="Gallente Battleship") diff --git a/eos/effects/shipbonuswarpscramblermaxrangegc2.py b/eos/effects/shipbonuswarpscramblermaxrangegc2.py index 343e869383..34df40cdb2 100644 --- a/eos/effects/shipbonuswarpscramblermaxrangegc2.py +++ b/eos/effects/shipbonuswarpscramblermaxrangegc2.py @@ -5,6 +5,5 @@ # Ship: Orthrus type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler", - "maxRange", ship.getModifiedItemAttr("shipBonusGC2") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") diff --git a/eos/effects/shipbonuswarpscramblermaxrangegf2.py b/eos/effects/shipbonuswarpscramblermaxrangegf2.py index a89f21102a..9587eee65d 100644 --- a/eos/effects/shipbonuswarpscramblermaxrangegf2.py +++ b/eos/effects/shipbonuswarpscramblermaxrangegf2.py @@ -5,6 +5,5 @@ # Ship: Utu type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler", - "maxRange", ship.getModifiedItemAttr("shipBonusGF2") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate") diff --git a/eos/effects/shipcapneedbonusab.py b/eos/effects/shipcapneedbonusab.py index 505ce27450..696b60ec43 100644 --- a/eos/effects/shipcapneedbonusab.py +++ b/eos/effects/shipcapneedbonusab.py @@ -5,6 +5,5 @@ # Ship: Apocalypse Imperial Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"), - "capacitorNeed", ship.getModifiedItemAttr("shipBonusAB") * level) + "capacitorNeed", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship") diff --git a/eos/effects/shipcaprecharge2af.py b/eos/effects/shipcaprecharge2af.py index 93b74089ff..436742c4f3 100644 --- a/eos/effects/shipcaprecharge2af.py +++ b/eos/effects/shipcaprecharge2af.py @@ -4,5 +4,4 @@ # Ship: Anathema type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level - fit.ship.boostItemAttr("rechargeRate", ship.getModifiedItemAttr("shipBonus2AF") * level) + fit.ship.boostItemAttr("rechargeRate", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") diff --git a/eos/effects/shipcargobonusai.py b/eos/effects/shipcargobonusai.py index a9a627a7ff..d035e20d82 100644 --- a/eos/effects/shipcargobonusai.py +++ b/eos/effects/shipcargobonusai.py @@ -5,5 +5,4 @@ # Ship: Bestower type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Industrial").level - fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("shipBonusAI") * level) + fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("shipBonusAI"), skill="Amarr Industrial") diff --git a/eos/effects/shipcommandbonuseffectivemultiplierorecapital2.py b/eos/effects/shipcommandbonuseffectivemultiplierorecapital2.py index 85891e7e6e..9a4de1129e 100644 --- a/eos/effects/shipcommandbonuseffectivemultiplierorecapital2.py +++ b/eos/effects/shipcommandbonuseffectivemultiplierorecapital2.py @@ -5,5 +5,4 @@ type = "passive" def handler(fit, ship, context): if fit.extraAttributes["siege"]: - level = fit.character.getSkill("Capital Industrial Ships").level - fit.ship.increaseItemAttr("commandBonusEffective", ship.getModifiedItemAttr("shipBonusORECapital2") * level) + fit.ship.increaseItemAttr("commandBonusEffective", ship.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships") diff --git a/eos/effects/shipconsumptionquantitybonusindustrialreconfigurationorecapital1.py b/eos/effects/shipconsumptionquantitybonusindustrialreconfigurationorecapital1.py index 2010769b57..8d85bebf52 100644 --- a/eos/effects/shipconsumptionquantitybonusindustrialreconfigurationorecapital1.py +++ b/eos/effects/shipconsumptionquantitybonusindustrialreconfigurationorecapital1.py @@ -4,6 +4,5 @@ # Ship: Rorqual type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Capital Industrial Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Industrial Reconfiguration"), - "consumptionQuantity", ship.getModifiedItemAttr("shipBonusORECapital1") * level) + "consumptionQuantity", ship.getModifiedItemAttr("shipBonusORECapital1"), skill="Capital Industrial Ships") diff --git a/eos/effects/shipcruiseandsiegelauncherrofbonus2cb.py b/eos/effects/shipcruiseandsiegelauncherrofbonus2cb.py index 74110f3510..9faf7b6a45 100644 --- a/eos/effects/shipcruiseandsiegelauncherrofbonus2cb.py +++ b/eos/effects/shipcruiseandsiegelauncherrofbonus2cb.py @@ -4,7 +4,6 @@ # Ship: Widow type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level affectedGroups = ("Missile Launcher Cruise", "Missile Launcher Torpedo") fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in affectedGroups, - "speed", ship.getModifiedItemAttr("shipBonus2CB") * level) + "speed", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship") diff --git a/eos/effects/shipcruiseandtorpedovelocitybonuscb3.py b/eos/effects/shipcruiseandtorpedovelocitybonuscb3.py index 2978381b97..e932a7a613 100644 --- a/eos/effects/shipcruiseandtorpedovelocitybonuscb3.py +++ b/eos/effects/shipcruiseandtorpedovelocitybonuscb3.py @@ -5,6 +5,5 @@ # Ship: Widow type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles") or mod.charge.requiresSkill("Torpedoes"), - "maxVelocity", ship.getModifiedItemAttr("shipBonusCB3") * level) + "maxVelocity", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship") diff --git a/eos/effects/shipcruiselauncherrofbonus2cb.py b/eos/effects/shipcruiselauncherrofbonus2cb.py index 555657a251..874ce2cc13 100644 --- a/eos/effects/shipcruiselauncherrofbonus2cb.py +++ b/eos/effects/shipcruiselauncherrofbonus2cb.py @@ -5,6 +5,5 @@ # Ship: Raven State Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Cruise", - "speed", ship.getModifiedItemAttr("shipBonus2CB") * level) + "speed", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship") diff --git a/eos/effects/shipcruisemissileaoecloudsize1cb.py b/eos/effects/shipcruisemissileaoecloudsize1cb.py index aff3717f76..55123d3285 100644 --- a/eos/effects/shipcruisemissileaoecloudsize1cb.py +++ b/eos/effects/shipcruisemissileaoecloudsize1cb.py @@ -4,6 +4,5 @@ # Ship: Raven Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), - "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCB") * level) + "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship") diff --git a/eos/effects/shipcruisemissilerofcb.py b/eos/effects/shipcruisemissilerofcb.py index 7f847724a3..1818258014 100644 --- a/eos/effects/shipcruisemissilerofcb.py +++ b/eos/effects/shipcruisemissilerofcb.py @@ -4,6 +4,5 @@ # Ship: Scorpion Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Cruise", - "speed", ship.getModifiedItemAttr("shipBonusCB") * level) + "speed", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship") diff --git a/eos/effects/shipcruisemissilevelocitybonuscb3.py b/eos/effects/shipcruisemissilevelocitybonuscb3.py index faa6bbb632..7d7819cb86 100644 --- a/eos/effects/shipcruisemissilevelocitybonuscb3.py +++ b/eos/effects/shipcruisemissilevelocitybonuscb3.py @@ -4,6 +4,5 @@ # Variations of ship: Raven (3 of 4) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), - "maxVelocity", ship.getModifiedItemAttr("shipBonusCB3") * level) + "maxVelocity", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship") diff --git a/eos/effects/shipdronescoutthermaldamagegf2.py b/eos/effects/shipdronescoutthermaldamagegf2.py index f709b17d35..85266c809b 100644 --- a/eos/effects/shipdronescoutthermaldamagegf2.py +++ b/eos/effects/shipdronescoutthermaldamagegf2.py @@ -4,6 +4,5 @@ # Ship: Helios type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drone Avionics"), - "thermalDamage", ship.getModifiedItemAttr("shipBonusGF2") * level) + "thermalDamage", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate") diff --git a/eos/effects/shipdronesmaxgc2.py b/eos/effects/shipdronesmaxgc2.py index 5e6ab940fc..7ae2e2f584 100644 --- a/eos/effects/shipdronesmaxgc2.py +++ b/eos/effects/shipdronesmaxgc2.py @@ -4,6 +4,4 @@ # Ship: Guardian-Vexor type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level - amount = ship.getModifiedItemAttr("shipBonusGC2") - fit.extraAttributes.increase("maxActiveDrones", amount * level) + fit.extraAttributes.increase("maxActiveDrones", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") diff --git a/eos/effects/shipecmscanstrengthbonuscf.py b/eos/effects/shipecmscanstrengthbonuscf.py index af5d601435..06735bcb14 100644 --- a/eos/effects/shipecmscanstrengthbonuscf.py +++ b/eos/effects/shipecmscanstrengthbonuscf.py @@ -4,8 +4,7 @@ # Variations of ship: Griffin (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level for type in ("Gravimetric", "Ladar", "Radar", "Magnetometric"): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "scan{0}StrengthBonus".format(type), - ship.getModifiedItemAttr("shipBonusCF") * level) + ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate") diff --git a/eos/effects/shipenergydrainamountaf1.py b/eos/effects/shipenergydrainamountaf1.py index f35bcc3185..67f97345c2 100644 --- a/eos/effects/shipenergydrainamountaf1.py +++ b/eos/effects/shipenergydrainamountaf1.py @@ -5,6 +5,5 @@ # Ship: Sentinel type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire", - "powerTransferAmount", ship.getModifiedItemAttr("shipBonusAF") * level) + "powerTransferAmount", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate") diff --git a/eos/effects/shipenergyneutralizerrangebonusac.py b/eos/effects/shipenergyneutralizerrangebonusac.py index dd46ad2d54..2d5b8767f0 100644 --- a/eos/effects/shipenergyneutralizerrangebonusac.py +++ b/eos/effects/shipenergyneutralizerrangebonusac.py @@ -4,6 +4,5 @@ # Ship: Vangel type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer", - "energyDestabilizationRange", ship.getModifiedItemAttr("shipBonusAC") * level) + "energyDestabilizationRange", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") diff --git a/eos/effects/shipenergyneutralizerrangebonusaf2.py b/eos/effects/shipenergyneutralizerrangebonusaf2.py index 8b809121ac..fb5e5a88b4 100644 --- a/eos/effects/shipenergyneutralizerrangebonusaf2.py +++ b/eos/effects/shipenergyneutralizerrangebonusaf2.py @@ -4,6 +4,5 @@ # Ship: Malice type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer", - "energyDestabilizationRange", ship.getModifiedItemAttr("shipBonus2AF") * level) + "energyDestabilizationRange", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") diff --git a/eos/effects/shipenergyneutralizertransferamountbonusab.py b/eos/effects/shipenergyneutralizertransferamountbonusab.py index fb392e4db5..b3b69c078a 100644 --- a/eos/effects/shipenergyneutralizertransferamountbonusab.py +++ b/eos/effects/shipenergyneutralizertransferamountbonusab.py @@ -4,6 +4,5 @@ # Ship: Bhaalgorn type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer", - "energyDestabilizationAmount", ship.getModifiedItemAttr("shipBonusAB") * level) + "energyDestabilizationAmount", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship") diff --git a/eos/effects/shipenergyneutralizertransferamountbonusac.py b/eos/effects/shipenergyneutralizertransferamountbonusac.py index c323ac19a8..436ef71e79 100644 --- a/eos/effects/shipenergyneutralizertransferamountbonusac.py +++ b/eos/effects/shipenergyneutralizertransferamountbonusac.py @@ -5,6 +5,5 @@ # Ship: Vangel type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer", - "energyDestabilizationAmount", ship.getModifiedItemAttr("shipBonusAC") * level) + "energyDestabilizationAmount", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") diff --git a/eos/effects/shipenergyneutralizertransferamountbonusaf.py b/eos/effects/shipenergyneutralizertransferamountbonusaf.py index 5ef1fb9858..88e0f7bd30 100644 --- a/eos/effects/shipenergyneutralizertransferamountbonusaf.py +++ b/eos/effects/shipenergyneutralizertransferamountbonusaf.py @@ -5,6 +5,5 @@ # Ship: Sentinel type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer", - "energyDestabilizationAmount", ship.getModifiedItemAttr("shipBonusAF") * level) + "energyDestabilizationAmount", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate") diff --git a/eos/effects/shipenergyneutralizertransferamountbonusaf2.py b/eos/effects/shipenergyneutralizertransferamountbonusaf2.py index 42f31ac3f1..ee16f81886 100644 --- a/eos/effects/shipenergyneutralizertransferamountbonusaf2.py +++ b/eos/effects/shipenergyneutralizertransferamountbonusaf2.py @@ -4,6 +4,5 @@ # Ship: Malice type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer", - "energyDestabilizationAmount", ship.getModifiedItemAttr("shipBonus2AF") * level) + "energyDestabilizationAmount", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") diff --git a/eos/effects/shipenergytcapneedbonusaf.py b/eos/effects/shipenergytcapneedbonusaf.py index 26b56682dd..7050d843f9 100644 --- a/eos/effects/shipenergytcapneedbonusaf.py +++ b/eos/effects/shipenergytcapneedbonusaf.py @@ -9,6 +9,5 @@ # Ship: Tormentor type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), - "capacitorNeed", ship.getModifiedItemAttr("shipBonus2AF") * level) + "capacitorNeed", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") diff --git a/eos/effects/shipenergytrackingabc1.py b/eos/effects/shipenergytrackingabc1.py index 3db187d13d..3384bdee58 100644 --- a/eos/effects/shipenergytrackingabc1.py +++ b/eos/effects/shipenergytrackingabc1.py @@ -5,6 +5,5 @@ type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battlecruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"), - "trackingSpeed", ship.getModifiedItemAttr("shipBonusABC1") * level) + "trackingSpeed", ship.getModifiedItemAttr("shipBonusABC1"), skill="Amarr Battlecruiser") diff --git a/eos/effects/shipenergytransferrange1.py b/eos/effects/shipenergytransferrange1.py index 734955d14c..193af0dbbd 100644 --- a/eos/effects/shipenergytransferrange1.py +++ b/eos/effects/shipenergytransferrange1.py @@ -4,6 +4,5 @@ # Ship: Guardian type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter", - "powerTransferRange", ship.getModifiedItemAttr("shipBonusAC") * level) + "powerTransferRange", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") diff --git a/eos/effects/shipenergytransferrange2.py b/eos/effects/shipenergytransferrange2.py index dbf8de23e2..adac10fcc6 100644 --- a/eos/effects/shipenergytransferrange2.py +++ b/eos/effects/shipenergytransferrange2.py @@ -5,6 +5,5 @@ # Ship: Etana type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter", - "powerTransferRange", ship.getModifiedItemAttr("shipBonusCC2") * level) + "powerTransferRange", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser") diff --git a/eos/effects/shipenergyvampireamountbonusfixedaf2.py b/eos/effects/shipenergyvampireamountbonusfixedaf2.py index e17492dea7..0e76b07c9e 100644 --- a/eos/effects/shipenergyvampireamountbonusfixedaf2.py +++ b/eos/effects/shipenergyvampireamountbonusfixedaf2.py @@ -4,6 +4,5 @@ # Ship: Malice type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire", - "powerTransferAmount", ship.getModifiedItemAttr("shipBonus2AF") * level) + "powerTransferAmount", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") diff --git a/eos/effects/shipenergyvampirerangebonusfixedac.py b/eos/effects/shipenergyvampirerangebonusfixedac.py index 6005f479da..b2cf784b8e 100644 --- a/eos/effects/shipenergyvampirerangebonusfixedac.py +++ b/eos/effects/shipenergyvampirerangebonusfixedac.py @@ -4,6 +4,5 @@ # Ship: Vangel type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire", - "powerTransferRange", ship.getModifiedItemAttr("shipBonusAC") * level) + "powerTransferRange", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") diff --git a/eos/effects/shipenergyvampirerangebonusfixedaf2.py b/eos/effects/shipenergyvampirerangebonusfixedaf2.py index 50276d7ecd..5a794654ff 100644 --- a/eos/effects/shipenergyvampirerangebonusfixedaf2.py +++ b/eos/effects/shipenergyvampirerangebonusfixedaf2.py @@ -4,6 +4,5 @@ # Ship: Malice type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire", - "powerTransferRange", ship.getModifiedItemAttr("shipBonus2AF") * level) + "powerTransferRange", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") diff --git a/eos/effects/shipenergyvampiretransferamountbonusab.py b/eos/effects/shipenergyvampiretransferamountbonusab.py index 0610dadfd6..dbeb393566 100644 --- a/eos/effects/shipenergyvampiretransferamountbonusab.py +++ b/eos/effects/shipenergyvampiretransferamountbonusab.py @@ -4,6 +4,5 @@ # Ship: Bhaalgorn type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire", - "powerTransferAmount", ship.getModifiedItemAttr("shipBonusAB") * level) + "powerTransferAmount", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship") diff --git a/eos/effects/shipenergyvampiretransferamountbonusac.py b/eos/effects/shipenergyvampiretransferamountbonusac.py index 82ab91dca6..f8932bc651 100644 --- a/eos/effects/shipenergyvampiretransferamountbonusac.py +++ b/eos/effects/shipenergyvampiretransferamountbonusac.py @@ -5,6 +5,5 @@ # Ship: Vangel type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire", - "powerTransferAmount", ship.getModifiedItemAttr("shipBonusAC") * level) + "powerTransferAmount", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") diff --git a/eos/effects/shipetdamageaf.py b/eos/effects/shipetdamageaf.py index 93c1986b0d..74dded6402 100644 --- a/eos/effects/shipetdamageaf.py +++ b/eos/effects/shipetdamageaf.py @@ -5,6 +5,5 @@ # Ship: Imperial Navy Slicer type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusAF") * level) \ No newline at end of file + "damageMultiplier", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate") \ No newline at end of file diff --git a/eos/effects/shipetoptimalrange2af.py b/eos/effects/shipetoptimalrange2af.py index 70d005a00c..593ee452fb 100644 --- a/eos/effects/shipetoptimalrange2af.py +++ b/eos/effects/shipetoptimalrange2af.py @@ -4,6 +4,5 @@ # Ship: Imperial Navy Slicer type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), - "maxRange", ship.getModifiedItemAttr("shipBonus2AF") * level) \ No newline at end of file + "maxRange", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") \ No newline at end of file diff --git a/eos/effects/shipetspeedbonusab2.py b/eos/effects/shipetspeedbonusab2.py index 5bc33e5c7d..ccec8f55f5 100644 --- a/eos/effects/shipetspeedbonusab2.py +++ b/eos/effects/shipetspeedbonusab2.py @@ -4,6 +4,5 @@ # Variations of ship: Armageddon (3 of 5) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"), - "speed", ship.getModifiedItemAttr("shipBonusAB2") * level) \ No newline at end of file + "speed", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship") \ No newline at end of file diff --git a/eos/effects/shipfalloffbonusgf.py b/eos/effects/shipfalloffbonusgf.py index dfab75b3fe..177b5695ec 100644 --- a/eos/effects/shipfalloffbonusgf.py +++ b/eos/effects/shipfalloffbonusgf.py @@ -5,6 +5,5 @@ # Ship: Daredevil type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), - "falloff", ship.getModifiedItemAttr("shipBonusGF2") * level) + "falloff", ship.getModifiedItemAttr("shipBonusGF2"), skill="Gallente Frigate") diff --git a/eos/effects/shipfalloffbonusmf.py b/eos/effects/shipfalloffbonusmf.py index ad51dfd628..25be55819c 100644 --- a/eos/effects/shipfalloffbonusmf.py +++ b/eos/effects/shipfalloffbonusmf.py @@ -5,6 +5,5 @@ # Ship: Dramiel type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), - "falloff", ship.getModifiedItemAttr("shipBonusMF") * level) + "falloff", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate") diff --git a/eos/effects/shipgchyieldbonusorefrig2.py b/eos/effects/shipgchyieldbonusorefrig2.py index 31ce02973c..d25ffdec2b 100644 --- a/eos/effects/shipgchyieldbonusorefrig2.py +++ b/eos/effects/shipgchyieldbonusorefrig2.py @@ -4,6 +4,5 @@ # Variations of ship: Venture (2 of 2) type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Mining Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Gas Cloud Harvester", - "duration", module.getModifiedItemAttr("shipBonusOREfrig2") * level) + "duration", module.getModifiedItemAttr("shipBonusOREfrig2"), skill="Mining Frigate") diff --git a/eos/effects/shipheatdamageamarrtacticaldestroyer3.py b/eos/effects/shipheatdamageamarrtacticaldestroyer3.py index b8fb821492..2a758f92b0 100644 --- a/eos/effects/shipheatdamageamarrtacticaldestroyer3.py +++ b/eos/effects/shipheatdamageamarrtacticaldestroyer3.py @@ -4,6 +4,5 @@ # Ship: Confessor type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Tactical Destroyer").level fit.modules.filteredItemBoost(lambda mod: True, "heatDamage", - ship.getModifiedItemAttr("shipBonusTacticalDestroyerAmarr3") * level) + ship.getModifiedItemAttr("shipBonusTacticalDestroyerAmarr3"), skill="Amarr Tactical Destroyer") diff --git a/eos/effects/shipheatdamagecaldaritacticaldestroyer3.py b/eos/effects/shipheatdamagecaldaritacticaldestroyer3.py index 16ae366187..488035544e 100644 --- a/eos/effects/shipheatdamagecaldaritacticaldestroyer3.py +++ b/eos/effects/shipheatdamagecaldaritacticaldestroyer3.py @@ -4,6 +4,5 @@ # Ship: Jackdaw type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Tactical Destroyer").level fit.modules.filteredItemBoost(lambda mod: True, "heatDamage", - ship.getModifiedItemAttr("shipBonusTacticalDestroyerCaldari3") * level) + ship.getModifiedItemAttr("shipBonusTacticalDestroyerCaldari3"), skill="Caldari Tactical Destroyer") diff --git a/eos/effects/shipheatdamagegallentetacticaldestroyer3.py b/eos/effects/shipheatdamagegallentetacticaldestroyer3.py index 9d09f8dc64..7bbad6ac39 100644 --- a/eos/effects/shipheatdamagegallentetacticaldestroyer3.py +++ b/eos/effects/shipheatdamagegallentetacticaldestroyer3.py @@ -4,6 +4,5 @@ # Ship: Hecate type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Tactical Destroyer").level fit.modules.filteredItemBoost(lambda mod: True, "heatDamage", - ship.getModifiedItemAttr("shipBonusTacticalDestroyerGallente3") * level) + ship.getModifiedItemAttr("shipBonusTacticalDestroyerGallente3"), skill="Gallente Tactical Destroyer") diff --git a/eos/effects/shipheatdamageminmatartacticaldestroyer3.py b/eos/effects/shipheatdamageminmatartacticaldestroyer3.py index 13607c1fa5..53ef8c9835 100644 --- a/eos/effects/shipheatdamageminmatartacticaldestroyer3.py +++ b/eos/effects/shipheatdamageminmatartacticaldestroyer3.py @@ -4,6 +4,5 @@ # Ship: Svipul type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Tactical Destroyer").level fit.modules.filteredItemBoost(lambda mod: True, "heatDamage", - ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar3") * level) + ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar3"), skill="Minmatar Tactical Destroyer") diff --git a/eos/effects/shipheavyassaultmissileaoecloudsizecbc1.py b/eos/effects/shipheavyassaultmissileaoecloudsizecbc1.py index f61f726e5c..43b6fa99c7 100644 --- a/eos/effects/shipheavyassaultmissileaoecloudsizecbc1.py +++ b/eos/effects/shipheavyassaultmissileaoecloudsizecbc1.py @@ -4,6 +4,5 @@ # Ship: Drake Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battlecruiser").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), - "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCBC1") * level) + "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCBC1"), skill="Caldari Battlecruiser") diff --git a/eos/effects/shipheavyassaultmissileaoecloudsizecc2.py b/eos/effects/shipheavyassaultmissileaoecloudsizecc2.py index 9eb7c2b325..be654846f4 100644 --- a/eos/effects/shipheavyassaultmissileaoecloudsizecc2.py +++ b/eos/effects/shipheavyassaultmissileaoecloudsizecc2.py @@ -4,6 +4,5 @@ # Ship: Caracal Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), - "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCC2") * level) + "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser") diff --git a/eos/effects/shipheavyassaultmissileemandexpandkinandthmdmgac1.py b/eos/effects/shipheavyassaultmissileemandexpandkinandthmdmgac1.py index e57a4fc316..9b722170da 100644 --- a/eos/effects/shipheavyassaultmissileemandexpandkinandthmdmgac1.py +++ b/eos/effects/shipheavyassaultmissileemandexpandkinandthmdmgac1.py @@ -4,8 +4,7 @@ # Ship: Sacrilege type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level damageTypes = ("em", "explosive", "kinetic", "thermal") for damageType in damageTypes: fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), - "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusAC") * level) + "{0}Damage".format(damageType), ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") diff --git a/eos/effects/shipheavyassaultmissilevelocitycbc2.py b/eos/effects/shipheavyassaultmissilevelocitycbc2.py index 6dc30f3838..9c93a602da 100644 --- a/eos/effects/shipheavyassaultmissilevelocitycbc2.py +++ b/eos/effects/shipheavyassaultmissilevelocitycbc2.py @@ -4,6 +4,5 @@ # Ship: Drake Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battlecruiser").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), - "maxVelocity", ship.getModifiedItemAttr("shipBonusCBC2") * level) + "maxVelocity", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser") diff --git a/eos/effects/shipheavymissileaoecloudsizecbc1.py b/eos/effects/shipheavymissileaoecloudsizecbc1.py index 61054cc0f8..b752147db8 100644 --- a/eos/effects/shipheavymissileaoecloudsizecbc1.py +++ b/eos/effects/shipheavymissileaoecloudsizecbc1.py @@ -4,6 +4,5 @@ # Ship: Drake Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battlecruiser").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), - "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCBC1") * level) + "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCBC1"), skill="Caldari Battlecruiser") diff --git a/eos/effects/shipheavymissileaoecloudsizecc2.py b/eos/effects/shipheavymissileaoecloudsizecc2.py index 1a144cc9e2..d9e4f36e5e 100644 --- a/eos/effects/shipheavymissileaoecloudsizecc2.py +++ b/eos/effects/shipheavymissileaoecloudsizecc2.py @@ -4,6 +4,5 @@ # Ship: Caracal Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), - "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCC2") * level) + "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser") diff --git a/eos/effects/shipheavymissilevelocitycbc2.py b/eos/effects/shipheavymissilevelocitycbc2.py index 313c8428aa..04e5963b61 100644 --- a/eos/effects/shipheavymissilevelocitycbc2.py +++ b/eos/effects/shipheavymissilevelocitycbc2.py @@ -4,6 +4,5 @@ # Ship: Drake Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battlecruiser").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), - "maxVelocity", ship.getModifiedItemAttr("shipBonusCBC2") * level) + "maxVelocity", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser") diff --git a/eos/effects/shiphrangebonuscc.py b/eos/effects/shiphrangebonuscc.py index 499fcdbe7a..bf9572d39f 100644 --- a/eos/effects/shiphrangebonuscc.py +++ b/eos/effects/shiphrangebonuscc.py @@ -4,6 +4,5 @@ # Ship: Eagle type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "maxRange", ship.getModifiedItemAttr("shipBonusCC") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser") diff --git a/eos/effects/shiphtdamagebonuscc.py b/eos/effects/shiphtdamagebonuscc.py index 4a7f21d37b..4c315d5583 100644 --- a/eos/effects/shiphtdamagebonuscc.py +++ b/eos/effects/shiphtdamagebonuscc.py @@ -4,6 +4,5 @@ # Ship: Moa type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusCC") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser") diff --git a/eos/effects/shiphtdmgbonusfixedgc.py b/eos/effects/shiphtdmgbonusfixedgc.py index 1058c33291..1268a1938e 100644 --- a/eos/effects/shiphtdmgbonusfixedgc.py +++ b/eos/effects/shiphtdmgbonusfixedgc.py @@ -10,6 +10,5 @@ # Ship: Vexor type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser") diff --git a/eos/effects/shiphtdmgbonusgb.py b/eos/effects/shiphtdmgbonusgb.py index 6f0e392fdc..3921d7ea2f 100644 --- a/eos/effects/shiphtdmgbonusgb.py +++ b/eos/effects/shiphtdmgbonusgb.py @@ -8,6 +8,5 @@ # Ship: Sin type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusGB") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusGB"), skill="Gallente Battleship") diff --git a/eos/effects/shiphttrackingbonusgb.py b/eos/effects/shiphttrackingbonusgb.py index 48be01487f..fdc2fd40dd 100644 --- a/eos/effects/shiphttrackingbonusgb.py +++ b/eos/effects/shiphttrackingbonusgb.py @@ -4,6 +4,5 @@ # Ship: Vindicator type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"), - "trackingSpeed", ship.getModifiedItemAttr("shipBonusGB") * level) + "trackingSpeed", ship.getModifiedItemAttr("shipBonusGB"), skill="Gallente Battleship") diff --git a/eos/effects/shiphttrackingbonusgb2.py b/eos/effects/shiphttrackingbonusgb2.py index 9369ff662e..183f69931e 100644 --- a/eos/effects/shiphttrackingbonusgb2.py +++ b/eos/effects/shiphttrackingbonusgb2.py @@ -4,6 +4,5 @@ # Ships named like: Megathron (3 of 3) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"), - "trackingSpeed", ship.getModifiedItemAttr("shipBonusGB2") * level) + "trackingSpeed", ship.getModifiedItemAttr("shipBonusGB2"), skill="Gallente Battleship") diff --git a/eos/effects/shiphturretfalloffbonusgc.py b/eos/effects/shiphturretfalloffbonusgc.py index 267c8f024e..836c1a921e 100644 --- a/eos/effects/shiphturretfalloffbonusgc.py +++ b/eos/effects/shiphturretfalloffbonusgc.py @@ -4,6 +4,5 @@ # Ship: Vigilant type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "falloff", ship.getModifiedItemAttr("shipBonusGC") * level) + "falloff", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser") diff --git a/eos/effects/shiphybriddamagebonuscbc2.py b/eos/effects/shiphybriddamagebonuscbc2.py index 050209649c..8bdc20cba6 100644 --- a/eos/effects/shiphybriddamagebonuscbc2.py +++ b/eos/effects/shiphybriddamagebonuscbc2.py @@ -4,6 +4,5 @@ # Ship: Naga type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battlecruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusCBC2") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser") diff --git a/eos/effects/shiphybriddamagebonuscf.py b/eos/effects/shiphybriddamagebonuscf.py index 5a2c7d0ee1..6c514a895d 100644 --- a/eos/effects/shiphybriddamagebonuscf.py +++ b/eos/effects/shiphybriddamagebonuscf.py @@ -4,6 +4,5 @@ # Ship: Raptor type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusCF") * level) \ No newline at end of file + "damageMultiplier", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate") \ No newline at end of file diff --git a/eos/effects/shiphybriddamagebonuscf2.py b/eos/effects/shiphybriddamagebonuscf2.py index 7d7d714803..89354e1972 100644 --- a/eos/effects/shiphybriddamagebonuscf2.py +++ b/eos/effects/shiphybriddamagebonuscf2.py @@ -4,6 +4,5 @@ # Ship: Merlin type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusCF2") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate") diff --git a/eos/effects/shiphybriddamagebonusgbc2.py b/eos/effects/shiphybriddamagebonusgbc2.py index 78c1030947..9745804a88 100644 --- a/eos/effects/shiphybriddamagebonusgbc2.py +++ b/eos/effects/shiphybriddamagebonusgbc2.py @@ -4,6 +4,5 @@ # Ship: Talos type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Battlecruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusGBC2") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusGBC2"), skill="Gallente Battlecruiser") diff --git a/eos/effects/shiphybriddmg1gbc1.py b/eos/effects/shiphybriddmg1gbc1.py index cc8a9638f5..71be2a3e86 100644 --- a/eos/effects/shiphybriddmg1gbc1.py +++ b/eos/effects/shiphybriddmg1gbc1.py @@ -4,6 +4,5 @@ # Variations of ship: Brutix (3 of 3) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Battlecruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusGBC1") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusGBC1"), skill="Gallente Battlecruiser") diff --git a/eos/effects/shiphybridfalloff1gd1.py b/eos/effects/shiphybridfalloff1gd1.py index e9527f2d21..c81bc6a0f7 100644 --- a/eos/effects/shiphybridfalloff1gd1.py +++ b/eos/effects/shiphybridfalloff1gd1.py @@ -4,6 +4,5 @@ # Ship: Catalyst type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Destroyer").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), - "falloff", ship.getModifiedItemAttr("shipBonusGD1") * level) + "falloff", ship.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer") diff --git a/eos/effects/shiphybridoptimal1cbc1.py b/eos/effects/shiphybridoptimal1cbc1.py index 637caf6f3f..54bec4ce6d 100644 --- a/eos/effects/shiphybridoptimal1cbc1.py +++ b/eos/effects/shiphybridoptimal1cbc1.py @@ -4,6 +4,5 @@ # Variations of ship: Ferox (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battlecruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "maxRange", ship.getModifiedItemAttr("shipBonusCBC1") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusCBC1"), skill="Caldari Battlecruiser") diff --git a/eos/effects/shiphybridoptimalgd1.py b/eos/effects/shiphybridoptimalgd1.py index bca92505f6..3ba0cb846f 100644 --- a/eos/effects/shiphybridoptimalgd1.py +++ b/eos/effects/shiphybridoptimalgd1.py @@ -4,6 +4,5 @@ # Ship: Eris type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Destroyer").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), - "maxRange", ship.getModifiedItemAttr("shipBonusGD1") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusGD1"), skill="Gallente Destroyer") diff --git a/eos/effects/shiphybridrange1cd1.py b/eos/effects/shiphybridrange1cd1.py index 9da623c193..fc6588175a 100644 --- a/eos/effects/shiphybridrange1cd1.py +++ b/eos/effects/shiphybridrange1cd1.py @@ -4,6 +4,5 @@ # Ship: Cormorant type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Destroyer").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), - "maxRange", ship.getModifiedItemAttr("shipBonusCD1") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer") diff --git a/eos/effects/shiphybridrangebonuscbc1.py b/eos/effects/shiphybridrangebonuscbc1.py index a6b3285e84..36bce02823 100644 --- a/eos/effects/shiphybridrangebonuscbc1.py +++ b/eos/effects/shiphybridrangebonuscbc1.py @@ -4,6 +4,5 @@ # Ship: Naga type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battlecruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"), - "maxRange", ship.getModifiedItemAttr("shipBonusCBC1") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusCBC1"), skill="Caldari Battlecruiser") diff --git a/eos/effects/shiphybridrangebonuscf2.py b/eos/effects/shiphybridrangebonuscf2.py index 5b3deb2cda..2823c2a650 100644 --- a/eos/effects/shiphybridrangebonuscf2.py +++ b/eos/effects/shiphybridrangebonuscf2.py @@ -5,6 +5,5 @@ # Ship: Raptor type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), - "maxRange", ship.getModifiedItemAttr("shipBonusCF2") * level) \ No newline at end of file + "maxRange", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate") \ No newline at end of file diff --git a/eos/effects/shiphybridtracking1gd2.py b/eos/effects/shiphybridtracking1gd2.py index 99172650ba..0bd5a3fac2 100644 --- a/eos/effects/shiphybridtracking1gd2.py +++ b/eos/effects/shiphybridtracking1gd2.py @@ -5,6 +5,5 @@ # Ship: Algos type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Destroyer").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), - "trackingSpeed", ship.getModifiedItemAttr("shipBonusGD2") * level) + "trackingSpeed", ship.getModifiedItemAttr("shipBonusGD2"), skill="Gallente Destroyer") diff --git a/eos/effects/shiphybridtrackingcd2.py b/eos/effects/shiphybridtrackingcd2.py index 33a20d2826..151686d6d4 100644 --- a/eos/effects/shiphybridtrackingcd2.py +++ b/eos/effects/shiphybridtrackingcd2.py @@ -4,6 +4,5 @@ # Ship: Cormorant type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Destroyer").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), - "trackingSpeed", ship.getModifiedItemAttr("shipBonusCD2") * level) + "trackingSpeed", ship.getModifiedItemAttr("shipBonusCD2"), skill="Caldari Destroyer") diff --git a/eos/effects/shiphybridtrackinggbc2.py b/eos/effects/shiphybridtrackinggbc2.py index 27ceb0ec51..3dd3299163 100644 --- a/eos/effects/shiphybridtrackinggbc2.py +++ b/eos/effects/shiphybridtrackinggbc2.py @@ -4,6 +4,5 @@ # Ship: Brutix Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Battlecruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "trackingSpeed", ship.getModifiedItemAttr("shipBonusGBC2") * level) + "trackingSpeed", ship.getModifiedItemAttr("shipBonusGBC2"), skill="Gallente Battlecruiser") diff --git a/eos/effects/shiphybridtrackinggc.py b/eos/effects/shiphybridtrackinggc.py index 02215246a6..53dddd898b 100644 --- a/eos/effects/shiphybridtrackinggc.py +++ b/eos/effects/shiphybridtrackinggc.py @@ -5,6 +5,5 @@ # Ship: Phobos type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "trackingSpeed", ship.getModifiedItemAttr("shipBonusGC") * level) + "trackingSpeed", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser") diff --git a/eos/effects/shiphybridtrackinggc2.py b/eos/effects/shiphybridtrackinggc2.py index 6832d023a3..b90f1fa229 100644 --- a/eos/effects/shiphybridtrackinggc2.py +++ b/eos/effects/shiphybridtrackinggc2.py @@ -4,6 +4,5 @@ # Ship: Thorax type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "trackingSpeed", ship.getModifiedItemAttr("shipBonusGC2") * level) + "trackingSpeed", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") diff --git a/eos/effects/shiphybridturretrofbonusgc2.py b/eos/effects/shiphybridturretrofbonusgc2.py index c23549bd4d..f056662557 100644 --- a/eos/effects/shiphybridturretrofbonusgc2.py +++ b/eos/effects/shiphybridturretrofbonusgc2.py @@ -5,6 +5,5 @@ # Ship: Phobos type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "speed", ship.getModifiedItemAttr("shipBonusGC2") * level) + "speed", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") diff --git a/eos/effects/shiplargehybridtrackingbonusgbc1.py b/eos/effects/shiplargehybridtrackingbonusgbc1.py index a513810bdf..0a6349db2d 100644 --- a/eos/effects/shiplargehybridtrackingbonusgbc1.py +++ b/eos/effects/shiplargehybridtrackingbonusgbc1.py @@ -4,6 +4,5 @@ # Ship: Talos type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Battlecruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"), - "trackingSpeed", ship.getModifiedItemAttr("shipBonusGBC1") * level) + "trackingSpeed", ship.getModifiedItemAttr("shipBonusGBC1"), skill="Gallente Battlecruiser") diff --git a/eos/effects/shiplargehybridturretrofgb.py b/eos/effects/shiplargehybridturretrofgb.py index dbc8a25b78..cbd73aca33 100644 --- a/eos/effects/shiplargehybridturretrofgb.py +++ b/eos/effects/shiplargehybridturretrofgb.py @@ -5,6 +5,5 @@ # Ship: Megathron Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"), - "speed", ship.getModifiedItemAttr("shipBonusGB") * level) + "speed", ship.getModifiedItemAttr("shipBonusGB"), skill="Gallente Battleship") diff --git a/eos/effects/shiplargelasercapabc1.py b/eos/effects/shiplargelasercapabc1.py index a5c09064d6..5f25cc664e 100644 --- a/eos/effects/shiplargelasercapabc1.py +++ b/eos/effects/shiplargelasercapabc1.py @@ -4,6 +4,5 @@ # Ship: Oracle type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battlecruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"), - "capacitorNeed", ship.getModifiedItemAttr("shipBonusABC1") * level) + "capacitorNeed", ship.getModifiedItemAttr("shipBonusABC1"), skill="Amarr Battlecruiser") diff --git a/eos/effects/shiplargelaserdamagebonusabc2.py b/eos/effects/shiplargelaserdamagebonusabc2.py index e43e55a248..97f8a00ab4 100644 --- a/eos/effects/shiplargelaserdamagebonusabc2.py +++ b/eos/effects/shiplargelaserdamagebonusabc2.py @@ -4,6 +4,5 @@ # Ship: Oracle type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battlecruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusABC2") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusABC2"), skill="Amarr Battlecruiser") diff --git a/eos/effects/shiplasercap1abc2.py b/eos/effects/shiplasercap1abc2.py index eab6fde05b..4041e972df 100644 --- a/eos/effects/shiplasercap1abc2.py +++ b/eos/effects/shiplasercap1abc2.py @@ -4,6 +4,5 @@ # Ship: Absolution type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battlecruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"), - "capacitorNeed", ship.getModifiedItemAttr("shipBonusABC2") * level) + "capacitorNeed", ship.getModifiedItemAttr("shipBonusABC2"), skill="Amarr Battlecruiser") diff --git a/eos/effects/shiplasercapabc1.py b/eos/effects/shiplasercapabc1.py index 3ab321dabd..a6bbcc1750 100644 --- a/eos/effects/shiplasercapabc1.py +++ b/eos/effects/shiplasercapabc1.py @@ -4,6 +4,5 @@ # Ship: Harbinger type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battlecruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"), - "capacitorNeed", ship.getModifiedItemAttr("shipBonusABC1") * level) + "capacitorNeed", ship.getModifiedItemAttr("shipBonusABC1"), skill="Amarr Battlecruiser") diff --git a/eos/effects/shiplasercapneed2ad1.py b/eos/effects/shiplasercapneed2ad1.py index bfbcb83ffa..749a631d79 100644 --- a/eos/effects/shiplasercapneed2ad1.py +++ b/eos/effects/shiplasercapneed2ad1.py @@ -4,6 +4,5 @@ # Ship: Coercer type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Destroyer").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), - "capacitorNeed", ship.getModifiedItemAttr("shipBonusAD1") * level) + "capacitorNeed", ship.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer") diff --git a/eos/effects/shiplaserdamagebonusabc2.py b/eos/effects/shiplaserdamagebonusabc2.py index c7f96cf8e4..5fadbd6049 100644 --- a/eos/effects/shiplaserdamagebonusabc2.py +++ b/eos/effects/shiplaserdamagebonusabc2.py @@ -4,6 +4,5 @@ # Ships named like: Harbinger (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battlecruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusABC2") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusABC2"), skill="Amarr Battlecruiser") diff --git a/eos/effects/shiplaserrofac2.py b/eos/effects/shiplaserrofac2.py index f0e115d4bb..c5b18f0107 100644 --- a/eos/effects/shiplaserrofac2.py +++ b/eos/effects/shiplaserrofac2.py @@ -5,6 +5,5 @@ # Ship: Zealot type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"), - "speed", ship.getModifiedItemAttr("shipBonusAC2") * level) + "speed", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser") diff --git a/eos/effects/shiplasertracking2ad2.py b/eos/effects/shiplasertracking2ad2.py index 079517875d..6d751cfdaf 100644 --- a/eos/effects/shiplasertracking2ad2.py +++ b/eos/effects/shiplasertracking2ad2.py @@ -4,6 +4,5 @@ # Ship: Coercer type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Destroyer").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), - "trackingSpeed", ship.getModifiedItemAttr("shipBonusAD2") * level) + "trackingSpeed", ship.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer") diff --git a/eos/effects/shipmetcdamagebonusac.py b/eos/effects/shipmetcdamagebonusac.py index 9ef3dacd17..7e0a512526 100644 --- a/eos/effects/shipmetcdamagebonusac.py +++ b/eos/effects/shipmetcdamagebonusac.py @@ -6,6 +6,5 @@ # Ship: Omen Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusAC") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") diff --git a/eos/effects/shipmetdamagebonusac2.py b/eos/effects/shipmetdamagebonusac2.py index 8d01df52da..9e356bfb0e 100644 --- a/eos/effects/shipmetdamagebonusac2.py +++ b/eos/effects/shipmetdamagebonusac2.py @@ -4,6 +4,5 @@ # Ship: Devoter type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusAC2") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser") diff --git a/eos/effects/shipminingbonusorefrig1.py b/eos/effects/shipminingbonusorefrig1.py index 04410024b4..be5c5c9a4a 100644 --- a/eos/effects/shipminingbonusorefrig1.py +++ b/eos/effects/shipminingbonusorefrig1.py @@ -4,6 +4,5 @@ # Variations of ship: Venture (2 of 2) type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Mining Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"), - "miningAmount", module.getModifiedItemAttr("shipBonusOREfrig1") * level) + "miningAmount", module.getModifiedItemAttr("shipBonusOREfrig1"), skill="Mining Frigate") diff --git a/eos/effects/shipmissileassaultmissilevelocitybonuscc2.py b/eos/effects/shipmissileassaultmissilevelocitybonuscc2.py index 9130d300e2..f384e3b833 100644 --- a/eos/effects/shipmissileassaultmissilevelocitybonuscc2.py +++ b/eos/effects/shipmissileassaultmissilevelocitybonuscc2.py @@ -5,6 +5,5 @@ # Ship: Osprey Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), - "maxVelocity", ship.getModifiedItemAttr("shipBonusCC2") * level) + "maxVelocity", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser") diff --git a/eos/effects/shipmissileemdamagecb.py b/eos/effects/shipmissileemdamagecb.py index 8321522e50..43869cffae 100644 --- a/eos/effects/shipmissileemdamagecb.py +++ b/eos/effects/shipmissileemdamagecb.py @@ -4,6 +4,5 @@ # Ship: Barghest type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "emDamage", ship.getModifiedItemAttr("shipBonusCB") * level) + "emDamage", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship") diff --git a/eos/effects/shipmissileemdamagecc.py b/eos/effects/shipmissileemdamagecc.py index 2c99447421..484ed5b38a 100644 --- a/eos/effects/shipmissileemdamagecc.py +++ b/eos/effects/shipmissileemdamagecc.py @@ -5,6 +5,5 @@ # Ship: Osprey Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "emDamage", ship.getModifiedItemAttr("shipBonusCC") * level) + "emDamage", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser") diff --git a/eos/effects/shipmissileemdamagecf2.py b/eos/effects/shipmissileemdamagecf2.py index ce22b70d66..ec0ae1f7ec 100644 --- a/eos/effects/shipmissileemdamagecf2.py +++ b/eos/effects/shipmissileemdamagecf2.py @@ -5,6 +5,5 @@ # Ship: Garmur type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "emDamage", ship.getModifiedItemAttr("shipBonusCF2") * level) + "emDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate") diff --git a/eos/effects/shipmissileexpdamagecc.py b/eos/effects/shipmissileexpdamagecc.py index c2d8059d93..1e0a584c65 100644 --- a/eos/effects/shipmissileexpdamagecc.py +++ b/eos/effects/shipmissileexpdamagecc.py @@ -5,6 +5,5 @@ # Ship: Osprey Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "explosiveDamage", ship.getModifiedItemAttr("shipBonusCC") * level) + "explosiveDamage", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser") diff --git a/eos/effects/shipmissileexplodamagecb.py b/eos/effects/shipmissileexplodamagecb.py index b7d44311df..73deda312b 100644 --- a/eos/effects/shipmissileexplodamagecb.py +++ b/eos/effects/shipmissileexplodamagecb.py @@ -4,6 +4,5 @@ # Ship: Barghest type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "explosiveDamage", ship.getModifiedItemAttr("shipBonusCB") * level) + "explosiveDamage", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship") diff --git a/eos/effects/shipmissileexplosivedamagecf2.py b/eos/effects/shipmissileexplosivedamagecf2.py index 52023a3255..df6dad4568 100644 --- a/eos/effects/shipmissileexplosivedamagecf2.py +++ b/eos/effects/shipmissileexplosivedamagecf2.py @@ -5,6 +5,5 @@ # Ship: Garmur type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "explosiveDamage", ship.getModifiedItemAttr("shipBonusCF2") * level) + "explosiveDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate") diff --git a/eos/effects/shipmissileheavyassaultvelocityabc2.py b/eos/effects/shipmissileheavyassaultvelocityabc2.py index 96ecc0e8b1..39eb421b10 100644 --- a/eos/effects/shipmissileheavyassaultvelocityabc2.py +++ b/eos/effects/shipmissileheavyassaultvelocityabc2.py @@ -4,6 +4,5 @@ # Ship: Damnation type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battlecruiser").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), - "maxVelocity", ship.getModifiedItemAttr("shipBonusABC2") * level) + "maxVelocity", ship.getModifiedItemAttr("shipBonusABC2"), skill="Amarr Battlecruiser") diff --git a/eos/effects/shipmissileheavyvelocityabc2.py b/eos/effects/shipmissileheavyvelocityabc2.py index a6fe4eca5b..2a6d1cd08b 100644 --- a/eos/effects/shipmissileheavyvelocityabc2.py +++ b/eos/effects/shipmissileheavyvelocityabc2.py @@ -4,6 +4,5 @@ # Ship: Damnation type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battlecruiser").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), - "maxVelocity", ship.getModifiedItemAttr("shipBonusABC2") * level) + "maxVelocity", ship.getModifiedItemAttr("shipBonusABC2"), skill="Amarr Battlecruiser") diff --git a/eos/effects/shipmissileheavyvelocitybonuscc2.py b/eos/effects/shipmissileheavyvelocitybonuscc2.py index 7e66469509..23a0d49c2f 100644 --- a/eos/effects/shipmissileheavyvelocitybonuscc2.py +++ b/eos/effects/shipmissileheavyvelocitybonuscc2.py @@ -5,6 +5,5 @@ # Ship: Osprey Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), - "maxVelocity", ship.getModifiedItemAttr("shipBonusCC2") * level) + "maxVelocity", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser") diff --git a/eos/effects/shipmissilekindamagecb.py b/eos/effects/shipmissilekindamagecb.py index 84a8cd62c2..49b58f3074 100644 --- a/eos/effects/shipmissilekindamagecb.py +++ b/eos/effects/shipmissilekindamagecb.py @@ -4,6 +4,5 @@ # Ship: Barghest type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "kineticDamage", ship.getModifiedItemAttr("shipBonusCB") * level) + "kineticDamage", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship") diff --git a/eos/effects/shipmissilekindamagecc2.py b/eos/effects/shipmissilekindamagecc2.py index 97ff60cc1e..54b623dd7a 100644 --- a/eos/effects/shipmissilekindamagecc2.py +++ b/eos/effects/shipmissilekindamagecc2.py @@ -5,6 +5,5 @@ # Ship: Rook type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "kineticDamage", ship.getModifiedItemAttr("shipBonusCC2") * level) + "kineticDamage", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser") diff --git a/eos/effects/shipmissilekineticdamagecc.py b/eos/effects/shipmissilekineticdamagecc.py index 4c9a0a8378..c0b145770f 100644 --- a/eos/effects/shipmissilekineticdamagecc.py +++ b/eos/effects/shipmissilekineticdamagecc.py @@ -6,6 +6,5 @@ # Ship: Orthrus type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "kineticDamage", ship.getModifiedItemAttr("shipBonusCC") * level) + "kineticDamage", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser") diff --git a/eos/effects/shipmissilekineticdamagecf.py b/eos/effects/shipmissilekineticdamagecf.py index 0db4681f07..89b625b1ed 100644 --- a/eos/effects/shipmissilekineticdamagecf.py +++ b/eos/effects/shipmissilekineticdamagecf.py @@ -7,6 +7,5 @@ # Ship: Hawk type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "kineticDamage", ship.getModifiedItemAttr("shipBonusCF") * level) + "kineticDamage", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate") diff --git a/eos/effects/shipmissilekineticdamagecf2.py b/eos/effects/shipmissilekineticdamagecf2.py index 48fae4f421..c5a2c0f0a9 100644 --- a/eos/effects/shipmissilekineticdamagecf2.py +++ b/eos/effects/shipmissilekineticdamagecf2.py @@ -4,6 +4,5 @@ # Ship: Garmur type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "kineticDamage", ship.getModifiedItemAttr("shipBonusCF2") * level) + "kineticDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate") diff --git a/eos/effects/shipmissilelauncherrofad1fixed.py b/eos/effects/shipmissilelauncherrofad1fixed.py index fa26f38ebd..7c28cce645 100644 --- a/eos/effects/shipmissilelauncherrofad1fixed.py +++ b/eos/effects/shipmissilelauncherrofad1fixed.py @@ -4,6 +4,5 @@ # 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) \ No newline at end of file + "speed", ship.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer") \ No newline at end of file diff --git a/eos/effects/shipmissilelauncherrofcc2.py b/eos/effects/shipmissilelauncherrofcc2.py index 8cab36a7ed..a73513db60 100644 --- a/eos/effects/shipmissilelauncherrofcc2.py +++ b/eos/effects/shipmissilelauncherrofcc2.py @@ -4,6 +4,5 @@ # Ship: Onyx type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), - "speed", ship.getModifiedItemAttr("shipBonusCC2") * level) + "speed", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser") diff --git a/eos/effects/shipmissilelauncherspeedbonusmc2.py b/eos/effects/shipmissilelauncherspeedbonusmc2.py index f756fe9c79..93c9bb262d 100644 --- a/eos/effects/shipmissilelauncherspeedbonusmc2.py +++ b/eos/effects/shipmissilelauncherspeedbonusmc2.py @@ -4,7 +4,6 @@ # Ship: Bellicose type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Cruiser").level groups = ("Missile Launcher Rapid Light", "Missile Launcher Heavy", "Missile Launcher Heavy Assault") fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, - "speed", ship.getModifiedItemAttr("shipBonusMC2") * level) + "speed", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser") diff --git a/eos/effects/shipmissilelightvelocitybonuscc2.py b/eos/effects/shipmissilelightvelocitybonuscc2.py index 9dbf6392fc..5c746a81d5 100644 --- a/eos/effects/shipmissilelightvelocitybonuscc2.py +++ b/eos/effects/shipmissilelightvelocitybonuscc2.py @@ -5,6 +5,5 @@ # Ship: Osprey Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"), - "maxVelocity", ship.getModifiedItemAttr("shipBonusCC2") * level) + "maxVelocity", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser") diff --git a/eos/effects/shipmissilelightvelocitybonuscf2.py b/eos/effects/shipmissilelightvelocitybonuscf2.py index ae89b56427..a94e057c40 100644 --- a/eos/effects/shipmissilelightvelocitybonuscf2.py +++ b/eos/effects/shipmissilelightvelocitybonuscf2.py @@ -4,6 +4,5 @@ # Ship: Caldari Navy Hookbill type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"), - "maxVelocity", ship.getModifiedItemAttr("shipBonusCF2") * level) + "maxVelocity", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate") diff --git a/eos/effects/shipmissilereloadtimecaldaritacticaldestroyer2.py b/eos/effects/shipmissilereloadtimecaldaritacticaldestroyer2.py index 25ad3540e9..f135240bf2 100644 --- a/eos/effects/shipmissilereloadtimecaldaritacticaldestroyer2.py +++ b/eos/effects/shipmissilereloadtimecaldaritacticaldestroyer2.py @@ -4,6 +4,5 @@ # Ship: Jackdaw type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Tactical Destroyer").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), - "reloadTime", ship.getModifiedItemAttr("shipBonusTacticalDestroyerCaldari2") * level) + "reloadTime", ship.getModifiedItemAttr("shipBonusTacticalDestroyerCaldari2"), skill="Caldari Tactical Destroyer") diff --git a/eos/effects/shipmissilerocketvelocitybonuscf2.py b/eos/effects/shipmissilerocketvelocitybonuscf2.py index b55513b0ac..a51d7c5ebf 100644 --- a/eos/effects/shipmissilerocketvelocitybonuscf2.py +++ b/eos/effects/shipmissilerocketvelocitybonuscf2.py @@ -4,6 +4,5 @@ # Ship: Caldari Navy Hookbill type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), - "maxVelocity", ship.getModifiedItemAttr("shipBonusCF2") * level) + "maxVelocity", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate") diff --git a/eos/effects/shipmissilerofcaldaritacticaldestroyer1.py b/eos/effects/shipmissilerofcaldaritacticaldestroyer1.py index 1dd5923393..9bb6ba9795 100644 --- a/eos/effects/shipmissilerofcaldaritacticaldestroyer1.py +++ b/eos/effects/shipmissilerofcaldaritacticaldestroyer1.py @@ -4,8 +4,7 @@ # Ship: Jackdaw type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Tactical Destroyer").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), - "speed", ship.getModifiedItemAttr("shipBonusTacticalDestroyerCaldari1") * level) + "speed", ship.getModifiedItemAttr("shipBonusTacticalDestroyerCaldari1"), skill="Caldari Tactical Destroyer") diff --git a/eos/effects/shipmissilerofcc.py b/eos/effects/shipmissilerofcc.py index 0a4f50bca1..933fe04ac9 100644 --- a/eos/effects/shipmissilerofcc.py +++ b/eos/effects/shipmissilerofcc.py @@ -4,7 +4,6 @@ # Ships named like: Caracal (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level groups = ("Missile Launcher Heavy", "Missile Launcher Rapid Light", "Missile Launcher Heavy Assault") fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, - "speed", ship.getModifiedItemAttr("shipBonusCC") * level) + "speed", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser") diff --git a/eos/effects/shipmissilerofmf2.py b/eos/effects/shipmissilerofmf2.py index 89e8210162..04ac24d596 100644 --- a/eos/effects/shipmissilerofmf2.py +++ b/eos/effects/shipmissilerofmf2.py @@ -4,8 +4,7 @@ # Ship: Breacher type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), - "speed", ship.getModifiedItemAttr("shipBonusMF2") * level) + "speed", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate") diff --git a/eos/effects/shipmissilespeedbonusaf.py b/eos/effects/shipmissilespeedbonusaf.py index 301c9c12d4..39dfb807fc 100644 --- a/eos/effects/shipmissilespeedbonusaf.py +++ b/eos/effects/shipmissilespeedbonusaf.py @@ -4,6 +4,5 @@ # Ship: Vengeance type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), - "speed", ship.getModifiedItemAttr("shipBonus2AF") * level) + "speed", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") diff --git a/eos/effects/shipmissilespeedbonuscf.py b/eos/effects/shipmissilespeedbonuscf.py index 8e8b8956d0..5351d8045c 100644 --- a/eos/effects/shipmissilespeedbonuscf.py +++ b/eos/effects/shipmissilespeedbonuscf.py @@ -5,6 +5,5 @@ # Ship: Hawk type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), - "speed", ship.getModifiedItemAttr("shipBonusCF2") * level) + "speed", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate") diff --git a/eos/effects/shipmissilethermaldamagecf2.py b/eos/effects/shipmissilethermaldamagecf2.py index c3d61aada0..60480c2e80 100644 --- a/eos/effects/shipmissilethermaldamagecf2.py +++ b/eos/effects/shipmissilethermaldamagecf2.py @@ -5,6 +5,5 @@ # Ship: Garmur type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "thermalDamage", ship.getModifiedItemAttr("shipBonusCF2") * level) + "thermalDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate") diff --git a/eos/effects/shipmissilethermdamagecb.py b/eos/effects/shipmissilethermdamagecb.py index 9fcb298542..6a6dde8b8f 100644 --- a/eos/effects/shipmissilethermdamagecb.py +++ b/eos/effects/shipmissilethermdamagecb.py @@ -4,6 +4,5 @@ # Ship: Barghest type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "thermalDamage", ship.getModifiedItemAttr("shipBonusCB") * level) + "thermalDamage", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship") diff --git a/eos/effects/shipmissilethermdamagecc.py b/eos/effects/shipmissilethermdamagecc.py index 15d646de41..6bef70ccf5 100644 --- a/eos/effects/shipmissilethermdamagecc.py +++ b/eos/effects/shipmissilethermdamagecc.py @@ -5,6 +5,5 @@ # Ship: Osprey Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "thermalDamage", ship.getModifiedItemAttr("shipBonusCC") * level) + "thermalDamage", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser") diff --git a/eos/effects/shipmissilevelocitycd1.py b/eos/effects/shipmissilevelocitycd1.py index 6575942241..5456686066 100644 --- a/eos/effects/shipmissilevelocitycd1.py +++ b/eos/effects/shipmissilevelocitycd1.py @@ -4,6 +4,5 @@ # Ship: Flycatcher type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Destroyer").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "maxVelocity", ship.getModifiedItemAttr("shipBonusCD1") * level) + "maxVelocity", ship.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer") diff --git a/eos/effects/shipmissilevelocitycf.py b/eos/effects/shipmissilevelocitycf.py index cd726cc188..33ec0887f6 100644 --- a/eos/effects/shipmissilevelocitycf.py +++ b/eos/effects/shipmissilevelocitycf.py @@ -5,6 +5,5 @@ # Ship: Kestrel type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "maxVelocity", ship.getModifiedItemAttr("shipBonusCF") * level) + "maxVelocity", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate") diff --git a/eos/effects/shippdmgbonusmf.py b/eos/effects/shippdmgbonusmf.py index a77ffba3cf..b9f2218714 100644 --- a/eos/effects/shippdmgbonusmf.py +++ b/eos/effects/shippdmgbonusmf.py @@ -8,6 +8,5 @@ # Ship: Republic Fleet Firetail type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusMF") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate") diff --git a/eos/effects/shipprojectiledamagemd1.py b/eos/effects/shipprojectiledamagemd1.py index e28d5424d5..3aca825cda 100644 --- a/eos/effects/shipprojectiledamagemd1.py +++ b/eos/effects/shipprojectiledamagemd1.py @@ -4,6 +4,5 @@ # Variations of ship: Thrasher (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Destroyer").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusMD1") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer") diff --git a/eos/effects/shipprojectiledmgmc.py b/eos/effects/shipprojectiledmgmc.py index bb33f7f640..843de102e0 100644 --- a/eos/effects/shipprojectiledmgmc.py +++ b/eos/effects/shipprojectiledmgmc.py @@ -4,6 +4,5 @@ # Ship: Mimir type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusMC") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser") diff --git a/eos/effects/shipprojectiledmgmc2.py b/eos/effects/shipprojectiledmgmc2.py index 5a540a6799..d12ee574bf 100644 --- a/eos/effects/shipprojectiledmgmc2.py +++ b/eos/effects/shipprojectiledmgmc2.py @@ -6,6 +6,5 @@ # Ship: Moracha type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusMC2") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser") diff --git a/eos/effects/shipprojectilefalloffbonusmbc2.py b/eos/effects/shipprojectilefalloffbonusmbc2.py index 3a7c04d3c0..ba1715a21a 100644 --- a/eos/effects/shipprojectilefalloffbonusmbc2.py +++ b/eos/effects/shipprojectilefalloffbonusmbc2.py @@ -4,6 +4,5 @@ # Ship: Tornado type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battlecruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"), - "falloff", ship.getModifiedItemAttr("shipBonusMBC2") * level) + "falloff", ship.getModifiedItemAttr("shipBonusMBC2"), skill="Minmatar Battlecruiser") diff --git a/eos/effects/shipprojectileoptimalbonusemf2.py b/eos/effects/shipprojectileoptimalbonusemf2.py index 966f799050..fe1aa2fbfa 100644 --- a/eos/effects/shipprojectileoptimalbonusemf2.py +++ b/eos/effects/shipprojectileoptimalbonusemf2.py @@ -4,6 +4,5 @@ # Ship: Cheetah type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), - "maxRange", ship.getModifiedItemAttr("shipBonusMF2") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate") diff --git a/eos/effects/shipprojectilerof1mbc2.py b/eos/effects/shipprojectilerof1mbc2.py index b2aa9fe142..77a329adb8 100644 --- a/eos/effects/shipprojectilerof1mbc2.py +++ b/eos/effects/shipprojectilerof1mbc2.py @@ -4,6 +4,5 @@ # Ships named like: Hurricane (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battlecruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), - "speed", ship.getModifiedItemAttr("shipBonusMBC2") * level) + "speed", ship.getModifiedItemAttr("shipBonusMBC2"), skill="Minmatar Battlecruiser") diff --git a/eos/effects/shipprojectilerofbonusmbc1.py b/eos/effects/shipprojectilerofbonusmbc1.py index c3bb2e75fc..bdac0bc586 100644 --- a/eos/effects/shipprojectilerofbonusmbc1.py +++ b/eos/effects/shipprojectilerofbonusmbc1.py @@ -4,6 +4,5 @@ # Ship: Tornado type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battlecruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"), - "speed", ship.getModifiedItemAttr("shipBonusMBC1") * level) + "speed", ship.getModifiedItemAttr("shipBonusMBC1"), skill="Minmatar Battlecruiser") diff --git a/eos/effects/shipprojectiletracking1md2.py b/eos/effects/shipprojectiletracking1md2.py index a550bedb88..8ccf42bd8e 100644 --- a/eos/effects/shipprojectiletracking1md2.py +++ b/eos/effects/shipprojectiletracking1md2.py @@ -4,6 +4,5 @@ # Variations of ship: Thrasher (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Destroyer").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), - "trackingSpeed", ship.getModifiedItemAttr("shipBonusMD2") * level) + "trackingSpeed", ship.getModifiedItemAttr("shipBonusMD2"), skill="Minmatar Destroyer") diff --git a/eos/effects/shipprojectiletrackinggf.py b/eos/effects/shipprojectiletrackinggf.py index a14b87068f..0085c314a3 100644 --- a/eos/effects/shipprojectiletrackinggf.py +++ b/eos/effects/shipprojectiletrackinggf.py @@ -5,6 +5,5 @@ # Ship: Dramiel type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), - "trackingSpeed", ship.getModifiedItemAttr("shipBonusGF") * level) + "trackingSpeed", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate") diff --git a/eos/effects/shipprojectiletrackingmf2.py b/eos/effects/shipprojectiletrackingmf2.py index 170ffd24f5..03dc39d2e0 100644 --- a/eos/effects/shipprojectiletrackingmf2.py +++ b/eos/effects/shipprojectiletrackingmf2.py @@ -7,6 +7,5 @@ # Ship: Wolf type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), - "trackingSpeed", ship.getModifiedItemAttr("shipBonusMF2") * level) + "trackingSpeed", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate") diff --git a/eos/effects/shipptdmgbonusmb.py b/eos/effects/shipptdmgbonusmb.py index 19d3c5744d..bfd3d4028e 100644 --- a/eos/effects/shipptdmgbonusmb.py +++ b/eos/effects/shipptdmgbonusmb.py @@ -6,6 +6,5 @@ # Ship: Panther type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusMB") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship") diff --git a/eos/effects/shipptspeedbonusmb2.py b/eos/effects/shipptspeedbonusmb2.py index 1e17e1b241..c403ee4525 100644 --- a/eos/effects/shipptspeedbonusmb2.py +++ b/eos/effects/shipptspeedbonusmb2.py @@ -7,6 +7,5 @@ # Ship: Typhoon Fleet Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"), - "speed", ship.getModifiedItemAttr("shipBonusMB2") * level) + "speed", ship.getModifiedItemAttr("shipBonusMB2"), skill="Minmatar Battleship") diff --git a/eos/effects/shippturretfalloffbonusgb.py b/eos/effects/shippturretfalloffbonusgb.py index 4286e1bd6a..2ee55dd4d0 100644 --- a/eos/effects/shippturretfalloffbonusgb.py +++ b/eos/effects/shippturretfalloffbonusgb.py @@ -4,6 +4,5 @@ # Ship: Machariel 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"), skill="Gallente Battleship") diff --git a/eos/effects/shippturretfalloffbonusgc.py b/eos/effects/shippturretfalloffbonusgc.py index 71f9d9817a..315df7bf34 100644 --- a/eos/effects/shippturretfalloffbonusgc.py +++ b/eos/effects/shippturretfalloffbonusgc.py @@ -5,6 +5,5 @@ # Ship: Moracha type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), - "falloff", ship.getModifiedItemAttr("shipBonusGC") * level) + "falloff", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser") diff --git a/eos/effects/shippturretfalloffbonusmc2.py b/eos/effects/shippturretfalloffbonusmc2.py index 41f753c92d..390742d77a 100644 --- a/eos/effects/shippturretfalloffbonusmc2.py +++ b/eos/effects/shippturretfalloffbonusmc2.py @@ -4,6 +4,5 @@ # Ship: Stabber type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), - "falloff", ship.getModifiedItemAttr("shipBonusMC2") * level) + "falloff", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser") diff --git a/eos/effects/shippturretspeedbonusmc.py b/eos/effects/shippturretspeedbonusmc.py index 51e9e50419..608073c626 100644 --- a/eos/effects/shippturretspeedbonusmc.py +++ b/eos/effects/shippturretspeedbonusmc.py @@ -7,6 +7,5 @@ # Ship: Scythe Fleet Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), - "speed", ship.getModifiedItemAttr("shipBonusMC") * level) + "speed", ship.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser") diff --git a/eos/effects/shipremotearmorrange1.py b/eos/effects/shipremotearmorrange1.py index a9aa3dffdb..6db4e683e9 100644 --- a/eos/effects/shipremotearmorrange1.py +++ b/eos/effects/shipremotearmorrange1.py @@ -4,6 +4,5 @@ # Ship: Oneiros type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", - "maxRange", ship.getModifiedItemAttr("shipBonusGC") * level) \ No newline at end of file + "maxRange", ship.getModifiedItemAttr("shipBonusGC"), skill="Gallente Cruiser") \ No newline at end of file diff --git a/eos/effects/shipremotearmorrange2.py b/eos/effects/shipremotearmorrange2.py index 27a51951fa..457cd51346 100644 --- a/eos/effects/shipremotearmorrange2.py +++ b/eos/effects/shipremotearmorrange2.py @@ -4,6 +4,5 @@ # Ship: Guardian type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", - "maxRange", ship.getModifiedItemAttr("shipBonusAC2") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusAC2"), skill="Amarr Cruiser") diff --git a/eos/effects/shipremotesensordampenercapneedgf.py b/eos/effects/shipremotesensordampenercapneedgf.py index a0b2ac333a..ee23bcadb7 100644 --- a/eos/effects/shipremotesensordampenercapneedgf.py +++ b/eos/effects/shipremotesensordampenercapneedgf.py @@ -4,6 +4,5 @@ # Variations of ship: Maulus (2 of 2) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Sensor Damper", - "capacitorNeed", ship.getModifiedItemAttr("shipBonusGF") * level) + "capacitorNeed", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate") diff --git a/eos/effects/shiprocketemdmgaf.py b/eos/effects/shiprocketemdmgaf.py index 585ed10747..4e2cf3ff7d 100644 --- a/eos/effects/shiprocketemdmgaf.py +++ b/eos/effects/shiprocketemdmgaf.py @@ -5,6 +5,5 @@ # Ship: Vengeance type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), - "emDamage", ship.getModifiedItemAttr("shipBonusAF") * level) + "emDamage", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate") diff --git a/eos/effects/shiprocketexplosivedmgaf.py b/eos/effects/shiprocketexplosivedmgaf.py index 30f96ac552..94c1b5bae7 100644 --- a/eos/effects/shiprocketexplosivedmgaf.py +++ b/eos/effects/shiprocketexplosivedmgaf.py @@ -5,6 +5,5 @@ # Ship: Vengeance type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), - "explosiveDamage", ship.getModifiedItemAttr("shipBonusAF") * level) + "explosiveDamage", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate") diff --git a/eos/effects/shiprocketexplosivedmgmd1.py b/eos/effects/shiprocketexplosivedmgmd1.py index 064b01bc3e..d2ee8f4190 100644 --- a/eos/effects/shiprocketexplosivedmgmd1.py +++ b/eos/effects/shiprocketexplosivedmgmd1.py @@ -4,6 +4,5 @@ # Ship: Talwar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Destroyer").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), - "explosiveDamage", ship.getModifiedItemAttr("shipBonusMD1") * level) + "explosiveDamage", ship.getModifiedItemAttr("shipBonusMD1"), skill="Minmatar Destroyer") diff --git a/eos/effects/shiprocketkineticdmgaf.py b/eos/effects/shiprocketkineticdmgaf.py index c1607ed1a3..5198af656f 100644 --- a/eos/effects/shiprocketkineticdmgaf.py +++ b/eos/effects/shiprocketkineticdmgaf.py @@ -5,6 +5,5 @@ # Ship: Vengeance type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), - "kineticDamage", ship.getModifiedItemAttr("shipBonusAF") * level) + "kineticDamage", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate") diff --git a/eos/effects/shiprocketkineticdmgcd1.py b/eos/effects/shiprocketkineticdmgcd1.py index 60a46ece92..9e34cee8fa 100644 --- a/eos/effects/shiprocketkineticdmgcd1.py +++ b/eos/effects/shiprocketkineticdmgcd1.py @@ -4,6 +4,5 @@ # Ship: Corax type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Destroyer").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), - "kineticDamage", ship.getModifiedItemAttr("shipBonusCD1") * level) + "kineticDamage", ship.getModifiedItemAttr("shipBonusCD1"), skill="Caldari Destroyer") diff --git a/eos/effects/shiprocketrofbonusaf2.py b/eos/effects/shiprocketrofbonusaf2.py index a8e7ff7601..3f4ebc575c 100644 --- a/eos/effects/shiprocketrofbonusaf2.py +++ b/eos/effects/shiprocketrofbonusaf2.py @@ -4,6 +4,5 @@ # Ship: Malediction type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rocket", - "speed", ship.getModifiedItemAttr("shipBonus2AF") * level) + "speed", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") diff --git a/eos/effects/shiprocketthermaldmgaf.py b/eos/effects/shiprocketthermaldmgaf.py index 005cf9a924..a524f2a434 100644 --- a/eos/effects/shiprocketthermaldmgaf.py +++ b/eos/effects/shiprocketthermaldmgaf.py @@ -5,6 +5,5 @@ # Ship: Vengeance type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), - "thermalDamage", ship.getModifiedItemAttr("shipBonusAF") * level) + "thermalDamage", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate") diff --git a/eos/effects/shipsetcapneedamarrtacticaldestroyer2.py b/eos/effects/shipsetcapneedamarrtacticaldestroyer2.py index 4f015f8181..1efdfc0d0a 100644 --- a/eos/effects/shipsetcapneedamarrtacticaldestroyer2.py +++ b/eos/effects/shipsetcapneedamarrtacticaldestroyer2.py @@ -4,6 +4,5 @@ # Ship: Confessor type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Tactical Destroyer").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), - "capacitorNeed", ship.getModifiedItemAttr("shipBonusTacticalDestroyerAmarr2") * level) + "capacitorNeed", ship.getModifiedItemAttr("shipBonusTacticalDestroyerAmarr2"), skill="Amarr Tactical Destroyer") diff --git a/eos/effects/shipsetdamageamarrtacticaldestroyer1.py b/eos/effects/shipsetdamageamarrtacticaldestroyer1.py index a959549d3e..61ce24b4fb 100644 --- a/eos/effects/shipsetdamageamarrtacticaldestroyer1.py +++ b/eos/effects/shipsetdamageamarrtacticaldestroyer1.py @@ -4,6 +4,5 @@ # Ship: Confessor type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Tactical Destroyer").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusTacticalDestroyerAmarr1") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusTacticalDestroyerAmarr1"), skill="Amarr Tactical Destroyer") diff --git a/eos/effects/shipsetdmgbonus2af.py b/eos/effects/shipsetdmgbonus2af.py index 5557c9280d..ae0159b625 100644 --- a/eos/effects/shipsetdmgbonus2af.py +++ b/eos/effects/shipsetdmgbonus2af.py @@ -4,6 +4,5 @@ # Ship: Punisher type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonus2AF") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate") diff --git a/eos/effects/shipsetdmgbonusaf.py b/eos/effects/shipsetdmgbonusaf.py index e1c1724cd1..920aae96c1 100644 --- a/eos/effects/shipsetdmgbonusaf.py +++ b/eos/effects/shipsetdmgbonusaf.py @@ -7,6 +7,5 @@ # Ship: Tormentor type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusAF") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate") diff --git a/eos/effects/shipsettrackingbonusaf.py b/eos/effects/shipsettrackingbonusaf.py index 68383f1986..3d5f3e6715 100644 --- a/eos/effects/shipsettrackingbonusaf.py +++ b/eos/effects/shipsettrackingbonusaf.py @@ -4,6 +4,5 @@ # Ship: Retribution type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), - "trackingSpeed", ship.getModifiedItemAttr("shipBonusAF") * level) + "trackingSpeed", ship.getModifiedItemAttr("shipBonusAF"), skill="Amarr Frigate") diff --git a/eos/effects/shipshieldboost1mbc1.py b/eos/effects/shipshieldboost1mbc1.py index 45d6104779..22f5ccf360 100644 --- a/eos/effects/shipshieldboost1mbc1.py +++ b/eos/effects/shipshieldboost1mbc1.py @@ -5,6 +5,5 @@ # Ship: Sleipnir type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battlecruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"), - "shieldBonus", ship.getModifiedItemAttr("shipBonusMBC1") * level) + "shieldBonus", ship.getModifiedItemAttr("shipBonusMBC1"), skill="Minmatar Battlecruiser") diff --git a/eos/effects/shipshieldboostmf.py b/eos/effects/shipshieldboostmf.py index ee53862f3b..3eac982bb2 100644 --- a/eos/effects/shipshieldboostmf.py +++ b/eos/effects/shipshieldboostmf.py @@ -4,6 +4,5 @@ # Ship: Breacher type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"), - "shieldBonus", ship.getModifiedItemAttr("shipBonusMF") * level) + "shieldBonus", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate") diff --git a/eos/effects/shipshieldemresistance1cbc2.py b/eos/effects/shipshieldemresistance1cbc2.py index 3c5db21a44..7bd2ae888d 100644 --- a/eos/effects/shipshieldemresistance1cbc2.py +++ b/eos/effects/shipshieldemresistance1cbc2.py @@ -6,5 +6,4 @@ # Ship: Nighthawk type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battlecruiser").level - fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2") * level) + fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser") diff --git a/eos/effects/shipshieldemresistancecc2.py b/eos/effects/shipshieldemresistancecc2.py index 4d5f640dd5..13fc8fef35 100644 --- a/eos/effects/shipshieldemresistancecc2.py +++ b/eos/effects/shipshieldemresistancecc2.py @@ -4,5 +4,4 @@ # Variations of ship: Moa (3 of 4) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level - fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("shipBonusCC2") * level) + fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser") diff --git a/eos/effects/shipshieldemresistancecf2.py b/eos/effects/shipshieldemresistancecf2.py index 250bfe02ce..9fd39ede57 100644 --- a/eos/effects/shipshieldemresistancecf2.py +++ b/eos/effects/shipshieldemresistancecf2.py @@ -6,5 +6,4 @@ # Ship: Whiptail type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level - fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("shipBonusCF") * level) + fit.ship.boostItemAttr("shieldEmDamageResonance", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate") diff --git a/eos/effects/shipshieldexplosiveresistance1cbc2.py b/eos/effects/shipshieldexplosiveresistance1cbc2.py index 2c394026f4..59ce3938b8 100644 --- a/eos/effects/shipshieldexplosiveresistance1cbc2.py +++ b/eos/effects/shipshieldexplosiveresistance1cbc2.py @@ -6,5 +6,4 @@ # Ship: Nighthawk type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battlecruiser").level - fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2") * level) + fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser") diff --git a/eos/effects/shipshieldexplosiveresistancecc2.py b/eos/effects/shipshieldexplosiveresistancecc2.py index 4f2a117b31..e40a362697 100644 --- a/eos/effects/shipshieldexplosiveresistancecc2.py +++ b/eos/effects/shipshieldexplosiveresistancecc2.py @@ -4,5 +4,4 @@ # Variations of ship: Moa (3 of 4) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level - fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusCC2") * level) + fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser") diff --git a/eos/effects/shipshieldexplosiveresistancecf2.py b/eos/effects/shipshieldexplosiveresistancecf2.py index e6e65956f6..d71caf7c97 100644 --- a/eos/effects/shipshieldexplosiveresistancecf2.py +++ b/eos/effects/shipshieldexplosiveresistancecf2.py @@ -6,5 +6,4 @@ # Ship: Whiptail type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level - fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusCF") * level) + fit.ship.boostItemAttr("shieldExplosiveDamageResonance", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate") diff --git a/eos/effects/shipshieldkineticresistance1cbc2.py b/eos/effects/shipshieldkineticresistance1cbc2.py index dc4bb30afc..68572bf639 100644 --- a/eos/effects/shipshieldkineticresistance1cbc2.py +++ b/eos/effects/shipshieldkineticresistance1cbc2.py @@ -6,5 +6,4 @@ # Ship: Nighthawk type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battlecruiser").level - fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2") * level) + fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser") diff --git a/eos/effects/shipshieldkineticresistancecc2.py b/eos/effects/shipshieldkineticresistancecc2.py index c64f38df88..ee429305fb 100644 --- a/eos/effects/shipshieldkineticresistancecc2.py +++ b/eos/effects/shipshieldkineticresistancecc2.py @@ -4,5 +4,4 @@ # Variations of ship: Moa (3 of 4) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level - fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonusCC2") * level) + fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser") diff --git a/eos/effects/shipshieldkineticresistancecf2.py b/eos/effects/shipshieldkineticresistancecf2.py index 3f38bcd0a7..efbdbb1848 100644 --- a/eos/effects/shipshieldkineticresistancecf2.py +++ b/eos/effects/shipshieldkineticresistancecf2.py @@ -6,5 +6,4 @@ # Ship: Whiptail type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level - fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonusCF") * level) + fit.ship.boostItemAttr("shieldKineticDamageResonance", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate") diff --git a/eos/effects/shipshieldthermalresistance1cbc2.py b/eos/effects/shipshieldthermalresistance1cbc2.py index 0e4f2fc781..417b3aeacb 100644 --- a/eos/effects/shipshieldthermalresistance1cbc2.py +++ b/eos/effects/shipshieldthermalresistance1cbc2.py @@ -6,5 +6,4 @@ # Ship: Nighthawk type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battlecruiser").level - fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2") * level) + fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonusCBC2"), skill="Caldari Battlecruiser") diff --git a/eos/effects/shipshieldthermalresistancecc2.py b/eos/effects/shipshieldthermalresistancecc2.py index 85156dda03..c84d5007ac 100644 --- a/eos/effects/shipshieldthermalresistancecc2.py +++ b/eos/effects/shipshieldthermalresistancecc2.py @@ -4,5 +4,4 @@ # Variations of ship: Moa (3 of 4) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level - fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonusCC2") * level) + fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser") diff --git a/eos/effects/shipshieldthermalresistancecf2.py b/eos/effects/shipshieldthermalresistancecf2.py index ae271d8e30..df75d3e002 100644 --- a/eos/effects/shipshieldthermalresistancecf2.py +++ b/eos/effects/shipshieldthermalresistancecf2.py @@ -6,5 +6,4 @@ # Ship: Whiptail type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level - fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonusCF") * level) + fit.ship.boostItemAttr("shieldThermalDamageResonance", ship.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate") diff --git a/eos/effects/shipshieldtransferrange1.py b/eos/effects/shipshieldtransferrange1.py index 77ab67b1eb..aee106097b 100644 --- a/eos/effects/shipshieldtransferrange1.py +++ b/eos/effects/shipshieldtransferrange1.py @@ -5,6 +5,5 @@ # Ship: Etana type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", - "shieldTransferRange", ship.getModifiedItemAttr("shipBonusCC") * level) + "shieldTransferRange", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser") diff --git a/eos/effects/shipshieldtransferrange2.py b/eos/effects/shipshieldtransferrange2.py index efeb6691d7..9246c9005c 100644 --- a/eos/effects/shipshieldtransferrange2.py +++ b/eos/effects/shipshieldtransferrange2.py @@ -4,6 +4,5 @@ # Ship: Scimitar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", - "shieldTransferRange", ship.getModifiedItemAttr("shipBonusMC2") * level) + "shieldTransferRange", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser") diff --git a/eos/effects/shipshtdmgbonusgf.py b/eos/effects/shipshtdmgbonusgf.py index 21412605f1..d5bd3f2665 100644 --- a/eos/effects/shipshtdmgbonusgf.py +++ b/eos/effects/shipshtdmgbonusgf.py @@ -8,6 +8,5 @@ # Ship: Taranis type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusGF") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate") diff --git a/eos/effects/shipshtoptimalbonusgf.py b/eos/effects/shipshtoptimalbonusgf.py index 6c674c970e..0a64f25d87 100644 --- a/eos/effects/shipshtoptimalbonusgf.py +++ b/eos/effects/shipshtoptimalbonusgf.py @@ -4,6 +4,5 @@ # Ship: Ares type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), - "maxRange", ship.getModifiedItemAttr("shipBonusGF") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusGF"), skill="Gallente Frigate") diff --git a/eos/effects/shipshtrofgallentetacticaldestroyer1.py b/eos/effects/shipshtrofgallentetacticaldestroyer1.py index 3d288c2899..989706ef06 100644 --- a/eos/effects/shipshtrofgallentetacticaldestroyer1.py +++ b/eos/effects/shipshtrofgallentetacticaldestroyer1.py @@ -4,6 +4,5 @@ # Ship: Hecate type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Tactical Destroyer").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), - "speed", ship.getModifiedItemAttr("shipBonusTacticalDestroyerGallente1") * level) + "speed", ship.getModifiedItemAttr("shipBonusTacticalDestroyerGallente1"), skill="Gallente Tactical Destroyer") diff --git a/eos/effects/shipshttrackinggallentetacticaldestroyer2.py b/eos/effects/shipshttrackinggallentetacticaldestroyer2.py index a2d6a612ce..b78f3e29f7 100644 --- a/eos/effects/shipshttrackinggallentetacticaldestroyer2.py +++ b/eos/effects/shipshttrackinggallentetacticaldestroyer2.py @@ -4,6 +4,5 @@ # Ship: Hecate type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Tactical Destroyer").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), - "trackingSpeed", ship.getModifiedItemAttr("shipBonusTacticalDestroyerGallente2") * level) + "trackingSpeed", ship.getModifiedItemAttr("shipBonusTacticalDestroyerGallente2"), skill="Gallente Tactical Destroyer") diff --git a/eos/effects/shipsiegelauncherrofbonus2cb.py b/eos/effects/shipsiegelauncherrofbonus2cb.py index 7f4eb514a1..a3a4a2123c 100644 --- a/eos/effects/shipsiegelauncherrofbonus2cb.py +++ b/eos/effects/shipsiegelauncherrofbonus2cb.py @@ -5,6 +5,5 @@ # Ship: Raven State Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Torpedo", - "speed", ship.getModifiedItemAttr("shipBonus2CB") * level) + "speed", ship.getModifiedItemAttr("shipBonus2CB"), skill="Caldari Battleship") diff --git a/eos/effects/shipsmallmissileemdmgcf2.py b/eos/effects/shipsmallmissileemdmgcf2.py index 38b2cd0e84..224482c503 100644 --- a/eos/effects/shipsmallmissileemdmgcf2.py +++ b/eos/effects/shipsmallmissileemdmgcf2.py @@ -4,6 +4,5 @@ # Ship: Kestrel type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"), - "emDamage", ship.getModifiedItemAttr("shipBonusCF2") * level) + "emDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate") diff --git a/eos/effects/shipsmallmissileexpdmgcf2.py b/eos/effects/shipsmallmissileexpdmgcf2.py index 978b6da061..8fb0c32f3b 100644 --- a/eos/effects/shipsmallmissileexpdmgcf2.py +++ b/eos/effects/shipsmallmissileexpdmgcf2.py @@ -4,6 +4,5 @@ # Ship: Kestrel type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"), - "explosiveDamage", ship.getModifiedItemAttr("shipBonusCF2") * level) + "explosiveDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate") diff --git a/eos/effects/shipsmallmissilekindmgcf2.py b/eos/effects/shipsmallmissilekindmgcf2.py index 63237ba533..946429934a 100644 --- a/eos/effects/shipsmallmissilekindmgcf2.py +++ b/eos/effects/shipsmallmissilekindmgcf2.py @@ -4,6 +4,5 @@ # Ship: Kestrel type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"), - "kineticDamage", ship.getModifiedItemAttr("shipBonusCF2") * level) + "kineticDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate") diff --git a/eos/effects/shipsmallmissilethermdmgcf2.py b/eos/effects/shipsmallmissilethermdmgcf2.py index a229288685..d768a0adbf 100644 --- a/eos/effects/shipsmallmissilethermdmgcf2.py +++ b/eos/effects/shipsmallmissilethermdmgcf2.py @@ -4,6 +4,5 @@ # Ship: Kestrel type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Frigate").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"), - "thermalDamage", ship.getModifiedItemAttr("shipBonusCF2") * level) + "thermalDamage", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate") diff --git a/eos/effects/shipsptdamageminmatartacticaldestroyer1.py b/eos/effects/shipsptdamageminmatartacticaldestroyer1.py index 349767adf0..6d6f26a278 100644 --- a/eos/effects/shipsptdamageminmatartacticaldestroyer1.py +++ b/eos/effects/shipsptdamageminmatartacticaldestroyer1.py @@ -4,6 +4,5 @@ # Ship: Svipul type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Tactical Destroyer").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), - "damageMultiplier", ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar1") * level) + "damageMultiplier", ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar1"), skill="Minmatar Tactical Destroyer") diff --git a/eos/effects/shipsptoptimalbonusmf.py b/eos/effects/shipsptoptimalbonusmf.py index 7b56b98c67..66d544a58b 100644 --- a/eos/effects/shipsptoptimalbonusmf.py +++ b/eos/effects/shipsptoptimalbonusmf.py @@ -4,6 +4,5 @@ # Ship: Chremoas type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), - "maxRange", ship.getModifiedItemAttr("shipBonusMF") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate") diff --git a/eos/effects/shipsptoptimalminmatartacticaldestroyer2.py b/eos/effects/shipsptoptimalminmatartacticaldestroyer2.py index da0ff3d127..9eae30565e 100644 --- a/eos/effects/shipsptoptimalminmatartacticaldestroyer2.py +++ b/eos/effects/shipsptoptimalminmatartacticaldestroyer2.py @@ -4,6 +4,5 @@ # Ship: Svipul type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Tactical Destroyer").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), - "maxRange", ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar2") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusTacticalDestroyerMinmatar2"), skill="Minmatar Tactical Destroyer") diff --git a/eos/effects/shipstasiswebrangebonusmb.py b/eos/effects/shipstasiswebrangebonusmb.py index 3a0c4d64cb..d1f250b1a2 100644 --- a/eos/effects/shipstasiswebrangebonusmb.py +++ b/eos/effects/shipstasiswebrangebonusmb.py @@ -4,6 +4,5 @@ # Ship: Bhaalgorn type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", - "maxRange", ship.getModifiedItemAttr("shipBonusMB") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusMB"), skill="Minmatar Battleship") diff --git a/eos/effects/shipstasiswebrangebonusmc2.py b/eos/effects/shipstasiswebrangebonusmc2.py index cd7fafa560..059a9dc7cd 100644 --- a/eos/effects/shipstasiswebrangebonusmc2.py +++ b/eos/effects/shipstasiswebrangebonusmc2.py @@ -4,6 +4,5 @@ # Ship: Ashimmu type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", - "maxRange", ship.getModifiedItemAttr("shipBonusMC2") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser") diff --git a/eos/effects/shipstasiswebstrengthbonusmc2.py b/eos/effects/shipstasiswebstrengthbonusmc2.py index 52fae86aaa..a521658534 100644 --- a/eos/effects/shipstasiswebstrengthbonusmc2.py +++ b/eos/effects/shipstasiswebstrengthbonusmc2.py @@ -4,6 +4,5 @@ # Ship: Vigilant type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", - "speedFactor", ship.getModifiedItemAttr("shipBonusMC2") * level) + "speedFactor", ship.getModifiedItemAttr("shipBonusMC2"), skill="Minmatar Cruiser") diff --git a/eos/effects/shipstasiswebstrengthbonusmf2.py b/eos/effects/shipstasiswebstrengthbonusmf2.py index e09d93e06f..fc1185cf1d 100644 --- a/eos/effects/shipstasiswebstrengthbonusmf2.py +++ b/eos/effects/shipstasiswebstrengthbonusmf2.py @@ -4,6 +4,5 @@ # Ship: Daredevil type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Frigate").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", - "speedFactor", ship.getModifiedItemAttr("shipBonusMF2") * level) + "speedFactor", ship.getModifiedItemAttr("shipBonusMF2"), skill="Minmatar Frigate") diff --git a/eos/effects/shiptcapneedbonusac.py b/eos/effects/shiptcapneedbonusac.py index 2f6dbc21d4..8bece86f40 100644 --- a/eos/effects/shiptcapneedbonusac.py +++ b/eos/effects/shiptcapneedbonusac.py @@ -6,6 +6,5 @@ # Ship: Zealot type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"), - "capacitorNeed", ship.getModifiedItemAttr("shipBonusAC") * level) + "capacitorNeed", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser") diff --git a/eos/effects/shiptorpedoaoecloudsize1cb.py b/eos/effects/shiptorpedoaoecloudsize1cb.py index e894754e6e..b079f5663a 100644 --- a/eos/effects/shiptorpedoaoecloudsize1cb.py +++ b/eos/effects/shiptorpedoaoecloudsize1cb.py @@ -4,6 +4,5 @@ # Ship: Raven Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), - "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCB") * level) + "aoeCloudSize", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship") diff --git a/eos/effects/shiptorpedorofcb.py b/eos/effects/shiptorpedorofcb.py index 373bbff599..86d0e30e3c 100644 --- a/eos/effects/shiptorpedorofcb.py +++ b/eos/effects/shiptorpedorofcb.py @@ -4,6 +4,5 @@ # Ship: Scorpion Navy Issue type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Torpedo", - "speed", ship.getModifiedItemAttr("shipBonusCB") * level) + "speed", ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship") diff --git a/eos/effects/shiptorpedosvelocitybonuscb3.py b/eos/effects/shiptorpedosvelocitybonuscb3.py index 227b320936..6c4f582a54 100644 --- a/eos/effects/shiptorpedosvelocitybonuscb3.py +++ b/eos/effects/shiptorpedosvelocitybonuscb3.py @@ -4,6 +4,5 @@ # Variations of ship: Raven (3 of 4) type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battleship").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), - "maxVelocity", ship.getModifiedItemAttr("shipBonusCB3") * level) + "maxVelocity", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship") diff --git a/eos/effects/shiptrackingbonusab.py b/eos/effects/shiptrackingbonusab.py index 37ace999b0..25368aff40 100644 --- a/eos/effects/shiptrackingbonusab.py +++ b/eos/effects/shiptrackingbonusab.py @@ -4,6 +4,5 @@ # Ship: Nightmare type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Battleship").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"), - "trackingSpeed", ship.getModifiedItemAttr("shipBonusAB2") * level) + "trackingSpeed", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship") diff --git a/eos/effects/shiptrackinglinkrange1fixed.py b/eos/effects/shiptrackinglinkrange1fixed.py index 1d5e4825b9..be139ea71f 100644 --- a/eos/effects/shiptrackinglinkrange1fixed.py +++ b/eos/effects/shiptrackinglinkrange1fixed.py @@ -4,6 +4,5 @@ # Ship: Scimitar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer", - "maxRange", ship.getModifiedItemAttr("shipBonusMC") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusMC"), skill="Minmatar Cruiser") diff --git a/eos/effects/shiptrackinglinkrange2group.py b/eos/effects/shiptrackinglinkrange2group.py index 2c77ee435c..537d0d46e7 100644 --- a/eos/effects/shiptrackinglinkrange2group.py +++ b/eos/effects/shiptrackinglinkrange2group.py @@ -4,6 +4,5 @@ # Ship: Oneiros type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer", - "maxRange", ship.getModifiedItemAttr("shipBonusGC2") * level) + "maxRange", ship.getModifiedItemAttr("shipBonusGC2"), skill="Gallente Cruiser") diff --git a/eos/effects/shipvelocitybonusai.py b/eos/effects/shipvelocitybonusai.py index 5e8c3a4e0d..b9f5257d93 100644 --- a/eos/effects/shipvelocitybonusai.py +++ b/eos/effects/shipvelocitybonusai.py @@ -5,5 +5,4 @@ # Ship: Prorator type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Industrial").level - fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("shipBonusAI") * level) + fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("shipBonusAI"), skill="Amarr Industrial") diff --git a/eos/effects/shipvelocitybonusmi.py b/eos/effects/shipvelocitybonusmi.py index a1bd2a747f..a29a8295d8 100644 --- a/eos/effects/shipvelocitybonusmi.py +++ b/eos/effects/shipvelocitybonusmi.py @@ -6,5 +6,4 @@ # Ship: Prowler type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Industrial").level - fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("shipBonusMI") * level) + fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("shipBonusMI"), skill="Minmatar Industrial") diff --git a/eos/effects/subsystembonusamarrdefensive2remotearmorrepairamount.py b/eos/effects/subsystembonusamarrdefensive2remotearmorrepairamount.py index 4e35ca5457..f14c083014 100644 --- a/eos/effects/subsystembonusamarrdefensive2remotearmorrepairamount.py +++ b/eos/effects/subsystembonusamarrdefensive2remotearmorrepairamount.py @@ -4,6 +4,5 @@ # Subsystem: Legion Defensive - Adaptive Augmenter type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Defensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", - "armorDamageAmount", module.getModifiedItemAttr("subsystemBonusAmarrDefensive2") * level) + "armorDamageAmount", module.getModifiedItemAttr("subsystemBonusAmarrDefensive2"), skill="Amarr Defensive Systems") diff --git a/eos/effects/subsystembonusamarrdefensivearmoredwarfare.py b/eos/effects/subsystembonusamarrdefensivearmoredwarfare.py index f4c01db825..b58cf75219 100644 --- a/eos/effects/subsystembonusamarrdefensivearmoredwarfare.py +++ b/eos/effects/subsystembonusamarrdefensivearmoredwarfare.py @@ -4,6 +4,5 @@ # Subsystem: Legion Defensive - Warfare Processor type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Defensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), - "commandBonus", module.getModifiedItemAttr("subsystemBonusAmarrDefensive") * level) + "commandBonus", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"), skill="Amarr Defensive Systems") diff --git a/eos/effects/subsystembonusamarrdefensivearmorhp.py b/eos/effects/subsystembonusamarrdefensivearmorhp.py index a8b05d4a98..73eb74a9ef 100644 --- a/eos/effects/subsystembonusamarrdefensivearmorhp.py +++ b/eos/effects/subsystembonusamarrdefensivearmorhp.py @@ -4,5 +4,4 @@ # Subsystem: Legion Defensive - Augmented Plating type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Defensive Systems").level - fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("subsystemBonusAmarrDefensive") * level) + fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"), skill="Amarr Defensive Systems") diff --git a/eos/effects/subsystembonusamarrdefensivearmorrepairamount.py b/eos/effects/subsystembonusamarrdefensivearmorrepairamount.py index c878288020..79b4176b1f 100644 --- a/eos/effects/subsystembonusamarrdefensivearmorrepairamount.py +++ b/eos/effects/subsystembonusamarrdefensivearmorrepairamount.py @@ -4,6 +4,5 @@ # Subsystem: Legion Defensive - Nanobot Injector type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Defensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), - "armorDamageAmount", module.getModifiedItemAttr("subsystemBonusAmarrDefensive") * level) + "armorDamageAmount", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"), skill="Amarr Defensive Systems") diff --git a/eos/effects/subsystembonusamarrdefensivearmorresistance.py b/eos/effects/subsystembonusamarrdefensivearmorresistance.py index 2be7ffa8cb..d032065e3e 100644 --- a/eos/effects/subsystembonusamarrdefensivearmorresistance.py +++ b/eos/effects/subsystembonusamarrdefensivearmorresistance.py @@ -4,6 +4,5 @@ # Subsystem: Legion Defensive - Adaptive Augmenter type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Defensive Systems").level for type in ("Em", "Explosive", "Kinetic", "Thermal"): - fit.ship.boostItemAttr("armor{0}DamageResonance".format(type), module.getModifiedItemAttr("subsystemBonusAmarrDefensive") * level) + fit.ship.boostItemAttr("armor{0}DamageResonance".format(type), module.getModifiedItemAttr("subsystemBonusAmarrDefensive"), skill="Amarr Defensive Systems") diff --git a/eos/effects/subsystembonusamarrdefensiveinformationwarfare.py b/eos/effects/subsystembonusamarrdefensiveinformationwarfare.py index c3e11dd1ae..0abc92ceec 100644 --- a/eos/effects/subsystembonusamarrdefensiveinformationwarfare.py +++ b/eos/effects/subsystembonusamarrdefensiveinformationwarfare.py @@ -4,6 +4,5 @@ # Subsystem: Legion Defensive - Warfare Processor type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Defensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), - "commandBonus", module.getModifiedItemAttr("subsystemBonusAmarrDefensive") * level) + "commandBonus", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"), skill="Amarr Defensive Systems") diff --git a/eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py b/eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py index 95dfef68d4..c41e0ee700 100644 --- a/eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py +++ b/eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py @@ -4,6 +4,5 @@ # Subsystem: Legion Defensive - Warfare Processor type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Defensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), - "commandBonusHidden", module.getModifiedItemAttr("subsystemBonusAmarrDefensive") * level) + "commandBonusHidden", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"), skill="Amarr Defensive Systems") diff --git a/eos/effects/subsystembonusamarrdefensiveskirmishwarfare.py b/eos/effects/subsystembonusamarrdefensiveskirmishwarfare.py index 436f6b83b6..7ba436d078 100644 --- a/eos/effects/subsystembonusamarrdefensiveskirmishwarfare.py +++ b/eos/effects/subsystembonusamarrdefensiveskirmishwarfare.py @@ -4,6 +4,5 @@ # Subsystem: Legion Defensive - Warfare Processor type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Defensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), - "commandBonus", module.getModifiedItemAttr("subsystemBonusAmarrDefensive") * level) + "commandBonus", module.getModifiedItemAttr("subsystemBonusAmarrDefensive"), skill="Amarr Defensive Systems") diff --git a/eos/effects/subsystembonusamarrelectronic2maxtargetingrange.py b/eos/effects/subsystembonusamarrelectronic2maxtargetingrange.py index 6da2ffd678..d27d3e8da6 100644 --- a/eos/effects/subsystembonusamarrelectronic2maxtargetingrange.py +++ b/eos/effects/subsystembonusamarrelectronic2maxtargetingrange.py @@ -4,5 +4,4 @@ # Subsystem: Legion Electronics - Dissolution Sequencer type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Electronic Systems").level - fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("subsystemBonusAmarrElectronic2") * level) + fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("subsystemBonusAmarrElectronic2"), skill="Amarr Electronic Systems") diff --git a/eos/effects/subsystembonusamarrelectronic2scanresolution.py b/eos/effects/subsystembonusamarrelectronic2scanresolution.py index c82a03509e..781e98f495 100644 --- a/eos/effects/subsystembonusamarrelectronic2scanresolution.py +++ b/eos/effects/subsystembonusamarrelectronic2scanresolution.py @@ -4,5 +4,4 @@ # Subsystem: Legion Electronics - Tactical Targeting Network type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Electronic Systems").level - fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("subsystemBonusAmarrElectronic2") * level) + fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("subsystemBonusAmarrElectronic2"), skill="Amarr Electronic Systems") diff --git a/eos/effects/subsystembonusamarrelectronic2tractorbeamrange.py b/eos/effects/subsystembonusamarrelectronic2tractorbeamrange.py index c3bc061829..becc360d46 100644 --- a/eos/effects/subsystembonusamarrelectronic2tractorbeamrange.py +++ b/eos/effects/subsystembonusamarrelectronic2tractorbeamrange.py @@ -4,6 +4,5 @@ # Subsystem: Legion Electronics - Emergent Locus Analyzer type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Electronic Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", - "maxRange", module.getModifiedItemAttr("subsystemBonusAmarrElectronic2") * level) + "maxRange", module.getModifiedItemAttr("subsystemBonusAmarrElectronic2"), skill="Amarr Electronic Systems") diff --git a/eos/effects/subsystembonusamarrelectronic2tractorbeamvelocity.py b/eos/effects/subsystembonusamarrelectronic2tractorbeamvelocity.py index ae030cd208..5b2e8e97c7 100644 --- a/eos/effects/subsystembonusamarrelectronic2tractorbeamvelocity.py +++ b/eos/effects/subsystembonusamarrelectronic2tractorbeamvelocity.py @@ -4,6 +4,5 @@ # Subsystem: Legion Electronics - Emergent Locus Analyzer type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Electronic Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", - "maxTractorVelocity", module.getModifiedItemAttr("subsystemBonusAmarrElectronic2") * level) + "maxTractorVelocity", module.getModifiedItemAttr("subsystemBonusAmarrElectronic2"), skill="Amarr Electronic Systems") diff --git a/eos/effects/subsystembonusamarrelectronicenergydestabilizeramount.py b/eos/effects/subsystembonusamarrelectronicenergydestabilizeramount.py index 60584c7917..9cb8a1ace0 100644 --- a/eos/effects/subsystembonusamarrelectronicenergydestabilizeramount.py +++ b/eos/effects/subsystembonusamarrelectronicenergydestabilizeramount.py @@ -4,6 +4,5 @@ # Subsystem: Legion Electronics - Energy Parasitic Complex type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Electronic Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer", - "energyDestabilizationAmount", module.getModifiedItemAttr("subsystemBonusAmarrElectronic") * level) + "energyDestabilizationAmount", module.getModifiedItemAttr("subsystemBonusAmarrElectronic"), skill="Amarr Electronic Systems") diff --git a/eos/effects/subsystembonusamarrelectronicenergyvampireamount.py b/eos/effects/subsystembonusamarrelectronicenergyvampireamount.py index 62af65629e..2eb6990b4e 100644 --- a/eos/effects/subsystembonusamarrelectronicenergyvampireamount.py +++ b/eos/effects/subsystembonusamarrelectronicenergyvampireamount.py @@ -4,6 +4,5 @@ # Subsystem: Legion Electronics - Energy Parasitic Complex type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Electronic Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire", - "powerTransferAmount", module.getModifiedItemAttr("subsystemBonusAmarrElectronic") * level) + "powerTransferAmount", module.getModifiedItemAttr("subsystemBonusAmarrElectronic"), skill="Amarr Electronic Systems") diff --git a/eos/effects/subsystembonusamarrelectronicscanprobestrength.py b/eos/effects/subsystembonusamarrelectronicscanprobestrength.py index 0c53658d9f..4d3c514a81 100644 --- a/eos/effects/subsystembonusamarrelectronicscanprobestrength.py +++ b/eos/effects/subsystembonusamarrelectronicscanprobestrength.py @@ -4,6 +4,5 @@ # Subsystem: Legion Electronics - Emergent Locus Analyzer type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Electronic Systems").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe", - "baseSensorStrength", module.getModifiedItemAttr("subsystemBonusAmarrElectronic") * level) + "baseSensorStrength", module.getModifiedItemAttr("subsystemBonusAmarrElectronic"), skill="Amarr Electronic Systems") diff --git a/eos/effects/subsystembonusamarrelectronicscanstrengthradar.py b/eos/effects/subsystembonusamarrelectronicscanstrengthradar.py index 3e3d31224d..1f5b85ce09 100644 --- a/eos/effects/subsystembonusamarrelectronicscanstrengthradar.py +++ b/eos/effects/subsystembonusamarrelectronicscanstrengthradar.py @@ -4,5 +4,4 @@ # Subsystem: Legion Electronics - Dissolution Sequencer type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Electronic Systems").level - fit.ship.boostItemAttr("scanRadarStrength", module.getModifiedItemAttr("subsystemBonusAmarrElectronic") * level) + fit.ship.boostItemAttr("scanRadarStrength", module.getModifiedItemAttr("subsystemBonusAmarrElectronic"), skill="Amarr Electronic Systems") diff --git a/eos/effects/subsystembonusamarrengineeringcapacitorcapacity.py b/eos/effects/subsystembonusamarrengineeringcapacitorcapacity.py index 9d4e59b75a..574478596c 100644 --- a/eos/effects/subsystembonusamarrengineeringcapacitorcapacity.py +++ b/eos/effects/subsystembonusamarrengineeringcapacitorcapacity.py @@ -4,5 +4,4 @@ # Subsystem: Legion Engineering - Augmented Capacitor Reservoir type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Engineering Systems").level - fit.ship.boostItemAttr("capacitorCapacity", module.getModifiedItemAttr("subsystemBonusAmarrEngineering") * level) + fit.ship.boostItemAttr("capacitorCapacity", module.getModifiedItemAttr("subsystemBonusAmarrEngineering"), skill="Amarr Engineering Systems") diff --git a/eos/effects/subsystembonusamarrengineeringcapacitorrecharge.py b/eos/effects/subsystembonusamarrengineeringcapacitorrecharge.py index e2b047a4f1..ff816724a6 100644 --- a/eos/effects/subsystembonusamarrengineeringcapacitorrecharge.py +++ b/eos/effects/subsystembonusamarrengineeringcapacitorrecharge.py @@ -4,5 +4,4 @@ # Subsystem: Legion Engineering - Capacitor Regeneration Matrix type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Engineering Systems").level - fit.ship.boostItemAttr("rechargeRate", module.getModifiedItemAttr("subsystemBonusAmarrEngineering") * level) + fit.ship.boostItemAttr("rechargeRate", module.getModifiedItemAttr("subsystemBonusAmarrEngineering"), skill="Amarr Engineering Systems") diff --git a/eos/effects/subsystembonusamarrengineeringheatdamagereduction.py b/eos/effects/subsystembonusamarrengineeringheatdamagereduction.py index fe919163e0..bc77e22d15 100644 --- a/eos/effects/subsystembonusamarrengineeringheatdamagereduction.py +++ b/eos/effects/subsystembonusamarrengineeringheatdamagereduction.py @@ -4,6 +4,5 @@ # Subsystem: Legion Engineering - Supplemental Coolant Injector type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Engineering Systems").level fit.modules.filteredItemBoost(lambda mod: True, "heatDamage", - module.getModifiedItemAttr("subsystemBonusAmarrEngineering") * level) + module.getModifiedItemAttr("subsystemBonusAmarrEngineering"), skill="Amarr Engineering Systems") diff --git a/eos/effects/subsystembonusamarrengineeringpoweroutput.py b/eos/effects/subsystembonusamarrengineeringpoweroutput.py index dc7dac3028..5640abcf69 100644 --- a/eos/effects/subsystembonusamarrengineeringpoweroutput.py +++ b/eos/effects/subsystembonusamarrengineeringpoweroutput.py @@ -4,5 +4,4 @@ # Subsystem: Legion Engineering - Power Core Multiplier type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Engineering Systems").level - fit.ship.boostItemAttr("powerOutput", module.getModifiedItemAttr("subsystemBonusAmarrEngineering") * level) + fit.ship.boostItemAttr("powerOutput", module.getModifiedItemAttr("subsystemBonusAmarrEngineering"), skill="Amarr Engineering Systems") diff --git a/eos/effects/subsystembonusamarroffensive2energyweaponcapacitorneed.py b/eos/effects/subsystembonusamarroffensive2energyweaponcapacitorneed.py index 6ac707da3b..2f06ecf2a9 100644 --- a/eos/effects/subsystembonusamarroffensive2energyweaponcapacitorneed.py +++ b/eos/effects/subsystembonusamarroffensive2energyweaponcapacitorneed.py @@ -5,6 +5,5 @@ # Subsystem: Legion Offensive - Liquid Crystal Magnifiers type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"), - "capacitorNeed", module.getModifiedItemAttr("subsystemBonusAmarrOffensive2") * level) + "capacitorNeed", module.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems") diff --git a/eos/effects/subsystembonusamarroffensive2hamemdamage.py b/eos/effects/subsystembonusamarroffensive2hamemdamage.py index b6ee1e7391..8178a10a10 100644 --- a/eos/effects/subsystembonusamarroffensive2hamemdamage.py +++ b/eos/effects/subsystembonusamarroffensive2hamemdamage.py @@ -4,6 +4,5 @@ # Subsystem: Legion Offensive - Assault Optimization type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Offensive Systems").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), - "emDamage", module.getModifiedItemAttr("subsystemBonusAmarrOffensive2") * level) + "emDamage", module.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems") diff --git a/eos/effects/subsystembonusamarroffensive2hamexplosivedamage.py b/eos/effects/subsystembonusamarroffensive2hamexplosivedamage.py index cbcd513561..f06ee21e82 100644 --- a/eos/effects/subsystembonusamarroffensive2hamexplosivedamage.py +++ b/eos/effects/subsystembonusamarroffensive2hamexplosivedamage.py @@ -4,6 +4,5 @@ # Subsystem: Legion Offensive - Assault Optimization type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Offensive Systems").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), - "explosiveDamage", module.getModifiedItemAttr("subsystemBonusAmarrOffensive2") * level) + "explosiveDamage", module.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems") diff --git a/eos/effects/subsystembonusamarroffensive2hamkineticdamage.py b/eos/effects/subsystembonusamarroffensive2hamkineticdamage.py index 8151ba8fe0..1fb68f0c81 100644 --- a/eos/effects/subsystembonusamarroffensive2hamkineticdamage.py +++ b/eos/effects/subsystembonusamarroffensive2hamkineticdamage.py @@ -4,6 +4,5 @@ # Subsystem: Legion Offensive - Assault Optimization type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Offensive Systems").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), - "kineticDamage", module.getModifiedItemAttr("subsystemBonusAmarrOffensive2") * level) + "kineticDamage", module.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems") diff --git a/eos/effects/subsystembonusamarroffensive2hamthermaldamage.py b/eos/effects/subsystembonusamarroffensive2hamthermaldamage.py index cdb09670b9..a8d181181f 100644 --- a/eos/effects/subsystembonusamarroffensive2hamthermaldamage.py +++ b/eos/effects/subsystembonusamarroffensive2hamthermaldamage.py @@ -4,6 +4,5 @@ # Subsystem: Legion Offensive - Assault Optimization type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Offensive Systems").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), - "thermalDamage", module.getModifiedItemAttr("subsystemBonusAmarrOffensive2") * level) + "thermalDamage", module.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems") diff --git a/eos/effects/subsystembonusamarroffensive3dronehp.py b/eos/effects/subsystembonusamarroffensive3dronehp.py index 5bea48e8ac..9ca93b3749 100644 --- a/eos/effects/subsystembonusamarroffensive3dronehp.py +++ b/eos/effects/subsystembonusamarroffensive3dronehp.py @@ -4,7 +4,6 @@ # Subsystem: Legion Offensive - Drone Synthesis Projector type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Offensive Systems").level for layer in ("shieldCapacity", "armorHP", "hp"): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), layer, - module.getModifiedItemAttr("subsystemBonusAmarrOffensive3") * level) + module.getModifiedItemAttr("subsystemBonusAmarrOffensive3"), skill="Amarr Offensive Systems") diff --git a/eos/effects/subsystembonusamarroffensive3energyweaponmaxrange.py b/eos/effects/subsystembonusamarroffensive3energyweaponmaxrange.py index dacb9bbac2..80546ed467 100644 --- a/eos/effects/subsystembonusamarroffensive3energyweaponmaxrange.py +++ b/eos/effects/subsystembonusamarroffensive3energyweaponmaxrange.py @@ -4,6 +4,5 @@ # Subsystem: Legion Offensive - Liquid Crystal Magnifiers type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"), - "maxRange", module.getModifiedItemAttr("subsystemBonusAmarrOffensive3") * level) + "maxRange", module.getModifiedItemAttr("subsystemBonusAmarrOffensive3"), skill="Amarr Offensive Systems") diff --git a/eos/effects/subsystembonusamarroffensiveassaultmissilelauncherrof.py b/eos/effects/subsystembonusamarroffensiveassaultmissilelauncherrof.py index cf7ba1d6e0..bd48e2863d 100644 --- a/eos/effects/subsystembonusamarroffensiveassaultmissilelauncherrof.py +++ b/eos/effects/subsystembonusamarroffensiveassaultmissilelauncherrof.py @@ -4,6 +4,5 @@ # Subsystem: Legion Offensive - Assault Optimization type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Light", - "speed", module.getModifiedItemAttr("subsystemBonusAmarrOffensive") * level) + "speed", module.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") diff --git a/eos/effects/subsystembonusamarroffensivedronedamagemultiplier.py b/eos/effects/subsystembonusamarroffensivedronedamagemultiplier.py index 44f87f4207..8891c8e231 100644 --- a/eos/effects/subsystembonusamarroffensivedronedamagemultiplier.py +++ b/eos/effects/subsystembonusamarroffensivedronedamagemultiplier.py @@ -4,6 +4,5 @@ # Subsystem: Legion Offensive - Drone Synthesis Projector type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Offensive Systems").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - "damageMultiplier", module.getModifiedItemAttr("subsystemBonusAmarrOffensive") * level) + "damageMultiplier", module.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") diff --git a/eos/effects/subsystembonusamarroffensiveenergyweaponcapacitorneed.py b/eos/effects/subsystembonusamarroffensiveenergyweaponcapacitorneed.py index dbba31e6fd..09b73187fe 100644 --- a/eos/effects/subsystembonusamarroffensiveenergyweaponcapacitorneed.py +++ b/eos/effects/subsystembonusamarroffensiveenergyweaponcapacitorneed.py @@ -4,6 +4,5 @@ # Subsystem: Legion Offensive - Covert Reconfiguration type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"), - "capacitorNeed", module.getModifiedItemAttr("subsystemBonusAmarrOffensive") * level) + "capacitorNeed", module.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") diff --git a/eos/effects/subsystembonusamarroffensiveenergyweapondamagemultiplier.py b/eos/effects/subsystembonusamarroffensiveenergyweapondamagemultiplier.py index e4caa3a79c..07dddee5a6 100644 --- a/eos/effects/subsystembonusamarroffensiveenergyweapondamagemultiplier.py +++ b/eos/effects/subsystembonusamarroffensiveenergyweapondamagemultiplier.py @@ -4,6 +4,5 @@ # Subsystem: Legion Offensive - Liquid Crystal Magnifiers type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"), - "damageMultiplier", module.getModifiedItemAttr("subsystemBonusAmarrOffensive") * level) + "damageMultiplier", module.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") diff --git a/eos/effects/subsystembonusamarroffensiveheavyassaultmissilelauncherrof.py b/eos/effects/subsystembonusamarroffensiveheavyassaultmissilelauncherrof.py index 42770acf05..00ffeca45a 100644 --- a/eos/effects/subsystembonusamarroffensiveheavyassaultmissilelauncherrof.py +++ b/eos/effects/subsystembonusamarroffensiveheavyassaultmissilelauncherrof.py @@ -4,6 +4,5 @@ # Subsystem: Legion Offensive - Assault Optimization type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault", - "speed", module.getModifiedItemAttr("subsystemBonusAmarrOffensive") * level) + "speed", module.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") diff --git a/eos/effects/subsystembonusamarroffensiveheavymissilelauncherrof.py b/eos/effects/subsystembonusamarroffensiveheavymissilelauncherrof.py index 2cf12d6883..5feee607cf 100644 --- a/eos/effects/subsystembonusamarroffensiveheavymissilelauncherrof.py +++ b/eos/effects/subsystembonusamarroffensiveheavymissilelauncherrof.py @@ -4,6 +4,5 @@ # Subsystem: Legion Offensive - Assault Optimization type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy", - "speed", module.getModifiedItemAttr("subsystemBonusAmarrOffensive") * level) + "speed", module.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") diff --git a/eos/effects/subsystembonusamarrpropulsionafterburnerspeedfactor.py b/eos/effects/subsystembonusamarrpropulsionafterburnerspeedfactor.py index be1b1a9240..ac4e700572 100644 --- a/eos/effects/subsystembonusamarrpropulsionafterburnerspeedfactor.py +++ b/eos/effects/subsystembonusamarrpropulsionafterburnerspeedfactor.py @@ -4,6 +4,5 @@ # Subsystem: Legion Propulsion - Fuel Catalyst type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Propulsion Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"), - "speedFactor", module.getModifiedItemAttr("subsystemBonusAmarrPropulsion") * level) + "speedFactor", module.getModifiedItemAttr("subsystemBonusAmarrPropulsion"), skill="Amarr Propulsion Systems") diff --git a/eos/effects/subsystembonusamarrpropulsionagility.py b/eos/effects/subsystembonusamarrpropulsionagility.py index 600bf2fb54..a2d9dfd563 100644 --- a/eos/effects/subsystembonusamarrpropulsionagility.py +++ b/eos/effects/subsystembonusamarrpropulsionagility.py @@ -4,5 +4,4 @@ # Subsystem: Legion Propulsion - Interdiction Nullifier type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Propulsion Systems").level - fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("subsystemBonusAmarrPropulsion") * level) + fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("subsystemBonusAmarrPropulsion"), skill="Amarr Propulsion Systems") diff --git a/eos/effects/subsystembonusamarrpropulsionmaxvelocity.py b/eos/effects/subsystembonusamarrpropulsionmaxvelocity.py index aad0ab4ff1..05b68be1e4 100644 --- a/eos/effects/subsystembonusamarrpropulsionmaxvelocity.py +++ b/eos/effects/subsystembonusamarrpropulsionmaxvelocity.py @@ -4,5 +4,4 @@ # Subsystem: Legion Propulsion - Chassis Optimization type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Propulsion Systems").level - fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("subsystemBonusAmarrPropulsion") * level) + fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("subsystemBonusAmarrPropulsion"), skill="Amarr Propulsion Systems") diff --git a/eos/effects/subsystembonusamarrpropulsionmwdpenalty.py b/eos/effects/subsystembonusamarrpropulsionmwdpenalty.py index cca129fd22..2276cff1d9 100644 --- a/eos/effects/subsystembonusamarrpropulsionmwdpenalty.py +++ b/eos/effects/subsystembonusamarrpropulsionmwdpenalty.py @@ -4,6 +4,5 @@ # Subsystem: Legion Propulsion - Wake Limiter type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Amarr Propulsion Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"), - "signatureRadiusBonus", module.getModifiedItemAttr("subsystemBonusAmarrPropulsion") * level) + "signatureRadiusBonus", module.getModifiedItemAttr("subsystemBonusAmarrPropulsion"), skill="Amarr Propulsion Systems") diff --git a/eos/effects/subsystembonuscaldaridefensive2remoteshieldtransporteramount.py b/eos/effects/subsystembonuscaldaridefensive2remoteshieldtransporteramount.py index 0c1a7461d6..e55064df9a 100644 --- a/eos/effects/subsystembonuscaldaridefensive2remoteshieldtransporteramount.py +++ b/eos/effects/subsystembonuscaldaridefensive2remoteshieldtransporteramount.py @@ -4,6 +4,5 @@ # Subsystem: Tengu Defensive - Adaptive Shielding type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Defensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", - "shieldBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive2") * level) + "shieldBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive2"), skill="Caldari Defensive Systems") diff --git a/eos/effects/subsystembonuscaldaridefensiveinformationwarfare.py b/eos/effects/subsystembonuscaldaridefensiveinformationwarfare.py index 167ef9b959..2274054948 100644 --- a/eos/effects/subsystembonuscaldaridefensiveinformationwarfare.py +++ b/eos/effects/subsystembonuscaldaridefensiveinformationwarfare.py @@ -4,6 +4,5 @@ # Subsystem: Tengu Defensive - Warfare Processor type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Defensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), - "commandBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive") * level) + "commandBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"), skill="Caldari Defensive Systems") diff --git a/eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py b/eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py index e652bab7a3..36ba1f089e 100644 --- a/eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py +++ b/eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py @@ -4,6 +4,5 @@ # Subsystem: Tengu Defensive - Warfare Processor type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Defensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), - "commandBonusHidden", module.getModifiedItemAttr("subsystemBonusCaldariDefensive") * level) + "commandBonusHidden", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"), skill="Caldari Defensive Systems") diff --git a/eos/effects/subsystembonuscaldaridefensiveshieldboostamount.py b/eos/effects/subsystembonuscaldaridefensiveshieldboostamount.py index 40d343b0ad..69edfb54d8 100644 --- a/eos/effects/subsystembonuscaldaridefensiveshieldboostamount.py +++ b/eos/effects/subsystembonuscaldaridefensiveshieldboostamount.py @@ -4,6 +4,5 @@ # Subsystem: Tengu Defensive - Amplification Node type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Defensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"), - "shieldBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive") * level) + "shieldBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"), skill="Caldari Defensive Systems") diff --git a/eos/effects/subsystembonuscaldaridefensiveshieldhp.py b/eos/effects/subsystembonuscaldaridefensiveshieldhp.py index d0c44f8fde..a1596527d0 100644 --- a/eos/effects/subsystembonuscaldaridefensiveshieldhp.py +++ b/eos/effects/subsystembonuscaldaridefensiveshieldhp.py @@ -4,5 +4,4 @@ # Subsystem: Tengu Defensive - Supplemental Screening type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Defensive Systems").level - fit.ship.boostItemAttr("shieldCapacity", module.getModifiedItemAttr("subsystemBonusCaldariDefensive") * level) + fit.ship.boostItemAttr("shieldCapacity", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"), skill="Caldari Defensive Systems") diff --git a/eos/effects/subsystembonuscaldaridefensiveshieldrechargerate.py b/eos/effects/subsystembonuscaldaridefensiveshieldrechargerate.py index 7c63b3a27c..791898df70 100644 --- a/eos/effects/subsystembonuscaldaridefensiveshieldrechargerate.py +++ b/eos/effects/subsystembonuscaldaridefensiveshieldrechargerate.py @@ -4,5 +4,4 @@ # Subsystem: Tengu Defensive - Supplemental Screening type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Defensive Systems").level - fit.ship.boostItemAttr("shieldRechargeRate", module.getModifiedItemAttr("subsystemBonusCaldariDefensive2") * level) + fit.ship.boostItemAttr("shieldRechargeRate", module.getModifiedItemAttr("subsystemBonusCaldariDefensive2"), skill="Caldari Defensive Systems") diff --git a/eos/effects/subsystembonuscaldaridefensiveshieldresistance.py b/eos/effects/subsystembonuscaldaridefensiveshieldresistance.py index e3b2755e37..5b010063af 100644 --- a/eos/effects/subsystembonuscaldaridefensiveshieldresistance.py +++ b/eos/effects/subsystembonuscaldaridefensiveshieldresistance.py @@ -4,6 +4,5 @@ # Subsystem: Tengu Defensive - Adaptive Shielding type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Defensive Systems").level for type in ("Em", "Explosive", "Kinetic", "Thermal"): - fit.ship.boostItemAttr("shield{0}DamageResonance".format(type), module.getModifiedItemAttr("subsystemBonusCaldariDefensive") * level) + fit.ship.boostItemAttr("shield{0}DamageResonance".format(type), module.getModifiedItemAttr("subsystemBonusCaldariDefensive"), skill="Caldari Defensive Systems") diff --git a/eos/effects/subsystembonuscaldaridefensivesiegewarfare.py b/eos/effects/subsystembonuscaldaridefensivesiegewarfare.py index 04b6534b9b..83bd125dcb 100644 --- a/eos/effects/subsystembonuscaldaridefensivesiegewarfare.py +++ b/eos/effects/subsystembonuscaldaridefensivesiegewarfare.py @@ -4,6 +4,5 @@ # Subsystem: Tengu Defensive - Warfare Processor type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Defensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), - "commandBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive") * level) + "commandBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"), skill="Caldari Defensive Systems") diff --git a/eos/effects/subsystembonuscaldaridefensiveskirmishwarfare.py b/eos/effects/subsystembonuscaldaridefensiveskirmishwarfare.py index 08bebeaa6d..f6cc7baa22 100644 --- a/eos/effects/subsystembonuscaldaridefensiveskirmishwarfare.py +++ b/eos/effects/subsystembonuscaldaridefensiveskirmishwarfare.py @@ -4,6 +4,5 @@ # Subsystem: Tengu Defensive - Warfare Processor type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Defensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), - "commandBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive") * level) + "commandBonus", module.getModifiedItemAttr("subsystemBonusCaldariDefensive"), skill="Caldari Defensive Systems") diff --git a/eos/effects/subsystembonuscaldarielectronic2maxtargetingrange.py b/eos/effects/subsystembonuscaldarielectronic2maxtargetingrange.py index 097ae851ad..bd6a0ff8f0 100644 --- a/eos/effects/subsystembonuscaldarielectronic2maxtargetingrange.py +++ b/eos/effects/subsystembonuscaldarielectronic2maxtargetingrange.py @@ -4,5 +4,4 @@ # Subsystem: Tengu Electronics - Dissolution Sequencer type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Electronic Systems").level - fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("subsystemBonusCaldariElectronic2") * level) + fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("subsystemBonusCaldariElectronic2"), skill="Caldari Electronic Systems") diff --git a/eos/effects/subsystembonuscaldarielectronic2tractorbeamrange.py b/eos/effects/subsystembonuscaldarielectronic2tractorbeamrange.py index 24be988d2c..0f34eae81b 100644 --- a/eos/effects/subsystembonuscaldarielectronic2tractorbeamrange.py +++ b/eos/effects/subsystembonuscaldarielectronic2tractorbeamrange.py @@ -4,6 +4,5 @@ # Subsystem: Tengu Electronics - Emergent Locus Analyzer type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Electronic Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", - "maxRange", module.getModifiedItemAttr("subsystemBonusCaldariElectronic2") * level) + "maxRange", module.getModifiedItemAttr("subsystemBonusCaldariElectronic2"), skill="Caldari Electronic Systems") diff --git a/eos/effects/subsystembonuscaldarielectronic2tractorbeamvelocity.py b/eos/effects/subsystembonuscaldarielectronic2tractorbeamvelocity.py index 3f94e256a9..225e6ddb04 100644 --- a/eos/effects/subsystembonuscaldarielectronic2tractorbeamvelocity.py +++ b/eos/effects/subsystembonuscaldarielectronic2tractorbeamvelocity.py @@ -4,6 +4,5 @@ # Subsystem: Tengu Electronics - Emergent Locus Analyzer type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Electronic Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", - "maxTractorVelocity", module.getModifiedItemAttr("subsystemBonusCaldariElectronic2") * level) + "maxTractorVelocity", module.getModifiedItemAttr("subsystemBonusCaldariElectronic2"), skill="Caldari Electronic Systems") diff --git a/eos/effects/subsystembonuscaldarielectroniccpu.py b/eos/effects/subsystembonuscaldarielectroniccpu.py index 08d67fd262..69c3556036 100644 --- a/eos/effects/subsystembonuscaldarielectroniccpu.py +++ b/eos/effects/subsystembonuscaldarielectroniccpu.py @@ -4,5 +4,4 @@ # Subsystem: Tengu Electronics - CPU Efficiency Gate type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Electronic Systems").level - fit.ship.boostItemAttr("cpuOutput", module.getModifiedItemAttr("subsystemBonusCaldariElectronic") * level) + fit.ship.boostItemAttr("cpuOutput", module.getModifiedItemAttr("subsystemBonusCaldariElectronic"), skill="Caldari Electronic Systems") diff --git a/eos/effects/subsystembonuscaldarielectronicecmrange.py b/eos/effects/subsystembonuscaldarielectronicecmrange.py index fa8f6bf635..768edca0a8 100644 --- a/eos/effects/subsystembonuscaldarielectronicecmrange.py +++ b/eos/effects/subsystembonuscaldarielectronicecmrange.py @@ -4,6 +4,5 @@ # Subsystem: Tengu Electronics - Obfuscation Manifold type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Electronic Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", - "maxRange", module.getModifiedItemAttr("subsystemBonusCaldariElectronic") * level) + "maxRange", module.getModifiedItemAttr("subsystemBonusCaldariElectronic"), skill="Caldari Electronic Systems") diff --git a/eos/effects/subsystembonuscaldarielectronicscanprobestrength.py b/eos/effects/subsystembonuscaldarielectronicscanprobestrength.py index 4947da2f34..5e7ce9b7d8 100644 --- a/eos/effects/subsystembonuscaldarielectronicscanprobestrength.py +++ b/eos/effects/subsystembonuscaldarielectronicscanprobestrength.py @@ -4,6 +4,5 @@ # Subsystem: Tengu Electronics - Emergent Locus Analyzer type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Electronic Systems").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe", - "baseSensorStrength", module.getModifiedItemAttr("subsystemBonusCaldariElectronic") * level) + "baseSensorStrength", module.getModifiedItemAttr("subsystemBonusCaldariElectronic"), skill="Caldari Electronic Systems") diff --git a/eos/effects/subsystembonuscaldarielectronicscanstrengthgravimetric.py b/eos/effects/subsystembonuscaldarielectronicscanstrengthgravimetric.py index 280788e019..a6f0ba498f 100644 --- a/eos/effects/subsystembonuscaldarielectronicscanstrengthgravimetric.py +++ b/eos/effects/subsystembonuscaldarielectronicscanstrengthgravimetric.py @@ -4,5 +4,4 @@ # Subsystem: Tengu Electronics - Dissolution Sequencer type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Electronic Systems").level - fit.ship.boostItemAttr("scanGravimetricStrength", module.getModifiedItemAttr("subsystemBonusCaldariElectronic") * level) + fit.ship.boostItemAttr("scanGravimetricStrength", module.getModifiedItemAttr("subsystemBonusCaldariElectronic"), skill="Caldari Electronic Systems") diff --git a/eos/effects/subsystembonuscaldariengineeringcapacitorcapacity.py b/eos/effects/subsystembonuscaldariengineeringcapacitorcapacity.py index 0e287748dc..7d8aa2bafe 100644 --- a/eos/effects/subsystembonuscaldariengineeringcapacitorcapacity.py +++ b/eos/effects/subsystembonuscaldariengineeringcapacitorcapacity.py @@ -4,5 +4,4 @@ # Subsystem: Tengu Engineering - Augmented Capacitor Reservoir type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Engineering Systems").level - fit.ship.boostItemAttr("capacitorCapacity", module.getModifiedItemAttr("subsystemBonusCaldariEngineering") * level) + fit.ship.boostItemAttr("capacitorCapacity", module.getModifiedItemAttr("subsystemBonusCaldariEngineering"), skill="Caldari Engineering Systems") diff --git a/eos/effects/subsystembonuscaldariengineeringcapacitorrecharge.py b/eos/effects/subsystembonuscaldariengineeringcapacitorrecharge.py index 62c538c3f2..fd4a3737aa 100644 --- a/eos/effects/subsystembonuscaldariengineeringcapacitorrecharge.py +++ b/eos/effects/subsystembonuscaldariengineeringcapacitorrecharge.py @@ -4,5 +4,4 @@ # Subsystem: Tengu Engineering - Capacitor Regeneration Matrix type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Engineering Systems").level - fit.ship.boostItemAttr("rechargeRate", module.getModifiedItemAttr("subsystemBonusCaldariEngineering") * level) + fit.ship.boostItemAttr("rechargeRate", module.getModifiedItemAttr("subsystemBonusCaldariEngineering"), skill="Caldari Engineering Systems") diff --git a/eos/effects/subsystembonuscaldariengineeringheatdamagereduction.py b/eos/effects/subsystembonuscaldariengineeringheatdamagereduction.py index 0206c45ac4..e694e066d9 100644 --- a/eos/effects/subsystembonuscaldariengineeringheatdamagereduction.py +++ b/eos/effects/subsystembonuscaldariengineeringheatdamagereduction.py @@ -4,6 +4,5 @@ # Subsystem: Tengu Engineering - Supplemental Coolant Injector type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Engineering Systems").level fit.modules.filteredItemBoost(lambda mod: True, "heatDamage", - module.getModifiedItemAttr("subsystemBonusCaldariEngineering") * level) + module.getModifiedItemAttr("subsystemBonusCaldariEngineering"), skill="Caldari Engineering Systems") diff --git a/eos/effects/subsystembonuscaldariengineeringpoweroutput.py b/eos/effects/subsystembonuscaldariengineeringpoweroutput.py index 829e13eeaf..1f21a67a41 100644 --- a/eos/effects/subsystembonuscaldariengineeringpoweroutput.py +++ b/eos/effects/subsystembonuscaldariengineeringpoweroutput.py @@ -4,5 +4,4 @@ # Subsystem: Tengu Engineering - Power Core Multiplier type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Engineering Systems").level - fit.ship.boostItemAttr("powerOutput", module.getModifiedItemAttr("subsystemBonusCaldariEngineering") * level) + fit.ship.boostItemAttr("powerOutput", module.getModifiedItemAttr("subsystemBonusCaldariEngineering"), skill="Caldari Engineering Systems") diff --git a/eos/effects/subsystembonuscaldarioffensive2hybridweapondamagemultiplier.py b/eos/effects/subsystembonuscaldarioffensive2hybridweapondamagemultiplier.py index 64bfb93611..ac961adc7b 100644 --- a/eos/effects/subsystembonuscaldarioffensive2hybridweapondamagemultiplier.py +++ b/eos/effects/subsystembonuscaldarioffensive2hybridweapondamagemultiplier.py @@ -4,6 +4,5 @@ # Subsystem: Tengu Offensive - Magnetic Infusion Basin type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "damageMultiplier", module.getModifiedItemAttr("subsystemBonusCaldariOffensive2") * level) + "damageMultiplier", module.getModifiedItemAttr("subsystemBonusCaldariOffensive2"), skill="Caldari Offensive Systems") diff --git a/eos/effects/subsystembonuscaldarioffensive2missilelauncherkineticdamage.py b/eos/effects/subsystembonuscaldarioffensive2missilelauncherkineticdamage.py index efd2a42109..1065c574cb 100644 --- a/eos/effects/subsystembonuscaldarioffensive2missilelauncherkineticdamage.py +++ b/eos/effects/subsystembonuscaldarioffensive2missilelauncherkineticdamage.py @@ -4,6 +4,5 @@ # Subsystem: Tengu Offensive - Accelerated Ejection Bay type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Offensive Systems").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "kineticDamage", module.getModifiedItemAttr("subsystemBonusCaldariOffensive2") * level) + "kineticDamage", module.getModifiedItemAttr("subsystemBonusCaldariOffensive2"), skill="Caldari Offensive Systems") diff --git a/eos/effects/subsystembonuscaldarioffensive3ewstrengthgrav.py b/eos/effects/subsystembonuscaldarioffensive3ewstrengthgrav.py index 061d1cbb1e..94afe30adb 100644 --- a/eos/effects/subsystembonuscaldarioffensive3ewstrengthgrav.py +++ b/eos/effects/subsystembonuscaldarioffensive3ewstrengthgrav.py @@ -4,6 +4,5 @@ # Subsystem: Tengu Offensive - Rifling Launcher Pattern type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", - "scanGravimetricStrengthBonus", module.getModifiedItemAttr("subsystemBonusCaldariOffensive3") * level) + "scanGravimetricStrengthBonus", module.getModifiedItemAttr("subsystemBonusCaldariOffensive3"), skill="Caldari Offensive Systems") diff --git a/eos/effects/subsystembonuscaldarioffensive3ewstrengthladar.py b/eos/effects/subsystembonuscaldarioffensive3ewstrengthladar.py index 84fe1935e5..658b651938 100644 --- a/eos/effects/subsystembonuscaldarioffensive3ewstrengthladar.py +++ b/eos/effects/subsystembonuscaldarioffensive3ewstrengthladar.py @@ -4,6 +4,5 @@ # Subsystem: Tengu Offensive - Rifling Launcher Pattern type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", - "scanLadarStrengthBonus", module.getModifiedItemAttr("subsystemBonusCaldariOffensive3") * level) + "scanLadarStrengthBonus", module.getModifiedItemAttr("subsystemBonusCaldariOffensive3"), skill="Caldari Offensive Systems") diff --git a/eos/effects/subsystembonuscaldarioffensive3ewstrengthmagn.py b/eos/effects/subsystembonuscaldarioffensive3ewstrengthmagn.py index 71393c1012..6ffa0dc1e9 100644 --- a/eos/effects/subsystembonuscaldarioffensive3ewstrengthmagn.py +++ b/eos/effects/subsystembonuscaldarioffensive3ewstrengthmagn.py @@ -4,6 +4,5 @@ # Subsystem: Tengu Offensive - Rifling Launcher Pattern type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", - "scanMagnetometricStrengthBonus", module.getModifiedItemAttr("subsystemBonusCaldariOffensive3") * level) + "scanMagnetometricStrengthBonus", module.getModifiedItemAttr("subsystemBonusCaldariOffensive3"), skill="Caldari Offensive Systems") diff --git a/eos/effects/subsystembonuscaldarioffensive3ewstrengthradar.py b/eos/effects/subsystembonuscaldarioffensive3ewstrengthradar.py index dbd89c6408..d985751d64 100644 --- a/eos/effects/subsystembonuscaldarioffensive3ewstrengthradar.py +++ b/eos/effects/subsystembonuscaldarioffensive3ewstrengthradar.py @@ -4,6 +4,5 @@ # Subsystem: Tengu Offensive - Rifling Launcher Pattern type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", - "scanRadarStrengthBonus", module.getModifiedItemAttr("subsystemBonusCaldariOffensive3") * level) + "scanRadarStrengthBonus", module.getModifiedItemAttr("subsystemBonusCaldariOffensive3"), skill="Caldari Offensive Systems") diff --git a/eos/effects/subsystembonuscaldarioffensive3heavyassaultmissilevelocity.py b/eos/effects/subsystembonuscaldarioffensive3heavyassaultmissilevelocity.py index a692a8edb5..5593d54749 100644 --- a/eos/effects/subsystembonuscaldarioffensive3heavyassaultmissilevelocity.py +++ b/eos/effects/subsystembonuscaldarioffensive3heavyassaultmissilevelocity.py @@ -4,6 +4,5 @@ # Subsystem: Tengu Offensive - Accelerated Ejection Bay type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Offensive Systems").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), - "maxVelocity", module.getModifiedItemAttr("subsystemBonusCaldariOffensive3") * level) + "maxVelocity", module.getModifiedItemAttr("subsystemBonusCaldariOffensive3"), skill="Caldari Offensive Systems") diff --git a/eos/effects/subsystembonuscaldarioffensive3heavymissilevelocity.py b/eos/effects/subsystembonuscaldarioffensive3heavymissilevelocity.py index b9e8663c85..3476f6cd0d 100644 --- a/eos/effects/subsystembonuscaldarioffensive3heavymissilevelocity.py +++ b/eos/effects/subsystembonuscaldarioffensive3heavymissilevelocity.py @@ -4,6 +4,5 @@ # Subsystem: Tengu Offensive - Accelerated Ejection Bay type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Offensive Systems").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), - "maxVelocity", module.getModifiedItemAttr("subsystemBonusCaldariOffensive3") * level) + "maxVelocity", module.getModifiedItemAttr("subsystemBonusCaldariOffensive3"), skill="Caldari Offensive Systems") diff --git a/eos/effects/subsystembonuscaldarioffensiveassaultmissilelauncherrof.py b/eos/effects/subsystembonuscaldarioffensiveassaultmissilelauncherrof.py index cb4a21c1d9..cf89e487f3 100644 --- a/eos/effects/subsystembonuscaldarioffensiveassaultmissilelauncherrof.py +++ b/eos/effects/subsystembonuscaldarioffensiveassaultmissilelauncherrof.py @@ -4,6 +4,5 @@ # Variations of subsystem: Tengu Offensive - Accelerated Ejection Bay (3 of 4) type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Light", - "speed", module.getModifiedItemAttr("subsystemBonusCaldariOffensive") * level) + "speed", module.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") diff --git a/eos/effects/subsystembonuscaldarioffensiveheavyassaultmissilelauncherrof.py b/eos/effects/subsystembonuscaldarioffensiveheavyassaultmissilelauncherrof.py index ba2bf17c2c..c454946075 100644 --- a/eos/effects/subsystembonuscaldarioffensiveheavyassaultmissilelauncherrof.py +++ b/eos/effects/subsystembonuscaldarioffensiveheavyassaultmissilelauncherrof.py @@ -4,6 +4,5 @@ # Variations of subsystem: Tengu Offensive - Accelerated Ejection Bay (3 of 4) type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault", - "speed", module.getModifiedItemAttr("subsystemBonusCaldariOffensive") * level) + "speed", module.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") diff --git a/eos/effects/subsystembonuscaldarioffensiveheavymissilelauncherrof.py b/eos/effects/subsystembonuscaldarioffensiveheavymissilelauncherrof.py index 1a66f96e7d..79fde47fb8 100644 --- a/eos/effects/subsystembonuscaldarioffensiveheavymissilelauncherrof.py +++ b/eos/effects/subsystembonuscaldarioffensiveheavymissilelauncherrof.py @@ -4,6 +4,5 @@ # Variations of subsystem: Tengu Offensive - Accelerated Ejection Bay (3 of 4) type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy", - "speed", module.getModifiedItemAttr("subsystemBonusCaldariOffensive") * level) + "speed", module.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") diff --git a/eos/effects/subsystembonuscaldarioffensivehybridweaponmaxrange.py b/eos/effects/subsystembonuscaldarioffensivehybridweaponmaxrange.py index 17755eaf1c..6d3f59b739 100644 --- a/eos/effects/subsystembonuscaldarioffensivehybridweaponmaxrange.py +++ b/eos/effects/subsystembonuscaldarioffensivehybridweaponmaxrange.py @@ -4,6 +4,5 @@ # Subsystem: Tengu Offensive - Magnetic Infusion Basin type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "maxRange", module.getModifiedItemAttr("subsystemBonusCaldariOffensive") * level) + "maxRange", module.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") diff --git a/eos/effects/subsystembonuscaldaripropulsion2warpcapacitor2.py b/eos/effects/subsystembonuscaldaripropulsion2warpcapacitor2.py index 96d1ab836a..b9d9f76b96 100644 --- a/eos/effects/subsystembonuscaldaripropulsion2warpcapacitor2.py +++ b/eos/effects/subsystembonuscaldaripropulsion2warpcapacitor2.py @@ -4,5 +4,4 @@ # Subsystem: Tengu Propulsion - Gravitational Capacitor type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Propulsion Systems").level - fit.ship.boostItemAttr("warpCapacitorNeed", module.getModifiedItemAttr("subsystemBonusCaldariPropulsion2") * level) + fit.ship.boostItemAttr("warpCapacitorNeed", module.getModifiedItemAttr("subsystemBonusCaldariPropulsion2"), skill="Caldari Propulsion Systems") diff --git a/eos/effects/subsystembonuscaldaripropulsionafterburnerspeedfactor.py b/eos/effects/subsystembonuscaldaripropulsionafterburnerspeedfactor.py index 10a1c21933..d30dc62a56 100644 --- a/eos/effects/subsystembonuscaldaripropulsionafterburnerspeedfactor.py +++ b/eos/effects/subsystembonuscaldaripropulsionafterburnerspeedfactor.py @@ -4,6 +4,5 @@ # Subsystem: Tengu Propulsion - Fuel Catalyst type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Propulsion Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"), - "speedFactor", module.getModifiedItemAttr("subsystemBonusCaldariPropulsion") * level) + "speedFactor", module.getModifiedItemAttr("subsystemBonusCaldariPropulsion"), skill="Caldari Propulsion Systems") diff --git a/eos/effects/subsystembonuscaldaripropulsionagility.py b/eos/effects/subsystembonuscaldaripropulsionagility.py index ca70e8418b..29c2b72f7b 100644 --- a/eos/effects/subsystembonuscaldaripropulsionagility.py +++ b/eos/effects/subsystembonuscaldaripropulsionagility.py @@ -5,5 +5,4 @@ # Subsystem: Tengu Propulsion - Interdiction Nullifier type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Propulsion Systems").level - fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("subsystemBonusCaldariPropulsion") * level) + fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("subsystemBonusCaldariPropulsion"), skill="Caldari Propulsion Systems") diff --git a/eos/effects/subsystembonuscaldaripropulsionwarpspeed.py b/eos/effects/subsystembonuscaldaripropulsionwarpspeed.py index 6e57fa4f09..0d7ee884a7 100644 --- a/eos/effects/subsystembonuscaldaripropulsionwarpspeed.py +++ b/eos/effects/subsystembonuscaldaripropulsionwarpspeed.py @@ -4,5 +4,4 @@ # Subsystem: Tengu Propulsion - Gravitational Capacitor type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Caldari Propulsion Systems").level - fit.ship.boostItemAttr("baseWarpSpeed", module.getModifiedItemAttr("subsystemBonusCaldariPropulsion") * level) + fit.ship.boostItemAttr("baseWarpSpeed", module.getModifiedItemAttr("subsystemBonusCaldariPropulsion"), skill="Caldari Propulsion Systems") diff --git a/eos/effects/subsystembonusgallentedefensive2remotearmorrepairamount.py b/eos/effects/subsystembonusgallentedefensive2remotearmorrepairamount.py index 78d75f96bd..9a8a146782 100644 --- a/eos/effects/subsystembonusgallentedefensive2remotearmorrepairamount.py +++ b/eos/effects/subsystembonusgallentedefensive2remotearmorrepairamount.py @@ -4,6 +4,5 @@ # Subsystem: Proteus Defensive - Adaptive Augmenter type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Defensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer", - "armorDamageAmount", module.getModifiedItemAttr("subsystemBonusGallenteDefensive2") * level) + "armorDamageAmount", module.getModifiedItemAttr("subsystemBonusGallenteDefensive2"), skill="Gallente Defensive Systems") diff --git a/eos/effects/subsystembonusgallentedefensivearmoredwarfare.py b/eos/effects/subsystembonusgallentedefensivearmoredwarfare.py index 5086c53292..d48c4da757 100644 --- a/eos/effects/subsystembonusgallentedefensivearmoredwarfare.py +++ b/eos/effects/subsystembonusgallentedefensivearmoredwarfare.py @@ -4,6 +4,5 @@ # Subsystem: Proteus Defensive - Warfare Processor type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Defensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), - "commandBonus", module.getModifiedItemAttr("subsystemBonusGallenteDefensive") * level) + "commandBonus", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"), skill="Gallente Defensive Systems") diff --git a/eos/effects/subsystembonusgallentedefensivearmorhp.py b/eos/effects/subsystembonusgallentedefensivearmorhp.py index 6ac0616d57..4316696170 100644 --- a/eos/effects/subsystembonusgallentedefensivearmorhp.py +++ b/eos/effects/subsystembonusgallentedefensivearmorhp.py @@ -4,5 +4,4 @@ # Subsystem: Proteus Defensive - Augmented Plating type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Defensive Systems").level - fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("subsystemBonusGallenteDefensive") * level) + fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"), skill="Gallente Defensive Systems") diff --git a/eos/effects/subsystembonusgallentedefensivearmorrepairamount.py b/eos/effects/subsystembonusgallentedefensivearmorrepairamount.py index 2426afd7a2..c3110e4e5f 100644 --- a/eos/effects/subsystembonusgallentedefensivearmorrepairamount.py +++ b/eos/effects/subsystembonusgallentedefensivearmorrepairamount.py @@ -4,6 +4,5 @@ # Subsystem: Proteus Defensive - Nanobot Injector type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Defensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), - "armorDamageAmount", module.getModifiedItemAttr("subsystemBonusGallenteDefensive") * level) + "armorDamageAmount", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"), skill="Gallente Defensive Systems") diff --git a/eos/effects/subsystembonusgallentedefensivearmorresistance.py b/eos/effects/subsystembonusgallentedefensivearmorresistance.py index 8785320715..2b7809ae3d 100644 --- a/eos/effects/subsystembonusgallentedefensivearmorresistance.py +++ b/eos/effects/subsystembonusgallentedefensivearmorresistance.py @@ -4,7 +4,6 @@ # Subsystem: Proteus Defensive - Adaptive Augmenter type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Defensive Systems").level for type in ("Em", "Explosive", "Kinetic", "Thermal"): fit.ship.boostItemAttr("armor{0}DamageResonance".format(type), - module.getModifiedItemAttr("subsystemBonusGallenteDefensive") * level) + module.getModifiedItemAttr("subsystemBonusGallenteDefensive"), skill="Gallente Defensive Systems") diff --git a/eos/effects/subsystembonusgallentedefensiveinformationwarfare.py b/eos/effects/subsystembonusgallentedefensiveinformationwarfare.py index 6c9be98d15..d6086d313e 100644 --- a/eos/effects/subsystembonusgallentedefensiveinformationwarfare.py +++ b/eos/effects/subsystembonusgallentedefensiveinformationwarfare.py @@ -4,6 +4,5 @@ # Subsystem: Proteus Defensive - Warfare Processor type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Defensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), - "commandBonus", module.getModifiedItemAttr("subsystemBonusGallenteDefensive") * level) + "commandBonus", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"), skill="Gallente Defensive Systems") diff --git a/eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py b/eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py index 454d3b7f36..adbf1a301d 100644 --- a/eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py +++ b/eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py @@ -4,6 +4,5 @@ # Subsystem: Proteus Defensive - Warfare Processor type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Defensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), - "commandBonusHidden", module.getModifiedItemAttr("subsystemBonusGallenteDefensive") * level) + "commandBonusHidden", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"), skill="Gallente Defensive Systems") diff --git a/eos/effects/subsystembonusgallentedefensiveskirmishwarfare.py b/eos/effects/subsystembonusgallentedefensiveskirmishwarfare.py index 9b060a9723..c527157084 100644 --- a/eos/effects/subsystembonusgallentedefensiveskirmishwarfare.py +++ b/eos/effects/subsystembonusgallentedefensiveskirmishwarfare.py @@ -4,6 +4,5 @@ # Subsystem: Proteus Defensive - Warfare Processor type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Defensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), - "commandBonus", module.getModifiedItemAttr("subsystemBonusGallenteDefensive") * level) + "commandBonus", module.getModifiedItemAttr("subsystemBonusGallenteDefensive"), skill="Gallente Defensive Systems") diff --git a/eos/effects/subsystembonusgallenteelectronic2maxtargetingrange.py b/eos/effects/subsystembonusgallenteelectronic2maxtargetingrange.py index 12d154a380..7da45acd22 100644 --- a/eos/effects/subsystembonusgallenteelectronic2maxtargetingrange.py +++ b/eos/effects/subsystembonusgallenteelectronic2maxtargetingrange.py @@ -4,5 +4,4 @@ # Subsystem: Proteus Electronics - Dissolution Sequencer type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Electronic Systems").level - fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("subsystemBonusGallenteElectronic2") * level) + fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("subsystemBonusGallenteElectronic2"), skill="Gallente Electronic Systems") diff --git a/eos/effects/subsystembonusgallenteelectronic2tractorbeamrange.py b/eos/effects/subsystembonusgallenteelectronic2tractorbeamrange.py index 98298ca120..8dfab20d79 100644 --- a/eos/effects/subsystembonusgallenteelectronic2tractorbeamrange.py +++ b/eos/effects/subsystembonusgallenteelectronic2tractorbeamrange.py @@ -4,6 +4,5 @@ # Subsystem: Proteus Electronics - Emergent Locus Analyzer type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Electronic Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", - "maxRange", module.getModifiedItemAttr("subsystemBonusGallenteElectronic2") * level) + "maxRange", module.getModifiedItemAttr("subsystemBonusGallenteElectronic2"), skill="Gallente Electronic Systems") diff --git a/eos/effects/subsystembonusgallenteelectronic2tractorbeamvelocity.py b/eos/effects/subsystembonusgallenteelectronic2tractorbeamvelocity.py index c85d0372f9..6ca9ea2504 100644 --- a/eos/effects/subsystembonusgallenteelectronic2tractorbeamvelocity.py +++ b/eos/effects/subsystembonusgallenteelectronic2tractorbeamvelocity.py @@ -4,6 +4,5 @@ # Subsystem: Proteus Electronics - Emergent Locus Analyzer type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Electronic Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", - "maxTractorVelocity", module.getModifiedItemAttr("subsystemBonusGallenteElectronic2") * level) + "maxTractorVelocity", module.getModifiedItemAttr("subsystemBonusGallenteElectronic2"), skill="Gallente Electronic Systems") diff --git a/eos/effects/subsystembonusgallenteelectroniccpu.py b/eos/effects/subsystembonusgallenteelectroniccpu.py index c48a7dea81..9eac793a5f 100644 --- a/eos/effects/subsystembonusgallenteelectroniccpu.py +++ b/eos/effects/subsystembonusgallenteelectroniccpu.py @@ -4,5 +4,4 @@ # Subsystem: Proteus Electronics - CPU Efficiency Gate type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Electronic Systems").level - fit.ship.boostItemAttr("cpuOutput", module.getModifiedItemAttr("subsystemBonusGallenteElectronic") * level) + fit.ship.boostItemAttr("cpuOutput", module.getModifiedItemAttr("subsystemBonusGallenteElectronic"), skill="Gallente Electronic Systems") diff --git a/eos/effects/subsystembonusgallenteelectronicscanprobestrength.py b/eos/effects/subsystembonusgallenteelectronicscanprobestrength.py index 7a4193a59d..3a4bd3292e 100644 --- a/eos/effects/subsystembonusgallenteelectronicscanprobestrength.py +++ b/eos/effects/subsystembonusgallenteelectronicscanprobestrength.py @@ -4,6 +4,5 @@ # Subsystem: Proteus Electronics - Emergent Locus Analyzer type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Electronic Systems").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe", - "baseSensorStrength", module.getModifiedItemAttr("subsystemBonusGallenteElectronic") * level) + "baseSensorStrength", module.getModifiedItemAttr("subsystemBonusGallenteElectronic"), skill="Gallente Electronic Systems") diff --git a/eos/effects/subsystembonusgallenteelectronicscanstrengthmagnetometric.py b/eos/effects/subsystembonusgallenteelectronicscanstrengthmagnetometric.py index de2bc404d1..8c371cc8ff 100644 --- a/eos/effects/subsystembonusgallenteelectronicscanstrengthmagnetometric.py +++ b/eos/effects/subsystembonusgallenteelectronicscanstrengthmagnetometric.py @@ -4,5 +4,4 @@ # Subsystem: Proteus Electronics - Dissolution Sequencer type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Electronic Systems").level - fit.ship.boostItemAttr("scanMagnetometricStrength", module.getModifiedItemAttr("subsystemBonusGallenteElectronic") * level) + fit.ship.boostItemAttr("scanMagnetometricStrength", module.getModifiedItemAttr("subsystemBonusGallenteElectronic"), skill="Gallente Electronic Systems") diff --git a/eos/effects/subsystembonusgallenteelectronicwarpscramblerange.py b/eos/effects/subsystembonusgallenteelectronicwarpscramblerange.py index 9c975d0c3e..9947ef45de 100644 --- a/eos/effects/subsystembonusgallenteelectronicwarpscramblerange.py +++ b/eos/effects/subsystembonusgallenteelectronicwarpscramblerange.py @@ -4,6 +4,5 @@ # Subsystem: Proteus Electronics - Friction Extension Processor type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Electronic Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler", - "maxRange", module.getModifiedItemAttr("subsystemBonusGallenteElectronic") * level) + "maxRange", module.getModifiedItemAttr("subsystemBonusGallenteElectronic"), skill="Gallente Electronic Systems") diff --git a/eos/effects/subsystembonusgallenteengineering2dronemwd.py b/eos/effects/subsystembonusgallenteengineering2dronemwd.py index 619c6e669a..17777c1b54 100644 --- a/eos/effects/subsystembonusgallenteengineering2dronemwd.py +++ b/eos/effects/subsystembonusgallenteengineering2dronemwd.py @@ -4,6 +4,5 @@ # Subsystem: Proteus Engineering - Augmented Capacitor Reservoir type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Engineering Systems").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), "maxVelocity", - module.getModifiedItemAttr("subsystemBonusGallenteEngineering2") * level) + module.getModifiedItemAttr("subsystemBonusGallenteEngineering2"), skill="Gallente Engineering Systems") diff --git a/eos/effects/subsystembonusgallenteengineeringcapacitorrecharge.py b/eos/effects/subsystembonusgallenteengineeringcapacitorrecharge.py index 2a237c9a9d..f338010059 100644 --- a/eos/effects/subsystembonusgallenteengineeringcapacitorrecharge.py +++ b/eos/effects/subsystembonusgallenteengineeringcapacitorrecharge.py @@ -4,5 +4,4 @@ # Subsystem: Proteus Engineering - Capacitor Regeneration Matrix type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Engineering Systems").level - fit.ship.boostItemAttr("rechargeRate", module.getModifiedItemAttr("subsystemBonusGallenteEngineering") * level) + fit.ship.boostItemAttr("rechargeRate", module.getModifiedItemAttr("subsystemBonusGallenteEngineering"), skill="Gallente Engineering Systems") diff --git a/eos/effects/subsystembonusgallenteengineeringdronehp.py b/eos/effects/subsystembonusgallenteengineeringdronehp.py index 84411417b2..2de1c3b93b 100644 --- a/eos/effects/subsystembonusgallenteengineeringdronehp.py +++ b/eos/effects/subsystembonusgallenteengineeringdronehp.py @@ -4,7 +4,6 @@ # Subsystem: Proteus Engineering - Augmented Capacitor Reservoir type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Engineering Systems").level for layer in ("shieldCapacity", "armorHP", "hp"): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), layer, - module.getModifiedItemAttr("subsystemBonusGallenteEngineering") * level) + module.getModifiedItemAttr("subsystemBonusGallenteEngineering"), skill="Gallente Engineering Systems") diff --git a/eos/effects/subsystembonusgallenteengineeringheatdamagereduction.py b/eos/effects/subsystembonusgallenteengineeringheatdamagereduction.py index f1de87cb5d..0d0e988967 100644 --- a/eos/effects/subsystembonusgallenteengineeringheatdamagereduction.py +++ b/eos/effects/subsystembonusgallenteengineeringheatdamagereduction.py @@ -4,6 +4,5 @@ # Subsystem: Proteus Engineering - Supplemental Coolant Injector type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Engineering Systems").level fit.modules.filteredItemBoost(lambda mod: True, "heatDamage", - module.getModifiedItemAttr("subsystemBonusGallenteEngineering") * level) + module.getModifiedItemAttr("subsystemBonusGallenteEngineering"), skill="Gallente Engineering Systems") diff --git a/eos/effects/subsystembonusgallenteengineeringpoweroutput.py b/eos/effects/subsystembonusgallenteengineeringpoweroutput.py index ea1e0d49f6..7deea9d0c7 100644 --- a/eos/effects/subsystembonusgallenteengineeringpoweroutput.py +++ b/eos/effects/subsystembonusgallenteengineeringpoweroutput.py @@ -4,5 +4,4 @@ # Subsystem: Proteus Engineering - Power Core Multiplier type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Engineering Systems").level - fit.ship.boostItemAttr("powerOutput", module.getModifiedItemAttr("subsystemBonusGallenteEngineering") * level) + fit.ship.boostItemAttr("powerOutput", module.getModifiedItemAttr("subsystemBonusGallenteEngineering"), skill="Gallente Engineering Systems") diff --git a/eos/effects/subsystembonusgallenteoffensive2hybridweapondamagemultiplier.py b/eos/effects/subsystembonusgallenteoffensive2hybridweapondamagemultiplier.py index 979db919de..3708570308 100644 --- a/eos/effects/subsystembonusgallenteoffensive2hybridweapondamagemultiplier.py +++ b/eos/effects/subsystembonusgallenteoffensive2hybridweapondamagemultiplier.py @@ -4,6 +4,5 @@ # Variations of subsystem: Proteus Offensive - Dissonic Encoding Platform (3 of 4) type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "damageMultiplier", module.getModifiedItemAttr("subsystemBonusGallenteOffensive2") * level) + "damageMultiplier", module.getModifiedItemAttr("subsystemBonusGallenteOffensive2"), skill="Gallente Offensive Systems") diff --git a/eos/effects/subsystembonusgallenteoffensive3dronedamagemultiplier.py b/eos/effects/subsystembonusgallenteoffensive3dronedamagemultiplier.py index dcace9300c..05d7f77c3f 100644 --- a/eos/effects/subsystembonusgallenteoffensive3dronedamagemultiplier.py +++ b/eos/effects/subsystembonusgallenteoffensive3dronedamagemultiplier.py @@ -4,6 +4,5 @@ # Subsystem: Proteus Offensive - Drone Synthesis Projector type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Offensive Systems").level fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), - "damageMultiplier", module.getModifiedItemAttr("subsystemBonusGallenteOffensive3") * level) + "damageMultiplier", module.getModifiedItemAttr("subsystemBonusGallenteOffensive3"), skill="Gallente Offensive Systems") diff --git a/eos/effects/subsystembonusgallenteoffensive3turrettracking.py b/eos/effects/subsystembonusgallenteoffensive3turrettracking.py index 3b288fe9b0..20fc3544ea 100644 --- a/eos/effects/subsystembonusgallenteoffensive3turrettracking.py +++ b/eos/effects/subsystembonusgallenteoffensive3turrettracking.py @@ -4,6 +4,5 @@ # Subsystem: Proteus Offensive - Dissonic Encoding Platform type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "trackingSpeed", module.getModifiedItemAttr("subsystemBonusGallenteOffensive3") * level) + "trackingSpeed", module.getModifiedItemAttr("subsystemBonusGallenteOffensive3"), skill="Gallente Offensive Systems") diff --git a/eos/effects/subsystembonusgallenteoffensivedronehp.py b/eos/effects/subsystembonusgallenteoffensivedronehp.py index d8d7ad9e3c..8fd52fbed5 100644 --- a/eos/effects/subsystembonusgallenteoffensivedronehp.py +++ b/eos/effects/subsystembonusgallenteoffensivedronehp.py @@ -4,7 +4,6 @@ # Subsystem: Proteus Offensive - Drone Synthesis Projector type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Offensive Systems").level for layer in ("shieldCapacity", "armorHP", "hp"): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), layer, - module.getModifiedItemAttr("subsystemBonusGallenteOffensive") * level) + module.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") diff --git a/eos/effects/subsystembonusgallenteoffensivehybridweapondamagemultiplier.py b/eos/effects/subsystembonusgallenteoffensivehybridweapondamagemultiplier.py index 2a89712460..be39a23e0e 100644 --- a/eos/effects/subsystembonusgallenteoffensivehybridweapondamagemultiplier.py +++ b/eos/effects/subsystembonusgallenteoffensivehybridweapondamagemultiplier.py @@ -4,6 +4,5 @@ # Subsystem: Proteus Offensive - Covert Reconfiguration type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "damageMultiplier", module.getModifiedItemAttr("subsystemBonusGallenteOffensive") * level) + "damageMultiplier", module.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") diff --git a/eos/effects/subsystembonusgallenteoffensivehybridweaponfalloff.py b/eos/effects/subsystembonusgallenteoffensivehybridweaponfalloff.py index a3f041f3ca..e75bbe6863 100644 --- a/eos/effects/subsystembonusgallenteoffensivehybridweaponfalloff.py +++ b/eos/effects/subsystembonusgallenteoffensivehybridweaponfalloff.py @@ -5,6 +5,5 @@ # Subsystem: Proteus Offensive - Hybrid Propulsion Armature type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "falloff", module.getModifiedItemAttr("subsystemBonusGallenteOffensive") * level) + "falloff", module.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") diff --git a/eos/effects/subsystembonusgallentepropulsion2warpcapacitor.py b/eos/effects/subsystembonusgallentepropulsion2warpcapacitor.py index ba950a3f46..ecb625ece4 100644 --- a/eos/effects/subsystembonusgallentepropulsion2warpcapacitor.py +++ b/eos/effects/subsystembonusgallentepropulsion2warpcapacitor.py @@ -4,5 +4,4 @@ # Subsystem: Proteus Propulsion - Gravitational Capacitor type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Propulsion Systems").level - fit.ship.boostItemAttr("warpCapacitorNeed", module.getModifiedItemAttr("subsystemBonusGallentePropulsion2") * level) + fit.ship.boostItemAttr("warpCapacitorNeed", module.getModifiedItemAttr("subsystemBonusGallentePropulsion2"), skill="Gallente Propulsion Systems") diff --git a/eos/effects/subsystembonusgallentepropulsionabmwdcapneed.py b/eos/effects/subsystembonusgallentepropulsionabmwdcapneed.py index d349bce676..7c8955146e 100644 --- a/eos/effects/subsystembonusgallentepropulsionabmwdcapneed.py +++ b/eos/effects/subsystembonusgallentepropulsionabmwdcapneed.py @@ -4,6 +4,5 @@ # Subsystem: Proteus Propulsion - Localized Injectors type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Propulsion Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module", - "capacitorNeed", module.getModifiedItemAttr("subsystemBonusGallentePropulsion") * level) + "capacitorNeed", module.getModifiedItemAttr("subsystemBonusGallentePropulsion"), skill="Gallente Propulsion Systems") diff --git a/eos/effects/subsystembonusgallentepropulsionagility.py b/eos/effects/subsystembonusgallentepropulsionagility.py index ad03ac4c76..bb37162440 100644 --- a/eos/effects/subsystembonusgallentepropulsionagility.py +++ b/eos/effects/subsystembonusgallentepropulsionagility.py @@ -4,5 +4,4 @@ # Subsystem: Proteus Propulsion - Interdiction Nullifier type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Propulsion Systems").level - fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("subsystemBonusGallentePropulsion") * level) + fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("subsystemBonusGallentePropulsion"), skill="Gallente Propulsion Systems") diff --git a/eos/effects/subsystembonusgallentepropulsionmwdpenalty.py b/eos/effects/subsystembonusgallentepropulsionmwdpenalty.py index 544286e40a..ec8701f986 100644 --- a/eos/effects/subsystembonusgallentepropulsionmwdpenalty.py +++ b/eos/effects/subsystembonusgallentepropulsionmwdpenalty.py @@ -4,6 +4,5 @@ # Subsystem: Proteus Propulsion - Wake Limiter type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Propulsion Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"), - "signatureRadiusBonus", module.getModifiedItemAttr("subsystemBonusGallentePropulsion") * level) + "signatureRadiusBonus", module.getModifiedItemAttr("subsystemBonusGallentePropulsion"), skill="Gallente Propulsion Systems") diff --git a/eos/effects/subsystembonusgallentepropulsionwarpspeed.py b/eos/effects/subsystembonusgallentepropulsionwarpspeed.py index d4b08f2248..53bcf1d006 100644 --- a/eos/effects/subsystembonusgallentepropulsionwarpspeed.py +++ b/eos/effects/subsystembonusgallentepropulsionwarpspeed.py @@ -4,5 +4,4 @@ # Subsystem: Proteus Propulsion - Gravitational Capacitor type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Gallente Propulsion Systems").level - fit.ship.boostItemAttr("baseWarpSpeed", module.getModifiedItemAttr("subsystemBonusGallentePropulsion") * level) + fit.ship.boostItemAttr("baseWarpSpeed", module.getModifiedItemAttr("subsystemBonusGallentePropulsion"), skill="Gallente Propulsion Systems") diff --git a/eos/effects/subsystembonusminmatardefensive2remoteshieldtransporteramount.py b/eos/effects/subsystembonusminmatardefensive2remoteshieldtransporteramount.py index 34fb573356..1e5d2c069d 100644 --- a/eos/effects/subsystembonusminmatardefensive2remoteshieldtransporteramount.py +++ b/eos/effects/subsystembonusminmatardefensive2remoteshieldtransporteramount.py @@ -4,6 +4,5 @@ # Subsystem: Loki Defensive - Adaptive Shielding type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Defensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", - "shieldBonus", module.getModifiedItemAttr("subsystemBonusMinmatarDefensive2") * level) + "shieldBonus", module.getModifiedItemAttr("subsystemBonusMinmatarDefensive2"), skill="Minmatar Defensive Systems") diff --git a/eos/effects/subsystembonusminmatardefensivearmoredwarfare.py b/eos/effects/subsystembonusminmatardefensivearmoredwarfare.py index a25ee70542..373b7607fe 100644 --- a/eos/effects/subsystembonusminmatardefensivearmoredwarfare.py +++ b/eos/effects/subsystembonusminmatardefensivearmoredwarfare.py @@ -4,6 +4,5 @@ # Subsystem: Loki Defensive - Warfare Processor type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Defensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), - "commandBonus", module.getModifiedItemAttr("subsystemBonusMinmatarDefensive") * level) + "commandBonus", module.getModifiedItemAttr("subsystemBonusMinmatarDefensive"), skill="Minmatar Defensive Systems") diff --git a/eos/effects/subsystembonusminmatardefensivearmorresistance.py b/eos/effects/subsystembonusminmatardefensivearmorresistance.py index 01a7915da5..3fac3a9a38 100644 --- a/eos/effects/subsystembonusminmatardefensivearmorresistance.py +++ b/eos/effects/subsystembonusminmatardefensivearmorresistance.py @@ -4,7 +4,6 @@ # Subsystem: Loki Defensive - Adaptive Augmenter type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Defensive Systems").level for type in ("Em", "Explosive", "Kinetic", "Thermal"): fit.ship.boostItemAttr("armor{0}DamageResonance".format(type), - module.getModifiedItemAttr("subsystemBonusMinmatarDefensive") * level) + module.getModifiedItemAttr("subsystemBonusMinmatarDefensive"), skill="Minmatar Defensive Systems") diff --git a/eos/effects/subsystembonusminmatardefensiveshieldresistance.py b/eos/effects/subsystembonusminmatardefensiveshieldresistance.py index 0a79b6db0c..30d5ec983c 100644 --- a/eos/effects/subsystembonusminmatardefensiveshieldresistance.py +++ b/eos/effects/subsystembonusminmatardefensiveshieldresistance.py @@ -4,6 +4,5 @@ # Subsystem: Loki Defensive - Adaptive Shielding type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Defensive Systems").level for type in ("Em", "Explosive", "Kinetic", "Thermal"): - fit.ship.boostItemAttr("shield{0}DamageResonance".format(type), module.getModifiedItemAttr("subsystemBonusMinmatarDefensive") * level) + fit.ship.boostItemAttr("shield{0}DamageResonance".format(type), module.getModifiedItemAttr("subsystemBonusMinmatarDefensive"), skill="Minmatar Defensive Systems") diff --git a/eos/effects/subsystembonusminmatardefensivesiegewarfare.py b/eos/effects/subsystembonusminmatardefensivesiegewarfare.py index caca517ab5..0690fde43d 100644 --- a/eos/effects/subsystembonusminmatardefensivesiegewarfare.py +++ b/eos/effects/subsystembonusminmatardefensivesiegewarfare.py @@ -4,6 +4,5 @@ # Subsystem: Loki Defensive - Warfare Processor type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Defensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), - "commandBonus", module.getModifiedItemAttr("subsystemBonusMinmatarDefensive") * level) + "commandBonus", module.getModifiedItemAttr("subsystemBonusMinmatarDefensive"), skill="Minmatar Defensive Systems") diff --git a/eos/effects/subsystembonusminmatardefensivesignatureradius.py b/eos/effects/subsystembonusminmatardefensivesignatureradius.py index c9c7dbc21e..d4731e8b83 100644 --- a/eos/effects/subsystembonusminmatardefensivesignatureradius.py +++ b/eos/effects/subsystembonusminmatardefensivesignatureradius.py @@ -4,5 +4,4 @@ # Subsystem: Loki Defensive - Amplification Node type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Defensive Systems").level - fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("subsystemBonusMinmatarDefensive") * level) + fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("subsystemBonusMinmatarDefensive"), skill="Minmatar Defensive Systems") diff --git a/eos/effects/subsystembonusminmatardefensiveskirmishwarfare.py b/eos/effects/subsystembonusminmatardefensiveskirmishwarfare.py index 4163ecabbb..f21b398422 100644 --- a/eos/effects/subsystembonusminmatardefensiveskirmishwarfare.py +++ b/eos/effects/subsystembonusminmatardefensiveskirmishwarfare.py @@ -4,6 +4,5 @@ # Subsystem: Loki Defensive - Warfare Processor type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Defensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), - "commandBonus", module.getModifiedItemAttr("subsystemBonusMinmatarDefensive") * level) + "commandBonus", module.getModifiedItemAttr("subsystemBonusMinmatarDefensive"), skill="Minmatar Defensive Systems") diff --git a/eos/effects/subsystembonusminmatarelectronic2maxtargetingrange.py b/eos/effects/subsystembonusminmatarelectronic2maxtargetingrange.py index bbac664377..fe4986a7cf 100644 --- a/eos/effects/subsystembonusminmatarelectronic2maxtargetingrange.py +++ b/eos/effects/subsystembonusminmatarelectronic2maxtargetingrange.py @@ -4,5 +4,4 @@ # Subsystem: Loki Electronics - Dissolution Sequencer type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Electronic Systems").level - fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic2") * level) + fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic2"), skill="Minmatar Electronic Systems") diff --git a/eos/effects/subsystembonusminmatarelectronic2scanresolution.py b/eos/effects/subsystembonusminmatarelectronic2scanresolution.py index d2afaf275d..94a58f4e37 100644 --- a/eos/effects/subsystembonusminmatarelectronic2scanresolution.py +++ b/eos/effects/subsystembonusminmatarelectronic2scanresolution.py @@ -4,5 +4,4 @@ # Subsystem: Loki Electronics - Tactical Targeting Network type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Electronic Systems").level - fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic2") * level) + fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic2"), skill="Minmatar Electronic Systems") diff --git a/eos/effects/subsystembonusminmatarelectronic2tractorbeamrange.py b/eos/effects/subsystembonusminmatarelectronic2tractorbeamrange.py index de12f49b5e..17a8867f21 100644 --- a/eos/effects/subsystembonusminmatarelectronic2tractorbeamrange.py +++ b/eos/effects/subsystembonusminmatarelectronic2tractorbeamrange.py @@ -4,6 +4,5 @@ # Subsystem: Loki Electronics - Emergent Locus Analyzer type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Electronic Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", - "maxRange", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic2") * level) + "maxRange", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic2"), skill="Minmatar Electronic Systems") diff --git a/eos/effects/subsystembonusminmatarelectronic2tractorbeamvelocity.py b/eos/effects/subsystembonusminmatarelectronic2tractorbeamvelocity.py index 4158877cfe..4e7eefc04e 100644 --- a/eos/effects/subsystembonusminmatarelectronic2tractorbeamvelocity.py +++ b/eos/effects/subsystembonusminmatarelectronic2tractorbeamvelocity.py @@ -4,6 +4,5 @@ # Subsystem: Loki Electronics - Emergent Locus Analyzer type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Electronic Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", - "maxTractorVelocity", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic2") * level) + "maxTractorVelocity", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic2"), skill="Minmatar Electronic Systems") diff --git a/eos/effects/subsystembonusminmatarelectronicscanprobestrength.py b/eos/effects/subsystembonusminmatarelectronicscanprobestrength.py index 67c1511660..b9f91387bb 100644 --- a/eos/effects/subsystembonusminmatarelectronicscanprobestrength.py +++ b/eos/effects/subsystembonusminmatarelectronicscanprobestrength.py @@ -4,6 +4,5 @@ # Subsystem: Loki Electronics - Emergent Locus Analyzer type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Electronic Systems").level fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name == "Scanner Probe", - "baseSensorStrength", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic") * level) + "baseSensorStrength", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic"), skill="Minmatar Electronic Systems") diff --git a/eos/effects/subsystembonusminmatarelectronicscanstrengthladar.py b/eos/effects/subsystembonusminmatarelectronicscanstrengthladar.py index 806dd4e320..407ebef132 100644 --- a/eos/effects/subsystembonusminmatarelectronicscanstrengthladar.py +++ b/eos/effects/subsystembonusminmatarelectronicscanstrengthladar.py @@ -4,5 +4,4 @@ # Subsystem: Loki Electronics - Dissolution Sequencer type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Electronic Systems").level - fit.ship.boostItemAttr("scanLadarStrength", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic") * level) + fit.ship.boostItemAttr("scanLadarStrength", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic"), skill="Minmatar Electronic Systems") diff --git a/eos/effects/subsystembonusminmatarelectronicstasiswebifierrange.py b/eos/effects/subsystembonusminmatarelectronicstasiswebifierrange.py index b540f90efe..e0eb629c89 100644 --- a/eos/effects/subsystembonusminmatarelectronicstasiswebifierrange.py +++ b/eos/effects/subsystembonusminmatarelectronicstasiswebifierrange.py @@ -4,6 +4,5 @@ # Subsystem: Loki Electronics - Immobility Drivers type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Electronic Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", - "maxRange", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic") * level) + "maxRange", module.getModifiedItemAttr("subsystemBonusMinmatarElectronic"), skill="Minmatar Electronic Systems") diff --git a/eos/effects/subsystembonusminmatarengineeringcapacitorcapacity.py b/eos/effects/subsystembonusminmatarengineeringcapacitorcapacity.py index b24d0530fa..7302b91498 100644 --- a/eos/effects/subsystembonusminmatarengineeringcapacitorcapacity.py +++ b/eos/effects/subsystembonusminmatarengineeringcapacitorcapacity.py @@ -4,5 +4,4 @@ # Subsystem: Loki Engineering - Augmented Capacitor Reservoir type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Engineering Systems").level - fit.ship.boostItemAttr("capacitorCapacity", module.getModifiedItemAttr("subsystemBonusMinmatarEngineering") * level) + fit.ship.boostItemAttr("capacitorCapacity", module.getModifiedItemAttr("subsystemBonusMinmatarEngineering"), skill="Minmatar Engineering Systems") diff --git a/eos/effects/subsystembonusminmatarengineeringcapacitorrecharge.py b/eos/effects/subsystembonusminmatarengineeringcapacitorrecharge.py index 62b417eafa..231e7b86ec 100644 --- a/eos/effects/subsystembonusminmatarengineeringcapacitorrecharge.py +++ b/eos/effects/subsystembonusminmatarengineeringcapacitorrecharge.py @@ -4,5 +4,4 @@ # Subsystem: Loki Engineering - Capacitor Regeneration Matrix type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Engineering Systems").level - fit.ship.boostItemAttr("rechargeRate", module.getModifiedItemAttr("subsystemBonusMinmatarEngineering") * level) + fit.ship.boostItemAttr("rechargeRate", module.getModifiedItemAttr("subsystemBonusMinmatarEngineering"), skill="Minmatar Engineering Systems") diff --git a/eos/effects/subsystembonusminmatarengineeringheatdamagereduction.py b/eos/effects/subsystembonusminmatarengineeringheatdamagereduction.py index ce54dee490..d66dcc378c 100644 --- a/eos/effects/subsystembonusminmatarengineeringheatdamagereduction.py +++ b/eos/effects/subsystembonusminmatarengineeringheatdamagereduction.py @@ -4,6 +4,5 @@ # Subsystem: Loki Engineering - Supplemental Coolant Injector type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Engineering Systems").level fit.modules.filteredItemBoost(lambda mod: True, "heatDamage", - module.getModifiedItemAttr("subsystemBonusMinmatarEngineering") * level) + module.getModifiedItemAttr("subsystemBonusMinmatarEngineering"), skill="Minmatar Engineering Systems") diff --git a/eos/effects/subsystembonusminmatarengineeringpoweroutput.py b/eos/effects/subsystembonusminmatarengineeringpoweroutput.py index 938e567cd5..b54d6413dd 100644 --- a/eos/effects/subsystembonusminmatarengineeringpoweroutput.py +++ b/eos/effects/subsystembonusminmatarengineeringpoweroutput.py @@ -4,5 +4,4 @@ # Subsystem: Loki Engineering - Power Core Multiplier type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Engineering Systems").level - fit.ship.boostItemAttr("powerOutput", module.getModifiedItemAttr("subsystemBonusMinmatarEngineering") * level) + fit.ship.boostItemAttr("powerOutput", module.getModifiedItemAttr("subsystemBonusMinmatarEngineering"), skill="Minmatar Engineering Systems") diff --git a/eos/effects/subsystembonusminmataroffensive2projectileweapondamagemultiplier.py b/eos/effects/subsystembonusminmataroffensive2projectileweapondamagemultiplier.py index ff2c8f296c..468ec49060 100644 --- a/eos/effects/subsystembonusminmataroffensive2projectileweapondamagemultiplier.py +++ b/eos/effects/subsystembonusminmataroffensive2projectileweapondamagemultiplier.py @@ -4,6 +4,5 @@ # Subsystem: Loki Offensive - Turret Concurrence Registry type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), - "damageMultiplier", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive2") * level) + "damageMultiplier", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive2"), skill="Minmatar Offensive Systems") diff --git a/eos/effects/subsystembonusminmataroffensive2projectileweaponrof.py b/eos/effects/subsystembonusminmataroffensive2projectileweaponrof.py index 8c0b3ef225..fcae6bbf86 100644 --- a/eos/effects/subsystembonusminmataroffensive2projectileweaponrof.py +++ b/eos/effects/subsystembonusminmataroffensive2projectileweaponrof.py @@ -5,6 +5,5 @@ # Subsystem: Loki Offensive - Projectile Scoping Array type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), - "speed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive2") * level) + "speed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive2"), skill="Minmatar Offensive Systems") diff --git a/eos/effects/subsystembonusminmataroffensive3turrettracking.py b/eos/effects/subsystembonusminmataroffensive3turrettracking.py index c9a52aa22c..5a3a693f29 100644 --- a/eos/effects/subsystembonusminmataroffensive3turrettracking.py +++ b/eos/effects/subsystembonusminmataroffensive3turrettracking.py @@ -4,6 +4,5 @@ # Subsystem: Loki Offensive - Turret Concurrence Registry type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), - "trackingSpeed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive3") * level) + "trackingSpeed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive3"), skill="Minmatar Offensive Systems") diff --git a/eos/effects/subsystembonusminmataroffensiveassaultmissilelauncherrof.py b/eos/effects/subsystembonusminmataroffensiveassaultmissilelauncherrof.py index 7822fb3b89..2b42b19a07 100644 --- a/eos/effects/subsystembonusminmataroffensiveassaultmissilelauncherrof.py +++ b/eos/effects/subsystembonusminmataroffensiveassaultmissilelauncherrof.py @@ -4,6 +4,5 @@ # Subsystem: Loki Offensive - Hardpoint Efficiency Configuration type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Light", - "speed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive") * level) + "speed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") diff --git a/eos/effects/subsystembonusminmataroffensiveheavyassaultmissilelauncherrof.py b/eos/effects/subsystembonusminmataroffensiveheavyassaultmissilelauncherrof.py index f258a8076e..ed45887c39 100644 --- a/eos/effects/subsystembonusminmataroffensiveheavyassaultmissilelauncherrof.py +++ b/eos/effects/subsystembonusminmataroffensiveheavyassaultmissilelauncherrof.py @@ -4,6 +4,5 @@ # Subsystem: Loki Offensive - Hardpoint Efficiency Configuration type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault", - "speed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive") * level) + "speed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") diff --git a/eos/effects/subsystembonusminmataroffensiveheavymissilelauncherrof.py b/eos/effects/subsystembonusminmataroffensiveheavymissilelauncherrof.py index 4ca177fdc4..e9c64b241d 100644 --- a/eos/effects/subsystembonusminmataroffensiveheavymissilelauncherrof.py +++ b/eos/effects/subsystembonusminmataroffensiveheavymissilelauncherrof.py @@ -4,6 +4,5 @@ # Subsystem: Loki Offensive - Hardpoint Efficiency Configuration type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy", - "speed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive") * level) + "speed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") diff --git a/eos/effects/subsystembonusminmataroffensiveprojectileweaponfalloff.py b/eos/effects/subsystembonusminmataroffensiveprojectileweaponfalloff.py index de2cd630dd..636023d12c 100644 --- a/eos/effects/subsystembonusminmataroffensiveprojectileweaponfalloff.py +++ b/eos/effects/subsystembonusminmataroffensiveprojectileweaponfalloff.py @@ -4,6 +4,5 @@ # Subsystem: Loki Offensive - Projectile Scoping Array type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), - "falloff", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive") * level) + "falloff", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") diff --git a/eos/effects/subsystembonusminmataroffensiveprojectileweaponmaxrange.py b/eos/effects/subsystembonusminmataroffensiveprojectileweaponmaxrange.py index aac4c2ce17..d90ff14f2c 100644 --- a/eos/effects/subsystembonusminmataroffensiveprojectileweaponmaxrange.py +++ b/eos/effects/subsystembonusminmataroffensiveprojectileweaponmaxrange.py @@ -4,6 +4,5 @@ # Subsystem: Loki Offensive - Turret Concurrence Registry type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), - "maxRange", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive") * level) + "maxRange", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") diff --git a/eos/effects/subsystembonusminmataroffensiveprojectileweaponrof.py b/eos/effects/subsystembonusminmataroffensiveprojectileweaponrof.py index 7340be4f81..d7ec0fc3de 100644 --- a/eos/effects/subsystembonusminmataroffensiveprojectileweaponrof.py +++ b/eos/effects/subsystembonusminmataroffensiveprojectileweaponrof.py @@ -4,6 +4,5 @@ # Subsystem: Loki Offensive - Covert Reconfiguration type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Offensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), - "speed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive") * level) + "speed", module.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") diff --git a/eos/effects/subsystembonusminmatarpropulsionafterburnerspeedfactor.py b/eos/effects/subsystembonusminmatarpropulsionafterburnerspeedfactor.py index f057ed7a19..da593a70f9 100644 --- a/eos/effects/subsystembonusminmatarpropulsionafterburnerspeedfactor.py +++ b/eos/effects/subsystembonusminmatarpropulsionafterburnerspeedfactor.py @@ -4,6 +4,5 @@ # Subsystem: Loki Propulsion - Fuel Catalyst type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Propulsion Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"), - "speedFactor", module.getModifiedItemAttr("subsystemBonusMinmatarPropulsion") * level) + "speedFactor", module.getModifiedItemAttr("subsystemBonusMinmatarPropulsion"), skill="Minmatar Propulsion Systems") diff --git a/eos/effects/subsystembonusminmatarpropulsionagility.py b/eos/effects/subsystembonusminmatarpropulsionagility.py index f315a01bf8..347692df7e 100644 --- a/eos/effects/subsystembonusminmatarpropulsionagility.py +++ b/eos/effects/subsystembonusminmatarpropulsionagility.py @@ -5,5 +5,4 @@ # Subsystem: Loki Propulsion - Interdiction Nullifier type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Propulsion Systems").level - fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("subsystemBonusMinmatarPropulsion") * level) + fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("subsystemBonusMinmatarPropulsion"), skill="Minmatar Propulsion Systems") diff --git a/eos/effects/subsystembonusminmatarpropulsionmaxvelocity.py b/eos/effects/subsystembonusminmatarpropulsionmaxvelocity.py index 666e6e90bd..a43ce9df81 100644 --- a/eos/effects/subsystembonusminmatarpropulsionmaxvelocity.py +++ b/eos/effects/subsystembonusminmatarpropulsionmaxvelocity.py @@ -4,5 +4,4 @@ # Subsystem: Loki Propulsion - Chassis Optimization type = "passive" def handler(fit, module, context): - level = fit.character.getSkill("Minmatar Propulsion Systems").level - fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("subsystemBonusMinmatarPropulsion") * level) + fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("subsystemBonusMinmatarPropulsion"), skill="Minmatar Propulsion Systems") diff --git a/eos/effects/titanamarrlaserdmg3.py b/eos/effects/titanamarrlaserdmg3.py index fa4338a1e1..f265306e37 100644 --- a/eos/effects/titanamarrlaserdmg3.py +++ b/eos/effects/titanamarrlaserdmg3.py @@ -4,6 +4,5 @@ # Ship: Avatar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Titan").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"), - "damageMultiplier", ship.getModifiedItemAttr("titanAmarrBonus3") * level) + "damageMultiplier", ship.getModifiedItemAttr("titanAmarrBonus3"), skill="Amarr Titan") diff --git a/eos/effects/titanamarrleadershipmoduleamount4.py b/eos/effects/titanamarrleadershipmoduleamount4.py index 2df94d628e..71fd418113 100644 --- a/eos/effects/titanamarrleadershipmoduleamount4.py +++ b/eos/effects/titanamarrleadershipmoduleamount4.py @@ -4,6 +4,5 @@ # Ship: Avatar type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Titan").level fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator", - "maxGroupActive", ship.getModifiedItemAttr("titanAmarrBonus4") * level) + "maxGroupActive", ship.getModifiedItemAttr("titanAmarrBonus4"), skill="Amarr Titan") diff --git a/eos/effects/titancaldarileadershipmoduleamount4.py b/eos/effects/titancaldarileadershipmoduleamount4.py index 1ef52b78fa..73df23284b 100644 --- a/eos/effects/titancaldarileadershipmoduleamount4.py +++ b/eos/effects/titancaldarileadershipmoduleamount4.py @@ -4,6 +4,5 @@ # Ship: Leviathan type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Titan").level fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator", - "maxGroupActive", ship.getModifiedItemAttr("titanCaldariBonus4") * level) + "maxGroupActive", ship.getModifiedItemAttr("titanCaldariBonus4"), skill="Caldari Titan") diff --git a/eos/effects/titancaldarimissilekineticdmg2.py b/eos/effects/titancaldarimissilekineticdmg2.py index 23e6697e3f..9757dea92a 100644 --- a/eos/effects/titancaldarimissilekineticdmg2.py +++ b/eos/effects/titancaldarimissilekineticdmg2.py @@ -4,7 +4,6 @@ # Ship: Leviathan type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Titan").level groups = ("Citadel Torpedo", "Citadel Cruise") fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in groups, - "kineticDamage", ship.getModifiedItemAttr("shipBonusCT1") * level) + "kineticDamage", ship.getModifiedItemAttr("shipBonusCT1"), skill="Caldari Titan") diff --git a/eos/effects/titangallentehybriddamage1.py b/eos/effects/titangallentehybriddamage1.py index bd1a20848d..cb53fe7109 100644 --- a/eos/effects/titangallentehybriddamage1.py +++ b/eos/effects/titangallentehybriddamage1.py @@ -4,6 +4,5 @@ # Ship: Erebus type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Titan").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), - "damageMultiplier", ship.getModifiedItemAttr("titanGallenteBonus1") * level) + "damageMultiplier", ship.getModifiedItemAttr("titanGallenteBonus1"), skill="Gallente Titan") diff --git a/eos/effects/titangallenteleadershipmoduleamount4.py b/eos/effects/titangallenteleadershipmoduleamount4.py index 0c904d7a3a..f78c15661d 100644 --- a/eos/effects/titangallenteleadershipmoduleamount4.py +++ b/eos/effects/titangallenteleadershipmoduleamount4.py @@ -4,6 +4,5 @@ # Ship: Erebus type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Titan").level fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator", - "maxGroupActive", ship.getModifiedItemAttr("titanGallenteBonus4") * level) + "maxGroupActive", ship.getModifiedItemAttr("titanGallenteBonus4"), skill="Gallente Titan") diff --git a/eos/effects/titanminmatarleadershipmoduleamount4.py b/eos/effects/titanminmatarleadershipmoduleamount4.py index f6f75c2175..e955fb0607 100644 --- a/eos/effects/titanminmatarleadershipmoduleamount4.py +++ b/eos/effects/titanminmatarleadershipmoduleamount4.py @@ -4,6 +4,5 @@ # Ship: Ragnarok type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Titan").level fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator", - "maxGroupActive", ship.getModifiedItemAttr("titanMinmatarBonus4") * level) + "maxGroupActive", ship.getModifiedItemAttr("titanMinmatarBonus4"), skill="Minmatar Titan") diff --git a/eos/effects/titanminmatarprojectiledmg3.py b/eos/effects/titanminmatarprojectiledmg3.py index 4e18f9ce35..568ffd8664 100644 --- a/eos/effects/titanminmatarprojectiledmg3.py +++ b/eos/effects/titanminmatarprojectiledmg3.py @@ -4,6 +4,5 @@ # Ship: Ragnarok type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Titan").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"), - "damageMultiplier", ship.getModifiedItemAttr("titanMinmatarBonus3") * level) + "damageMultiplier", ship.getModifiedItemAttr("titanMinmatarBonus3"), skill="Minmatar Titan") diff --git a/eos/effects/zcolinorcacargobonus.py b/eos/effects/zcolinorcacargobonus.py index bcd8cbde1f..ba78fadec0 100644 --- a/eos/effects/zcolinorcacargobonus.py +++ b/eos/effects/zcolinorcacargobonus.py @@ -4,5 +4,4 @@ # Ship: Orca type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Industrial Command Ships").level - fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("shipOrcaCargoBonusOrca1") * level) + fit.ship.boostItemAttr("capacity", ship.getModifiedItemAttr("shipOrcaCargoBonusOrca1"), skill="Industrial Command Ships") diff --git a/eos/effects/zcolinorcaforemanmodbonus.py b/eos/effects/zcolinorcaforemanmodbonus.py index ad483b8fb0..9c536a9a02 100644 --- a/eos/effects/zcolinorcaforemanmodbonus.py +++ b/eos/effects/zcolinorcaforemanmodbonus.py @@ -4,6 +4,5 @@ # Ship: Orca type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Industrial Command Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Director"), - "commandBonus", ship.getModifiedItemAttr("shipOrcaForemanBonus") * level) + "commandBonus", ship.getModifiedItemAttr("shipOrcaForemanBonus"), skill="Industrial Command Ships") diff --git a/eos/modifiedAttributeDict.py b/eos/modifiedAttributeDict.py index 09497be2a1..d4b2fdd229 100644 --- a/eos/modifiedAttributeDict.py +++ b/eos/modifiedAttributeDict.py @@ -202,6 +202,18 @@ def __calculateValue(self, key): return val + def __handleSkill(self, skillName): + """ + Since ship skill bonuses do not directly modify the attributes, it does + not register as an affector (instead, the ship itself is the affector). + To fix this, we pass the skill which ends up here, where we register it + with the fit and thus get the correct affector. Returns skill level to + be used to modify modifier. See GH issue #101 + """ + skill = self.fit.character.getSkill(skillName) + self.fit.register(skill) + return skill.level + def getAfflictions(self, key): return self.__affectedBy[key] if key in self.__affectedBy else {} @@ -236,10 +248,13 @@ def preAssign(self, attributeName, value): self.__placehold(attributeName) self.__afflict(attributeName, "=", value, value != self.getOriginal(attributeName)) - def increase(self, attributeName, increase, position="pre"): + def increase(self, attributeName, increase, position="pre", skill=None): """Increase value of given attribute by given number""" # Increases applied before multiplications and after them are # written in separate maps + if skill: + increase *= self.__handleSkill(skill) + if position == "pre": tbl = self.__preIncreases elif position == "post": @@ -252,10 +267,13 @@ def increase(self, attributeName, increase, position="pre"): self.__placehold(attributeName) self.__afflict(attributeName, "+", increase, increase != 0) - def multiply(self, attributeName, multiplier, stackingPenalties=False, penaltyGroup="default"): + def multiply(self, attributeName, multiplier, stackingPenalties=False, penaltyGroup="default", skill=None): """Multiply value of given attribute by given factor""" # If we're asked to do stacking penalized multiplication, append values # to per penalty group lists + if skill: + multiplier *= self.__handleSkill(skill) + if stackingPenalties: if not attributeName in self.__penalizedMultipliers: self.__penalizedMultipliers[attributeName] = {} @@ -271,9 +289,11 @@ def multiply(self, attributeName, multiplier, stackingPenalties=False, penaltyGr self.__placehold(attributeName) self.__afflict(attributeName, "%s*" % ("s" if stackingPenalties else ""), multiplier, multiplier != 1) - def boost(self, attributeName, boostFactor, *args, **kwargs): + def boost(self, attributeName, boostFactor, skill=None, *args, **kwargs): """Boost value by some percentage""" # We just transform percentage boost into multiplication factor + if skill: + boostFactor *= self.__handleSkill(skill) self.multiply(attributeName, 1 + boostFactor / 100.0, *args, **kwargs) def force(self, attributeName, value): diff --git a/eos/saveddata/character.py b/eos/saveddata/character.py index c3e4765264..84e5a67632 100644 --- a/eos/saveddata/character.py +++ b/eos/saveddata/character.py @@ -105,10 +105,11 @@ def init(self): for skill in self.__skills: self.__skillIdMap[skill.itemID] = skill - def apiUpdateCharSheet(self, sheet): + def apiUpdateCharSheet(self, skills): del self.__skills[:] self.__skillIdMap.clear() - for skillRow in sheet.skills: + for skillRow in skills: + self.addSkill(Skill(skillRow["typeID"], skillRow["level"])) @property @@ -203,23 +204,24 @@ def __init__(self, item, level = 0, ro = False, learned = True): self.itemID = item.ID if not isinstance(item, int) else item self.__level = level if learned else None self.commandBonus = 0 - self.learned = learned self.build(ro) @reconstructor def init(self): self.build(False) - self.learned = self.__level is not None self.__item = None def build(self, ro): self.__ro = ro self.__suppressed = False + @property + def learned(self): + return self.__level is not None + @property def level(self): - if not self.learned: return 0 - else: return self.__level or 0 + return self.__level or 0 @level.setter def level(self, level): @@ -230,7 +232,6 @@ def level(self, level): raise ReadOnlyException() self.__level = level - self.learned = True @property def item(self): @@ -254,11 +255,11 @@ def calculateModifiedAttributes(self, fit, runTime): return for effect in item.effects.itervalues(): - if effect.runTime == runTime and effect.isType("passive"): - try: - effect.handler(fit, self, ("skill",)) - except AttributeError: - continue + if effect.runTime == runTime and effect.isType("passive"): + try: + effect.handler(fit, self, ("skill",)) + except AttributeError: + continue def clear(self): self.__suppressed = False diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py index 4f9f3e8679..2e19f53766 100644 --- a/eos/saveddata/fit.py +++ b/eos/saveddata/fit.py @@ -611,7 +611,7 @@ def getSlotsFree(self, type, countDummies=False): @property def calibrationUsed(self): - return self.getItemAttrSum(self.modules, 'upgradeCost') + return self.getItemAttrOnlineSum(self.modules, 'upgradeCost') @property def pgUsed(self): @@ -1004,4 +1004,4 @@ def __repr__(self): def __str__(self): return "{} ({})".format( self.name, self.ship.item.name - ) \ No newline at end of file + ) diff --git a/gui/builtinContextMenus/__init__.py b/gui/builtinContextMenus/__init__.py index b9fb3386d7..d1da03023d 100644 --- a/gui/builtinContextMenus/__init__.py +++ b/gui/builtinContextMenus/__init__.py @@ -14,7 +14,7 @@ "whProjector", "cargo", "shipJump", - #"changeAffectingSkills", + "changeAffectingSkills", "tacticalMode", "targetResists", "priceClear", diff --git a/gui/builtinContextMenus/changeAffectingSkills.py b/gui/builtinContextMenus/changeAffectingSkills.py index cfffddaff5..32530bdb65 100644 --- a/gui/builtinContextMenus/changeAffectingSkills.py +++ b/gui/builtinContextMenus/changeAffectingSkills.py @@ -12,7 +12,7 @@ def __init__(self): self.mainFrame = gui.mainFrame.MainFrame.getInstance() def display(self, srcContext, selection): - if self.mainFrame.getActiveFit() is None or srcContext not in ("fittingModule", "fittingShip"): + if self.mainFrame.getActiveFit() is None or srcContext not in ("fittingModule", "fittingCharge", "fittingShip"): return False self.sChar = service.Character.getInstance() @@ -32,7 +32,7 @@ def display(self, srcContext, selection): self.stuff = selection[0] cont = self.stuff.itemModifiedAttributes - self.skills = [] + skills = set() for attrName in cont.iterAfflictions(): if cont[attrName] == 0: @@ -44,9 +44,9 @@ def display(self, srcContext, selection): if not isinstance(afflictor, Skill): continue - self.skills.append(afflictor) - self.skills.sort(key=lambda x: x.item.name) + skills.add(afflictor) + self.skills = sorted(skills, key=lambda x: x.item.name) return len(self.skills) > 0 def getText(self, itmContext, selection): @@ -81,7 +81,8 @@ def getSubMenu(self, context, selection, rootMenu, i, pitem): for i in xrange(-1, 6): levelItem = self.addSkill(rootMenu if msw else grandSub, skill, i) grandSub.AppendItem(levelItem) - #@ todo: add check to current level. Need to fix #109 first + if (not skill.learned and i == -1) or (skill.learned and skill.level == i): + levelItem.Check(True) sub.AppendItem(skillItem) return sub diff --git a/service/character.py b/service/character.py index af4b431067..1f2c789005 100644 --- a/service/character.py +++ b/service/character.py @@ -45,13 +45,34 @@ def run(self): sCharacter = Character.getInstance() for path in paths: try: + # we try to parse api XML data first with open(path, mode='r') as charFile: sheet = service.ParseXML(charFile) charID = sCharacter.new() sCharacter.rename(charID, sheet.name+" (imported)") - sCharacter.apiUpdateCharSheet(charID, sheet) + sCharacter.apiUpdateCharSheet(charID, sheet.skills) except: - continue + # if it's not api XML data, try this + # this is a horrible logic flow, but whatever + try: + charFile = open(path, mode='r').read() + doc = minidom.parseString(charFile) + if doc.documentElement.tagName != "SerializableCCPCharacter": + raise RuntimeError("Incorrect EVEMon XML sheet") + name = doc.getElementsByTagName("name")[0].firstChild.nodeValue + skill_els = doc.getElementsByTagName("skill") + skills = [] + for skill in skill_els: + skills.append({ + "typeID": int(skill.getAttribute("typeID")), + "level": int(skill.getAttribute("level")), + }) + charID = sCharacter.new() + sCharacter.rename(charID, name+" (EVEMon)") + sCharacter.apiUpdateCharSheet(charID, skills) + except: + continue + wx.CallAfter(self.callback) class SkillBackupThread(threading.Thread): @@ -269,19 +290,18 @@ def apiFetch(self, charID, charName): sheet = auth.character(charID).CharacterSheet() - dbChar.apiUpdateCharSheet(sheet) + dbChar.apiUpdateCharSheet(sheet.skills) eos.db.commit() - def apiUpdateCharSheet(self, charID, sheet): + def apiUpdateCharSheet(self, charID, skills): char = eos.db.getCharacter(charID) - char.apiUpdateCharSheet(sheet) + char.apiUpdateCharSheet(skills) eos.db.commit() def changeLevel(self, charID, skillID, level): char = eos.db.getCharacter(charID) skill = char.getSkill(skillID) if isinstance(level, basestring) or level > 5 or level < 0: - skill.learned = False skill.level = None else: skill.level = level