diff --git a/nano/maptools/MapPatcher.jar b/nano/maptools/MapPatcher.jar deleted file mode 100644 index 5cbaad488c1..00000000000 Binary files a/nano/maptools/MapPatcher.jar and /dev/null differ diff --git a/nano/maptools/clean_map.bat b/nano/maptools/clean_map.bat deleted file mode 100644 index 82ed1829b4f..00000000000 --- a/nano/maptools/clean_map.bat +++ /dev/null @@ -1 +0,0 @@ -java -jar MapPatcher.jar -clean ../maps/tgstation2.dmm.backup ../maps/tgstation2.dmm ../maps/tgstation2.dmm \ No newline at end of file diff --git a/nano/maptools/mapmerge.sh b/nano/maptools/mapmerge.sh deleted file mode 100644 index bddb60100e0..00000000000 --- a/nano/maptools/mapmerge.sh +++ /dev/null @@ -1,9 +0,0 @@ -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 maptools/MapPatcher.jar -clean $1 $2 $2 - -exit 0 diff --git a/nano/maptools/new_clean.bat b/nano/maptools/new_clean.bat deleted file mode 100644 index 9d9ec108b5d..00000000000 --- a/nano/maptools/new_clean.bat +++ /dev/null @@ -1,96 +0,0 @@ -@setlocal enableextensions enabledelayedexpansion -@echo off - -set /a count=0 -for /f "tokens=*" %%A in ('dir /b /a-d "../maps/*.dmm"') do ( - set /a count+=1 - set num.!count!=%%A -) - -for /f "tokens=2* delims=.=" %%A in ('set num.') do echo %%A = %%B - -:choosemap -echo ... -set /p prompt="Which map # would you like to clean?: " || set prompt=_None - -if /i "%prompt%"=="exit" ( - goto :quitmaybe -) - -if "%prompt%"=="_None" ( - goto :prom_error -) else set mapnum=%prompt% - -for /f "tokens=2* delims=.=" %%A in ('set num.%mapnum%') do set map=%%B - -if "%map%"=="" ( - echo That's not a valid map, donklorde. - goto :choosemap -) - -if not exist "../maps/%map%.backup" ( - goto :bckup_error -) - -goto :printpath - -:prom_error -echo You didn't choose anything! -goto :choosemap - -:bckup_error -echo ... -echo WARNING: A .backup does not exist for %map% ! -echo ... -goto :choosemap - - -:printpath -echo ... -echo ============= -echo Map filepath (This should NOT be the .backup): -echo:../maps/%map% -echo ============= -goto :finalize - - -:finalize -echo ... -set /p finalize="Is this filepath correct?: " || set finalize=None -if "%finalize%"=="None" (goto :fin_error) -if /i "%finalize%"=="y" (goto :java) -if /i "%finalize%"=="yes" (goto :java) -if /i "%finalize%"=="n" (goto :quitmaybe) -if /i "%finalize%"=="no" (goto :quitmaybe) -goto :fin_error - -:fin_error -echo ... -echo That wasn't a valid response you donk! -echo Valid responses: y, n, yes, no -goto :finalize - -:java -echo Starting MapPatcher... -java -jar MapPatcher.jar -clean ../maps/%map%.backup ../maps/%map% ../maps/%map% -goto :exit - -:quitmaybe -echo ... -set /p exitmaybe="Exit the program?: " || set exitmaybe=_NothingChosen -if "%exitmaybe%"=="_NothingChosen" (goto :qm_error) -if /i "%exitmaybe%"=="y" (goto :exit) -if /i "%exitmaybe%"=="yes" (goto :exit) -if /i "%exitmaybe%"=="n" (goto :choosemap) -if /i "%exitmaybe%"=="no" (goto :choosemap) -goto :qm_error - -:qm_error -echo ... -echo That wasn't a valid response, or you didn't choose anything! -echo Valid responses: y, n, yes, no -goto :quitmaybe - -:exit -pause -exit \ No newline at end of file diff --git a/nano/maptools/new_prepare.bat b/nano/maptools/new_prepare.bat deleted file mode 100644 index ddcdfabe1cb..00000000000 --- a/nano/maptools/new_prepare.bat +++ /dev/null @@ -1,73 +0,0 @@ -@setlocal enableextensions enabledelayedexpansion -@echo off - -set /a count=0 -for /f "tokens=*" %%A in ('dir /b /a-d "../maps/*.dmm"') do ( - set /a count+=1 - set num.!count!=%%A -) - -for /f "tokens=2* delims=.=" %%A in ('set num.') do echo %%A = %%B - -:choosemap -echo ... -set /p prompt="Which map # would you like to back up?: " || set prompt=_None - -if /i "%prompt%"=="exit" ( - goto :quitmaybe -) - -if "%prompt%"=="_None" ( - goto :prom_error -) else set mapnum=%prompt% - -for /f "tokens=2* delims=.=" %%A in ('set num.%mapnum%') do set map=%%B - -if "%map%"=="" ( - echo That's not a valid map, donklorde. - goto :choosemap -) - -goto :printpath - -:prom_error -echo You didn't choose anything! -goto :choosemap - -:printpath -echo ... -echo ============= -echo Backing up: -echo:../maps/%map% -echo Into: -echo:../maps/%map%.backup -echo ============= -goto :copymap - -:copymap -echo Copying... -cd ../maps -copy %map% %map%.backup -echo Done. -goto :exit - -:quitmaybe -echo ... -set /p exitmaybe="Exit the program?: " || set exitmaybe=_NothingChosen -if "%exitmaybe%"=="_NothingChosen" (goto :qm_error) -if /i "%exitmaybe%"=="y" (goto :exit) -if /i "%exitmaybe%"=="yes" (goto :exit) -if /i "%exitmaybe%"=="n" (goto :choosemap) -if /i "%exitmaybe%"=="no" (goto :choosemap) -goto :qm_error - -:qm_error -echo ... -echo That wasn't a valid response, or you didn't choose anything! -echo Valid responses: y, n, yes, no -goto :quitmaybe - -:exit -pause -exit - diff --git a/nano/maptools/prepare_map.bat b/nano/maptools/prepare_map.bat deleted file mode 100644 index 98c5c884b01..00000000000 --- a/nano/maptools/prepare_map.bat +++ /dev/null @@ -1,2 +0,0 @@ -cd ../maps -copy tgstation2.dmm tgstation2.dmm.backup