Merge pull request #11721 from Baystation12/master

Dev-freeze

tools/mapmerge/1prepare_map.bat

@@ -1,8 +1,7 @@
-SET z_levels=6
 cd ../../maps
 
-FOR /L %%i IN (1,1,%z_levels%) DO (
-  copy exodus-%%i.dmm exodus-%%i.dmm.backup
+FOR %%f IN (*.dmm) DO (
+  copy %%f %%f.backup
 )
 
 pause

tools/mapmerge/2clean_map.bat

@@ -1,8 +1,8 @@
 SET z_levels=6
 cd 
 
-FOR /L %%i IN (1,1,%z_levels%) DO (
-  java -jar MapPatcher.jar -clean ../../maps/exodus-%%i.dmm.backup ../../maps/exodus-%%i.dmm ../../maps/exodus-%%i.dmm
+FOR %%f IN (../../maps/*.dmm) DO (
+  java -jar MapPatcher.jar -clean ../../maps/%%f.backup ../../maps/%%f ../../maps/%%f
 )
 
-pause
+pause

tools/mapmerge/clean_map_git.sh

@@ -1,10 +1,9 @@
-#!/bin/bash
+#!/bin/sh
 
-for i in {1..6}
+for MAPFILE in ../../maps/*.dmm
 do
-	MAPFILE="exodus-$i.dmm"
-
-	git show HEAD:maps/$MAPFILE > tmp.dmm
-	java -jar MapPatcher.jar -clean tmp.dmm '../../maps/'$MAPFILE '../../maps/'$MAPFILE
+	MAPNAME=$(basename $MAPFILE)
+	git show HEAD:maps/$MAPNAME > tmp.dmm
+	java -jar MapPatcher.jar -clean tmp.dmm $MAPFILE $MAPFILE
 	rm tmp.dmm
 done