From 8605bab4d412574382863f31db5f14157c74738a Mon Sep 17 00:00:00 2001 From: blitzman Date: Mon, 21 Nov 2016 21:59:44 -0500 Subject: [PATCH] Fix effects running when they shouldn't --- eos/saveddata/module.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py index 54b88243b..a382f9a56 100644 --- a/eos/saveddata/module.py +++ b/eos/saveddata/module.py @@ -643,16 +643,21 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut): if self.state >= State.OVERHEATED: for effect in self.item.effects.itervalues(): if effect.runTime == runTime and \ - effect.isType("overheat") and \ - not forceProjected: + effect.isType("overheat") \ + and not forceProjected \ + and ((gang and effect.isType("gang")) or not gang): effect.handler(fit, self, context) for effect in self.item.effects.itervalues(): if effect.runTime == runTime and \ (effect.isType("offline") or (effect.isType("passive") and self.state >= State.ONLINE) or - (effect.isType("active") and self.state >= State.ACTIVE)) and \ - ((projected and effect.isType("projected")) or not projected): + (effect.isType("active") and self.state >= State.ACTIVE))\ + and ((projected and effect.isType("projected")) or not projected)\ + and ((gang and effect.isType("gang")) or not gang): + thing = effect.isType("gang") + if gang: + pass effect.handler(fit, self, context) @property