diff --git a/config.py b/config.py index 8b0f4b9ae..6b0db1e85 100644 --- a/config.py +++ b/config.py @@ -13,15 +13,15 @@ debug = False saveInRoot = False # Version data -version = "1.10.1" +version = "1.11.1" tag = "git" -expansionName = "Scylla" +expansionName = "Mosaic" expansionVersion = "1.0" evemonMinVersion = "4081" # Database version (int ONLY) # Increment every time we need to flag for user database upgrade/modification -dbversion = 6 +dbversion = 7 pyfaPath = None savePath = None @@ -29,6 +29,11 @@ staticPath = None saveDB = None gameDB = None +# TODO: move back to pyfa.py main loop +# We moved it here just to avoid rebuilding windows skeleton for now (any change to pyfa.py needs it) +import logging +logging.basicConfig() + def defPaths(): global pyfaPath global savePath diff --git a/eos/capSim.py b/eos/capSim.py index 90734d8e1..0057e48cb 100644 --- a/eos/capSim.py +++ b/eos/capSim.py @@ -82,18 +82,25 @@ class CapSimulator(object): if self.scale: duration, capNeed = self.scale_activation(duration, capNeed) - if self.stagger: - duration = int(duration/amount) - else: - capNeed *= amount - - period = lcm(period, duration) - # set clipSize to infinite if reloads are disabled unless it's # a cap booster module. if not self.reload and capNeed > 0: clipSize = 0 + if self.stagger: + if clipSize == 0: + duration = int(duration/amount) + else: + stagger_amount = (duration*clipSize+10000)/(amount*clipSize) + for i in range(1, amount): + heapq.heappush(self.state, + [i*stagger_amount, duration, + capNeed, 0, clipSize]) + else: + capNeed *= amount + + period = lcm(period, duration) + # period optimization doesn't work when reloads are active. if clipSize: disable_period = True diff --git a/eos/db/migrations/upgrade7.py b/eos/db/migrations/upgrade7.py new file mode 100644 index 000000000..226f84b3a --- /dev/null +++ b/eos/db/migrations/upgrade7.py @@ -0,0 +1,24 @@ +""" +Migration 7 + +- Converts Scorpion Ishukone Watch to Scorpion + + Mosaic introduced proper skinning system, and Ishukone Scorp + was the only ship which was presented as stand-alone ship in + Pyfa. +""" + + +CONVERSIONS = { + 640: ( # Scorpion + 4005, # Scorpion Ishukone Watch + ) +} + +def upgrade(saveddata_engine): + + # Convert ships + for replacement_item, list in CONVERSIONS.iteritems(): + for retired_item in list: + saveddata_engine.execute('UPDATE "fits" SET "shipID" = ? WHERE "shipID" = ?', (replacement_item, retired_item)) + diff --git a/eos/effects/armorreinforcermassadd.py b/eos/effects/armorreinforcermassadd.py index 2af496470..75cbe0525 100644 --- a/eos/effects/armorreinforcermassadd.py +++ b/eos/effects/armorreinforcermassadd.py @@ -2,6 +2,7 @@ # # Used by: # Modules from group: Armor Reinforcer (57 of 57) +# Modules from group: Entosis Link (2 of 2) type = "passive" def handler(fit, module, context): fit.ship.increaseItemAttr("mass", module.getModifiedItemAttr("massAddition")) \ No newline at end of file diff --git a/eos/effects/caldarishipecmburstoptimalrangecb3.py b/eos/effects/caldarishipecmburstoptimalrangecb3.py index 414f3fb7b..4cb1863dd 100644 --- a/eos/effects/caldarishipecmburstoptimalrangecb3.py +++ b/eos/effects/caldarishipecmburstoptimalrangecb3.py @@ -2,7 +2,6 @@ # # Used by: # Ship: Scorpion -# Ship: Scorpion Ishukone Watch type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battleship").level diff --git a/eos/effects/caldarishipewfalloffrangecb3.py b/eos/effects/caldarishipewfalloffrangecb3.py index 91f483136..53c0c30fb 100644 --- a/eos/effects/caldarishipewfalloffrangecb3.py +++ b/eos/effects/caldarishipewfalloffrangecb3.py @@ -2,7 +2,6 @@ # # Used by: # Ship: Scorpion -# Ship: Scorpion Ishukone Watch type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battleship").level diff --git a/eos/effects/caldarishipewoptimalrangecb3.py b/eos/effects/caldarishipewoptimalrangecb3.py index db797f41e..22a59a00c 100644 --- a/eos/effects/caldarishipewoptimalrangecb3.py +++ b/eos/effects/caldarishipewoptimalrangecb3.py @@ -2,7 +2,6 @@ # # Used by: # Ship: Scorpion -# Ship: Scorpion Ishukone Watch type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battleship").level diff --git a/eos/effects/caldarishipewstrengthcb.py b/eos/effects/caldarishipewstrengthcb.py index b66d6e239..680703718 100644 --- a/eos/effects/caldarishipewstrengthcb.py +++ b/eos/effects/caldarishipewstrengthcb.py @@ -2,7 +2,6 @@ # # Used by: # Ship: Scorpion -# Ship: Scorpion Ishukone Watch type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battleship").level diff --git a/eos/effects/commandbonustdmultiplywithcommandbonushidden.py b/eos/effects/commandbonustdmultiplywithcommandbonushidden.py index 05825349c..215d539b9 100644 --- a/eos/effects/commandbonustdmultiplywithcommandbonushidden.py +++ b/eos/effects/commandbonustdmultiplywithcommandbonushidden.py @@ -8,5 +8,5 @@ type = "active", "gang" def handler(fit, module, context): if "gang" not in context: return for bonus in ("maxRangeBonus", "falloffBonus", "trackingSpeedBonus"): - fit.modules.filteredItemBoost(lambda mod: lambda mod: mod.item.requiresSkill("Weapon Disruption"), + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), bonus, module.getModifiedItemAttr("commandBonusTD")) diff --git a/eos/effects/commandshipmultirelayeffect.py b/eos/effects/commandshipmultirelayeffect.py index b52881cc6..427bfe38e 100644 --- a/eos/effects/commandshipmultirelayeffect.py +++ b/eos/effects/commandshipmultirelayeffect.py @@ -1,9 +1,9 @@ # commandshipMultiRelayEffect # # Used by: -# Ships from group: Capital Industrial Ship (2 of 2) # Ships from group: Command Ship (8 of 8) -# Ships from group: Industrial Command Ship (2 of 2) +# Ship: Orca +# Ship: Rorqual type = "passive" def handler(fit, ship, context): fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator", diff --git a/eos/effects/drawbackcpuoutput.py b/eos/effects/drawbackcpuoutput.py index 0c0a682a7..07320a4d0 100644 --- a/eos/effects/drawbackcpuoutput.py +++ b/eos/effects/drawbackcpuoutput.py @@ -2,7 +2,6 @@ # # Used by: # Modules from group: Rig Drones (64 of 64) -# Modules named like: Optimizer (16 of 16) type = "passive" def handler(fit, module, context): fit.ship.boostItemAttr("cpuOutput", module.getModifiedItemAttr("drawback")) \ No newline at end of file diff --git a/eos/effects/drawbacksigrad.py b/eos/effects/drawbacksigrad.py index 457db6d2d..95ad15a9b 100644 --- a/eos/effects/drawbacksigrad.py +++ b/eos/effects/drawbacksigrad.py @@ -2,6 +2,7 @@ # # Used by: # Modules from group: Rig Shield (72 of 72) +# Modules named like: Optimizer (16 of 16) type = "passive" def handler(fit, module, context): fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("drawback"), stackingPenalties = True) diff --git a/eos/effects/dreadnoughtmd1projdmgbonus.py b/eos/effects/dreadnoughtmd1projdmgbonus.py index 4f3d7f264..303d8b87f 100644 --- a/eos/effects/dreadnoughtmd1projdmgbonus.py +++ b/eos/effects/dreadnoughtmd1projdmgbonus.py @@ -1,7 +1,7 @@ # dreadnoughtMD1ProjDmgBonus # # Used by: -# Ships named like: Naglfar (2 of 2) +# Ship: Naglfar type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Dreadnought").level diff --git a/eos/effects/dreadnoughtmd3projrofbonus.py b/eos/effects/dreadnoughtmd3projrofbonus.py index 6ecbc500d..639985a44 100644 --- a/eos/effects/dreadnoughtmd3projrofbonus.py +++ b/eos/effects/dreadnoughtmd3projrofbonus.py @@ -1,7 +1,7 @@ # dreadnoughtMD3ProjRoFBonus # # Used by: -# Ships named like: Naglfar (2 of 2) +# Ship: Naglfar type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Dreadnought").level diff --git a/eos/effects/dreadnoughtshipbonushybriddmgg1.py b/eos/effects/dreadnoughtshipbonushybriddmgg1.py index 75e111b79..c0921b5d3 100644 --- a/eos/effects/dreadnoughtshipbonushybriddmgg1.py +++ b/eos/effects/dreadnoughtshipbonushybriddmgg1.py @@ -1,7 +1,7 @@ # dreadnoughtShipBonusHybridDmgG1 # # Used by: -# Ships named like: Moros (2 of 2) +# Ship: Moros type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Dreadnought").level diff --git a/eos/effects/dreadnoughtshipbonushybridrofg2.py b/eos/effects/dreadnoughtshipbonushybridrofg2.py index f28c752a1..ca1a8325e 100644 --- a/eos/effects/dreadnoughtshipbonushybridrofg2.py +++ b/eos/effects/dreadnoughtshipbonushybridrofg2.py @@ -1,7 +1,7 @@ # dreadnoughtShipBonusHybridRoFG2 # # Used by: -# Ships named like: Moros (2 of 2) +# Ship: Moros type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Dreadnought").level diff --git a/eos/effects/dreadnoughtshipbonuslasercapneeda1.py b/eos/effects/dreadnoughtshipbonuslasercapneeda1.py index d5cce7464..53912cfb1 100644 --- a/eos/effects/dreadnoughtshipbonuslasercapneeda1.py +++ b/eos/effects/dreadnoughtshipbonuslasercapneeda1.py @@ -1,7 +1,7 @@ # dreadnoughtShipBonusLaserCapNeedA1 # # Used by: -# Ships named like: Revelation (2 of 2) +# Ship: Revelation type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Dreadnought").level diff --git a/eos/effects/dreadnoughtshipbonuslaserrofa2.py b/eos/effects/dreadnoughtshipbonuslaserrofa2.py index dee4b663b..d01246d24 100644 --- a/eos/effects/dreadnoughtshipbonuslaserrofa2.py +++ b/eos/effects/dreadnoughtshipbonuslaserrofa2.py @@ -1,7 +1,7 @@ # dreadnoughtShipBonusLaserRofA2 # # Used by: -# Ships named like: Revelation (2 of 2) +# Ship: Revelation type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Dreadnought").level diff --git a/eos/effects/dreadnoughtshipbonusshieldresistancesc2.py b/eos/effects/dreadnoughtshipbonusshieldresistancesc2.py index 3f1ef0feb..a837c7a36 100644 --- a/eos/effects/dreadnoughtshipbonusshieldresistancesc2.py +++ b/eos/effects/dreadnoughtshipbonusshieldresistancesc2.py @@ -1,7 +1,7 @@ # dreadnoughtShipBonusShieldResistancesC2 # # Used by: -# Ships named like: Phoenix (2 of 2) +# Ship: Phoenix type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Dreadnought").level diff --git a/eos/effects/elitebargebonusiceharvestingcycletimebarge3.py b/eos/effects/elitebargebonusiceharvestingcycletimebarge3.py index 5f03ed644..9f8b3d19c 100644 --- a/eos/effects/elitebargebonusiceharvestingcycletimebarge3.py +++ b/eos/effects/elitebargebonusiceharvestingcycletimebarge3.py @@ -1,7 +1,7 @@ # eliteBargeBonusIceHarvestingCycleTimeBarge3 # # Used by: -# Ships from group: Exhumer (4 of 4) +# Ships from group: Exhumer (3 of 3) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Exhumers").level diff --git a/eos/effects/elitebargebonusminingdurationbarge2.py b/eos/effects/elitebargebonusminingdurationbarge2.py index 48216b63b..c0ac3476b 100644 --- a/eos/effects/elitebargebonusminingdurationbarge2.py +++ b/eos/effects/elitebargebonusminingdurationbarge2.py @@ -1,7 +1,7 @@ # eliteBargeBonusMiningDurationBarge2 # # Used by: -# Ships from group: Exhumer (4 of 4) +# Ships from group: Exhumer (3 of 3) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Exhumers").level diff --git a/eos/effects/elitebargeshieldresistance1.py b/eos/effects/elitebargeshieldresistance1.py index 278b0f571..b336ae615 100644 --- a/eos/effects/elitebargeshieldresistance1.py +++ b/eos/effects/elitebargeshieldresistance1.py @@ -1,7 +1,7 @@ # eliteBargeShieldResistance1 # # Used by: -# Ships from group: Exhumer (4 of 4) +# Ships from group: Exhumer (3 of 3) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Exhumers").level diff --git a/eos/effects/elitebonusmarauderscruiseandtorpedodamagerole1.py b/eos/effects/elitebonusmarauderscruiseandtorpedodamagerole1.py index ff6dc6f7c..16729828f 100644 --- a/eos/effects/elitebonusmarauderscruiseandtorpedodamagerole1.py +++ b/eos/effects/elitebonusmarauderscruiseandtorpedodamagerole1.py @@ -1,7 +1,7 @@ # eliteBonusMaraudersCruiseAndTorpedoDamageRole1 # # Used by: -# Ships named like: Golem (4 of 4) +# Ship: Golem type = "passive" def handler(fit, ship, context): damageTypes = ("em", "explosive", "kinetic", "thermal") diff --git a/eos/effects/elitebonusmaraudersheavymissiledamageemrole1.py b/eos/effects/elitebonusmaraudersheavymissiledamageemrole1.py index 44ed5ff8f..79a74f96e 100644 --- a/eos/effects/elitebonusmaraudersheavymissiledamageemrole1.py +++ b/eos/effects/elitebonusmaraudersheavymissiledamageemrole1.py @@ -1,7 +1,7 @@ # eliteBonusMaraudersHeavyMissileDamageEMRole1 # # Used by: -# Ships named like: Golem (4 of 4) +# Ship: Golem type = "passive" def handler(fit, ship, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), diff --git a/eos/effects/elitebonusmaraudersheavymissiledamageexprole1.py b/eos/effects/elitebonusmaraudersheavymissiledamageexprole1.py index ee7d8a446..0e928f96d 100644 --- a/eos/effects/elitebonusmaraudersheavymissiledamageexprole1.py +++ b/eos/effects/elitebonusmaraudersheavymissiledamageexprole1.py @@ -1,7 +1,7 @@ # eliteBonusMaraudersHeavyMissileDamageExpRole1 # # Used by: -# Ships named like: Golem (4 of 4) +# Ship: Golem type = "passive" def handler(fit, ship, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), diff --git a/eos/effects/elitebonusmaraudersheavymissiledamagekinrole1.py b/eos/effects/elitebonusmaraudersheavymissiledamagekinrole1.py index d30f51635..8b2a9949d 100644 --- a/eos/effects/elitebonusmaraudersheavymissiledamagekinrole1.py +++ b/eos/effects/elitebonusmaraudersheavymissiledamagekinrole1.py @@ -1,7 +1,7 @@ # eliteBonusMaraudersHeavyMissileDamageKinRole1 # # Used by: -# Ships named like: Golem (4 of 4) +# Ship: Golem type = "passive" def handler(fit, ship, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), diff --git a/eos/effects/elitebonusmaraudersheavymissiledamagethermrole1.py b/eos/effects/elitebonusmaraudersheavymissiledamagethermrole1.py index 9767646c0..cb5f31065 100644 --- a/eos/effects/elitebonusmaraudersheavymissiledamagethermrole1.py +++ b/eos/effects/elitebonusmaraudersheavymissiledamagethermrole1.py @@ -1,7 +1,7 @@ # eliteBonusMaraudersHeavyMissileDamageThermRole1 # # Used by: -# Ships named like: Golem (4 of 4) +# Ship: Golem type = "passive" def handler(fit, ship, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), diff --git a/eos/effects/elitebonusmaraudershieldbonus2a.py b/eos/effects/elitebonusmaraudershieldbonus2a.py index 6c95f9651..fd15a3216 100644 --- a/eos/effects/elitebonusmaraudershieldbonus2a.py +++ b/eos/effects/elitebonusmaraudershieldbonus2a.py @@ -1,7 +1,8 @@ # eliteBonusMarauderShieldBonus2a # # Used by: -# Ships from group: Marauder (8 of 16) +# Ship: Golem +# Ship: Vargur type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Marauders").level diff --git a/eos/effects/elitebonusviolatorsewtargetpainting1.py b/eos/effects/elitebonusviolatorsewtargetpainting1.py index 75421d4c7..3bcc86f25 100644 --- a/eos/effects/elitebonusviolatorsewtargetpainting1.py +++ b/eos/effects/elitebonusviolatorsewtargetpainting1.py @@ -1,7 +1,7 @@ # eliteBonusViolatorsEwTargetPainting1 # # Used by: -# Ships named like: Golem (4 of 4) +# Ship: Golem type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Marauders").level diff --git a/eos/effects/elitebonusviolatorslargeenergyturretdamage1.py b/eos/effects/elitebonusviolatorslargeenergyturretdamage1.py index 0f723b757..19c257162 100644 --- a/eos/effects/elitebonusviolatorslargeenergyturretdamage1.py +++ b/eos/effects/elitebonusviolatorslargeenergyturretdamage1.py @@ -1,7 +1,7 @@ # eliteBonusViolatorsLargeEnergyTurretDamage1 # # Used by: -# Ships named like: Paladin (4 of 4) +# Ship: Paladin type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Marauders").level diff --git a/eos/effects/elitebonusviolatorslargeenergyturretdamagerole1.py b/eos/effects/elitebonusviolatorslargeenergyturretdamagerole1.py index fdc4ebe13..cee1f5fe1 100644 --- a/eos/effects/elitebonusviolatorslargeenergyturretdamagerole1.py +++ b/eos/effects/elitebonusviolatorslargeenergyturretdamagerole1.py @@ -1,7 +1,7 @@ # eliteBonusViolatorsLargeEnergyTurretDamageRole1 # # Used by: -# Ships named like: Paladin (4 of 4) +# Ship: Paladin type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"), diff --git a/eos/effects/elitebonusviolatorslargehybridturretdamagerole1.py b/eos/effects/elitebonusviolatorslargehybridturretdamagerole1.py index 9b9be54e0..ade06d1a0 100644 --- a/eos/effects/elitebonusviolatorslargehybridturretdamagerole1.py +++ b/eos/effects/elitebonusviolatorslargehybridturretdamagerole1.py @@ -1,7 +1,7 @@ # eliteBonusViolatorsLargeHybridTurretDamageRole1 # # Used by: -# Ships named like: Kronos (4 of 4) +# Ship: Kronos type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"), diff --git a/eos/effects/elitebonusviolatorslargehybridturrettracking1.py b/eos/effects/elitebonusviolatorslargehybridturrettracking1.py index c9de93d25..5c7b1fded 100644 --- a/eos/effects/elitebonusviolatorslargehybridturrettracking1.py +++ b/eos/effects/elitebonusviolatorslargehybridturrettracking1.py @@ -1,7 +1,7 @@ # eliteBonusViolatorsLargeHybridTurretTracking1 # # Used by: -# Ships named like: Kronos (4 of 4) +# Ship: Kronos type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Marauders").level diff --git a/eos/effects/elitebonusviolatorslargeprojectileturretdamagerole1.py b/eos/effects/elitebonusviolatorslargeprojectileturretdamagerole1.py index 31e63839d..79cf55663 100644 --- a/eos/effects/elitebonusviolatorslargeprojectileturretdamagerole1.py +++ b/eos/effects/elitebonusviolatorslargeprojectileturretdamagerole1.py @@ -1,7 +1,7 @@ # eliteBonusViolatorsLargeProjectileTurretDamageRole1 # # Used by: -# Ships named like: Vargur (4 of 4) +# Ship: Vargur type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"), diff --git a/eos/effects/elitebonusviolatorslargeprojectileturrettracking1.py b/eos/effects/elitebonusviolatorslargeprojectileturrettracking1.py index 2d2c2c19e..ac03e4dcf 100644 --- a/eos/effects/elitebonusviolatorslargeprojectileturrettracking1.py +++ b/eos/effects/elitebonusviolatorslargeprojectileturrettracking1.py @@ -1,7 +1,7 @@ # eliteBonusViolatorsLargeProjectileTurretTracking1 # # Used by: -# Ships named like: Vargur (4 of 4) +# Ship: Vargur type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Marauders").level diff --git a/eos/effects/elitebonusviolatorsrepairsystemsarmordamageamount2.py b/eos/effects/elitebonusviolatorsrepairsystemsarmordamageamount2.py index d8a63625a..a1d7ce8e1 100644 --- a/eos/effects/elitebonusviolatorsrepairsystemsarmordamageamount2.py +++ b/eos/effects/elitebonusviolatorsrepairsystemsarmordamageamount2.py @@ -1,7 +1,8 @@ # eliteBonusViolatorsRepairSystemsArmorDamageAmount2 # # Used by: -# Ships from group: Marauder (8 of 16) +# Ship: Kronos +# Ship: Paladin type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Marauders").level diff --git a/eos/effects/elitebonusviolatorstractorbeammaxrangerole2.py b/eos/effects/elitebonusviolatorstractorbeammaxrangerole2.py index 1ef90a0ee..724b59f75 100644 --- a/eos/effects/elitebonusviolatorstractorbeammaxrangerole2.py +++ b/eos/effects/elitebonusviolatorstractorbeammaxrangerole2.py @@ -1,7 +1,7 @@ # eliteBonusViolatorsTractorBeamMaxRangeRole2 # # Used by: -# Ships from group: Marauder (16 of 16) +# Ships from group: Marauder (4 of 4) type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", diff --git a/eos/effects/elitebonusviolatorstractorbeammaxtractorvelocityrole3.py b/eos/effects/elitebonusviolatorstractorbeammaxtractorvelocityrole3.py index 2ac2ed9d2..6985e955e 100644 --- a/eos/effects/elitebonusviolatorstractorbeammaxtractorvelocityrole3.py +++ b/eos/effects/elitebonusviolatorstractorbeammaxtractorvelocityrole3.py @@ -1,7 +1,7 @@ # eliteBonusViolatorsTractorBeamMaxTractorVelocityRole3 # # Used by: -# Ships from group: Marauder (16 of 16) +# Ships from group: Marauder (4 of 4) type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", diff --git a/eos/effects/iceharvestercapacitorneedmultiplier.py b/eos/effects/iceharvestercapacitorneedmultiplier.py index e74dcd007..8f16c516f 100644 --- a/eos/effects/iceharvestercapacitorneedmultiplier.py +++ b/eos/effects/iceharvestercapacitorneedmultiplier.py @@ -1,9 +1,8 @@ # iceHarvesterCapacitorNeedMultiplier # # Used by: -# Ships from group: Exhumer (3 of 4) -# Ship: Procurer -# Ship: Retriever +# Variations of ship: Procurer (2 of 2) +# Variations of ship: Retriever (2 of 2) type = "passive" def handler(fit, ship, context): fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Ice Harvesting"), diff --git a/eos/effects/iceharvesterdurationmultiplier.py b/eos/effects/iceharvesterdurationmultiplier.py index 08a54c86a..4019c8063 100644 --- a/eos/effects/iceharvesterdurationmultiplier.py +++ b/eos/effects/iceharvesterdurationmultiplier.py @@ -1,9 +1,8 @@ # iceHarvesterDurationMultiplier # # Used by: -# Ships from group: Exhumer (3 of 4) -# Ship: Procurer -# Ship: Retriever +# Variations of ship: Procurer (2 of 2) +# Variations of ship: Retriever (2 of 2) type = "passive" def handler(fit, ship, context): fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Ice Harvesting"), diff --git a/eos/effects/minigamevirusstrengthbonus.py b/eos/effects/minigamevirusstrengthbonus.py index f8b277b34..47ba315c1 100644 --- a/eos/effects/minigamevirusstrengthbonus.py +++ b/eos/effects/minigamevirusstrengthbonus.py @@ -4,12 +4,12 @@ # Ships from group: Covert Ops (5 of 5) # Ships named like: Stratios (2 of 2) # Subsystems named like: Electronics Emergent Locus Analyzer (4 of 4) -# Variations of ship: Heron (3 of 3) -# Variations of ship: Imicus (3 of 3) -# Variations of ship: Magnate (4 of 6) -# Variations of ship: Probe (3 of 3) # Ship: Astero +# Ship: Heron +# Ship: Imicus +# Ship: Magnate # Ship: Nestor +# Ship: Probe type = "passive" def handler(fit, container, context): level = container.level if "skill" in context else 1 diff --git a/eos/effects/miningdirectorbonuscommandbonuseffective.py b/eos/effects/miningdirectorbonuscommandbonuseffective.py index eec3da6ff..825d66b79 100644 --- a/eos/effects/miningdirectorbonuscommandbonuseffective.py +++ b/eos/effects/miningdirectorbonuscommandbonuseffective.py @@ -1,7 +1,7 @@ # miningDirectorBonusCommandBonusEffective # # Used by: -# Ships from group: Capital Industrial Ship (2 of 2) +# Ship: Rorqual type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Director"), diff --git a/eos/effects/miningyieldmultiplypassive.py b/eos/effects/miningyieldmultiplypassive.py index a9ba45c18..5c6aee92f 100644 --- a/eos/effects/miningyieldmultiplypassive.py +++ b/eos/effects/miningyieldmultiplypassive.py @@ -1,10 +1,9 @@ # miningYieldMultiplyPassive # # Used by: -# Ships from group: Exhumer (3 of 4) +# Variations of ship: Procurer (2 of 2) +# Variations of ship: Retriever (2 of 2) # Variations of ship: Venture (2 of 2) -# Ship: Procurer -# Ship: Retriever type = "passive" def handler(fit, module, context): fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Mining"), diff --git a/eos/effects/mwdsignatureradiusrolebonus.py b/eos/effects/mwdsignatureradiusrolebonus.py index 92f757399..b160c5b28 100644 --- a/eos/effects/mwdsignatureradiusrolebonus.py +++ b/eos/effects/mwdsignatureradiusrolebonus.py @@ -2,7 +2,7 @@ # # Used by: # Ships from group: Assault Frigate (8 of 12) -# Ships from group: Heavy Assault Cruiser (10 of 13) +# Ships from group: Heavy Assault Cruiser (8 of 11) type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"), diff --git a/eos/effects/orecapitalshipshieldtransferrange.py b/eos/effects/orecapitalshipshieldtransferrange.py index 93cebe1b6..76d91c365 100644 --- a/eos/effects/orecapitalshipshieldtransferrange.py +++ b/eos/effects/orecapitalshipshieldtransferrange.py @@ -1,7 +1,7 @@ # oreCapitalShipShieldTransferRange # # Used by: -# Ships from group: Capital Industrial Ship (2 of 2) +# Ship: Rorqual type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Capital Industrial Ships").level diff --git a/eos/effects/rolebonusmaraudermjdrreactivationdelaybonus.py b/eos/effects/rolebonusmaraudermjdrreactivationdelaybonus.py index e754a6546..9af3bd8eb 100644 --- a/eos/effects/rolebonusmaraudermjdrreactivationdelaybonus.py +++ b/eos/effects/rolebonusmaraudermjdrreactivationdelaybonus.py @@ -1,7 +1,7 @@ # roleBonusMarauderMJDRReactivationDelayBonus # # Used by: -# Ships from group: Marauder (16 of 16) +# Ships from group: Marauder (4 of 4) type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Micro Jump Drive", diff --git a/eos/effects/rorqualcargoscanrangebonus.py b/eos/effects/rorqualcargoscanrangebonus.py index fdb003150..3fea94d3c 100644 --- a/eos/effects/rorqualcargoscanrangebonus.py +++ b/eos/effects/rorqualcargoscanrangebonus.py @@ -1,7 +1,7 @@ # rorqualCargoScanRangeBonus # # Used by: -# Ships from group: Capital Industrial Ship (2 of 2) +# Ship: Rorqual type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cargo Scanner", diff --git a/eos/effects/rorqualsurveyscannerrangebonus.py b/eos/effects/rorqualsurveyscannerrangebonus.py index 1de079622..d9857c037 100644 --- a/eos/effects/rorqualsurveyscannerrangebonus.py +++ b/eos/effects/rorqualsurveyscannerrangebonus.py @@ -1,7 +1,7 @@ # rorqualSurveyScannerRangeBonus # # Used by: -# Ships from group: Capital Industrial Ship (2 of 2) +# Ship: Rorqual type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Survey Scanner", diff --git a/eos/effects/shipadvancedspaceshipcommandagilitybonus.py b/eos/effects/shipadvancedspaceshipcommandagilitybonus.py index bbc33a174..e6370d5aa 100644 --- a/eos/effects/shipadvancedspaceshipcommandagilitybonus.py +++ b/eos/effects/shipadvancedspaceshipcommandagilitybonus.py @@ -1,7 +1,7 @@ # shipAdvancedSpaceshipCommandAgilityBonus # # Used by: -# Items from market group: Ships > Capital Ships (32 of 34) +# Items from market group: Ships > Capital Ships (27 of 28) type = "passive" def handler(fit, ship, context): skill = fit.character.getSkill("Advanced Spaceship Command") diff --git a/eos/effects/shiparmoremresistance1abc1.py b/eos/effects/shiparmoremresistance1abc1.py index 4d2d73669..5d6a53cd4 100644 --- a/eos/effects/shiparmoremresistance1abc1.py +++ b/eos/effects/shiparmoremresistance1abc1.py @@ -3,7 +3,6 @@ # Used by: # Variations of ship: Prophecy (2 of 2) # Ship: Absolution -# Ship: Prophecy Blood Raiders Edition type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Battlecruiser").level diff --git a/eos/effects/shiparmoremresistanceaf1.py b/eos/effects/shiparmoremresistanceaf1.py index fc68d0ebe..492b24541 100644 --- a/eos/effects/shiparmoremresistanceaf1.py +++ b/eos/effects/shiparmoremresistanceaf1.py @@ -1,9 +1,9 @@ # shipArmorEMResistanceAF1 # # Used by: -# Ships named like: Punisher (3 of 3) # Ship: Astero # Ship: Malice +# Ship: Punisher type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Frigate").level diff --git a/eos/effects/shiparmorexplosiveresistance1abc1.py b/eos/effects/shiparmorexplosiveresistance1abc1.py index ced56c6b4..300fefccc 100644 --- a/eos/effects/shiparmorexplosiveresistance1abc1.py +++ b/eos/effects/shiparmorexplosiveresistance1abc1.py @@ -3,7 +3,6 @@ # Used by: # Variations of ship: Prophecy (2 of 2) # Ship: Absolution -# Ship: Prophecy Blood Raiders Edition type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Battlecruiser").level diff --git a/eos/effects/shiparmorexresistanceaf1.py b/eos/effects/shiparmorexresistanceaf1.py index 3864d3f55..3d5473ba9 100644 --- a/eos/effects/shiparmorexresistanceaf1.py +++ b/eos/effects/shiparmorexresistanceaf1.py @@ -1,9 +1,9 @@ # shipArmorEXResistanceAF1 # # Used by: -# Ships named like: Punisher (3 of 3) # Ship: Astero # Ship: Malice +# Ship: Punisher type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Frigate").level diff --git a/eos/effects/shiparmorkineticresistance1abc1.py b/eos/effects/shiparmorkineticresistance1abc1.py index cdf643628..4ddff9669 100644 --- a/eos/effects/shiparmorkineticresistance1abc1.py +++ b/eos/effects/shiparmorkineticresistance1abc1.py @@ -3,7 +3,6 @@ # Used by: # Variations of ship: Prophecy (2 of 2) # Ship: Absolution -# Ship: Prophecy Blood Raiders Edition type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Battlecruiser").level diff --git a/eos/effects/shiparmorknresistanceaf1.py b/eos/effects/shiparmorknresistanceaf1.py index 0ba5e9f6f..3461e2a1e 100644 --- a/eos/effects/shiparmorknresistanceaf1.py +++ b/eos/effects/shiparmorknresistanceaf1.py @@ -1,9 +1,9 @@ # shipArmorKNResistanceAF1 # # Used by: -# Ships named like: Punisher (3 of 3) # Ship: Astero # Ship: Malice +# Ship: Punisher type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Frigate").level diff --git a/eos/effects/shiparmorrepairing1gbc2.py b/eos/effects/shiparmorrepairing1gbc2.py index 8ccfaeaa4..57f427e4a 100644 --- a/eos/effects/shiparmorrepairing1gbc2.py +++ b/eos/effects/shiparmorrepairing1gbc2.py @@ -4,7 +4,6 @@ # Variations of ship: Myrmidon (2 of 2) # Ship: Astarte # Ship: Brutix -# Ship: Brutix Serpentis Edition type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Battlecruiser").level diff --git a/eos/effects/shiparmorrepairinggf2.py b/eos/effects/shiparmorrepairinggf2.py index b2a1bc57a..1d9245700 100644 --- a/eos/effects/shiparmorrepairinggf2.py +++ b/eos/effects/shiparmorrepairinggf2.py @@ -1,7 +1,7 @@ # shipArmorRepairingGF2 # # Used by: -# Ships named like: Incursus (3 of 3) +# Ship: Incursus type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Frigate").level diff --git a/eos/effects/shiparmorthermresistance1abc1.py b/eos/effects/shiparmorthermresistance1abc1.py index de6a113ee..59b395516 100644 --- a/eos/effects/shiparmorthermresistance1abc1.py +++ b/eos/effects/shiparmorthermresistance1abc1.py @@ -3,7 +3,6 @@ # Used by: # Variations of ship: Prophecy (2 of 2) # Ship: Absolution -# Ship: Prophecy Blood Raiders Edition type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Battlecruiser").level diff --git a/eos/effects/shiparmorthresistanceaf1.py b/eos/effects/shiparmorthresistanceaf1.py index 19dbb4404..43b869ce9 100644 --- a/eos/effects/shiparmorthresistanceaf1.py +++ b/eos/effects/shiparmorthresistanceaf1.py @@ -1,9 +1,9 @@ # shipArmorTHResistanceAF1 # # Used by: -# Ships named like: Punisher (3 of 3) # Ship: Astero # Ship: Malice +# Ship: Punisher type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Frigate").level diff --git a/eos/effects/shipbonusaoevelocitycruiseandtorpedocb2.py b/eos/effects/shipbonusaoevelocitycruiseandtorpedocb2.py index 545c04b1b..75678d3f3 100644 --- a/eos/effects/shipbonusaoevelocitycruiseandtorpedocb2.py +++ b/eos/effects/shipbonusaoevelocitycruiseandtorpedocb2.py @@ -1,7 +1,7 @@ # shipBonusAoeVelocityCruiseAndTorpedoCB2 # # Used by: -# Ships named like: Golem (4 of 4) +# Ship: Golem type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battleship").level diff --git a/eos/effects/shipbonusarmorresistab.py b/eos/effects/shipbonusarmorresistab.py index 74f6d6d02..ae0d083ba 100644 --- a/eos/effects/shipbonusarmorresistab.py +++ b/eos/effects/shipbonusarmorresistab.py @@ -1,7 +1,7 @@ # shipBonusArmorResistAB # # Used by: -# Ships named like: Abaddon (3 of 3) +# Ship: Abaddon # Ship: Nestor type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonuscapcapab.py b/eos/effects/shipbonuscapcapab.py index 32e9029e2..39104bcf1 100644 --- a/eos/effects/shipbonuscapcapab.py +++ b/eos/effects/shipbonuscapcapab.py @@ -1,8 +1,8 @@ # shipBonusCapCapAB # # Used by: -# Ships named like: Paladin (4 of 4) # Ship: Apocalypse Imperial Issue +# Ship: Paladin type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Battleship").level diff --git a/eos/effects/shipbonuscargo2gi.py b/eos/effects/shipbonuscargo2gi.py index f06a8ad9e..fdbabac07 100644 --- a/eos/effects/shipbonuscargo2gi.py +++ b/eos/effects/shipbonuscargo2gi.py @@ -3,7 +3,6 @@ # Used by: # Variations of ship: Miasmos (3 of 4) # Variations of ship: Nereus (2 of 2) -# Ship: Iteron Inner Zone Shipping Edition # Ship: Iteron Mark V type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonuscargoci.py b/eos/effects/shipbonuscargoci.py index d7f67ff96..5f8bfa00a 100644 --- a/eos/effects/shipbonuscargoci.py +++ b/eos/effects/shipbonuscargoci.py @@ -1,8 +1,8 @@ # shipBonusCargoCI # # Used by: -# Ships named like: Tayra (2 of 2) # Variations of ship: Badger (2 of 2) +# Ship: Tayra type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Industrial").level diff --git a/eos/effects/shipbonuscargomi.py b/eos/effects/shipbonuscargomi.py index b22c354bf..cc23db73b 100644 --- a/eos/effects/shipbonuscargomi.py +++ b/eos/effects/shipbonuscargomi.py @@ -1,8 +1,8 @@ # shipBonusCargoMI # # Used by: -# Ships named like: Mammoth (2 of 2) # Variations of ship: Wreathe (2 of 2) +# Ship: Mammoth type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Industrial").level diff --git a/eos/effects/shipbonusdreadcitadelcruiserofc1.py b/eos/effects/shipbonusdreadcitadelcruiserofc1.py index 92427cdc7..d97580dbc 100644 --- a/eos/effects/shipbonusdreadcitadelcruiserofc1.py +++ b/eos/effects/shipbonusdreadcitadelcruiserofc1.py @@ -1,7 +1,7 @@ # shipBonusDreadCitadelCruiseRofC1 # # Used by: -# Ships named like: Phoenix (2 of 2) +# Ship: Phoenix type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Dreadnought").level diff --git a/eos/effects/shipbonusdreadcitadeltorprofc1.py b/eos/effects/shipbonusdreadcitadeltorprofc1.py index 1371a87e5..ae624dbd5 100644 --- a/eos/effects/shipbonusdreadcitadeltorprofc1.py +++ b/eos/effects/shipbonusdreadcitadeltorprofc1.py @@ -1,7 +1,7 @@ # shipBonusDreadCitadelTorpRofC1 # # Used by: -# Ships named like: Phoenix (2 of 2) +# Ship: Phoenix type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Dreadnought").level diff --git a/eos/effects/shipbonusdronedamagemultiplierabc2.py b/eos/effects/shipbonusdronedamagemultiplierabc2.py index 3dfc8c8e0..0b0738be5 100644 --- a/eos/effects/shipbonusdronedamagemultiplierabc2.py +++ b/eos/effects/shipbonusdronedamagemultiplierabc2.py @@ -1,7 +1,7 @@ # shipBonusDroneDamageMultiplierABC2 # # Used by: -# Ships named like: Prophecy (2 of 2) +# Ship: Prophecy type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Battlecruiser").level diff --git a/eos/effects/shipbonusdronedamagemultipliergb2.py b/eos/effects/shipbonusdronedamagemultipliergb2.py index 80fe20844..c65feca5a 100644 --- a/eos/effects/shipbonusdronedamagemultipliergb2.py +++ b/eos/effects/shipbonusdronedamagemultipliergb2.py @@ -2,7 +2,6 @@ # # Used by: # Variations of ship: Dominix (3 of 3) -# Ship: Dominix Quafe Edition # Ship: Nestor type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonusdronedamagemultipliergc2.py b/eos/effects/shipbonusdronedamagemultipliergc2.py index dc87ee023..38d87217b 100644 --- a/eos/effects/shipbonusdronedamagemultipliergc2.py +++ b/eos/effects/shipbonusdronedamagemultipliergc2.py @@ -2,7 +2,8 @@ # # Used by: # Ships named like: Stratios (2 of 2) -# Ships named like: Vexor (3 of 4) +# Ship: Vexor +# Ship: Vexor Navy Issue type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Cruiser").level diff --git a/eos/effects/shipbonusdronehitpointsabc2.py b/eos/effects/shipbonusdronehitpointsabc2.py index fb1e18493..d1c3a9ce0 100644 --- a/eos/effects/shipbonusdronehitpointsabc2.py +++ b/eos/effects/shipbonusdronehitpointsabc2.py @@ -1,7 +1,7 @@ # shipBonusDroneHitpointsABC2 # # Used by: -# Ships named like: Prophecy (2 of 2) +# Ship: Prophecy type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Battlecruiser").level diff --git a/eos/effects/shipbonusdronehitpointsgb2.py b/eos/effects/shipbonusdronehitpointsgb2.py index aa6c3958a..0a526d7e1 100644 --- a/eos/effects/shipbonusdronehitpointsgb2.py +++ b/eos/effects/shipbonusdronehitpointsgb2.py @@ -2,7 +2,6 @@ # # Used by: # Variations of ship: Dominix (3 of 3) -# Ship: Dominix Quafe Edition # Ship: Nestor type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonusdronehitpointsgc2.py b/eos/effects/shipbonusdronehitpointsgc2.py index 369566d00..620290a64 100644 --- a/eos/effects/shipbonusdronehitpointsgc2.py +++ b/eos/effects/shipbonusdronehitpointsgc2.py @@ -2,7 +2,8 @@ # # Used by: # Ships named like: Stratios (2 of 2) -# Ships named like: Vexor (3 of 4) +# Ship: Vexor +# Ship: Vexor Navy Issue type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Cruiser").level diff --git a/eos/effects/shipbonusdronehitpointsgf.py b/eos/effects/shipbonusdronehitpointsgf.py index b5d838c4b..d1892d7c8 100644 --- a/eos/effects/shipbonusdronehitpointsgf.py +++ b/eos/effects/shipbonusdronehitpointsgf.py @@ -1,8 +1,8 @@ # shipBonusDroneHitpointsGF # # Used by: -# Ships named like: Tristan (2 of 2) # Ship: Astero +# Ship: Tristan type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Frigate").level diff --git a/eos/effects/shipbonusdroneminingamountgc2.py b/eos/effects/shipbonusdroneminingamountgc2.py index 643e7f522..60a66e282 100644 --- a/eos/effects/shipbonusdroneminingamountgc2.py +++ b/eos/effects/shipbonusdroneminingamountgc2.py @@ -1,7 +1,8 @@ # shipBonusDroneMiningAmountGC2 # # Used by: -# Ships named like: Vexor (3 of 4) +# Ship: Vexor +# Ship: Vexor Navy Issue type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Cruiser").level diff --git a/eos/effects/shipbonusdroneoptimalrangegb.py b/eos/effects/shipbonusdroneoptimalrangegb.py index c8e8f2346..746b74c2a 100644 --- a/eos/effects/shipbonusdroneoptimalrangegb.py +++ b/eos/effects/shipbonusdroneoptimalrangegb.py @@ -2,7 +2,6 @@ # # Used by: # Ship: Dominix -# Ship: Dominix Quafe Edition type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Battleship").level diff --git a/eos/effects/shipbonusdronetrackinggb.py b/eos/effects/shipbonusdronetrackinggb.py index 553479ae0..192608c97 100644 --- a/eos/effects/shipbonusdronetrackinggb.py +++ b/eos/effects/shipbonusdronetrackinggb.py @@ -2,7 +2,6 @@ # # Used by: # Ship: Dominix -# Ship: Dominix Quafe Edition type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Battleship").level diff --git a/eos/effects/shipbonusdronetrackinggf.py b/eos/effects/shipbonusdronetrackinggf.py index 8e172b68b..9f666dfe4 100644 --- a/eos/effects/shipbonusdronetrackinggf.py +++ b/eos/effects/shipbonusdronetrackinggf.py @@ -1,7 +1,7 @@ # shipBonusDroneTrackingGF # # Used by: -# Ships named like: Tristan (2 of 2) +# Ship: Tristan type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Frigate").level diff --git a/eos/effects/shipbonusemshieldresistancecb2.py b/eos/effects/shipbonusemshieldresistancecb2.py index 0470458f6..d8f617eaf 100644 --- a/eos/effects/shipbonusemshieldresistancecb2.py +++ b/eos/effects/shipbonusemshieldresistancecb2.py @@ -2,7 +2,7 @@ # # Used by: # Ships named like: Rattlesnake (2 of 2) -# Ships named like: Rokh (3 of 3) +# Ship: Rokh # Ship: Scorpion Navy Issue type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonusexplosiveshieldresistancecb2.py b/eos/effects/shipbonusexplosiveshieldresistancecb2.py index 5421ea9eb..0a18bb8c8 100644 --- a/eos/effects/shipbonusexplosiveshieldresistancecb2.py +++ b/eos/effects/shipbonusexplosiveshieldresistancecb2.py @@ -2,7 +2,7 @@ # # Used by: # Ships named like: Rattlesnake (2 of 2) -# Ships named like: Rokh (3 of 3) +# Ship: Rokh # Ship: Scorpion Navy Issue type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonusheavyassaultmissilelauncherrofmbc2.py b/eos/effects/shipbonusheavyassaultmissilelauncherrofmbc2.py index 0b036f60b..f33fea953 100644 --- a/eos/effects/shipbonusheavyassaultmissilelauncherrofmbc2.py +++ b/eos/effects/shipbonusheavyassaultmissilelauncherrofmbc2.py @@ -2,7 +2,6 @@ # # Used by: # Variations of ship: Cyclone (2 of 2) -# Ship: Cyclone Thukker Tribe Edition type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Battlecruiser").level diff --git a/eos/effects/shipbonusheavymissilelauncherrofmbc2.py b/eos/effects/shipbonusheavymissilelauncherrofmbc2.py index 6b6d8d68b..e238a096d 100644 --- a/eos/effects/shipbonusheavymissilelauncherrofmbc2.py +++ b/eos/effects/shipbonusheavymissilelauncherrofmbc2.py @@ -2,7 +2,6 @@ # # Used by: # Variations of ship: Cyclone (2 of 2) -# Ship: Cyclone Thukker Tribe Edition type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Battlecruiser").level diff --git a/eos/effects/shipbonushtfalloffgb2.py b/eos/effects/shipbonushtfalloffgb2.py index c6a9db3f9..449d46d8c 100644 --- a/eos/effects/shipbonushtfalloffgb2.py +++ b/eos/effects/shipbonushtfalloffgb2.py @@ -1,7 +1,7 @@ # shipBonusHTFalloffGB2 # # Used by: -# Ships named like: Kronos (4 of 4) +# Ship: Kronos type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Battleship").level diff --git a/eos/effects/shipbonushybridoptimalcb.py b/eos/effects/shipbonushybridoptimalcb.py index 918f726b9..e0164fa0a 100644 --- a/eos/effects/shipbonushybridoptimalcb.py +++ b/eos/effects/shipbonushybridoptimalcb.py @@ -1,7 +1,7 @@ # shipBonusHybridOptimalCB # # Used by: -# Ships named like: Rokh (3 of 3) +# Ship: Rokh type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battleship").level diff --git a/eos/effects/shipbonushybridtrackinggf2.py b/eos/effects/shipbonushybridtrackinggf2.py index d50ab59b4..ccbddc1eb 100644 --- a/eos/effects/shipbonushybridtrackinggf2.py +++ b/eos/effects/shipbonushybridtrackinggf2.py @@ -1,10 +1,9 @@ # shipBonusHybridTrackingGF2 # # Used by: -# Ships named like: Tristan (2 of 2) # Ship: Ares # Ship: Federation Navy Comet -# Ship: Police Pursuit Comet +# Ship: Tristan type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Frigate").level diff --git a/eos/effects/shipbonusiceharvesterdurationore3.py b/eos/effects/shipbonusiceharvesterdurationore3.py index 5ef49cac0..ff0dc08a2 100644 --- a/eos/effects/shipbonusiceharvesterdurationore3.py +++ b/eos/effects/shipbonusiceharvesterdurationore3.py @@ -1,7 +1,7 @@ # shipBonusIceHarvesterDurationORE3 # # Used by: -# Ships from group: Exhumer (4 of 4) +# Ships from group: Exhumer (3 of 3) # Ships from group: Mining Barge (3 of 3) type = "passive" def handler(fit, container, context): diff --git a/eos/effects/shipbonuskineticshieldresistancecb2.py b/eos/effects/shipbonuskineticshieldresistancecb2.py index c076ea081..d7c2c5e5e 100644 --- a/eos/effects/shipbonuskineticshieldresistancecb2.py +++ b/eos/effects/shipbonuskineticshieldresistancecb2.py @@ -2,7 +2,7 @@ # # Used by: # Ships named like: Rattlesnake (2 of 2) -# Ships named like: Rokh (3 of 3) +# Ship: Rokh # Ship: Scorpion Navy Issue type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonuslargeenergyturretmaxrangeab.py b/eos/effects/shipbonuslargeenergyturretmaxrangeab.py index eff96e4a8..90e39e39a 100644 --- a/eos/effects/shipbonuslargeenergyturretmaxrangeab.py +++ b/eos/effects/shipbonuslargeenergyturretmaxrangeab.py @@ -1,7 +1,7 @@ # shipBonusLargeEnergyTurretMaxRangeAB # # Used by: -# Ships named like: Paladin (4 of 4) +# Ship: Paladin type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Battleship").level diff --git a/eos/effects/shipbonuslargeenergyturretmaxrangeab2.py b/eos/effects/shipbonuslargeenergyturretmaxrangeab2.py index 6234e18aa..14b92c06b 100644 --- a/eos/effects/shipbonuslargeenergyturretmaxrangeab2.py +++ b/eos/effects/shipbonuslargeenergyturretmaxrangeab2.py @@ -1,7 +1,8 @@ # shipBonusLargeEnergyTurretMaxRangeAB2 # # Used by: -# Ships named like: Apocalypse (5 of 6) +# Ship: Apocalypse +# Ship: Apocalypse Navy Issue type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Battleship").level diff --git a/eos/effects/shipbonuslargeenergyturrettrackingab.py b/eos/effects/shipbonuslargeenergyturrettrackingab.py index af576a600..4e4b5dfb5 100644 --- a/eos/effects/shipbonuslargeenergyturrettrackingab.py +++ b/eos/effects/shipbonuslargeenergyturrettrackingab.py @@ -1,7 +1,8 @@ # shipBonusLargeEnergyTurretTrackingAB # # Used by: -# Ships named like: Apocalypse (5 of 6) +# Ship: Apocalypse +# Ship: Apocalypse Navy Issue type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Battleship").level diff --git a/eos/effects/shipbonuslargeenergyweapondamageab2.py b/eos/effects/shipbonuslargeenergyweapondamageab2.py index cd98d4304..4ed3cf92d 100644 --- a/eos/effects/shipbonuslargeenergyweapondamageab2.py +++ b/eos/effects/shipbonuslargeenergyweapondamageab2.py @@ -1,7 +1,7 @@ # shipBonusLargeEnergyWeaponDamageAB2 # # Used by: -# Ships named like: Abaddon (3 of 3) +# Ship: Abaddon type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Battleship").level diff --git a/eos/effects/shipbonusminingdurationore3.py b/eos/effects/shipbonusminingdurationore3.py index 34517438d..f92bc1527 100644 --- a/eos/effects/shipbonusminingdurationore3.py +++ b/eos/effects/shipbonusminingdurationore3.py @@ -1,7 +1,7 @@ # shipBonusMiningDurationORE3 # # Used by: -# Ships from group: Exhumer (4 of 4) +# Ships from group: Exhumer (3 of 3) # Ships from group: Mining Barge (3 of 3) type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonusorecapshipdronearmorhpandshieldhpandhpbonus.py b/eos/effects/shipbonusorecapshipdronearmorhpandshieldhpandhpbonus.py index ccd60cffe..4c79d5f22 100644 --- a/eos/effects/shipbonusorecapshipdronearmorhpandshieldhpandhpbonus.py +++ b/eos/effects/shipbonusorecapshipdronearmorhpandshieldhpandhpbonus.py @@ -1,7 +1,7 @@ # shipBonusORECapShipDroneArmorHPAndShieldHPAndHpBonus # # Used by: -# Ships from group: Capital Industrial Ship (2 of 2) +# Ship: Rorqual type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Capital Industrial Ships").level diff --git a/eos/effects/shipbonusorecapshipdronedmgbonus.py b/eos/effects/shipbonusorecapshipdronedmgbonus.py index 7a12efd21..f486279ac 100644 --- a/eos/effects/shipbonusorecapshipdronedmgbonus.py +++ b/eos/effects/shipbonusorecapshipdronedmgbonus.py @@ -1,7 +1,7 @@ # shipBonusORECapShipDroneDmgBonus # # Used by: -# Ships from group: Capital Industrial Ship (2 of 2) +# Ship: Rorqual type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Capital Industrial Ships").level diff --git a/eos/effects/shipbonusoreholdore2.py b/eos/effects/shipbonusoreholdore2.py index 5542806f7..2221ef72a 100644 --- a/eos/effects/shipbonusoreholdore2.py +++ b/eos/effects/shipbonusoreholdore2.py @@ -2,7 +2,6 @@ # # Used by: # Variations of ship: Retriever (2 of 2) -# Ship: Mackinaw ORE Development Edition type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Mining Barge").level diff --git a/eos/effects/shipbonuspiratefrigateprojdamage.py b/eos/effects/shipbonuspiratefrigateprojdamage.py index 5701e05b5..e569a3705 100644 --- a/eos/effects/shipbonuspiratefrigateprojdamage.py +++ b/eos/effects/shipbonuspiratefrigateprojdamage.py @@ -3,6 +3,7 @@ # Used by: # Ship: Chremoas # Ship: Dramiel +# Ship: Svipul type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), diff --git a/eos/effects/shipbonusptfalloffmb1.py b/eos/effects/shipbonusptfalloffmb1.py index bea62b809..d4ac35b16 100644 --- a/eos/effects/shipbonusptfalloffmb1.py +++ b/eos/effects/shipbonusptfalloffmb1.py @@ -1,7 +1,7 @@ # shipBonusPTFalloffMB1 # # Used by: -# Ships named like: Vargur (4 of 4) +# Ship: Vargur type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Battleship").level diff --git a/eos/effects/shipbonusrepairsystemsarmorrepairamountgb2.py b/eos/effects/shipbonusrepairsystemsarmorrepairamountgb2.py index 40a07ed80..c1b054191 100644 --- a/eos/effects/shipbonusrepairsystemsarmorrepairamountgb2.py +++ b/eos/effects/shipbonusrepairsystemsarmorrepairamountgb2.py @@ -1,7 +1,7 @@ # shipBonusRepairSystemsArmorRepairAmountGB2 # # Used by: -# Ships named like: Hyperion (3 of 3) +# Ship: Hyperion type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Battleship").level diff --git a/eos/effects/shipbonusrhmlrof2cb.py b/eos/effects/shipbonusrhmlrof2cb.py index 215c28ef0..bbbc91a77 100644 --- a/eos/effects/shipbonusrhmlrof2cb.py +++ b/eos/effects/shipbonusrhmlrof2cb.py @@ -1,7 +1,6 @@ # shipBonusRHMLROF2CB # # Used by: -# Ships named like: Raven Edition (3 of 3) # Ship: Raven # Ship: Widow type = "passive" diff --git a/eos/effects/shipbonussalvagecycleaf.py b/eos/effects/shipbonussalvagecycleaf.py index 5f2f5f313..252fa183e 100644 --- a/eos/effects/shipbonussalvagecycleaf.py +++ b/eos/effects/shipbonussalvagecycleaf.py @@ -1,7 +1,7 @@ # shipBonusSalvageCycleAF # # Used by: -# Variations of ship: Magnate (3 of 6) +# Ship: Magnate type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Frigate").level diff --git a/eos/effects/shipbonussalvagecyclecf.py b/eos/effects/shipbonussalvagecyclecf.py index 13c33aaf2..7832af2b6 100644 --- a/eos/effects/shipbonussalvagecyclecf.py +++ b/eos/effects/shipbonussalvagecyclecf.py @@ -1,7 +1,7 @@ # shipBonusSalvageCycleCF # # Used by: -# Ships named like: Heron (2 of 2) +# Ship: Heron type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Frigate").level diff --git a/eos/effects/shipbonussalvagecyclegf.py b/eos/effects/shipbonussalvagecyclegf.py index e4d62ea31..9e32df3a8 100644 --- a/eos/effects/shipbonussalvagecyclegf.py +++ b/eos/effects/shipbonussalvagecyclegf.py @@ -1,7 +1,7 @@ # shipBonusSalvageCycleGF # # Used by: -# Ships named like: Imicus (2 of 2) +# Ship: Imicus type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Frigate").level diff --git a/eos/effects/shipbonussalvagecyclemf.py b/eos/effects/shipbonussalvagecyclemf.py index 5ae1d5ea1..6d6158919 100644 --- a/eos/effects/shipbonussalvagecyclemf.py +++ b/eos/effects/shipbonussalvagecyclemf.py @@ -1,7 +1,7 @@ # shipBonusSalvageCycleMF # # Used by: -# Ships named like: Probe (2 of 2) +# Ship: Probe type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Frigate").level diff --git a/eos/effects/shipbonusscanprobestrength2af.py b/eos/effects/shipbonusscanprobestrength2af.py index 058642eb7..1be48b032 100644 --- a/eos/effects/shipbonusscanprobestrength2af.py +++ b/eos/effects/shipbonusscanprobestrength2af.py @@ -1,7 +1,7 @@ # shipBonusScanProbeStrength2AF # # Used by: -# Variations of ship: Magnate (3 of 6) +# Ship: Magnate type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Frigate").level diff --git a/eos/effects/shipbonusscanprobestrengthcf.py b/eos/effects/shipbonusscanprobestrengthcf.py index 7488cce33..7528d4222 100644 --- a/eos/effects/shipbonusscanprobestrengthcf.py +++ b/eos/effects/shipbonusscanprobestrengthcf.py @@ -1,7 +1,7 @@ # shipBonusScanProbeStrengthCF # # Used by: -# Ships named like: Heron (2 of 2) +# Ship: Heron type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Frigate").level diff --git a/eos/effects/shipbonusscanprobestrengthgf.py b/eos/effects/shipbonusscanprobestrengthgf.py index d7f43b2ab..06276bbc1 100644 --- a/eos/effects/shipbonusscanprobestrengthgf.py +++ b/eos/effects/shipbonusscanprobestrengthgf.py @@ -1,7 +1,7 @@ # shipBonusScanProbeStrengthGF # # Used by: -# Ships named like: Imicus (2 of 2) +# Ship: Imicus type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Frigate").level diff --git a/eos/effects/shipbonusscanprobestrengthmf.py b/eos/effects/shipbonusscanprobestrengthmf.py index cb1022a60..6287ba5ac 100644 --- a/eos/effects/shipbonusscanprobestrengthmf.py +++ b/eos/effects/shipbonusscanprobestrengthmf.py @@ -1,7 +1,7 @@ # shipBonusScanProbeStrengthMF # # Used by: -# Ships named like: Probe (2 of 2) +# Ship: Probe type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Frigate").level diff --git a/eos/effects/shipbonusshieldboostermb1a.py b/eos/effects/shipbonusshieldboostermb1a.py index 8c6594841..d7e557913 100644 --- a/eos/effects/shipbonusshieldboostermb1a.py +++ b/eos/effects/shipbonusshieldboostermb1a.py @@ -1,7 +1,7 @@ # shipBonusShieldBoosterMB1a # # Used by: -# Ships named like: Maelstrom (3 of 3) +# Ship: Maelstrom type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Battleship").level diff --git a/eos/effects/shipbonussmallenergyturretdamagepiratefaction.py b/eos/effects/shipbonussmallenergyturretdamagepiratefaction.py index 4554a5af5..3203b1b52 100644 --- a/eos/effects/shipbonussmallenergyturretdamagepiratefaction.py +++ b/eos/effects/shipbonussmallenergyturretdamagepiratefaction.py @@ -1,6 +1,7 @@ # shipBonusSmallEnergyTurretDamagePirateFaction # # Used by: +# Ship: Confessor # Ship: Cruor # Ship: Succubus type = "passive" diff --git a/eos/effects/shipbonussptfalloffmf2.py b/eos/effects/shipbonussptfalloffmf2.py index ffe6a3887..d9b2fb6cd 100644 --- a/eos/effects/shipbonussptfalloffmf2.py +++ b/eos/effects/shipbonussptfalloffmf2.py @@ -1,7 +1,7 @@ # shipBonusSPTFalloffMF2 # # Used by: -# Ships named like: Rifter (3 of 3) +# Ship: Rifter type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Frigate").level diff --git a/eos/effects/shipbonusthermicshieldresistancecb2.py b/eos/effects/shipbonusthermicshieldresistancecb2.py index 29f7f07cf..522f69ded 100644 --- a/eos/effects/shipbonusthermicshieldresistancecb2.py +++ b/eos/effects/shipbonusthermicshieldresistancecb2.py @@ -2,7 +2,7 @@ # # Used by: # Ships named like: Rattlesnake (2 of 2) -# Ships named like: Rokh (3 of 3) +# Ship: Rokh # Ship: Scorpion Navy Issue type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonusvelocityci.py b/eos/effects/shipbonusvelocityci.py index 7364fd0ae..d1124fcc2 100644 --- a/eos/effects/shipbonusvelocityci.py +++ b/eos/effects/shipbonusvelocityci.py @@ -3,7 +3,6 @@ # Used by: # Variations of ship: Tayra (2 of 2) # Ship: Crane -# Ship: Tayra Wiyrkomi Edition type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Industrial").level diff --git a/eos/effects/shipbonusvelocitygi.py b/eos/effects/shipbonusvelocitygi.py index b0e1e2925..2895f6bc1 100644 --- a/eos/effects/shipbonusvelocitygi.py +++ b/eos/effects/shipbonusvelocitygi.py @@ -1,9 +1,10 @@ # shipBonusVelocityGI # # Used by: -# Ships from group: Industrial (8 of 21) +# Variations of ship: Epithal (2 of 2) # Variations of ship: Miasmos (4 of 4) -# Ship: Occator +# Ship: Iteron Mark V +# Ship: Kryos # Ship: Viator type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipcargobonusai.py b/eos/effects/shipcargobonusai.py index 2edaee7b7..a9a627a7f 100644 --- a/eos/effects/shipcargobonusai.py +++ b/eos/effects/shipcargobonusai.py @@ -1,8 +1,8 @@ # shipCargoBonusAI # # Used by: -# Ships named like: Bestower (2 of 2) # Variations of ship: Sigil (2 of 2) +# Ship: Bestower type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Industrial").level diff --git a/eos/effects/shipcommandbonuseffectivemultiplierorecapital2.py b/eos/effects/shipcommandbonuseffectivemultiplierorecapital2.py index e47cf0ef8..85891e7e6 100644 --- a/eos/effects/shipcommandbonuseffectivemultiplierorecapital2.py +++ b/eos/effects/shipcommandbonuseffectivemultiplierorecapital2.py @@ -1,7 +1,7 @@ # shipCommandBonusEffectiveMultiplierOreCapital2 # # Used by: -# Ships from group: Capital Industrial Ship (2 of 2) +# Ship: Rorqual type = "passive" def handler(fit, ship, context): if fit.extraAttributes["siege"]: diff --git a/eos/effects/shipconsumptionquantitybonusindustrialreconfigurationorecapital1.py b/eos/effects/shipconsumptionquantitybonusindustrialreconfigurationorecapital1.py index 8930c768b..2010769b5 100644 --- a/eos/effects/shipconsumptionquantitybonusindustrialreconfigurationorecapital1.py +++ b/eos/effects/shipconsumptionquantitybonusindustrialreconfigurationorecapital1.py @@ -1,7 +1,7 @@ # shipConsumptionQuantityBonusIndustrialReconfigurationORECapital1 # # Used by: -# Ships from group: Capital Industrial Ship (2 of 2) +# Ship: Rorqual type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Capital Industrial Ships").level diff --git a/eos/effects/shipcruiseandtorpedovelocitybonuscb3.py b/eos/effects/shipcruiseandtorpedovelocitybonuscb3.py index 817ef9dfa..2978381b9 100644 --- a/eos/effects/shipcruiseandtorpedovelocitybonuscb3.py +++ b/eos/effects/shipcruiseandtorpedovelocitybonuscb3.py @@ -1,7 +1,7 @@ # shipCruiseAndTorpedoVelocityBonusCB3 # # Used by: -# Ships named like: Golem (4 of 4) +# Ship: Golem # Ship: Widow type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipcruiselauncherrofbonus2cb.py b/eos/effects/shipcruiselauncherrofbonus2cb.py index 8ad0ca847..555657a25 100644 --- a/eos/effects/shipcruiselauncherrofbonus2cb.py +++ b/eos/effects/shipcruiselauncherrofbonus2cb.py @@ -1,7 +1,8 @@ # shipCruiseLauncherROFBonus2CB # # Used by: -# Ships named like: Raven (5 of 6) +# Ship: Raven +# Ship: Raven State Issue type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battleship").level diff --git a/eos/effects/shipcruisemissilevelocitybonuscb3.py b/eos/effects/shipcruisemissilevelocitybonuscb3.py index f9d3939da..faa6bbb63 100644 --- a/eos/effects/shipcruisemissilevelocitybonuscb3.py +++ b/eos/effects/shipcruisemissilevelocitybonuscb3.py @@ -1,7 +1,7 @@ # shipCruiseMissileVelocityBonusCB3 # # Used by: -# Ships named like: Raven (6 of 6) +# Variations of ship: Raven (3 of 4) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battleship").level diff --git a/eos/effects/shiphtdmgbonusfixedgc.py b/eos/effects/shiphtdmgbonusfixedgc.py index 33ad961e3..1058c3329 100644 --- a/eos/effects/shiphtdmgbonusfixedgc.py +++ b/eos/effects/shiphtdmgbonusfixedgc.py @@ -1,12 +1,13 @@ # shipHTDmgBonusfixedGC # # Used by: -# Ships named like: Thorax (3 of 3) -# Ships named like: Vexor (3 of 4) # Ship: Adrestia # Ship: Arazu # Ship: Deimos # Ship: Exequror Navy Issue +# Ship: Guardian-Vexor +# Ship: Thorax +# Ship: Vexor type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Cruiser").level diff --git a/eos/effects/shiphtdmgbonusgb.py b/eos/effects/shiphtdmgbonusgb.py index 9e7b19343..6f0e392fd 100644 --- a/eos/effects/shiphtdmgbonusgb.py +++ b/eos/effects/shiphtdmgbonusgb.py @@ -1,9 +1,9 @@ # shipHTDmgBonusGB # # Used by: -# Ships named like: Hyperion (3 of 3) -# Ships named like: Kronos (4 of 4) # Ship: Dominix Navy Issue +# Ship: Hyperion +# Ship: Kronos # Ship: Megathron Federate Issue # Ship: Sin type = "passive" diff --git a/eos/effects/shiphttrackingbonusgb2.py b/eos/effects/shiphttrackingbonusgb2.py index 3e527ca67..9369ff662 100644 --- a/eos/effects/shiphttrackingbonusgb2.py +++ b/eos/effects/shiphttrackingbonusgb2.py @@ -1,7 +1,7 @@ # shipHTTrackingBonusGB2 # # Used by: -# Ships named like: Megathron (6 of 6) +# Ships named like: Megathron (3 of 3) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Battleship").level diff --git a/eos/effects/shiphybriddamagebonuscf2.py b/eos/effects/shiphybriddamagebonuscf2.py index 429baf4ab..7d7d71480 100644 --- a/eos/effects/shiphybriddamagebonuscf2.py +++ b/eos/effects/shiphybriddamagebonuscf2.py @@ -1,7 +1,7 @@ # shipHybridDamageBonusCF2 # # Used by: -# Ships named like: Merlin (3 of 3) +# Ship: Merlin type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Frigate").level diff --git a/eos/effects/shiphybriddmg1gbc1.py b/eos/effects/shiphybriddmg1gbc1.py index ffd4d93f0..cc8a9638f 100644 --- a/eos/effects/shiphybriddmg1gbc1.py +++ b/eos/effects/shiphybriddmg1gbc1.py @@ -2,7 +2,6 @@ # # Used by: # Variations of ship: Brutix (3 of 3) -# Ship: Brutix Serpentis Edition type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Battlecruiser").level diff --git a/eos/effects/shiphybridfalloff1gd1.py b/eos/effects/shiphybridfalloff1gd1.py index ec721066b..e9527f2d2 100644 --- a/eos/effects/shiphybridfalloff1gd1.py +++ b/eos/effects/shiphybridfalloff1gd1.py @@ -1,8 +1,7 @@ # shipHybridFallOff1GD1 # # Used by: -# Variations of ship: Catalyst (6 of 7) -# Ship: Catalyst Serpentis Edition +# Ship: Catalyst type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Destroyer").level diff --git a/eos/effects/shiphybridoptimal1cbc1.py b/eos/effects/shiphybridoptimal1cbc1.py index 37dc78477..637caf6f3 100644 --- a/eos/effects/shiphybridoptimal1cbc1.py +++ b/eos/effects/shiphybridoptimal1cbc1.py @@ -2,7 +2,6 @@ # # Used by: # Variations of ship: Ferox (2 of 2) -# Ship: Ferox Guristas Edition type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battlecruiser").level diff --git a/eos/effects/shiphybridrange1cd1.py b/eos/effects/shiphybridrange1cd1.py index 9660bb3da..9da623c19 100644 --- a/eos/effects/shiphybridrange1cd1.py +++ b/eos/effects/shiphybridrange1cd1.py @@ -1,7 +1,7 @@ # shipHybridRange1CD1 # # Used by: -# Ships named like: Cormorant (2 of 2) +# Ship: Cormorant type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Destroyer").level diff --git a/eos/effects/shiphybridtracking1gd2.py b/eos/effects/shiphybridtracking1gd2.py index 9278cf7aa..99172650b 100644 --- a/eos/effects/shiphybridtracking1gd2.py +++ b/eos/effects/shiphybridtracking1gd2.py @@ -1,9 +1,8 @@ # shipHybridTracking1GD2 # # Used by: -# Variations of ship: Catalyst (7 of 7) +# Variations of ship: Catalyst (2 of 2) # Ship: Algos -# Ship: Catalyst Serpentis Edition type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Destroyer").level diff --git a/eos/effects/shiphybridtrackingcd2.py b/eos/effects/shiphybridtrackingcd2.py index f3b9f3e23..33a20d282 100644 --- a/eos/effects/shiphybridtrackingcd2.py +++ b/eos/effects/shiphybridtrackingcd2.py @@ -1,7 +1,7 @@ # shipHybridTrackingCD2 # # Used by: -# Ships named like: Cormorant (2 of 2) +# Ship: Cormorant type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Destroyer").level diff --git a/eos/effects/shiphybridtrackinggc2.py b/eos/effects/shiphybridtrackinggc2.py index 5fa21fd44..6832d023a 100644 --- a/eos/effects/shiphybridtrackinggc2.py +++ b/eos/effects/shiphybridtrackinggc2.py @@ -1,7 +1,7 @@ # shipHybridTrackingGC2 # # Used by: -# Ships named like: Thorax (3 of 3) +# Ship: Thorax type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Cruiser").level diff --git a/eos/effects/shiplargehybridturretrofgb.py b/eos/effects/shiplargehybridturretrofgb.py index 999b644ae..dbc8a25b7 100644 --- a/eos/effects/shiplargehybridturretrofgb.py +++ b/eos/effects/shiplargehybridturretrofgb.py @@ -1,7 +1,8 @@ # shipLargeHybridTurretRofGB # # Used by: -# Ships named like: Megathron (5 of 6) +# Ship: Megathron +# Ship: Megathron Navy Issue type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Battleship").level diff --git a/eos/effects/shiplasercapneed2ad1.py b/eos/effects/shiplasercapneed2ad1.py index b0d757a02..bfbcb83ff 100644 --- a/eos/effects/shiplasercapneed2ad1.py +++ b/eos/effects/shiplasercapneed2ad1.py @@ -1,7 +1,7 @@ # shipLaserCapNeed2AD1 # # Used by: -# Ships named like: Coercer (2 of 2) +# Ship: Coercer type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Destroyer").level diff --git a/eos/effects/shiplaserrofac2.py b/eos/effects/shiplaserrofac2.py index 62118fd4d..f0e115d4b 100644 --- a/eos/effects/shiplaserrofac2.py +++ b/eos/effects/shiplaserrofac2.py @@ -1,7 +1,7 @@ # shipLaserRofAC2 # # Used by: -# Ships named like: Omen (3 of 4) +# Ship: Omen # Ship: Zealot type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shiplasertracking2ad2.py b/eos/effects/shiplasertracking2ad2.py index d8f474025..079517875 100644 --- a/eos/effects/shiplasertracking2ad2.py +++ b/eos/effects/shiplasertracking2ad2.py @@ -1,7 +1,7 @@ # shipLaserTracking2AD2 # # Used by: -# Ships named like: Coercer (2 of 2) +# Ship: Coercer type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Destroyer").level diff --git a/eos/effects/shipmissileassaultmissilevelocitybonuscc2.py b/eos/effects/shipmissileassaultmissilevelocitybonuscc2.py index a778373fa..9130d300e 100644 --- a/eos/effects/shipmissileassaultmissilevelocitybonuscc2.py +++ b/eos/effects/shipmissileassaultmissilevelocitybonuscc2.py @@ -1,7 +1,7 @@ # shipMissileAssaultMissileVelocityBonusCC2 # # Used by: -# Ships named like: Caracal (3 of 4) +# Ship: Caracal # Ship: Osprey Navy Issue type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipmissileheavyvelocitybonuscc2.py b/eos/effects/shipmissileheavyvelocitybonuscc2.py index 63a4a37c2..7e6646950 100644 --- a/eos/effects/shipmissileheavyvelocitybonuscc2.py +++ b/eos/effects/shipmissileheavyvelocitybonuscc2.py @@ -1,7 +1,7 @@ # shipMissileHeavyVelocityBonusCC2 # # Used by: -# Ships named like: Caracal (3 of 4) +# Ship: Caracal # Ship: Osprey Navy Issue type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipmissilelightvelocitybonuscc2.py b/eos/effects/shipmissilelightvelocitybonuscc2.py index da2dc8033..9dbf6392f 100644 --- a/eos/effects/shipmissilelightvelocitybonuscc2.py +++ b/eos/effects/shipmissilelightvelocitybonuscc2.py @@ -1,7 +1,7 @@ # shipMissileLightVelocityBonusCC2 # # Used by: -# Ships named like: Caracal (3 of 4) +# Ship: Caracal # Ship: Osprey Navy Issue type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipmissilerofcc.py b/eos/effects/shipmissilerofcc.py index 576f5e5b5..0a4f50bca 100644 --- a/eos/effects/shipmissilerofcc.py +++ b/eos/effects/shipmissilerofcc.py @@ -1,7 +1,7 @@ # shipMissileRofCC # # Used by: -# Ships named like: Caracal (4 of 4) +# Ships named like: Caracal (2 of 2) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Cruiser").level diff --git a/eos/effects/shippdmgbonusmf.py b/eos/effects/shippdmgbonusmf.py index e5d992266..a77ffba3c 100644 --- a/eos/effects/shippdmgbonusmf.py +++ b/eos/effects/shippdmgbonusmf.py @@ -1,7 +1,6 @@ # shipPDmgBonusMF # # Used by: -# Ships named like: Rifter (3 of 3) # Variations of ship: Rifter (3 of 3) # Variations of ship: Slasher (3 of 3) # Ship: Cheetah diff --git a/eos/effects/shipprojectiledamagemd1.py b/eos/effects/shipprojectiledamagemd1.py index d72bd0590..e28d5424d 100644 --- a/eos/effects/shipprojectiledamagemd1.py +++ b/eos/effects/shipprojectiledamagemd1.py @@ -1,8 +1,7 @@ # shipProjectileDamageMD1 # # Used by: -# Variations of ship: Thrasher (3 of 3) -# Ship: Thrasher Thukker Tribe Edition +# Variations of ship: Thrasher (2 of 2) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Destroyer").level diff --git a/eos/effects/shipprojectiletracking1md2.py b/eos/effects/shipprojectiletracking1md2.py index 4766c59c7..a550bedb8 100644 --- a/eos/effects/shipprojectiletracking1md2.py +++ b/eos/effects/shipprojectiletracking1md2.py @@ -1,8 +1,7 @@ # shipProjectileTracking1MD2 # # Used by: -# Variations of ship: Thrasher (3 of 3) -# Ship: Thrasher Thukker Tribe Edition +# Variations of ship: Thrasher (2 of 2) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Destroyer").level diff --git a/eos/effects/shipptdmgbonusmb.py b/eos/effects/shipptdmgbonusmb.py index ef4e66b65..19d3c5744 100644 --- a/eos/effects/shipptdmgbonusmb.py +++ b/eos/effects/shipptdmgbonusmb.py @@ -1,7 +1,7 @@ # shipPTDmgBonusMB # # Used by: -# Ships named like: Tempest (6 of 6) +# Variations of ship: Tempest (3 of 4) # Ship: Machariel # Ship: Panther type = "passive" diff --git a/eos/effects/shipptspeedbonusmb2.py b/eos/effects/shipptspeedbonusmb2.py index 8cdb3128b..1e17e1b24 100644 --- a/eos/effects/shipptspeedbonusmb2.py +++ b/eos/effects/shipptspeedbonusmb2.py @@ -1,10 +1,8 @@ # shipPTspeedBonusMB2 # # Used by: -# Ships named like: Maelstrom (3 of 3) -# Ships named like: Tempest Edition (3 of 3) -# Ships named like: Vargur Edition (3 of 3) # Variations of ship: Tempest (4 of 4) +# Ship: Maelstrom # Ship: Panther # Ship: Typhoon Fleet Issue type = "passive" diff --git a/eos/effects/shippturretfalloffbonusmc2.py b/eos/effects/shippturretfalloffbonusmc2.py index 03c49b0b0..41f753c92 100644 --- a/eos/effects/shippturretfalloffbonusmc2.py +++ b/eos/effects/shippturretfalloffbonusmc2.py @@ -1,7 +1,7 @@ # shipPTurretFalloffBonusMC2 # # Used by: -# Ships named like: Stabber (3 of 4) +# Ship: Stabber type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Cruiser").level diff --git a/eos/effects/shippturretspeedbonusmc.py b/eos/effects/shippturretspeedbonusmc.py index c561afc47..51e9e5041 100644 --- a/eos/effects/shippturretspeedbonusmc.py +++ b/eos/effects/shippturretspeedbonusmc.py @@ -1,7 +1,6 @@ # shipPTurretSpeedBonusMC # # Used by: -# Ships named like: Stabber (4 of 4) # Variations of ship: Rupture (3 of 3) # Variations of ship: Stabber (3 of 3) # Ship: Huginn diff --git a/eos/effects/shipsetdmgbonus2af.py b/eos/effects/shipsetdmgbonus2af.py index f1ecee404..5557c9280 100644 --- a/eos/effects/shipsetdmgbonus2af.py +++ b/eos/effects/shipsetdmgbonus2af.py @@ -1,7 +1,7 @@ # shipSETDmgBonus2AF # # Used by: -# Ships named like: Punisher (3 of 3) +# Ship: Punisher type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Frigate").level diff --git a/eos/effects/shipshieldboost1mbc1.py b/eos/effects/shipshieldboost1mbc1.py index 42551f49d..45d610477 100644 --- a/eos/effects/shipshieldboost1mbc1.py +++ b/eos/effects/shipshieldboost1mbc1.py @@ -2,7 +2,6 @@ # # Used by: # Variations of ship: Cyclone (2 of 2) -# Ship: Cyclone Thukker Tribe Edition # Ship: Sleipnir type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipshieldemresistance1cbc2.py b/eos/effects/shipshieldemresistance1cbc2.py index 163b9e602..3c5db21a4 100644 --- a/eos/effects/shipshieldemresistance1cbc2.py +++ b/eos/effects/shipshieldemresistance1cbc2.py @@ -3,7 +3,6 @@ # Used by: # Variations of ship: Ferox (2 of 2) # Ship: Drake -# Ship: Ferox Guristas Edition # Ship: Nighthawk type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipshieldemresistancecf2.py b/eos/effects/shipshieldemresistancecf2.py index d55874bec..250bfe02c 100644 --- a/eos/effects/shipshieldemresistancecf2.py +++ b/eos/effects/shipshieldemresistancecf2.py @@ -1,7 +1,6 @@ # shipShieldEMResistanceCF2 # # Used by: -# Ships named like: Merlin (3 of 3) # Variations of ship: Merlin (3 of 4) # Ship: Cambion # Ship: Whiptail diff --git a/eos/effects/shipshieldexplosiveresistance1cbc2.py b/eos/effects/shipshieldexplosiveresistance1cbc2.py index a16bfe29c..2c394026f 100644 --- a/eos/effects/shipshieldexplosiveresistance1cbc2.py +++ b/eos/effects/shipshieldexplosiveresistance1cbc2.py @@ -3,7 +3,6 @@ # Used by: # Variations of ship: Ferox (2 of 2) # Ship: Drake -# Ship: Ferox Guristas Edition # Ship: Nighthawk type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipshieldexplosiveresistancecf2.py b/eos/effects/shipshieldexplosiveresistancecf2.py index 00dc8375f..e6e65956f 100644 --- a/eos/effects/shipshieldexplosiveresistancecf2.py +++ b/eos/effects/shipshieldexplosiveresistancecf2.py @@ -1,7 +1,6 @@ # shipShieldExplosiveResistanceCF2 # # Used by: -# Ships named like: Merlin (3 of 3) # Variations of ship: Merlin (3 of 4) # Ship: Cambion # Ship: Whiptail diff --git a/eos/effects/shipshieldkineticresistance1cbc2.py b/eos/effects/shipshieldkineticresistance1cbc2.py index 20d42c782..dc4bb30af 100644 --- a/eos/effects/shipshieldkineticresistance1cbc2.py +++ b/eos/effects/shipshieldkineticresistance1cbc2.py @@ -3,7 +3,6 @@ # Used by: # Variations of ship: Ferox (2 of 2) # Ship: Drake -# Ship: Ferox Guristas Edition # Ship: Nighthawk type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipshieldkineticresistancecf2.py b/eos/effects/shipshieldkineticresistancecf2.py index b1f706a26..3f38bcd0a 100644 --- a/eos/effects/shipshieldkineticresistancecf2.py +++ b/eos/effects/shipshieldkineticresistancecf2.py @@ -1,7 +1,6 @@ # shipShieldKineticResistanceCF2 # # Used by: -# Ships named like: Merlin (3 of 3) # Variations of ship: Merlin (3 of 4) # Ship: Cambion # Ship: Whiptail diff --git a/eos/effects/shipshieldthermalresistance1cbc2.py b/eos/effects/shipshieldthermalresistance1cbc2.py index 864f23b9a..0e4f2fc78 100644 --- a/eos/effects/shipshieldthermalresistance1cbc2.py +++ b/eos/effects/shipshieldthermalresistance1cbc2.py @@ -3,7 +3,6 @@ # Used by: # Variations of ship: Ferox (2 of 2) # Ship: Drake -# Ship: Ferox Guristas Edition # Ship: Nighthawk type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipshieldthermalresistancecf2.py b/eos/effects/shipshieldthermalresistancecf2.py index 00645f1db..ae271d8e3 100644 --- a/eos/effects/shipshieldthermalresistancecf2.py +++ b/eos/effects/shipshieldthermalresistancecf2.py @@ -1,7 +1,6 @@ # shipShieldThermalResistanceCF2 # # Used by: -# Ships named like: Merlin (3 of 3) # Variations of ship: Merlin (3 of 4) # Ship: Cambion # Ship: Whiptail diff --git a/eos/effects/shipshtdmgbonusgf.py b/eos/effects/shipshtdmgbonusgf.py index acab7d885..21412605f 100644 --- a/eos/effects/shipshtdmgbonusgf.py +++ b/eos/effects/shipshtdmgbonusgf.py @@ -1,12 +1,10 @@ # shipSHTDmgBonusGF # # Used by: -# Ships named like: Incursus (3 of 3) # Variations of ship: Incursus (3 of 3) # Ship: Atron # Ship: Federation Navy Comet # Ship: Helios -# Ship: Police Pursuit Comet # Ship: Taranis type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipsiegelauncherrofbonus2cb.py b/eos/effects/shipsiegelauncherrofbonus2cb.py index af9ca6851..7f4eb514a 100644 --- a/eos/effects/shipsiegelauncherrofbonus2cb.py +++ b/eos/effects/shipsiegelauncherrofbonus2cb.py @@ -1,7 +1,8 @@ # shipSiegeLauncherROFBonus2CB # # Used by: -# Ships named like: Raven (5 of 6) +# Ship: Raven +# Ship: Raven State Issue type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battleship").level diff --git a/eos/effects/shiptcapneedbonusac.py b/eos/effects/shiptcapneedbonusac.py index 72c66fa76..2f6dbc21d 100644 --- a/eos/effects/shiptcapneedbonusac.py +++ b/eos/effects/shiptcapneedbonusac.py @@ -1,8 +1,8 @@ # shipTCapNeedBonusAC # # Used by: -# Ships named like: Omen (3 of 4) # Ship: Devoter +# Ship: Omen # Ship: Zealot type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shiptorpedosvelocitybonuscb3.py b/eos/effects/shiptorpedosvelocitybonuscb3.py index 69de71c7c..227b32093 100644 --- a/eos/effects/shiptorpedosvelocitybonuscb3.py +++ b/eos/effects/shiptorpedosvelocitybonuscb3.py @@ -1,7 +1,7 @@ # shipTorpedosVelocityBonusCB3 # # Used by: -# Ships named like: Raven (6 of 6) +# Variations of ship: Raven (3 of 4) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battleship").level diff --git a/eos/effects/shipvelocitybonusai.py b/eos/effects/shipvelocitybonusai.py index cf1003145..5e8c3a4e0 100644 --- a/eos/effects/shipvelocitybonusai.py +++ b/eos/effects/shipvelocitybonusai.py @@ -2,7 +2,6 @@ # # Used by: # Variations of ship: Bestower (2 of 2) -# Ship: Bestower Tash-Murkon Edition # Ship: Prorator type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipvelocitybonusmi.py b/eos/effects/shipvelocitybonusmi.py index 55a4eecfd..a1bd2a747 100644 --- a/eos/effects/shipvelocitybonusmi.py +++ b/eos/effects/shipvelocitybonusmi.py @@ -3,7 +3,6 @@ # Used by: # Variations of ship: Mammoth (2 of 2) # Ship: Hoarder -# Ship: Mammoth Nefantar Edition # Ship: Prowler type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipxlprojectiledamagerole.py b/eos/effects/shipxlprojectiledamagerole.py index 00d66ce05..fbbb39202 100644 --- a/eos/effects/shipxlprojectiledamagerole.py +++ b/eos/effects/shipxlprojectiledamagerole.py @@ -1,7 +1,7 @@ # shipXLProjectileDamageRole # # Used by: -# Ships named like: Naglfar (2 of 2) +# Ship: Naglfar type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"), diff --git a/eos/effects/smallenergymaxrangebonus.py b/eos/effects/smallenergymaxrangebonus.py index acd38b398..f67219ccd 100644 --- a/eos/effects/smallenergymaxrangebonus.py +++ b/eos/effects/smallenergymaxrangebonus.py @@ -1,7 +1,7 @@ # smallEnergyMaxRangeBonus # # Used by: -# Ships named like: Coercer (2 of 2) +# Ship: Coercer type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), diff --git a/eos/effects/smallhybridmaxrangebonus.py b/eos/effects/smallhybridmaxrangebonus.py index 6045dc4a7..ac39f763e 100644 --- a/eos/effects/smallhybridmaxrangebonus.py +++ b/eos/effects/smallhybridmaxrangebonus.py @@ -1,8 +1,8 @@ # smallHybridMaxRangeBonus # # Used by: -# Ships from group: Destroyer (9 of 18) -# Variations of ship: Catalyst (6 of 7) +# Ship: Catalyst +# Ship: Cormorant type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Hybrid Turret"), diff --git a/eos/effects/smallprojectilemaxrangebonus.py b/eos/effects/smallprojectilemaxrangebonus.py index bd8cbb6d2..d495785b3 100644 --- a/eos/effects/smallprojectilemaxrangebonus.py +++ b/eos/effects/smallprojectilemaxrangebonus.py @@ -1,7 +1,7 @@ # smallProjectileMaxRangeBonus # # Used by: -# Ships named like: Thrasher (3 of 3) +# Ship: Thrasher type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), diff --git a/eos/effects/zcolinorcacargobonus.py b/eos/effects/zcolinorcacargobonus.py index 394cf765b..bcd8cbde1 100644 --- a/eos/effects/zcolinorcacargobonus.py +++ b/eos/effects/zcolinorcacargobonus.py @@ -1,7 +1,7 @@ # zColinOrcaCargoBonus # # Used by: -# Ships from group: Industrial Command Ship (2 of 2) +# Ship: Orca type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Industrial Command Ships").level diff --git a/eos/effects/zcolinorcaforemanmodbonus.py b/eos/effects/zcolinorcaforemanmodbonus.py index 615ddbdd9..ad483b8fb 100644 --- a/eos/effects/zcolinorcaforemanmodbonus.py +++ b/eos/effects/zcolinorcaforemanmodbonus.py @@ -1,7 +1,7 @@ # zColinOrcaForemanModBonus # # Used by: -# Ships from group: Industrial Command Ship (2 of 2) +# Ship: Orca type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Industrial Command Ships").level diff --git a/eos/effects/zcolinorcasurveyscannerbonus.py b/eos/effects/zcolinorcasurveyscannerbonus.py index 63d495b79..7e73bc9dc 100644 --- a/eos/effects/zcolinorcasurveyscannerbonus.py +++ b/eos/effects/zcolinorcasurveyscannerbonus.py @@ -1,7 +1,7 @@ # zColinOrcaSurveyScannerBonus # # Used by: -# Ships from group: Industrial Command Ship (2 of 2) +# Ship: Orca type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Survey Scanner", diff --git a/eos/effects/zcolinorcatractorrangebonus.py b/eos/effects/zcolinorcatractorrangebonus.py index ca755f4ed..6d26a56b3 100644 --- a/eos/effects/zcolinorcatractorrangebonus.py +++ b/eos/effects/zcolinorcatractorrangebonus.py @@ -1,7 +1,7 @@ # zColinOrcaTractorRangeBonus # # Used by: -# Ships from group: Industrial Command Ship (2 of 2) +# Ship: Orca type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", diff --git a/eos/effects/zcolinorcatractorvelocitybonus.py b/eos/effects/zcolinorcatractorvelocitybonus.py index a68a08e22..74f39e89b 100644 --- a/eos/effects/zcolinorcatractorvelocitybonus.py +++ b/eos/effects/zcolinorcatractorvelocitybonus.py @@ -1,7 +1,7 @@ # zColinOrcaTractorVelocityBonus # # Used by: -# Ships from group: Industrial Command Ship (2 of 2) +# Ship: Orca type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam", diff --git a/service/conversions/skinnedShips.py b/service/conversions/skinnedShips.py index d2e0a8d85..1040f2362 100644 --- a/service/conversions/skinnedShips.py +++ b/service/conversions/skinnedShips.py @@ -7,94 +7,7 @@ See GH issue #67 on why this is needed """ CONVERSIONS = { - "Abaddon Kador Edition": "Abaddon", - "Abaddon Tash-Murkon Edition": "Abaddon", - "Aliastra Catalyst": "Catalyst", - "Apocalypse Blood Raider Edition": "Apocalypse", - "Apocalypse Kador Edition": "Apocalypse", - "Apocalypse Tash-Murkon Edition": "Apocalypse", - "Bestower Tash-Murkon Edition": "Bestower", - "Brutix Serpentis Edition": "Brutix", - "Caracal Nugoeihuvi Edition": "Caracal", - "Caracal Wiyrkomi Edition": "Caracal", - "Catalyst Serpentis Edition": "Catalyst", - "Coercer Blood Raiders Edition": "Coercer", - "Cormorant Guristas Edition": "Cormorant", - "Cyclone Thukker Tribe Edition": "Cyclone", - "Dominix Quafe Edition": "Dominix", - "Ferox Guristas Edition": "Ferox", - "Golem Guristas Edition": "Golem", - "Golem Kaalakiota Edition": "Golem", - "Golem Nugoeihuvi Edition": "Golem", - "Hyperion Aliastra Edition": "Hyperion", - "Hyperion Innerzone Shipping Edition": "Hyperion", - "Hyperion Inner Zone Shipping Edition": "Hyperion", - "Incursus Aliastra Edition": "Incursus", - "Incursus Innerzone Shipping Edition": "Incursus", - "Incursus Inner Zone Shipping Edition": "Incursus", - "Inner Zone Shipping Catalyst": "Catalyst", - "Inner Zone Shipping Imicus": "Imicus", - "Intaki Syndicate Catalyst": "Catalyst", - "InterBus Catalyst": "Catalyst", - "Iteron Inner Zone Shipping Edition": "Iteron Mark V", - "Kronos Innerzone Shipping Edition": "Kronos", - "Kronos Inner Zone Shipping Edition": "Kronos", - "Kronos Police Edition": "Kronos", - "Kronos Quafe Edition": "Kronos", - "Mackinaw ORE Development Edition": "Mackinaw", - "Maelstrom Krusual Edition": "Maelstrom", - "Maelstrom Nefantar Edition": "Maelstrom", - "Mammoth Nefantar Edition": "Mammoth", - "Megathron Innerzone Shipping Edition": "Megathron", - "Megathron Inner Zone Shipping Edition": "Megathron", - "Megathron Police Edition": "Megathron", - "Megathron Quafe Edition": "Megathron", - "Merlin Nugoeihuvi Edition": "Merlin", - "Merlin Wiyrkomi Edition": "Merlin", "Miasmos Amastris Edition": "Miasmos Quafe Ultra Edition", "Miasmos Quafe Ultramarine Edition": "Miasmos Quafe Ultra Edition", - "Moros Interbus Edition": "Moros", - "Naglfar Justice Edition": "Naglfar", - "Nefantar Thrasher": "Thrasher", - "Omen Kador Edition": "Omen", - "Omen Tash-Murkon Edition": "Omen", - "Orca ORE Development Edition": "Orca", - "Paladin Blood Raider Edition": "Paladin", - "Paladin Kador Edition": "Paladin", - "Paladin Tash-Murkon Edition": "Paladin", - "Phoenix Wiyrkomi Edition": "Phoenix", - "Police Pursuit Comet": "Federation Navy Comet", - "Prophecy Blood Raiders Edition": "Prophecy", - "Punisher Kador Edition": "Punisher", - "Punisher Tash-Murkon Edition": "Punisher", - "Quafe Catalyst": "Catalyst", - "Raven Guristas Edition": "Raven", - "Raven Kaalakiota Edition": "Raven", - "Raven Nugoeihuvi Edition": "Raven", - "Rattlesnake Victory Edition": "Rattlesnake", - "Revelation Sarum Edition": "Revelation", - "Rifter Krusual Edition": "Rifter", - "Rifter Nefantar Edition": "Rifter", - "Rokh Nugoeihuvi Edition": "Rokh", - "Rokh Wiyrkomi Edition": "Rokh", - "Rorqual ORE Development Edition": "Rorqual", - "Stabber Krusual Edition": "Stabber", - "Stabber Nefantar Edition": "Stabber", - "Sarum Magnate": "Magnate", - "Sukuuvestaa Heron": "Heron", - "Tash-Murkon Magnate": "Magnate", - "Tayra Wiyrkomi Edition": "Tayra", - "Tempest Justice Edition": "Tempest", - "Tempest Krusual Edition": "Tempest", - "Tempest Nefantar Edition": "Tempest", - "Thorax Aliastra Edition": "Thorax", - "Thorax Innerzone Shipping Edition": "Thorax", - "Thorax Inner Zone Shipping Edition": "Thorax", - "Thrasher Thukker Tribe Edition": "Thrasher", - "Tristan Quafe Edition": "Tristan", - "Vargur Justice Edition": "Vargur", - "Vargur Krusual Edition": "Vargur", - "Vargur Nefantar Edition": "Vargur", - "Vexor Quafe Edition": "Vexor", - "Vherokior Probe": "Probe" + "Rattlesnake Victory Edition": "Rattlesnake" } diff --git a/service/fit.py b/service/fit.py index fac02bb5c..dfda754e0 100644 --- a/service/fit.py +++ b/service/fit.py @@ -20,6 +20,7 @@ import locale import copy import threading +import logging import wx from codecs import open @@ -35,6 +36,7 @@ from service.fleet import Fleet from service.settings import SettingsProvider from service.port import Port +logger = logging.getLogger("pyfa.service.fit") class FitBackupThread(threading.Thread): def __init__(self, path, callback): @@ -789,15 +791,28 @@ class Fit(object): file = open(path, "r") srcString = file.read() + codec_found = None # If file had ANSI encoding, convert it to unicode using system - # default codepage, or use fallback cp1252 on any encoding errors + # default codepage, or use fallbacks UTF-16, then cp1252 on any + # encoding errors if isinstance(srcString, str): - try: - srcString = unicode(srcString, defcodepage) - except UnicodeDecodeError: - srcString = unicode(srcString, "cp1252") + attempt_codecs = (defcodepage, "utf-16", "cp1252") + for page in attempt_codecs: + try: + srcString = unicode(srcString, page) + codec_found = page + except UnicodeDecodeError: + logger.warn("Error unicode decoding %s from page %s, trying next codec", path, page) + else: + break + else: + # nasty hack to detect other transparent utf-16 loading + if srcString[0] == '<' and 'utf-16' in srcString[:128].lower(): + codec_found = "utf-16" + else: + codec_found = "utf-8" - _, fitsImport = Port.importAuto(srcString, path, callback=callback) + _, fitsImport = Port.importAuto(srcString, path, callback=callback, encoding=codec_found) fits += fitsImport IDs = [] diff --git a/service/market.py b/service/market.py index 541e8cd8d..b4f3ef1b3 100644 --- a/service/market.py +++ b/service/market.py @@ -188,7 +188,6 @@ class Market(): "Chremoas": self.les_grp, # AT11 prize :( "Moracha": self.les_grp, # AT11 prize "Stratios Emergency Responder": self.les_grp, # Issued for Somer Blink lottery - "Scorpion Ishukone Watch": self.les_grp, # Prize for offline events - fanfest PVP and poker tourneys "Miasmos Quafe Ultra Edition": self.les_grp, # Gift to people who purchased FF HD stream "InterBus Shuttle": self.les_grp, "Leopard": self.les_grp, # 2013 new year gift @@ -218,19 +217,7 @@ class Market(): "Guristas Shuttle": False, "Mobile Decoy Unit": False, # Seems to be left over test mod for deployables "Tournament Micro Jump Unit": False, # Normally seen only on tournament arenas - u"\u4e07\u738b\u5b9d\u5ea7\u7ea7YC117\u5e74\u7279\u522b\u7248": False, # Proteus added shitton of chinese-specific ships - u"\u4e4c\u9e26\u7ea7YC117\u5e74\u7279\u522b\u7248": False, - u"\u54cd\u5c3e\u86c7\u7ea7YC117\u5e74\u7279\u522b\u7248": False, - u"\u5730\u72f1\u5929\u4f7f\u7ea7YC117\u5e74\u7279\u522b\u7248": False, - u"\u591a\u7c73\u5c3c\u514b\u65af\u7ea7YC117\u5e74\u7279\u522b\u7248": False, - u"\u672b\u65e5\u6c99\u573a\u7ea7YC117\u5e74\u7279\u522b\u7248": False, - u"\u707e\u96be\u7ea7YC117\u5e74\u7279\u522b\u7248": False, - u"\u9a6c\u514b\u745e\u7ea7YC117\u5e74\u7279\u522b\u7248": False, - u"\u5e7c\u9f99\u7ea7YC117\u5e74\u7279\u522b\u7248": False, - u"\u6bd2\u8725\u7ea7YC117\u5e74\u7279\u522b\u7248": False, - u"\u4f0a\u4ec0\u5854\u7ea7YC117\u5e74\u7279\u522b\u7248": False, - u"\u94f6\u9e70\u7ea7YC117\u5e74\u7279\u522b\u7248": False, - "Council Diplomatic Shuttle": False, # Not sure yet + "Council Diplomatic Shuttle": False, # CSM X celebration } # do not publish ships that we convert @@ -274,18 +261,18 @@ class Market(): "'Daemon' Data Analyzer I": 714, # Ship Equipment > Electronics and Sensor Upgrades > Scanners > Data and Composition Scanners "'Libram' Data Analyzer I": 714, # Ship Equipment > Electronics and Sensor Upgrades > Scanners > Data and Composition Scanners "Advanced Cerebral Accelerator": 977, # Implants & Boosters > Booster - "Civilian Damage Control": 760, # Ship Equipment > Civilian Modules - "Civilian EM Ward Field": 760, # Ship Equipment > Civilian Modules - "Civilian Explosive Deflection Field": 760, # Ship Equipment > Civilian Modules + "Civilian Damage Control": 615, # Ship Equipment > Hull & Armor > Damage Controls + "Civilian EM Ward Field": 1695, # Ship Equipment > Shield > Shield Hardeners > EM Shield Hardeners + "Civilian Explosive Deflection Field": 1694, # Ship Equipment > Shield > Shield Hardeners > Explosive Shield Hardeners "Civilian Hobgoblin": 837, # Drones > Combat Drones > Light Scout Drones - "Civilian Kinetic Deflection Field": 760, # Ship Equipment > Civilian Modules - "Civilian Light Missile Launcher": 760, # Ship Equipment > Civilian Modules + "Civilian Kinetic Deflection Field": 1693, # Ship Equipment > Shield > Shield Hardeners > Kinetic Shield Hardeners + "Civilian Light Missile Launcher": 640, # Ship Equipment > Turrets & Bays > Missile Launchers > Light Missile Launchers "Civilian Scourge Light Missile": 920, # Ammunition & Charges > Missiles > Light Missiles > Standard Light Missiles - "Civilian Small Remote Armor Repairer": 760, # Ship Equipment > Civilian Modules - "Civilian Small Remote Shield Booster": 760, # Ship Equipment > Civilian Modules - "Civilian Stasis Webifier": 760, # Ship Equipment > Civilian Modules - "Civilian Thermic Dissipation Field": 760, # Ship Equipment > Civilian Modules - "Civilian Warp Disruptor": 760, # Ship Equipment > Civilian Modules + "Civilian Small Remote Armor Repairer": 1059, # Ship Equipment > Hull & Armor > Remote Armor Repairers > Small + "Civilian Small Remote Shield Booster": 603, # Ship Equipment > Shield > Remote Shield Boosters > Small + "Civilian Stasis Webifier": 683, # Ship Equipment > Electronic Warfare > Stasis Webifiers + "Civilian Thermic Dissipation Field": 1692, # Ship Equipment > Shield > Shield Hardeners > Thermal Shield Hardeners + "Civilian Warp Disruptor": 1935, # Ship Equipment > Electronic Warfare > Warp Disruptors "Hardwiring - Zainou 'Sharpshooter' ZMX10": 1493, # Implants & Boosters > Implants > Skill Hardwiring > Missile Implants > Implant Slot 06 "Hardwiring - Zainou 'Sharpshooter' ZMX100": 1493, # Implants & Boosters > Implants > Skill Hardwiring > Missile Implants > Implant Slot 06 "Hardwiring - Zainou 'Sharpshooter' ZMX1000": 1493, # Implants & Boosters > Implants > Skill Hardwiring > Missile Implants > Implant Slot 06 diff --git a/service/port.py b/service/port.py index e3bfe9dd7..e9a88ab3b 100644 --- a/service/port.py +++ b/service/port.py @@ -24,6 +24,9 @@ import xml.dom from eos.types import State, Slot, Module, Cargo, Fit, Ship, Drone, Implant, Booster import service import wx +import logging + +logger = logging.getLogger("pyfa.service.port") try: from collections import OrderedDict @@ -36,14 +39,14 @@ class Port(object): """Service which houses all import/export format functions""" @classmethod - def importAuto(cls, string, path=None, activeFit=None, callback=None): + def importAuto(cls, string, path=None, activeFit=None, callback=None, encoding=None): # Get first line and strip space symbols of it to avoid possible detection errors firstLine = re.split("[\n\r]+", string.strip(), maxsplit=1)[0] firstLine = firstLine.strip() # If XML-style start of tag encountered, detect as XML if re.match("<", firstLine): - return "XML", cls.importXml(string, callback) + return "XML", cls.importXml(string, callback, encoding) # If we've got source file name which is used to describe ship name # and first line contains something like [setup name], detect as eft config file @@ -66,8 +69,16 @@ class Port(object): info = string.split(":") f = Fit() - f.ship = Ship(sMkt.getItem(int(info[0]))) - f.name = "{0} - DNA Imported".format(f.ship.item.name) + try: + f.ship = Ship(sMkt.getItem(int(info[0]))) + f.name = "{0} - DNA Imported".format(f.ship.item.name) + except UnicodeEncodeError as e: + def logtransform(s): + if len(s) > 10: + return s[:10] + "..." + return s + logger.exception("Couldn't import ship data %r", [ logtransform(s) for s in info ]) + return None for itemInfo in info[1:]: if itemInfo: @@ -358,10 +369,10 @@ class Port(object): return fits @staticmethod - def importXml(text, callback=None): + def importXml(text, callback=None, encoding="utf-8"): sMkt = service.Market.getInstance() - doc = xml.dom.minidom.parseString(text.encode("utf-8")) + doc = xml.dom.minidom.parseString(text.encode(encoding)) fittings = doc.getElementsByTagName("fittings").item(0) fittings = fittings.getElementsByTagName("fitting") fits = [] diff --git a/staticdata/eve.db b/staticdata/eve.db index c48497192..a5c1e7998 100644 Binary files a/staticdata/eve.db and b/staticdata/eve.db differ