trainerbase 3.12.0__tar.gz → 3.13.0__tar.gz

{trainerbase-3.12.0 → trainerbase-3.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: trainerbase
-Version: 3.12.0
+Version: 3.13.0
 Summary: Framework for creating game trainers/mods
 Home-page: https://gitlab.com/python-trainers/trainer-base
 License: MIT

{trainerbase-3.12.0 → trainerbase-3.13.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "trainerbase"
-version = "3.12.0"
+version = "3.13.0"
 description = "Framework for creating game trainers/mods"
 authors = ["v01d <v01d@v01d.ru>", "doomayka <zd@doomayka.ru>"]
 license = "MIT"

{trainerbase-3.12.0 → trainerbase-3.13.0}/trainerbase/codeinjection.py

@@ -4,7 +4,7 @@ from pathlib import Path
 from subprocess import DEVNULL
 from subprocess import run as run_executable
 from tempfile import TemporaryDirectory
-from typing import ClassVar, Final, Never, Self, override
+from typing import ClassVar, Final, Self, override
 
 from pymem.exception import MemoryWriteError
 
@@ -69,21 +69,16 @@ class AllocatingCodeInjection(AbstractCodeInjection):  # pylint: disable=too-man
         code_to_inject: Code,
         original_code_length: int = 0,
         new_memory_size: int = 1024,
-        is_long_x64_jump_needed: Never = Never,
+        is_long_x64_jump_needed: bool | None = None,
     ):
-        if is_long_x64_jump_needed is not Never:
-            raise Exception(  # pylint: disable=broad-exception-raised
-                "Since TrainerBase 3.4.0 is_long_x64_jump_needed has been deprecated."
-                " Now there is not need to manually pop and push rax. That's why you must"
-                " rewrite injections based on manual pop rax, push rax and then remove is_long_x64_jump_needed"
-                " argument"
-            )
+        if is_long_x64_jump_needed is None:
+            is_long_x64_jump_needed = pm.is_64_bit
 
+        self.is_long_x64_jump_needed = is_long_x64_jump_needed
         self.address = ensure_address(address)
-
         self.code_to_inject = compile_asm(code_to_inject)
 
-        if pm.is_64_bit:
+        if self.is_long_x64_jump_needed:
             self.code_to_inject = compile_asm("pop rax") + self.code_to_inject + compile_asm("push rax")
 
         self.original_code: bytes = b""
@@ -101,7 +96,7 @@ class AllocatingCodeInjection(AbstractCodeInjection):  # pylint: disable=too-man
 
         self.original_code = pm.read_bytes(self.injection_point, self.original_code_length)
 
-        if pm.is_64_bit:
+        if self.is_long_x64_jump_needed:
             jump_to_new_mem = compile_asm(get_long_x64_jump_to_new_mem_code(self.new_memory_address))
             jumper_length = len(jump_to_new_mem)
             jump_back_address = self.injection_point + jumper_length - 1

{trainerbase-3.12.0 → trainerbase-3.13.0}/trainerbase/common/helpers.py

@@ -63,7 +63,7 @@ class ASMArrayManager(Sequence):
         # The solution was to first save the address into a register before reading/writing a value from it.
         # In order not to use another register, existing ones were reused,
         # which, unfortunately, can be misleading.
-        # But it was decided that using a new register would make the code even less clea
+        # But it was decided that using a new register would make the code even less clear
         # and potentially more error-prone.
 
         asm = f"""

{trainerbase-3.12.0 → trainerbase-3.13.0}/trainerbase/common/teleport.py

@@ -1,3 +1,4 @@
+from collections.abc import Hashable
 from itertools import repeat, starmap
 from math import sqrt
 from operator import add, mul
@@ -65,7 +66,7 @@ class Teleport:
         self.player_z = player_z
         self.labels = {} if labels is None else labels
 
-        self.saved_position: Coords | None = None
+        self.saved_positions: dict[Hashable, Coords] = {}
 
         self.dash_coefficients = Vector3(5, 5, 5) if dash_coefficients is None else dash_coefficients
         self.previous_position: Coords | None = None
@@ -89,18 +90,20 @@ class Teleport:
 
         self.set_coords(*self.labels[label])
 
-    def save_position(self) -> None:
-        self.saved_position = self.get_coords()
+    def save_position(self, key: Hashable = 0) -> None:
+        self.saved_positions[key] = self.get_coords()
 
-    def restore_saved_position(self) -> bool:
+    def restore_saved_position(self, key: Hashable = 0) -> bool:
         """
         Returns False if position is not saved else True
         """
 
-        if self.saved_position is None:
+        saved_position = self.saved_positions.get(key)
+
+        if saved_position is None:
             return False
 
-        self.set_coords(*self.saved_position)
+        self.set_coords(*saved_position)
 
         return True
 

{trainerbase-3.12.0 → trainerbase-3.13.0}/trainerbase/gui/teleport.py

@@ -1,3 +1,5 @@
+from collections.abc import Hashable
+from functools import partial
 from typing import override
 
 from dearpygui import dearpygui as dpg
@@ -20,12 +22,14 @@ class TeleportUI(AbstractUIComponent):
         hotkey_save_position: str | None = "Insert",
         hotkey_set_saved_position: str | None = "Home",
         hotkey_dash: str | None = "End",
+        hotkey_secondary_position_modifier: str = "Shift",
         *,
         tts_on_hotkey: bool = True,
     ):
         self.tp = tp
         self.hotkey_save_position = hotkey_save_position
         self.hotkey_set_saved_position = hotkey_set_saved_position
+        self.hotkey_secondary_position_modifier = hotkey_secondary_position_modifier
         self.hotkey_dash = hotkey_dash
         self.tts_on_hotkey = tts_on_hotkey
 
@@ -47,14 +51,14 @@ class TeleportUI(AbstractUIComponent):
     def on_clip_coords(self):
         dpg.set_clipboard_text(repr(self.tp.get_coords()))
 
-    def on_hotkey_save_position_press(self):
-        self.tp.save_position()
+    def on_hotkey_save_position_press(self, key: Hashable):
+        self.tp.save_position(key)
 
         if self.tts_on_hotkey:
             say("Position saved")
 
-    def on_hotkey_set_saved_position_press(self):
-        is_position_restored = self.tp.restore_saved_position()
+    def on_hotkey_set_saved_position_press(self, key: Hashable):
+        is_position_restored = self.tp.restore_saved_position(key)
 
         if self.tts_on_hotkey:
             say("Position restored" if is_position_restored else "Save position at first")
@@ -71,11 +75,21 @@ 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, self.on_hotkey_save_position_press)
-        add_hotkey(self.hotkey_set_saved_position, self.on_hotkey_set_saved_position_press)
-
-        dpg.add_text(f"[{self.hotkey_save_position}] Save Position")
-        dpg.add_text(f"[{self.hotkey_set_saved_position}] Restore Position")
+        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))
+
+        hotkey_secondary_position_hint = ""
+        if self.hotkey_secondary_position_modifier:
+            hotkey_save_secondary_position = f"{self.hotkey_secondary_position_modifier} + {self.hotkey_save_position}"
+            hotkey_set_secondary_saved_position = (
+                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))
+
+        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")
 
     def _tp_add_dash_hotkeys_if_needed(self):
         if self.hotkey_dash is None:

{trainerbase-3.12.0 → trainerbase-3.13.0}/trainerbase/process.py

@@ -1,3 +1,4 @@
+from contextlib import suppress
 from itertools import cycle
 from os import _exit as force_exit
 from typing import cast
@@ -19,17 +20,22 @@ def attach_to_process() -> Pymem:
 
     print("Waiting for process in:", process_names)
 
-    for process_name in cycle(process_names):
-        try:
-            pm = Pymem(process_name, exact_match=pymem_config["exact_match"], ignore_case=pymem_config["ignore_case"])
-        except ProcessNotFound:
-            continue
+    with suppress(KeyboardInterrupt):
+        for process_name in cycle(process_names):
+            try:
+                pm = Pymem(
+                    process_name,
+                    exact_match=pymem_config["exact_match"],
+                    ignore_case=pymem_config["ignore_case"],
+                )
+            except ProcessNotFound:
+                continue
 
-        print(f"Found {process_name}, pid: {pm.process_id}")
+            print(f"Found {process_name}, pid: {pm.process_id}")
 
-        return pm
+            return pm
 
-    raise RuntimeError("Code should be unreachable")
+    force_exit(0)
 
 
 def show_message_and_shutdown_if_process_exited():