Skip to content

Fix issue with ping ponging between the two entrances to the same area #683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sorc653 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix issue with ping ponging between the two entrances to the same area #683

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion internal/action/step/interact_entrance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ func InteractEntrance(area area.ID) error {
currentMouseCoords := data.Position{}
lastRun := time.Time{}

// If we move the mouse to interact with an entrance, we will set this variable.
var lastEntranceLevel data.Level

ctx := context.Get()
ctx.SetLastStep("InteractEntrance")

Expand All @@ -42,7 +45,10 @@ func InteractEntrance(area area.ID) error {

lastRun = time.Now()
for _, l := range ctx.Data.AdjacentLevels {
if l.Area == area {
// It is possible to have multiple entrances to the same area (A2 sewers, A2 palace, etc)
// Once we "select" an area and start to move the mouse to hover with it, we don't want
// to change the area to the 2nd entrance in the same area on the next iteration.
if l.Area == area && (lastEntranceLevel == (data.Level{}) || lastEntranceLevel == l) {
distance := ctx.PathFinder.DistanceFromMe(l.Position)
if distance > maxEntranceDistance {
// Try to move closer with retries
Expand Down Expand Up @@ -85,6 +91,9 @@ func InteractEntrance(area area.ID) error {
ctx.HID.MovePointer(lx+x, ly+y)
interactionAttempts++
utils.Sleep(100)

lastEntranceLevel = l

continue
}

Expand Down