diff --git a/DivaBot/DivaBot.jar b/DivaBot/DivaBot.jar index 55d5f5f..d4bbed9 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 db0487c..a9a813c 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 be6e15f..e592ced 100644 Binary files a/DivaBot/rectangle0.png and b/DivaBot/rectangle0.png differ diff --git a/DivaBot/rectangle1.png b/DivaBot/rectangle1.png index 954abd8..faecef0 100644 Binary files a/DivaBot/rectangle1.png and b/DivaBot/rectangle1.png differ diff --git a/DivaBot/rectangle2.png b/DivaBot/rectangle2.png index 2d9bfff..6c2319f 100644 Binary files a/DivaBot/rectangle2.png and b/DivaBot/rectangle2.png differ diff --git a/DivaBot/rectangle3.png b/DivaBot/rectangle3.png index 7e92042..04feee3 100644 Binary files a/DivaBot/rectangle3.png and b/DivaBot/rectangle3.png differ diff --git a/DivaBot/rectangle4.png b/DivaBot/rectangle4.png index 2ff0905..0414ee0 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 31307d0..a12a2f0 100644 --- a/DivaBot/src/sig/MyRobot.java +++ b/DivaBot/src/sig/MyRobot.java @@ -395,7 +395,7 @@ public class MyRobot{ Thread.sleep(100); MYROBOT.refreshScoreScreen(); ImageIO.write(MYROBOT.createScoreScreenCapture(),"png",new File("scoreimage.png")); - data = typeface1.getAllData(MYROBOT.createScoreScreenCapture()); + //data = typeface1.getAllData(MYROBOT.createScoreScreenCapture()); } System.out.println("Results for "+selectedSong.title+" "+data.difficulty+": "+data.display()); @@ -824,6 +824,7 @@ public class MyRobot{ selectedSong=new SongData("LIKE THE WIND",null,null,null,null); difficulty="H"; + RunTest("test74.jpg",349,36,0,0,0,101.94f,"EXEX","",385,1107029,false,Mode.FUTURETONE); RunTest("test73.png",456,207,31,11,18,71.06f,"EX","",96,544610,false,Mode.MEGAMIX); RunTest("test72.png",571,129,12,0,19,82.47f,"EX","",153,571680,false,Mode.MEGAMIX); RunTest("test71.png",520,36,0,0,0,104.91f,"EX","",556,888074,false,Mode.FUTURETONE); diff --git a/DivaBot/src/sig/TypeFace2.java b/DivaBot/src/sig/TypeFace2.java index 659eaa2..84748b1 100644 --- a/DivaBot/src/sig/TypeFace2.java +++ b/DivaBot/src/sig/TypeFace2.java @@ -817,7 +817,7 @@ public class TypeFace2 { Color fontCol = new Color(font.getRGB(x+i*22,y)); Color pixelCol = new Color(img.getRGB(xpointer-22+x+1, y+ypointer)); if (fontCol.equals(Color.RED) && pixelCol.getRed()<150 - && pixelCol.getGreen()<150 && pixelCol.getBlue()<150) { + && pixelCol.getGreen()<150 && pixelCol.getBlue()<144) { //Breaks a rule. ruleBreak=true; if (!debug) { diff --git a/DivaBot/testsuite/test74.jpg b/DivaBot/testsuite/test74.jpg new file mode 100644 index 0000000..40a4448 Binary files /dev/null and b/DivaBot/testsuite/test74.jpg differ diff --git a/DivaBot/typeface.png b/DivaBot/typeface.png index 2daca69..065d7fe 100644 Binary files a/DivaBot/typeface.png and b/DivaBot/typeface.png differ diff --git a/Release/DivaBot/DivaBot/DivaBot.jar b/Release/DivaBot/DivaBot/DivaBot.jar index b70ae6a..55d5f5f 100644 Binary files a/Release/DivaBot/DivaBot/DivaBot.jar and b/Release/DivaBot/DivaBot/DivaBot.jar differ diff --git a/Release/DivaBot/DivaBot/typeface.png b/Release/DivaBot/DivaBot/typeface.png index ed97ccf..2daca69 100644 Binary files a/Release/DivaBot/DivaBot/typeface.png and b/Release/DivaBot/DivaBot/typeface.png differ diff --git a/Release/DivaBot/DivaBot/typeface5.png b/Release/DivaBot/DivaBot/typeface5.png index dc129b7..5695779 100644 Binary files a/Release/DivaBot/DivaBot/typeface5.png and b/Release/DivaBot/DivaBot/typeface5.png differ diff --git a/Release/DivaBot05C2.zip b/Release/DivaBot05D.zip similarity index 88% rename from Release/DivaBot05C2.zip rename to Release/DivaBot05D.zip index e3df2eb..ec687a6 100644 Binary files a/Release/DivaBot05C2.zip and b/Release/DivaBot05D.zip differ