diff --git a/README.md b/README.md index 0fa4c22..c946f60 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ ## Welcome Bit Verse ### and new BH update at Nov 16th 2022 & Nov 28th 2022 ### Remaining features need to be updated -- [ ] Invasion - [ ] Idol Dimension (Expedition) - [ ] Hallowed Dimension (Expedition) - [ ] Jammie Dimension (Expedition) diff --git a/pom.xml b/pom.xml index 798ae0b..6a4f9e5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 bh.bot 99bot - 3.4.1 + 3.4.2 diff --git a/src/main/java/bh/bot/common/types/AttendablePlace.java b/src/main/java/bh/bot/common/types/AttendablePlace.java index 34e31d0..c7c6a42 100644 --- a/src/main/java/bh/bot/common/types/AttendablePlace.java +++ b/src/main/java/bh/bot/common/types/AttendablePlace.java @@ -24,12 +24,10 @@ public AttendablePlace(String name, int id, String imgCode, boolean left, int pr String imgFile; switch(imgCode) { - case "invasion": - imgFile = imgCode + "2"; - break; case "pvp": case "world-boss": case "raid": + case "invasion": case "trials": case "gvg": case "gauntlet": diff --git a/src/main/java/bh/bot/common/types/ScreenResolutionProfile.java b/src/main/java/bh/bot/common/types/ScreenResolutionProfile.java index 787e876..7a83612 100644 --- a/src/main/java/bh/bot/common/types/ScreenResolutionProfile.java +++ b/src/main/java/bh/bot/common/types/ScreenResolutionProfile.java @@ -740,7 +740,7 @@ public Offset getOffsetButtonSendMessage() { @Override public Offset getOffsetButtonCloseChatBox() { - return new Offset(603, 101); + return new Offset(598, 98); } @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 a79a526..9766986 100644 --- a/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java +++ b/src/main/java/bh/bot/common/types/images/BwMatrixMeta.java @@ -418,7 +418,7 @@ public static void load() throws IOException { 0xCEDEB5 ); Metas.Globally.Buttons.closeChatBox = BwMatrixMeta.from(// - "buttons/globally.close-chatbox2?", + "buttons/globally.close-chatbox3?", Configuration.screenResolutionProfile.getOffsetButtonCloseChatBox(), // 0xFFFFFF ); diff --git a/src/main/resources/game-images/800x520/buttons/globally.close-chatbox2-tp.bmp b/src/main/resources/game-images/800x520/buttons/globally.close-chatbox2-tp.bmp deleted file mode 100644 index 812c875..0000000 Binary files a/src/main/resources/game-images/800x520/buttons/globally.close-chatbox2-tp.bmp and /dev/null differ diff --git a/src/main/resources/game-images/800x520/buttons/globally.close-chatbox3-tp.bmp b/src/main/resources/game-images/800x520/buttons/globally.close-chatbox3-tp.bmp new file mode 100644 index 0000000..4ab5214 Binary files /dev/null and b/src/main/resources/game-images/800x520/buttons/globally.close-chatbox3-tp.bmp differ diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/invasion2-tp.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/invasion2-tp.bmp deleted file mode 100644 index 0c3578c..0000000 Binary files a/src/main/resources/game-images/800x520/labels/attendable-places/invasion2-tp.bmp and /dev/null differ diff --git a/src/main/resources/game-images/800x520/labels/attendable-places/invasion3-tp.bmp b/src/main/resources/game-images/800x520/labels/attendable-places/invasion3-tp.bmp new file mode 100644 index 0000000..ec4a54c Binary files /dev/null and b/src/main/resources/game-images/800x520/labels/attendable-places/invasion3-tp.bmp differ