Introduce special cases for cargo swapping when dealing with abyssal modules (#1649)

eos/db/gamedata/queries.py

@@ -391,6 +391,10 @@ def directAttributeRequest(itemIDs, attrIDs):
     return result
 
 
+def getAbyssalTypes():
+    return set([r.resultingTypeID for r in gamedata_session.query(DynamicItem.resultingTypeID).distinct()])
+
+
 def getRequiredFor(itemID, attrMapping):
     Attribute1 = aliased(Attribute)
     Attribute2 = aliased(Attribute)

eos/gamedata.py

@@ -208,6 +208,8 @@ class Item(EqBase):
 
     MOVE_ATTR_INFO = None
 
+    ABYSSAL_TYPES = None
+
     @classmethod
     def getMoveAttrInfo(cls):
         info = getattr(cls, "MOVE_ATTR_INFO", None)
@@ -463,6 +465,17 @@ class Item(EqBase):
 
         return self.__price
 
+    @property
+    def isAbyssal(self):
+        if Item.ABYSSAL_TYPES is None:
+            Item.getAbyssalYypes()
+
+        return self.ID in Item.ABYSSAL_TYPES
+
+    @classmethod
+    def getAbyssalYypes(cls):
+        cls.ABYSSAL_TYPES = eos.db.getAbyssalTypes()
+
     def __repr__(self):
         return "Item(ID={}, name={}) at {}".format(
                 self.ID, self.name, hex(id(self))

gui/builtinAdditionPanes/cargoView.py

@@ -118,13 +118,22 @@ class CargoView(d.Display):
         # Gather module information to get position
         module = fit.modules[modIdx]
 
+        if module.item.isAbyssal:
+            dlg = wx.MessageDialog(self,
+               "Moving this Abyssal module to the cargo will convert it to the base module. Do you wish to proceed?",
+               "Confirm", wx.YES_NO | wx.ICON_QUESTION)
+            result = dlg.ShowModal() == wx.ID_YES
+
+            if not result:
+                return
+
         if dstRow != -1:  # we're swapping with cargo
             if mstate.cmdDown:  # if copying, append to cargo
-                sFit.addCargo(self.mainFrame.getActiveFit(), module.item.ID)
+                sFit.addCargo(self.mainFrame.getActiveFit(), module.item.ID if not module.item.isAbyssal else module.baseItemID)
             else:  # else, move / swap
                 sFit.moveCargoToModule(self.mainFrame.getActiveFit(), module.position, dstRow)
         else:  # dragging to blank spot, append
-            sFit.addCargo(self.mainFrame.getActiveFit(), module.item.ID)
+            sFit.addCargo(self.mainFrame.getActiveFit(), module.item.ID if not module.item.isAbyssal else module.baseItemID)
 
             if not mstate.cmdDown:  # if not copying, remove module
                 sFit.removeModule(self.mainFrame.getActiveFit(), module.position)

service/fit.py

@@ -705,11 +705,12 @@ class Fit(object):
                 cargo.amount -= 1
 
         if not module.isEmpty:  # if module is placeholder, we don't want to convert/add it
-            for x in fit.cargo.find(module.item):
+            moduleItem = module.item if not module.item.isAbyssal else module.baseItem
+            for x in fit.cargo.find(moduleItem ):
                 x.amount += 1
                 break
             else:
-                moduleP = es_Cargo(module.item)
+                moduleP = es_Cargo(moduleItem )
                 moduleP.amount = 1
                 fit.cargo.insert(cargoIdx, moduleP)