Skip to content
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

[scripts][common-travel] Expand nemesis avoidance #6766

Merged
merged 4 commits into from
Feb 17, 2024
Merged

[scripts][common-travel] Expand nemesis avoidance #6766

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2bba05c
[scripts][common-travel] Expand nemesis avoidance
MahtraDR Feb 17, 2024
6772f1c
Merge branch 'rpherbig:master' into common_travel_nemesis
MahtraDR Feb 17, 2024
4195079
Merge branch 'rpherbig:master' into common_travel_nemesis
MahtraDR Feb 17, 2024
8c67c3a
Merge branch 'rpherbig:master' into common_travel_nemesis
MahtraDR Feb 17, 2024
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
4 changes: 2 additions & 2 deletions common-travel.lic
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,8 @@ module DRCT
rooms_searched += 1

if priotize_buddies && (rooms_searched <= search_rooms.size)
suitable_room = (DRRoom.pcs & UserVars.friends).any?
if (rooms_searched == search_rooms.size && (DRRoom.pcs & UserVars.friends).empty?)
suitable_room = ((DRRoom.pcs & UserVars.friends).any? && (DRRoom.pcs & UserVars.hunting_nemesis).none?)
if (rooms_searched == search_rooms.size && (DRRoom.pcs & UserVars.friends).empty? && (DRRoom.pcs & UserVars.hunting_nemesis).empty?)
echo("*** Reached last room in list, and found no buddies. Retrying for empty room. ***")
return find_empty_room(search_rooms, idle_room, predicate, min_mana, strict_mana, max_search_attempts, priotize_buddies = false)
end
Expand Down
Loading