diff --git a/assets/templates/a5_town/a5_town_12.png b/assets/templates/a5_town/a5_town_12.png new file mode 100644 index 0000000..7bf75cf Binary files /dev/null and b/assets/templates/a5_town/a5_town_12.png differ diff --git a/src/bot.py b/src/bot.py index 61ef870..91b0272 100644 --- a/src/bot.py +++ b/src/bot.py @@ -291,12 +291,6 @@ class Bot: self._curr_loc = self._town_manager.buy_pots(self._curr_loc, pot_needs["health"], pot_needs["mana"]) wait(0.5, 0.8) self._belt_manager.update_pot_needs() - # TODO: Remove this, currently workaround cause too lazy to add all the pathes from MALAH - if self._curr_loc == Location.A5_MALAH: - if self._pather.traverse_nodes((Location.A5_MALAH, Location.A5_TOWN_START), self._char, force_move=True): - self._curr_loc = Location.A5_TOWN_START - else: - self._curr_loc = False else: Logger.info("Healing at next possible Vendor") self._curr_loc = self._town_manager.heal(self._curr_loc) diff --git a/src/pather.py b/src/pather.py index 3999f8d..9efe86e 100644 --- a/src/pather.py +++ b/src/pather.py @@ -111,6 +111,8 @@ class Pather: 12: {'A5_TOWN_8': (-139, -196), 'A5_TOWN_9': (-165, 87)}, 13: {'A5_TOWN_3': (120, 120), 'A5_TOWN_10': (-533, 221), 'A5_TOWN_4': (548, 97)}, 14: {'A5_TOWN_3': (447, 173), 'A5_TOWN_10': (-200, 280)}, + 15: {'A5_TOWN_9': (310, -38), 'A5_TOWN_2': (-327, -118), 'A5_TOWN_12': (-267, 204)}, + 16: {'A5_TOWN_0.5': (65, 155), 'A5_TOWN_12': (-25, -107)}, # Pindle 100: {'PINDLE_7': (384, -92), 'PINDLE_0': (-97, -40), 'PINDLE_1': (-13, 223), 'PINDLE_2': (-366, 85)}, 101: {'PINDLE_1': (371, -45), 'PINDLE_2': (18, -184), 'PINDLE_3': (-123, 261)}, @@ -301,7 +303,7 @@ class Pather: 911: {"NECRO_TRAV_22": (13, 171), "NECRO_TRAV_21": (212, 307), }, } self._paths = { - # A5 Town + # A5 Town (Location.A5_TOWN_START, Location.A5_NIHLATHAK_PORTAL): [3, 4, 5, 6, 8, 9], (Location.A5_TOWN_START, Location.A5_STASH): [3, 4, 5], (Location.A5_TOWN_START, Location.A5_WP): [3, 4], @@ -309,20 +311,31 @@ class Pather: (Location.A5_TOWN_START, Location.A5_MALAH): [1, 2], (Location.A5_TOWN_START, Location.A5_LARZUK): [3, 4, 5, 13, 14], (Location.A5_MALAH, Location.A5_TOWN_START): [1, 0], + (Location.A5_MALAH, Location.A5_QUAL_KEHK): [16, 15, 12], + (Location.A5_MALAH, Location.A5_STASH): [1, 0, 3, 4, 5], + (Location.A5_MALAH, Location.A5_LARZUK): [1, 0, 3, 4, 5, 13, 14], + (Location.A5_MALAH, Location.A5_WP): [1, 0, 3, 4], + (Location.A5_MALAH, Location.A5_NIHLATHAK_PORTAL): [16, 15, 12, 11, 10, 6, 8, 9], (Location.A5_STASH, Location.A5_NIHLATHAK_PORTAL): [6, 8, 9], (Location.A5_STASH, Location.A5_QUAL_KEHK): [5, 6, 10, 11, 12], (Location.A5_STASH, Location.A5_LARZUK): [13, 14], (Location.A5_STASH, Location.A5_WP): [], + (Location.A5_STASH, Location.A5_MALAH): [4, 3, 0, 1, 2], (Location.A5_WP, Location.A5_STASH): [], (Location.A5_WP, Location.A5_LARZUK): [13, 14], (Location.A5_WP, Location.A5_NIHLATHAK_PORTAL): [6, 8, 9], (Location.A5_WP, Location.A5_QUAL_KEHK): [6, 10, 11, 12], + (Location.A5_WP, Location.A5_MALAH): [4, 3, 0, 1, 2], (Location.A5_QUAL_KEHK, Location.A5_NIHLATHAK_PORTAL): [12, 11, 10, 6, 8, 9], (Location.A5_QUAL_KEHK, Location.A5_WP): [12, 11, 10, 6], (Location.A5_QUAL_KEHK, Location.A5_STASH): [12, 11, 10, 6, 5], + (Location.A5_QUAL_KEHK, Location.A5_LARZUK): [12, 11, 10, 6, 5, 13, 14], + (Location.A5_QUAL_KEHK, Location.A5_MALAH): [15, 16, 2], (Location.A5_LARZUK, Location.A5_QUAL_KEHK): [13, 14, 5, 6, 10, 11, 12], (Location.A5_LARZUK, Location.A5_NIHLATHAK_PORTAL): [14, 13, 5, 6, 8, 9], (Location.A5_LARZUK, Location.A5_WP): [14, 13, 5], + (Location.A5_LARZUK, Location.A5_STASH): [14, 13, 5], + (Location.A5_LARZUK, Location.A5_MALAH): [14, 13, 5, 4, 3, 1, 2], # Pindle (Location.A5_PINDLE_START, Location.A5_PINDLE_SAFE_DIST): [100, 101, 102, 103], (Location.A5_PINDLE_SAFE_DIST, Location.A5_PINDLE_END): [104],