diff --git a/README.md b/README.md index b4ccf34f..dac5095a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ ## Welcome Bit Verse -### and new BH update at Nov 16 2022 -### Almost functions were fixed and back to work. Expedition will be fixed as soon as possible +### and new BH update at Nov 16th 2022 & Nov 28th 2022 +### Remaining features need to be updated +- [ ] Invasion +- [ ] Gauntlet +- [ ] GVG - [ ] Idol Dimension (Expedition) - [ ] Hallowed Dimension (Expedition) - [ ] Jammie Dimension (Expedition) diff --git a/pom.xml b/pom.xml index df22675a..8d0029bb 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 bh.bot 99bot - 3.3.0 + 3.4.0 diff --git a/src/main/java/bh/bot/app/AbstractApplication.java b/src/main/java/bh/bot/app/AbstractApplication.java index b320a7fe..3fbc4abe 100644 --- a/src/main/java/bh/bot/app/AbstractApplication.java +++ b/src/main/java/bh/bot/app/AbstractApplication.java @@ -605,7 +605,9 @@ protected Tuple2 detectRadioButtons(Rectangle scanRect) { try (ScreenCapturedResult screenCapturedResult = captureElementInEstimatedArea( new Offset(Math.max(0, scanRect.x - positionTolerant), Math.max(0, scanRect.y - positionTolerant)), - scanRect.width + positionTolerant * 2, scanRect.height + positionTolerant * 2)) { + scanRect.width + positionTolerant * 2, + scanRect.height + positionTolerant * 2 + )) { BufferedImage sc = screenCapturedResult.image; saveDebugImage(sc, "detectRadioButtons"); @@ -675,7 +677,7 @@ protected Tuple2 detectRadioButtons(Rectangle scanRect) { else { if (selectedRadioButtonIndex != curRadioButtonIndex) throw new InvalidDataException( - "Found more than one selected radio button which is absolutely wrong!" + String.format("Found more than one selected radio button which is absolutely wrong! (no.%d conflicts with no.%d)", curRadioButtonIndex + 1, selectedRadioButtonIndex + 1) ); } break; @@ -687,6 +689,7 @@ protected Tuple2 detectRadioButtons(Rectangle scanRect) { x, y ); startingCoords.add(new Point(x, y)); + x += Math.max(0, im.getWidth() - 2); } } diff --git a/src/main/java/bh/bot/app/dev/TestApp.java b/src/main/java/bh/bot/app/dev/TestApp.java index 3161a2f9..b18ae469 100644 --- a/src/main/java/bh/bot/app/dev/TestApp.java +++ b/src/main/java/bh/bot/app/dev/TestApp.java @@ -41,6 +41,16 @@ protected void internalRun(String[] args) { adjustScreenOffset(); // + Tuple2 result = detectRadioButtons( + Configuration.screenResolutionProfile.getRectangleRadioButtonsOfRaid() + ); + Point[] points = result._1; + int selectedLevel = result._2 + 1; + info("Selected %d", selectedLevel); + for (int i = 0; i < points.length; i++) { + Point p = points[i]; + info("[%d] %d,%d", i + 1, p.x - Configuration.gameScreenOffset.X.get(), p.y - Configuration.gameScreenOffset.Y.get()); + } } private static void testParseTime() { diff --git a/src/main/java/bh/bot/common/types/AttendablePlace.java b/src/main/java/bh/bot/common/types/AttendablePlace.java index 0619e877..969999f7 100644 --- a/src/main/java/bh/bot/common/types/AttendablePlace.java +++ b/src/main/java/bh/bot/common/types/AttendablePlace.java @@ -24,15 +24,17 @@ public AttendablePlace(String name, int id, String imgCode, boolean left, int pr String imgFile; switch(imgCode) { + case "gvg": + case "gauntlet": + case "invasion": + imgFile = imgCode + "2"; + break; case "pvp": case "world-boss": case "raid": - case "gvg": case "trials": - case "gauntlet": - case "invasion": case "expedition": - imgFile = imgCode + "2"; + imgFile = imgCode + "3"; break; default: imgFile = imgCode; diff --git a/src/main/java/bh/bot/common/types/ScreenResolutionProfile.java b/src/main/java/bh/bot/common/types/ScreenResolutionProfile.java index 1b8f65b2..fb082f4b 100644 --- a/src/main/java/bh/bot/common/types/ScreenResolutionProfile.java +++ b/src/main/java/bh/bot/common/types/ScreenResolutionProfile.java @@ -510,7 +510,7 @@ public Offset getOffsetButtonTownAfterCompetedGauntlet() { @Override public Offset getOffsetButtonAuto() { - return new Offset(778, 213); + return new Offset(777, 214); } @Override diff --git a/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java b/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java index fc6710c6..1972cdf5 100644 --- a/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java +++ b/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java @@ -383,17 +383,17 @@ public static void load() throws IOException { 0xFFFFFF ); Metas.Globally.Buttons.autoG = BwMatrixMeta.from(// - "buttons/globally.auto-green2?", + "buttons/globally.auto-green3?", Configuration.screenResolutionProfile.getOffsetButtonAuto(), // 0xFFFFFF ); Metas.Globally.Buttons.autoR = BwMatrixMeta.from(// - "buttons/globally.auto-red2?", + "buttons/globally.auto-red3?", Configuration.screenResolutionProfile.getOffsetButtonAuto(), // 0xFFFFFF ); Metas.Globally.Buttons.radioButton = BwMatrixMeta.from(// - "buttons/globally.radio-button2?", + "buttons/globally.radio-button3?", Offset.none(), // 0x000000 ); diff --git a/src/main/java/bh/bot/common/utils/InteractionUtil.java b/src/main/java/bh/bot/common/utils/InteractionUtil.java index 36d8ca81..261f70c6 100644 --- a/src/main/java/bh/bot/common/utils/InteractionUtil.java +++ b/src/main/java/bh/bot/common/utils/InteractionUtil.java @@ -77,7 +77,7 @@ public static void hideCursor() { public static void clickRadioButton(int level, Point[] points, String evName) { if (level < 1 || level > points.length) throw new InvalidDataException( - "Can not select level %d of %s because it's not exists, do you setup wrongly?", level, evName + "Can not select level %d/%d of %s because it's not exists, do you setup wrongly?", level, points.length, evName ); Point p = points[level - 1]; moveCursor(new Point(p.x + 7, p.y + 7)); diff --git a/src/main/resources/game-images/800x520/buttons/globally.auto-green2-tp.bmp b/src/main/resources/game-images/800x520/buttons/globally.auto-green2-tp.bmp deleted file mode 100644 index afd07199..00000000 Binary files a/src/main/resources/game-images/800x520/buttons/globally.auto-green2-tp.bmp and /dev/null differ diff --git a/src/main/resources/game-images/800x520/buttons/globally.auto-green3-tp.bmp b/src/main/resources/game-images/800x520/buttons/globally.auto-green3-tp.bmp new file mode 100644 index 00000000..5a129f20 Binary files /dev/null and b/src/main/resources/game-images/800x520/buttons/globally.auto-green3-tp.bmp differ diff --git a/src/main/resources/game-images/800x520/buttons/globally.auto-red2-tp.bmp b/src/main/resources/game-images/800x520/buttons/globally.auto-red2-tp.bmp deleted file mode 100644 index f1384018..00000000 Binary files a/src/main/resources/game-images/800x520/buttons/globally.auto-red2-tp.bmp and /dev/null differ diff --git a/src/main/resources/game-images/800x520/buttons/globally.auto-red3-tp.bmp b/src/main/resources/game-images/800x520/buttons/globally.auto-red3-tp.bmp new file mode 100644 index 00000000..71a55def Binary files /dev/null and b/src/main/resources/game-images/800x520/buttons/globally.auto-red3-tp.bmp differ diff --git a/src/main/resources/game-images/800x520/buttons/globally.radio-button2-mx.bmp b/src/main/resources/game-images/800x520/buttons/globally.radio-button2-mx.bmp deleted file mode 100644 index 3654b405..00000000 Binary files a/src/main/resources/game-images/800x520/buttons/globally.radio-button2-mx.bmp and /dev/null differ diff --git a/src/main/resources/game-images/800x520/buttons/globally.radio-button3-mx.bmp b/src/main/resources/game-images/800x520/buttons/globally.radio-button3-mx.bmp new file mode 100644 index 00000000..71af434c Binary files /dev/null and b/src/main/resources/game-images/800x520/buttons/globally.radio-button3-mx.bmp differ diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/expedition2-tp.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/expedition2-tp.bmp deleted file mode 100644 index 66709945..00000000 Binary files a/src/main/resources/game-images/800x520/labels/attendable-places/expedition2-tp.bmp and /dev/null differ diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/expedition3-tp.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/expedition3-tp.bmp new file mode 100644 index 00000000..2d7454bd Binary files /dev/null and b/src/main/resources/game-images/800x520/labels/attendable-places/expedition3-tp.bmp differ diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/pvp2-tp.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/pvp2-tp.bmp deleted file mode 100644 index a0519f11..00000000 Binary files a/src/main/resources/game-images/800x520/labels/attendable-places/pvp2-tp.bmp and /dev/null differ diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/pvp3-tp.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/pvp3-tp.bmp new file mode 100644 index 00000000..d4b5308b Binary files /dev/null and b/src/main/resources/game-images/800x520/labels/attendable-places/pvp3-tp.bmp differ diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/raid2-tp.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/raid2-tp.bmp deleted file mode 100644 index a2c64f2a..00000000 Binary files a/src/main/resources/game-images/800x520/labels/attendable-places/raid2-tp.bmp and /dev/null differ diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/raid3-tp.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/raid3-tp.bmp new file mode 100644 index 00000000..22465a31 Binary files /dev/null and b/src/main/resources/game-images/800x520/labels/attendable-places/raid3-tp.bmp differ diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/trials2-tp.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/trials2-tp.bmp deleted file mode 100644 index efe4f2fa..00000000 Binary files a/src/main/resources/game-images/800x520/labels/attendable-places/trials2-tp.bmp and /dev/null differ diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/trials3-tp.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/trials3-tp.bmp new file mode 100644 index 00000000..ba655b67 Binary files /dev/null and b/src/main/resources/game-images/800x520/labels/attendable-places/trials3-tp.bmp differ diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/world-boss2-tp.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/world-boss2-tp.bmp deleted file mode 100644 index 402e172c..00000000 Binary files a/src/main/resources/game-images/800x520/labels/attendable-places/world-boss2-tp.bmp and /dev/null differ diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/world-boss3-tp.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/world-boss3-tp.bmp new file mode 100644 index 00000000..c01b3c18 Binary files /dev/null and b/src/main/resources/game-images/800x520/labels/attendable-places/world-boss3-tp.bmp differ diff --git a/web/json/reject-versions-2.json b/web/json/reject-versions-2.json index 2a7cba31..9bc28586 100644 --- a/web/json/reject-versions-2.json +++ b/web/json/reject-versions-2.json @@ -1,8 +1,6 @@ { - "bv": ["2.12.0","2.11.0","2.10.1","2.10.0","2.9.3","2.9.2","2.9.1","2.9.0","2.8.6","2.8.5","2.8.4","2.8.3","2.8.2","2.8.1","2.8.0","2.7.0","2.6.0","2.5.0","2.4.0","2.3.0","2.2.0","2.1.0","2.0.1","2.0.0"], + "bv": ["3.3.0","3.2.0","3.1.0","3.0.0","2.12.0","2.11.0","2.10.1","2.10.0","2.9.3","2.9.2","2.9.1","2.9.0","2.8.6","2.8.5","2.8.4","2.8.3","2.8.2","2.8.1","2.8.0","2.7.0","2.6.0","2.5.0","2.4.0","2.3.0","2.2.0","2.1.0","2.0.1","2.0.0"], "bf": { - "3.2.0": ["expedition"], - "3.1.0": ["expedition"], - "3.0.0": ["expedition","invasion","gauntlet"] + "3.4.0": ["invasion","gauntlet"] } }