Merge pull request #87 from 9-9-9-9/b/fix-update-29-11-2022

Fix bot after Nov 28th 2022

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)

pom.xml

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

src/main/java/bh/bot/app/AbstractApplication.java

@@ -605,7 +605,9 @@ protected Tuple2<Point[], Byte> 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<Point[], Byte> 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<Point[], Byte> detectRadioButtons(Rectangle scanRect) {
 							x, y
 					);
 					startingCoords.add(new Point(x, y));
+					x += Math.max(0, im.getWidth() - 2);
 				}
 			}
 

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

@@ -41,6 +41,16 @@ 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,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;

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

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

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

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