diff --git a/ArcadeReader.java b/ArcadeReader.java index b7e0753..5d34a90 100644 --- a/ArcadeReader.java +++ b/ArcadeReader.java @@ -59,6 +59,6 @@ public class ArcadeReader { * */ public static void retrieveData(Path img) { - new PopnReader().interpretBoxes(img); + new ITGReader().interpretBoxes(img); } } diff --git a/readers/ITGReader.java b/readers/ITGReader.java index e510a71..1b33e64 100644 --- a/readers/ITGReader.java +++ b/readers/ITGReader.java @@ -20,6 +20,7 @@ public class ITGReader extends Reader{ final static int REGION_PADDING = 32; List extraRegions = new ArrayList<>(); static int lastJump=0; + boolean failed=false; public ITGReader(){ addRegion(new Box(388,552,227,60),NUMBER); //score[0] addRegion(new Box(797,438,164,58),NUMBER); //fantastic+[1] @@ -220,6 +221,31 @@ public class ITGReader extends Reader{ case 9:{ other=convertToString(splitter); }break; + case 10:{ + if (convertToString(splitter).equals("F")) { + failed=true; + } + if (failed) { + rank=17;/*F*/ + } else + if (pct>=100) {rank=0;/*Quad*/} else + if (pct>=99) {rank=1;/*Trip*/} else + if (pct>=98) {rank=2;/*Doub*/} else + if (pct>=96) {rank=3;/*Star*/} else + if (pct>=94) {rank=4;/*S+*/} else + if (pct>=92) {rank=5;/*S*/} else + if (pct>=89) {rank=6;/*S-*/} else + if (pct>=86) {rank=7;/*A+*/} else + if (pct>=83) {rank=8;/*A*/} else + if (pct>=80) {rank=9;/*A-*/} else + if (pct>=76) {rank=10;/*B+*/} else + if (pct>=72) {rank=11;/*B*/} else + if (pct>=68) {rank=12;/*B-*/} else + if (pct>=64) {rank=13;/*C+*/} else + if (pct>=60) {rank=14;/*C*/} else + if (pct>=55) {rank=15;/*C-*/} else + {rank=16;/*D*/} + } case 11:{ title=convertToString(splitter); }break; diff --git a/result.png b/result.png index 14affb0..60b45c2 100644 Binary files a/result.png and b/result.png differ diff --git a/sigPlace.java b/sigPlace.java index fa5470b..c2f7c0d 100644 --- a/sigPlace.java +++ b/sigPlace.java @@ -116,7 +116,7 @@ public class sigPlace { // TODO Auto-generated catch block e.printStackTrace(); }*/ - ArcadeReader.retrieveData(Paths.get("popn5.png")); + ArcadeReader.retrieveData(Paths.get("itg15.png")); /* Path secretFile = Paths.get(".clientsecret"); List data; try { diff --git a/sub.png b/sub.png index 2994a77..ee7f104 100644 Binary files a/sub.png and b/sub.png differ