mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
9e91d3816e
Fixes a major mapping error introduced in #39816 and adds handling to the map merger to prevent it from happening again. Keys need to be ordered movables, then turf(s), then area, otherwise our map reader acts weird. In-game this manifests as floor being placed in the dirt's underlays, such that after floor is crowbarred to plating the floor is still visually present (this is how I noticed the problem). Fixes #39888. Some map files still have stacked turfs. Our map reader supports this but it tends to cause other problems (e.g. atmos) so I'll try to look at those in the future. X=$(find _maps -name '*.dmm'); tools/hooks/python.sh -m convert $X
58 lines
2.0 KiB
Python
58 lines
2.0 KiB
Python
#!/usr/bin/env python3
|
|
import os
|
|
import pygit2
|
|
import dmm
|
|
from mapmerge import merge_map
|
|
|
|
def main(repo):
|
|
if repo.index.conflicts:
|
|
print("You need to resolve merge conflicts first.")
|
|
return 1
|
|
|
|
try:
|
|
repo.lookup_reference('MERGE_HEAD')
|
|
print("Not running mapmerge for merge commit.")
|
|
return 0
|
|
except KeyError:
|
|
pass
|
|
|
|
changed = 0
|
|
for path, status in repo.status().items():
|
|
if path.endswith(".dmm") and (status & (pygit2.GIT_STATUS_INDEX_MODIFIED | pygit2.GIT_STATUS_INDEX_NEW)):
|
|
# read the index
|
|
index_entry = repo.index[path]
|
|
index_map = dmm.DMM.from_bytes(repo[index_entry.id].read_raw())
|
|
|
|
try:
|
|
head_blob = repo[repo[repo.head.target].tree[path].id]
|
|
except KeyError:
|
|
# New map, no entry in HEAD
|
|
print(f"Converting new map: {path}", flush=True)
|
|
assert (status & pygit2.GIT_STATUS_INDEX_NEW)
|
|
merged_map = index_map
|
|
else:
|
|
# Entry in HEAD, merge the index over it
|
|
print(f"Merging map: {path}", flush=True)
|
|
assert not (status & pygit2.GIT_STATUS_INDEX_NEW)
|
|
head_map = dmm.DMM.from_bytes(head_blob.read_raw())
|
|
merged_map = merge_map(index_map, head_map)
|
|
|
|
# write to the index
|
|
blob_id = repo.create_blob(merged_map.to_bytes())
|
|
repo.index.add(pygit2.IndexEntry(path, blob_id, index_entry.mode))
|
|
changed += 1
|
|
|
|
# write to the working directory if that's clean
|
|
if status & (pygit2.GIT_STATUS_WT_DELETED | pygit2.GIT_STATUS_WT_MODIFIED):
|
|
print(f"Warning: {path} has unindexed changes, not overwriting them")
|
|
else:
|
|
merged_map.to_file(os.path.join(repo.workdir, path))
|
|
|
|
if changed:
|
|
repo.index.write()
|
|
print(f"Merged {changed} maps.")
|
|
return 0
|
|
|
|
if __name__ == '__main__':
|
|
exit(main(pygit2.Repository(pygit2.discover_repository(os.getcwd()))))
|