New version of maptools by mloc

maptools/1prepare_map.bat

@@ -0,0 +1,6 @@
+set MAPFILE=tgstation2.dmm
+
+cd ../../maps
+copy %MAPFILE% %MAPFILE%.backup
+
+pause

maptools/2clean_map.bat

@@ -0,0 +1,5 @@
+set MAPFILE=tgstation2.dmm
+
+java -jar MapPatcher.jar -clean ../../maps/%MAPFILE%.backup ../../maps/%MAPFILE% ../../maps/%MAPFILE%
+
+pause

maptools/clean_map-vg.bat

@@ -0,0 +1,2 @@
+call java -jar MapPatcher.jar -clean ../maps/vgstation.dmm.backup ../maps/vgstation.dmm ../maps/vgstation.dmm
+pause

maptools/clean_map.bat

@@ -1 +0,0 @@
-java -jar MapPatcher.jar -clean ../maps/tgstation.2.1.0.0.1.dmm.backup ../maps/tgstation.2.1.0.0.1.dmm ../maps/tgstation.2.1.0.0.1.dmm

maptools/clean_map_git.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+#MAPROOT='../../_maps/map_files/'
+MAPROOT='../maps/'
+MAPFILE=$MAPROOT'tgstation.2.1.0.0.1.dmm'
+
+git show HEAD:$MAPFILE > tmp.dmm
+java -jar MapPatcher.jar -clean tmp.dmm $MAPFILE $MAPFILE
+#dos2unix -U '../../_maps/map_files/'$MAPFILE
+rm tmp.dmm
+

maptools/install.txt

@@ -0,0 +1,17 @@
+1. Install java(http://www.java.com/en/download/index.jsp)
+2. Make sure java is in your PATH. To test this, open git bash, and type "java". If it says unknown command, you need to add JAVA/bin to your PATH variable (A guide for this can be found at https://www.java.com/en/download/help/path.xml ).
+
+Committing
+1. Before starting to edit the map, double-click "prepare_map.bat" in the tools/mapmerge/ directory.
+2. After finishing your edit, and before your commit, double-click "clean_map.bat" in the tools/mapmerge/ directory.
+
+This will make sure in the new version of your map, no paths are needlessly changed, thus instead of 8000 lines changed you'll get 50 lines changed. This not only reduces size of your commit, it also makes it possible to get an overview of your map changes on the "files changed" page in your pull request.
+
+Merging
+The easiest way to do merging is to install the merge driver. For this, open `Baystation12/.git/config` in a text editor, and paste the following lines to the end of it:
+
+[merge "merge-dmm"]
+	name = mapmerge driver
+	driver = ./tools/mapmerge/mapmerge.sh %O %A %B
+
+After this, merging maps should happen automagically unless there are conflicts(a tile that both you and someone else changed). If there are conflicts, you will unfortunately still be stuck with opening both versions in a map editor, and manually resolving the issues.

maptools/mapmerge.sh

@@ -1,9 +1,9 @@
-java -jar maptools/MapPatcher.jar -merge $1 $2 $3 $2
+java -jar tools/mapmerge/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 maptools/MapPatcher.jar -clean $1 $2 $2
+java -jar tools/mapmerge/MapPatcher.jar -clean $1 $2 $2
 
 exit 0