trainerbase 4.4.1__tar.gz → 4.5.0__tar.gz

{trainerbase-4.4.1 → trainerbase-4.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: trainerbase
-Version: 4.4.1
+Version: 4.5.0
 Summary: Framework for creating game trainers/mods
 Project-URL: Homepage, https://gitlab.com/python-trainers/
 Project-URL: Repository, https://gitlab.com/python-trainers/trainer-base

{trainerbase-4.4.1 → trainerbase-4.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "trainerbase"
-version = "4.4.1"
+version = "4.5.0"
 description = "Framework for creating game trainers/mods"
 license = "MIT"
 authors = [

{trainerbase-4.4.1 → trainerbase-4.5.0}/trainerbase/gui/teleport.py

@@ -16,6 +16,9 @@ from trainerbase.tts import say
 class TeleportUI(AbstractUIComponent):
     DPG_TAG_TELEPORT_LABELS = "__teleport_labels"
     DPG_TAG_TELEPORT_LABEL_FILTER_INPUT = "__dpg_tag_teleport_label_filter_input"
+    POSITION_ID_MANUAL_PRIMARY = "__position_id_manual_primary"
+    POSITION_ID_MANUAL_SECONDARY = "__position_id_manual_secondary"
+    POSITION_ID_BEFORE_DASH = "__position_id_before_dash"
 
     def __init__(
         self,
@@ -24,6 +27,7 @@ class TeleportUI(AbstractUIComponent):
         hotkey_set_saved_position: str | None = "Home",
         hotkey_dash: str | None = "End",
         hotkey_secondary_position_modifier: str = "Shift",
+        hotkey_dash_rollback: str = "Shift+End",
         *,
         tts_on_hotkey: bool = True,
     ):
@@ -32,6 +36,7 @@ class TeleportUI(AbstractUIComponent):
         self.hotkey_set_saved_position = hotkey_set_saved_position
         self.hotkey_secondary_position_modifier = hotkey_secondary_position_modifier
         self.hotkey_dash = hotkey_dash
+        self.hotkey_dash_rollback = hotkey_dash_rollback
         self.tts_on_hotkey = tts_on_hotkey
 
     @override
@@ -69,10 +74,19 @@ class TeleportUI(AbstractUIComponent):
 
     @suppress_memory_exceptions
     def on_hotkey_dash_press(self):
+        self.tp.save_position(self.POSITION_ID_BEFORE_DASH)
         self.tp.dash()
+
         if self.tts_on_hotkey:
             say("Dash!")
 
+    @suppress_memory_exceptions
+    def on_hotkey_dash_rollback_press(self):
+        self.tp.restore_saved_position(self.POSITION_ID_BEFORE_DASH)
+
+        if self.tts_on_hotkey:
+            say("Dash Rollback!")
+
     @suppress_memory_exceptions
     def on_goto_label(self):
         self.tp.goto(dpg.get_value(self.DPG_TAG_TELEPORT_LABELS))
@@ -81,8 +95,14 @@ class TeleportUI(AbstractUIComponent):
         if self.hotkey_save_position is None or self.hotkey_set_saved_position is None:
             return
 
-        add_hotkey(self.hotkey_save_position, partial(self.on_hotkey_save_position_press, 0))
-        add_hotkey(self.hotkey_set_saved_position, partial(self.on_hotkey_set_saved_position_press, 0))
+        add_hotkey(
+            self.hotkey_save_position,
+            partial(self.on_hotkey_save_position_press, self.POSITION_ID_MANUAL_PRIMARY),
+        )
+        add_hotkey(
+            self.hotkey_set_saved_position,
+            partial(self.on_hotkey_set_saved_position_press, self.POSITION_ID_MANUAL_PRIMARY),
+        )
 
         hotkey_secondary_position_hint = ""
         if self.hotkey_secondary_position_modifier:
@@ -91,8 +111,14 @@ class TeleportUI(AbstractUIComponent):
                 f"{self.hotkey_secondary_position_modifier} + {self.hotkey_set_saved_position}"
             )
             hotkey_secondary_position_hint = f"[{self.hotkey_secondary_position_modifier} +] "
-            add_hotkey(hotkey_save_secondary_position, partial(self.on_hotkey_save_position_press, 1))
-            add_hotkey(hotkey_set_secondary_saved_position, partial(self.on_hotkey_set_saved_position_press, 1))
+            add_hotkey(
+                hotkey_save_secondary_position,
+                partial(self.on_hotkey_save_position_press, self.POSITION_ID_MANUAL_SECONDARY),
+            )
+            add_hotkey(
+                hotkey_set_secondary_saved_position,
+                partial(self.on_hotkey_set_saved_position_press, self.POSITION_ID_MANUAL_SECONDARY),
+            )
 
         dpg.add_text(f"[{hotkey_secondary_position_hint}{self.hotkey_save_position}] Save Position")
         dpg.add_text(f"[{hotkey_secondary_position_hint}{self.hotkey_set_saved_position}] Restore Position")
@@ -101,9 +127,15 @@ class TeleportUI(AbstractUIComponent):
         if self.hotkey_dash is None:
             return
 
-        add_hotkey(self.hotkey_dash, self.on_hotkey_dash_press)
+        with dpg.group(horizontal=True):
+            add_hotkey(self.hotkey_dash, self.on_hotkey_dash_press)
+            dpg.add_text(f"[{self.hotkey_dash}] Dash")
+
+            if self.hotkey_dash_rollback is None:
+                return
 
-        dpg.add_text(f"[{self.hotkey_dash}] Dash")
+            add_hotkey(self.hotkey_dash_rollback, self.on_hotkey_dash_rollback_press)
+            dpg.add_text(f"/ [{self.hotkey_dash_rollback}] Dash Rollback")
 
     def _tp_add_labels_if_needed(self):
         if not self.tp.labels: