diff --git a/DivaBot/DivaBot.jar b/DivaBot/DivaBot.jar index 12746e7..60dd79e 100644 Binary files a/DivaBot/DivaBot.jar and b/DivaBot/DivaBot.jar differ diff --git a/DivaBot/calibration_data.txt b/DivaBot/calibration_data.txt index e031c48..38f461e 100644 --- a/DivaBot/calibration_data.txt +++ b/DivaBot/calibration_data.txt @@ -1,4 +1,4 @@ -530 -260 -1573 -845 +517 +265 +1485 +808 diff --git a/DivaBot/src/sig/MyRobot.java b/DivaBot/src/sig/MyRobot.java index 10d51fe..670627a 100644 --- a/DivaBot/src/sig/MyRobot.java +++ b/DivaBot/src/sig/MyRobot.java @@ -397,7 +397,7 @@ public class MyRobot{ } private void GetCurrentDifficulty() { - Color c = new Color(MYROBOT.createScreenCapture(new Rectangle(653,459,10,10)).getRGB(5, 5)); + Color c = new Color(MYROBOT.createScreenCapture(new Rectangle(320,274,10,10)).getRGB(0, 0)); //return c.getRed()==43 && c.getGreen()==88 && c.getBlue()==213; if (c.getRed()>100 && c.getRed()<200 && c.getBlue()>200 && c.getBlue()<255 && c.getGreen()<50) { difficulty="EXEX"; @@ -407,6 +407,12 @@ public class MyRobot{ } else if (c.getRed()>175 && c.getRed()<225 && c.getBlue()<50 && c.getGreen()<175 && c.getGreen()>135) { difficulty="H"; + } else + if (c.getRed()>0 && c.getRed()<50 && c.getBlue()<50 && c.getGreen()<255 && c.getGreen()>190) { + difficulty="N"; + } else + if (c.getRed()>0 && c.getRed()<50 && c.getBlue()>170 && c.getBlue()<230 && c.getGreen()<190 && c.getGreen()>150) { + difficulty="E"; } } private void GetCurrentSong() throws IOException {