trainerbase 3.1.5__tar.gz → 3.3.0__tar.gz

{trainerbase-3.1.5 → trainerbase-3.3.0}/PKG-INFO

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

{trainerbase-3.1.5 → trainerbase-3.3.0}/pyproject.toml

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

{trainerbase-3.1.5 → trainerbase-3.3.0}/trainerbase/gui.py

@@ -28,10 +28,6 @@ from trainerbase.speedhack import SpeedHack
 from trainerbase.tts import say
 
 
-TAG_TELEPORT_LABELS = "__teleport_labels"
-TAG_SPEEDHACK_FACTOR_INPUT = "tag_speedhack_factor_input"
-
-
 class AbstractUIComponent(ABC):
     @abstractmethod
     def add_to_ui(self) -> None:
@@ -211,12 +207,14 @@ class GameObjectUI(AbstractUIComponent):
 
 
 class TeleportUI(AbstractUIComponent):
+    DPG_TAG_TELEPORT_LABELS = "__teleport_labels"
+
     def __init__(
         self,
         tp: Teleport,
-        hotkey_save_position: str | None = None,
-        hotkey_set_saved_position: str | None = None,
-        hotkey_dash: str | None = None,
+        hotkey_save_position: str | None = "Insert",
+        hotkey_set_saved_position: str | None = "Home",
+        hotkey_dash: str | None = "End",
         tts_on_hotkey: bool = True,
     ):
         self.tp = tp
@@ -261,7 +259,7 @@ class TeleportUI(AbstractUIComponent):
             say("Dash!")
 
     def on_goto_label(self):
-        self.tp.goto(dpg.get_value(TAG_TELEPORT_LABELS))
+        self.tp.goto(dpg.get_value(self.DPG_TAG_TELEPORT_LABELS))
 
     def _tp_add_save_set_position_hotkeys_if_needed(self):
         if self.hotkey_save_position is None or self.hotkey_set_saved_position is None:
@@ -289,14 +287,20 @@ class TeleportUI(AbstractUIComponent):
 
         with dpg.group(horizontal=True):
             dpg.add_button(label="Go To", callback=self.on_goto_label)
-            dpg.add_combo(label="Labels", tag=TAG_TELEPORT_LABELS, items=labels, default_value=labels[0])
+            dpg.add_combo(label="Labels", tag=self.DPG_TAG_TELEPORT_LABELS, items=labels, default_value=labels[0])
 
 
 class SpeedHackUI(AbstractUIComponent):
-    def __init__(self, speedhack: SpeedHack, key: str):
+    DPG_TAG_SPEEDHACK_FACTOR_INPUT = "tag_speedhack_factor_input"
+    DPG_TAG_SPEEDHACK_PRESET_INPUT = "tag_speedhack_preset_input"
+
+    PRESETS: tuple[float, ...] = (0.1, 0.2, 0.3, 0.5, 1.0, 2.0, 3.0, 5.0, 10.0, 20.0, 50.0)
+
+    def __init__(self, speedhack: SpeedHack, key: str = "Delete", default_factor_input_value: float = 3.0):
         self.speedhack = speedhack
         self.key = key
-        self.switch = ShortLongPressSwitch(SpeedHackUISwitch(speedhack, TAG_SPEEDHACK_FACTOR_INPUT), key)
+        self.default_factor_input_value = default_factor_input_value
+        self.switch = ShortLongPressSwitch(SpeedHackUISwitch(speedhack, self.DPG_TAG_SPEEDHACK_FACTOR_INPUT), key)
 
     @override
     def add_to_ui(self) -> None:
@@ -304,17 +308,41 @@ class SpeedHackUI(AbstractUIComponent):
         dpg.add_text(f"Press [{self.key}] Toggle SpeedHack")
 
         dpg.add_input_double(
-            tag=TAG_SPEEDHACK_FACTOR_INPUT,
+            tag=self.DPG_TAG_SPEEDHACK_FACTOR_INPUT,
             label="SpeedHack Factor",
             min_value=0.0,
             max_value=100.0,
-            default_value=3.0,
+            default_value=self.default_factor_input_value,
             min_clamped=True,
             max_clamped=True,
+            callback=self.on_factor_change,
+        )
+
+        dpg.add_slider_int(
+            tag=self.DPG_TAG_SPEEDHACK_PRESET_INPUT,
+            label="Preset",
+            min_value=0,
+            max_value=len(self.PRESETS) - 1,
+            clamped=True,
+            default_value=self.get_closest_preset_index(self.default_factor_input_value),
+            callback=self.on_preset_change,
         )
 
         self.switch.handle()
 
+    def on_preset_change(self):
+        new_factor = self.PRESETS[dpg.get_value(self.DPG_TAG_SPEEDHACK_PRESET_INPUT)]
+        dpg.set_value(self.DPG_TAG_SPEEDHACK_FACTOR_INPUT, new_factor)
+
+    def on_factor_change(self):
+        new_factor = dpg.get_value(self.DPG_TAG_SPEEDHACK_FACTOR_INPUT)
+        closest_preset_index = self.get_closest_preset_index(new_factor)
+        dpg.set_value(self.DPG_TAG_SPEEDHACK_PRESET_INPUT, closest_preset_index)
+
+    def get_closest_preset_index(self, factor: float) -> int:
+        closest_preset = min(self.PRESETS, key=lambda preset: abs(preset - factor))
+        return self.PRESETS.index(closest_preset)
+
 
 class SpeedHackUISwitch(Switchable):
     def __init__(self, speedhack: SpeedHack, dpg_tag: str):

{trainerbase-3.1.5 → trainerbase-3.3.0}/trainerbase/memory.py

@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 from collections.abc import Callable
 from functools import partial
-from typing import Self, assert_never
+from typing import Self, assert_never, override
 
 from pymem import Pymem
 from pymem.exception import ProcessNotFound
@@ -55,6 +55,11 @@ class AOBScan(AbstractAddress):
         self.module_name = module_name
         self.multiple_result_index = multiple_result_index
 
+    def __add__(self, extra_add: int) -> Self:
+        new_add = self.add + extra_add
+        return self.inherit(new_add=new_add)
+
+    @override
     def resolve(self) -> int:
         if self._saved_scan_result is not None:
             return self._saved_scan_result
@@ -88,6 +93,20 @@ class AOBScan(AbstractAddress):
 
         return result_address
 
+    def inherit(self, *, new_add: int | None = None) -> Self:
+        new_address = self.__class__(
+            self.aob,
+            add=self.add,
+            module_name=self.module_name,
+            multiple_result_index=self.multiple_result_index,
+            should_cache=self._should_cache,
+        )
+
+        if new_add is not None:
+            new_address.add = new_add
+
+        return new_address
+
 
 class Address(AbstractAddress):
     def __init__(self, base_address: int, offsets: list[int] | None = None, add: int = 0):
@@ -105,6 +124,14 @@ class Address(AbstractAddress):
             case _:
                 assert_never(other)
 
+    @override
+    def resolve(self) -> int:
+        pointer = self.base_address
+        for offset in self.offsets:
+            pointer = read_pointer(pointer) + offset
+
+        return pointer + self.add
+
     def inherit(self, *, extra_offsets: list[int] | None = None, new_add: int | None = None) -> Self:
         new_address = self.__class__(self.base_address, self.offsets.copy(), self.add)
 
@@ -116,13 +143,6 @@ class Address(AbstractAddress):
 
         return new_address
 
-    def resolve(self) -> int:
-        pointer = self.base_address
-        for offset in self.offsets:
-            pointer = read_pointer(pointer) + offset
-
-        return pointer + self.add
-
 
 def ensure_address(obj: ConvertibleToAddress) -> AbstractAddress:
     match obj: