Automap pather for Shenk

Author: roozhou

assets/templates/shenk/shenk_wp1_automap.png

@@ -126,6 +126,11 @@ def __init__(self):
             1228: {'TRAV_AUTOMAP': (430, 10)},
             1229: {'TRAV_AUTOMAP': (442, -8)},
             1230: {'TRAV_AUTOMAP': (406, -25)},
+            # Shenk
+            1146: {'SHENK_WP_AUTOMAP': (66, 28), 'SHENK_ROCK_AUTOMAP': (124, 38)},
+            1147: {'SHENK_WP_AUTOMAP': (137, 108), 'SHENK_ROCK_AUTOMAP': (195, 118)},
+            1148: {'SHENK_WP_AUTOMAP': (213, 138), 'SHENK_ROCK_AUTOMAP': (271, 148)}, # A5_SHENK_SAFE_DIST
+            1149: {'SHENK_WP_AUTOMAP': (269, 168), 'SHENK_ROCK_AUTOMAP': (327, 178)},
 
             # A5 town
             0: {'A5_TOWN_0': (27, 249), 'A5_TOWN_1': (-92, -137), 'A5_TOWN_11': (-313, -177)},
@@ -419,6 +424,8 @@ def __init__(self):
             (Location.A5_LARZUK, Location.A5_MALAH): [1014, 1007, 1003, 1000, 1001],
             (Location.A5_NIHLATHAK_PORTAL, Location.A5_STASH): [1009, 1008, 1006, 1005],
             (Location.A5_NIHLATHAK_PORTAL, Location.A5_WP): [1009, 1008, 1006],
+            # Eldritch and Shenk
+            (Location.A5_SHENK_START, Location.A5_SHENK_SAFE_DIST): [1146, 1147, 1148],
         }
         self._paths = {
 	        # A5 Town
@@ -958,3 +965,5 @@ def show_automap_pos(template: list[str], threshold=0.75):
         keyboard.wait("f11")
         show_automap_pos(["A5_TOWN_AUTOMAP"])
         #show_automap_pos(["TRAV_AUTOMAP"])
+        #show_automap_pos(["SHENK_WP_AUTOMAP", "SHENK_WP1_AUTOMAP"])
+        #show_automap_pos(["SHENK_ROCK_AUTOMAP"])

assets/templates/shenk/shenk_wp_automap.png

@@ -58,7 +58,12 @@ def battle(self, do_shenk: bool, do_pre_buff: bool, game_stats) -> bool | tuple[
             game_stats.update_location("Shk")
             self._curr_loc = Location.A5_SHENK_START
             # No force move, otherwise we might get stuck at stairs!
-            if not self._pather.traverse_nodes((Location.A5_SHENK_START, Location.A5_SHENK_SAFE_DIST), self._char):
+            if self._char.capabilities.can_teleport_natively:
+                self._pather.traverse_nodes_fixed([(1128, 710)]*4, self._char)
+                success = self._pather.traverse_nodes_automap([1148], self._char, force_tp=True)
+            else:
+                success = self._pather.traverse_nodes_automap((Location.A5_SHENK_START, Location.A5_SHENK_SAFE_DIST), self._char)
+            if not success:
                 return False
             self._char.kill_shenk()
             loc = Location.A5_SHENK_END