cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update help text, guard against illegal values

Browse Source
This commit is contained in:
GinjaNinja32
2014-11-30 20:15:43 +00:00
parent 9018892947
commit b7032cafca
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
tools/dmitool/dmitool.jar
View File

Binary file not shown.

18
tools/dmitool/src/main/java/dmitool/Main.java
View File

@@ -33,9 +33,12 @@ public class Main {
"\tmerge [file1] and [file2]'s changes from a common ancestor [base], saving the result in [out]\n" + "\tmerge [file1] and [file2]'s changes from a common ancestor [base], saving the result in [out]\n" +
"\tconflicts will be placed in [out].conflict.dmi\n" + "\tconflicts will be placed in [out].conflict.dmi\n" +
"extract [file] [state] {direction} {frame} [out]\n"+ "extract [file] [state] [out] {args}\n"+
"\textract [state] from [file] in bitmap format to [out]; {direction} and {frame} are separately mandatory if [state] has more than one of them\n" + "\textract [state] from [file] in PNG format to [out]\n" +
"\t{direction} can be 0-7 or S, N, E, W, SE, SW, NE, NW (non-case-sensitive)\n" + "\targs specify direction and frame; input 'f' followed by a frame specifier, and/or 'd' followed by a direction specifier\n" +
"\tframe specifier can be a single number or number-number for a range\n" +
"\tdirection specifier can be a single direction, or direction-direction\n" +
"\tdirection can be 0-7 or S, N, E, W, SE, SW, NE, NW (non-case-sensitive)\n" +
""; "";
@@ -189,6 +192,11 @@ public class Main {
} }
// Invalid value check, warnings are printed in parseDir() // Invalid value check, warnings are printed in parseDir()
if(mDir == -1 || Mdir == -1) return; if(mDir == -1 || Mdir == -1) return;
if(Mdir < mDir) {
System.out.println("Maximum dir greater than minimum dir!");
System.out.println("Textual direction order is S, N, E, W, SE, SW, NE, NW increasing 0 (S) to 7 (NW)");
return;
}
break; break;
case "f": case "f":
case "frame": case "frame":
@@ -209,6 +217,10 @@ public class Main {
} }
// Invalid value check, warnings are printed in parseFrame() // Invalid value check, warnings are printed in parseFrame()
if(mFrame == -1 || Mframe == -1) return; if(mFrame == -1 || Mframe == -1) return;
if(Mframe < mFrame) {
System.out.println("Maximum frame greater than minimum frame!");
return;
}
break; break;
default: default:
System.out.println("Unknown argument '" + arg + "' detected, ignoring."); System.out.println("Unknown argument '" + arg + "' detected, ignoring.");