diff --git a/README.md b/README.md index dac5095..0fa4c22 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,6 @@ ### 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 8d0029b..798ae0b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 bh.bot 99bot - 3.4.0 + 3.4.1 diff --git a/src/main/java/bh/bot/app/dev/TestApp.java b/src/main/java/bh/bot/app/dev/TestApp.java index b18ae46..3161a2f 100644 --- a/src/main/java/bh/bot/app/dev/TestApp.java +++ b/src/main/java/bh/bot/app/dev/TestApp.java @@ -41,16 +41,6 @@ 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 969999f..34e31d0 100644 --- a/src/main/java/bh/bot/common/types/AttendablePlace.java +++ b/src/main/java/bh/bot/common/types/AttendablePlace.java @@ -24,8 +24,6 @@ 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; @@ -33,6 +31,8 @@ public AttendablePlace(String name, int id, String imgCode, boolean left, int pr case "world-boss": case "raid": case "trials": + case "gvg": + case "gauntlet": case "expedition": imgFile = imgCode + "3"; break; diff --git a/src/main/java/bh/bot/common/types/ScreenResolutionProfile.java b/src/main/java/bh/bot/common/types/ScreenResolutionProfile.java index fb082f4..787e876 100644 --- a/src/main/java/bh/bot/common/types/ScreenResolutionProfile.java +++ b/src/main/java/bh/bot/common/types/ScreenResolutionProfile.java @@ -265,7 +265,7 @@ public Offset getOffsetButtonTalkRightArrow() { @Override public Offset getOffsetButtonReconnect() { - return new Offset(344, 353); + return new Offset(336, 352); } @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 1972cdf..a79a526 100644 --- a/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java +++ b/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java @@ -378,7 +378,7 @@ public static void load() throws IOException { 0x000000 ); Metas.Globally.Buttons.reconnect = BwMatrixMeta.from(// - "buttons/globally.reconnect2?", + "buttons/globally.reconnect3?", Configuration.screenResolutionProfile.getOffsetButtonReconnect(), // 0xFFFFFF ); diff --git a/src/main/resources/game-images/800x520/buttons/globally.reconnect2-tp.bmp b/src/main/resources/game-images/800x520/buttons/globally.reconnect2-tp.bmp deleted file mode 100644 index 995e0ab..0000000 Binary files a/src/main/resources/game-images/800x520/buttons/globally.reconnect2-tp.bmp and /dev/null differ diff --git a/src/main/resources/game-images/800x520/buttons/globally.reconnect3-tp.bmp b/src/main/resources/game-images/800x520/buttons/globally.reconnect3-tp.bmp new file mode 100644 index 0000000..1b8b102 Binary files /dev/null and b/src/main/resources/game-images/800x520/buttons/globally.reconnect3-tp.bmp differ diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/gauntlet2-tp.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/gauntlet2-tp.bmp deleted file mode 100644 index c809962..0000000 Binary files a/src/main/resources/game-images/800x520/labels/attendable-places/gauntlet2-tp.bmp and /dev/null differ diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/gauntlet3-tp.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/gauntlet3-tp.bmp new file mode 100644 index 0000000..cf42d4e Binary files /dev/null and b/src/main/resources/game-images/800x520/labels/attendable-places/gauntlet3-tp.bmp differ diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/gvg2-tp.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/gvg2-tp.bmp deleted file mode 100644 index e9b7c28..0000000 Binary files a/src/main/resources/game-images/800x520/labels/attendable-places/gvg2-tp.bmp and /dev/null differ diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/gvg3-tp.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/gvg3-tp.bmp new file mode 100644 index 0000000..3bfa555 Binary files /dev/null and b/src/main/resources/game-images/800x520/labels/attendable-places/gvg3-tp.bmp differ diff --git a/web/json/reject-versions-2.json b/web/json/reject-versions-2.json index 9bc2858..7aed940 100644 --- a/web/json/reject-versions-2.json +++ b/web/json/reject-versions-2.json @@ -1,6 +1,7 @@ { "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.4.0": ["invasion","gauntlet"] + "3.4.1": ["invasion"], + "3.4.0": ["invasion","gvg","gauntlet"] } }