v1.1.1 minor improvments

Author: joffreybesos

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.1.1] - 2021-11-02 - Minor improvements
+
+- No longer exits sometimes when changing acts
+- Map will no longer show when at menu
+- Other minor optimisations
+
 ## [1.1.0] - 2021-10-28 - Better map drawing
 
 - Better map alias smoothing

src/d2r-map.ahk

@@ -21,36 +21,47 @@ IniRead, startingOffset, settings.ini, Memory, playerOffset
 
 playerOffset:=startingOffset
 
-SetTimer, UpdateCycle, 1000
+SetTimer, UpdateCycle, 1000 ; the 1000 here is priority, not sleep
 return
 
 UpdateCycle:
 	; scan for the player offset
 	playerOffset := checkLastOffset(playerOffset)
 	if (!playerOffset) {
+		Sleep, 1000
 		playerOffset := scanForPlayerOffset(startingOffset)
 	}
 	if (playerOffset) {
 		pSeedAddress := getMapSeedAddress(playerOffset)
 		if (pSeedAddress) {
 			pLevelNoAddress := getLevelNoAddress(playerOffset)
-			sMapUrl := getD2RMapUrl(baseUrl, pSeedAddress, pLevelNoAddress)
-			if (InStr(lastMap, sMapUrl)) { ; if map not changed then don't update
-			} else {
-				WriteLog("Fetching map from " sMapUrl)
-				lastMap := sMapUrl
-				ShowMap(sMapUrl, width, height, leftMargin, topMargin, opacity)
+			if (pLevelNoAddress) {
+				sMapUrl := getD2RMapUrl(baseUrl, pSeedAddress, pLevelNoAddress)
+				if (InStr(lastMap, sMapUrl)) { ; if map not changed then don't update
+				} else {
+					WriteLog("Fetching map from " sMapUrl)
+					lastMap := sMapUrl
+					ShowMap(sMapUrl, width, height, leftMargin, topMargin, opacity)
+				}
 			}
 		} else {
 			WriteLog("Found playerOffset" playerOffset ", but not map seed address")
-			Sleep, 2000
+			Gui, 1: Hide
+			playerOffset := startingOffset ; reset the offset to default
+			Sleep, 1000
 		}
 	} else {
-		Sleep, 5000  ; sleep longer when no offset found, this means you're in menu
+		playerOffset := startingOffset ; reset the offset to default
+		Gui, 1: Hide
+		Sleep, 3000  ; sleep longer when no offset found, you're likely in menu
 	}
-	Sleep, 1000
+	Sleep, 1000 ; set a pacing of 1 second
 return
 
-+F4::ExitApp  ; shift+f4 to exit app
++F10::
+{
+	WriteLog("Pressed Shift+F10, exiting...")
+	ExitApp
+}
 
 

src/include/getLevelNo.ahk

@@ -36,7 +36,6 @@ getLevelNoAddress(playerOffset) {
     levelNo := d2r.read(dwLevelNo, "UInt")
     if (!levelNo) {
         WriteLog("Did not find level num at address " dwLevelNo " using player offset " playerOffset)    
-        ExitApp
     }
     ;WriteLog("Found level num " levelNo " at address " dwLevelNo)
 

src/include/getPlayerOffset.ahk

@@ -8,10 +8,12 @@ checkLastOffset(startingOffset) {
 }
 
 scanForPlayerOffset(startingOffset) {
-    return getPlayerOffset(startingOffset, 2000)
+    ;WriteLog("Scanning for new player offset address, starting default offset " startingOffset)
+    return getPlayerOffset(startingOffset, 128)
 }
 
 
+
 getPlayerOffset(startingOffset, loops) {
 
     if (_ClassMemory.__Class != "_ClassMemory")
@@ -28,11 +30,9 @@ getPlayerOffset(startingOffset, loops) {
         ExitApp
     }
 
-    ;WriteLog("Looking for player offset address, starting with offset " startingOffset)
-
     loop, %loops%
     {
-        newOffset := HexAdd(startingOffset, A_Index - 1)
+        newOffset := HexAdd(startingOffset, (A_Index - 1) * 8)
         startingAddress := d2r.BaseAddress + newOffset
         playerUnit := d2r.read(startingAddress, "Int64")
         if (playerUnit) {
@@ -47,6 +47,8 @@ getPlayerOffset(startingOffset, loops) {
                 }
 	            newOffset := newOffset + 0
                 return newOffset
+            } else {
+                WriteLog("Found player unit: " playerUnit ", from " A_Index " attempts, but no mapSeed " mapSeed ", ignoring...")
             }
         }
     }

src/include/showMap.ahk

@@ -15,7 +15,7 @@ ShowMap(sMapUrl, width, height, leftMargin, topMargin, opacity) {
 
     sFile=%a_scriptdir%\currentmap.png
     URLDownloadToFile, %sMapUrl%,%sFile%
-
+    
     Gui, 1: -Caption +E0x20 +E0x80000 +LastFound +AlwaysOnTop +ToolWindow +OwnDialogs
     Gui, 1: Show, NA