Address Cell Patcher Coordinate Reversal and Improper Comparison

Author: Sharlikran

Mopy/bash/patcher/patchers/importers.py

@@ -289,11 +289,12 @@ def importCellBlockData(cellBlock):
             if not cellBlock.cell.flags1.ignored:
                 fid = cellBlock.cell.fid
                 for attr in attrs:
-                    tempCellData[fid][attr] = cellBlock.cell.__getattribute__(
-                        attr)
+                    tempCellData[fid][attr] = (cellBlock.cell.__getattribute__(
+		        attr))
                 for flg_ in flgs_:
                     tempCellData[fid + ('flags',)][
-                        flg_] = cellBlock.cell.flags.__getattr__(flg_)
+                        flg_] = (cellBlock.cell.flags.__getattr__(flg_))
+
         def checkMasterCellBlockData(cellBlock):
             """
             Add attribute values from record(s) in master file(s).
@@ -313,7 +314,8 @@ def checkMasterCellBlockData(cellBlock):
                     master_flag = cellBlock.cell.flags.__getattr__(flg_)
                     if tempCellData[fid + ('flags',)][flg_] != master_flag:
                         cellData[fid + ('flags',)][flg_] = \
-                            tempCellData[fid + ('flags',)][flg_]
+                            (tempCellData[fid + ('flags',)][flg_])
+
         loadFactory = LoadFactory(False,MreRecord.type_class['CELL'],
                                         MreRecord.type_class['WRLD'])
         progress.setFull(len(self.srcs))
@@ -336,6 +338,7 @@ def checkMasterCellBlockData(cellBlock):
             # print bashTags
             tags = bashTags & set(self.recAttrs)
             if not tags: continue
+            # adds tuples together, then takes the set
             attrs = set(chain.from_iterable(
                 self.recAttrs[bashKey] for bashKey in tags))
             flgs_ = tuple(self.recFlags[bashKey] for bashKey in tags if
@@ -403,6 +406,18 @@ def scanModFile(self, modFile, progress): # scanModFile0
 
     def buildPatch(self,log,progress): # buildPatch0
         """Adds merged lists to patchfile."""
+
+        def regions_differ(patch_value, value_):
+            """
+            Required for regions because comparing using `==` or `!=`
+            results in false positives.
+            """
+            sorted_patch_value = sorted(patch_value)
+            sorted_value = sorted(value_)
+            regions_compare = set(sorted_value).difference(
+                sorted_patch_value)
+            return (bool(regions_compare))
+
         def handlePatchCellBlock(patchCellBlock):
             """
             This function checks if an attribute or flag in CellData has
@@ -415,24 +430,24 @@ def handlePatchCellBlock(patchCellBlock):
             Modified cell Blocks are kept, the other are discarded.
             """
             modified=False
-            for attr,value in cellData[patchCellBlock.cell.fid].iteritems():
+            for attr, value in cellData[patchCellBlock.cell.fid].viewitems():
                 if attr == 'regions':
-                    if set(value).difference(set(patchCellBlock.cell.__getattribute__(attr))):
+                    if regions_differ(patchCellBlock.cell.__getattribute__(attr), value):
                         patchCellBlock.cell.__setattr__(attr, value)
                         modified = True
-                else:
-                    if patchCellBlock.cell.__getattribute__(attr) != value:
-                        patchCellBlock.cell.__setattr__(attr, value)
-                        modified=True
+                elif patchCellBlock.cell.__getattribute__(attr) != value:
+                    patchCellBlock.cell.__setattr__(attr, value)
+                    modified = True
             for flag, value in cellData[
-                        patchCellBlock.cell.fid + ('flags',)].iteritems():
+                        patchCellBlock.cell.fid + ('flags',)].viewitems():
                 if patchCellBlock.cell.flags.__getattr__(flag) != value:
                     patchCellBlock.cell.flags.__setattr__(flag, value)
                     modified=True
             if modified:
                 patchCellBlock.cell.setChanged()
                 keep(patchCellBlock.cell.fid)
             return modified
+
         if not self.isActive: return
         keep = self.patchFile.getKeeper()
         cellData, count = self.cellData, Counter()
@@ -442,10 +457,10 @@ def handlePatchCellBlock(patchCellBlock):
         for worldBlock in self.patchFile.WRLD.worldBlocks:
             keepWorld = False
             for cellBlock in worldBlock.cellBlocks:
-                if cellBlock.cell.fid in cellData and handlePatchCellBlock(
-                        cellBlock):
-                    count[cellBlock.cell.fid[0]] += 1
-                    keepWorld = True
+                if cellBlock.cell.fid in cellData:
+                    if handlePatchCellBlock(cellBlock):
+                        count[cellBlock.cell.fid[0]] += 1
+                        keepWorld = True
             if worldBlock.worldCellBlock:
                 if worldBlock.worldCellBlock.cell.fid in cellData:
                     if handlePatchCellBlock(worldBlock.worldCellBlock):

Mopy/bash/record_groups.py

@@ -482,11 +482,12 @@ def getBsb(self):
             baseFid = cell.fid & 0x00FFFFFF
             return baseFid%10, baseFid%100//10
         #--Exterior cell
+        # Grup Coord are reversed for Exteriors
         else:
-            x,y = cell.posY,cell.posX
+            x,y = cell.posX,cell.posY
             if x is None: x = 0
             if y is None: y = 0
-            return (x//32, y//32), (x//8, y//8)
+            return (y//32, x//32), (y//8, x//8)
 
     def dump(self,out):
         """Dumps group header and then records."""