trainerbase 2.12.5__tar.gz → 2.13.1__tar.gz

{trainerbase-2.12.5 → trainerbase-2.13.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: TrainerBase
-Version: 2.12.5
+Version: 2.13.1
 Summary: Framework for creating game trainers/mods
 Home-page: https://gitlab.com/python-trainers/trainer-base
 Author-Email: v01d <v01d@v01d.ru>, doomayka <zd@doomayka.ru>

{trainerbase-2.12.5 → trainerbase-2.13.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "TrainerBase"
-version = "2.12.5"
+version = "2.13.1"
 description = "Framework for creating game trainers/mods"
 authors = [
     { name = "v01d", email = "v01d@v01d.ru" },
@@ -33,6 +33,10 @@ target-version = [
 ]
 line-length = 120
 
+[tool.isort]
+lines_after_imports = 2
+skip = "trainerbase/template/"
+
 [tool.pdm.build]
 includes = [
     "fasm/",

{trainerbase-2.12.5 → trainerbase-2.13.1}/trainerbase/codeinjection.py

@@ -1,10 +1,11 @@
 from abc import ABC, abstractmethod
 from pathlib import Path
-from subprocess import run as run_executable, DEVNULL
+from subprocess import DEVNULL
+from subprocess import run as run_executable
 from tempfile import TemporaryDirectory
 from uuid import uuid4
 
-from trainerbase.memory import ARCH, Address, pm, make_address
+from trainerbase.memory import ARCH, Address, make_address, pm
 
 
 FASM_EXECUTABLE_PATH = Path(__file__).resolve().parent.parent / "fasm" / "FASM.EXE"

{trainerbase-2.12.5 → trainerbase-2.13.1}/trainerbase/common.py

@@ -1,10 +1,10 @@
-from operator import mul, add
-from itertools import starmap, repeat
+from itertools import repeat, starmap
 from math import sqrt
+from operator import add, mul
 
 from pymem.exception import MemoryReadError
 
-from trainerbase.gameobject import GameInt, GameFloat
+from trainerbase.gameobject import GameFloat, GameInt
 from trainerbase.scriptengine import Script
 
 

{trainerbase-2.12.5 → trainerbase-2.13.1}/trainerbase/gui.py

@@ -1,12 +1,26 @@
 from collections.abc import Callable
+from functools import partial
+from typing import Any
 
 from dearpygui import dearpygui as dpg
 from keyboard import add_hotkey
 
-from trainerbase.scriptengine import Script
-from trainerbase.gameobject import GameObject
 from trainerbase.codeinjection import AbstractCodeInjection
 from trainerbase.common import Teleport
+from trainerbase.gameobject import (
+    GameBool,
+    GameByte,
+    GameDouble,
+    GameFloat,
+    GameInt,
+    GameLongLong,
+    GameObject,
+    GameShort,
+    GameUnsignedInt,
+    GameUnsignedLongLong,
+    GameUnsignedShort,
+)
+from trainerbase.scriptengine import Script
 from trainerbase.tts import say
 
 
@@ -76,6 +90,7 @@ def add_gameobject_to_gui(
     gameobject: GameObject,
     label: str,
     hotkey: str = None,
+    default_setter_input_value: Any = 0,
     before_set: Callable = int,
     tts_on_hotkey: bool = True,
 ):
@@ -83,11 +98,7 @@ def add_gameobject_to_gui(
         gameobject.frozen = gameobject.value if dpg.get_value(gameobject.dpg_tag_frozen) else None
 
     def on_value_set():
-        raw_new_value = dpg.get_value(gameobject.dpg_tag_setter)
-        if not raw_new_value:
-            return
-
-        new_value = before_set(raw_new_value)
+        new_value = before_set(dpg.get_value(gameobject.dpg_tag_setter))
 
         if gameobject.frozen is None:
             gameobject.value = new_value
@@ -108,11 +119,23 @@ def add_gameobject_to_gui(
 
         label = f"[{hotkey}] {label}"
 
+    match gameobject:
+        case GameFloat():
+            add_setter_input = dpg.add_input_float
+        case GameDouble():
+            add_setter_input = dpg.add_input_double
+        case GameByte() | GameShort() | GameInt() | GameLongLong() | GameBool():
+            add_setter_input = dpg.add_input_int
+        case GameUnsignedShort() | GameUnsignedInt() | GameUnsignedLongLong():
+            add_setter_input = partial(dpg.add_input_int, min_clamped=True, min_value=0)
+        case _:
+            add_setter_input = dpg.add_input_text
+
     with dpg.group(horizontal=True):
         dpg.add_checkbox(tag=gameobject.dpg_tag_frozen, callback=on_frozen_state_change)
         dpg.add_text(label)
         dpg.add_input_text(width=220, tag=gameobject.dpg_tag_getter, readonly=True)
-        dpg.add_input_text(width=220, tag=gameobject.dpg_tag_setter, hint="Set value here")
+        add_setter_input(width=220, tag=gameobject.dpg_tag_setter, default_value=default_setter_input_value)
         dpg.add_button(label="Set", callback=on_value_set)
 
 

{trainerbase-2.12.5 → trainerbase-2.13.1}/trainerbase/template/src/gui.py

@@ -1,4 +1,4 @@
-import dearpygui.dearpygui as dpg
+from dearpygui import dearpygui as dpg
 from trainerbase.gui import add_script_to_gui, add_gameobject_to_gui, add_codeinjection_to_gui, simple_trainerbase_menu
 
 from scripts import *
@@ -11,13 +11,13 @@ def run_menu():
     with dpg.tab_bar():
         # (!) Example:
         #
-        # with dpg.tab(label="Scripts", tag="scripts"):
+        # with dpg.tab(label="Scripts"):
         #     add_script_to_gui(script, "Readable Name")
         #
-        # with dpg.tab(label="Objects", tag="objects"):
+        # with dpg.tab(label="Objects"):
         #     add_gameobject_to_gui(game_object, "Readable Name")
         #
-        # with dpg.tab(label="Code Injections", tag="code_injections"):
+        # with dpg.tab(label="Code Injections"):
         #     add_codeinjection_to_gui(injection, "Injection Name")
 
         ...

{trainerbase-2.12.5 → trainerbase-2.13.1}/trainerbase/template/src/scripts.py

@@ -1,4 +1,3 @@
-from trainerbase.gameobject import GameObject
 from trainerbase.scriptengine import ScriptEngine, system_script_engine
 
 

{trainerbase-2.12.5 → trainerbase-2.13.1}/trainerbase/tts.py

@@ -1,4 +1,5 @@
 from threading import Thread
+
 from pyttsx3 import init as init_tts_engine
 
 

{trainerbase-2.12.5 → trainerbase-2.13.1}/trainerbase/config.py

@@ -1,5 +1,5 @@
-from tomllib import load as load_toml
 from pathlib import Path
+from tomllib import load as load_toml
 
 
 with Path("./trainerbase.toml").resolve().open("rb") as trainerbase_toml:

{trainerbase-2.12.5 → trainerbase-2.13.1}/trainerbase/gameobject.py

@@ -1,6 +1,6 @@
 from abc import ABC, abstractmethod
-from uuid import uuid4
 from typing import Self
+from uuid import uuid4
 
 from trainerbase.memory import Address, make_address, pm