Add genolution implant effects

2013-08-23 23:09:57 +04:00
parent 942649c589
commit 1a77ace6c3
25 changed files with 67 additions and 56 deletions
--- a/eos/effects/caldarisetbonus3.py
+++ b/eos/effects/caldarisetbonus3.py
@@ -3,6 +3,5 @@
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
-    fit.implants.filteredItemMultiply(lambda implant: "implantSetCaldariNavy" in implant.itemModifiedAttributes and\
-                                      "scanGravimetricStrengthPercent" in implant.itemModifiedAttributes,
+    fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
                                      "scanGravimetricStrengthPercent", implant.getModifiedItemAttr("implantSetCaldariNavy"))
--- a/eos/effects/caldarisetlgbonus.py
+++ b/eos/effects/caldarisetlgbonus.py
@@ -2,6 +2,6 @@
 # Implants named like: Low grade Talon (6 of 6)
 runTime = "early"
 type = "passive"
-def handler(fit, item, context):
-    fit.implants.filteredItemMultiply(lambda implant: "scanGravimetricStrengthModifier" in implant.itemModifiedAttributes,
-                                   "scanGravimetricStrengthModifier", item.getModifiedItemAttr("implantSetLGCaldariNavy"))
+def handler(fit, implant, context):
+    fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
+                                      "scanGravimetricStrengthModifier", implant.getModifiedItemAttr("implantSetLGCaldariNavy"))
--- a/eos/effects/federationsetbonus3.py
+++ b/eos/effects/federationsetbonus3.py
@@ -3,6 +3,5 @@
 type = "passive"
 runTime = "early"
 def handler(fit, implant, context):
-    fit.implants.filteredItemMultiply(lambda implant: "implantSetFederationNavy" in implant.itemModifiedAttributes and\
-                                   "scanMagnetometricStrengthPercent" in implant.itemModifiedAttributes,
-                                   "scanMagnetometricStrengthPercent", implant.getModifiedItemAttr("implantSetFederationNavy"))
+    fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
+                                      "scanMagnetometricStrengthPercent", implant.getModifiedItemAttr("implantSetFederationNavy"))
--- a/eos/effects/federationsetlgbonus.py
+++ b/eos/effects/federationsetlgbonus.py
@@ -2,6 +2,6 @@
 # Implants named like: Low grade Spur (6 of 6)
 type = "passive"
 runTime = "early"
-def handler(fit, item, context):
-    fit.implants.filteredItemMultiply(lambda implant: "scanMagnetometricStrengthModifier" in implant.itemModifiedAttributes,
-                                      "scanMagnetometricStrengthModifier", item.getModifiedItemAttr("implantSetLGFederationNavy"))
+def handler(fit, implant, context):
+    fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
+                                      "scanMagnetometricStrengthModifier", implant.getModifiedItemAttr("implantSetLGFederationNavy"))
--- a/eos/effects/imperialsetbonus3.py
+++ b/eos/effects/imperialsetbonus3.py
@@ -3,6 +3,5 @@
 type = "passive"
 runTime = "early"
 def handler(fit, implant, context):
-    fit.implants.filteredItemMultiply(lambda implant: "scanRadarStrengthPercent" in implant.itemModifiedAttributes and\
-                                      "implantSetImperialNavy" in implant.itemModifiedAttributes,
+    fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
                                      "scanRadarStrengthPercent", implant.getModifiedItemAttr("implantSetImperialNavy"))
--- a/eos/effects/imperialsetlgbonus.py
+++ b/eos/effects/imperialsetlgbonus.py
@@ -2,6 +2,6 @@
 # Implants named like: Low grade Grail (6 of 6)
 type = "passive"
 runTime = "early"
-def handler(fit, item, context):
-    fit.implants.filteredItemMultiply(lambda implant: "scanRadarStrengthModifier" in implant.itemModifiedAttributes,
-                                      "scanRadarStrengthModifier", item.getModifiedItemAttr("implantSetLGImperialNavy"))
+def handler(fit, implant, context):
+    fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
+                                      "scanRadarStrengthModifier", implant.getModifiedItemAttr("implantSetLGImperialNavy"))
--- a/eos/effects/republicsetbonus3.py
+++ b/eos/effects/republicsetbonus3.py
@@ -3,6 +3,5 @@
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
-    fit.implants.filteredItemMultiply(lambda implant: "implantSetRepublicFleet" in implant.itemModifiedAttributes and\
-                                   "scanLadarStrengthPercent" in implant.itemModifiedAttributes,
-                                   "scanLadarStrengthPercent", implant.getModifiedItemAttr("implantSetRepublicFleet"))
+    fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
+                                      "scanLadarStrengthPercent", implant.getModifiedItemAttr("implantSetRepublicFleet"))
--- a/eos/effects/republicsetlgbonus.py
+++ b/eos/effects/republicsetlgbonus.py
@@ -2,6 +2,6 @@
 # Implants named like: Low grade Jackal (6 of 6)
 runTime = "early"
 type = "passive"
-def handler(fit, item, context):
-    fit.implants.filteredItemMultiply(lambda implant: "scanLadarStrengthModifier" in implant.itemModifiedAttributes,
-                                      "scanLadarStrengthModifier", item.getModifiedItemAttr("implantSetLGRepublicFleet"))
+def handler(fit, implant, context):
+    fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
+                                      "scanLadarStrengthModifier", implant.getModifiedItemAttr("implantSetLGRepublicFleet"))
--- a/eos/effects/setbonusbloodraider.py
+++ b/eos/effects/setbonusbloodraider.py
@@ -3,6 +3,5 @@
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
-    fit.implants.filteredItemMultiply(lambda implant: "durationBonus" in implant.itemModifiedAttributes and \
-                                      "implantSetBloodraider" in implant.itemModifiedAttributes,
+    fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
                                      "durationBonus", implant.getModifiedItemAttr("implantSetBloodraider"))
--- a/eos/effects/setbonuschristmasagilitybonus.py
+++ b/eos/effects/setbonuschristmasagilitybonus.py
@@ -0,0 +1,7 @@
+# Used by:
+# Implants named like: Genolution Core Augmentation CA (4 of 4)
+runTime = "early"
+type = "passive"
+def handler(fit, implant, context):
+    fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
+                                      "agilityBonus", implant.getModifiedItemAttr("implantSetChristmas"))
--- a/eos/effects/setbonuschristmasarmorhpbonus2.py
+++ b/eos/effects/setbonuschristmasarmorhpbonus2.py
@@ -0,0 +1,7 @@
+# Used by:
+# Implants named like: Genolution Core Augmentation CA (4 of 4)
+runTime = "early"
+type = "passive"
+def handler(fit, implant, context):
+    fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
+                                      "armorHpBonus2", implant.getModifiedItemAttr("implantSetChristmas"))
--- a/eos/effects/setbonuschristmasbonusvelocity.py
+++ b/eos/effects/setbonuschristmasbonusvelocity.py
@@ -0,0 +1,7 @@
+# Used by:
+# Implants named like: Genolution Core Augmentation CA (4 of 4)
+runTime = "early"
+type = "passive"
+def handler(fit, implant, context):
+    fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
+                                      "implantBonusVelocity", implant.getModifiedItemAttr("implantSetChristmas"))
--- a/eos/effects/setbonuschristmascapacitorcapacity.py
+++ b/eos/effects/setbonuschristmascapacitorcapacity.py
@@ -3,6 +3,5 @@
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
-    fit.implants.filteredItemMultiply(lambda implant: "capacitorCapacityBonus" in implant.itemModifiedAttributes and \
-                                      "implantSetChristmas" in implant.itemModifiedAttributes,
+    fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
                                      "capacitorCapacityBonus", implant.getModifiedItemAttr("implantSetChristmas"))
--- a/eos/effects/setbonuschristmascapacitorrecharge2.py
+++ b/eos/effects/setbonuschristmascapacitorrecharge2.py
@@ -3,6 +3,5 @@
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
-    fit.implants.filteredItemMultiply(lambda implant: "capRechargeBonus" in implant.itemModifiedAttributes and \
-                                      "implantSetChristmas" in implant.itemModifiedAttributes,
+    fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
                                      "capRechargeBonus", implant.getModifiedItemAttr("implantSetChristmas"))
--- a/eos/effects/setbonuschristmascpuoutput.py
+++ b/eos/effects/setbonuschristmascpuoutput.py
@@ -3,6 +3,5 @@
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
-    fit.implants.filteredItemMultiply(lambda implant: "cpuOutputBonus2" in implant.itemModifiedAttributes and \
-                                      "implantSetChristmas" in implant.itemModifiedAttributes,
+    fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
                                      "cpuOutputBonus2", implant.getModifiedItemAttr("implantSetChristmas"))
--- a/eos/effects/setbonuschristmaspowergrid.py
+++ b/eos/effects/setbonuschristmaspowergrid.py
@@ -3,6 +3,5 @@
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
-    fit.implants.filteredItemMultiply(lambda implant: "powerEngineeringOutputBonus" in implant.itemModifiedAttributes and \
-                                      "implantSetChristmas" in implant.itemModifiedAttributes,
+    fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
                                      "powerEngineeringOutputBonus", implant.getModifiedItemAttr("implantSetChristmas"))
--- a/eos/effects/setbonuschristmasshieldcapacitybonus.py
+++ b/eos/effects/setbonuschristmasshieldcapacitybonus.py
@@ -0,0 +1,7 @@
+# Used by:
+# Implants named like: Genolution Core Augmentation CA (4 of 4)
+runTime = "early"
+type = "passive"
+def handler(fit, implant, context):
+    fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
+                                      "shieldCapacityBonus", implant.getModifiedItemAttr("implantSetChristmas"))
--- a/eos/effects/setbonusguristas.py
+++ b/eos/effects/setbonusguristas.py
@@ -3,6 +3,5 @@
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
-    fit.implants.filteredItemMultiply(lambda implant: "shieldBoostMultiplier" in implant.itemModifiedAttributes and \
-                                   "implantSetGuristas" in implant.itemModifiedAttributes,
-                                   "shieldBoostMultiplier", implant.getModifiedItemAttr("implantSetGuristas"))
+    fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
+                                      "shieldBoostMultiplier", implant.getModifiedItemAttr("implantSetGuristas"))
--- a/eos/effects/setbonusmordus.py
+++ b/eos/effects/setbonusmordus.py
@@ -3,6 +3,5 @@
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
-    fit.implants.filteredItemMultiply(lambda implant: "rangeSkillBonus" in implant.itemModifiedAttributes and \
-                                   "implantSetMordus" in implant.itemModifiedAttributes,
-                                   "rangeSkillBonus", implant.getModifiedItemAttr("implantSetMordus"))
+    fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
+                                      "rangeSkillBonus", implant.getModifiedItemAttr("implantSetMordus"))
--- a/eos/effects/setbonusore.py
+++ b/eos/effects/setbonusore.py
@@ -3,6 +3,5 @@
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
-    fit.implants.filteredItemMultiply(lambda implant: "maxRangeBonus" in implant.itemModifiedAttributes and \
-                                      "implantSetORE" in implant.itemModifiedAttributes,
-                                      "maxRangeBonus", implant.getModifiedItemAttr("implantSetORE"))
+    fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
+                                      "maxRangeBonus", implant.getModifiedItemAttr("implantSetORE"))
--- a/eos/effects/setbonussansha.py
+++ b/eos/effects/setbonussansha.py
@@ -4,6 +4,5 @@
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
-    fit.implants.filteredItemMultiply(lambda implant: "armorHpBonus" in implant.itemModifiedAttributes and \
-                                      "implantSetSansha" in implant.itemModifiedAttributes,
-                                      "armorHpBonus", implant.getModifiedItemAttr("implantSetSansha"))
+    fit.implants.filteredItemMultiply(lambda target: target.item.requiresSkill("Cybernetics"),
+                                      "armorHpBonus", implant.getModifiedItemAttr("implantSetSansha") or 1)
--- a/eos/effects/setbonusserpentis.py
+++ b/eos/effects/setbonusserpentis.py
@@ -3,6 +3,5 @@
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
-    fit.implants.filteredItemMultiply(lambda implant: "velocityBonus" in implant.itemModifiedAttributes and \
-                                      "implantSetSerpentis" in implant.itemModifiedAttributes,
-                                      "velocityBonus", implant.getModifiedItemAttr("implantSetSerpentis"))
+    fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
+                                      "velocityBonus", implant.getModifiedItemAttr("implantSetSerpentis"))
--- a/eos/effects/setbonussisters.py
+++ b/eos/effects/setbonussisters.py
@@ -3,6 +3,5 @@
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
-    fit.implants.filteredItemMultiply(lambda implant: "scanStrengthBonus" in implant.itemModifiedAttributes and \
-                                      "implantSetSisters" in implant.itemModifiedAttributes,
-                                      "scanStrengthBonus", implant.getModifiedItemAttr("implantSetSisters"))
+    fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
+                                      "scanStrengthBonus", implant.getModifiedItemAttr("implantSetSisters"))
--- a/eos/effects/setbonussyndicate.py
+++ b/eos/effects/setbonussyndicate.py
@@ -3,6 +3,5 @@
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
-    fit.implants.filteredItemMultiply(lambda implant: "boosterAttributeModifier" in implant.itemModifiedAttributes and \
-                                      "implantSetSyndicate" in implant.itemModifiedAttributes,
-                                      "boosterAttributeModifier", implant.getModifiedItemAttr("implantSetSyndicate"))
+    fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
+                                      "boosterAttributeModifier", implant.getModifiedItemAttr("implantSetSyndicate"))
--- a/eos/effects/setbonusthukker.py
+++ b/eos/effects/setbonusthukker.py
@@ -3,6 +3,5 @@
 runTime = "early"
 type = "passive"
 def handler(fit, implant, context):
-    fit.implants.filteredItemMultiply(lambda implant: "agilityBonus" in implant.itemModifiedAttributes and \
-                                      "implantSetThukker" in implant.itemModifiedAttributes,
-                                      "agilityBonus", implant.getModifiedItemAttr("implantSetThukker"))
+    fit.implants.filteredItemMultiply(lambda mod: mod.item.group.name == "Cyberimplant",
+                                      "agilityBonus", implant.getModifiedItemAttr("implantSetThukker"))