From 9c406a0a440ec3e9216665c223d5a607290fb1c7 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sun, 16 Apr 2017 23:53:19 -0400 Subject: [PATCH 1/2] Fix for #1128 - these modifiers are in their own pen-group --- eos/effects/modulebonusfightersupportunit.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eos/effects/modulebonusfightersupportunit.py b/eos/effects/modulebonusfightersupportunit.py index 93a4c22f4..e79f21515 100644 --- a/eos/effects/modulebonusfightersupportunit.py +++ b/eos/effects/modulebonusfightersupportunit.py @@ -9,13 +9,13 @@ def handler(fit, src, context): fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity", src.getModifiedItemAttr("fighterBonusShieldCapacityPercent")) fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity", - src.getModifiedItemAttr("fighterBonusVelocityPercent"), stackingPenalties=True) + src.getModifiedItemAttr("fighterBonusVelocityPercent"), stackingPenalties=True, penaltyGroup="postMul") fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackMissileDuration", - src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True) + src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True, penaltyGroup="postMul") fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDuration", - src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True) + src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True, penaltyGroup="postMul") fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDuration", - src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True) + src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True, penaltyGroup="postMul") fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "shieldRechargeRate", src.getModifiedItemAttr("fighterBonusShieldRechargePercent")) From 1aaa93c1fd80b918040948ce426487167c7b0174 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Mon, 17 Apr 2017 21:35:22 -0400 Subject: [PATCH 2/2] Set sqlalchemy version to 1.0.5 in requirements... newer version causing issues in builds? --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d3bc33dde..7dc7d5651 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,4 +4,4 @@ PyYAML python-dateutil urllib3 requests==2.11.1 -sqlalchemy>=1.0.5 +sqlalchemy==1.0.5