Include Future Tone livestreaming image updates, update typeface for

more accuracy.

DivaBot/config.txt

@@ -1,4 +1,4 @@
-DISPLAYDATA	-16765135*-10027060*48*Yu Gothic UI Bold*665*64*10000*Song Title (Japanese+Romanized)|Song Title (English)*80*16**~-16765135*-10027060*48*Yu Gothic UI Light*380*64*10000*Best Play*80*952**~-16765135*-10027060*48*Yu Gothic UI Light*380*64*10000*Overall Rating*560*952**~-16765135*-10027060*48*Yu Gothic UI Light*380*64*10000*Song Difficulty|Pass/Play Count (+%)|FC Count (+%)*1048*952**~-16765135*-10027060*16*Yu Gothic UI Semilight*245*14*10000*Song Artist*504*16*Artist: *
+DISPLAYDATA	-16765135*-10027060*48*Yu Gothic UI Bold*665*64*10000*Song Title (Japanese+Romanized)|Song Title (English)*80*16**~-16765135*-10027060*48*Yu Gothic UI Light*380*64*10000*Best Play*80*952**~-16765135*-10027060*48*Yu Gothic UI Light*380*64*10000*Overall Rating*560*952**~-16765135*-10027060*48*Yu Gothic UI Light*380*64*10000*Song Difficulty|Pass/Play Count (+%)|FC Count (+%)*1048*952**~-16765135*-10027060*16*Yu Gothic UI Semilight*245*14*10000*Song Artist*504*16*Artist: *~-16765135*-10027060*48*Yu Gothic UI Light*380*128*10000*Song Difficulty*840*320**
 LAST_HEIGHT	128
 WIDTH	1936
 HEIGHT	1096

DivaBot/src/sig/ColorRegion.java

@@ -41,7 +41,11 @@ public class ColorRegion {
 				if (region.x+x<0||region.x+x>=region.x+region.width||region.y+y<0||region.y+y>=region.y+region.height) {
 					continue;
 				}
+				try {
 					total+=new Color(img.getRGB(region.x+x, region.y+y)).getRed();
+				} catch (NullPointerException|ArrayIndexOutOfBoundsException e) {
+					
+				}
 			}
 		}
 		return total/(region.width*region.height);
@@ -53,7 +57,11 @@ public class ColorRegion {
 				if (region.x+x<0||region.x+x>=region.x+region.width||region.y+y<0||region.y+y>=region.y+region.height) {
 					continue;
 				}
+				try {
 					total+=new Color(img.getRGB(region.x+x, region.y+y)).getGreen();
+				} catch (NullPointerException|ArrayIndexOutOfBoundsException e) {
+					
+				}
 			}
 		}
 		return total/(region.width*region.height);
@@ -65,7 +73,11 @@ public class ColorRegion {
 				if (region.x+x<0||region.x+x>=region.x+region.width||region.y+y<0||region.y+y>=region.y+region.height) {
 					continue;
 				}
+				try {
 					total+=new Color(img.getRGB(region.x+x, region.y+y)).getBlue();
+				} catch (NullPointerException|ArrayIndexOutOfBoundsException e) {
+					
+				}
 			}
 		}
 		return total/(region.width*region.height);

DivaBot/src/sig/MyRobot.java

@@ -292,7 +292,6 @@ public class MyRobot{
 				p.overallrating = (int)obj.getDouble("rating");
 				if (p.lastRating<p.overallrating) {p.ratingTime=System.currentTimeMillis();}
 			}	
-			
 		} catch (JSONException e) {
 			e.printStackTrace();
 		} catch (IOException e) {
@@ -823,6 +822,12 @@ public class MyRobot{
 		selectedSong=new SongData("LIKE THE WIND",null,null,null,null);
 		difficulty="H";
 
+		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);
+		RunTest("test70.png",670,42,0,0,0,103.54f,"EX","",712,726704,false,Mode.FUTURETONE);
+		RunTest("test69.png",731,144,9,2,2,89.74f,"EX","",273,750387,false,Mode.FUTURETONE);
+		RunTest("test68.png",590,63,0,0,0,103.40f,"EX","",653,783607,false,Mode.FUTURETONE);
+		RunTest("test67.png",592,65,0,0,0,102.41f,"EX","",657,883256,false,Mode.FUTURETONE);
 		RunTest("test65.png",561,100,3,2,2,95.40f,"EX","HS",445,755216,false,Mode.FUTURETONE);
 		RunTest("test64.png",518,30,3,0,6,96.13f,"EX","HS",197,666116,false,Mode.FUTURETONE);
 		RunTest("test63.png",0,0,0,0,1000,0.00f,"EX","",0,0,true,Mode.FUTURETONE);

DivaBot/src/sig/TypeFace2.java

@@ -210,6 +210,7 @@ public class TypeFace2 {
 				result.difficulty = getDifficulty(difficultyRegion);
 				if (debug) {
 					System.out.println("Diff:"+result.difficulty+"/"+difficultyRegion);
+					ImageIO.write(difficultyRegion.img.getSubimage(difficultyRegion.region.x,difficultyRegion.region.y,difficultyRegion.region.width,difficultyRegion.region.height),"png",new File("debug","difficulty.png"));
 				}
 			}break;
 			case FUTURETONE:{
@@ -217,6 +218,7 @@ public class TypeFace2 {
 				result.difficulty = getFutureToneDifficulty(difficultyRegion);
 				if (debug) {
 					System.out.println("Diff:"+result.difficulty+"/"+difficultyRegion);
+					ImageIO.write(difficultyRegion.img.getSubimage(difficultyRegion.region.x,difficultyRegion.region.y,difficultyRegion.region.width,difficultyRegion.region.height),"png",new File("debug","difficulty.png"));
 				}
 			}break;
 		}