Merge pull request #89 from 9-9-9-9/b/09-12-2022

Fix Invasion + Close chat box
9-9-9-9 · Dec 9, 2022 · 7d263fe · 7d263fe
2 parents c149d8a + 7f9814b
commit 7d263fe
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 7 deletions.
diff --git 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
@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>bh.bot</groupId>
 	<artifactId>99bot</artifactId>
-	<version>3.4.1</version>
+	<version>3.4.2</version>
 
 	<dependencies>
 		<dependency>

diff --git 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
@@ -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
@@ -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
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
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
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