diff --git a/DivaBot/DivaBot.jar b/DivaBot/DivaBot.jar index 6558092..c78d147 100644 Binary files a/DivaBot/DivaBot.jar and b/DivaBot/DivaBot.jar differ diff --git a/DivaBot/TypeFace_API.jar b/DivaBot/TypeFace_API.jar index 5964f3f..db0487c 100644 Binary files a/DivaBot/TypeFace_API.jar and b/DivaBot/TypeFace_API.jar differ diff --git a/DivaBot/rectangle0.png b/DivaBot/rectangle0.png index cb0d0e7..6a4904e 100644 Binary files a/DivaBot/rectangle0.png and b/DivaBot/rectangle0.png differ diff --git a/DivaBot/rectangle1.png b/DivaBot/rectangle1.png index 0d74e6b..1dbf87a 100644 Binary files a/DivaBot/rectangle1.png and b/DivaBot/rectangle1.png differ diff --git a/DivaBot/rectangle2.png b/DivaBot/rectangle2.png index 08a25a7..e99a22d 100644 Binary files a/DivaBot/rectangle2.png and b/DivaBot/rectangle2.png differ diff --git a/DivaBot/rectangle3.png b/DivaBot/rectangle3.png index 280d1ca..91884ed 100644 Binary files a/DivaBot/rectangle3.png and b/DivaBot/rectangle3.png differ diff --git a/DivaBot/rectangle4.png b/DivaBot/rectangle4.png index 37fd1a1..64111ba 100644 Binary files a/DivaBot/rectangle4.png and b/DivaBot/rectangle4.png differ diff --git a/DivaBot/src/sig/MyRobot.java b/DivaBot/src/sig/MyRobot.java index 7b2b1ce..fecddb9 100644 --- a/DivaBot/src/sig/MyRobot.java +++ b/DivaBot/src/sig/MyRobot.java @@ -816,6 +816,7 @@ public class MyRobot{ selectedSong=new SongData("LIKE THE WIND",null,null,null,null); difficulty="H"; + RunTest("test63.png",0,0,0,0,1000,0.00f,"EX","",0,0,true,Mode.FUTURETONE); RunTest("test62.png",329,29,0,0,2,100.66f,"EXEX","",305,548735,false,Mode.FUTURETONE); RunTest("test61.png",467,21,0,0,0,103.48f,"EX","HS",488,514440,false,Mode.MEGAMIX); RunTest("test60.png",430,88,2,0,3,95.05f,"EX","HS",298,538510,false,Mode.MEGAMIX); diff --git a/DivaBot/src/sig/TypeFace2.java b/DivaBot/src/sig/TypeFace2.java index 08f913e..5531923 100644 --- a/DivaBot/src/sig/TypeFace2.java +++ b/DivaBot/src/sig/TypeFace2.java @@ -55,11 +55,11 @@ public class TypeFace2 { final static Rectangle MEGAMIX_RECT_SEARCH_PCT2=new Rectangle(1123+XOFFSET,163,1051,8); final static Rectangle MEGAMIX_RECT_SEARCH_SCORE=new Rectangle(859+XOFFSET,578-4,250+XOFFSET+1,32+14); final static Rectangle MEGAMIX_RECT_SEARCH_COMBO=new Rectangle(1010+XOFFSET,435-2,100+XOFFSET+1,22+8); - final static Rectangle FUTURETONE_RECT_SEARCH_COOL=new Rectangle(872+XOFFSET,223,100+XOFFSET+1,22+8); - final static Rectangle FUTURETONE_RECT_SEARCH_FINE=new Rectangle(872+XOFFSET,258,100+XOFFSET+1,22+8); - final static Rectangle FUTURETONE_RECT_SEARCH_SAFE=new Rectangle(872+XOFFSET,294,100+XOFFSET+1,22+8); - final static Rectangle FUTURETONE_RECT_SEARCH_SAD=new Rectangle(872+XOFFSET,330,100+XOFFSET+1,22+8); - final static Rectangle FUTURETONE_RECT_SEARCH_WORST=new Rectangle(872+XOFFSET,367,100+XOFFSET+1,22+8); + final static Rectangle FUTURETONE_RECT_SEARCH_COOL=new Rectangle(850+XOFFSET,223,122+XOFFSET+1,22+8); + final static Rectangle FUTURETONE_RECT_SEARCH_FINE=new Rectangle(850+XOFFSET,258,122+XOFFSET+1,22+8); + final static Rectangle FUTURETONE_RECT_SEARCH_SAFE=new Rectangle(850+XOFFSET,294,122+XOFFSET+1,22+8); + final static Rectangle FUTURETONE_RECT_SEARCH_SAD=new Rectangle(850+XOFFSET,330,122+XOFFSET+1,22+8); + final static Rectangle FUTURETONE_RECT_SEARCH_WORST=new Rectangle(850+XOFFSET,367,122+XOFFSET+1,22+8); final static Rectangle FUTURETONE_RECT_SEARCH_PCT=new Rectangle(1174+XOFFSET,152,1125,8); final static Rectangle FUTURETONE_RECT_SEARCH_PCT2=new Rectangle(1114+XOFFSET,152,1045,8); final static Rectangle FUTURETONE_RECT_SEARCH_SCORE=new Rectangle(866+XOFFSET,543-4,250+XOFFSET+1,32+24); @@ -786,7 +786,7 @@ public class TypeFace2 { this.img=img; File f = null; BufferedImage test = null; - xpointer=MEGAMIX_RECT_SEARCH_COOL.width-1; + xpointer=img.getWidth()-1; ypointer=0; String total = ""; @@ -799,7 +799,7 @@ public class TypeFace2 { trialloop: while (ypointer<8) { - xpointer=MEGAMIX_RECT_SEARCH_COOL.width-1; + xpointer=img.getWidth()-1; while (xpointer>22) { int foundIndex = -1; //Compare the 22x21 range. diff --git a/DivaBot/typeface.png b/DivaBot/typeface.png index 267e5d2..0e8a774 100644 Binary files a/DivaBot/typeface.png and b/DivaBot/typeface.png differ