Fix #537 - cap battery causing remote cap transfers to apply incorrec…

…t values. Bump to stable 1.20.1
pyfa-org · Mar 16, 2016 · c42748a · c42748a
1 parent 91980c9
commit c42748a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/config.py b/config.py
@@ -18,10 +18,10 @@
 saveInRoot = False
 
 # Version data
-version = "1.20.0"
+version = "1.20.1"
 tag = "Stable"
 expansionName = "March 2016"
-expansionVersion = "1.0"
+expansionVersion = "1.3"
 evemonMinVersion = "4081"
 
 pyfaPath = None

diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py
@@ -823,7 +823,8 @@ def calculateShieldRecharge(self, percent = PEAK_RECHARGE):
         return 10 / rechargeRate * sqrt(percent) * (1 - sqrt(percent)) * capacity
 
     def addDrain(self, cycleTime, capNeed, clipSize=0):
-        resistance = self.ship.getModifiedItemAttr("energyWarfareResistance") or 1
+        """ Used for both cap drains and cap fills (fills have negative capNeed) """
+        resistance = self.ship.getModifiedItemAttr("energyWarfareResistance") or 1 if capNeed > 0 else 1
         self.__extraDrains.append((cycleTime, capNeed * resistance, clipSize))
 
     def removeDrain(self, i):

diff --git a/eve.db b/eve.db