cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 10:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24289 from xxalpha/mapmerge17

Browse Source 
[map merger] Added try catch block to handle duplicate keys.
This commit is contained in:
oranges
2017-02-21 09:48:55 +13:00
committed by GitHub
parent 9609a09a08 33973ae2fa
commit f06f287859
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/mapmerge/map_helpers.py
View File

@@ -74,7 +74,10 @@ def merge_map(newfile, backupfile, tgm):
if new_tile == old_tile: #this tile is the exact same as before, so the old key is used if new_tile == old_tile: #this tile is the exact same as before, so the old key is used
merged_grid[x,y] = old_key merged_grid[x,y] = old_key
known_keys[new_key] = old_key known_keys[new_key] = old_key
try:
unused_keys.remove(old_key) unused_keys.remove(old_key)
except ValueError as ve_exception:
print("NOTICE: Correcting duplicate dictionary entry. ({})".format(new_key))
continue continue
#the tile is different here, but if it exists in the old dictionary, its old key can be used #the tile is different here, but if it exists in the old dictionary, its old key can be used
@@ -84,7 +87,7 @@ def merge_map(newfile, backupfile, tgm):
known_keys[new_key] = newold_key known_keys[new_key] = newold_key
try: try:
unused_keys.remove(newold_key) unused_keys.remove(newold_key)
except ValueError: except ValueError as ve_exception:
print("NOTICE: Correcting duplicate dictionary entry. ({})".format(new_key)) print("NOTICE: Correcting duplicate dictionary entry. ({})".format(new_key))
#the tile is brand new and it needs a new key, but if the old key isn't being used any longer it can be used instead #the tile is brand new and it needs a new key, but if the old key isn't being used any longer it can be used instead