cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes mapmerge (#1296)

Browse Source 
* Fixes mapmerge

* Update mapmerger.py

* Delete mapmerger.py.rej
This commit is contained in:
CitadelStationBot
2017-06-28 01:43:26 -05:00
committed by Poojawa
parent f3ec10704c
commit 92da94ca2a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/mapmerge/mapmerger.py
View File

@@ -4,7 +4,7 @@ import shutil
#main("../../_maps/")
def main(map_folder, tgm=0):
valid_indices = map_helpers.prompt_maps(map_folder, "merge", tgm)
maps = map_helpers.prompt_maps(map_folder, "merge", tgm)
print("\nMerging these maps:")
for i in maps.indices:
@@ -15,8 +15,8 @@ def main(map_folder, tgm=0):
print("\nAborted map merge.")
sys.exit()
else:
for i in valid_indices:
path_str = str(list_of_files[i])
for i in maps.indices:
path_str = str(maps.files[i])
shutil.copyfile(path_str, path_str + ".before")
path_str_pretty = path_str[len(map_folder):]
try: