diff --git a/config.py b/config.py index 0cbc5b996..a241db5d8 100644 --- a/config.py +++ b/config.py @@ -16,7 +16,7 @@ saveInRoot = False version = "1.12.1" tag = "git" expansionName = "Singularity" -expansionVersion = "908326" +expansionVersion = "910808" evemonMinVersion = "4081" # Database version (int ONLY) diff --git a/eos/effects/missileaoecloudsizebonusonline.py b/eos/effects/missileaoecloudsizebonusonline.py index d6892518f..b0776443a 100644 --- a/eos/effects/missileaoecloudsizebonusonline.py +++ b/eos/effects/missileaoecloudsizebonusonline.py @@ -1,4 +1,5 @@ type = "passive" def handler(fit, container, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "aoeCloudSize", container.getModifiedItemAttr("aoeCloudSizeBonus")) + "aoeCloudSize", container.getModifiedItemAttr("aoeCloudSizeBonus"), + stackingPenalties=True) diff --git a/eos/effects/missileaoevelocitybonusonline.py b/eos/effects/missileaoevelocitybonusonline.py index 74269c36c..65421f6ee 100644 --- a/eos/effects/missileaoevelocitybonusonline.py +++ b/eos/effects/missileaoevelocitybonusonline.py @@ -1,4 +1,5 @@ type = "passive" def handler(fit, container, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "aoeVelocity", container.getModifiedItemAttr("aoeVelocityBonus")) + "aoeVelocity", container.getModifiedItemAttr("aoeVelocityBonus"), + stackingPenalties=True) diff --git a/eos/effects/missileguidancecomputerbonus4.py b/eos/effects/missileguidancecomputerbonus4.py index caa096ef7..f739a4b26 100644 --- a/eos/effects/missileguidancecomputerbonus4.py +++ b/eos/effects/missileguidancecomputerbonus4.py @@ -1,11 +1,11 @@ type = "active" def handler(fit, container, context): - for srcAttr, tgtAttr, penalize in ( - ("aoeCloudSizeBonus", "aoeCloudSize", False), - ("aoeVelocityBonus", "aoeVelocity", False), - ("missileVelocityBonus", "maxVelocity", True), - ("explosionDelayBonus", "explosionDelay", True), + for srcAttr, tgtAttr in ( + ("aoeCloudSizeBonus", "aoeCloudSize"), + ("aoeVelocityBonus", "aoeVelocity"), + ("missileVelocityBonus", "maxVelocity"), + ("explosionDelayBonus", "explosionDelay"), ): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), tgtAttr, container.getModifiedItemAttr(srcAttr), - stackingPenalties=penalize) + stackingPenalties=True) diff --git a/eos/effects/missileskillaoecloudsizebonus.py b/eos/effects/missileskillaoecloudsizebonus.py index fcb3ccfec..6d97e56cd 100644 --- a/eos/effects/missileskillaoecloudsizebonus.py +++ b/eos/effects/missileskillaoecloudsizebonus.py @@ -7,6 +7,7 @@ type = "passive" def handler(fit, container, context): level = container.level if "skill" in context else 1 + penalize = False if "skill" in context or "implant" in context else True fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "aoeCloudSize", container.getModifiedItemAttr("aoeCloudSizeBonus") * level, - stackingPenalties = False) + stackingPenalties=penalize) diff --git a/eos/effects/missileskillaoevelocitybonus.py b/eos/effects/missileskillaoevelocitybonus.py index 613d97584..a059eee93 100644 --- a/eos/effects/missileskillaoevelocitybonus.py +++ b/eos/effects/missileskillaoevelocitybonus.py @@ -7,6 +7,7 @@ type = "passive" def handler(fit, container, context): level = container.level if "skill" in context else 1 + penalize = False if "skill" in context or "implant" in context else True fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "aoeVelocity", container.getModifiedItemAttr("aoeVelocityBonus") * level, - stackingPenalties = "skill" not in context and "implant" not in context) + stackingPenalties=penalize) diff --git a/staticdata/eve.db b/staticdata/eve.db index 5d277a692..a45ad135d 100644 Binary files a/staticdata/eve.db and b/staticdata/eve.db differ