Burn types with fire

gui/builtinContextMenus/amount.py

@@ -1,5 +1,5 @@
 from gui.contextMenu import ContextMenu
-import eos.types
+from eos.saveddata.fit import Fit as es_Fit
 import gui.mainFrame
 import gui.globalEvents as GE
 import wx
@@ -55,7 +55,7 @@ class AmountChanger(wx.Dialog):
 
         if isinstance(self.thing, es_Cargo):
             sFit.addCargo(fitID, self.thing.item.ID, int(self.input.GetLineText(0)), replace=True)
-        elif isinstance(self.thing, eos.types.Fit):
+        elif isinstance(self.thing, es_Fit):
             sFit.changeAmount(fitID, self.thing, int(self.input.GetLineText(0)))
         elif isinstance(self.thing, es_Fighter):
             sFit.changeActiveFighters(fitID, self.thing, int(self.input.GetLineText(0)))

gui/builtinContextMenus/changeAffectingSkills.py

@@ -3,7 +3,7 @@ from gui.contextMenu import ContextMenu
 import gui.mainFrame
 import wx
 from gui.bitmapLoader import BitmapLoader
-from eos.types import Skill
+from eos.saveddata.character import Skill
 import gui.globalEvents as GE
 from service.fit import Fit
 from service.character import Character

gui/builtinContextMenus/moduleAmmoPicker.py

@@ -4,7 +4,7 @@ import wx
 
 from service.fit import Fit
 from service.market import Market
-from eos.types import Hardpoint
+from eos.saveddata.module import Hardpoint
 import gui.mainFrame
 import gui.globalEvents as GE
 from gui.contextMenu import ContextMenu

gui/builtinStatsViews/resourcesViewFull.py

@@ -24,7 +24,7 @@ from gui import pygauge as PG
 import gui.mainFrame
 import gui.chromeTabs
 
-from eos.types import Hardpoint
+from eos.saveddata.module import Hardpoint
 
 from gui.utils.numberFormatter import formatAmount
 

gui/builtinViewColumns/abilities.py

@@ -19,7 +19,7 @@
 
 
 import wx
-from eos.types import Fighter
+from eos.saveddata.fighter import Fighter
 from gui.viewColumn import ViewColumn
 import gui.mainFrame
 

gui/builtinViewColumns/ammo.py

@@ -1,58 +1,58 @@
-# =============================================================================
-# Copyright (C) 2010 Diego Duclos
-#
-# This file is part of pyfa.
-#
-# pyfa is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyfa is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
-# =============================================================================
-
-import wx
-from eos.types import Fighter
-from gui.viewColumn import ViewColumn
-from gui.bitmapLoader import BitmapLoader
-
-
-class Ammo(ViewColumn):
-    name = "Ammo"
-
-    def __init__(self, fittingView, params):
-        ViewColumn.__init__(self, fittingView)
-        self.mask = wx.LIST_MASK_IMAGE
-        self.imageId = fittingView.imageList.GetImageIndex("damagePattern_small", "gui")
-        self.bitmap = BitmapLoader.getBitmap("damagePattern_small", "gui")
-
-    def getText(self, stuff):
-        if isinstance(stuff, Fighter):
-            # this is an experiment, not sure I like it. But it saves us from duplicating code.
-            col = self.columns['Fighter Abilities'](self.fittingView, {})
-            text = col.getText(stuff)
-            del col
-            return text
-        if getattr(stuff, "charge", None) is not None:
-            charges = stuff.numCharges
-            if charges > 0:
-                cycles = stuff.numShots
-                if cycles != 0 and charges != cycles:
-                    return "%s (%d, %d cycles)" % (stuff.charge.name, charges, cycles)
-                else:
-                    return "%s (%d)" % (stuff.charge.name, charges)
-            else:
-                return stuff.charge.name
-        return ""
-
-    def getImageId(self, mod):
-        return -1
-
-
-Ammo.register()
+# =============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# This file is part of pyfa.
+#
+# pyfa is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# pyfa is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
+# =============================================================================
+
+import wx
+from eos.saveddata.fighter import Fighter
+from gui.viewColumn import ViewColumn
+from gui.bitmapLoader import BitmapLoader
+
+
+class Ammo(ViewColumn):
+    name = "Ammo"
+
+    def __init__(self, fittingView, params):
+        ViewColumn.__init__(self, fittingView)
+        self.mask = wx.LIST_MASK_IMAGE
+        self.imageId = fittingView.imageList.GetImageIndex("damagePattern_small", "gui")
+        self.bitmap = BitmapLoader.getBitmap("damagePattern_small", "gui")
+
+    def getText(self, stuff):
+        if isinstance(stuff, Fighter):
+            # this is an experiment, not sure I like it. But it saves us from duplicating code.
+            col = self.columns['Fighter Abilities'](self.fittingView, {})
+            text = col.getText(stuff)
+            del col
+            return text
+        if getattr(stuff, "charge", None) is not None:
+            charges = stuff.numCharges
+            if charges > 0:
+                cycles = stuff.numShots
+                if cycles != 0 and charges != cycles:
+                    return "%s (%d, %d cycles)" % (stuff.charge.name, charges, cycles)
+                else:
+                    return "%s (%d)" % (stuff.charge.name, charges)
+            else:
+                return stuff.charge.name
+        return ""
+
+    def getImageId(self, mod):
+        return -1
+
+
+Ammo.register()

gui/builtinViewColumns/ammoIcon.py

@@ -1,56 +1,56 @@
-# =============================================================================
-# Copyright (C) 2010 Diego Duclos
-#
-# This file is part of pyfa.
-#
-# pyfa is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyfa is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
-# =============================================================================
-
-from gui.viewColumn import ViewColumn
-import wx
-from eos.types import Module
-
-
-class AmmoIcon(ViewColumn):
-    name = "Ammo Icon"
-
-    def __init__(self, fittingView, params):
-        ViewColumn.__init__(self, fittingView)
-        self.size = 24
-        self.maxsize = self.size
-        self.mask = wx.LIST_MASK_IMAGE
-        self.columnText = ""
-
-    def getText(self, mod):
-        return ""
-
-    def getImageId(self, stuff):
-        if not isinstance(stuff, Module):
-            return -1
-
-        if stuff.charge is None:
-            return -1
-        else:
-            iconFile = stuff.charge.icon.iconFile if stuff.charge.icon else ""
-            if iconFile:
-                return self.fittingView.imageList.GetImageIndex(iconFile, "icons")
-            else:
-                return -1
-
-    def getToolTip(self, mod):
-        if isinstance(mod, Module) and mod.charge is not None:
-            return mod.charge.name
-
-
-AmmoIcon.register()
+# =============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# This file is part of pyfa.
+#
+# pyfa is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# pyfa is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
+# =============================================================================
+
+from gui.viewColumn import ViewColumn
+import wx
+from eos.saveddata.module import Module
+
+
+class AmmoIcon(ViewColumn):
+    name = "Ammo Icon"
+
+    def __init__(self, fittingView, params):
+        ViewColumn.__init__(self, fittingView)
+        self.size = 24
+        self.maxsize = self.size
+        self.mask = wx.LIST_MASK_IMAGE
+        self.columnText = ""
+
+    def getText(self, mod):
+        return ""
+
+    def getImageId(self, stuff):
+        if not isinstance(stuff, Module):
+            return -1
+
+        if stuff.charge is None:
+            return -1
+        else:
+            iconFile = stuff.charge.icon.iconFile if stuff.charge.icon else ""
+            if iconFile:
+                return self.fittingView.imageList.GetImageIndex(iconFile, "icons")
+            else:
+                return -1
+
+    def getToolTip(self, mod):
+        if isinstance(mod, Module) and mod.charge is not None:
+            return mod.charge.name
+
+
+AmmoIcon.register()

gui/builtinViewColumns/baseIcon.py

@@ -1,5 +1,8 @@
 import wx
-from eos.types import Drone, Fit, Module, Slot, Rack, Implant
+from eos.saveddata.implant import Implant
+from eos.saveddata.drone import Drone
+from eos.saveddata.module import Module, Slot, Rack
+from eos.saveddata.fit import Fit
 from gui.viewColumn import ViewColumn
 
 

gui/builtinViewColumns/baseName.py

@@ -19,7 +19,11 @@
 # =============================================================================
 
 import wx
-from eos.types import Drone, Cargo, Module, Slot, Rack, Implant, Fighter
+from eos.saveddata.cargo import Cargo
+from eos.saveddata.implant import Implant
+from eos.saveddata.drone import Drone
+from eos.saveddata.fighter import Fighter
+from eos.saveddata.module import Module, Slot, Rack
 from service.fit import Fit
 from gui.viewColumn import ViewColumn
 import gui.mainFrame

gui/builtinViewColumns/capacitorUse.py

@@ -1,58 +1,58 @@
-# =============================================================================
-# Copyright (C) 2010 Diego Duclos
-#
-# This file is part of pyfa.
-#
-# pyfa is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# pyfa is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
-# =============================================================================
-
-import wx
-
-from eos.types import Mode
-from service.attribute import Attribute
-from gui.utils.numberFormatter import formatAmount
-from gui.viewColumn import ViewColumn
-from gui.bitmapLoader import BitmapLoader
-
-
-class CapacitorUse(ViewColumn):
-    name = "Capacitor Usage"
-
-    def __init__(self, fittingView, params):
-        ViewColumn.__init__(self, fittingView)
-
-        self.mask = wx.LIST_MASK_IMAGE
-
-        Attribute.getInstance().getAttributeInfo("capacitorNeed")
-        self.imageId = fittingView.imageList.GetImageIndex("capacitorRecharge_small", "gui")
-        self.bitmap = BitmapLoader.getBitmap("capacitorRecharge_small", "gui")
-
-    def getText(self, mod):
-        if isinstance(mod, Mode):
-            return ""
-
-        capUse = mod.capUse
-        if capUse:
-            return "%s%s" % ("+" if capUse < 0 else "", (formatAmount(-capUse, 3, 0, 3)))
-        else:
-            return ""
-
-    def getImageId(self, mod):
-        return -1
-
-    def getToolTip(self, mod):
-        return self.name
-
-
-CapacitorUse.register()
+# =============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# This file is part of pyfa.
+#
+# pyfa is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# pyfa is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
+# =============================================================================
+
+import wx
+
+from eos.saveddata.mode import Mode
+from service.attribute import Attribute
+from gui.utils.numberFormatter import formatAmount
+from gui.viewColumn import ViewColumn
+from gui.bitmapLoader import BitmapLoader
+
+
+class CapacitorUse(ViewColumn):
+    name = "Capacitor Usage"
+
+    def __init__(self, fittingView, params):
+        ViewColumn.__init__(self, fittingView)
+
+        self.mask = wx.LIST_MASK_IMAGE
+
+        Attribute.getInstance().getAttributeInfo("capacitorNeed")
+        self.imageId = fittingView.imageList.GetImageIndex("capacitorRecharge_small", "gui")
+        self.bitmap = BitmapLoader.getBitmap("capacitorRecharge_small", "gui")
+
+    def getText(self, mod):
+        if isinstance(mod, Mode):
+            return ""
+
+        capUse = mod.capUse
+        if capUse:
+            return "%s%s" % ("+" if capUse < 0 else "", (formatAmount(-capUse, 3, 0, 3)))
+        else:
+            return ""
+
+    def getImageId(self, mod):
+        return -1
+
+    def getToolTip(self, mod):
+        return self.name
+
+
+CapacitorUse.register()

gui/builtinViewColumns/maxRange.py

@@ -19,7 +19,7 @@
 
 import wx
 
-from eos.types import Mode
+from eos.saveddata.mode import Mode
 from service.attribute import Attribute
 from gui.viewColumn import ViewColumn
 from gui.bitmapLoader import BitmapLoader

gui/builtinViewColumns/price.py

@@ -19,7 +19,8 @@
 
 import wx
 
-from eos.types import Drone, Cargo
+from eos.saveddata.cargo import Cargo
+from eos.saveddata.drone import Drone
 from service.market import Market
 from gui.viewColumn import ViewColumn
 from gui.bitmapLoader import BitmapLoader

gui/builtinViewColumns/state.py

@@ -20,8 +20,10 @@
 
 import wx
 
-from eos.types import Drone, Module, Rack, Fit, Implant
-from eos.types import State as State_
+from eos.saveddata.fit import Fit
+from eos.saveddata.implant import Implant
+from eos.saveddata.drone import Drone
+from eos.saveddata.module import Module, State as State_, Rack
 from gui.viewColumn import ViewColumn
 
 import gui.mainFrame

gui/builtinViews/fittingView.py

@@ -25,7 +25,8 @@ import gui.display as d
 from gui.contextMenu import ContextMenu
 import gui.shipBrowser
 import gui.multiSwitch
-from eos.types import Slot, Rack, Module, Mode
+from eos.saveddata.mode import Mode
+from eos.saveddata.module import Module, Slot, Rack
 from gui.builtinViewColumns.state import State
 from gui.bitmapLoader import BitmapLoader
 import gui.builtinViews.emptyView

gui/crestFittings.py

@@ -8,7 +8,7 @@ from service.crest import CrestModes
 from service.crest import Crest
 from service.fit import Fit
 
-from eos.types import Cargo
+from eos.saveddata.cargo import Cargo
 from eos.db import getItem
 
 import gui.display as d

gui/fighterView.py

@@ -24,7 +24,7 @@ import gui.marketBrowser as mb
 import gui.mainFrame
 import gui.display as d
 from gui.builtinViewColumns.state import State
-from eos.types import Slot
+from eos.saveddata.module import Slot
 from gui.contextMenu import ContextMenu
 from service.fit import Fit
 from service.market import Market

gui/implantView.py

@@ -24,7 +24,7 @@ import gui.mainFrame
 from gui.builtinViewColumns.state import State
 from gui.contextMenu import ContextMenu
 import globalEvents as GE
-from eos.types import ImplantLocation
+from eos.saveddata.fit import ImplantLocation
 from service.fit import Fit
 from service.market import Market
 

gui/itemStats.py

@@ -28,7 +28,16 @@ import wx.html
 import wx.lib.mixins.listctrl as listmix
 
 import config
-from eos.types import Fit, Ship, Citadel, Module, Skill, Booster, Implant, Drone, Mode, Fighter
+from eos.saveddata.mode import Mode
+from eos.saveddata.character import Skill
+from eos.saveddata.implant import Implant
+from eos.saveddata.booster import Booster
+from eos.saveddata.drone import Drone
+from eos.saveddata.fighter import Fighter
+from eos.saveddata.module import Module
+from eos.saveddata.ship import Ship
+from eos.saveddata.citadel import Citadel
+from eos.saveddata.fit import Fit
 from service.market import Market
 from service.attribute import Attribute
 import gui.mainFrame