diff --git a/config.py b/config.py index 56948323b..a0319c429 100644 --- a/config.py +++ b/config.py @@ -20,7 +20,7 @@ saveInRoot = False # Version data version = "1.29.1" -tag = "git" +tag = "Stable" expansionName = "YC119.5" expansionVersion = "1.0" evemonMinVersion = "4081" diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py index b9e43c083..0b8487c56 100644 --- a/eos/saveddata/fit.py +++ b/eos/saveddata/fit.py @@ -1313,7 +1313,7 @@ class Fit(object): else: hp = 0 - if hp > 0: + if hp > 0 and duration > 0: self.__remoteReps[remote_type] += (hp * modifier) / duration return self.__remoteReps diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py index 3834def33..2ac850982 100644 --- a/eos/saveddata/module.py +++ b/eos/saveddata/module.py @@ -763,8 +763,9 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut): capNeed = self.getModifiedItemAttr("capacitorNeed") if capNeed and self.state >= State.ACTIVE: cycleTime = self.cycleTime - capUsed = capNeed / (cycleTime / 1000.0) - return capUsed + if cycleTime > 0: + capUsed = capNeed / (cycleTime / 1000.0) + return capUsed else: return 0 diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py index 1aebfe8ec..4c4da029c 100644 --- a/gui/builtinViews/fittingView.py +++ b/gui/builtinViews/fittingView.py @@ -110,6 +110,7 @@ class FittingViewDrop(wx.PyDropTarget): def OnData(self, x, y, t): if self.GetData(): + pyfalog.debug("fittingView: recieved drag: " + self.dropData.GetText()) data = self.dropData.GetText().split(':') self.dropFn(x, y, data) return t diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py index 8321b7a8d..d42ea56ec 100644 --- a/gui/marketBrowser.py +++ b/gui/marketBrowser.py @@ -279,8 +279,10 @@ class ItemView(Display): if row != -1: data = wx.PyTextDataObject() - data.SetText("market:" + str(self.active[row].ID)) + dataStr = "market:" + str(self.active[row].ID) + pyfalog.debug("Dragging from market: " + dataStr) + data.SetText(dataStr) dropSource = wx.DropSource(self) dropSource.SetData(data) dropSource.DoDragDrop()