cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 02:02:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updates tools to include mapmerge hooks and merge drivers, plus more (#18034)

Browse Source 
* bumps tools to modern versions, adds DMM merge driver hooks for automatic map merging

* mapping guidelines update

* Update .github/CONTRIBUTING.md

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* aa review

* these somehow got ignored? force adding

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
This commit is contained in:
S34N
2022-06-21 23:53:19 +01:00
committed by GitHub
parent 727b299d33
commit 4f5c3376e3
53 changed files with 1089 additions and 2465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/mapmerge2/mapmerge.py
View File

@@ -1,8 +1,8 @@
#!/usr/bin/env python3
import frontend
import shutil
from dmm import *
from collections import defaultdict
from . import frontend
from .dmm import *
def merge_map(new_map, old_map, delete_unused=False):
if new_map.key_length != old_map.key_length:
@@ -66,7 +66,7 @@ def merge_map(new_map, old_map, delete_unused=False):
# step two: delete unused keys
if unused_keys:
print(f"Notice: Trimming {len(unused_keys)} unused dictionary keys.")
#print(f"Notice: Trimming {len(unused_keys)} unused dictionary keys.")
for key in unused_keys:
del merged.dictionary[key]