Merge pull request #106 from 9-9-9-9/upgrade-afk

Update Client Positioning and Idol Dimension Expedition
9-9-9-9 · Apr 9, 2023 · 4d46332 · 4d46332
2 parents fe085a1 + 9e8bd8f
commit 4d46332
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 deletions.
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.6.2</version>
+	<version>3.7.0</version>
 
 	<dependencies>
 		<dependency>

diff --git a/src/main/java/bh/bot/app/AfkApp.java b/src/main/java/bh/bot/app/AfkApp.java
@@ -261,6 +261,11 @@ private void doLoop(//
             ML:
             while (!masterSwitch.get()) {
                 sleep(loopSleep);
+                try {
+                    adjustScreenOffset();
+                } catch (Exception ex) {
+                    err("Unable to detect screen offset: %s", ex.getMessage());
+                }
 
                 debug("doLoop on loop");
                 if (toBeRemoved.size() > 0) {

diff --git a/src/main/java/bh/bot/common/jna/MiniClientWindowsJna.java b/src/main/java/bh/bot/common/jna/MiniClientWindowsJna.java
@@ -57,7 +57,7 @@ public Tuple4<Boolean, String, Rectangle, Offset> locateGameScreenOffset(Desktop
 		if (rect.width <= 0 || rect.height <= 0)
 			return new Tuple4<>(false, "Window has minimized", null, null);
 
-		Offset offset = new Offset(rect.x, rect.y+45);
+		Offset offset = new Offset(rect.x+10, rect.y+32);
 		if (offset.X < 0 || offset.Y < 0)
 			Main.showWarningWindowMustClearlyVisible();
 

diff --git a/src/main/java/bh/bot/common/types/ScreenResolutionProfile.java b/src/main/java/bh/bot/common/types/ScreenResolutionProfile.java
@@ -699,22 +699,22 @@ public Offset getOffsetLabelIdolDimension() {
 
 		@Override
 		public Offset getOffsetEnterIdolDimensionBlubLix() {
-			return new Offset(400, 183);
+			return new Offset(400, 170);
 		}
 
 		@Override
 		public Offset getOffsetEnterIdolDimensionMowhi() {
-			return new Offset(242, 389);
+			return new Offset(240, 400);
 		}
 
 		@Override
 		public Offset getOffsetEnterIdolDimensionWizBot() {
-			return new Offset(559, 389);
+			return new Offset(555, 400);
 		}
 
 		@Override
 		public Offset getOffsetEnterIdolDimensionAstamus() {
-			return new Offset(400, 311);
+			return new Offset(400, 320);
 		}
 
 		@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
@@ -810,7 +810,7 @@ public static void load() throws IOException {
                 0xFFFFFF
         );
         Metas.Expedition.Labels.idolDimension = BwMatrixMeta.from(//
-                "labels/expedition.idol-dimension?",
+                "labels/expedition.idol-dimension2?",
                 Configuration.screenResolutionProfile.getOffsetLabelIdolDimension(), //
                 0xFFFFFF
         );

diff --git a/src/main/resources/game-images/800x520/labels/expedition.idol-dimension2-tp.bmp b/src/main/resources/game-images/800x520/labels/expedition.idol-dimension2-tp.bmp
diff --git a/web/json/reject-versions-2.json b/web/json/reject-versions-2.json
@@ -1,5 +1,5 @@
 {
-	"bv": ["3.6.0", "3.5.0", "3.4.0", "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"],
+	"bv": ["3.6.2", "3.6.0", "3.5.0", "3.4.0", "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.1":  ["invasion"],
 		"3.4.0":  ["invasion","gvg","gauntlet"]