From 9cf5266e10ce0f396d69ea30b839703256c7feea Mon Sep 17 00:00:00 2001 From: cib Date: Sun, 11 Nov 2012 13:04:29 +0100 Subject: [PATCH] Moved map tools into maptools directory. Also added .bat files to make map cleaning easier. --- MapPatcher.jar => maptools/MapPatcher.jar | Bin maptools/clean_map.bat | 1 + mapmerge.sh => maptools/mapmerge.sh | 4 ++-- maptools/prepare_map.bat | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) rename MapPatcher.jar => maptools/MapPatcher.jar (100%) create mode 100644 maptools/clean_map.bat rename mapmerge.sh => maptools/mapmerge.sh (55%) create mode 100644 maptools/prepare_map.bat diff --git a/MapPatcher.jar b/maptools/MapPatcher.jar similarity index 100% rename from MapPatcher.jar rename to maptools/MapPatcher.jar diff --git a/maptools/clean_map.bat b/maptools/clean_map.bat new file mode 100644 index 00000000000..61272dee9ae --- /dev/null +++ b/maptools/clean_map.bat @@ -0,0 +1 @@ +java -jar MapPatcher.jar ../maps/tgstation.2.0.9.1.dmm.backup ../maps/tgstation.2.0.9.1.dmm ../maps/tgstation.2.0.9.1.dmm diff --git a/mapmerge.sh b/maptools/mapmerge.sh similarity index 55% rename from mapmerge.sh rename to maptools/mapmerge.sh index f457e02ab74..bddb60100e0 100755 --- a/mapmerge.sh +++ b/maptools/mapmerge.sh @@ -1,9 +1,9 @@ -java -jar MapPatcher.jar -merge $1 $2 $3 $2 +java -jar maptools/MapPatcher.jar -merge $1 $2 $3 $2 if [ "$?" -gt 0 ] then echo "Unable to automatically resolve map conflicts, please merge manually." exit 1 fi -java -jar MapPatcher.jar -clean $1 $2 $2 +java -jar maptools/MapPatcher.jar -clean $1 $2 $2 exit 0 diff --git a/maptools/prepare_map.bat b/maptools/prepare_map.bat new file mode 100644 index 00000000000..ec567c6e245 --- /dev/null +++ b/maptools/prepare_map.bat @@ -0,0 +1 @@ +cp ../maps/tgstation.2.0.9.1.dmm ../maps/tgstation.2.0.9.1.dmm.backup