Bump release

Fixed type of weapon

config.py

@@ -18,7 +18,7 @@ debug = False
 saveInRoot = False
 
 # Version data
-version = "1.22.0"
+version = "1.22.1"
 tag = "Stable"
 expansionName = "YC 118.6"
 expansionVersion = "1.0"

eos/effects/boosterarmorhppenalty.py

@@ -1,7 +1,7 @@
 # boosterArmorHpPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 42)
+# Implants from group: Booster (12 of 45)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.ship.boostItemAttr("armorHP", booster.getModifiedItemAttr("boosterArmorHPPenalty"))

eos/effects/boosterarmorrepairamountpenalty.py

@@ -1,7 +1,9 @@
 # boosterArmorRepairAmountPenalty
 #
 # Used by:
-# Implants from group: Booster (9 of 42)
+# Implants named like: Drop Booster (3 of 4)
+# Implants named like: Mindflood Booster (3 of 4)
+# Implants named like: Sooth Sayer Booster (3 of 4)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Unit",

eos/effects/boostermaxvelocitypenalty.py

@@ -1,7 +1,7 @@
 # boosterMaxVelocityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 42)
+# Implants from group: Booster (12 of 45)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.ship.boostItemAttr("maxVelocity", booster.getModifiedItemAttr("boosterMaxVelocityPenalty"))

eos/effects/boostershieldcapacitypenalty.py

@@ -1,7 +1,7 @@
 # boosterShieldCapacityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 42)
+# Implants from group: Booster (12 of 45)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.ship.boostItemAttr("shieldCapacity", booster.getModifiedItemAttr("boosterShieldCapacityPenalty"))

eos/effects/boosterturretoptimalrangepenalty.py

@@ -1,7 +1,9 @@
 # boosterTurretOptimalRangePenalty
 #
 # Used by:
-# Implants from group: Booster (9 of 42)
+# Implants named like: Blue Pill Booster (3 of 5)
+# Implants named like: Mindflood Booster (3 of 4)
+# Implants named like: Sooth Sayer Booster (3 of 4)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),

eos/effects/dohacking.py

@@ -1,7 +1,7 @@
 # doHacking
 #
 # Used by:
-# Modules from group: Data Miners (13 of 14)
+# Modules from group: Data Miners (15 of 16)
 # Module: QA Cross Protocol Analyzer
 type = "active"
 def handler(fit, module, context):

eos/effects/entityecmfalloff.py

@@ -1,3 +1,7 @@
+# entityECMFalloff
+#
+# Used by:
+# Drones named like: EC (3 of 3)
 type = "projected", "active"
 def handler(fit, module, context):
     if "projected" in context:

eos/effects/entityenergyneutralizerfalloff.py

@@ -1,7 +1,7 @@
-# energyNeutralizerFalloff
+# entityEnergyNeutralizerFalloff
 #
 # Used by:
-# Modules from group: Energy Neutralizer (51 of 51)
+# Drones from group: Energy Neutralizer Drone (3 of 3)
 from eos.types import State
 type = "active", "projected"
 def handler(fit, container, context):

eos/effects/entosisdurationmultiply.py

@@ -1,8 +1,12 @@
 # entosisDurationMultiply
 #
 # Used by:
-# Ships from group: Supercarrier (5 of 5)
-# Items from market group: Ships > Capital Ships (22 of 32)
+# Ships from group: Carrier (4 of 4)
+# Ships from group: Dreadnought (5 of 5)
+# Ships from group: Force Auxiliary (4 of 4)
+# Ships from group: Supercarrier (6 of 6)
+# Ships from group: Titan (5 of 5)
+# Ship: Rorqual
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Infomorph Psychology"),

eos/effects/rigdrawbackbonuseffect.py

@@ -1,7 +1,4 @@
-# rigDrawbackBonusEffect
-#
-# Used by:
-# Skills from group: Rigging (9 of 10)
+# Not used by any item
 type = "passive"
 def handler(fit, skill, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill),

eos/effects/rigdrawbackreductionarmor.py

@@ -1,3 +1,7 @@
+# rigDrawbackReductionArmor
+#
+# Used by:
+# Skill: Armor Rigging
 type = "passive"
 def handler(fit, src, context):
     lvl = src.level

eos/effects/rigdrawbackreductionastronautics.py

@@ -1,3 +1,7 @@
+# rigDrawbackReductionAstronautics
+#
+# Used by:
+# Skill: Astronautics Rigging
 type = "passive"
 def handler(fit, src, context):
     lvl = src.level

eos/effects/rigdrawbackreductiondrones.py

@@ -1,3 +1,7 @@
+# rigDrawbackReductionDrones
+#
+# Used by:
+# Skill: Drones Rigging
 type = "passive"
 def handler(fit, src, context):
     lvl = src.level

eos/effects/rigdrawbackreductionelectronic.py

@@ -1,3 +1,7 @@
+# rigDrawbackReductionElectronic
+#
+# Used by:
+# Skill: Electronic Superiority Rigging
 type = "passive"
 def handler(fit, src, context):
     lvl = src.level

eos/effects/rigdrawbackreductionenergyweapon.py

@@ -1,3 +1,7 @@
+# rigDrawbackReductionEnergyWeapon
+#
+# Used by:
+# Skill: Energy Weapon Rigging
 type = "passive"
 def handler(fit, src, context):
     lvl = src.level

eos/effects/rigdrawbackreductionhybrid.py

@@ -1,3 +1,7 @@
+# rigDrawbackReductionHybrid
+#
+# Used by:
+# Skill: Hybrid Weapon Rigging
 type = "passive"
 def handler(fit, src, context):
     lvl = src.level

eos/effects/rigdrawbackreductionlauncher.py

@@ -1,3 +1,7 @@
+# rigDrawbackReductionLauncher
+#
+# Used by:
+# Skill: Launcher Rigging
 type = "passive"
 def handler(fit, src, context):
     lvl = src.level

eos/effects/rigdrawbackreductionprojectile.py

@@ -1,3 +1,7 @@
+# rigDrawbackReductionProjectile
+#
+# Used by:
+# Skill: Projectile Weapon Rigging
 type = "passive"
 def handler(fit, src, context):
     lvl = src.level

eos/effects/rigdrawbackreductionshield.py

@@ -1,3 +1,7 @@
+# rigDrawbackReductionShield
+#
+# Used by:
+# Skill: Shield Rigging
 type = "passive"
 def handler(fit, src, context):
     lvl = src.level

eos/effects/scanstrengthbonuspercentpassive.py

@@ -1,7 +1,7 @@
 # scanStrengthBonusPercentPassive
 #
 # Used by:
-# Implants named like: High grade (20 of 60)
+# Implants named like: High grade (20 of 61)
 type = "passive"
 def handler(fit, implant, context):
     for type in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):

eos/effects/shieldcapacitybonusonline.py

@@ -1,8 +1,8 @@
 # shieldCapacityBonusOnline
 #
 # Used by:
-# Modules from group: Shield Resistance Amplifier (88 of 88)
 # Modules from group: Shield Extender (33 of 33)
+# Modules from group: Shield Resistance Amplifier (88 of 88)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("shieldCapacity", module.getModifiedItemAttr("capacityBonus"))

eos/effects/shipadvancedspaceshipcommandagilitybonus.py

@@ -1,7 +1,9 @@
 # shipAdvancedSpaceshipCommandAgilityBonus
 #
 # Used by:
-# Items from market group: Ships > Capital Ships (31 of 32)
+# Ships from group: Dreadnought (5 of 5)
+# Ships from group: Titan (5 of 5)
+# Items from market group: Ships > Capital Ships (32 of 33)
 type = "passive"
 def handler(fit, ship, context):
     skillName = "Advanced Spaceship Command"

eos/effects/shipbonusdreadnoughtg2rofbonus.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Moros
+# Ship: Vehement
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), "speed", src.getModifiedItemAttr("shipBonusDreadnoughtG2"), skill="Gallente Dreadnought")

eos/effects/shipbonusdreadnoughtm1webbonus.py

@@ -1,3 +1,7 @@
+# shipBonusDreadnoughtM1WebBonus
+#
+# Used by:
+# Ship: Vehement
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "speedFactor", src.getModifiedItemAttr("shipBonusDreadnoughtM1"), skill="Minmatar Dreadnought")

eos/effects/shipbonusdreadnoughtrole1damagebonus.py

@@ -1,7 +1,9 @@
 # shipBonusDreadnoughtRole1DamageBonus
 #
 # Used by:
-# Ship: Naglfar
+# Ship: Vehement
 type = "passive"
-def handler(fit, src, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"), "damageMultiplier", src.getModifiedItemAttr("shipBonusRole1"))
+def handler(fit, ship, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"),
+                                  "damageMultiplier", ship.getModifiedItemAttr("shipBonusRole1"))
+

eos/effects/shipbonussupercarrierg1fighterdamage.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Nyx
+# Ship: Vendetta
 type = "passive"
 def handler(fit, src, context):
     fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDamageMultiplier", src.getModifiedItemAttr("shipBonusSupercarrierG1"), skill="Gallente Carrier")

eos/effects/shipbonussupercarrierg2fighterhitpoints.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Nyx
+# Ship: Vendetta
 type = "passive"
 def handler(fit, src, context):
     fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity", src.getModifiedItemAttr("shipBonusSupercarrierG2"), skill="Gallente Carrier")

eos/effects/shipbonussupercarrierg3warpstrength.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Nyx
+# Ship: Vendetta
 type = "passive"
 def handler(fit, src, context):
     fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusSupercarrierG3"), skill="Gallente Carrier")

eos/effects/shipbonussupercarrierm1burstprojectorwebbonus.py

@@ -1,3 +1,8 @@
+# shipBonusSupercarrierM1BurstProjectorWebBonus
+#
+# Used by:
+# Ship: Hel
+# Ship: Vendetta
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Burst Projector Operation"), "speedFactor", src.getModifiedItemAttr("shipBonusSupercarrierM1"), skill="Minmatar Carrier")

eos/effects/shipbonussupercarrierm2fightervelocity.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Hel
+# Ship: Vendetta
 type = "passive"
 def handler(fit, src, context):
     fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity", src.getModifiedItemAttr("shipBonusSupercarrierM2"), skill="Minmatar Carrier")

eos/effects/shipbonussupercarrierm3warpstrength.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Hel
+# Ship: Vendetta
 type = "passive"
 def handler(fit, src, context):
     fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusSupercarrierM3"), skill="Minmatar Carrier")

eos/effects/shipbonussupercarrierrole1numwarfarelinks.py

@@ -1,7 +1,7 @@
 # shipBonusSupercarrierRole1NumWarfareLinks
 #
 # Used by:
-# Ships from group: Supercarrier (5 of 5)
+# Ships from group: Supercarrier (6 of 6)
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupActive", src.getModifiedItemAttr("shipBonusRole1"))

eos/effects/shipbonussupercarrierrole2armorshieldmodulebonus.py

@@ -1,7 +1,7 @@
 # shipBonusSupercarrierRole2ArmorShieldModuleBonus
 #
 # Used by:
-# Ships from group: Supercarrier (5 of 5)
+# Ships from group: Supercarrier (6 of 6)
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"), "armorHPBonusAdd", src.getModifiedItemAttr("shipBonusRole2"))

eos/effects/shipbonustitang2rofbonus.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Erebus
+# Ship: Vanquisher
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), "speed", src.getModifiedItemAttr("shipBonusTitanG2"), skill="Gallente Titan")

eos/effects/shipbonustitang3warpstrength.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Erebus
+# Ship: Vanquisher
 type = "passive"
 def handler(fit, src, context):
     fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusTitanG3"), skill="Gallente Titan")

eos/effects/shipbonustitanm1webbonus.py

@@ -1,3 +1,7 @@
+# shipBonusTitanM1WebBonus
+#
+# Used by:
+# Ship: Vanquisher
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "speedFactor", src.getModifiedItemAttr("shipBonusTitanM1"), skill="Minmatar Titan")

eos/effects/shipbonustitanm3warpstrength.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Ragnarok
+# Ship: Vanquisher
 type = "passive"
 def handler(fit, src, context):
     fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("shipBonusTitanM3"), skill="Minmatar Titan")

eos/effects/shipbonustitanrole1numwarfarelinks.py

@@ -1,7 +1,7 @@
 # shipBonusTitanRole1NumWarfareLinks
 #
 # Used by:
-# Ships from group: Titan (4 of 4)
+# Ships from group: Titan (5 of 5)
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), "maxGroupActive", src.getModifiedItemAttr("shipBonusRole1"))

eos/effects/shipbonustitanrole2armorshieldmodulebonus.py

@@ -1,7 +1,7 @@
 # shipBonusTitanRole2ArmorShieldModuleBonus
 #
 # Used by:
-# Ships from group: Titan (4 of 4)
+# Ships from group: Titan (5 of 5)
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Hull Upgrades"), "armorHPBonusAdd", src.getModifiedItemAttr("shipBonusRole2"))

eos/effects/shipbonustitanrole3damagebonus.py

@@ -1,3 +1,7 @@
+# shipBonusTitanRole3DamageBonus
+#
+# Used by:
+# Ship: Vanquisher
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"), "damageMultiplier", src.getModifiedItemAttr("shipBonusRole3"))

eos/effects/shipcapitalagilitybonus.py

@@ -1,8 +1,12 @@
 # shipCapitalAgilityBonus
 #
 # Used by:
-# Ships from group: Supercarrier (5 of 5)
-# Items from market group: Ships > Capital Ships (22 of 32)
+# Ships from group: Carrier (4 of 4)
+# Ships from group: Dreadnought (5 of 5)
+# Ships from group: Force Auxiliary (4 of 4)
+# Ships from group: Supercarrier (6 of 6)
+# Ships from group: Titan (5 of 5)
+# Ship: Rorqual
 type = "passive"
 def handler(fit, src, context):
     fit.ship.multiplyItemAttr("agility", src.getModifiedItemAttr("advancedCapitalAgility"), stackingPenalties=True)

gui/itemStats.py

@@ -481,7 +481,7 @@ class ItemCompare(wx.Panel):
         self.toggleView = 1
         self.stuff = stuff
         self.item = item
-        self.items = sorted(items, key=lambda x: x.attributes['metaLevel'].value)
+        self.items = sorted(items, key=lambda x: x.attributes['metaLevel'].value if 'metaLevel' in x.attributes else None)
         self.attrs = {}
 
         # get a dict of attrName: attrInfo of all unique attributes across all items