From 69870e73c5ae2857f2d72c0589e767f2fb7aa90f Mon Sep 17 00:00:00 2001 From: aeon0 Date: Wed, 8 Dec 2021 21:41:40 +0100 Subject: [PATCH] Fix tele rebuy after failed tele (#237) --- src/bot.py | 4 +++- src/char/hammerdin.py | 9 ++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/bot.py b/src/bot.py index c4520b0..5a56eef 100644 --- a/src/bot.py +++ b/src/bot.py @@ -275,9 +275,11 @@ class Bot: def on_end_run(self): self._pre_buffed = True success = self._char.tp_town() - self._tps_left -= 1 if success: + self._tps_left -= 1 self._curr_loc = self._town_manager.wait_for_tp(self._curr_loc) if self._curr_loc: return self.trigger_or_stop("maintenance") + if not self._ui_manager.has_tps(): + self._tps_left = 0 self.trigger_or_stop("end_game", failed=True) diff --git a/src/char/hammerdin.py b/src/char/hammerdin.py index e687a2b..48f21fb 100644 --- a/src/char/hammerdin.py +++ b/src/char/hammerdin.py @@ -117,11 +117,10 @@ class Hammerdin(IChar): self._pather.traverse_nodes([226], self, time_out=2.5) self._cast_hammers(atk_len) # move a bit to the top - for _ in range(2): - pos_m = self._screen.convert_abs_to_monitor((45, -30)) - self.pre_move() - self.move(pos_m, force_move=True) - self._cast_hammers(atk_len) + pos_m = self._screen.convert_abs_to_monitor((45, -30)) + self.pre_move() + self.move(pos_m, force_move=True) + self._cast_hammers(atk_len) self._do_redemption() return True