Skip to content

Commit c3a48b9

Browse files
authored
Merge pull request #252 from coderwilson/bribe_fix
Update nemesis bribe
2 parents 1ec4e98 + 0bd67a1 commit c3a48b9

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

Diff for: nemesis/arenaPrep.py

+9-10
Original file line numberDiff line numberDiff line change
@@ -589,22 +589,21 @@ def bribe_battle(spare_change_value: int = 12000):
589589
if memory.main.turn_ready():
590590
if screen.turn_lulu():
591591
while memory.main.battle_menu_cursor() != 20:
592-
if memory.main.battle_menu_cursor() == 0:
592+
if memory.main.battle_menu_cursor() == 255:
593+
xbox.tap_down()
594+
elif memory.main.battle_menu_cursor() == 0:
593595
xbox.tap_down()
594596
else:
595597
xbox.tap_up()
596-
if game_vars.use_pause():
597-
memory.main.wait_frames(6)
598-
memory.main.wait_frames(8)
599-
xbox.tap_b()
600-
memory.main.wait_frames(8)
601-
xbox.tap_b()
602-
memory.main.wait_frames(8)
598+
while not memory.main.other_battle_menu():
599+
xbox.tap_b()
600+
battle.main._navigate_to_position(0)
601+
while memory.main.other_battle_menu():
602+
xbox.tap_b()
603603
battle.main.calculate_spare_change_movement(spare_change_value)
604604
while memory.main.spare_change_open():
605605
xbox.tap_b()
606-
xbox.tap_b()
607-
xbox.tap_b()
606+
battle.main.tap_targeting()
608607
else:
609608
battle.main.buddy_swap_lulu()
610609
print("Battle is complete.")

0 commit comments

Comments
 (0)