diff --git a/ArcadeReader.java b/ArcadeReader.java index e3f42e3..b7e0753 100644 --- a/ArcadeReader.java +++ b/ArcadeReader.java @@ -59,6 +59,6 @@ public class ArcadeReader { * */ public static void retrieveData(Path img) { - new SoundVoltexReader().interpretBoxes(img); + new PopnReader().interpretBoxes(img); } } diff --git a/readers/PopnReader.java b/readers/PopnReader.java index d5825c6..4707f04 100644 --- a/readers/PopnReader.java +++ b/readers/PopnReader.java @@ -50,8 +50,8 @@ public class PopnReader extends Reader{ }break; case 1:{ process(arr,width, - 240,255,0,10,240,255, - 240,255,0,150,240,255); + 200,255,0,10,200,255, + 200,255,0,150,200,255); }break; case 2:{ process(arr,width, @@ -154,9 +154,7 @@ public class PopnReader extends Reader{ ImageIO.write(subRegion,"png",new File("sub.png")); cutImg.setRGB(0,currentHeight,readRegions.get(i).w,readRegions.get(i).h,arr,0,readRegions.get(i).w); String val = interpretImage(subRegion,i); - if (!val.isEmpty()) { - sig_data[counter++]=val; - } + sig_data[counter++]=val; currentHeight+=readRegions.get(i).h+REGION_PADDING; } Path output = Paths.get("result.png"); @@ -170,7 +168,7 @@ public class PopnReader extends Reader{ System.out.println(Arrays.toString(ja_data)); System.out.println(Arrays.toString(en_data)); System.out.println(Arrays.toString(sig_data)); - //interpretOutput(ja_data,en_data); + interpretOutput(ja_data,en_data,sig_data); g.dispose(); } catch (IOException e) { e.printStackTrace(); @@ -226,7 +224,9 @@ public class PopnReader extends Reader{ case 5:{ maxcombo=convertToInt("COMBO",splitter); }break; - case 6:{}break;//We'll handle the level in a special way. + case 6:{ + difficulty=convertToInt(splitter); + }break;//We'll handle the level in a special way. case 7:{ title=convertToString(splitter); }break; diff --git a/result.png b/result.png index 358e4c3..eb5fd3c 100644 Binary files a/result.png and b/result.png differ diff --git a/sigPlace.java b/sigPlace.java index b4858f2..8da599e 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("sdvx4.png")); + ArcadeReader.retrieveData(Paths.get("popn12.png")); /* Path secretFile = Paths.get(".clientsecret"); List data; try { diff --git a/sub.png b/sub.png index 04bb6eb..5ec5e12 100644 Binary files a/sub.png and b/sub.png differ