diff --git a/pkg/memory/game_reader.go b/pkg/memory/game_reader.go index 3504e7b..1b98964 100644 --- a/pkg/memory/game_reader.go +++ b/pkg/memory/game_reader.go @@ -89,7 +89,7 @@ func (gd *GameReader) openMenus() data.OpenMenus { return data.OpenMenus{ Inventory: buffer[0x01] != 0, - LoadingScreen: buffer[0x16C] != 0, + LoadingScreen: buffer[0x168] != 0, NPCInteract: buffer[0x08] != 0, NPCShop: buffer[0x0B] != 0, Stash: buffer[0x18] != 0, @@ -175,6 +175,7 @@ func (gd *GameReader) getStatsList(statListPtr uintptr) stat.Stats { value = int(math.Max(float64(2/statValue), 1)) case stat.RegenStaminaPerLevel: value = int(statValue) * 10 + case stat.LevelRequirePercent: value = int(statValue) * -1 case stat.AttackRatingPerLevel: @@ -200,7 +201,7 @@ func (gd *GameReader) InCharacterSelectionScreen() bool { } func (gd *GameReader) GetSelectedCharacterName() string { - return gd.Process.ReadStringFromMemory(gd.Process.moduleBaseAddressPtr+0x222D0A0, 0) + return gd.Process.ReadStringFromMemory(gd.Process.moduleBaseAddressPtr+0x222D0A8, 0) } func (gd *GameReader) LegacyGraphics() bool { diff --git a/pkg/memory/player.go b/pkg/memory/player.go index 57c4288..9b65f3f 100644 --- a/pkg/memory/player.go +++ b/pkg/memory/player.go @@ -2,6 +2,7 @@ package memory import ( "encoding/binary" + "github.com/hectorgimenez/d2go/pkg/data/mode" "github.com/hectorgimenez/d2go/pkg/data" @@ -91,7 +92,7 @@ func (gd *GameReader) GetPlayerUnit(mainPlayerUnit RawPlayerUnit) data.PlayerUni availableWPs := make([]area.ID, 0) // Probably there is a better place to pick up those values, since this seems to be very tied to the UI - wpList := gd.Process.ReadBytesFromMemory(gd.moduleBaseAddressPtr+0x2140E20, 0x48) + wpList := gd.Process.ReadBytesFromMemory(gd.moduleBaseAddressPtr+0x2186420, 0x48) for i := 0; i < 0x48; i = i + 8 { a := binary.LittleEndian.Uint32(wpList[i : i+4]) available := binary.LittleEndian.Uint32(wpList[i+4 : i+8])