shrines and portals

Author: joffreybesos

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.3.3] - 2021-12-13 - Shrines and portals
+
+- Shrine types will now show on the map
+- You have to be in range for it to show, they will not persist
+- Town portals will now show on the map as well
+- Red portals (such as cow level) should appear in red, normal portals in blue
+- Can be turned on/off with `showShrines` and `showPortals` in `settings.ini`
+- Can also configure `portalColor`, `redPortalColor`, `shrineColor` and `shrineTextSize`
+
 ## [2.3.2] - 2021-12-13 - Performance improvements
 
 - Major refactor of how mobs/player units are drawn, which gives better performance

src/d2r-map.ahk

@@ -13,11 +13,11 @@ SetWorkingDir, %A_ScriptDir%
 #Include %A_ScriptDir%\ui\showMap.ahk
 #Include %A_ScriptDir%\ui\showText.ahk
 #Include %A_ScriptDir%\ui\showHelp.ahk
-#Include %A_ScriptDir%\ui\showPlayer.ahk
+#Include %A_ScriptDir%\ui\showUnits.ahk
 #Include %A_ScriptDir%\ui\showLastGame.ahk
 #Include %A_ScriptDir%\readSettings.ahk
 
-expectedVersion := "2.3.2"
+expectedVersion := "2.3.3"
 
 if !FileExist(A_Scriptdir . "\settings.ini") {
     MsgBox, , Missing settings, Could not find settings.ini file
@@ -157,7 +157,7 @@ While 1 {
             }
             ; update player layer on each loop
             uiData["ticktock"] := ticktock
-            ShowPlayer(settings, unitHwnd1, imageData, gameMemoryData, uiData)
+            ShowUnits(settings, unitHwnd1, imageData, gameMemoryData, uiData)
             checkAutomapVisibility(d2rprocess, settings, gameMemoryData["levelNo"])
 
             lastlevel := gameMemoryData["levelNo"]
@@ -253,7 +253,7 @@ MapSizeIncrease:
         IniWrite, %levelScale%, mapconfig.ini, %levelNo%, scale
         imageData["levelScale"] := levelScale
         ShowMap(settings, mapHwnd1, imageData, gameMemoryData, uiData)
-        ;ShowPlayer(settings, unitHwnd1, imageData, gameMemoryData, uiData)
+        ;ShowUnits(settings, unitHwnd1, imageData, gameMemoryData, uiData)
         WriteLog("Increased level " levelNo " scale by 0.05 to " levelScale)
     }
     return
@@ -268,7 +268,7 @@ MapSizeDecrease:
         IniWrite, %levelScale%, mapconfig.ini, %levelNo%, scale
         imageData["levelScale"] := levelScale
         ShowMap(settings, mapHwnd1, imageData, gameMemoryData, uiData)
-        ;ShowPlayer(settings, unitHwnd1, imageData, gameMemoryData, uiData)
+        ;ShowUnits(settings, unitHwnd1, imageData, gameMemoryData, uiData)
         WriteLog("Decreased level " levelNo " scale by 0.05 to " levelScale)
     }
     return
@@ -285,7 +285,7 @@ MapSizeDecrease:
             IniWrite, %levelxmargin%, mapconfig.ini, %levelNo%, x
             imageData["levelxmargin"] := levelxmargin
             ShowMap(settings, mapHwnd1, imageData, gameMemoryData, uiData)
-            ;ShowPlayer(settings, unitHwnd1, imageData, gameMemoryData, uiData)
+            ;ShowUnits(settings, unitHwnd1, imageData, gameMemoryData, uiData)
         }
         return
     }
@@ -299,7 +299,7 @@ MapSizeDecrease:
             IniWrite, %levelxmargin%, mapconfig.ini, %levelNo%, x
             imageData["levelxmargin"] := levelxmargin
             ShowMap(settings, mapHwnd1, imageData, gameMemoryData, uiData)
-            ;ShowPlayer(settings, unitHwnd1, imageData, gameMemoryData, uiData)
+            ;ShowUnits(settings, unitHwnd1, imageData, gameMemoryData, uiData)
         }
         return
     }
@@ -313,7 +313,7 @@ MapSizeDecrease:
             IniWrite, %levelymargin%, mapconfig.ini, %levelNo%, y
             imageData["levelymargin"] := levelymargin
             ShowMap(settings, mapHwnd1, imageData, gameMemoryData, uiData)
-            ;ShowPlayer(settings, unitHwnd1, imageData, gameMemoryData, uiData)
+            ;ShowUnits(settings, unitHwnd1, imageData, gameMemoryData, uiData)
         }
         return
     }
@@ -327,7 +327,7 @@ MapSizeDecrease:
             IniWrite, %levelymargin%, mapconfig.ini, %levelNo%, y
             imageData["levelymargin"] := levelymargin
             ShowMap(settings, mapHwnd1, imageData, gameMemoryData, uiData)
-            ;ShowPlayer(settings, unitHwnd1, imageData, gameMemoryData, uiData)
+            ;ShowUnits(settings, unitHwnd1, imageData, gameMemoryData, uiData)
         }
         return
     }

src/memory/readGameMemory.ahk

@@ -3,6 +3,7 @@
 #Include %A_ScriptDir%\memory\readOtherPlayers.ahk
 #Include %A_ScriptDir%\memory\readMobs.ahk
 #Include %A_ScriptDir%\memory\readItems.ahk
+#Include %A_ScriptDir%\memory\readObjects.ahk
 
 #Include %A_ScriptDir%\include\logging.ahk
 SetWorkingDir, %A_ScriptDir%
@@ -83,6 +84,12 @@ readGameMemory(d2rprocess, settings, playerOffset, ByRef gameMemoryData) {
         ReadItems(d2rprocess, startingOffset, items)
     }
 
+     ; get items
+    if (settings["showShrines"] or settings["showPortals"]) {
+        ReadObjects(d2rprocess, startingOffset, objects)
+    }
+
+
     ; player position
     pPath := playerUnit + 0x38
     pathAddress := d2rprocess.read(pPath, "Int64")
@@ -94,7 +101,7 @@ readGameMemory(d2rprocess, settings, playerOffset, ByRef gameMemoryData) {
     if (!xPos) {
         WriteLog("Did not find player position at player offset " playerOffset) 
     }
-    gameMemoryData := {"gameName": gameName, "mapSeed": mapSeed, "difficulty": difficulty, "levelNo": levelNo, "xPos": xPos, "yPos": yPos, "mobs": mobs, "otherPlayers": otherPlayerData, "items": items, "playerName": playerName }
+    gameMemoryData := {"gameName": gameName, "mapSeed": mapSeed, "difficulty": difficulty, "levelNo": levelNo, "xPos": xPos, "yPos": yPos, "mobs": mobs, "otherPlayers": otherPlayerData, "items": items, "objects": objects, "playerName": playerName }
     ElapsedTime := A_TickCount - StartTime
     ;ToolTip % "`n`n`n`n" ElapsedTime
 }