From af5e4ffebe60843b93c0c0dce61dc69a4eecd938 Mon Sep 17 00:00:00 2001 From: aeon0 Date: Mon, 6 Dec 2021 06:58:14 +0100 Subject: [PATCH] Use merc config (#216) * Use merc config * docs --- params.ini | 1 + src/bot.py | 2 +- src/config.py | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/params.ini b/params.ini index 910d0b7..0783257 100644 --- a/params.ini +++ b/params.ini @@ -25,6 +25,7 @@ run_shenk=0 type=sorceress casting_frames=11 stash_gold=0 +use_merc=1 atk_len_pindle=3 atk_len_eldritch=3 atk_len_shenk=4 diff --git a/src/bot.py b/src/bot.py index e3b4107..e9b06c1 100644 --- a/src/bot.py +++ b/src/bot.py @@ -207,7 +207,7 @@ class Bot: # Check if merc needs to be revived merc_alive = self._template_finder.search("MERC", self._screen.grab(), threshold=0.9, roi=[0, 0, 200, 200]).valid - if not merc_alive: + if not merc_alive and self._config.char["use_merc"]: Logger.info("Reviving merc.") if not self._pather.traverse_nodes(self._curr_location, Location.A5_QUAL_KEHK, self._char): self.trigger_or_stop("end_game") diff --git a/src/config.py b/src/config.py index 8bd1e44..f185f0f 100644 --- a/src/config.py +++ b/src/config.py @@ -71,6 +71,7 @@ class Config: "belt_hp_columns": int(self._select_val("char", "belt_hp_columns")), "belt_mp_columns": int(self._select_val("char", "belt_mp_columns")), "stash_gold": bool(int(self._select_val("char", "stash_gold"))), + "use_merc": bool(int(self._select_val("char", "use_merc"))), "cta_available": bool(int(self._select_val("char", "cta_available"))), "weapon_switch": self._select_val("char", "weapon_switch"), "battle_orders": self._select_val("char", "battle_orders"),