From 6dc4161a36cb40999da892adeb42be45d094f59b Mon Sep 17 00:00:00 2001 From: blitzmann Date: Mon, 14 Apr 2014 22:14:06 -0400 Subject: [PATCH] Fix #69 --- eos/saveddata/drone.py | 2 +- eos/saveddata/module.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eos/saveddata/drone.py b/eos/saveddata/drone.py index 8a064a719..e49aeb2ad 100755 --- a/eos/saveddata/drone.py +++ b/eos/saveddata/drone.py @@ -164,7 +164,7 @@ class Drone(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut): def canBeApplied(self, projectedOnto): """Check if drone can engage specific fitting""" item = self.item - if (item.offensive and projectedOnto.ship.getModifiedItemAttr("disallowOffensiveModifiers") == 1) or \ + if (item.offensive and projectedOnto.ship.getModifiedItemAttr("disallowOffensiveModifiers") == 1 and "energyDestabilizationNew" not in item.effects) or \ (item.assistive and projectedOnto.ship.getModifiedItemAttr("disallowAssistance") == 1): return False else: diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py index ad4a52811..8a75c0405 100755 --- a/eos/saveddata/module.py +++ b/eos/saveddata/module.py @@ -464,7 +464,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut): return currActive <= maxGroupActive # For projected, we're checking if ship is vulnerable to given item else: - if (item.offensive and projectedOnto.ship.getModifiedItemAttr("disallowOffensiveModifiers") == 1) or \ + if (item.offensive and projectedOnto.ship.getModifiedItemAttr("disallowOffensiveModifiers") == 1 and "energyDestabilizationNew" not in item.effects) or \ (item.assistive and projectedOnto.ship.getModifiedItemAttr("disallowAssistance") == 1): return False else: