trainerbase 3.8.2__tar.gz → 3.10.0__tar.gz

{trainerbase-3.8.2 → trainerbase-3.10.0}/PKG-INFO

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

{trainerbase-3.8.2 → trainerbase-3.10.0}/pyproject.toml

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

trainerbase-3.10.0/trainerbase/common/abc.py

@@ -0,0 +1,22 @@
+from abc import ABC, abstractmethod
+
+
+class Switchable(ABC):
+    @abstractmethod
+    def enable(self):
+        pass
+
+    @abstractmethod
+    def disable(self):
+        pass
+
+
+class AbstractKeyboardHandler(ABC):
+    @property
+    @abstractmethod
+    def hotkey(self) -> str:
+        pass
+
+    @abstractmethod
+    def handle(self):
+        pass

{trainerbase-3.8.2 → trainerbase-3.10.0}/trainerbase/common/keyboard.py

@@ -1,19 +1,11 @@
-from abc import ABC, abstractmethod
 from collections.abc import Callable
 from time import time
 from typing import override
 
 from keyboard import add_hotkey, on_press_key, on_release_key
 
-
-class Switchable(ABC):
-    @abstractmethod
-    def enable(self):
-        pass
-
-    @abstractmethod
-    def disable(self):
-        pass
+from trainerbase.common.abc import AbstractKeyboardHandler, Switchable
+from trainerbase.gameobject import GameBool
 
 
 class SimpleSwitchable(Switchable):
@@ -30,17 +22,6 @@ class SimpleSwitchable(Switchable):
         self._on_disabled()
 
 
-class AbstractKeyboardHandler(ABC):
-    @property
-    @abstractmethod
-    def hotkey(self) -> str:
-        pass
-
-    @abstractmethod
-    def handle(self):
-        pass
-
-
 class SimpleHotkeyHandler(AbstractKeyboardHandler):
     def __init__(self, callback: Callable[[], None], hotkey: str):
         self._callback = callback
@@ -80,6 +61,27 @@ class ReleaseHotkeySwitch(AbstractKeyboardHandler):
         on_release_key(self._key, self._on_release)
 
 
+class GameBoolReleaseHotkeySwitch(AbstractKeyboardHandler):
+    def __init__(self, game_bool: GameBool, key: str):
+        self._key = key
+        self._game_bool = game_bool
+
+    def _on_release(self, _):
+        if self._game_bool.value:
+            self._game_bool.disable()
+        else:
+            self._game_bool.enable()
+
+    @property
+    @override
+    def hotkey(self):
+        return self._key
+
+    @override
+    def handle(self):
+        on_release_key(self._key, self._on_release)
+
+
 class ShortLongHotkeyPressSwitch(AbstractKeyboardHandler):
     def __init__(self, switchable: Switchable, key: str, short_press_max_delta: float = 0.3):
         self._key = key

{trainerbase-3.8.2 → trainerbase-3.10.0}/trainerbase/gameobject.py

@@ -3,6 +3,7 @@ from typing import Self, override
 
 from pymem.exception import MemoryWriteError
 
+from trainerbase.common.abc import Switchable
 from trainerbase.memory import ConvertibleToAddress, ensure_address, pm
 
 
@@ -167,12 +168,20 @@ class GameUnsignedLongLong(GameObject[int, int]):
     pm_write = pm.write_ulonglong
 
 
-class GameBool(GameObject[bool, bool]):
+class GameBool(GameObject[bool, bool], Switchable):
     value_range: tuple[bool, bool] = (False, True)
 
     pm_read = pm.read_bool  # type: ignore
     pm_write = pm.write_bool
 
+    @override
+    def enable(self):
+        self.value = True  # pylint: disable=attribute-defined-outside-init
+
+    @override
+    def disable(self):
+        self.value = False  # pylint: disable=attribute-defined-outside-init
+
 
 class ReadonlyGameObjectSumGetter(AbstractReadableObject[int | float]):
     def __init__(self, *game_numbers: GameInt | GameFloat):

{trainerbase-3.8.2 → trainerbase-3.10.0}/trainerbase/gui/misc.py

@@ -8,13 +8,23 @@ from trainerbase.gui.types import AbstractUIComponent
 
 
 class SeparatorUI(AbstractUIComponent):
+    def __init__(self, empty_lines_before: int = 1, empty_lines_after: int = 0):
+        self._empty_lines_before = empty_lines_before
+        self._empty_lines_after = empty_lines_after
+
     @override
     def add_to_ui(self) -> None:
+        for _ in range(self._empty_lines_before):
+            dpg.add_text()
+
         dpg.add_separator()
 
+        for _ in range(self._empty_lines_after):
+            dpg.add_text()
+
 
 class TextUI(AbstractUIComponent):
-    def __init__(self, text: str):
+    def __init__(self, text: str = ""):
         self.text = text
 
     @override

{trainerbase-3.8.2 → trainerbase-3.10.0}/trainerbase/gui/objects.py

@@ -35,19 +35,21 @@ class GameObjectUI(AbstractUIComponent):
         self,
         gameobject: GameObject,
         label: str,
-        hotkey: str | None = None,
+        freeze_hotkey: str | None = None,
+        set_hotkey: str | None = None,
         default_setter_input_value: Any = 0,
         before_set: Callable | None = None,
         tts_on_hotkey: bool = True,
         setter_input_width: int = 220,
     ):
         if not gameobject.is_tracked:
-            hotkey = None
+            freeze_hotkey = None
 
         self.gameobject = gameobject
         self.pure_label = label
-        self.label_with_hotkey = label if hotkey is None else f"[{hotkey}] {label}"
-        self.hotkey = hotkey
+        self.label_with_hotkey = label if freeze_hotkey is None else f"[{freeze_hotkey}] {label}"
+        self.freeze_hotkey = freeze_hotkey
+        self.set_hotkey = set_hotkey
         self.default_setter_input_value = default_setter_input_value
         self.before_set = before_set
         self.tts_on_hotkey = tts_on_hotkey
@@ -60,8 +62,11 @@ class GameObjectUI(AbstractUIComponent):
 
     @override
     def add_to_ui(self) -> None:
-        if self.hotkey is not None:
-            add_hotkey(self.hotkey, self.on_hotkey_press)
+        if self.freeze_hotkey is not None:
+            add_hotkey(self.freeze_hotkey, self.on_freeze_hotkey_press)
+
+        if self.set_hotkey is not None:
+            add_hotkey(self.set_hotkey, self.on_value_set)
 
         with dpg.group(horizontal=True):
             if self.gameobject.is_tracked:
@@ -72,7 +77,12 @@ class GameObjectUI(AbstractUIComponent):
 
             self.add_setter_input()
 
-            dpg.add_button(label="Set", callback=self.on_value_set)
+            if self.set_hotkey is None:
+                setter_button_text = "Set"
+            else:
+                setter_button_text = f"[{self.set_hotkey}] Set"
+
+            dpg.add_button(label=setter_button_text, callback=self.on_value_set)
 
         GameObjectUI.displayed_objects.append(self)
 
@@ -141,7 +151,7 @@ class GameObjectUI(AbstractUIComponent):
         else:
             self.gameobject.frozen = new_value
 
-    def on_hotkey_press(self):
+    def on_freeze_hotkey_press(self):
         dpg.set_value(self.dpg_tag_frozen, not dpg.get_value(self.dpg_tag_frozen))
 
         self.on_frozen_state_change()

trainerbase-3.8.2/trainerbase/common/__init__.py

@@ -1,3 +0,0 @@
-from .helpers import *
-from .keyboard import *
-from .teleport import *