Resolve Wrye-Code-Collection/Wrye-Flash-FalloutNV#3 for FO3

Author: Sharlikran

Mopy/bash/basher.py

@@ -1483,12 +1483,18 @@ def OnDropIndexes(self, indexes, newPos):
         # Make sure we don't go out of bounds
         target = indexes[0]
         thisFile = self.items[target]
+        def isEsp(file):
+            if thisFile in bosh.modInfos:
+                return bosh.modInfos[thisFile].isEsp()
+            else:
+                return None
+        thisFileIsEsp = isEsp(thisFile)
         while True:
             if target < 0: break
             if target + howMany >= len(self.items) - inc: break
             if target == newPos: break
             swapFile = self.items[target]
-            if thisFile.cext != swapFile.cext: break
+            if thisFileIsEsp != isEsp(swapFile): break
             target += inc
         if inc == 1 and target + howMany <= indexes[-1]: return
         if inc == -1 and target >= indexes[0]: return
@@ -1704,7 +1710,7 @@ def SortItems(self,col=None,reverse=-2):
         #--ESMs First?
         settings['bash.mods.esmsFirst'] = self.esmsFirst
         if self.esmsFirst or col == 'Load Order':
-            self.items.sort(key = lambda x: x.cext)
+            self.items.sort(key = lambda x: (x in bosh.modInfos) and bosh.modInfos[x].isEsp())
         #--Selected First?
         settings['bash.mods.selectedFirst'] = self.selectedFirst
         if self.selectedFirst:

Mopy/bash/bosh.py

@@ -11304,9 +11304,10 @@ def getOrdered(self,modNames,asTuple=True):
         """Sort list of mod names into their load order."""
         data = self.data
         modNames = list(modNames) #--Don't do an in-place sort.
-        modNames.sort()
+        #modNames.sort()
         modNames.sort(key=lambda a: (a in data) and data[a].mtime) #--Sort on modified
-        modNames.sort(key=lambda a: a.cs[-1]) #--Sort on esm/esp
+        #modNames.sort(key=lambda a: a.cs[-1]) #--Sort on esm/esp
+        modNames.sort(key=lambda a: (a in data) and data[a].isEsp())
         if asTuple: return tuple(modNames)
         else: return modNames