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

Find path like ball saver not strong boss #116

Merged
merged 3 commits into from
Apr 3, 2021
Merged

Find path like ball saver not strong boss #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80554f6
Update auto_max_lair.py
TeachingGame Apr 2, 2021
5dc9c68
Update Config.sample.toml
TeachingGame Apr 2, 2021
e642e65
Update auto_max_lair.py
TeachingGame Apr 2, 2021
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
5 changes: 2 additions & 3 deletions Config.sample.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,8 @@ LEGENDARY_BALLS = 500
# "KEEP PATH" - Will force the game to always reset on a pre-saved path.
# Similar to "BALL SAVER" and "STRONG BOSS" but will always use the same path if it fails.
# This will deplete your Ore quickly.
# "FIND PATH" - Will run like STRONG BOSS mode but will stop when it consecutively wins the
# number of times inputted into "FIND PATH WINS". It is recommended to leave the
# NON_LEGEND setting as "default" to avoid any false posistives.
# "FIND PATH" - Will run like BALL SAVER mode but will stop when it consecutively wins the
# number of times inputted into "FIND PATH WINS".
# It can be used alongside KEEP PATH to find a winning path. Don't forget to update the
# CONSECUTIVE_RESETS section below, before starting KEEP PATH.
# It's up to the user to check if the path found was good or not.
Expand Down
13 changes: 9 additions & 4 deletions auto_max_lair.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,9 +643,15 @@ def select_pokemon(ctrlr) -> str:
# caught.
if (
(ctrlr.mode == 'keep path' and (run.num_caught < 4 or i > 0))
or (ctrlr.mode == 'ball saver' and run.num_caught == 4 and i > 0)
or (
(ctrlr.mode == 'ball saver' or ctrlr.mode == 'find path')
and run.num_caught == 4 and i > 0
)
):
if ctrlr.mode == 'ball saver' or ctrlr.check_sufficient_ore(2):
if (
(ctrlr.mode == 'ball saver' or ctrlr.mode == 'find path')
or ctrlr.check_sufficient_ore(2)
):
reset_game = True
break
else:
Expand Down Expand Up @@ -692,8 +698,7 @@ def select_pokemon(ctrlr) -> str:
ctrlr.push_button(b'^', 3 + VIDEO_EXTRA_DELAY)

if (
not take_pokemon and (
ctrlr.mode == 'strong boss' or ctrlr.mode == 'find path')
not take_pokemon and ctrlr.mode == 'strong boss'
and run.num_caught == 4 and ctrlr.check_sufficient_ore(1)
):
reset_game = True
Expand Down