Merge branch 'regSkills' into preview_proj_skills

eos/effects/blockaderunnercloakcpupercentbonus.py

@@ -5,6 +5,5 @@
 type = "passive"
 runTime = "early"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Transport Ships").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cloaking Device",
-                                  "cpu", ship.getModifiedItemAttr("eliteIndustrialCovertCloakBonus") * level)
+                                  "cpu", ship.getModifiedItemAttr("eliteIndustrialCovertCloakBonus"), skill="Transport Ships")

eos/effects/caldarishipecmburstoptimalrangecb3.py

@@ -4,6 +4,5 @@
 # Ship: Scorpion
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Battleship").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM Burst",
-                                  "ecmBurstRange", ship.getModifiedItemAttr("shipBonusCB3") * level)
+                                  "ecmBurstRange", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")

eos/effects/caldarishipewcapacitorneedcc.py

@@ -6,6 +6,5 @@
 # Ship: Rook
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Cruiser").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusCC") * level)
+                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusCC"), skill="Caldari Cruiser")

eos/effects/caldarishipewcapacitorneedcf2.py

@@ -4,6 +4,5 @@
 # Variations of ship: Griffin (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Frigate").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusCF2") * level)
+                                  "capacitorNeed", ship.getModifiedItemAttr("shipBonusCF2"), skill="Caldari Frigate")

eos/effects/caldarishipewfalloffrangecb3.py

@@ -4,6 +4,5 @@
 # Ship: Scorpion
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Battleship").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "falloff", ship.getModifiedItemAttr("shipBonusCB3") * level)
+                                  "falloff", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")

eos/effects/caldarishipewfalloffrangecc2.py

@@ -4,6 +4,5 @@
 # Ship: Blackbird
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Cruiser").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "falloff", ship.getModifiedItemAttr("shipBonusCC2") * level)
+                                  "falloff", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")

eos/effects/caldarishipewoptimalrangecb3.py

@@ -4,6 +4,5 @@
 # Ship: Scorpion
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Battleship").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusCB3") * level)
+                                  "maxRange", ship.getModifiedItemAttr("shipBonusCB3"), skill="Caldari Battleship")

eos/effects/caldarishipewoptimalrangecc2.py

@@ -4,6 +4,5 @@
 # Ship: Blackbird
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Cruiser").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
-                                  "maxRange", ship.getModifiedItemAttr("shipBonusCC2") * level)
+                                  "maxRange", ship.getModifiedItemAttr("shipBonusCC2"), skill="Caldari Cruiser")

eos/effects/caldarishipewstrengthcb.py

@@ -4,8 +4,7 @@
 # Ship: Scorpion
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Battleship").level
     for sensorType in ("Gravimetric", "Ladar", "Magnetometric", "Radar"):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
                                       "scan{0}StrengthBonus".format(sensorType),
-                                      ship.getModifiedItemAttr("shipBonusCB") * level)
+                                      ship.getModifiedItemAttr("shipBonusCB"), skill="Caldari Battleship")

eos/effects/carrieramarrarmorenergytransferrange3.py

@@ -5,9 +5,7 @@
 # Ship: Archon
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Amarr Carrier").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
-                                  "maxRange", ship.getModifiedItemAttr("carrierAmarrBonus3") * level)
+                                  "maxRange", ship.getModifiedItemAttr("carrierAmarrBonus3"), skill="Amarr Carrier")
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Capacitor Emission Systems"),
-                                  "powerTransferRange", ship.getModifiedItemAttr("carrierAmarrBonus3") * level)
-
+                                  "powerTransferRange", ship.getModifiedItemAttr("carrierAmarrBonus3"), skill="Amarr Carrier")

eos/effects/carrieramarrarmorresist2.py

@@ -5,7 +5,6 @@
 # Ship: Archon
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Amarr Carrier").level
     for resType in ("Em", "Explosive", "Kinetic", "Thermal"):
         fit.ship.boostItemAttr("armor{0}DamageResonance".format(resType),
-                               ship.getModifiedItemAttr("carrierAmarrBonus2") * level)
+                               ship.getModifiedItemAttr("carrierAmarrBonus2"), skill="Amarr Carrier")

eos/effects/carrieramarrdronemax1.py

@@ -5,6 +5,4 @@
 # Ship: Archon
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Amarr Carrier").level
-    amount = ship.getModifiedItemAttr("carrierAmarrBonus1")
-    fit.extraAttributes.increase("maxActiveDrones", amount * level)
+    fit.extraAttributes.increase("maxActiveDrones", ship.getModifiedItemAttr("carrierAmarrBonus1"), skill="Amarr Carrier")

eos/effects/carrieramarrfighterbombermaxvelocity2.py

@@ -4,6 +4,5 @@
 # Ship: Revenant
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Amarr Carrier").level
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighter Bombers"),
-                                 "maxVelocity", ship.getModifiedItemAttr("carrierAmarrBonus2") * level)
+                                 "maxVelocity", ship.getModifiedItemAttr("carrierAmarrBonus2"), skill="Amarr Carrier")

eos/effects/carrieramarrfightermaxvelocity2.py

@@ -4,6 +4,5 @@
 # Ship: Revenant
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Amarr Carrier").level
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighters"),
-                                 "maxVelocity", ship.getModifiedItemAttr("carrierAmarrBonus2") * level)
+                                 "maxVelocity", ship.getModifiedItemAttr("carrierAmarrBonus2"), skill="Amarr Carrier")

eos/effects/carrieramarrleadershipmaxgroupactive4.py

@@ -5,6 +5,5 @@
 # Ship: Revenant
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Amarr Carrier").level
     fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator",
-                                     "maxGroupActive", ship.getModifiedItemAttr("carrierAmarrBonus4") * level)
+                                     "maxGroupActive", ship.getModifiedItemAttr("carrierAmarrBonus4"), skill="Amarr Carrier")

eos/effects/carriercaldaridronemax1.py

@@ -5,6 +5,4 @@
 # Ship: Wyvern
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Carrier").level
-    amount = ship.getModifiedItemAttr("carrierCaldariBonus1")
-    fit.extraAttributes.increase("maxActiveDrones", amount * level)
+    fit.extraAttributes.increase("maxActiveDrones", ship.getModifiedItemAttr("carrierCaldariBonus1"), skill="Caldari Carrier")

eos/effects/carriercaldarifightersandbomberssig1.py

@@ -4,6 +4,5 @@
 # Ship: Revenant
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Carrier").level
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighters") or drone.item.requiresSkill("Fighter Bombers"),
-                                 "signatureRadius", ship.getModifiedItemAttr("carrierCaldariBonus1") * level)
+                                 "signatureRadius", ship.getModifiedItemAttr("carrierCaldariBonus1"), skill="Caldari Carrier")

eos/effects/carriercaldarileadershipmaxgroupactive4.py

@@ -4,6 +4,5 @@
 # Ship: Wyvern
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Carrier").level
     fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator",
-                                     "maxGroupActive", ship.getModifiedItemAttr("carrierCaldariBonus4") * level)
+                                     "maxGroupActive", ship.getModifiedItemAttr("carrierCaldariBonus4"), skill="Caldari Carrier")

eos/effects/carriercaldarishieldenergytransferrange3.py

@@ -6,8 +6,7 @@
 # Ship: Wyvern
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Carrier").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "shieldTransferRange", ship.getModifiedItemAttr("carrierCaldariBonus3") * level)
+                                  "shieldTransferRange", ship.getModifiedItemAttr("carrierCaldariBonus3"), skill="Caldari Carrier")
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Capacitor Emission Systems"),
-                                  "powerTransferRange", ship.getModifiedItemAttr("carrierCaldariBonus3") * level)
+                                  "powerTransferRange", ship.getModifiedItemAttr("carrierCaldariBonus3"), skill="Caldari Carrier")

eos/effects/carriercaldarishieldresist2.py

@@ -5,7 +5,6 @@
 # Ship: Wyvern
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Carrier").level
     for resType in ("Em", "Explosive", "Kinetic", "Thermal"):
         fit.ship.boostItemAttr("shield{0}DamageResonance".format(resType),
-                               ship.getModifiedItemAttr("carrierCaldariBonus2") * level)
+                               ship.getModifiedItemAttr("carrierCaldariBonus2"), skill="Caldari Carrier")

eos/effects/carriergallentearmorshieldtransferrange3.py

@@ -5,8 +5,7 @@
 # Ship: Thanatos
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Gallente Carrier").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "shieldTransferRange", ship.getModifiedItemAttr("carrierGallenteBonus3") * level)
+                                  "shieldTransferRange", ship.getModifiedItemAttr("carrierGallenteBonus3"), skill="Gallente Carrier")
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
-                                  "maxRange", ship.getModifiedItemAttr("carrierGallenteBonus3") * level)
+                                  "maxRange", ship.getModifiedItemAttr("carrierGallenteBonus3"), skill="Gallente Carrier")

eos/effects/carriergallentebomberdroneowndmg2.py

@@ -4,6 +4,5 @@
 # Ship: Nyx
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Gallente Carrier").level
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighter Bombers"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("carrierGallenteBonus2") * level)
+                                 "damageMultiplier", ship.getModifiedItemAttr("carrierGallenteBonus2"), skill="Gallente Carrier")

eos/effects/carriergallentedronemax1.py

@@ -5,6 +5,4 @@
 # Ship: Thanatos
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Gallente Carrier").level
-    amount = ship.getModifiedItemAttr("carrierGallenteBonus1")
-    fit.extraAttributes.increase("maxActiveDrones", amount * level)
+    fit.extraAttributes.increase("maxActiveDrones", ship.getModifiedItemAttr("carrierGallenteBonus1"), skill="Gallente Carrier")

eos/effects/carriergallentedroneowndmg2.py

@@ -5,6 +5,5 @@
 # Ship: Thanatos
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Gallente Carrier").level
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Fighters"),
-                                 "damageMultiplier", ship.getModifiedItemAttr("carrierGallenteBonus2") * level)
+                                 "damageMultiplier", ship.getModifiedItemAttr("carrierGallenteBonus2"), skill="Gallente Carrier")

eos/effects/carriergallenteleadershipmaxgroupactive4.py

@@ -4,6 +4,5 @@
 # Ship: Nyx
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Gallente Carrier").level
     fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator",
-                                     "maxGroupActive", ship.getModifiedItemAttr("carrierGallenteBonus4") * level)
+                                     "maxGroupActive", ship.getModifiedItemAttr("carrierGallenteBonus4"), skill="Gallente Carrier")

eos/effects/carrierminmatararmorshieldamount.py

@@ -5,8 +5,7 @@
 # Ship: Nidhoggur
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Minmatar Carrier").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster",
-                                  "shieldBonus", ship.getModifiedItemAttr("carrierMinmatarBonus2") * level)
+                                  "shieldBonus", ship.getModifiedItemAttr("carrierMinmatarBonus2"), skill="Minmatar Carrier")
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Armor Repairer",
-                                  "armorDamageAmount", ship.getModifiedItemAttr("carrierMinmatarBonus2") * level)
+                                  "armorDamageAmount", ship.getModifiedItemAttr("carrierMinmatarBonus2"), skill="Minmatar Carrier")

eos/effects/carrierminmatararmorshieldtransferrange3.py

@@ -5,8 +5,7 @@
 # Ship: Nidhoggur
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Minmatar Carrier").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Emission Systems"),
-                                  "shieldTransferRange", ship.getModifiedItemAttr("carrierMinmatarBonus3") * level)
+                                  "shieldTransferRange", ship.getModifiedItemAttr("carrierMinmatarBonus3"), skill="Minmatar Carrier")
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Remote Armor Repair Systems"),
-                                  "maxRange", ship.getModifiedItemAttr("carrierMinmatarBonus3") * level)
+                                  "maxRange", ship.getModifiedItemAttr("carrierMinmatarBonus3"), skill="Minmatar Carrier")

eos/effects/carrierminmatardronemax1.py

@@ -5,6 +5,4 @@
 # Ship: Nidhoggur
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Minmatar Carrier").level
-    amount = ship.getModifiedItemAttr("carrierMinmatarBonus1")
-    fit.extraAttributes.increase("maxActiveDrones", amount * level)
+    fit.extraAttributes.increase("maxActiveDrones", ship.getModifiedItemAttr("carrierMinmatarBonus1"), skill="Minmatar Carrier")

eos/effects/carrierminmatarleadershipmaxgroupactive4.py

@@ -4,6 +4,5 @@
 # Ship: Hel
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Minmatar Carrier").level
     fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator",
-                                     "maxGroupActive", ship.getModifiedItemAttr("carrierMinmatarBonus4") * level)
+                                     "maxGroupActive", ship.getModifiedItemAttr("carrierMinmatarBonus4"), skill="Minmatar Carrier")

eos/effects/covertopscloakcpupercentbonus1.py

@@ -5,6 +5,5 @@
 type = "passive"
 runTime = "early"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Covert Ops").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cloaking Device",
-                                  "cpu", ship.getModifiedItemAttr("eliteBonusCoverOps1") * level)
+                                  "cpu", ship.getModifiedItemAttr("eliteBonusCoverOps1"), skill="Covert Ops")

eos/effects/dreadnoughtmd1projdmgbonus.py

@@ -4,6 +4,5 @@
 # Ship: Naglfar
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Minmatar Dreadnought").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("dreadnoughtShipBonusM1") * level)
+                                  "damageMultiplier", ship.getModifiedItemAttr("dreadnoughtShipBonusM1"), skill="Minmatar Dreadnought")

eos/effects/dreadnoughtmd3projrofbonus.py

@@ -4,6 +4,5 @@
 # Ship: Naglfar
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Minmatar Dreadnought").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Projectile Turret"),
-                                  "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusM3") * level)
+                                  "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusM3"), skill="Minmatar Dreadnought")

eos/effects/dreadnoughtshipbonushybriddmgg1.py

@@ -4,6 +4,5 @@
 # Ship: Moros
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Gallente Dreadnought").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"),
-                                  "damageMultiplier", ship.getModifiedItemAttr("dreadnoughtShipBonusG1") * level)
+                                  "damageMultiplier", ship.getModifiedItemAttr("dreadnoughtShipBonusG1"), skill="Gallente Dreadnought")

eos/effects/dreadnoughtshipbonushybridrofg2.py

@@ -4,6 +4,5 @@
 # Ship: Moros
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Gallente Dreadnought").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Hybrid Turret"),
-                                  "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusG2") * level)
+                                  "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusG2"), skill="Gallente Dreadnought")

eos/effects/dreadnoughtshipbonuslasercapneeda1.py

@@ -4,6 +4,5 @@
 # Ship: Revelation
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Amarr Dreadnought").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"),
-                                  "capacitorNeed", ship.getModifiedItemAttr("dreadnoughtShipBonusA1") * level)
+                                  "capacitorNeed", ship.getModifiedItemAttr("dreadnoughtShipBonusA1"), skill="Amarr Dreadnought")

eos/effects/dreadnoughtshipbonuslaserrofa2.py

@@ -4,6 +4,5 @@
 # Ship: Revelation
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Amarr Dreadnought").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret"),
-                                  "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusA2") * level)
+                                  "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusA2"), skill="Amarr Dreadnought")

eos/effects/dreadnoughtshipbonusshieldresistancesc2.py

@@ -4,7 +4,6 @@
 # Ship: Phoenix
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Caldari Dreadnought").level
     for damageType in ("em", "thermal", "explosive", "kinetic"):
         fit.ship.boostItemAttr("shield{}DamageResonance".format(damageType.capitalize()),
-                               ship.getModifiedItemAttr("dreadnoughtShipBonusC2") * level)
+                               ship.getModifiedItemAttr("dreadnoughtShipBonusC2"), skill="Caldari Dreadnought")

eos/effects/elitebargebonusiceharvestingcycletimebarge3.py

@@ -4,6 +4,5 @@
 # Ships from group: Exhumer (3 of 3)
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Exhumers").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"),
-                                  "duration", ship.getModifiedItemAttr("eliteBonusBarge2") * level)
+                                  "duration", ship.getModifiedItemAttr("eliteBonusBarge2"), skill="Exhumers")

eos/effects/elitebargebonusminingdurationbarge2.py

@@ -4,6 +4,5 @@
 # Ships from group: Exhumer (3 of 3)
 type = "passive"
 def handler(fit, ship, context):
-    level = fit.character.getSkill("Exhumers").level
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
-                                  "duration", ship.getModifiedItemAttr("eliteBonusBarge2") * level)
+                                  "duration", ship.getModifiedItemAttr("eliteBonusBarge2"), skill="Exhumers")