mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-14 20:22:05 +00:00
779f8a0733
Okay, this update is kinda big. Summary: - Trimmed unused keys in Exodus telecomms - Adds script that will run mapmerge2 on Travis to check branch for unused keys or key overflow, etc. - Fixes matching indentation style in tag-matcher and converts it to use Python 3.6 - Converts mapmerge2 to be used by Python 3.4 and above. Instead of 3.6 - Removes Windows 1252 characters from Communication-blackout.dm that were not able to be seen in UTF-8 format. Note: the last commit will fail because currently main level is broken Example of no map issues:  Example of issues: 
95 lines
3.6 KiB
Python
95 lines
3.6 KiB
Python
#!/usr/bin/env python3
|
|
import frontend
|
|
import shutil
|
|
from dmm import *
|
|
from collections import defaultdict
|
|
|
|
def merge_map(new_map, old_map, delete_unused=False):
|
|
if new_map.key_length != old_map.key_length:
|
|
print("Warning: Key lengths differ, taking new map")
|
|
print(" Old: {}".format(old_map.key_length))
|
|
print(" New: {}".format(new_map.key_length))
|
|
return new_map
|
|
|
|
if new_map.size != old_map.size:
|
|
print("Warning: Map dimensions differ, taking new map")
|
|
print(" Old: {}".format(old_map.size))
|
|
print(" New: {}".format(new_map.size))
|
|
return new_map
|
|
|
|
key_length, size = old_map.key_length, old_map.size
|
|
merged = DMM(key_length, size)
|
|
merged.dictionary = old_map.dictionary.copy()
|
|
|
|
known_keys = dict() # mapping fron 'new' key to 'merged' key
|
|
unused_keys = set(old_map.dictionary.keys()) # keys going unused
|
|
|
|
# step one: parse the new version, compare it to the old version, merge both
|
|
for z, y, x in new_map.coords_zyx:
|
|
new_key = new_map.grid[x, y, z]
|
|
# if this key has been processed before, it can immediately be merged
|
|
try:
|
|
merged.grid[x, y, z] = known_keys[new_key]
|
|
continue
|
|
except KeyError:
|
|
pass
|
|
|
|
def select_key(assigned):
|
|
merged.grid[x, y, z] = known_keys[new_key] = assigned
|
|
|
|
old_key = old_map.grid[x, y, z]
|
|
old_tile = old_map.dictionary[old_key]
|
|
new_tile = new_map.dictionary[new_key]
|
|
|
|
# this tile is the exact same as before, so the old key is used
|
|
if new_tile == old_tile:
|
|
select_key(old_key)
|
|
unused_keys.remove(old_key)
|
|
|
|
# the tile is different here, but if it exists in the merged dictionary, that key can be used
|
|
elif new_tile in merged.dictionary.inv:
|
|
newold_key = merged.dictionary.inv[new_tile]
|
|
select_key(newold_key)
|
|
unused_keys.remove(newold_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
|
|
elif old_tile not in new_map.dictionary.inv and old_key in unused_keys:
|
|
merged.dictionary[old_key] = new_tile
|
|
select_key(old_key)
|
|
unused_keys.remove(old_key)
|
|
|
|
# all other options ruled out, a brand new key is generated for the brand new tile
|
|
else:
|
|
fresh_key = merged.generate_new_key()
|
|
merged.dictionary[fresh_key] = new_tile
|
|
select_key(fresh_key)
|
|
|
|
# step two: delete unused keys
|
|
if unused_keys:
|
|
print("Notice: Trimming {} unused dictionary keys.".format(len(unused_keys)))
|
|
for key in unused_keys:
|
|
del merged.dictionary[key]
|
|
|
|
# sanity check: that the merged map equals the new map
|
|
for z, y, x in new_map.coords_zyx:
|
|
new_tile = new_map.dictionary[new_map.grid[x, y, z]]
|
|
merged_tile = merged.dictionary[merged.grid[x, y, z]]
|
|
if new_tile != merged_tile:
|
|
print("Error: the map has been mangled! This is a mapmerge bug!")
|
|
print("At {},{},{}.".format(x, y, z))
|
|
print("Should be {}".format(new_tile))
|
|
print("Instead is {}".format(merged_tile))
|
|
raise RuntimeError()
|
|
|
|
return merged
|
|
|
|
def main(settings):
|
|
for fname in frontend.process(settings, "merge", backup=True):
|
|
shutil.copyfile(fname, fname + ".before")
|
|
old_map = DMM.from_file(fname + ".backup")
|
|
new_map = DMM.from_file(fname)
|
|
merge_map(new_map, old_map).to_file(fname, settings.tgm)
|
|
|
|
if __name__ == '__main__':
|
|
main(frontend.read_settings())
|