Sound Voltex Number Recognition Implemented (#1)

Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2 years ago · 0a160e7081
parent 596f4f1e7d
commit 0a160e7081
12 changed files with 122 additions and 122 deletions
--- a/ArcadeReader.java
+++ b/ArcadeReader.java
@ -59,6 +59,6 @@ public class ArcadeReader {
     * 
     */
    public static void retrieveData(Path img) {
-        new PopnReader().interpretBoxes(img);
+        new SoundVoltexReader().interpretBoxes(img);
    }
 }
--- a/readers/SoundVoltexReader.java
+++ b/readers/SoundVoltexReader.java
@ -2,6 +2,7 @@ package readers;
 import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@ -12,34 +13,37 @@ import java.util.regex.Pattern;

 import javax.imageio.ImageIO;

+import readers.fonts.Font;
+import readers.fonts.Glyph;
+
 public class SoundVoltexReader extends Reader{
    final static int REGION_PADDING = 32;
    List<Box> extraRegions = new ArrayList<>();
    static int lastJump=0;
    public SoundVoltexReader(){
-        readRegions.add(new Box(430,1006,454,29)); //title[0]
-        readRegions.add(new Box(458,1075,240,57)); //bigscore[1]
-        readRegions.add(new Box(697,1096,146,34)); //score[2]
-        readRegions.add(new Box(630,1142,110,16)); //exscore[3]
-        readRegions.add(new Box(932,1194,55,19)); //health percentage[4]
-        readRegions.add(new Box(617,1237,70,23)); //early error[5]
-        readRegions.add(new Box(617,1268,70,23)); //early near[6]
-        readRegions.add(new Box(617,1300,70,23)); //early critical[7]
-        readRegions.add(new Box(617,1330,70,23)); //s-critical[8]
-        readRegions.add(new Box(617,1362,70,23)); //late critical[9]
-        readRegions.add(new Box(617,1393,70,23)); //late near[10]
-        readRegions.add(new Box(617,1424,70,23)); //late error[11]
-        readRegions.add(new Box(188,1231,70,23)); //chip s-critical[12]
-        readRegions.add(new Box(188,1262,70,23)); //chip critical[13]
-        readRegions.add(new Box(188,1294,70,23)); //chip near[14]
-        readRegions.add(new Box(188,1324,70,23)); //chip error[15]
-        readRegions.add(new Box(266,1231,70,23)); //long s-critical[16]
-        readRegions.add(new Box(266,1324,70,23)); //long error[17]
-        readRegions.add(new Box(345,1231,70,23)); //vol s-critical[18]
-        readRegions.add(new Box(345,1324,70,23)); //vol error[19]
-        readRegions.add(new Box(304,1364,70,23)); //max combo[20]
-        readRegions.add(new Box(233,880,84,20)); //difficulty[21]
-        readRegions.add(new Box(875,1046,125,82)); //rating[22]
+        addRegion(new Box(385,1006,454,29)); //title[0]
+        addRegion(new Box(476,1075,242,57),NUMBER); //bigscore[1]
+        addRegion(new Box(717,1096,146,34),NUMBER); //score[2]
+        addRegion(new Box(630,1142,110,16),NUMBER); //exscore[3]
+        addRegion(new Box(932,1194,55,19)); //health percentage[4]
+        addRegion(new Box(617,1237,70,23),NUMBER); //early error[5]
+        addRegion(new Box(617,1268,70,23),NUMBER); //early near[6]
+        addRegion(new Box(617,1300,70,23),NUMBER); //early critical[7]
+        addRegion(new Box(617,1330,70,23),NUMBER); //s-critical[8]
+        addRegion(new Box(617,1362,70,23),NUMBER); //late critical[9]
+        addRegion(new Box(617,1393,70,23),NUMBER); //late near[10]
+        addRegion(new Box(617,1424,70,23),NUMBER); //late error[11]
+        addRegion(new Box(188,1231,70,23),NUMBER); //chip s-critical[12]
+        addRegion(new Box(188,1262,70,23),NUMBER); //chip critical[13]
+        addRegion(new Box(188,1294,70,23),NUMBER); //chip near[14]
+        addRegion(new Box(188,1324,70,23),NUMBER); //chip error[15]
+        addRegion(new Box(266,1231,70,23),NUMBER); //long s-critical[16]
+        addRegion(new Box(266,1324,70,23),NUMBER); //long error[17]
+        addRegion(new Box(345,1231,70,23),NUMBER); //vol s-critical[18]
+        addRegion(new Box(345,1324,70,23),NUMBER); //vol error[19]
+        addRegion(new Box(304,1364,70,23),NUMBER); //max combo[20]
+        addRegion(new Box(58,862,132,26)); //difficulty[21]
+        addRegion(new Box(875,1046,125,82)); //rating[22]



@ -61,6 +65,8 @@ public class SoundVoltexReader extends Reader{
        extraRegions.add(new Box(62,1230,119,24)); //s-critical extra text[15]
        extraRegions.add(new Box(62,1325,119,24)); //error extra text[16]
        extraRegions.add(new Box(71,1365,171,22)); //maximum chain text[17]
+
+        init();
    }

    void ColorFilter(int[] arr,int region,int width) {
@ -302,6 +308,7 @@ public class SoundVoltexReader extends Reader{

        int regionHeights = 0;
        int maxWidth = 0;
+        int counter = 0;
        for (int i=0;i<readRegions.size();i++) {
            regionHeights+=readRegions.get(i).h+REGION_PADDING;
            if (readRegions.get(i).w>maxWidth) {
@ -314,71 +321,21 @@ public class SoundVoltexReader extends Reader{
            Graphics2D g = cutImg.createGraphics();
            int currentHeight=0;
            for (int i=0;i<readRegions.size();i++) {
-                int[] arr = originalImg.getRGB(readRegions.get(i).x, readRegions.get(i).y, readRegions.get(i).w, readRegions.get(i).h, null, 0, readRegions.get(i).w);
+                BufferedImage subRegion = new BufferedImage(readRegions.get(i).w, readRegions.get(i).h,BufferedImage.TYPE_INT_ARGB);
+                
+                subRegion.setRGB(0,0,readRegions.get(i).w,readRegions.get(i).h,originalImg.getRGB(readRegions.get(i).x, readRegions.get(i).y, readRegions.get(i).w, readRegions.get(i).h, null, 0, readRegions.get(i).w),0,readRegions.get(i).w);
+                
+                int[] arr = subRegion.getRGB(0, 0, readRegions.get(i).w, readRegions.get(i).h, null, 0, readRegions.get(i).w);
                //System.out.println(Arrays.toString(arr));
                //System.out.println(i);
                //ImageIO.write(originalImg.getSubimage(readRegions.get(i).x, readRegions.get(i).y, readRegions.get(i).w, readRegions.get(i).h),"png",new File("cut.png"));
                ColorFilter(arr,i,readRegions.get(i).w);
-                //g.drawImage(originalImg, 0,currentHeight,readRegions.get(i).w,readRegions.get(i).h+currentHeight,readRegions.get(i).x, readRegions.get(i).y, readRegions.get(i).x+readRegions.get(i).w, readRegions.get(i).y+readRegions.get(i).h, null);
-                int leftMost=readRegions.get(i).w;
-                for (int j=0;j<arr.length;j++) {
-                    if (arr[j]==Color.MAGENTA.getRGB()&&j%readRegions.get(i).w<leftMost) {
-                        leftMost=j%readRegions.get(i).w;
-                    }
-                }
-                if (i==21) {
-                    //Squish the difficulty together.
-                    int pixelGap=0;
-                    int pixelGapStart=0;
-                    int reachedPoint=0;
-                    boolean found=false;
-                    for (int x=0;x<readRegions.get(i).w;x++) {
-                        for (int y=0;y<readRegions.get(i).h;y++) {
-                            if (arr[y*readRegions.get(i).w+x]!=TRANSPARENT) {
-                                if (pixelGap>10) {
-                                    found=true;
-                                    reachedPoint=x;
-                                    System.out.println(reachedPoint+"-"+pixelGapStart);
-                                    break;
-                                }
-                                pixelGap=0;
-                                pixelGapStart=x;
-                                break;
-                            }
-                        }
-                        if (found) {
-                            break;
-                        }
-                        pixelGap++;
-                    }
-                    final int PADDING = 14;
-                    //From the pixelGapStart X, cut down the pixels to reach the point next to the previous pixels.
-                    for (int x=reachedPoint;x<readRegions.get(i).w;x++) {
-                        for (int y=0;y<readRegions.get(i).h;y++) {
-                            arr[y*readRegions.get(i).w+x-pixelGapStart+PADDING]=arr[y*readRegions.get(i).w+x];
-                            arr[y*readRegions.get(i).w+x]=TRANSPARENT;
-                        }
-                    }
-                }
-                if (i>=3&&i<=20) {
-                    int[] arr2 = originalImg.getRGB(extraRegions.get(i-3).x, extraRegions.get(i-3).y, extraRegions.get(i-3).w, extraRegions.get(i-3).h, null, 0, extraRegions.get(i-3).w);
-                    int rightMost=0;
-                    ColorFilter(arr2,400+i-3,extraRegions.get(i-3).w);
-                    for (int j=0;j<arr2.length;j++) {
-                        if (arr2[j]==Color.MAGENTA.getRGB()&&j%extraRegions.get(i-3).w>rightMost) {
-                            rightMost=j%extraRegions.get(i-3).w;
-                        }
-                    }
-                    //cutImg.setRGB(rightMost-leftMost,currentHeight,readRegions.get(i).w,readRegions.get(i).h,arr,0,readRegions.get(i).w);
-                    cutImg.setRGB(0,currentHeight,extraRegions.get(i-3).w,extraRegions.get(i-3).h,arr2,0,extraRegions.get(i-3).w);
-                    final int PADDING = 4;
-                    for (int x=leftMost;x<readRegions.get(i).w;x++) {
-                        for (int y=0;y<readRegions.get(i).h;y++) {
-                            cutImg.setRGB(x+rightMost-leftMost+PADDING, y+currentHeight, arr[y*readRegions.get(i).w+x]);
-                        }
-                    }
-                } else {
-                    cutImg.setRGB(0,currentHeight,readRegions.get(i).w,readRegions.get(i).h,arr,0,readRegions.get(i).w);
+                subRegion.setRGB(0,0,readRegions.get(i).w,readRegions.get(i).h,arr,0,readRegions.get(i).w);
+                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;
                }
                currentHeight+=readRegions.get(i).h+REGION_PADDING;
            }
@ -392,7 +349,8 @@ public class SoundVoltexReader extends Reader{
            trimAllData(en_data);
            System.out.println(Arrays.toString(ja_data));
            System.out.println(Arrays.toString(en_data));
-            interpretOutput(ja_data,en_data);
+            System.out.println(Arrays.toString(sig_data));
+            //interpretOutput(ja_data,en_data);
            g.dispose();
        } catch (IOException e) {
            e.printStackTrace();
@ -401,6 +359,47 @@ public class SoundVoltexReader extends Reader{
        //System.out.println(data[2]);
    }

+    private String interpretImage(BufferedImage cutImg, int i) {
+        switch (i) {
+            case 1:{
+                Font f = Font.FONT_SDVX_BIGSCORE;
+                List<Glyph> glyphs = Glyph.split(cutImg);
+                return f.convertGlyphs(glyphs);
+            }
+            case 2:{
+                Font f = Font.FONT_SDVX_LITTLESCORE;
+                List<Glyph> glyphs = Glyph.split(cutImg);
+                return f.convertGlyphs(glyphs);
+            }
+            case 3:{
+                Font f = Font.FONT_SDVX_EXSCORE;
+                List<Glyph> glyphs = Glyph.split(cutImg);
+                return f.convertGlyphs(glyphs);
+            }
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+            case 9:
+            case 10:
+            case 11:
+            case 12:
+            case 13:
+            case 14:
+            case 15:
+            case 16:
+            case 17:
+            case 18:
+            case 19:
+            case 20:{
+                Font f = Font.FONT_SDVX_NOTECOUNT;
+                List<Glyph> glyphs = Glyph.split(cutImg);
+                return f.convertGlyphs(glyphs);
+            }
+        }
+        return "";
+    }
+
    @Override
    void interpretResults(String[] finalData) {
        for (int i=0;i<finalData.length;i++) {
--- a/readers/fonts/sdvx_largeScore
+++ b/readers/fonts/sdvx_largeScore
@ -1,30 +1,30 @@
-54
-51
-000000000000000000001111111111111111111111111110000000000000000000000000111111111111111111111111111100000000000000000000000001111111111111111111111111111111111100000000000000000011111111111111111111111111111111111100000000000000000111111111111111111111111111111111111100000000000000001111111111111111111111111111111111111100000000000000011111111111111111111111111111111111111100000000000000111111111111111111111111111111111111111100000000000000111111111111111111111111111111111111111110000000000000111111111111111111111111111111111111111110000000000111111111111111111111111111111111111111111110000000000111111111111111111111111111111111111111111110000000001111111111111111111111111111111111111111111111000000011111111111111111111111111111111111111111111111000000011111111111111111111111111111111111111111111111000000111111100000000000000000000000000111111111111111000001111111100000000000000000000000000111111111111111000011111111100000000000000000000000000111111111111111000111111111100000000000000000000000000111111111111111000111111111000000000000000000000000000111111111111111001111111111000000000000000000000000000111111111111111111111111111000000000000000000000000000111111111111111111111111111000000000000000000000000000111111111111111111111111111000000000000000000000000000111111111111111111111111111000000000000000000000000000111111111111111111111111111000000000000000000000000000111111111111111111111111111000000000000000000000000000111111111111111111111111111000000000000000000000000000111111111111111111111111111000000000000000000000000000111111111111111111111111111000000000000000000000000000111111111111111111111111111000000000000000000000000000111111111111111111111111111000000000000000000000000000111111111111111111111111111000000000000000000000000000111111111111110111111111111000000000000000000000000000111111111111110111111111111000000000000000000000000000111111111111100111111111111000000000000000000000000000111111111111000111111111111000000000000000000000000000111111111110000111111111111000000000000000000000000000111111111100000111111111111000000000000000000000000000111111111000000111111111111000000000000000000000111111111111110000000111111111111111111111111111111111111111111111100000000111111111111111111111111111111111111111111111000000000111111111111111111111111111111111111111111110000000000111111111111111111111111111111111111111111100000000000111111111111111111111111111111111111111100000000000000111111111111111111111111111111111111111100000000000000111111111111111111111111111111111111110000000000000000111111111111111111111111111111111111100000000000000000111111111111111111111111111111111111000000000000000000111111111111111111111111111111111110000000000000000000111111111111111111111111111111111100000000000000000000
-54
-51
-000000000000000000000011111111111111111110000000000000000000000000000000000111111111111111111111100000000000000000000000000000011111111111111111111111110000000000000000000000000000111111111111111111111111111000000000000000000000000001111111111111111111111111111100000000000000000000000011111111111111111111111111111110000000000000000000000111111111111111111111111111111111000000000000000000001111111111111111111111111111111111100000000000000000011111111111111111111111111111111111110000000000000000111111111111111111111111111111111111111000000000000001111111111111111111111111111111111111111100000000000011111111111111111111111111111111111111111110000000000011111111111111111111111111111111111111111110000000000111111111111111111111111111111111111111111111000000001111111111111111111111111111111111111111111111000000001111100000000000000000000000000111111111111111000000011111100000000000000000000000000111111111111111000000011111100000000000000000000000000111111111111111000000111111100000000000000000000000000111111111111111000001111111000000000000000000000000000111111111111111000011111111000000000000000000000000000111111111111111000111111111000000000000000000000000000111111111111111001111111111000000000000000000000000000111111111111111011111111111000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111100111111111111111111111111111111111111111111111111111000111111111111111111111111111111111111111111111111110000111111111111111111111111111111111111111111111111100000111111111111111111111111111111111111111111111110000000111111111111111000000000000000000000000000000100000000111111111111111000000000000000000000000000000000000000111111111111111000000000000000000000000000000000000000111111111111111000000000000000000000000000000000111111111111111111111000000000001111111111111111111111111111111111111111111000000000001111111111111111111111111111111111111111111000000000001111111111111111111111111111111111111111110000000000001111111111111111111111111111111111111111100000000000001111111111111111111111111111111111111111000000000000001111111111111111111111111111111111111110000000000000001111111111111111111111111111111111111100000000000000001111111111111111111111111111111111111000000000000000001111111111111111111111111111111111100000000000000000001111111111111111111111111111111111000000000000000000001111111111111111111111111111111100000000000
+0
+0
+
 27
 49
 000000000001111111111111100000000000111111111111111100000000001111111111111111100000000011111111111111111100000000111111111111111111100000001111111111111111111100000011111111111111111111100000111111111111111111111100011111111111111111111111100111111111111111111111111100111111111111111111111111100111111111111111111111111100011111111111111111111111100000000000000111111111111100000000000000111111111111110000000000000111111111111110000000000000111111111111110000000000000111111111111110000000000000111111111111110000000000000111111111111111000000000000111111111111111000000000000111111111111111000000000000111111111111111000000000000111111111111111000000000000111111111111111000000000000111111111111111000000000000011111111111111000000000000011111111111111000000000000011111111111111000000000000011111111111111000000000000011111111111111000000000000011111111111111000000000000011111111111111000000000000011111111111111000000000000011111111111111000000000000011111111111111000000000000011111111111111000000000000011111111111111000000000000011111111111110000000000000011111111111100000000000000011111111111100000000000000011111111111100000000000000011111111111100000000000000011111111111100000000000000011111111111100000000000000011111111111100000000000000011111111111100000000000000011111111111100000000000000011111111111100
+52
+52
+0111111111111111111111111111111111111110000000000000111111111111111111111111111111111111111110000000000011111111111111111111111111111111111111111100000000001111111111111111111111111111111111111111111000000000111111111111111111111111111111111111111111110000000011111111111111111111111111111111111111111111100000001111111111111111111111111111111111111111111111000000011111111111111111111111111111111111111111111110000001111111111111111111111111111111111111111111111100000111111111111111111111111111111111111111111111111000011111111111111111111111111111111111111111111111110001111111111111111111111111111111111111111111111111100111111111111111111111111111111111111111111111111110011111111111111111111111111111111111111111111111111100000000111111111111111111111111111111111111111111110000000000000000000000000000000000000111111111111111000000000000000000000000000000000000011111111111111100000000000000000000000000000000000001111111111111110000000000000000000000000000000000000111111111111111000000000000000000111111111000000000011111111111111100000000000000111111111111111000000001111111111111110000000000001111111111111111110000000111111111111111000000000001111111111111111111100000011111111111111100000000001111111111111111111111000001111111111111110000000001111111111111111111111110000111111111111111000000001111111111111111111111111100011111111111111100000001111111111111111111111111111001111111111111110000001111111111111111111111111111110111111111111111000001111111111111111111111111111111111111111111111100001111111111111111111111111111111111111111111111110001111111111111111111111111111111111111111111111111001111111111111111111111111111111111111111111111111101111111111111111111111111111111111111111111111111110111111111111000000000000001111111111111111111111110011111111111100000000000000000000111110111111111100001111111111110000000000000000000000000000000000000000111111111111000000000000000000000000000000000000000011111111111100000000000000000000000000000000000000001111111111110000000000000000000000000000000000000000111111111111000000000000000000001111111111111111110011111111111111111111111111111111111111111111111111101111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111011111111111111111111111111111111111111111111111111101111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111011111111111111111111111111111111111111111111111111101111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111011111111111111111111111111111111111111111111111111101111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111
+0
+0
+
+54
 51
+000000000000000000000011111111111111111111000000000000000000000000000000001111111111111111111111110000000000000000000000000000011111111111111111111111110000000000000000000000000000111111111111111111111111110000000000000000000000000001111111111111111111111111110000000000000000000000000011111111111111111111111111110000000000000000000000000111111111111111111111111111110000000000000000000000001111111111111111111111111111110000000000000000000000011111111111111111111111111111110000000000000000000000111111111111111111111111111111110000000000000000000001111111111111111111111111111111110000000000000000000011111111111111111111111111111111110000000000000000000011111111111111111111111111111111110000000000000000000111111111111111111111111111111111110000000000000000001111111111111111111111111111111111110000000000000000001111100000000000000000111111111111110000000000000000011111100000000000000000111111111111110000000000000000011111100000000000000000111111111111110000000000000000111111100000000000000000111111111111110000000000000001111111000000000000000000111111111111110000000000000011111111000000000000000000111111111111111000000000000111111111000000000000000000111111111111111000000000001111111111000000000000000000111111111111111000000000011111111111000000000000000000111111111111111000000000111111111111000000000000000000111111111111111000000000111111111111000000000000000000111111111111111000000000111111111111000000000000000000111111111111111000000000111111111111000000000000000000111111111111111000000000111111111111000000000000000000111111111111111000000000111111111111000000000000000000111111111111111000000000111111111111000000000000000000111111111111111000000000111111111111000000000000011111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000000000000000000000000000011111111111111111111110000000000000000000000000000000011111111111111111111100000000000000000000000000000000011111111111110000000000000000000000000000000000000000011111111111110000000000000000000000000000000000000000011111111111110000000000000000000000000000000000000000011111111111110000000000000000000000000000000000000000011111111111100000000000
+53
 51
-011111111111111111111111111111111111100000000000000111111111111111111111111111111111111111000000000000111111111111111111111111111111111111111000000000000111111111111111111111111111111111111111000000000000111111111111111111111111111111111111111000000000000111111111111111111111111111111111111111000000000000111111111111111111111111111111111111111000000000000011111111111111111111111111111111111111000000000000011111111111111111111111111111111111111000000000000011111111111111111111111111111111111111000000000000011111111111111111111111111111111111111000000000000011111111111111111111111111111111111111000000000000011111111111111111111111111111111111111100000000000011111111111111111111111111111111111111110000000000000000001111111111111111111111111111111111100000000000000000000000000000000000000000000111111111000000000000000000000000000000000000000000111111111110000000000000000000000000000000000000000111111111111000000000000000000000000000000000000000111111111111110000000000000000001111111111111111001111111111111110000000000000001111111111111111111111111111111111111000000000000001111111111111111111111111111111111111000000000000011111111111111111111111111111111111111000000000000111111111111111111111111111111111111111000000000001111111111111111111111111111111111111111000000000011111111111111111111111111111111111111111000000000111111111111111111111111110111111111111111000000001111111111111111111111111100111111111111111000000011111111111111111111111111000111111111111111000000111111111111111111111111110000111111111111111000001111111111111111111111111100000111111111111111000011111111111111111111111111000000111111111111111000011111111111111111111111110000000111111111111111000000000000000000000000000000000000111111111111111000000000000000000000000000000000000111111111111111000000000000000000000000000000000000111111111111111000000000000000000000000000000000000111111111111111000000000000000000000000000000000000111111111111111000000000000000000000000000000000000111111111111111000000000000000000000000000000000111111111111111111011111111111111111111111111111111111111111111111111011111111111111111111111111111111111111111111111110011111111111111111111111111111111111110011111111000011111111111111111111111111111111110000000000000000011111111111111111111111111111111100000000000000000011111111111111111111111111111111000000000000000000011111111111111111111111111111110000000000000000000011111111111111111111111111111100000000000000000000011111111111111111111111111111000000000000000000000011111111111111111111111111110000000000000000000000011111111111111111111111111100000000000000000000000
+001111111111111111111111111111111111111111111110000000111111111111111111111111111111111111111111111000000001111111111111111111111111111111111111111111111111100111111111111111111111111111111111111111111111111111000111111111111111111111111111111111111111111111111110001111111111111111111111111111111111111111111111111100011111111111111111111111111111111111111111111111111000011111111111111111111111111111111111111111111111111000111111111111111111111111111111111111111111111111110001111111111111111111111111111111111111111111111111100011111111111111111111111111111111111111111111111111000111111111111111111111111111111111111111111111111110001111111111111111111111111111111111111111111111111110011111111111111111111111111111111111111111111111111000111111111111111111111111111111111111111111111111110001111111111111000000000000000000000000000000000000000011111111111110000000000000000000000000000000000000000111111111111100000000000000000000000000000000000000001111111111111000000000000000000000000000000000000000011111111111110000000000111111111100010000000000000000111111111111000000000111111111111111111000000000000001111111111110000000011111111111111111111000000000000011111111111100000001111111111111111111111000000000000111111111111000000111111111111111111111111000000000001111111111110000011111111111111111111111111000000000011111111111100000011111111111111111111111111000000000111111111111000001111111111111111111111111111000000001111111111110000111111111111111111111111111111000000011111111111100011111111111111111111111111111111000000111111111111001111111111111111111111111111111111000001111111111110111111111111111111111111111111111111000011111111111111111111111111111111111111111111111111000111111111111111111111111111111111111111111111111111000000000000000000000000000011111111111111111111111110000000000000000000000000000000000111111111111111111100000000000000000000000000000000000000111111111111111000000000000000000000000000000000000001111111111111110000000000000000000000000000000000000011111111111111100000000000000000000000000000000000000111111111111111000000000000000000000000000000000011111111111111111110011111111111111111111111111111111111111111111111111100111111111111111111111111111111111111111111111111110001111111111111111111111111111111111111111111111111100011111111111111111111111111111111111111111111111110000111111111111111111111111111111111111111111111111000001111111111111111111111111111111111111111111111100000011111111111111111111111111111111111111111111110000000111111111111111111111111111111111111111111110000000001111111111111111111111111111111111111111111000000000011111111111111111111111111111111111111111000000000000111111111111111111111111111111111111111100000000000
 54
 51
-000000000000000000000011111111111111111110000000000000000000000000000000000111111111111111111111100000000000000000000000000000011111111111111111111111110000000000000000000000000000111111111111111111111111111000000000000000000000000001111111111111111111111111111100000000000000000000000011111111111111111111111111111110000000000000000000000111111111111111111111111111111111000000000000000000001111111111111111111111111111111111100000000000000000011111111111111111111111111111111111110000000000000000111111111111111111111111111111111111111000000000000001111111111111111111111111111111111111111100000000000011111111111111111111111111111111111111111110000000000011111111111111111111111111111111111111111110000000000111111111111111111111111111111111111111111111000000001111111111111111111111111111111111111111111111000000001111100000000000000000000000000111111111111111000000011111100000000000000000000000000111111111111111000000011111100000000000000000000000000111111111111111000000111111100000000000000000000000000111111111111111000001111111000000000000000000000000000111111111111111000011111111000000000000000000000000000111111111111111000111111111000000000000000000000000000111111111111111001111111111000000000000000000000000000111111111111111011111111111000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111100111111111111111111111111111111111111111111111111111000111111111111111111111111111111111111111111111111110000111111111111111111111111111111111111111111111111100000111111111111111111111111111111111111111111111110000000111111111111111000000000000000000000000000000100000000111111111111111000000000000000000000000000000000000000111111111111111000000000000000000000000000000000000000111111111111111000000000000000000000000000000000111111111111111111111000000000001111111111111111111111111111111111111111111000000000001111111111111111111111111111111111111111111000000000001111111111111111111111111111111111111111110000000000001111111111111111111111111111111111111111100000000000001111111111111111111111111111111111111111000000000000001111111111111111111111111111111111111110000000000000001111111111111111111111111111111111111100000000000000001111111111111111111111111111111111111000000000000000001111111111111111111111111111111111100000000000000000001111111111111111111111111111111111000000000000000000001111111111111111111111111111111100000000000
+000000000000111111111000000000000000000000000000000000000000000111111111111111111111111111111100000000000000000000001111111111111111111111111111111110000000000000000000011111111111111111111111111111111111000000000000000000111111111111111111111111111111111111100000000000000001111111111111111111111111111111111111100000000000000001111111111111111111111111111111111111110000000000000011111111111111111111111111111111111111111000000000000111111111111111111111111111111111111111111100000000000111111111111111111111111111111111111111111100000000001111111111111111111111111111111111111111111110000000001111111111111111111111111111111111111111111111000000111111111111111111111111111111111111111111111111100000111111111111111111111111111111111111111111111111100000111111111111111111111111111111111111111111111111000000111111111111100000000000000000000000000000000000000000111111111111100000000000000000000000000000000000000000111111111111100000000000000000000000000000000000000000111111111111100000000000000000000000000000000000000000111111111111000000111111111111000000000000000000000000111111111111001111111111111111111111111111111000000000111111111111111111111111111111111111111111111100000000111111111111111111111111111111111111111111111110000000111111111111111111111111111111111111111111111110000000111111111111111111111111111111111111111111111111000000111111111111111111111111111111111111111111111111100000111111111111111111111111111111111111111111111111110000111111111111111111111111111111111111111111111111110000111111111111111111111111111111111111111111111111111000111111111111111111111111111111111111111111111111111100111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111000000000000000111111111111111111111111111111111111111000000000000000000000000001111111111111111111111111111000000000000000000000000000111111111111111111111111111000000000000000000000000000111111111111111111111111111000000000000000000000000000111111111111111111111111111000000000000000000000000000111111111111111111111111111000000000000000000000111111111111111111111111111111111111111111111111111111111111111111111111110011111111111111111111111111111111111111111111111111110001111111111111111111111111111111111111111111111111110000111111111111111111111111111111111111111111111111100000011111111111111111111111111111111111111111111111000000001111111111111111111111111111111111111111111110000000000111111111111111111111111111111111111111111100000000000011111111111111111111111111111111111111111000000000000001111111111111111111111111111111111111100000000000000000111111111111111111111111111111111111000000000000000000011111111111111111111111111111111100000000000
 52
 52
 0011111111111111111111111111111111111111111111100000011111111111111111111111111111111111111111111110000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111011111111111111111111111111111111111111111111111111001111111111111111111111111111111111111111111111111100111111111111111111111111111111111111111111111111110001111111111111111111111111111111111111111111111111000111111111111111111111111111111111111111111111111000011111111111111111111111111111111111111111111111100001111111111111111111111111111111111111111111111100000111111111111111111111111111111111111111111111110000011111111111111111111111111111111111111111111110000001111111111111111111111111111111111111111111111000000000000011111111111111111111111111111111111111000000000000000000000000000000000011111111111111111000000000000000000000000000000000011111111111111111100000000000000000000000000000000001111111111111111100000000000000000000000000000000001111111111111111110000000000000000000000000000000000111111111111111110000000000000000000000000000000000111111111111111111000000000000000000000000000000000011111111111111111000000000000000000000000000000000011111111111111111100000000000000000000000000000000011111111111111111100000000000000000000000000000000001111111111111111100000000000000000000000000000000000111111111111111110000000000000000000000000000000000111111111111111110000000000000000000000000000000000011111111111111111000000000000000000000000000000000001111111111111111000000000000000000000000000000000000111111111111111100000000000000000000000000000000000111111111111111100000000000000000000000000000000000011111111111111110000000000000000000000000000000000011111111111111110000000000000000000000000000000000001111111111111110000000000000000000000000000000000001111111111111111000000000000000000000000000000000000111111111111111000000000000000000000000000000000000111111111111111000000000000000000000000000000000000111111111111111100000000000000000000000000000000000011111111111111000000000000000000000000000000000000011111111111111000000000000000000000000000000000000001111111111111100000000000000000000000000000000000001111111111111100000000000000000000000000000000000000111111111111110000000000000000000000000000000000000111111111111110000000000000000000000000000000000000011111111111110000000000000000000000000000000000000011111111111111000000000000000000000000000000000000011111111111111000000000000000000000000000000000000001111111111111100000000000000000000000000000000000001111111111111100000000000000000000000000000000000000111111111111110000000000000000000000000000000000000111111111111110000000000000000000000000000000000000011111111111110000000000000000000000000000
 54
 51
-000000000000000000000011111111111111111110000000000000000000000000000000000111111111111111111111100000000000000000000000000000011111111111111111111111110000000000000000000000000000111111111111111111111111111000000000000000000000000001111111111111111111111111111100000000000000000000000011111111111111111111111111111110000000000000000000000111111111111111111111111111111111000000000000000000001111111111111111111111111111111111100000000000000000011111111111111111111111111111111111110000000000000000111111111111111111111111111111111111111000000000000001111111111111111111111111111111111111111100000000000011111111111111111111111111111111111111111110000000000011111111111111111111111111111111111111111110000000000111111111111111111111111111111111111111111111000000001111111111111111111111111111111111111111111111000000001111100000000000000000000000000111111111111111000000011111100000000000000000000000000111111111111111000000011111100000000000000000000000000111111111111111000000111111100000000000000000000000000111111111111111000001111111000000000000000000000000000111111111111111000011111111000000000000000000000000000111111111111111000111111111000000000000000000000000000111111111111111001111111111000000000000000000000000000111111111111111011111111111000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111100111111111111111111111111111111111111111111111111111000111111111111111111111111111111111111111111111111110000111111111111111111111111111111111111111111111111100000111111111111111111111111111111111111111111111110000000111111111111111000000000000000000000000000000100000000111111111111111000000000000000000000000000000000000000111111111111111000000000000000000000000000000000000000111111111111111000000000000000000000000000000000111111111111111111111000000000001111111111111111111111111111111111111111111000000000001111111111111111111111111111111111111111111000000000001111111111111111111111111111111111111111110000000000001111111111111111111111111111111111111111100000000000001111111111111111111111111111111111111111000000000000001111111111111111111111111111111111111110000000000000001111111111111111111111111111111111111100000000000000001111111111111111111111111111111111111000000000000000001111111111111111111111111111111111100000000000000000001111111111111111111111111111111111000000000000000000001111111111111111111111111111111100000000000
+000000000000111111111111111111111000000000000000000000000000000011111111111111111111111111111111111100000000000000000111111111111111111111111111111111111111111100000000001111111111111111111111111111111111111111111100000000011111111111111111111111111111111111111111111100000000111111111111111111111111111111111111111111111100000001111111111111111111111111111111111111111111111100000011111111111111111111111111111111111111111111111100000111111111111111111111111111111111111111111111111110000111111111111111111111111111111111111111111111111110000111111111111111111111111111111111111111111111111110001111111111111111111111111111111111111111111111111110011111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111100000000000000000000000000111111111111110111111111111100000000000000000000000000111111111111110111111111111100000000000000000000000000111111111111110111111111111100000000000000000000000000111111111111110111111111111000000111111111111111111111111111111111110111111111111001111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111000000000000000111111111111111111111111110111111111111000000000000000000000000001111111111111110111111111111000000000000000000000000000111111111111110111111111111000000000000000000000000000111111111111110111111111111000000000000000000000000000111111111111110111111111111000000000000000000000000011111111111111110111111111111000000000000000000000111111111111111111111111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111100111111111111111111111111111111111111111111111111111000111111111111111111111111111111111111111111111111110000111111111111111111111111111111111111111111111111100000111111111111111111111111111111111111111111111111000000111111111111111111111111111111111111111111111110000000111111111111111111111111111111111111111111111100000000111111111111111111111111111111111111111111111000000000111111111111111111111111111111111111111111000000000000
 54
 51
-000000000000111111111111111111111000000000000000000000000000000011111111111111111111111111111111111100000000000000000111111111111111111111111111111111111111111100000000001111111111111111111111111111111111111111111100000000011111111111111111111111111111111111111111111100000000111111111111111111111111111111111111111111111100000001111111111111111111111111111111111111111111111100000011111111111111111111111111111111111111111111111100000111111111111111111111111111111111111111111111111110000111111111111111111111111111111111111111111111111110000111111111111111111111111111111111111111111111111110001111111111111111111111111111111111111111111111111110011111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111100000000000000000000000000111111111111110111111111111100000000000000000000000000111111111111110111111111111100000000000000000000000000111111111111110111111111111100000000000000000000000000111111111111110111111111111000000111111111111111111111111111111111110111111111111001111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111000000000000000111111111111111111111111110111111111111000000000000000000000000001111111111111110111111111111000000000000000000000000000111111111111110111111111111000000000000000000000000000111111111111110111111111111000000000000000000000000000111111111111110111111111111000000000000000000000000011111111111111110111111111111000000000000000000000111111111111111111111111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111100111111111111111111111111111111111111111111111111111000111111111111111111111111111111111111111111111111110000111111111111111111111111111111111111111111111111100000111111111111111111111111111111111111111111111111000000111111111111111111111111111111111111111111111110000000111111111111111111111111111111111111111111111100000000111111111111111111111111111111111111111111111000000000111111111111111111111111111111111111111111000000000000
-6
-19
-100000100000110000110000111000111000111100111110111110111111111111111110111110111100111000111000110000110000100000
-6
-19
-100000100000110000110000111000111000111100111110111110111111111111111110111110111100111000111000110000110000100000
+000000000000000000000011111111111111111110000000000000000000000000000000000111111111111111111111100000000000000000000000000000011111111111111111111111110000000000000000000000000000111111111111111111111111111000000000000000000000000001111111111111111111111111111100000000000000000000000011111111111111111111111111111110000000000000000000000111111111111111111111111111111111000000000000000000001111111111111111111111111111111111100000000000000000011111111111111111111111111111111111110000000000000000111111111111111111111111111111111111111000000000000001111111111111111111111111111111111111111100000000000011111111111111111111111111111111111111111110000000000011111111111111111111111111111111111111111110000000000111111111111111111111111111111111111111111111000000001111111111111111111111111111111111111111111111000000001111100000000000000000000000000111111111111111000000011111100000000000000000000000000111111111111111000000011111100000000000000000000000000111111111111111000000111111100000000000000000000000000111111111111111000001111111000000000000000000000000000111111111111111000011111111000000000000000000000000000111111111111111000111111111000000000000000000000000000111111111111111001111111111000000000000000000000000000111111111111111011111111111000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110111111111111111111111111111111111111111111111111111100111111111111111111111111111111111111111111111111111000111111111111111111111111111111111111111111111111110000111111111111111111111111111111111111111111111111100000111111111111111111111111111111111111111111111110000000111111111111111000000000000000000000000000000100000000111111111111111000000000000000000000000000000000000000111111111111111000000000000000000000000000000000000000111111111111111000000000000000000000000000000000111111111111111111111000000000001111111111111111111111111111111111111111111000000000001111111111111111111111111111111111111111111000000000001111111111111111111111111111111111111111110000000000001111111111111111111111111111111111111111100000000000001111111111111111111111111111111111111111000000000000001111111111111111111111111111111111111110000000000000001111111111111111111111111111111111111100000000000000001111111111111111111111111111111111111000000000000000001111111111111111111111111111111111100000000000000000001111111111111111111111111111111111000000000000000000001111111111111111111111111111111100000000000
--- a/readers/fonts/sdvx_littleScore
+++ b/readers/fonts/sdvx_littleScore
@ -1,30 +1,30 @@
-33
-30
-000000000001111111111111111111110000000000011111111111111111111110000000000111111111111111111111110000000001111111111111111111111110000000001111111111111111111111110000000111111111111111111111111110000000111111111111111111111111111000001111111111111111111111111111000011110000000000000000111111111000111110000000000000000111111111001111110000000000000000111111111011111110000000000000000111111111111111110000000000000000111111111111111110000000000000000111111111111111110000000000000000111111111111111110000000000000000111111111111111110000000000000000111111111111111110000000000000000111111111111111110000000000000000111111111111111110000000000000000111111110111111110000000000000000111111100111111110000000000000000111111000111111110000000000000000111110000111111111111111111111111111100000111111111111111111111111111000000111111111111111111111111110000000111111111111111111111111000000000111111111111111111111110000000000111111111111111111111100000000000111111111111111111111000000000000
-31
+0
+0
+
+16
 30
-111111111111111111111111111111011111111111111111111111111111101111111111111111111111111111110111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110000000000000000000000111111110000000000000000000000011111111000000000000000000000001111111100000111111111110000000111111110000111111111111100000011111111000011111111111111000001111111100011111111111111110000111111110011111111111111111100011111111011111111111111111111001111111111111111111111111111110111111111111111111111111111111100000000000000001111111111111110000000000000000000000111111111000000000000000000000011111111100000000000000000000001111111110111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101111111111111111111111111111100111111111111111111111111111100011111111111111111111111111000001111111111111111111111111000000
+000000011111111000000011111111100000011111111110000011111111111000011111111111100111111111111110111111111111111011111111111111100000000111111110000000011111111100000001111111110000000111111111000000011111111100000001111111110000000111111111000000001111111100000000111111110000000011111111000000001111111100000000111111110000000011111111000000001111111100000000111111110000000011111111000000001111111000000000111111100000000011111110000000001111111000000000111111100000000011111110
 31
 30
 111111111111111111111111000000011111111111111111111111111000001111111111111111111111111100000111111111111111111111111111000011111111111111111111111111111001111111111111111111111111111100111111111111111111111111111111011111111111111111111111111111110000000000000000000000111111111000000000000000000000011111111100000000000000000000001111111110000000000011111100000111111111000000111111111111000011111111100000011111111111110001111111110000011111111111111100111111111000011111111111111111011111111100011111111111111111111111111110011111111111111111111111111111011111111111111111111111111111111111111000000001111111111111111111111100000000000000000000000111111110000000000000000000000011111111000000000000000000000001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111
-32
-30
-000000111111111111111111111111110000011111111111111111111111111100001111111111111111111111111111000111111111111111111111111111110011111111111111111111111111111100111111111111111111111111111111011111111111111111111111111111111111111111111111111111111111111111111111100000000000000111111111111111110000000000000000111111111111111100000000000000001111111111111111000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000000011111111111111111111111000000000000000011111111111111110000000000000000111111111111111100000000000000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111011111111111111111111111111111100011111111111111111111111111110000111111111111111111111111111000011111111111111111111111111000000
-33
-30
-000000000000011111111111111000000000000000001111111111111111000000000000000001111111111111111000000000000000011111111111111111000000000000001111111111111111111000000000000011111111111111111111000000000000011111111111111111111000000000000111111111111111111111000000000001110000000000111111111000000000011110000000000111111111000000000011110000000000111111111000000000111110000000000111111111000000001111110000000000111111111000000011111110000000000111111111000000111111110000000000111111111000000111111110000000000111111111000000111111110000000000111111111000000111111110000000000111111111000000111111111111111111111111111111110111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111000000000000000000011111111111110000000000000000000011111111000000000000000000000000011111111000000000000000000000000011111110000000
 30
 30
 111111111111111111111110000000111111111111111111111110000000111111111111111111111110000000111111111111111111111110000000111111111111111111111110000000111111111111111111111110000000111111111111111111111111000000111111111111111111111111100000000000000000000000000111110000000000000000000000000111111100000000000000000000000111111111000000000011111111111111111111000000001111111111111111111111000000011111111111111111111111000000111111111111111111111111000001111111111111111111111111000011111111111111110111111111000111111111111111100111111111001111111111111111000111111111000000000000000000000111111111000000000000000000000111111111000000000000000000000111111111000000000000000000000111111111011111111111111111111111111111111111111111111111111111111111111111111111111111111000000000111111111111111111111000000000111111111111111111100000000000111111111111111111000000000000111111111111111110000000000000
+0
+0
+
+31
+30
+111111111111111111111111111111011111111111111111111111111111101111111111111111111111111111110111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110000000000000000000000111111110000000000000000000000011111111000000000000000000000001111111100000111111111110000000111111110000111111111111100000011111111000011111111111111000001111111100011111111111111110000111111110011111111111111111100011111111011111111111111111111001111111111111111111111111111110111111111111111111111111111111100000000000000001111111111111110000000000000000000000111111111000000000000000000000011111111100000000000000000000001111111110111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111101111111111111111111111111111100111111111111111111111111111100011111111111111111111111111000001111111111111111111111111000000
 33
 30
 000000111111111111111111100000000000001111111111111111111100000000000011111111111111111111110000000000111111111111111111111111000000001111111111111111111111111100000001111111111111111111111111100000011111111111111111111111111110000111111111111111111111111111111000111111110111111110000000000000000111111110000000000000000000000000111111110000000000000000000000000111111110001111111111111111000000111111111111111111111111111100000111111111111111111111111111110000111111111111111111111111111111000111111111111111111111111111111000111111111111111111111111111111100111111111111111111111111111111110111111111111111111111111111111110111111110000000001111111111111111111111110000000000000000111111111111111110000000000000000111111111111111110000000000000000111111111111111111111111111111111111111111011111111111111111111111111111110001111111111111111111111111111100000111111111111111111111111111000000011111111111111111111111110000000001111111111111111111111100000000000111111111111111111110000000
 31
 31
 1111111111111111111111111111000111111111111111111111111111111111111111111111111111111111111110111111111111111111111111111110011111111111111111111111111111001111111111111111111111111111100111111111111111111111111111100011111111111111111111111111100000000111111111111111111111110000000000000000000011111111110000000000000000000001111111111000000000000000000001111111111000000000000000000001111111111100000000000000000000111111111100000000000000000000111111111110000000000000000000011111111110000000000000000000001111111111000000000000000000001111111111000000000000000000000111111111100000000000000000000111111111100000000000000000000011111111100000000000000000000011111111100000000000000000000011111111110000000000000000000001111111110000000000000000000001111111110000000000000000000000111111111000000000000000000000011111111000000000000000000000011111111100000000000000000000011111111100000000000000000000001111111100000000000000000000001111111110000000000000000
-19
 32
-00001111111111111110000111111111111111000011111111111111100001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111011111111111111111001111111111111111000111111111111111000011111111111111100001111111111111110000111111111111111000011111111111111100001111111111111110000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111011111111111111111001111111111111111000111111111111111000011111111111111000001111111111111000000111111111110000000011111111110000000001111111100000000000
+30
+000000111111111111111111111111110000011111111111111111111111111100001111111111111111111111111111000111111111111111111111111111110011111111111111111111111111111100111111111111111111111111111111011111111111111111111111111111111111111111111111111111111111111111111111100000000000000111111111111111110000000000000000111111111111111100000000000000001111111111111111000111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111100000000011111111111111111111111000000000000000011111111111111110000000000000000111111111111111100000000000000011111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111011111111111111111111111111111100011111111111111111111111111110000111111111111111111111111111000011111111111111111111111111000000
 33
 30
 000000000000011111111111110000000000000000001111111111111111000000000000000001111111111111111100000000000000011111111111111111110000000000001111111111111111111111000000000011111111111111111111111100000000011111111111111111111111110000000111111111111111111111111111000001110000000000000000111111111000011110000000000000000111111111000011110000000000000000111111111000111110000000000000000111111111011111110000000000000000111111111011111110001111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111110111111111111111111111111111111100111111111111111111111111111111000111111111111111111111111111110000111111111000000000000000000000000111111111000000000000000000000000111111111000000011111111111111111111111111000000011111111111111111111111110000000011111111111111111111111100000000011111111111111111111111000000000011111111111111111111111000000000011111111111111111111100000000000011111111111111111111000000
--- a/result.png
+++ b/result.png
--- a/sdvx6.png
+++ b/sdvx6.png
--- a/sdvx7.png
+++ b/sdvx7.png
--- a/sdvx8.png
+++ b/sdvx8.png
--- a/sdvx9.png
+++ b/sdvx9.png
--- a/sigPlace.java
+++ b/sigPlace.java
@ -81,20 +81,21 @@ public class sigPlace {
    final static int TRANSPARENT = new Color(0,0,0,0).getRGB();
    
    public static void main(String[] args) {
-        /*String fontName = "sdvx_EXScore";
-        String value = "04882";
-        Path f = Paths.get("sdvx2.png");
+        /*String fontName = "sdvx_littleScore";
+        String value = "9328";
+        Path f = Paths.get("sdvx1.png");
        BufferedImage img;
        try {
            img = ImageIO.read(f.toFile());
-            Box scoreBox = new Box(630,1142,110,16);
+            Box scoreBox = new Box(717,1096,146,34);
            
            int[] arr = img.getRGB(scoreBox.x, scoreBox.y, scoreBox.w, scoreBox.h, null, 0, scoreBox.w);

            BufferedImage newImg = new BufferedImage(scoreBox.w,scoreBox.h,BufferedImage.TYPE_INT_ARGB);
            
-            final ColorRange TARGETCOLOR = new ColorRange(230,255,180,255,20,255);
-                final ColorRange SEEKINGCOLOR = new ColorRange(130,255,100,255,15,255);
+            
+            final ColorRange TARGETCOLOR = new ColorRange(160,255,170,255,190,255);
+            final ColorRange SEEKINGCOLOR = new ColorRange(26,255,53,255,80,255);
            final Color FINALCOLOR = Color.MAGENTA;
            for (int i=0;i<arr.length;i++) {
                Color col = new Color(arr[i],true);
@ -115,7 +116,7 @@ public class sigPlace {
            // TODO Auto-generated catch block
            e.printStackTrace();
        }*/
-        ArcadeReader.retrieveData(Paths.get("popn8.png"));
+        ArcadeReader.retrieveData(Paths.get("sdvx4.png"));
        /* Path secretFile = Paths.get(".clientsecret");
        List<String> data;
 		try {
--- a/sub.png
+++ b/sub.png
--- a/test.png
+++ b/test.png