diff --git a/eos/effects/armoredcommandmindlink.py b/eos/effects/armoredcommandmindlink.py index d0bbd217b..d84ffe8a2 100644 --- a/eos/effects/armoredcommandmindlink.py +++ b/eos/effects/armoredcommandmindlink.py @@ -6,8 +6,8 @@ # Implant: Imperial Navy Command Mindlink type = "passive" def handler(fit, src, context): - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff2Value", src.getModifiedItemAttr("mindlinkBonus")) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff1Value", src.getModifiedItemAttr("mindlinkBonus")) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff4Value", src.getModifiedItemAttr("mindlinkBonus")) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff3Value", src.getModifiedItemAttr("mindlinkBonus")) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff2Modifier", src.getModifiedItemAttr("mindlinkBonus")) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff1Modifier", src.getModifiedItemAttr("mindlinkBonus")) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff4Modifier", src.getModifiedItemAttr("mindlinkBonus")) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff3Modifier", src.getModifiedItemAttr("mindlinkBonus")) fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "buffDuration", src.getModifiedItemAttr("mindlinkBonus")) diff --git a/eos/effects/armoredcommandstrengthbonus.py b/eos/effects/armoredcommandstrengthbonus.py index d0741f661..503a2418d 100644 --- a/eos/effects/armoredcommandstrengthbonus.py +++ b/eos/effects/armoredcommandstrengthbonus.py @@ -5,7 +5,7 @@ type = "passive" def handler(fit, src, context): lvl = src.level - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff1Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff2Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff4Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff3Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff1Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff2Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff4Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Armored Command"), "warfareBuff3Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl) diff --git a/eos/effects/chargebonuswarfarecharge.py b/eos/effects/chargebonuswarfarecharge.py index 2823664fa..1e3100094 100644 --- a/eos/effects/chargebonuswarfarecharge.py +++ b/eos/effects/chargebonuswarfarecharge.py @@ -100,7 +100,7 @@ def handler(fit, module, context, **kwargs): for x in xrange(1, 4): if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)): - value = module.getModifiedChargeAttr("warfareBuff{}Value".format(x)) + value = module.getModifiedChargeAttr("warfareBuff{}Modifier".format(x)) id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x)) print "Buff ID: ",id," value: ",value if id: diff --git a/eos/effects/iceharvestingdronespecbonus.py b/eos/effects/iceharvestingdronespecbonus.py new file mode 100644 index 000000000..14de64343 --- /dev/null +++ b/eos/effects/iceharvestingdronespecbonus.py @@ -0,0 +1,9 @@ +# iceHarvestingDroneSpecBonus +# +# Used by: +# Skill: Ice Harvesting Drone Specialization +type = "passive" +def handler(fit, src, context): + lvl = src.level + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Ice Harvesting Drone Specialization"), "duration", src.getModifiedItemAttr("rofBonus") * lvl) + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Ice Harvesting Drone Specialization"), "maxVelocity", src.getModifiedItemAttr("maxVelocityBonus") * lvl) diff --git a/eos/effects/industrialcommandshipskilllevelmultiplierics3.py b/eos/effects/industrialcommandshipskilllevelmultiplierics3.py new file mode 100644 index 000000000..2a21e47c8 --- /dev/null +++ b/eos/effects/industrialcommandshipskilllevelmultiplierics3.py @@ -0,0 +1,8 @@ +# industrialCommandShipSkillLevelMultiplierICS3 +# +# Used by: +# Skill: Industrial Command Ships +type = "passive" +def handler(fit, src, context): + lvl = src.level + fit.ship.multiplyItemAttr("shipBonusICS3", src.getModifiedItemAttr("skillLevel") * lvl) diff --git a/eos/effects/industrialcommandshipskilllevelmultiplierics4.py b/eos/effects/industrialcommandshipskilllevelmultiplierics4.py new file mode 100644 index 000000000..368383e2d --- /dev/null +++ b/eos/effects/industrialcommandshipskilllevelmultiplierics4.py @@ -0,0 +1,8 @@ +# industrialCommandShipSkillLevelMultiplierICS4 +# +# Used by: +# Skill: Industrial Command Ships +type = "passive" +def handler(fit, src, context): + lvl = src.level + fit.ship.multiplyItemAttr("shipBonusICS4", src.getModifiedItemAttr("skillLevel") * lvl) diff --git a/eos/effects/industrialcommandshipskilllevelmultiplierics5.py b/eos/effects/industrialcommandshipskilllevelmultiplierics5.py new file mode 100644 index 000000000..ef74f8b9a --- /dev/null +++ b/eos/effects/industrialcommandshipskilllevelmultiplierics5.py @@ -0,0 +1,8 @@ +# industrialCommandShipSkillLevelMultiplierICS5 +# +# Used by: +# Skill: Industrial Command Ships +type = "passive" +def handler(fit, src, context): + lvl = src.level + fit.ship.multiplyItemAttr("shipBonusICS5", src.getModifiedItemAttr("skillLevel") * lvl) diff --git a/eos/effects/industrialcoreeffect2.py b/eos/effects/industrialcoreeffect2.py index 4dc850827..7f65c6295 100644 --- a/eos/effects/industrialcoreeffect2.py +++ b/eos/effects/industrialcoreeffect2.py @@ -7,6 +7,9 @@ runTime = "early" def handler(fit, module, context): + return + + # @todo: finish this fit.extraAttributes["siege"] = True fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("speedFactor")) fit.ship.multiplyItemAttr("mass", module.getModifiedItemAttr("siegeMassMultiplier")) @@ -20,7 +23,7 @@ def handler(fit, module, context): ( "Shield Command", ), - "warfareBuff4Value", - src.getModifiedItemAttr("shipBonusORECapital3"), + "warfareBuff4Modifier", + module.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships", ) diff --git a/eos/effects/informationcommandmindlink.py b/eos/effects/informationcommandmindlink.py index 42ebc245e..52c29f99c 100644 --- a/eos/effects/informationcommandmindlink.py +++ b/eos/effects/informationcommandmindlink.py @@ -6,8 +6,8 @@ # Implant: Information Command Mindlink type = "passive" def handler(fit, src, context): - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff4Value", src.getModifiedItemAttr("mindlinkBonus")) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff3Value", src.getModifiedItemAttr("mindlinkBonus")) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff1Value", src.getModifiedItemAttr("mindlinkBonus")) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff2Value", src.getModifiedItemAttr("mindlinkBonus")) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff4Modifier", src.getModifiedItemAttr("mindlinkBonus")) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff3Modifier", src.getModifiedItemAttr("mindlinkBonus")) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff1Modifier", src.getModifiedItemAttr("mindlinkBonus")) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff2Modifier", src.getModifiedItemAttr("mindlinkBonus")) fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Command"), "buffDuration", src.getModifiedItemAttr("mindlinkBonus")) diff --git a/eos/effects/informationcommandstrengthbonus.py b/eos/effects/informationcommandstrengthbonus.py index 1d3852132..bcd960187 100644 --- a/eos/effects/informationcommandstrengthbonus.py +++ b/eos/effects/informationcommandstrengthbonus.py @@ -5,7 +5,7 @@ type = "passive" def handler(fit, src, context): lvl = src.level - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff2Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff1Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff3Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff4Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff2Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff1Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff3Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Information Command"), "warfareBuff4Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl) diff --git a/eos/effects/invulnerabilitycoredurationbonus.py b/eos/effects/invulnerabilitycoredurationbonus.py new file mode 100644 index 000000000..8d4165859 --- /dev/null +++ b/eos/effects/invulnerabilitycoredurationbonus.py @@ -0,0 +1,9 @@ +# invulnerabilityCoreDurationBonus +# +# Used by: +# Skill: Invulnerability Core Operation +type = "passive" +def handler(fit, src, context): + lvl = src.level + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Invulnerability Core Operation"), "buffDuration", src.getModifiedItemAttr("durationBonus") * lvl) + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Invulnerability Core Operation"), "duration", src.getModifiedItemAttr("durationBonus") * lvl) diff --git a/eos/effects/miningforemanburstbonusics2.py b/eos/effects/miningforemanburstbonusics2.py index 40cb8c538..8e3e54662 100644 --- a/eos/effects/miningforemanburstbonusics2.py +++ b/eos/effects/miningforemanburstbonusics2.py @@ -3,72 +3,9 @@ # Used by: # Ships from group: Industrial Command Ship (2 of 2) type = "passive" - - def handler(fit, src, context): - fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in - ( - "Command Burst", - ) and - mod.item.requiresSkill in - ( - "Mining Foreman", - ), - "buffDuration", - src.getModifiedItemAttr("shipBonusICS2"), - skill="Industrial Command Ships", - ) - - fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in - ( - "Command Burst", - ) and - mod.item.requiresSkill in - ( - "Mining Foreman", - ), - "warfareBuff1Value", - src.getModifiedItemAttr("shipBonusICS2"), - skill="Industrial Command Ships", - ) - - fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in - ( - "Command Burst", - ) and - mod.item.requiresSkill in - ( - "Mining Foreman", - ), - "warfareBuff2Value", - src.getModifiedItemAttr("shipBonusICS2"), - skill="Industrial Command Ships", - ) - - fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in - ( - "Command Burst", - ) and - mod.item.requiresSkill in - ( - "Mining Foreman", - ), - "warfareBuff3Value", - src.getModifiedItemAttr("shipBonusICS2"), - skill="Industrial Command Ships", - ) - - fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in - ( - "Command Burst", - ) and - mod.item.requiresSkill in - ( - "Mining Foreman", - ), - "warfareBuff4Value", - src.getModifiedItemAttr("shipBonusICS2"), - skill="Industrial Command Ships", - ) - -# TODO: test + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Modifier", src.getModifiedItemAttr("shipBonusICS2"), skill="Industrial Command Ships") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Modifier", src.getModifiedItemAttr("shipBonusICS2"), skill="Industrial Command Ships") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "buffDuration", src.getModifiedItemAttr("shipBonusICS2"), skill="Industrial Command Ships") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Modifier", src.getModifiedItemAttr("shipBonusICS2"), skill="Industrial Command Ships") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Modifier", src.getModifiedItemAttr("shipBonusICS2"), skill="Industrial Command Ships") diff --git a/eos/effects/miningforemanburstbonusorecapital2.py b/eos/effects/miningforemanburstbonusorecapital2.py index b518a16c9..9511c93ed 100644 --- a/eos/effects/miningforemanburstbonusorecapital2.py +++ b/eos/effects/miningforemanburstbonusorecapital2.py @@ -3,68 +3,9 @@ # Used by: # Ship: Rorqual type = "passive" - - def handler(fit, src, context): - fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in - ( - "Command Burst", - ) and - mod.item.requiresSkill in - ( - "Mining Foreman", - ), - "buffDuration", - src.getModifiedItemAttr("shipBonusORECapital2"), - ) - - fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in - ( - "Command Burst", - ) and - mod.item.requiresSkill in - ( - "Mining Foreman", - ), - "warfareBuff1Value", - src.getModifiedItemAttr("shipBonusORECapital2"), - ) - - fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in - ( - "Command Burst", - ) and - mod.item.requiresSkill in - ( - "Mining Foreman", - ), - "warfareBuff2Value", - src.getModifiedItemAttr("shipBonusORECapital2"), - ) - - fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in - ( - "Command Burst", - ) and - mod.item.requiresSkill in - ( - "Mining Foreman", - ), - "warfareBuff3Value", - src.getModifiedItemAttr("shipBonusORECapital2"), - ) - - fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in - ( - "Command Burst", - ) and - mod.item.requiresSkill in - ( - "Mining Foreman", - ), - "warfareBuff4Value", - src.getModifiedItemAttr("shipBonusORECapital2"), - skill="Capital Industrial Ships", - ) - -# TODO: test + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Modifier", src.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Modifier", src.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Modifier", src.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Modifier", src.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "buffDuration", src.getModifiedItemAttr("shipBonusORECapital2"), skill="Capital Industrial Ships") diff --git a/eos/effects/miningforemanmindlink.py b/eos/effects/miningforemanmindlink.py index 4e90edcc2..16e52b4e6 100644 --- a/eos/effects/miningforemanmindlink.py +++ b/eos/effects/miningforemanmindlink.py @@ -5,8 +5,8 @@ # Implant: ORE Mining Director Mindlink type = "passive" def handler(fit, src, context): - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Value", src.getModifiedItemAttr("mindlinkBonus")) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Value", src.getModifiedItemAttr("mindlinkBonus")) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Value", src.getModifiedItemAttr("mindlinkBonus")) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Value", src.getModifiedItemAttr("mindlinkBonus")) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Modifier", src.getModifiedItemAttr("mindlinkBonus")) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Modifier", src.getModifiedItemAttr("mindlinkBonus")) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Modifier", src.getModifiedItemAttr("mindlinkBonus")) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Modifier", src.getModifiedItemAttr("mindlinkBonus")) fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "buffDuration", src.getModifiedItemAttr("mindlinkBonus")) diff --git a/eos/effects/miningforemanstrengthbonus.py b/eos/effects/miningforemanstrengthbonus.py index a40972fa7..530ee9698 100644 --- a/eos/effects/miningforemanstrengthbonus.py +++ b/eos/effects/miningforemanstrengthbonus.py @@ -5,7 +5,7 @@ type = "passive" def handler(fit, src, context): lvl = src.level - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl) \ No newline at end of file + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl) \ No newline at end of file diff --git a/eos/effects/moduletitaneffectgenerator.py b/eos/effects/moduletitaneffectgenerator.py index 08488b82f..befe52b3d 100644 --- a/eos/effects/moduletitaneffectgenerator.py +++ b/eos/effects/moduletitaneffectgenerator.py @@ -64,7 +64,7 @@ def handler(fit, module, context, **kwargs): for x in xrange(1, 4): if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)): - value = module.getModifiedChargeAttr("warfareBuff{}Value".format(x)) + value = module.getModifiedChargeAttr("warfareBuff{}Modifier".format(x)) id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x)) if id: diff --git a/eos/effects/orecapitalshipskillmultiplier5.py b/eos/effects/orecapitalshipskillmultiplier5.py new file mode 100644 index 000000000..ddc733c91 --- /dev/null +++ b/eos/effects/orecapitalshipskillmultiplier5.py @@ -0,0 +1,8 @@ +# oreCapitalShipSkillMultiplier5 +# +# Used by: +# Skill: Capital Industrial Ships +type = "passive" +def handler(fit, src, context): + lvl = src.level + fit.ship.multiplyItemAttr("shipBonusORECapital5", src.getModifiedItemAttr("skillLevel") * lvl) diff --git a/eos/effects/shieldcommandburstbonusics3.py b/eos/effects/shieldcommandburstbonusics3.py index fc0644c03..ead61404b 100644 --- a/eos/effects/shieldcommandburstbonusics3.py +++ b/eos/effects/shieldcommandburstbonusics3.py @@ -3,72 +3,9 @@ # Used by: # Ship: Orca type = "passive" - - def handler(fit, src, context): - fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in - ( - "Command Burst", - ) and - mod.item.requiresSkill in - ( - "Shield Command", - ), - "buffDuration", - src.getModifiedItemAttr("shipBonusICS3"), - skill="Industrial Command Ships", - ) - - fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in - ( - "Command Burst", - ) and - mod.item.requiresSkill in - ( - "Shield Command", - ), - "warfareBuff1Value", - src.getModifiedItemAttr("shipBonusICS3"), - skill="Industrial Command Ships", - ) - - fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in - ( - "Command Burst", - ) and - mod.item.requiresSkill in - ( - "Shield Command", - ), - "warfareBuff2Value", - src.getModifiedItemAttr("shipBonusICS3"), - skill="Industrial Command Ships", - ) - - fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in - ( - "Command Burst", - ) and - mod.item.requiresSkill in - ( - "Shield Command", - ), - "warfareBuff3Value", - src.getModifiedItemAttr("shipBonusICS3"), - skill="Industrial Command Ships", - ) - - fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in - ( - "Command Burst", - ) and - mod.item.requiresSkill in - ( - "Shield Command" - ), - "warfareBuff4Value", - src.getModifiedItemAttr("shipBonusICS3"), - skill="Industrial Command Ships", - ) - -# TODO: test + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Modifier", src.getModifiedItemAttr("shipBonusICS3"), skill="Industrial Command Ships") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Modifier", src.getModifiedItemAttr("shipBonusICS3"), skill="Industrial Command Ships") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Modifier", src.getModifiedItemAttr("shipBonusICS3"), skill="Industrial Command Ships") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Modifier", src.getModifiedItemAttr("shipBonusICS3"), skill="Industrial Command Ships") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "buffDuration", src.getModifiedItemAttr("shipBonusICS3"), skill="Industrial Command Ships") diff --git a/eos/effects/shieldcommandburstbonusorecapital3.py b/eos/effects/shieldcommandburstbonusorecapital3.py index 49518efae..e435b3228 100644 --- a/eos/effects/shieldcommandburstbonusorecapital3.py +++ b/eos/effects/shieldcommandburstbonusorecapital3.py @@ -3,72 +3,9 @@ # Used by: # Ship: Rorqual type = "passive" - - def handler(fit, src, context): - fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in - ( - "Command Burst", - ) and - mod.item.requiresSkill in - ( - "Shield Command", - ), - "buffDuration", - src.getModifiedItemAttr("shipBonusORECapital3"), - skill="Capital Industrial Ships", - ) - - fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in - ( - "Command Burst", - ) and - mod.item.requiresSkill in - ( - "Shield Command", - ), - "warfareBuff1Value", - src.getModifiedItemAttr("shipBonusORECapital3"), - skill="Capital Industrial Ships", - ) - - fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in - ( - "Command Burst", - ) and - mod.item.requiresSkill in - ( - "Shield Command", - ), - "warfareBuff2Value", - src.getModifiedItemAttr("shipBonusORECapital3"), - skill="Capital Industrial Ships", - ) - - fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in - ( - "Command Burst", - ) and - mod.item.requiresSkill in - ( - "Shield Command", - ), - "warfareBuff3Value", - src.getModifiedItemAttr("shipBonusORECapital3"), - skill="Capital Industrial Ships", - ) - - fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name in - ( - "Command Burst", - ) and - mod.item.requiresSkill in - ( - "Shield Command", - ), - "warfareBuff4Value", - src.getModifiedItemAttr("shipBonusORECapital3"), - skill="Capital Industrial Ships", - ) - -# TODO: test + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Modifier", src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "buffDuration", src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Modifier", src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Modifier", src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Modifier", src.getModifiedItemAttr("shipBonusORECapital3"), skill="Capital Industrial Ships") diff --git a/eos/effects/shieldcommandmindlink.py b/eos/effects/shieldcommandmindlink.py index 0e2eaa3c1..a3303d552 100644 --- a/eos/effects/shieldcommandmindlink.py +++ b/eos/effects/shieldcommandmindlink.py @@ -4,8 +4,8 @@ # Implants from group: Cyber Leadership (4 of 10) type = "passive" def handler(fit, src, context): - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Value", src.getModifiedItemAttr("mindlinkBonus")) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Value", src.getModifiedItemAttr("mindlinkBonus")) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Value", src.getModifiedItemAttr("mindlinkBonus")) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Value", src.getModifiedItemAttr("mindlinkBonus")) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Modifier", src.getModifiedItemAttr("mindlinkBonus")) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Modifier", src.getModifiedItemAttr("mindlinkBonus")) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Modifier", src.getModifiedItemAttr("mindlinkBonus")) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Modifier", src.getModifiedItemAttr("mindlinkBonus")) fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "buffDuration", src.getModifiedItemAttr("mindlinkBonus")) diff --git a/eos/effects/shieldcommandstrengthbonus.py b/eos/effects/shieldcommandstrengthbonus.py index fce60bbc9..dc18f5e5f 100644 --- a/eos/effects/shieldcommandstrengthbonus.py +++ b/eos/effects/shieldcommandstrengthbonus.py @@ -5,7 +5,7 @@ type = "passive" def handler(fit, src, context): lvl = src.level - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff3Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff1Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff2Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Shield Command"), "warfareBuff4Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl) diff --git a/eos/effects/shipbonusdronehpdamageminingics4.py b/eos/effects/shipbonusdronehpdamageminingics4.py index 146ed7ec1..c8d49571f 100644 --- a/eos/effects/shipbonusdronehpdamageminingics4.py +++ b/eos/effects/shipbonusdronehpdamageminingics4.py @@ -36,4 +36,3 @@ def handler(fit, src, context): skill="Industrial Command Ships" ) -# TODO: test diff --git a/eos/effects/shipbonusdronehpdamageminingorecapital4.py b/eos/effects/shipbonusdronehpdamageminingorecapital4.py index b9b12a6cb..1b5ed13f5 100644 --- a/eos/effects/shipbonusdronehpdamageminingorecapital4.py +++ b/eos/effects/shipbonusdronehpdamageminingorecapital4.py @@ -36,4 +36,3 @@ def handler(fit, src, context): skill="Capital Industrial Ships" ) -# TODO: test diff --git a/eos/effects/shipbonusdroneiceharvestingics5.py b/eos/effects/shipbonusdroneiceharvestingics5.py index d442ae9d3..4119b36c7 100644 --- a/eos/effects/shipbonusdroneiceharvestingics5.py +++ b/eos/effects/shipbonusdroneiceharvestingics5.py @@ -11,5 +11,3 @@ def handler(fit, src, context): src.getModifiedItemAttr("shipBonusICS5"), skill="Industrial Command Ships" ) - -# TODO: test diff --git a/eos/effects/shipbonusdroneiceharvestingorecapital5.py b/eos/effects/shipbonusdroneiceharvestingorecapital5.py index 94208f7fb..754ea3fe6 100644 --- a/eos/effects/shipbonusdroneiceharvestingorecapital5.py +++ b/eos/effects/shipbonusdroneiceharvestingorecapital5.py @@ -11,5 +11,3 @@ def handler(fit, src, context): src.getModifiedItemAttr("shipBonusORECapital5"), skill="Capital Industrial Ships" ) - -# TODO: test diff --git a/eos/effects/shipbonusdroneiceharvestingrole.py b/eos/effects/shipbonusdroneiceharvestingrole.py index e9522ddff..07e444437 100644 --- a/eos/effects/shipbonusdroneiceharvestingrole.py +++ b/eos/effects/shipbonusdroneiceharvestingrole.py @@ -3,12 +3,5 @@ # Used by: # Ship: Orca type = "passive" - - def handler(fit, src, context): - fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Ice Harvesting Drone Operation"), - "duration", - src.getModifiedItemAttr("roleBonusDroneIceHarvestingSpeed") - ) - -# TODO: test + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Ice Harvesting Drone Operation"), "duration", src.getModifiedItemAttr("roleBonusDroneIceHarvestingSpeed")) diff --git a/eos/effects/shipbonusdroneminingamountrole.py b/eos/effects/shipbonusdroneminingamountrole.py index 5024b45bd..789754258 100644 --- a/eos/effects/shipbonusdroneminingamountrole.py +++ b/eos/effects/shipbonusdroneminingamountrole.py @@ -10,5 +10,3 @@ def handler(fit, src, context): "miningAmount", src.getModifiedItemAttr("roleBonusDroneMiningYield"), ) - -# TODO: test diff --git a/eos/effects/skirmishcommandmindlink.py b/eos/effects/skirmishcommandmindlink.py index e28ef0918..f3e9ff027 100644 --- a/eos/effects/skirmishcommandmindlink.py +++ b/eos/effects/skirmishcommandmindlink.py @@ -6,8 +6,8 @@ # Implant: Skirmish Command Mindlink type = "passive" def handler(fit, src, context): - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff3Value", src.getModifiedItemAttr("mindlinkBonus")) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff4Value", src.getModifiedItemAttr("mindlinkBonus")) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff2Value", src.getModifiedItemAttr("mindlinkBonus")) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff1Value", src.getModifiedItemAttr("mindlinkBonus")) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff3Modifier", src.getModifiedItemAttr("mindlinkBonus")) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff4Modifier", src.getModifiedItemAttr("mindlinkBonus")) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff2Modifier", src.getModifiedItemAttr("mindlinkBonus")) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff1Modifier", src.getModifiedItemAttr("mindlinkBonus")) fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "buffDuration", src.getModifiedItemAttr("mindlinkBonus")) diff --git a/eos/effects/skirmishcommandstrengthbonus.py b/eos/effects/skirmishcommandstrengthbonus.py index 6af23b5a8..efc32360e 100644 --- a/eos/effects/skirmishcommandstrengthbonus.py +++ b/eos/effects/skirmishcommandstrengthbonus.py @@ -5,7 +5,7 @@ type = "passive" def handler(fit, src, context): lvl = src.level - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff3Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff4Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff1Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl) - fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff2Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff3Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff4Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff1Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl) + fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Skirmish Command"), "warfareBuff2Modifier", src.getModifiedItemAttr("commandStrengthBonus") * lvl) diff --git a/eos/effects/techtwocommandburstbonus.py b/eos/effects/techtwocommandburstbonus.py index 9713c4949..150704753 100644 --- a/eos/effects/techtwocommandburstbonus.py +++ b/eos/effects/techtwocommandburstbonus.py @@ -4,4 +4,4 @@ runTime = "late" def handler(fit, module, context): for x in xrange(1, 4): - module.boostChargeAttr("warfareBuff{}Value".format(x), module.getModifiedItemAttr("commandBurstStrengthBonus")) + module.boostChargeAttr("warfareBuff{}Modifier".format(x), module.getModifiedItemAttr("commandBurstStrengthBonus"))