Change order of market group sorting for ammo picker

gui/builtinContextMenus/graphFitAmmoPicker.py

@@ -102,10 +102,10 @@ class AmmoPicker(AuxiliaryFrame):
         for charges, itemCounts in modsPrelim.items():
             modsFinal.append((
                 # Sort items within group
-                sorted(itemCounts.items(), key=lambda i: sMkt.itemSort(i[0]), reverse=True),
+                sorted(itemCounts.items(), key=lambda i: sMkt.itemSort(i[0], reverseMktGrp=True), reverse=True),
                 charges))
         # Sort item groups
-        modsFinal.sort(key=lambda i: sMkt.itemSort(i[0][0][0]), reverse=True)
+        modsFinal.sort(key=lambda i: sMkt.itemSort(i[0][0][0], reverseMktGrp=True), reverse=True)
         return modsFinal
 
     def getDrones(self, fit):

service/market.py

@@ -842,13 +842,15 @@ class Market:
             recentlyUsedModules.pop(-1)
         recentlyUsedModules.insert(0, itemID)
 
-    def itemSort(self, item):
+    def itemSort(self, item, reverseMktGrp=False):
         catname = self.getCategoryByItem(item).name
         try:
             mktgrpid = self.getMarketGroupByItem(item).ID
         except AttributeError:
             mktgrpid = -1
             pyfalog.warning("unable to find market group for {}".format(item.name))
+        if reverseMktGrp:
+            mktgrpid = -mktgrpid
         parentname = self.getParentItemByItem(item).name
         # Get position of market group
         metagrpid = self.getMetaGroupIdByItem(item)