cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

tools: update MapPatcher.jar, add mapclean helper

Browse Source 
MapPatcher.jar can now take a user-defined tile line when conflicted.
Added a clean_map_git.sh file that will automatically clean maps
without needing a prepare_map.bat call beforehand. Needs to be run in
git bash, or have .sh associated with something that has git.
Fixed line endings in install.txt to show up right in notepad.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
This commit is contained in:
Mloc-Argent
2014-05-15 22:00:24 +01:00
parent ef5aaf0610
commit 6db1484a80
3 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
tools/mapmerge/MapPatcher.jar
View File

Binary file not shown.

9
tools/mapmerge/clean_map_git.sh Normal file
View File

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

34
tools/mapmerge/install.txt
View File

@@ -1,17 +1,17 @@
1. Install java(http://www.java.com/en/download/index.jsp) 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. 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 Committing
1. Before starting to edit the map, double-click "prepare_map.bat" in the tools/mapmerge/ directory. 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. 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. 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 Merging
The easiest way to do merging is to install the merge driver. For this, open -tg-station/.git/config in a text editor, and paste the following lines to the end of it: 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"] [merge "merge-dmm"]
name = mapmerge driver name = mapmerge driver
driver = ./tools/mapmerge/mapmerge.sh %O %A %B 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. 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.