diff --git a/eos/effects/elitebonuscoveropswarpvelocity1.py b/eos/effects/elitebonuscoveropswarpvelocity1.py index 04d6188fd..6a661ae0f 100644 --- a/eos/effects/elitebonuscoveropswarpvelocity1.py +++ b/eos/effects/elitebonuscoveropswarpvelocity1.py @@ -4,5 +4,4 @@ # Ship: Pacifier type = "passive" def handler(fit, src, context): - lvl = src.level - fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("eliteBonusCoverOps1") * lvl, skill="Covert Ops") + fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("eliteBonusCoverOps1"), skill="Covert Ops") diff --git a/eos/effects/elitebonusreconwarpvelocity3.py b/eos/effects/elitebonusreconwarpvelocity3.py index a48540754..9d7f98dfc 100644 --- a/eos/effects/elitebonusreconwarpvelocity3.py +++ b/eos/effects/elitebonusreconwarpvelocity3.py @@ -4,5 +4,4 @@ # Ship: Enforcer type = "passive" def handler(fit, src, context): - lvl = src.level - fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("eliteBonusReconShip3") * lvl, skill="Recon Ships") + fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships") diff --git a/eos/effects/elitereconstasiswebbonus1.py b/eos/effects/elitereconstasiswebbonus1.py index 7ffc1fede..0a05274f4 100644 --- a/eos/effects/elitereconstasiswebbonus1.py +++ b/eos/effects/elitereconstasiswebbonus1.py @@ -4,5 +4,4 @@ # Ship: Enforcer type = "passive" def handler(fit, src, context): - lvl = src.level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange", src.getModifiedItemAttr("eliteBonusReconShip1") * lvl, skill="Recon Ships") + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange", src.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships") diff --git a/eos/effects/shipbonusdreadnoughta1energywarfareamountbonus.py b/eos/effects/shipbonusdreadnoughta1energywarfareamountbonus.py index 830bc1e35..527eba0c2 100644 --- a/eos/effects/shipbonusdreadnoughta1energywarfareamountbonus.py +++ b/eos/effects/shipbonusdreadnoughta1energywarfareamountbonus.py @@ -4,6 +4,5 @@ # Ship: Chemosh type = "passive" def handler(fit, src, context): - lvl = src.level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferAmount", src.getModifiedItemAttr("shipBonusDreadnoughtA1") * lvl, skill="Amarr Dreadnought") - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyNeutralizerAmount", src.getModifiedItemAttr("shipBonusDreadnoughtA1") * lvl, skill="Amarr Dreadnought") + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferAmount", src.getModifiedItemAttr("shipBonusDreadnoughtA1"), skill="Amarr Dreadnought") + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyNeutralizerAmount", src.getModifiedItemAttr("shipBonusDreadnoughtA1"), skill="Amarr Dreadnought") diff --git a/eos/effects/shipbonusdreadnoughtm1webrangebonus.py b/eos/effects/shipbonusdreadnoughtm1webrangebonus.py index a4d965ee9..d258b3efc 100644 --- a/eos/effects/shipbonusdreadnoughtm1webrangebonus.py +++ b/eos/effects/shipbonusdreadnoughtm1webrangebonus.py @@ -4,5 +4,4 @@ # Ship: Chemosh type = "passive" def handler(fit, src, context): - lvl = src.level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange", src.getModifiedItemAttr("shipBonusDreadnoughtM1") * lvl, skill="Minmatar Dreadnought") + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange", src.getModifiedItemAttr("shipBonusDreadnoughtM1"), skill="Minmatar Dreadnought") diff --git a/eos/effects/shipbonusforceauxiliarya1nosferatudrainamount.py b/eos/effects/shipbonusforceauxiliarya1nosferatudrainamount.py index 454588069..9544149f1 100644 --- a/eos/effects/shipbonusforceauxiliarya1nosferatudrainamount.py +++ b/eos/effects/shipbonusforceauxiliarya1nosferatudrainamount.py @@ -4,5 +4,4 @@ # Ship: Dagon type = "passive" def handler(fit, src, context): - lvl = src.level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1") * lvl, skill="Amarr Carrier") + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferAmount", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"), skill="Amarr Carrier") diff --git a/eos/effects/shipbonusforceauxiliarya1nosferaturangebonus.py b/eos/effects/shipbonusforceauxiliarya1nosferaturangebonus.py index f52f20361..aabd0b7fb 100644 --- a/eos/effects/shipbonusforceauxiliarya1nosferaturangebonus.py +++ b/eos/effects/shipbonusforceauxiliarya1nosferaturangebonus.py @@ -4,6 +4,5 @@ # Ship: Dagon type = "passive" def handler(fit, src, context): - lvl = src.level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1") * lvl, skill="Amarr Carrier") - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1") * lvl, skill="Amarr Carrier") + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "maxRange", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"), skill="Amarr Carrier") + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "falloffEffectiveness", src.getModifiedItemAttr("shipBonusForceAuxiliaryA1"), skill="Amarr Carrier") diff --git a/eos/effects/shipbonusforceauxiliarym1remotearmorrepairduration.py b/eos/effects/shipbonusforceauxiliarym1remotearmorrepairduration.py index f8fc6a8b4..cec5a745e 100644 --- a/eos/effects/shipbonusforceauxiliarym1remotearmorrepairduration.py +++ b/eos/effects/shipbonusforceauxiliarym1remotearmorrepairduration.py @@ -4,5 +4,4 @@ # Ship: Dagon type = "passive" def handler(fit, src, context): - lvl = src.level - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "duration", src.getModifiedItemAttr("shipBonusForceAuxiliaryM1") * lvl, skill="Minmatar Carrier") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "duration", src.getModifiedItemAttr("shipBonusForceAuxiliaryM1"), skill="Minmatar Carrier") diff --git a/eos/effects/shipbonusmedmissileflighttimecc2.py b/eos/effects/shipbonusmedmissileflighttimecc2.py index d3045a91d..7bf6a461f 100644 --- a/eos/effects/shipbonusmedmissileflighttimecc2.py +++ b/eos/effects/shipbonusmedmissileflighttimecc2.py @@ -4,6 +4,5 @@ # Ship: Enforcer type = "passive" def handler(fit, src, context): - lvl = src.level - fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "explosionDelay", src.getModifiedItemAttr("shipBonusCC2") * lvl, skill="Caldari Cruiser") - fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), "explosionDelay", src.getModifiedItemAttr("shipBonusCC2") * lvl, skill="Caldari Cruiser") + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), "explosionDelay", src.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser") + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), "explosionDelay", src.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser") diff --git a/eos/effects/shipbonussmallmissileflighttimecf1.py b/eos/effects/shipbonussmallmissileflighttimecf1.py index fa678a1d4..2f755750c 100644 --- a/eos/effects/shipbonussmallmissileflighttimecf1.py +++ b/eos/effects/shipbonussmallmissileflighttimecf1.py @@ -4,6 +4,5 @@ # Ship: Pacifier type = "passive" def handler(fit, src, context): - lvl = src.level - fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "explosionDelay", src.getModifiedItemAttr("shipBonusCF") * lvl, skill="Caldari Frigate") - fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"), "explosionDelay", src.getModifiedItemAttr("shipBonusCF") * lvl, skill="Caldari Frigate") + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), "explosionDelay", src.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate") + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"), "explosionDelay", src.getModifiedItemAttr("shipBonusCF"), skill="Caldari Frigate") diff --git a/eos/effects/shipbonussptrofmf.py b/eos/effects/shipbonussptrofmf.py index 7e425a51e..6b226c3bf 100644 --- a/eos/effects/shipbonussptrofmf.py +++ b/eos/effects/shipbonussptrofmf.py @@ -4,5 +4,4 @@ # Ship: Pacifier type = "passive" def handler(fit, src, context): - lvl = src.level - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), "speed", src.getModifiedItemAttr("shipBonusMF") * lvl, skill="Minmatar Frigate") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), "speed", src.getModifiedItemAttr("shipBonusMF"), skill="Minmatar Frigate") diff --git a/eos/effects/shipbonustitanm1webrangebonus.py b/eos/effects/shipbonustitanm1webrangebonus.py index 4beeb9df2..0fd26a1b7 100644 --- a/eos/effects/shipbonustitanm1webrangebonus.py +++ b/eos/effects/shipbonustitanm1webrangebonus.py @@ -4,5 +4,4 @@ # Ship: Molok type = "passive" def handler(fit, src, context): - lvl = src.level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange", src.getModifiedItemAttr("shipBonusTitanM1") * lvl, skill="Minmatar Titan") + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange", src.getModifiedItemAttr("shipBonusTitanM1"), skill="Minmatar Titan")