From fd745c5f623b71be628b89e98aba682b4b180b41 Mon Sep 17 00:00:00 2001 From: blitzman Date: Sat, 25 Mar 2017 01:02:20 -0400 Subject: [PATCH 1/3] Tox fix. --- config.py | 4 ++-- gui/builtinContextMenus/cargoAmmo.py | 1 - gui/builtinContextMenus/droneStack.py | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/config.py b/config.py index 13a7d9cb9..884803d76 100644 --- a/config.py +++ b/config.py @@ -19,8 +19,8 @@ debug = False saveInRoot = False # Version data -version = "1.28.1" -tag = "Stable" +version = "1.28.2" +tag = "git" expansionName = "YC119.3" expansionVersion = "1.0" evemonMinVersion = "4081" diff --git a/gui/builtinContextMenus/cargoAmmo.py b/gui/builtinContextMenus/cargoAmmo.py index 57ae42517..12ebe552f 100644 --- a/gui/builtinContextMenus/cargoAmmo.py +++ b/gui/builtinContextMenus/cargoAmmo.py @@ -1,6 +1,5 @@ from gui.contextMenu import ContextMenu import gui.mainFrame -import service import gui.globalEvents as GE import wx from service.settings import ContextMenuSettings diff --git a/gui/builtinContextMenus/droneStack.py b/gui/builtinContextMenus/droneStack.py index 150b76676..99a253796 100644 --- a/gui/builtinContextMenus/droneStack.py +++ b/gui/builtinContextMenus/droneStack.py @@ -1,6 +1,5 @@ from gui.contextMenu import ContextMenu import gui.mainFrame -import service import gui.globalEvents as GE import wx from service.settings import ContextMenuSettings From e03b3227d430ca184cb468c03f74eca5d8d5df07 Mon Sep 17 00:00:00 2001 From: Ryan Holmes Date: Sat, 1 Apr 2017 22:23:50 -0500 Subject: [PATCH 2/3] Fix for #1081 (#1085) * Break project application code out of main item iteration, and apply it after command boosts have been applied to the fit. Fix for #1081 * Make tox happy --- eos/saveddata/fit.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py index b013a5f3f..c2c8f02c4 100644 --- a/eos/saveddata/fit.py +++ b/eos/saveddata/fit.py @@ -732,12 +732,6 @@ class Fit(object): self.register(item) item.calculateModifiedAttributes(self, runTime, False) - if projected is True and projectionInfo and item not in chain.from_iterable(r): - # apply effects onto target fit - for _ in xrange(projectionInfo.amount): - targetFit.register(item, origin=self) - item.calculateModifiedAttributes(targetFit, runTime, True) - if targetFit and withBoosters and item in self.modules: # Apply the gang boosts to target fit # targetFit.register(item, origin=self) @@ -750,6 +744,16 @@ class Fit(object): if not withBoosters and self.commandBonuses: self.__runCommandBoosts(runTime) + # Projection effects have been broken out of the main loop, see GH issue #1081 + + if projected is True and projectionInfo: + for item in chain.from_iterable(u): + if item is not None: + # apply effects onto target fit + for _ in xrange(projectionInfo.amount): + targetFit.register(item, origin=self) + item.calculateModifiedAttributes(targetFit, runTime, True) + timer.checkpoint('Done with runtime: %s' % runTime) # Mark fit as calculated From 112ab91e3427945f75eca2a1448ee7c5756f445b Mon Sep 17 00:00:00 2001 From: Ryan Holmes Date: Sat, 1 Apr 2017 23:09:32 -0500 Subject: [PATCH 3/3] Fix for #1091 (#1092) --- eos/db/saveddata/databaseRepair.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eos/db/saveddata/databaseRepair.py b/eos/db/saveddata/databaseRepair.py index 0d133d5e6..d16c412b0 100644 --- a/eos/db/saveddata/databaseRepair.py +++ b/eos/db/saveddata/databaseRepair.py @@ -215,7 +215,7 @@ class DatabaseCleanup(object): row = results.first() if row and row['num']: - query = "UPDATE '{0}' SET '{1}Amount' = '0' WHERE {1}Amount IS NULL OR Amount = ''".format(profileType, + query = "UPDATE '{0}' SET '{1}Amount' = '0' WHERE {1}Amount IS NULL OR {1}Amount = ''".format(profileType, damageType) delete = DatabaseCleanup.ExecuteSQLQuery(saveddata_engine, query) pyfalog.error("Database corruption found. Cleaning up {0} records.", delete.rowcount)