diff --git a/eos/effects/chargebonuswarfarecharge.py b/eos/effects/chargebonuswarfarecharge.py index fc4af6c2d..49f583beb 100644 --- a/eos/effects/chargebonuswarfarecharge.py +++ b/eos/effects/chargebonuswarfarecharge.py @@ -24,7 +24,7 @@ def handler(fit, module, context, **kwargs): if id == 10: # Shield Burst: Shield Harmonizing: Shield Resistance for damageType in ("Em", "Explosive", "Thermal", "Kinetic"): - fit.ship.boostItemAttr("shield%sDamageResonance" % damageType, value, stackingPenalties=True) + fit.ship.boostItemAttr("shield%sDamageResonance" % damageType, value) if id == 11: # Shield Burst: Active Shielding: Repair Duration/Capacitor fit.modules.filteredItemBoost( diff --git a/eos/effects/modulebonuswarfarelinkarmor.py b/eos/effects/modulebonuswarfarelinkarmor.py index daa55444e..7cb5aeb2e 100644 --- a/eos/effects/modulebonuswarfarelinkarmor.py +++ b/eos/effects/modulebonuswarfarelinkarmor.py @@ -3,7 +3,7 @@ # Used by: # Variations of module: Armor Command Burst I (2 of 2) type = "active" -runTime = "late" +runTime = "early" def handler(fit, module, context): diff --git a/eos/effects/modulebonuswarfarelinkinfo.py b/eos/effects/modulebonuswarfarelinkinfo.py index 32b493279..d9bbeae33 100644 --- a/eos/effects/modulebonuswarfarelinkinfo.py +++ b/eos/effects/modulebonuswarfarelinkinfo.py @@ -3,7 +3,7 @@ # Used by: # Variations of module: Information Command Burst I (2 of 2) type = "active" -runTime = "late" +runTime = "early" def handler(fit, module, context): diff --git a/eos/effects/modulebonuswarfarelinkshield.py b/eos/effects/modulebonuswarfarelinkshield.py index 856137e74..567364749 100644 --- a/eos/effects/modulebonuswarfarelinkshield.py +++ b/eos/effects/modulebonuswarfarelinkshield.py @@ -3,7 +3,7 @@ # Used by: # Variations of module: Shield Command Burst I (2 of 2) type = "active" -runTime = "late" +runTime = "early" def handler(fit, module, context): diff --git a/eos/effects/modulebonuswarfarelinkskirmish.py b/eos/effects/modulebonuswarfarelinkskirmish.py index c0bedf2b1..aaee36640 100644 --- a/eos/effects/modulebonuswarfarelinkskirmish.py +++ b/eos/effects/modulebonuswarfarelinkskirmish.py @@ -3,7 +3,7 @@ # Used by: # Variations of module: Skirmish Command Burst I (2 of 2) type = "active" -runTime = "late" +runTime = "early" def handler(fit, module, context): diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py index 8e5435acf..5ca38dba0 100644 --- a/eos/saveddata/fit.py +++ b/eos/saveddata/fit.py @@ -458,9 +458,9 @@ class Fit(object): def __runCommandBoosts(self, runTime="normal"): logger.debug("Applying gang boosts for %r", self) - for warfareBuffID, info in self.commandBonuses.iteritems(): + for warfareBuffID in self.commandBonuses.keys(): # Unpack all data required to run effect properly - effect_runTime, value, thing, effect = info + effect_runTime, value, thing, effect = self.commandBonuses[warfareBuffID] if runTime != effect_runTime: continue @@ -491,7 +491,7 @@ class Fit(object): except: pass - self.commandBonuses.clear() + del self.commandBonuses[warfareBuffID] def calculateModifiedAttributes(self, targetFit=None, withBoosters=False, dirtyStorage=None): timer = Timer(u'Fit: {}, {}'.format(self.ID, self.name), logger)