diff --git a/eos/db/migrations/upgrade21.py b/eos/db/migrations/upgrade21.py index 8545f5ecf..e6101b3ad 100644 --- a/eos/db/migrations/upgrade21.py +++ b/eos/db/migrations/upgrade21.py @@ -5,5 +5,6 @@ Migration 21 (we don't support activating only 2/5 drones). See GH issue #728 """ + def upgrade(saveddata_engine): saveddata_engine.execute("UPDATE drones SET amountActive = amount where amountActive > 0 AND amountActive <> amount;") diff --git a/eos/saveddata/character.py b/eos/saveddata/character.py index 82d58b1b9..afa3b96e8 100644 --- a/eos/saveddata/character.py +++ b/eos/saveddata/character.py @@ -147,7 +147,7 @@ class Character(object): if self.alphaCloneID: clone = eos.db.getAlphaClone(self.alphaCloneID) - type = clone.alphaCloneName.split()[1] + type = clone.alphaCloneName.split()[1] name += u' (\u03B1{})'.format(type[0].upper()) return name diff --git a/gui/contextMenu.py b/gui/contextMenu.py index 145600988..45deb2d92 100644 --- a/gui/contextMenu.py +++ b/gui/contextMenu.py @@ -181,7 +181,7 @@ class ContextMenu(object): # noinspection PyUnresolvedReferences from gui.builtinContextMenus import ( # noqa: E402,F401 openFit, - #moduleGlobalAmmoPicker, + # moduleGlobalAmmoPicker, moduleAmmoPicker, itemStats, damagePattern, @@ -204,5 +204,3 @@ from gui.builtinContextMenus import ( # noqa: E402,F401 implantSets, fighterAbilities, ) - - diff --git a/service/fit.py b/service/fit.py index 9a9d98d33..350741f45 100644 --- a/service/fit.py +++ b/service/fit.py @@ -731,7 +731,7 @@ class Fit(object): # If we have less than the total number of drones active, make them all active. Fixes #728 # This could be removed if we ever add an enhancement to make drone stacks partially active. - if d2.amount > d2.amountActive: + if d2.amount > d2.amountActive: d2.amountActive = d2.amount eos.db.commit()