trainerbase 3.0.0__tar.gz → 3.1.0__tar.gz

{trainerbase-3.0.0 → trainerbase-3.1.0}/PKG-INFO

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

{trainerbase-3.0.0 → trainerbase-3.1.0}/pyproject.toml

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

{trainerbase-3.0.0 → trainerbase-3.1.0}/trainerbase/codeinjection.py

@@ -114,6 +114,21 @@ class AllocatingCodeInjection(AbstractCodeInjection):  # pylint: disable=too-man
             self.new_memory_address = 0
 
 
+class MultipleCodeInjection(AbstractCodeInjection):
+    def __init__(self, *injections: AbstractCodeInjection):
+        self._injections = injections
+
+    @override
+    def inject(self):
+        for injection in self._injections:
+            injection.inject()
+
+    @override
+    def eject(self):
+        for injection in self._injections:
+            injection.eject()
+
+
 def compile_asm(code: Code) -> bytes:
     if isinstance(code, str):
         fasm_mode = f"use{ARCH}"

{trainerbase-3.0.0 → trainerbase-3.1.0}/trainerbase/common.py

@@ -8,8 +8,8 @@ from typing import Self
 from keyboard import on_press_key, on_release_key
 from pymem.exception import MemoryReadError
 
-from trainerbase.gameobject import GameObject
-from trainerbase.scriptengine import Script
+from trainerbase.gameobject import AbstractReadableObject, GameObject
+from trainerbase.scriptengine import Script, system_script_engine
 
 
 type Coords[T: (int, float)] = tuple[T, T, T]
@@ -75,7 +75,8 @@ class Teleport:
         self.current_position: Coords | None = None
         self.movement_vector = Vector3(0, 0, 0)
         self.minimal_movement_vector_length = minimal_movement_vector_length
-        self.movement_vector_updater_script: Script | None = None
+
+        system_script_engine.register_script(Script(self.update_movement_vector, enabled=True))
 
     def set_coords(self, x: Number, y: Number, z: Number = 100) -> None:
         self.player_x.value = x
@@ -126,12 +127,6 @@ class Teleport:
         new_coords = Vector3(*self.get_coords()) + dash_movement_vector
         self.set_coords(*new_coords)
 
-    def create_movement_vector_updater_script(self) -> Script:
-        if self.movement_vector_updater_script is None:
-            self.movement_vector_updater_script = Script(self.update_movement_vector, enabled=True)
-
-        return self.movement_vector_updater_script
-
 
 class Switchable(ABC):
     @abstractmethod
@@ -195,7 +190,7 @@ class ShortLongPressSwitch:
 
 def regenerate(
     current_value: GameObject,
-    max_value: GameObject,
+    max_value: AbstractReadableObject,
     percent: Number,
     min_value: Number = 1,
 ):

{trainerbase-3.0.0 → trainerbase-3.1.0}/trainerbase/gameobject.py

@@ -6,7 +6,14 @@ from pymem.exception import MemoryWriteError
 from trainerbase.memory import ConvertibleToAddress, ensure_address, pm
 
 
-class GameObject[PymemType, TrainerBaseType](ABC):
+class AbstractReadableObject[T](ABC):
+    @property
+    @abstractmethod
+    def value(self) -> T:
+        pass
+
+
+class GameObject[PymemType, TrainerBaseType](AbstractReadableObject[TrainerBaseType]):
     created_objects: list[Self] = []
 
     @staticmethod
@@ -45,6 +52,7 @@ class GameObject[PymemType, TrainerBaseType](ABC):
         return value  # type: ignore
 
     @property
+    @override
     def value(self) -> TrainerBaseType:
         return self.after_read(self.pm_read(self.address.resolve()))
 
@@ -126,6 +134,15 @@ class GameBool(GameObject[bool, bool]):
     pm_write = pm.write_bool
 
 
+class ReadonlyGameObjectSumGetter(AbstractReadableObject[int | float]):
+    def __init__(self, *game_numbers: GameInt | GameFloat):
+        self.game_numbers = game_numbers
+
+    @property
+    def value(self) -> int | float:
+        return sum(number.value for number in self.game_numbers)
+
+
 def update_frozen_objects():
     for game_object in GameObject.created_objects:
         if game_object.frozen is not None:

{trainerbase-3.0.0 → trainerbase-3.1.0}/trainerbase/gui.py

@@ -262,7 +262,7 @@ class TeleportUI(AbstractUIComponent):
         dpg.add_text(f"[{self.hotkey_set_saved_position}] Set Saved Position")
 
     def _tp_add_dash_hotkeys_if_needed(self):
-        if self.tp.movement_vector_updater_script is None or self.hotkey_dash is None:
+        if self.hotkey_dash is None:
             return
 
         add_hotkey(self.hotkey_dash, self.on_hotkey_dash_press)