diff --git a/eos/db/migrations/upgrade25.py b/eos/db/migrations/upgrade25.py index 409046b16..bf334c37d 100644 --- a/eos/db/migrations/upgrade25.py +++ b/eos/db/migrations/upgrade25.py @@ -4208,12 +4208,14 @@ def upgrade(saveddata_engine): # I can't figure out a way to get IN operator to work when supplying a list using a parameterized query. So I'm # doing it the shitty way by formatting the SQL string. Don't do this kids! - fits = [x['fitID'] for x in saveddata_engine.execute("SELECT fitID FROM modules WHERE itemID IN ({}) GROUP BY fitID HAVING COUNT(*) = 5".format(','.join(oldItems)))] + fits = [x['fitID'] for x in saveddata_engine.execute( + "SELECT fitID FROM modules WHERE itemID IN ({}) GROUP BY fitID HAVING COUNT(*) = 5".format(','.join(oldItems)))] for fitID in fits: try: # Gather a list of the old subsystems and their record IDs - modules = saveddata_engine.execute("SELECT * FROM modules WHERE itemID IN ({}) AND fitID = ?".format(','.join(oldItems)), (fitID,)) + modules = saveddata_engine.execute( + "SELECT * FROM modules WHERE itemID IN ({}) AND fitID = ?".format(','.join(oldItems)), (fitID,)) oldModules = [] for mod in modules: diff --git a/eos/db/saveddata/booster.py b/eos/db/saveddata/booster.py index bc95d02cc..4c1a3d81a 100644 --- a/eos/db/saveddata/booster.py +++ b/eos/db/saveddata/booster.py @@ -48,8 +48,8 @@ mapper(Booster, boosters_table, BoosterSideEffect, backref="booster", cascade='all, delete, delete-orphan'), - } -) + } + ) mapper(BoosterSideEffect, booster_side_effect_table) diff --git a/eos/effects/agilitybonus.py b/eos/effects/agilitybonus.py index b9859e5af..ea3811650 100644 --- a/eos/effects/agilitybonus.py +++ b/eos/effects/agilitybonus.py @@ -3,5 +3,7 @@ # Used by: # Subsystems named like: Propulsion Interdiction Nullifier (4 of 4) type = "passive" + + def handler(fit, src, context): fit.ship.increaseItemAttr("agility", src.getModifiedItemAttr("agilityBonusAdd")) diff --git a/eos/effects/boosterarmorhppenalty.py b/eos/effects/boosterarmorhppenalty.py index 920b8b727..e7b202a5a 100644 --- a/eos/effects/boosterarmorhppenalty.py +++ b/eos/effects/boosterarmorhppenalty.py @@ -10,5 +10,6 @@ displayName = "Armor Capacity" # Attribute that this effect targets attr = "boosterArmorHPPenalty" + def handler(fit, booster, context): fit.ship.boostItemAttr("armorHP", booster.getModifiedItemAttr(attr)) diff --git a/eos/effects/boosterarmorrepairamountpenalty.py b/eos/effects/boosterarmorrepairamountpenalty.py index 5f556908b..32596c796 100644 --- a/eos/effects/boosterarmorrepairamountpenalty.py +++ b/eos/effects/boosterarmorrepairamountpenalty.py @@ -12,6 +12,7 @@ displayName = "Armor Repair Amount" # Attribute that this effect targets attr = "boosterArmorRepairAmountPenalty" + def handler(fit, booster, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Unit", "armorDamageAmount", booster.getModifiedItemAttr(attr)) diff --git a/eos/effects/boostercapacitorcapacitypenalty.py b/eos/effects/boostercapacitorcapacitypenalty.py index 087b591f5..1f546f439 100644 --- a/eos/effects/boostercapacitorcapacitypenalty.py +++ b/eos/effects/boostercapacitorcapacitypenalty.py @@ -11,5 +11,6 @@ displayName = "Cap Capacity" # Attribute that this effect targets attr = "boosterCapacitorCapacityPenalty" + def handler(fit, booster, context): fit.ship.boostItemAttr("capacitorCapacity", booster.getModifiedItemAttr(attr)) diff --git a/eos/effects/boostermaxvelocitypenalty.py b/eos/effects/boostermaxvelocitypenalty.py index e5ee204f6..af2baa170 100644 --- a/eos/effects/boostermaxvelocitypenalty.py +++ b/eos/effects/boostermaxvelocitypenalty.py @@ -10,5 +10,6 @@ displayName = "Velocity" # Attribute that this effect targets attr = "boosterMaxVelocityPenalty" + def handler(fit, booster, context): fit.ship.boostItemAttr("maxVelocity", booster.getModifiedItemAttr(attr)) diff --git a/eos/effects/boostermissileexplosioncloudpenaltyfixed.py b/eos/effects/boostermissileexplosioncloudpenaltyfixed.py index 270f53fc3..24da2f481 100644 --- a/eos/effects/boostermissileexplosioncloudpenaltyfixed.py +++ b/eos/effects/boostermissileexplosioncloudpenaltyfixed.py @@ -11,6 +11,7 @@ displayName = "Missile Explosion Radius" # Attribute that this effect targets attr = "boosterMissileAOECloudPenalty" + def handler(fit, booster, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "aoeCloudSize", booster.getModifiedItemAttr(attr)) diff --git a/eos/effects/boostermissileexplosionvelocitypenalty.py b/eos/effects/boostermissileexplosionvelocitypenalty.py index e9857e13c..873dd2968 100644 --- a/eos/effects/boostermissileexplosionvelocitypenalty.py +++ b/eos/effects/boostermissileexplosionvelocitypenalty.py @@ -10,6 +10,7 @@ displayName = "Missile Explosion Velocity" # Attribute that this effect targets attr = "boosterAOEVelocityPenalty" + def handler(fit, booster, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "aoeVelocity", booster.getModifiedItemAttr(attr)) diff --git a/eos/effects/boostermissilevelocitypenalty.py b/eos/effects/boostermissilevelocitypenalty.py index 5ffe02dd8..a472673f5 100644 --- a/eos/effects/boostermissilevelocitypenalty.py +++ b/eos/effects/boostermissilevelocitypenalty.py @@ -11,6 +11,7 @@ displayName = "Missile Velocity" # Attribute that this effect targets attr = "boosterMissileVelocityPenalty" + def handler(fit, booster, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "maxVelocity", attr) diff --git a/eos/effects/boostershieldcapacitypenalty.py b/eos/effects/boostershieldcapacitypenalty.py index 13bfaa151..abf077c51 100644 --- a/eos/effects/boostershieldcapacitypenalty.py +++ b/eos/effects/boostershieldcapacitypenalty.py @@ -10,5 +10,6 @@ displayName = "Shield Capacity" # Attribute that this effect targets attr = "boosterShieldCapacityPenalty" + def handler(fit, booster, context): fit.ship.boostItemAttr("shieldCapacity", booster.getModifiedItemAttr(attr)) diff --git a/eos/effects/boosterturretfalloffpenalty.py b/eos/effects/boosterturretfalloffpenalty.py index f79674987..636c49909 100644 --- a/eos/effects/boosterturretfalloffpenalty.py +++ b/eos/effects/boosterturretfalloffpenalty.py @@ -11,6 +11,7 @@ displayName = "Turret Falloff" # Attribute that this effect targets attr = "boosterTurretFalloffPenalty" + def handler(fit, booster, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"), "falloff", booster.getModifiedItemAttr(attr)) diff --git a/eos/effects/boosterturretoptimalrangepenalty.py b/eos/effects/boosterturretoptimalrangepenalty.py index e4f9d7e4c..11354017f 100644 --- a/eos/effects/boosterturretoptimalrangepenalty.py +++ b/eos/effects/boosterturretoptimalrangepenalty.py @@ -12,6 +12,7 @@ displayName = "Turret Optimal Range" # Attribute that this effect targets attr = "boosterTurretOptimalRange" + def handler(fit, booster, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"), "maxRange", booster.getModifiedItemAttr(attr)) diff --git a/eos/effects/boosterturrettrackingpenalty.py b/eos/effects/boosterturrettrackingpenalty.py index 0e6025b66..77e71d373 100644 --- a/eos/effects/boosterturrettrackingpenalty.py +++ b/eos/effects/boosterturrettrackingpenalty.py @@ -11,6 +11,7 @@ displayName = "Turret Tracking" # Attribute that this effect targets attr = "boosterTurretTrackingPenalty" + def handler(fit, booster, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"), "trackingSpeed", booster.getModifiedItemAttr(attr)) diff --git a/eos/effects/probelaunchercpupercentrolebonust3.py b/eos/effects/probelaunchercpupercentrolebonust3.py index 52a6aa080..b78379d9a 100644 --- a/eos/effects/probelaunchercpupercentrolebonust3.py +++ b/eos/effects/probelaunchercpupercentrolebonust3.py @@ -4,5 +4,7 @@ # Ships from group: Strategic Cruiser (4 of 4) # Ships from group: Tactical Destroyer (4 of 4) type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Astrometrics"), "cpu", src.getModifiedItemAttr("roleBonusT3ProbeCPU")) diff --git a/eos/effects/shipbonusstrategiccruiseramarrnaniterepairtime2.py b/eos/effects/shipbonusstrategiccruiseramarrnaniterepairtime2.py index 0a614ff37..3f15088b8 100644 --- a/eos/effects/shipbonusstrategiccruiseramarrnaniterepairtime2.py +++ b/eos/effects/shipbonusstrategiccruiseramarrnaniterepairtime2.py @@ -9,4 +9,3 @@ def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: True, "moduleRepairRate", ship.getModifiedItemAttr("shipBonusStrategicCruiserAmarr2"), skill="Amarr Strategic Cruiser") - diff --git a/eos/effects/shipbonusstrategiccruisercaldarinaniterepairtime2.py b/eos/effects/shipbonusstrategiccruisercaldarinaniterepairtime2.py index 842a68c45..d245c16ca 100644 --- a/eos/effects/shipbonusstrategiccruisercaldarinaniterepairtime2.py +++ b/eos/effects/shipbonusstrategiccruisercaldarinaniterepairtime2.py @@ -9,4 +9,3 @@ def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: True, "moduleRepairRate", ship.getModifiedItemAttr("shipBonusStrategicCruiserCaldari2"), skill="Caldari Strategic Cruiser") - diff --git a/eos/effects/shipbonusstrategiccruisergallentenaniterepairtime2.py b/eos/effects/shipbonusstrategiccruisergallentenaniterepairtime2.py index f6564c478..0652e251e 100644 --- a/eos/effects/shipbonusstrategiccruisergallentenaniterepairtime2.py +++ b/eos/effects/shipbonusstrategiccruisergallentenaniterepairtime2.py @@ -9,4 +9,3 @@ def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: True, "moduleRepairRate", ship.getModifiedItemAttr("shipBonusStrategicCruiserGallente2"), skill="Gallente Strategic Cruiser") - diff --git a/eos/effects/shipbonusstrategiccruiserminmatarnaniterepairtime2.py b/eos/effects/shipbonusstrategiccruiserminmatarnaniterepairtime2.py index dffa92f13..9fe7b88c9 100644 --- a/eos/effects/shipbonusstrategiccruiserminmatarnaniterepairtime2.py +++ b/eos/effects/shipbonusstrategiccruiserminmatarnaniterepairtime2.py @@ -9,4 +9,3 @@ def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: True, "moduleRepairRate", ship.getModifiedItemAttr("shipBonusStrategicCruiserMinmatar2"), skill="Minmatar Strategic Cruiser") - diff --git a/eos/effects/shipmaxlockedtargetsbonusaddpassive.py b/eos/effects/shipmaxlockedtargetsbonusaddpassive.py index 63e528ec2..52840f0b1 100644 --- a/eos/effects/shipmaxlockedtargetsbonusaddpassive.py +++ b/eos/effects/shipmaxlockedtargetsbonusaddpassive.py @@ -5,5 +5,7 @@ # Subsystems named like: Core Electronic Efficiency Gate (2 of 2) # Subsystems named like: Offensive Support Processor (4 of 4) type = "passive" + + def handler(fit, src, context): fit.ship.increaseItemAttr("maxLockedTargets", src.getModifiedItemAttr("maxLockedTargetsBonus")) diff --git a/eos/effects/subsystembonusamarrcore2energydestabilizeramount.py b/eos/effects/subsystembonusamarrcore2energydestabilizeramount.py index 0ac3475d4..e9cd100c1 100644 --- a/eos/effects/subsystembonusamarrcore2energydestabilizeramount.py +++ b/eos/effects/subsystembonusamarrcore2energydestabilizeramount.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Legion Core - Energy Parasitic Complex type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer", "energyNeutralizerAmount", src.getModifiedItemAttr("subsystemBonusAmarrCore2"), skill="Amarr Core Systems") diff --git a/eos/effects/subsystembonusamarrcore2energyresistance.py b/eos/effects/subsystembonusamarrcore2energyresistance.py index 17feeb362..a4f8215f8 100644 --- a/eos/effects/subsystembonusamarrcore2energyresistance.py +++ b/eos/effects/subsystembonusamarrcore2energyresistance.py @@ -3,5 +3,7 @@ # Used by: # Subsystem: Legion Core - Augmented Antimatter Reactor type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("energyWarfareResistance", src.getModifiedItemAttr("subsystemBonusAmarrCore2"), skill="Amarr Core Systems") diff --git a/eos/effects/subsystembonusamarrcore2energyvampireamount.py b/eos/effects/subsystembonusamarrcore2energyvampireamount.py index 11dce861a..c3597aead 100644 --- a/eos/effects/subsystembonusamarrcore2energyvampireamount.py +++ b/eos/effects/subsystembonusamarrcore2energyvampireamount.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Legion Core - Energy Parasitic Complex type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu", "powerTransferAmount", src.getModifiedItemAttr("subsystemBonusAmarrCore2"), skill="Amarr Core Systems") diff --git a/eos/effects/subsystembonusamarrcore2maxtargetingrange.py b/eos/effects/subsystembonusamarrcore2maxtargetingrange.py index bd2c03093..855c5f401 100644 --- a/eos/effects/subsystembonusamarrcore2maxtargetingrange.py +++ b/eos/effects/subsystembonusamarrcore2maxtargetingrange.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Legion Core - Dissolution Sequencer type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("maxTargetRange", src.getModifiedItemAttr("subsystemBonusAmarrCore2"), skill="Amarr Core Systems") diff --git a/eos/effects/subsystembonusamarrcore3energywarheatbonus.py b/eos/effects/subsystembonusamarrcore3energywarheatbonus.py index 3fe0840b1..0d74c77e5 100644 --- a/eos/effects/subsystembonusamarrcore3energywarheatbonus.py +++ b/eos/effects/subsystembonusamarrcore3energywarheatbonus.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Legion Core - Energy Parasitic Complex type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Energy Nosferatu", "Energy Neutralizer"), "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusAmarrCore3"), skill="Amarr Core Systems") diff --git a/eos/effects/subsystembonusamarrcore3scanresolution.py b/eos/effects/subsystembonusamarrcore3scanresolution.py index e90baef0e..2374304e5 100644 --- a/eos/effects/subsystembonusamarrcore3scanresolution.py +++ b/eos/effects/subsystembonusamarrcore3scanresolution.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Legion Core - Dissolution Sequencer type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("scanResolution", src.getModifiedItemAttr("subsystemBonusAmarrCore3"), skill="Amarr Core Systems") diff --git a/eos/effects/subsystembonusamarrcorecapacitorcapacity.py b/eos/effects/subsystembonusamarrcorecapacitorcapacity.py index 02e073dab..373d62290 100644 --- a/eos/effects/subsystembonusamarrcorecapacitorcapacity.py +++ b/eos/effects/subsystembonusamarrcorecapacitorcapacity.py @@ -3,5 +3,7 @@ # Used by: # Subsystem: Legion Core - Augmented Antimatter Reactor type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("capacitorCapacity", src.getModifiedItemAttr("subsystemBonusAmarrCore"), skill="Amarr Core Systems") diff --git a/eos/effects/subsystembonusamarrcorescanstrengthradar.py b/eos/effects/subsystembonusamarrcorescanstrengthradar.py index bb8fd3d6d..8c0c2bd82 100644 --- a/eos/effects/subsystembonusamarrcorescanstrengthradar.py +++ b/eos/effects/subsystembonusamarrcorescanstrengthradar.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Legion Core - Dissolution Sequencer type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("scanRadarStrength", src.getModifiedItemAttr("subsystemBonusAmarrCore"), skill="Amarr Core Systems") diff --git a/eos/effects/subsystembonusamarrdefensive2armorrepheat.py b/eos/effects/subsystembonusamarrdefensive2armorrepheat.py index 498aa90ac..b8d62df63 100644 --- a/eos/effects/subsystembonusamarrdefensive2armorrepheat.py +++ b/eos/effects/subsystembonusamarrdefensive2armorrepheat.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Legion Defensive - Nanobot Injector type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), "overloadArmorDamageAmount", src.getModifiedItemAttr("subsystemBonusAmarrDefensive2"), skill="Amarr Defensive Systems") diff --git a/eos/effects/subsystembonusamarrdefensive2hardenerheat.py b/eos/effects/subsystembonusamarrdefensive2hardenerheat.py index 356100e04..20459415a 100644 --- a/eos/effects/subsystembonusamarrdefensive2hardenerheat.py +++ b/eos/effects/subsystembonusamarrdefensive2hardenerheat.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Legion Defensive - Augmented Plating type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"), "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusAmarrDefensive2"), skill="Amarr Defensive Systems") diff --git a/eos/effects/subsystembonusamarrdefensive3armorrepheat.py b/eos/effects/subsystembonusamarrdefensive3armorrepheat.py index a14ba91b9..e4c0bf66e 100644 --- a/eos/effects/subsystembonusamarrdefensive3armorrepheat.py +++ b/eos/effects/subsystembonusamarrdefensive3armorrepheat.py @@ -4,6 +4,8 @@ # Subsystem: Legion Defensive - Covert Reconfiguration # Subsystem: Legion Defensive - Nanobot Injector type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusAmarrDefensive3"), diff --git a/eos/effects/subsystembonusamarroffensive2missiledamage.py b/eos/effects/subsystembonusamarroffensive2missiledamage.py index cafe1e967..ac51a389f 100644 --- a/eos/effects/subsystembonusamarroffensive2missiledamage.py +++ b/eos/effects/subsystembonusamarroffensive2missiledamage.py @@ -3,8 +3,14 @@ # Used by: # Subsystem: Legion Offensive - Assault Optimization type = "passive" + + def handler(fit, src, context): - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), "explosiveDamage", src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems") - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), "kineticDamage", src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems") - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), "emDamage", src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems") - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), "thermalDamage", src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems") + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), + "explosiveDamage", src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems") + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), + "kineticDamage", src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems") + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), + "emDamage", src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems") + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), + "thermalDamage", src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems") diff --git a/eos/effects/subsystembonusamarroffensive2remotearmorrepaircapuse.py b/eos/effects/subsystembonusamarroffensive2remotearmorrepaircapuse.py index 5fee4eff9..39804e030 100644 --- a/eos/effects/subsystembonusamarroffensive2remotearmorrepaircapuse.py +++ b/eos/effects/subsystembonusamarroffensive2remotearmorrepaircapuse.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Legion Offensive - Support Processor type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed", src.getModifiedItemAttr("subsystemBonusAmarrOffensive2"), skill="Amarr Offensive Systems") diff --git a/eos/effects/subsystembonusamarroffensive3dronedamagehp.py b/eos/effects/subsystembonusamarroffensive3dronedamagehp.py index 325bf3f73..26618a998 100644 --- a/eos/effects/subsystembonusamarroffensive3dronedamagehp.py +++ b/eos/effects/subsystembonusamarroffensive3dronedamagehp.py @@ -3,8 +3,14 @@ # Used by: # Subsystem: Legion Offensive - Assault Optimization type = "passive" + + def handler(fit, src, context): - fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "hp", src.getModifiedItemAttr("subsystemBonusAmarrOffensive3"), skill="Amarr Offensive Systems") - fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "armorHP", src.getModifiedItemAttr("subsystemBonusAmarrOffensive3"), skill="Amarr Offensive Systems") - fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "shieldCapacity", src.getModifiedItemAttr("subsystemBonusAmarrOffensive3"), skill="Amarr Offensive Systems") - fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "damageMultiplier", src.getModifiedItemAttr("subsystemBonusAmarrOffensive3"), skill="Amarr Offensive Systems") + fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), + "hp", src.getModifiedItemAttr("subsystemBonusAmarrOffensive3"), skill="Amarr Offensive Systems") + fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), + "armorHP", src.getModifiedItemAttr("subsystemBonusAmarrOffensive3"), skill="Amarr Offensive Systems") + fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), + "shieldCapacity", src.getModifiedItemAttr("subsystemBonusAmarrOffensive3"), skill="Amarr Offensive Systems") + fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), + "damageMultiplier", src.getModifiedItemAttr("subsystemBonusAmarrOffensive3"), skill="Amarr Offensive Systems") diff --git a/eos/effects/subsystembonusamarroffensive3remotearmorrepairheat.py b/eos/effects/subsystembonusamarroffensive3remotearmorrepairheat.py index defbde537..d7e603aab 100644 --- a/eos/effects/subsystembonusamarroffensive3remotearmorrepairheat.py +++ b/eos/effects/subsystembonusamarroffensive3remotearmorrepairheat.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Legion Offensive - Support Processor type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusAmarrOffensive3"), skill="Amarr Offensive Systems") diff --git a/eos/effects/subsystembonusamarroffensivecommandbursts.py b/eos/effects/subsystembonusamarroffensivecommandbursts.py index 42a24c757..8133970bc 100644 --- a/eos/effects/subsystembonusamarroffensivecommandbursts.py +++ b/eos/effects/subsystembonusamarroffensivecommandbursts.py @@ -3,21 +3,38 @@ # Used by: # Subsystem: Legion Offensive - Support Processor type = "passive" + + def handler(fit, src, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "buffDuration", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), + "buffDuration", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), + "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), + "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), + "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), + "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "buffDuration", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), + "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), + "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), + "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), + "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), + "buffDuration", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "buffDuration", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), + "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), + "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), + "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), + "buffDuration", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), + "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") diff --git a/eos/effects/subsystembonusamarroffensivemissilelauncherrof.py b/eos/effects/subsystembonusamarroffensivemissilelauncherrof.py index cbd7206f7..7eb49ec46 100644 --- a/eos/effects/subsystembonusamarroffensivemissilelauncherrof.py +++ b/eos/effects/subsystembonusamarroffensivemissilelauncherrof.py @@ -3,6 +3,9 @@ # Used by: # Subsystem: Legion Offensive - Assault Optimization type = "passive" + + def handler(fit, src, context): groups = ("Missile Launcher Heavy", "Missile Launcher Rapid Light", "Missile Launcher Heavy Assault") - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, "speed", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, + "speed", src.getModifiedItemAttr("subsystemBonusAmarrOffensive"), skill="Amarr Offensive Systems") diff --git a/eos/effects/subsystembonusamarrpropulsion2agility.py b/eos/effects/subsystembonusamarrpropulsion2agility.py index 856299dc8..426d8a119 100644 --- a/eos/effects/subsystembonusamarrpropulsion2agility.py +++ b/eos/effects/subsystembonusamarrpropulsion2agility.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Legion Propulsion - Intercalated Nanofibers type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("agility", src.getModifiedItemAttr("subsystemBonusAmarrPropulsion2"), skill="Amarr Propulsion Systems") diff --git a/eos/effects/subsystembonusamarrpropulsion2mwdpenalty.py b/eos/effects/subsystembonusamarrpropulsion2mwdpenalty.py index b34e2142d..ceb76ccea 100644 --- a/eos/effects/subsystembonusamarrpropulsion2mwdpenalty.py +++ b/eos/effects/subsystembonusamarrpropulsion2mwdpenalty.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Legion Propulsion - Wake Limiter type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"), "signatureRadiusBonus", src.getModifiedItemAttr("subsystemBonusAmarrPropulsion2"), diff --git a/eos/effects/subsystembonusamarrpropulsion2warpspeed.py b/eos/effects/subsystembonusamarrpropulsion2warpspeed.py index 98d72a933..bc59ac952 100644 --- a/eos/effects/subsystembonusamarrpropulsion2warpspeed.py +++ b/eos/effects/subsystembonusamarrpropulsion2warpspeed.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Legion Propulsion - Interdiction Nullifier type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("subsystemBonusAmarrPropulsion2"), skill="Amarr Propulsion Systems") diff --git a/eos/effects/subsystembonusamarrpropulsionwarpcapacitor.py b/eos/effects/subsystembonusamarrpropulsionwarpcapacitor.py index 70c6839a5..76c076a0f 100644 --- a/eos/effects/subsystembonusamarrpropulsionwarpcapacitor.py +++ b/eos/effects/subsystembonusamarrpropulsionwarpcapacitor.py @@ -3,5 +3,7 @@ # Used by: # Subsystem: Legion Propulsion - Interdiction Nullifier type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("warpCapacitorNeed", src.getModifiedItemAttr("subsystemBonusAmarrPropulsion"), skill="Amarr Propulsion Systems") diff --git a/eos/effects/subsystembonuscaldaricore2ecmstrengthrange.py b/eos/effects/subsystembonuscaldaricore2ecmstrengthrange.py index 64c8c21ea..afa67dbaa 100644 --- a/eos/effects/subsystembonuscaldaricore2ecmstrengthrange.py +++ b/eos/effects/subsystembonuscaldaricore2ecmstrengthrange.py @@ -3,8 +3,10 @@ # Used by: # Subsystem: Tengu Core - Obfuscation Manifold type = "passive" + + def handler(fit, src, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "scanLadarStrengthBonus", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "scanLadarStrengthBonus", src.getModifiedItemAttr("subsystemBonusCaldariCore2"), skill="Caldari Core Systems") fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "scanRadarStrengthBonus", src.getModifiedItemAttr("subsystemBonusCaldariCore2"), skill="Caldari Core Systems") diff --git a/eos/effects/subsystembonuscaldaricore2energyresistance.py b/eos/effects/subsystembonuscaldaricore2energyresistance.py index 7440cae22..9a2d0c415 100644 --- a/eos/effects/subsystembonuscaldaricore2energyresistance.py +++ b/eos/effects/subsystembonuscaldaricore2energyresistance.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Tengu Core - Augmented Graviton Reactor type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("energyWarfareResistance", src.getModifiedItemAttr("subsystemBonusCaldariCore2"), skill="Caldari Core Systems") diff --git a/eos/effects/subsystembonuscaldaricore2maxtargetingrange.py b/eos/effects/subsystembonuscaldaricore2maxtargetingrange.py index 080bd5af6..4aa3ad96c 100644 --- a/eos/effects/subsystembonuscaldaricore2maxtargetingrange.py +++ b/eos/effects/subsystembonuscaldaricore2maxtargetingrange.py @@ -3,5 +3,7 @@ # Used by: # Subsystem: Tengu Core - Electronic Efficiency Gate type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("maxTargetRange", src.getModifiedItemAttr("subsystemBonusCaldariCore2"), skill="Caldari Core Systems") diff --git a/eos/effects/subsystembonuscaldaricore3ecmheatbonus.py b/eos/effects/subsystembonuscaldaricore3ecmheatbonus.py index 4d91fa571..c17c23ea2 100644 --- a/eos/effects/subsystembonuscaldaricore3ecmheatbonus.py +++ b/eos/effects/subsystembonuscaldaricore3ecmheatbonus.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Tengu Core - Obfuscation Manifold type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM", "overloadECMStrengthBonus", src.getModifiedItemAttr("subsystemBonusCaldariCore3"), skill="Caldari Core Systems") diff --git a/eos/effects/subsystembonuscaldaricorecapacitorcapacity.py b/eos/effects/subsystembonuscaldaricorecapacitorcapacity.py index f0a94e0dd..b3895bbec 100644 --- a/eos/effects/subsystembonuscaldaricorecapacitorcapacity.py +++ b/eos/effects/subsystembonuscaldaricorecapacitorcapacity.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Tengu Core - Augmented Graviton Reactor type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("capacitorCapacity", src.getModifiedItemAttr("subsystemBonusCaldariCore"), skill="Caldari Core Systems") diff --git a/eos/effects/subsystembonuscaldaricorescanstrengthgravimetric.py b/eos/effects/subsystembonuscaldaricorescanstrengthgravimetric.py index 3089deff6..b21cd5754 100644 --- a/eos/effects/subsystembonuscaldaricorescanstrengthgravimetric.py +++ b/eos/effects/subsystembonuscaldaricorescanstrengthgravimetric.py @@ -3,5 +3,7 @@ # Used by: # Subsystem: Tengu Core - Electronic Efficiency Gate type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("scanGravimetricStrength", src.getModifiedItemAttr("subsystemBonusCaldariCore"), skill="Caldari Core Systems") diff --git a/eos/effects/subsystembonuscaldaridefensive2hardenerheat.py b/eos/effects/subsystembonuscaldaridefensive2hardenerheat.py index 7867403f6..259f761eb 100644 --- a/eos/effects/subsystembonuscaldaridefensive2hardenerheat.py +++ b/eos/effects/subsystembonuscaldaridefensive2hardenerheat.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Tengu Defensive - Supplemental Screening type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Tactical Shield Manipulation"), "overloadHardeningBonus", src.getModifiedItemAttr("subsystemBonusCaldariDefensive2"), diff --git a/eos/effects/subsystembonuscaldaridefensive2scanprobestrength.py b/eos/effects/subsystembonuscaldaridefensive2scanprobestrength.py index 6f048673f..828d383a2 100644 --- a/eos/effects/subsystembonuscaldaridefensive2scanprobestrength.py +++ b/eos/effects/subsystembonuscaldaridefensive2scanprobestrength.py @@ -3,5 +3,9 @@ # Used by: # Subsystem: Tengu Defensive - Covert Reconfiguration type = "passive" + + def handler(fit, src, context): - fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"), "baseSensorStrength", src.getModifiedItemAttr("subsystemBonusCaldariDefensive2"), stackingPenalties=True, skill="Caldari Defensive Systems") + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"), + "baseSensorStrength", src.getModifiedItemAttr("subsystemBonusCaldariDefensive2"), + skill="Caldari Defensive Systems") diff --git a/eos/effects/subsystembonuscaldaridefensive2shieldboostheat.py b/eos/effects/subsystembonuscaldaridefensive2shieldboostheat.py index 79f3247c4..bd28f05c4 100644 --- a/eos/effects/subsystembonuscaldaridefensive2shieldboostheat.py +++ b/eos/effects/subsystembonuscaldaridefensive2shieldboostheat.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Tengu Defensive - Amplification Node type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"), "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusCaldariDefensive2"), diff --git a/eos/effects/subsystembonuscaldaridefensive3shieldboostheat.py b/eos/effects/subsystembonuscaldaridefensive3shieldboostheat.py index 65391515a..a18f076f1 100644 --- a/eos/effects/subsystembonuscaldaridefensive3shieldboostheat.py +++ b/eos/effects/subsystembonuscaldaridefensive3shieldboostheat.py @@ -4,6 +4,8 @@ # Subsystem: Tengu Defensive - Amplification Node # Subsystem: Tengu Defensive - Covert Reconfiguration type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"), "overloadShieldBonus", src.getModifiedItemAttr("subsystemBonusCaldariDefensive3"), diff --git a/eos/effects/subsystembonuscaldaridefensive3tractorbeambonus.py b/eos/effects/subsystembonuscaldaridefensive3tractorbeambonus.py index b3bd0ecaf..9802868e5 100644 --- a/eos/effects/subsystembonuscaldaridefensive3tractorbeambonus.py +++ b/eos/effects/subsystembonuscaldaridefensive3tractorbeambonus.py @@ -1,5 +1,9 @@ # Not used by any item type = "passive" + + def handler(fit, src, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", "maxRange", src.getModifiedItemAttr("subsystemBonusCaldariDefensive3"), stackingPenalties=True, skill="Caldari Defensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", "maxTractorVelocity", src.getModifiedItemAttr("subsystemBonusCaldariDefensive3"), skill="Caldari Defensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", + "maxRange", src.getModifiedItemAttr("subsystemBonusCaldariDefensive3"), stackingPenalties=True, skill="Caldari Defensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", + "maxTractorVelocity", src.getModifiedItemAttr("subsystemBonusCaldariDefensive3"), skill="Caldari Defensive Systems") diff --git a/eos/effects/subsystembonuscaldarioffensive1launcherrof.py b/eos/effects/subsystembonuscaldarioffensive1launcherrof.py index 3bf414c83..7a7418ff2 100644 --- a/eos/effects/subsystembonuscaldarioffensive1launcherrof.py +++ b/eos/effects/subsystembonuscaldarioffensive1launcherrof.py @@ -3,6 +3,9 @@ # Used by: # Subsystem: Tengu Offensive - Accelerated Ejection Bay type = "passive" + + def handler(fit, src, context): groups = ("Missile Launcher Heavy", "Missile Launcher Rapid Light", "Missile Launcher Heavy Assault") - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, "speed", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") \ No newline at end of file + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, + "speed", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") diff --git a/eos/effects/subsystembonuscaldarioffensive2remoteshieldboostercapuse.py b/eos/effects/subsystembonuscaldarioffensive2remoteshieldboostercapuse.py index 9ff91b73e..9d327606c 100644 --- a/eos/effects/subsystembonuscaldarioffensive2remoteshieldboostercapuse.py +++ b/eos/effects/subsystembonuscaldarioffensive2remoteshieldboostercapuse.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Tengu Offensive - Support Processor type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "capacitorNeed", src.getModifiedItemAttr("subsystemBonusCaldariOffensive2"), diff --git a/eos/effects/subsystembonuscaldarioffensive3hmlhamvelocity.py b/eos/effects/subsystembonuscaldarioffensive3hmlhamvelocity.py index cf9fda8c6..dbe5e88db 100644 --- a/eos/effects/subsystembonuscaldarioffensive3hmlhamvelocity.py +++ b/eos/effects/subsystembonuscaldarioffensive3hmlhamvelocity.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Tengu Offensive - Accelerated Ejection Bay type = "passive" + + def handler(fit, src, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles") or mod.charge.requiresSkill("Heavy Assault Missiles"), "maxVelocity", src.getModifiedItemAttr("subsystemBonusCaldariOffensive3"), diff --git a/eos/effects/subsystembonuscaldarioffensive3remoteshieldboosterheat.py b/eos/effects/subsystembonuscaldarioffensive3remoteshieldboosterheat.py index ab44a6392..44a471a6d 100644 --- a/eos/effects/subsystembonuscaldarioffensive3remoteshieldboosterheat.py +++ b/eos/effects/subsystembonuscaldarioffensive3remoteshieldboosterheat.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Tengu Offensive - Support Processor type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusCaldariOffensive3"), diff --git a/eos/effects/subsystembonuscaldarioffensivecommandbursts.py b/eos/effects/subsystembonuscaldarioffensivecommandbursts.py index e8f97ad4a..e83045ae8 100644 --- a/eos/effects/subsystembonuscaldarioffensivecommandbursts.py +++ b/eos/effects/subsystembonuscaldarioffensivecommandbursts.py @@ -3,21 +3,38 @@ # Used by: # Subsystem: Tengu Offensive - Support Processor type = "passive" + + def handler(fit, src, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "buffDuration", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), + "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), + "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), + "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), + "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), + "buffDuration", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "buffDuration", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), + "buffDuration", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), + "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), + "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), + "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), + "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "buffDuration", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), + "buffDuration", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), + "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), + "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), + "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), + "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusCaldariOffensive"), skill="Caldari Offensive Systems") diff --git a/eos/effects/subsystembonuscaldaripropulsion2agility.py b/eos/effects/subsystembonuscaldaripropulsion2agility.py index d5f5989e5..c923e51bd 100644 --- a/eos/effects/subsystembonuscaldaripropulsion2agility.py +++ b/eos/effects/subsystembonuscaldaripropulsion2agility.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Tengu Propulsion - Chassis Optimization type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("agility", src.getModifiedItemAttr("subsystemBonusCaldariPropulsion2"), skill="Caldari Propulsion Systems") diff --git a/eos/effects/subsystembonuscaldaripropulsion2propmodheatbenefit.py b/eos/effects/subsystembonuscaldaripropulsion2propmodheatbenefit.py index b8d5423e0..e089fdf80 100644 --- a/eos/effects/subsystembonuscaldaripropulsion2propmodheatbenefit.py +++ b/eos/effects/subsystembonuscaldaripropulsion2propmodheatbenefit.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Tengu Propulsion - Fuel Catalyst type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner") or mod.item.requiresSkill("High Speed Maneuvering"), "overloadSpeedFactorBonus", src.getModifiedItemAttr("subsystemBonusCaldariPropulsion2"), diff --git a/eos/effects/subsystembonuscaldaripropulsion2warpspeed.py b/eos/effects/subsystembonuscaldaripropulsion2warpspeed.py index 0bf616ef9..3e0d5f181 100644 --- a/eos/effects/subsystembonuscaldaripropulsion2warpspeed.py +++ b/eos/effects/subsystembonuscaldaripropulsion2warpspeed.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Tengu Propulsion - Interdiction Nullifier type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("subsystemBonusCaldariPropulsion2"), skill="Caldari Propulsion Systems") diff --git a/eos/effects/subsystembonuscaldaripropulsionmaxvelocity.py b/eos/effects/subsystembonuscaldaripropulsionmaxvelocity.py index a318409e7..b883e9b9d 100644 --- a/eos/effects/subsystembonuscaldaripropulsionmaxvelocity.py +++ b/eos/effects/subsystembonuscaldaripropulsionmaxvelocity.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Tengu Propulsion - Chassis Optimization type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("maxVelocity", src.getModifiedItemAttr("subsystemBonusCaldariPropulsion"), skill="Caldari Propulsion Systems") diff --git a/eos/effects/subsystembonuscaldaripropulsionwarpcapacitor.py b/eos/effects/subsystembonuscaldaripropulsionwarpcapacitor.py index fd43d7afc..050e87d91 100644 --- a/eos/effects/subsystembonuscaldaripropulsionwarpcapacitor.py +++ b/eos/effects/subsystembonuscaldaripropulsionwarpcapacitor.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Tengu Propulsion - Interdiction Nullifier type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("warpCapacitorNeed", src.getModifiedItemAttr("subsystemBonusCaldariPropulsion"), skill="Caldari Propulsion Systems") diff --git a/eos/effects/subsystembonuscommandburstfittingreduction.py b/eos/effects/subsystembonuscommandburstfittingreduction.py index 6c1a43c27..8549a57bf 100644 --- a/eos/effects/subsystembonuscommandburstfittingreduction.py +++ b/eos/effects/subsystembonuscommandburstfittingreduction.py @@ -3,6 +3,8 @@ # Used by: # Subsystems named like: Offensive Support Processor (4 of 4) type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Leadership"), "power", src.getModifiedItemAttr("subsystemCommandBurstFittingReduction")) diff --git a/eos/effects/subsystembonusgallentecore2energyresistance.py b/eos/effects/subsystembonusgallentecore2energyresistance.py index c5bfe7fad..1a3c834c2 100644 --- a/eos/effects/subsystembonusgallentecore2energyresistance.py +++ b/eos/effects/subsystembonusgallentecore2energyresistance.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Proteus Core - Augmented Fusion Reactor type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("energyWarfareResistance", src.getModifiedItemAttr("subsystemBonusGallenteCore2"), skill="Gallente Core Systems") diff --git a/eos/effects/subsystembonusgallentecore2maxtargetingrange.py b/eos/effects/subsystembonusgallentecore2maxtargetingrange.py index 98944b2b5..9e2e880f4 100644 --- a/eos/effects/subsystembonusgallentecore2maxtargetingrange.py +++ b/eos/effects/subsystembonusgallentecore2maxtargetingrange.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Proteus Core - Electronic Efficiency Gate type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("maxTargetRange", src.getModifiedItemAttr("subsystemBonusGallenteCore2"), skill="Gallente Core Systems") diff --git a/eos/effects/subsystembonusgallentecore2warpscramblerange.py b/eos/effects/subsystembonusgallentecore2warpscramblerange.py index dfc2a9ccf..0d93f558b 100644 --- a/eos/effects/subsystembonusgallentecore2warpscramblerange.py +++ b/eos/effects/subsystembonusgallentecore2warpscramblerange.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Proteus Core - Friction Extension Processor type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler", "maxRange", src.getModifiedItemAttr("subsystemBonusGallenteCore2"), skill="Gallente Core Systems") diff --git a/eos/effects/subsystembonusgallentecore3warpscramheatbonus.py b/eos/effects/subsystembonusgallentecore3warpscramheatbonus.py index 9adbc2212..9060dac39 100644 --- a/eos/effects/subsystembonusgallentecore3warpscramheatbonus.py +++ b/eos/effects/subsystembonusgallentecore3warpscramheatbonus.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Proteus Core - Friction Extension Processor type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Warp Scrambler", "overloadRangeBonus", src.getModifiedItemAttr("subsystemBonusGallenteCore3"), skill="Gallente Core Systems") diff --git a/eos/effects/subsystembonusgallentecorecapacitorrecharge.py b/eos/effects/subsystembonusgallentecorecapacitorrecharge.py index 6eec5a0df..52c020b91 100644 --- a/eos/effects/subsystembonusgallentecorecapacitorrecharge.py +++ b/eos/effects/subsystembonusgallentecorecapacitorrecharge.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Proteus Core - Augmented Fusion Reactor type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("rechargeRate", src.getModifiedItemAttr("subsystemBonusGallenteCore"), skill="Gallente Core Systems") diff --git a/eos/effects/subsystembonusgallentecorescanstrengthmagnetometric.py b/eos/effects/subsystembonusgallentecorescanstrengthmagnetometric.py index bfcae9b7e..793b071ac 100644 --- a/eos/effects/subsystembonusgallentecorescanstrengthmagnetometric.py +++ b/eos/effects/subsystembonusgallentecorescanstrengthmagnetometric.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Proteus Core - Electronic Efficiency Gate type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("scanMagnetometricStrength", src.getModifiedItemAttr("subsystemBonusGallenteCore"), skill="Gallente Core Systems") diff --git a/eos/effects/subsystembonusgallentedefensive2armorrepheat.py b/eos/effects/subsystembonusgallentedefensive2armorrepheat.py index 9dc9f84bc..e35f7cd1c 100644 --- a/eos/effects/subsystembonusgallentedefensive2armorrepheat.py +++ b/eos/effects/subsystembonusgallentedefensive2armorrepheat.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Proteus Defensive - Nanobot Injector type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), "overloadArmorDamageAmount", src.getModifiedItemAttr("subsystemBonusGallenteDefensive2"), skill="Gallente Defensive Systems") diff --git a/eos/effects/subsystembonusgallentedefensive2hardenerheat.py b/eos/effects/subsystembonusgallentedefensive2hardenerheat.py index 97f3763e1..d4c2f7e1d 100644 --- a/eos/effects/subsystembonusgallentedefensive2hardenerheat.py +++ b/eos/effects/subsystembonusgallentedefensive2hardenerheat.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Proteus Defensive - Augmented Plating type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"), "overloadHardeningBonus", src.getModifiedItemAttr("subsystemBonusGallenteDefensive2"), skill="Gallente Defensive Systems") diff --git a/eos/effects/subsystembonusgallentedefensive2scanprobestrength.py b/eos/effects/subsystembonusgallentedefensive2scanprobestrength.py index bdede90f9..e5e7955d8 100644 --- a/eos/effects/subsystembonusgallentedefensive2scanprobestrength.py +++ b/eos/effects/subsystembonusgallentedefensive2scanprobestrength.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Proteus Defensive - Covert Reconfiguration type = "passive" + + def handler(fit, src, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"), "baseSensorStrength", src.getModifiedItemAttr("subsystemBonusGallenteDefensive2"), skill="Gallente Defensive Systems") diff --git a/eos/effects/subsystembonusgallentedefensive3armorrepheat.py b/eos/effects/subsystembonusgallentedefensive3armorrepheat.py index 470ba5d03..1f2e9d309 100644 --- a/eos/effects/subsystembonusgallentedefensive3armorrepheat.py +++ b/eos/effects/subsystembonusgallentedefensive3armorrepheat.py @@ -4,6 +4,8 @@ # Subsystem: Proteus Defensive - Covert Reconfiguration # Subsystem: Proteus Defensive - Nanobot Injector type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusGallenteDefensive3"), diff --git a/eos/effects/subsystembonusgallentedefensive3tractorbeambonus.py b/eos/effects/subsystembonusgallentedefensive3tractorbeambonus.py index 2f56414dc..4493eaa7a 100644 --- a/eos/effects/subsystembonusgallentedefensive3tractorbeambonus.py +++ b/eos/effects/subsystembonusgallentedefensive3tractorbeambonus.py @@ -1,5 +1,7 @@ # Not used by any item type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", "maxRange", src.getModifiedItemAttr("subsystemBonusGallenteDefensive3"), skill="Gallente Defensive Systems") diff --git a/eos/effects/subsystembonusgallenteoffensive2dronevelotracking.py b/eos/effects/subsystembonusgallenteoffensive2dronevelotracking.py index 9e5866deb..72b7e628d 100644 --- a/eos/effects/subsystembonusgallenteoffensive2dronevelotracking.py +++ b/eos/effects/subsystembonusgallenteoffensive2dronevelotracking.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Proteus Offensive - Drone Synthesis Projector type = "passive" + + def handler(fit, src, context): fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "maxVelocity", src.getModifiedItemAttr("subsystemBonusGallenteOffensive2"), diff --git a/eos/effects/subsystembonusgallenteoffensive2remotearmorrepaircapuse.py b/eos/effects/subsystembonusgallenteoffensive2remotearmorrepaircapuse.py index 20d52931b..4fbccf015 100644 --- a/eos/effects/subsystembonusgallenteoffensive2remotearmorrepaircapuse.py +++ b/eos/effects/subsystembonusgallenteoffensive2remotearmorrepaircapuse.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Proteus Offensive - Support Processor type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed", src.getModifiedItemAttr("subsystemBonusGallenteOffensive2"), skill="Gallente Offensive Systems") diff --git a/eos/effects/subsystembonusgallenteoffensive3remotearmorrepairheat.py b/eos/effects/subsystembonusgallenteoffensive3remotearmorrepairheat.py index 1290308a9..651810140 100644 --- a/eos/effects/subsystembonusgallenteoffensive3remotearmorrepairheat.py +++ b/eos/effects/subsystembonusgallenteoffensive3remotearmorrepairheat.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Proteus Offensive - Support Processor type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusGallenteOffensive3"), skill="Gallente Offensive Systems") diff --git a/eos/effects/subsystembonusgallenteoffensivecommandbursts.py b/eos/effects/subsystembonusgallenteoffensivecommandbursts.py index eed8786b6..dfa14ae83 100644 --- a/eos/effects/subsystembonusgallenteoffensivecommandbursts.py +++ b/eos/effects/subsystembonusgallenteoffensivecommandbursts.py @@ -3,21 +3,38 @@ # Used by: # Subsystem: Proteus Offensive - Support Processor type = "passive" + + def handler(fit, src, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "buffDuration", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), + "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), + "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), + "buffDuration", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), + "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), + "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "buffDuration", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), + "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), + "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), + "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), + "buffDuration", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), + "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "buffDuration", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), + "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), + "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), + "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), + "buffDuration", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), + "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), skill="Gallente Offensive Systems") diff --git a/eos/effects/subsystembonusgallenteoffensivedronedamagehp.py b/eos/effects/subsystembonusgallenteoffensivedronedamagehp.py index 619442466..4f1abbb8d 100644 --- a/eos/effects/subsystembonusgallenteoffensivedronedamagehp.py +++ b/eos/effects/subsystembonusgallenteoffensivedronedamagehp.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Proteus Offensive - Drone Synthesis Projector type = "passive" + + def handler(fit, src, context): fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "armorHP", src.getModifiedItemAttr("subsystemBonusGallenteOffensive"), diff --git a/eos/effects/subsystembonusgallentepropulsion2agility.py b/eos/effects/subsystembonusgallentepropulsion2agility.py index 7d9704081..5e060b092 100644 --- a/eos/effects/subsystembonusgallentepropulsion2agility.py +++ b/eos/effects/subsystembonusgallentepropulsion2agility.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Proteus Propulsion - Hyperspatial Optimization type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("agility", src.getModifiedItemAttr("subsystemBonusGallentePropulsion2"), skill="Gallente Propulsion Systems") diff --git a/eos/effects/subsystembonusgallentepropulsion2propmodheatbenefit.py b/eos/effects/subsystembonusgallentepropulsion2propmodheatbenefit.py index 659b8cc08..96dc20bb4 100644 --- a/eos/effects/subsystembonusgallentepropulsion2propmodheatbenefit.py +++ b/eos/effects/subsystembonusgallentepropulsion2propmodheatbenefit.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Proteus Propulsion - Localized Injectors type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner") or mod.item.requiresSkill("High Speed Maneuvering"), "overloadSpeedFactorBonus", src.getModifiedItemAttr("subsystemBonusGallentePropulsion2"), diff --git a/eos/effects/subsystembonusgallentepropulsion2warpspeed.py b/eos/effects/subsystembonusgallentepropulsion2warpspeed.py index 0603d0845..043a3d962 100644 --- a/eos/effects/subsystembonusgallentepropulsion2warpspeed.py +++ b/eos/effects/subsystembonusgallentepropulsion2warpspeed.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Proteus Propulsion - Interdiction Nullifier type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("subsystemBonusGallentePropulsion2"), skill="Gallente Propulsion Systems") diff --git a/eos/effects/subsystembonusgallentepropulsionwarpcapacitor.py b/eos/effects/subsystembonusgallentepropulsionwarpcapacitor.py index a6fee75d6..f267ba0bd 100644 --- a/eos/effects/subsystembonusgallentepropulsionwarpcapacitor.py +++ b/eos/effects/subsystembonusgallentepropulsionwarpcapacitor.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Proteus Propulsion - Interdiction Nullifier type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("warpCapacitorNeed", src.getModifiedItemAttr("subsystemBonusGallentePropulsion"), skill="Gallente Propulsion Systems") diff --git a/eos/effects/subsystembonusminmatarcore2energyresistance.py b/eos/effects/subsystembonusminmatarcore2energyresistance.py index a9d3436d3..c2f93a623 100644 --- a/eos/effects/subsystembonusminmatarcore2energyresistance.py +++ b/eos/effects/subsystembonusminmatarcore2energyresistance.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Loki Core - Augmented Nuclear Reactor type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("energyWarfareResistance", src.getModifiedItemAttr("subsystemBonusMinmatarCore2"), skill="Minmatar Core Systems") diff --git a/eos/effects/subsystembonusminmatarcore2maxtargetingrange.py b/eos/effects/subsystembonusminmatarcore2maxtargetingrange.py index a7f009981..4417e41cb 100644 --- a/eos/effects/subsystembonusminmatarcore2maxtargetingrange.py +++ b/eos/effects/subsystembonusminmatarcore2maxtargetingrange.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Loki Core - Dissolution Sequencer type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("maxTargetRange", src.getModifiedItemAttr("subsystemBonusMinmatarCore2"), skill="Minmatar Core Systems") diff --git a/eos/effects/subsystembonusminmatarcore2stasiswebifierrange.py b/eos/effects/subsystembonusminmatarcore2stasiswebifierrange.py index 7519350ce..1b05d6864 100644 --- a/eos/effects/subsystembonusminmatarcore2stasiswebifierrange.py +++ b/eos/effects/subsystembonusminmatarcore2stasiswebifierrange.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Loki Core - Immobility Drivers type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange", src.getModifiedItemAttr("subsystemBonusMinmatarCore2"), skill="Minmatar Core Systems") diff --git a/eos/effects/subsystembonusminmatarcore3scanresolution.py b/eos/effects/subsystembonusminmatarcore3scanresolution.py index a252aa62a..3fb57e5e6 100644 --- a/eos/effects/subsystembonusminmatarcore3scanresolution.py +++ b/eos/effects/subsystembonusminmatarcore3scanresolution.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Loki Core - Dissolution Sequencer type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("scanResolution", src.getModifiedItemAttr("subsystemBonusMinmatarCore3"), skill="Minmatar Core Systems") diff --git a/eos/effects/subsystembonusminmatarcore3stasiswebheatbonus.py b/eos/effects/subsystembonusminmatarcore3stasiswebheatbonus.py index 8000fe2a8..b9233bacb 100644 --- a/eos/effects/subsystembonusminmatarcore3stasiswebheatbonus.py +++ b/eos/effects/subsystembonusminmatarcore3stasiswebheatbonus.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Loki Core - Immobility Drivers type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "overloadRangeBonus", src.getModifiedItemAttr("subsystemBonusMinmatarCore3"), diff --git a/eos/effects/subsystembonusminmatarcorecapacitorrecharge.py b/eos/effects/subsystembonusminmatarcorecapacitorrecharge.py index bfedacaeb..d32fce7ac 100644 --- a/eos/effects/subsystembonusminmatarcorecapacitorrecharge.py +++ b/eos/effects/subsystembonusminmatarcorecapacitorrecharge.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Loki Core - Augmented Nuclear Reactor type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("rechargeRate", src.getModifiedItemAttr("subsystemBonusMinmatarCore"), skill="Minmatar Core Systems") diff --git a/eos/effects/subsystembonusminmatarcorescanstrengthladar.py b/eos/effects/subsystembonusminmatarcorescanstrengthladar.py index 5bf2180d6..0266d09e8 100644 --- a/eos/effects/subsystembonusminmatarcorescanstrengthladar.py +++ b/eos/effects/subsystembonusminmatarcorescanstrengthladar.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Loki Core - Dissolution Sequencer type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("scanLadarStrength", src.getModifiedItemAttr("subsystemBonusMinmatarCore"), skill="Minmatar Core Systems") diff --git a/eos/effects/subsystembonusminmatardefensive2hardenerheat.py b/eos/effects/subsystembonusminmatardefensive2hardenerheat.py index 7c67000be..f87466071 100644 --- a/eos/effects/subsystembonusminmatardefensive2hardenerheat.py +++ b/eos/effects/subsystembonusminmatardefensive2hardenerheat.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Loki Defensive - Augmented Durability type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"), "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusMinmatarDefensive2"), skill="Minmatar Defensive Systems") diff --git a/eos/effects/subsystembonusminmatardefensive2localrepheat.py b/eos/effects/subsystembonusminmatardefensive2localrepheat.py index 4a8839bd1..732ca1779 100644 --- a/eos/effects/subsystembonusminmatardefensive2localrepheat.py +++ b/eos/effects/subsystembonusminmatardefensive2localrepheat.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Loki Defensive - Adaptive Defense Node type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Shield Operation"), "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusMinmatarDefensive2"), diff --git a/eos/effects/subsystembonusminmatardefensive2scanprobestrength.py b/eos/effects/subsystembonusminmatardefensive2scanprobestrength.py index 7ea56b354..8879074a6 100644 --- a/eos/effects/subsystembonusminmatardefensive2scanprobestrength.py +++ b/eos/effects/subsystembonusminmatardefensive2scanprobestrength.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Loki Defensive - Covert Reconfiguration type = "passive" + + def handler(fit, src, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"), "baseSensorStrength", src.getModifiedItemAttr("subsystemBonusMinmatarDefensive2"), skill="Minmatar Defensive Systems") diff --git a/eos/effects/subsystembonusminmatardefensive3localrepheat.py b/eos/effects/subsystembonusminmatardefensive3localrepheat.py index 377fe59c7..fe6c0e1ee 100644 --- a/eos/effects/subsystembonusminmatardefensive3localrepheat.py +++ b/eos/effects/subsystembonusminmatardefensive3localrepheat.py @@ -4,6 +4,8 @@ # Subsystem: Loki Defensive - Adaptive Defense Node # Subsystem: Loki Defensive - Covert Reconfiguration type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Shield Operation"), "overloadArmorDamageAmount", src.getModifiedItemAttr("subsystemBonusMinmatarDefensive3"), @@ -11,4 +13,3 @@ def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Shield Operation"), "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusMinmatarDefensive3"), skill="Minmatar Defensive Systems") - diff --git a/eos/effects/subsystembonusminmatardefensive3tractorbeambonus.py b/eos/effects/subsystembonusminmatardefensive3tractorbeambonus.py index 43c40e876..46c0dc717 100644 --- a/eos/effects/subsystembonusminmatardefensive3tractorbeambonus.py +++ b/eos/effects/subsystembonusminmatardefensive3tractorbeambonus.py @@ -1,5 +1,7 @@ # Not used by any item type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", "maxRange", src.getModifiedItemAttr("subsystemBonusMinmatarDefensive3"), skill="Minmatar Defensive Systems") diff --git a/eos/effects/subsystembonusminmatardefensiveshieldarmorhp.py b/eos/effects/subsystembonusminmatardefensiveshieldarmorhp.py index b876eb949..5e0b76798 100644 --- a/eos/effects/subsystembonusminmatardefensiveshieldarmorhp.py +++ b/eos/effects/subsystembonusminmatardefensiveshieldarmorhp.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Loki Defensive - Augmented Durability type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("shieldCapacity", src.getModifiedItemAttr("subsystemBonusMinmatarDefensive"), skill="Minmatar Defensive Systems") diff --git a/eos/effects/subsystembonusminmatardefensiveshieldarmorrepairamount.py b/eos/effects/subsystembonusminmatardefensiveshieldarmorrepairamount.py index 1438ec632..0c43a70d4 100644 --- a/eos/effects/subsystembonusminmatardefensiveshieldarmorrepairamount.py +++ b/eos/effects/subsystembonusminmatardefensiveshieldarmorrepairamount.py @@ -4,6 +4,8 @@ # Subsystem: Loki Defensive - Adaptive Defense Node # Subsystem: Loki Defensive - Covert Reconfiguration type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), "armorDamageAmount", src.getModifiedItemAttr("subsystemBonusMinmatarDefensive"), diff --git a/eos/effects/subsystembonusminmataroffensive1hmlhamvelo.py b/eos/effects/subsystembonusminmataroffensive1hmlhamvelo.py index 61f679736..49ae9388a 100644 --- a/eos/effects/subsystembonusminmataroffensive1hmlhamvelo.py +++ b/eos/effects/subsystembonusminmataroffensive1hmlhamvelo.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Loki Offensive - Launcher Efficiency Configuration type = "passive" + + def handler(fit, container, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles") or mod.charge.requiresSkill("Heavy Assault Missiles"), "maxVelocity", container.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), diff --git a/eos/effects/subsystembonusminmataroffensive2missilelauncherrof.py b/eos/effects/subsystembonusminmataroffensive2missilelauncherrof.py index 9cca8a286..29e71d306 100644 --- a/eos/effects/subsystembonusminmataroffensive2missilelauncherrof.py +++ b/eos/effects/subsystembonusminmataroffensive2missilelauncherrof.py @@ -3,9 +3,10 @@ # Used by: # Subsystem: Loki Offensive - Launcher Efficiency Configuration type = "passive" + + def handler(fit, src, context): groups = ("Missile Launcher Heavy", "Missile Launcher Rapid Light", "Missile Launcher Heavy Assault") fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, "speed", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive2"), skill="Minmatar Offensive Systems") - diff --git a/eos/effects/subsystembonusminmataroffensive2remoterepcapuse.py b/eos/effects/subsystembonusminmataroffensive2remoterepcapuse.py index 43bca3640..451744d1a 100644 --- a/eos/effects/subsystembonusminmataroffensive2remoterepcapuse.py +++ b/eos/effects/subsystembonusminmataroffensive2remoterepcapuse.py @@ -3,8 +3,9 @@ # Used by: # Subsystem: Loki Offensive - Support Processor type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems") or mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive2"), skill="Minmatar Offensive Systems") - diff --git a/eos/effects/subsystembonusminmataroffensive3missileexpvelo.py b/eos/effects/subsystembonusminmataroffensive3missileexpvelo.py index 4046e1aa1..7dd2cde86 100644 --- a/eos/effects/subsystembonusminmataroffensive3missileexpvelo.py +++ b/eos/effects/subsystembonusminmataroffensive3missileexpvelo.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Loki Offensive - Launcher Efficiency Configuration type = "passive" + + def handler(fit, container, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "aoeVelocity", container.getModifiedItemAttr("subsystemBonusMinmatarOffensive3"), diff --git a/eos/effects/subsystembonusminmataroffensive3remoterepheat.py b/eos/effects/subsystembonusminmataroffensive3remoterepheat.py index 2824396a1..a88a2907d 100644 --- a/eos/effects/subsystembonusminmataroffensive3remoterepheat.py +++ b/eos/effects/subsystembonusminmataroffensive3remoterepheat.py @@ -3,8 +3,9 @@ # Used by: # Subsystem: Loki Offensive - Support Processor type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems") or mod.item.requiresSkill("Remote Armor Repair Systems"), "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive3"), skill="Minmatar Offensive Systems") - diff --git a/eos/effects/subsystembonusminmataroffensivecommandbursts.py b/eos/effects/subsystembonusminmataroffensivecommandbursts.py index 868eb390f..50586ca36 100644 --- a/eos/effects/subsystembonusminmataroffensivecommandbursts.py +++ b/eos/effects/subsystembonusminmataroffensivecommandbursts.py @@ -3,21 +3,39 @@ # Used by: # Subsystem: Loki Offensive - Support Processor type = "passive" + + def handler(fit, src, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "buffDuration", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), + "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), + "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), + "buffDuration", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), + "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), + "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "buffDuration", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), + "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), + "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), + "buffDuration", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), + "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), + "war" + "fareBuff1Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "buffDuration", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), + "warfareBuff3Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), + "warfareBuff4Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), + "warfareBuff1Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), + "buffDuration", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), + "warfareBuff2Value", src.getModifiedItemAttr("subsystemBonusMinmatarOffensive"), skill="Minmatar Offensive Systems") diff --git a/eos/effects/subsystembonusminmatarpropulsion2agility.py b/eos/effects/subsystembonusminmatarpropulsion2agility.py index dcf6c1c1b..1a01b509b 100644 --- a/eos/effects/subsystembonusminmatarpropulsion2agility.py +++ b/eos/effects/subsystembonusminmatarpropulsion2agility.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Loki Propulsion - Intercalated Nanofibers type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("agility", src.getModifiedItemAttr("subsystemBonusMinmatarPropulsion2"), skill="Minmatar Propulsion Systems") diff --git a/eos/effects/subsystembonusminmatarpropulsion2mwdpenalty.py b/eos/effects/subsystembonusminmatarpropulsion2mwdpenalty.py index cd28e3dc3..94bbfe321 100644 --- a/eos/effects/subsystembonusminmatarpropulsion2mwdpenalty.py +++ b/eos/effects/subsystembonusminmatarpropulsion2mwdpenalty.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Loki Propulsion - Wake Limiter type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"), "signatureRadiusBonus", src.getModifiedItemAttr("subsystemBonusMinmatarPropulsion2"), diff --git a/eos/effects/subsystembonusminmatarpropulsion2warpspeed.py b/eos/effects/subsystembonusminmatarpropulsion2warpspeed.py index a1b8c6bd8..d8d8262ca 100644 --- a/eos/effects/subsystembonusminmatarpropulsion2warpspeed.py +++ b/eos/effects/subsystembonusminmatarpropulsion2warpspeed.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Loki Propulsion - Interdiction Nullifier type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("subsystemBonusMinmatarPropulsion2"), skill="Minmatar Propulsion Systems") diff --git a/eos/effects/subsystembonusminmatarpropulsionwarpcapacitor.py b/eos/effects/subsystembonusminmatarpropulsionwarpcapacitor.py index ca50ecf88..f7f965c59 100644 --- a/eos/effects/subsystembonusminmatarpropulsionwarpcapacitor.py +++ b/eos/effects/subsystembonusminmatarpropulsionwarpcapacitor.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Loki Propulsion - Interdiction Nullifier type = "passive" + + def handler(fit, src, context): fit.ship.boostItemAttr("warpCapacitorNeed", src.getModifiedItemAttr("subsystemBonusMinmatarPropulsion"), skill="Minmatar Propulsion Systems") diff --git a/eos/effects/subsystemenergyneutfittingreduction.py b/eos/effects/subsystemenergyneutfittingreduction.py index 6053a7b0b..52c427fa1 100644 --- a/eos/effects/subsystemenergyneutfittingreduction.py +++ b/eos/effects/subsystemenergyneutfittingreduction.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Legion Core - Energy Parasitic Complex type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Energy Nosferatu", "Energy Neutralizer"), "cpu", src.getModifiedItemAttr("subsystemEnergyNeutFittingReduction")) diff --git a/eos/effects/subsystemmetfittingreduction.py b/eos/effects/subsystemmetfittingreduction.py index 4d82d7046..ea3567a27 100644 --- a/eos/effects/subsystemmetfittingreduction.py +++ b/eos/effects/subsystemmetfittingreduction.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Legion Offensive - Liquid Crystal Magnifiers type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"), "cpu", src.getModifiedItemAttr("subsystemMETFittingReduction")) diff --git a/eos/effects/subsystemmhtfittingreduction.py b/eos/effects/subsystemmhtfittingreduction.py index ab944e37e..29aaec123 100644 --- a/eos/effects/subsystemmhtfittingreduction.py +++ b/eos/effects/subsystemmhtfittingreduction.py @@ -5,6 +5,8 @@ # Subsystem: Proteus Offensive - Hybrid Encoding Platform # Subsystem: Tengu Offensive - Magnetic Infusion Basin type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), "cpu", src.getModifiedItemAttr("subsystemMHTFittingReduction")) diff --git a/eos/effects/subsystemmmissilefittingreduction.py b/eos/effects/subsystemmmissilefittingreduction.py index 7b0a6ac4e..299536c2a 100644 --- a/eos/effects/subsystemmmissilefittingreduction.py +++ b/eos/effects/subsystemmmissilefittingreduction.py @@ -5,6 +5,8 @@ # Subsystem: Loki Offensive - Launcher Efficiency Configuration # Subsystem: Tengu Offensive - Accelerated Ejection Bay type = "passive" + + def handler(fit, src, context): groups = ("Missile Launcher Heavy", "Missile Launcher Rapid Light", "Missile Launcher Heavy Assault") fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, diff --git a/eos/effects/subsystemmptfittingreduction.py b/eos/effects/subsystemmptfittingreduction.py index 67e9b60c3..7660239b8 100644 --- a/eos/effects/subsystemmptfittingreduction.py +++ b/eos/effects/subsystemmptfittingreduction.py @@ -3,6 +3,8 @@ # Used by: # Subsystem: Loki Offensive - Projectile Scoping Array type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), "power", src.getModifiedItemAttr("subsystemMPTFittingReduction")) diff --git a/eos/effects/subsystemmrarfittingreduction.py b/eos/effects/subsystemmrarfittingreduction.py index 0083d136e..070407bca 100644 --- a/eos/effects/subsystemmrarfittingreduction.py +++ b/eos/effects/subsystemmrarfittingreduction.py @@ -3,6 +3,8 @@ # Used by: # Subsystems named like: Offensive Support Processor (3 of 4) type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems") and mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1, diff --git a/eos/effects/subsystemmrsbfittingreduction.py b/eos/effects/subsystemmrsbfittingreduction.py index 9cae9e9a2..98185b770 100644 --- a/eos/effects/subsystemmrsbfittingreduction.py +++ b/eos/effects/subsystemmrsbfittingreduction.py @@ -4,6 +4,8 @@ # Subsystem: Loki Offensive - Support Processor # Subsystem: Tengu Offensive - Support Processor type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems") and mod.getModifiedItemAttr('mediumRemoteRepFittingMultiplier', 0) == 1, diff --git a/eos/effects/subsystemremotearmorrepairerfalloffbonus.py b/eos/effects/subsystemremotearmorrepairerfalloffbonus.py index 7eb8c1977..20ac549af 100644 --- a/eos/effects/subsystemremotearmorrepairerfalloffbonus.py +++ b/eos/effects/subsystemremotearmorrepairerfalloffbonus.py @@ -3,7 +3,8 @@ # Used by: # Subsystems named like: Offensive Support Processor (3 of 4) type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Remote Armor Repairer", "Ancillary Remote Armor Repairer"), "falloffEffectiveness", src.getModifiedItemAttr("remoteArmorRepairerFalloffBonus")) - diff --git a/eos/effects/subsystemremotearmorrepaireroptimalbonus.py b/eos/effects/subsystemremotearmorrepaireroptimalbonus.py index 7ae6d234f..6112559c3 100644 --- a/eos/effects/subsystemremotearmorrepaireroptimalbonus.py +++ b/eos/effects/subsystemremotearmorrepaireroptimalbonus.py @@ -3,7 +3,8 @@ # Used by: # Subsystems named like: Offensive Support Processor (3 of 4) type = "passive" -def handler(fit, src, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Remote Armor Repairer", "Ancillary Remote Armor Repairer"), - "maxRange", src.getModifiedItemAttr("remoteArmorRepairerOptimalBonus")) + +def handler(fit, src, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Remote Armor Repairer", "Ancillary Remote Armor Repairer"), + "maxRange", src.getModifiedItemAttr("remoteArmorRepairerOptimalBonus")) diff --git a/eos/effects/subsystemremoteshieldboostfalloffbonus.py b/eos/effects/subsystemremoteshieldboostfalloffbonus.py index d6a445726..ab3a9f867 100644 --- a/eos/effects/subsystemremoteshieldboostfalloffbonus.py +++ b/eos/effects/subsystemremoteshieldboostfalloffbonus.py @@ -4,6 +4,8 @@ # Subsystem: Loki Offensive - Support Processor # Subsystem: Tengu Offensive - Support Processor type = "passive" + + def handler(fit, src, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in ("Remote Shield Booster", "Ancillary Remote Shield Booster"), "falloffEffectiveness", src.getModifiedItemAttr("remoteShieldBoosterFalloffBonus")) diff --git a/eos/saveddata/boosterSideEffect.py b/eos/saveddata/boosterSideEffect.py index 6f08c0904..3fd39ac4e 100644 --- a/eos/saveddata/boosterSideEffect.py +++ b/eos/saveddata/boosterSideEffect.py @@ -63,4 +63,3 @@ class BoosterSideEffect(object): @property def attr(self): return self.__effect.getattr('attr') - diff --git a/gui/builtinMarketBrowser/events.py b/gui/builtinMarketBrowser/events.py index f2e78cf93..be9e4d393 100644 --- a/gui/builtinMarketBrowser/events.py +++ b/gui/builtinMarketBrowser/events.py @@ -4,4 +4,4 @@ import wx.lib.newevent ItemSelected, ITEM_SELECTED = wx.lib.newevent.NewEvent() RECENTLY_USED_MODULES = -2 -MAX_RECENTLY_USED_MODULES = 20 \ No newline at end of file +MAX_RECENTLY_USED_MODULES = 20 diff --git a/gui/builtinMarketBrowser/marketTree.py b/gui/builtinMarketBrowser/marketTree.py index 1658da2c5..c55c7e3b5 100644 --- a/gui/builtinMarketBrowser/marketTree.py +++ b/gui/builtinMarketBrowser/marketTree.py @@ -1,7 +1,7 @@ import wx from gui.cachingImageList import CachingImageList -from gui.builtinMarketBrowser.events import * +import gui.builtinMarketBrowser.events as events from logbook import Logger @@ -32,7 +32,7 @@ class MarketTree(wx.TreeCtrl): # Add recently used modules node rumIconId = self.addImage("market_small", "gui") - self.AppendItem(self.root, "Recently Used Modules", rumIconId, data=wx.TreeItemData(RECENTLY_USED_MODULES)) + self.AppendItem(self.root, "Recently Used Modules", rumIconId, data=wx.TreeItemData(events.RECENTLY_USED_MODULES)) # Bind our lookup method to when the tree gets expanded self.Bind(wx.EVT_TREE_ITEM_EXPANDING, self.expandLookup) @@ -96,4 +96,3 @@ class MarketTree(wx.TreeCtrl): self.SelectItem(item) self.marketBrowser.itemView.selectionMade() - diff --git a/gui/builtinMarketBrowser/metaButton.py b/gui/builtinMarketBrowser/metaButton.py index ce939a436..3d2762232 100644 --- a/gui/builtinMarketBrowser/metaButton.py +++ b/gui/builtinMarketBrowser/metaButton.py @@ -1,4 +1,4 @@ -from gui.builtinMarketBrowser.events import * +import wx from logbook import Logger pyfalog = Logger(__name__) diff --git a/gui/builtinShipBrowser/events.py b/gui/builtinShipBrowser/events.py index eccb0eda9..b359540cf 100644 --- a/gui/builtinShipBrowser/events.py +++ b/gui/builtinShipBrowser/events.py @@ -11,4 +11,4 @@ Stage1Selected, EVT_SB_STAGE1_SEL = wx.lib.newevent.NewEvent() Stage2Selected, EVT_SB_STAGE2_SEL = wx.lib.newevent.NewEvent() Stage3Selected, EVT_SB_STAGE3_SEL = wx.lib.newevent.NewEvent() SearchSelected, EVT_SB_SEARCH_SEL = wx.lib.newevent.NewEvent() -ImportSelected, EVT_SB_IMPORT_SEL = wx.lib.newevent.NewEvent() \ No newline at end of file +ImportSelected, EVT_SB_IMPORT_SEL = wx.lib.newevent.NewEvent() diff --git a/gui/builtinShipBrowser/navigationPanel.py b/gui/builtinShipBrowser/navigationPanel.py index ae79838cf..cd80b658e 100644 --- a/gui/builtinShipBrowser/navigationPanel.py +++ b/gui/builtinShipBrowser/navigationPanel.py @@ -70,8 +70,8 @@ class NavigationPanel(SFItem.SFBrowserItem): (wx.BORDER_NONE if 'wxGTK' in wx.PlatformInfo else 0)) self.BrowserSearchBox.Show(False) - #self.BrowserSearchBox.Bind(wx.EVT_TEXT_ENTER, self.OnBrowserSearchBoxEnter) - #self.BrowserSearchBox.Bind(wx.EVT_KILL_FOCUS, self.OnBrowserSearchBoxLostFocus) + # self.BrowserSearchBox.Bind(wx.EVT_TEXT_ENTER, self.OnBrowserSearchBoxEnter) + # self.BrowserSearchBox.Bind(wx.EVT_KILL_FOCUS, self.OnBrowserSearchBoxLostFocus) self.BrowserSearchBox.Bind(wx.EVT_KEY_DOWN, self.OnBrowserSearchBoxEsc) self.BrowserSearchBox.Bind(wx.EVT_TEXT, self.OnScheduleSearch) diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py index b67950503..480836c04 100644 --- a/gui/marketBrowser.py +++ b/gui/marketBrowser.py @@ -26,7 +26,6 @@ from gui.builtinMarketBrowser.searchBox import SearchBox from gui.builtinMarketBrowser.itemView import ItemView from gui.builtinMarketBrowser.metaButton import MetaButton from gui.builtinMarketBrowser.marketTree import MarketTree -from gui.builtinMarketBrowser.events import * from logbook import Logger @@ -99,4 +98,3 @@ class MarketBrowser(wx.Panel): def jump(self, item): self.marketView.jump(item) - diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index 2caa74f11..5eea8029b 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -11,7 +11,7 @@ from gui.builtinShipBrowser.shipItem import ShipItem from service.fit import Fit from service.market import Market -from gui.builtinShipBrowser.events import * +import gui.builtinShipBrowser.events as events from gui.builtinShipBrowser.pfWidgetContainer import PFWidgetsContainer from gui.builtinShipBrowser.navigationPanel import NavigationPanel from gui.builtinShipBrowser.raceSelector import RaceSelector @@ -76,11 +76,11 @@ class ShipBrowser(wx.Panel): self.Show() self.Bind(wx.EVT_SIZE, self.SizeRefreshList) - self.Bind(EVT_SB_STAGE2_SEL, self.stage2) - self.Bind(EVT_SB_STAGE1_SEL, self.stage1) - self.Bind(EVT_SB_STAGE3_SEL, self.stage3) - self.Bind(EVT_SB_SEARCH_SEL, self.searchStage) - self.Bind(EVT_SB_IMPORT_SEL, self.importStage) + self.Bind(events.EVT_SB_STAGE2_SEL, self.stage2) + self.Bind(events.EVT_SB_STAGE1_SEL, self.stage1) + self.Bind(events.EVT_SB_STAGE3_SEL, self.stage3) + self.Bind(events.EVT_SB_SEARCH_SEL, self.searchStage) + self.Bind(events.EVT_SB_IMPORT_SEL, self.importStage) self.mainFrame.Bind(GE.FIT_CHANGED, self.RefreshList) @@ -440,7 +440,3 @@ class ShipBrowser(wx.Panel): if self.showRacesFilterInStage2Only: self.raceselect.Show(False) self.Layout() - - - - diff --git a/service/fit.py b/service/fit.py index 9d51047b1..6320b73b7 100644 --- a/service/fit.py +++ b/service/fit.py @@ -255,7 +255,7 @@ class Fit(object): Projected is a recursion flag that is set to reduce recursions into projected fits Basic is a flag to simply return the fit without any other processing """ - #pyfalog.debug("Getting fit for fit ID: {0}", fitID) + # pyfalog.debug("Getting fit for fit ID: {0}", fitID) if fitID is None: return None fit = eos.db.getFit(fitID) diff --git a/tox.ini b/tox.ini index 2d1072d50..ab540fa30 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27, pep8 +envlist = pep8 skipsdist = True [testenv]