Merge pull request #1322 from burnsypet/issue-1315

Stop applying neut resistance twice

eos/effects/shipmoduleremotecapacitortransmitter.py

@@ -2,11 +2,16 @@
 #
 # Used by:
 # Modules from group: Remote Capacitor Transmitter (41 of 41)
+from eos.modifiedAttributeDict import ModifiedAttributeDict
 type = "projected", "active"
 
 
-def handler(fit, src, context):
+def handler(fit, src, context, **kwargs):
     if "projected" in context:
         amount = src.getModifiedItemAttr("powerTransferAmount")
         duration = src.getModifiedItemAttr("duration")
+
+        if 'effect' in kwargs:
+            amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
         fit.addDrain(src, duration, -amount, 0)

eos/saveddata/fit.py

@@ -1193,8 +1193,7 @@ class Fit(object):
         if energyNeutralizerSignatureResolution:
             capNeed = capNeed * min(1, signatureRadius / energyNeutralizerSignatureResolution)
 
-        resistance = self.ship.getModifiedItemAttr("energyWarfareResistance") or 1 if capNeed > 0 else 1
-        self.__extraDrains.append((cycleTime, capNeed * resistance, clipSize))
+        self.__extraDrains.append((cycleTime, capNeed, clipSize))
 
     def removeDrain(self, i):
         del self.__extraDrains[i]