Merge pull request #88 from 9-9-9-9/b/01-12-2022

Fix GVG + Gauntlet

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)

pom.xml

@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>bh.bot</groupId>
 	<artifactId>99bot</artifactId>
-	<version>3.4.0</version>
+	<version>3.4.1</version>
 
 	<dependencies>
 		<dependency>

src/main/java/bh/bot/app/dev/TestApp.java

@@ -41,16 +41,6 @@ protected void internalRun(String[] args) {
 		adjustScreenOffset();
 
 		//
-		Tuple2<Point[], Byte> 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() {

src/main/java/bh/bot/common/types/AttendablePlace.java

@@ -24,15 +24,15 @@ 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 "trials":
+	    	case "gvg":
+	    	case "gauntlet":
 	    	case "expedition":
 	        	imgFile = imgCode + "3";
 	        	break;

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

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
         );

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"]
 	}
 }