Merge branch 'development' into PreferencesPaneV2

gui/builtinContextMenus/__init__.py

@@ -22,4 +22,6 @@ __all__ = [
     "metaSwap",
     "implantSets",
     "fighterAbilities",
+    "cargoAmmo",
+    "droneStack"
 ]

gui/builtinContextMenus/cargoAmmo.py

@@ -0,0 +1,35 @@
+from gui.contextMenu import ContextMenu
+import gui.mainFrame
+import service
+import gui.globalEvents as GE
+import wx
+
+
+class CargoAmmo(ContextMenu):
+    def __init__(self):
+        self.mainFrame = gui.mainFrame.MainFrame.getInstance()
+
+    def display(self, srcContext, selection):
+        if srcContext not in ("marketItemGroup", "marketItemMisc") or self.mainFrame.getActiveFit() is None:
+            return False
+
+        for selected_item in selection:
+            if selected_item.category.ID in (
+                    8,  # Charge
+            ):
+                return True
+
+    def getText(self, itmContext, selection):
+        return "Add {0} to Cargo (x1000)".format(itmContext)
+
+    def activate(self, fullContext, selection, i):
+        sFit = service.Fit.getInstance()
+        fitID = self.mainFrame.getActiveFit()
+
+        typeID = int(selection[0].ID)
+        sFit.addCargo(fitID, typeID, 1000)
+        self.mainFrame.additionsPane.select("Cargo")
+        wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
+
+
+CargoAmmo.register()

gui/builtinContextMenus/droneStack.py

@@ -0,0 +1,37 @@
+from gui.contextMenu import ContextMenu
+import gui.mainFrame
+import service
+import gui.globalEvents as GE
+import wx
+
+
+class CargoAmmo(ContextMenu):
+    def __init__(self):
+        self.mainFrame = gui.mainFrame.MainFrame.getInstance()
+
+    def display(self, srcContext, selection):
+        if srcContext not in ("marketItemGroup", "marketItemMisc") or self.mainFrame.getActiveFit() is None:
+            return False
+
+        for selected_item in selection:
+            if selected_item.category.ID in (
+                    18,  # Drones
+            ):
+                return True
+
+        return False
+
+    def getText(self, itmContext, selection):
+        return "Add {0} to Drone Bay (x5)".format(itmContext)
+
+    def activate(self, fullContext, selection, i):
+        sFit = service.Fit.getInstance()
+        fitID = self.mainFrame.getActiveFit()
+
+        typeID = int(selection[0].ID)
+        sFit.addDrone(fitID, typeID, 5)
+        self.mainFrame.additionsPane.select("Drones")
+        wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
+
+
+CargoAmmo.register()

gui/builtinContextMenus/metaSwap.py

@@ -9,6 +9,11 @@ import gui.mainFrame
 import gui.globalEvents as GE
 from gui.contextMenu import ContextMenu
 from service.settings import ContextMenuSettings
+from eos.saveddata.booster import Booster
+from eos.saveddata.module import Module
+from eos.saveddata.drone import Drone
+from eos.saveddata.fighter import Fighter
+from eos.saveddata.implant import Implant
 
 
 class MetaSwap(ContextMenu):
@@ -20,7 +25,13 @@ class MetaSwap(ContextMenu):
         if not self.settings.get('metaSwap'):
             return False
 
-        if self.mainFrame.getActiveFit() is None or srcContext not in ("fittingModule",):
+        if self.mainFrame.getActiveFit() is None or srcContext not in (
+                "fittingModule",
+                "droneItem",
+                "fighterItem",
+                "boosterItem",
+                "implantItem",
+        ):
             return False
 
         # Check if list of variations is same for all of selection
@@ -56,6 +67,17 @@ class MetaSwap(ContextMenu):
         def get_metagroup(x):
             return x.metaGroup.ID if x.metaGroup is not None else 0
 
+        def get_boosterrank(x):
+            # If we're returning a lot of items, sort my name
+            if len(self.variations) > 7:
+                return x.name
+            # Sort by booster chance to get some sort of pseudorank.
+            elif 'boosterEffectChance1' in x.attributes:
+                return x.attributes['boosterEffectChance1'].value
+            # the "first" rank (Synth) doesn't have boosterEffectChance1. If we're not pulling back all boosters, return 0 for proper sorting
+            else:
+                return 0
+
         m = wx.Menu()
 
         # If on Windows we need to bind out events into the root menu, on other
@@ -67,8 +89,17 @@ class MetaSwap(ContextMenu):
 
         # Sort items by metalevel, and group within that metalevel
         items = list(self.variations)
-        items.sort(key=get_metalevel)
-        items.sort(key=get_metagroup)
+        print context
+        if "implantItem" in context:
+            # sort implants based on name
+            items.sort(key=lambda x: x.name)
+        elif "boosterItem" in context:
+            # boosters don't have meta or anything concrete that we can rank by. Go by chance to inflict side effect
+            items.sort(key=get_boosterrank)
+        else:
+            # sort by group and meta level
+            items.sort(key=get_metalevel)
+            items.sort(key=get_metagroup)
 
         group = None
         for item in items:
@@ -78,7 +109,7 @@ class MetaSwap(ContextMenu):
             else:
                 thisgroup = item.metaGroup.name
 
-            if thisgroup != group:
+            if thisgroup != group and context not in ("implantItem", "boosterItem"):
                 group = thisgroup
                 id = ContextMenu.nextID()
                 m.Append(id, u'─ %s ─' % group)
@@ -101,9 +132,56 @@ class MetaSwap(ContextMenu):
         fitID = self.mainFrame.getActiveFit()
         fit = sFit.getFit(fitID)
 
-        for mod in self.selection:
-            pos = fit.modules.index(mod)
-            sFit.changeModule(fitID, pos, item.ID)
+        for selected_item in self.selection:
+            if isinstance(selected_item, Module):
+                pos = fit.modules.index(selected_item)
+                sFit.changeModule(fitID, pos, item.ID)
+
+            elif isinstance(selected_item, Drone):
+                drone_count = None
+
+                for idx, drone_stack in enumerate(fit.drones):
+                    if drone_stack is selected_item:
+                        drone_count = drone_stack.amount
+                        sFit.removeDrone(fitID, idx, drone_count)
+                        break
+
+                if drone_count:
+                    sFit.addDrone(fitID, item.ID, drone_count)
+
+            elif isinstance(selected_item, Fighter):
+                fighter_count = None
+
+                for idx, fighter_stack in enumerate(fit.fighters):
+                    # Right now fighters always will have max stack size.
+                    # Including this for future improvement, so if adjustable
+                    # fighter stacks get added we're ready for it.
+                    if fighter_stack is selected_item:
+                        if fighter_stack.amount > 0:
+                            fighter_count = fighter_stack.amount
+                        elif fighter_stack.amount == -1:
+                            fighter_count = fighter_stack.amountActive
+                        else:
+                            fighter_count.amount = 0
+
+                        sFit.removeFighter(fitID, idx)
+                        break
+
+                sFit.addFighter(fitID, item.ID)
+
+            elif isinstance(selected_item, Booster):
+                for idx, booster_stack in enumerate(fit.boosters):
+                    if booster_stack is selected_item:
+                        sFit.removeBooster(fitID, idx)
+                        sFit.addBooster(fitID, item.ID)
+                        break
+
+            elif isinstance(selected_item, Implant):
+                for idx, implant_stack in enumerate(fit.implants):
+                    if implant_stack is selected_item:
+                        sFit.removeImplant(fitID, idx)
+                        sFit.addImplant(fitID, item.ID, False)
+                        break
 
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))