trainerbase 3.1.4__tar.gz → 3.2.0__tar.gz

{trainerbase-3.1.4 → trainerbase-3.2.0}/PKG-INFO

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

{trainerbase-3.1.4 → trainerbase-3.2.0}/pyproject.toml

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

{trainerbase-3.1.4 → trainerbase-3.2.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,8 +124,16 @@ 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 = Address(self.base_address, self.offsets.copy(), self.add)
+        new_address = self.__class__(self.base_address, self.offsets.copy(), self.add)
 
         if extra_offsets is not None:
             new_address.offsets.extend(extra_offsets)
@@ -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: