Another fix for map merging

NiceneNerd · Oct 29, 2019 · a156b41 · a156b41
1 parent d33eb65
commit a156b41
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/bcml/data/version.txt b/bcml/data/version.txt
@@ -1 +1 @@
-version='2.4.6'
+version='2.4.8'
diff --git a/bcml/mubin.py b/bcml/mubin.py
@@ -283,15 +283,16 @@ def merge_map(map_pair: tuple, rstb_calc: rstb.SizeCalculator, no_del: bool = Fa
         try:
             new_map['Objs'][stock_hashes.index(hash_id)] = deepcopy(actor)
         except ValueError:
-            new_map['Objs'].append(actor)
+            changes['add'].append(actor)
     stock_links = []
     if map_unit.type == 'Static' and changes['del']:
         for actor in new_map['Objs']:
             if 'LinksToObj' in actor:
                 stock_links.extend([link['DestUnitHashId']
                                     for link in actor['LinksToObj']])
     if not no_del:
-        for map_del in changes['del']:
+        for map_del in sorted(changes['del'], key=lambda change: stock_hashes.index(change) \
+                              if change in stock_hashes else -1, reverse=True):
             if map_del in stock_hashes and map_del not in stock_links:
                 try:
                     new_map['Objs'].pop(stock_hashes.index(map_del))

diff --git a/installer.cfg b/installer.cfg
@@ -1,6 +1,6 @@
 [Application]
 name=BCML
-version=2.4.6
+version=2.4.8
 entry_point=bcml.__init__:main
 icon=bcml/data/bcml.ico
 

diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
 
 setup(
     name='bcml',
-    version='2.4.6',
+    version='2.4.8',
     author='NiceneNerd',
     author_email='[email protected]',
     description='A mod manager for The Legend of Zelda: Breath of the Wild on Cemu',