Merge pull request #45 from apple1417/master

more loot rando fixups

Author: apple1417

libs/pyunrealsdk

@@ -96,6 +96,7 @@ def add_compat_module(name: str, module: ModuleType) -> None:  # pyright: ignore
     from functools import wraps
 
     from unrealsdk.hooks import prevent_hooking_direct_calls
+    from unrealsdk.unreal import notify_changes
 
     from mods_base import MODS_DIR
 
@@ -107,6 +108,7 @@ def add_compat_module(name: str, module: ModuleType) -> None:  # pyright: ignore
 
     ENABLED = True  # pyright: ignore[reportConstantRedefinition]
     compat_handlers.append(prevent_hooking_direct_calls)
+    compat_handlers.append(notify_changes)
 
     """
     There are two parts to legacy SDK compatibility.

src/legacy_compat/__init__.py

@@ -98,7 +98,7 @@ def get_importing_file() -> Path:
         raise RuntimeError
 
     @classmethod
-    def find_spec(  # noqa: D102, C901
+    def find_spec(  # noqa: D102
         cls,
         fullname: str,
         path: Sequence[str] | None = None,
@@ -194,6 +194,7 @@ def find_spec(  # noqa: D102, C901
                 ("Mod", "Mods.LootRandomizer.Mod.missions")
                 # Newer versions split the files
                 | ("Mod", "Mods.LootRandomizer.Mod.bl2.locations")
+                | ("Mod", "Mods.LootRandomizer.Mod.tps.locations")
             ):
                 return spec_with_replacements(
                     fullname,
@@ -204,42 +205,23 @@ def find_spec(  # noqa: D102, C901
                     # case the functions actually validated their arg, so this just became a no-op.
                     # Remove the two bad calls.
                     (rb"get_missiontracker\(\)\.(Unr|R)egisterMissionDirector\(giver\)", b"pass"),
-                    # There's some code to hide Face McShooty's body on re-accepting the quest. I
-                    # think this broke due to the removal of CallPostEdit. Swapping it to use the
-                    # setter functions makes it work again.
-                    (
-                        rb"pawn.bHidden = True([\r\n]+ +)pawn.CollisionType = 1",
-                        rb"pawn.SetHidden(True)\1pawn.SetCollisionType(1)",
-                    ),
-                    # This one seems to be another post edit issue. Work around it with a console
-                    # command instead. Matching any number at the end for testing.
-                    (
-                        rb"raise Exception\(\"Could not locate switch for Michael Mamaril\"\)"
-                        rb"([\r\n]+ +)switch\.LinkCount = (\d+)",
-                        b'raise Exception("Could not locate switch for Michael Mamaril")\\1'
-                        b"import unrealsdk; unrealsdk.DoInjectedCallNext(); "
-                        b"GetEngine().GamePlayers[0].Actor.ConsoleCommand("
-                        b'f"set {switch.PathName(switch)} LinkCount \\2")',
-                    ),
                     # I was just told this one never did anything, idk what the bug is
                     (rb"sequence\.CustomEnableCondition\.bComplete = True", b""),
-                )
-
-            case ("Mod", "Mods.LootRandomizer.Mod.locations"):
-                return spec_with_replacements(
-                    fullname,
-                    path,
-                    target,
-                    # This one's a break just due to upgrading python. Hints were trying to be a
-                    # string enum before StrEnum was introduced, stringifying them now returns the
-                    # name, not the value.
+                    # This one's the same as reward reroller, need to manually convert to a list
                     (
-                        rb"hint_text = self\.item\.hint\.formatter\(self\.item\.hint\)",
-                        b"hint_text = self.item.hint.formatter(self.item.hint.value)",
+                        rb"caller\.FastTravelClip\.SendLocationData\(([\r\n]+ +)"
+                        rb"travels,([\r\n]+ +)"
+                        rb"caller\.LocationStationStrings,",
+                        rb"caller.FastTravelClip.SendLocationData(\1travels,\2list(caller.LocationStationStrings),",
                     ),
                 )
 
-            case ("Mod", "Mods.LootRandomizer.Mod.hints"):
+            case (
+                "Mod",
+                "Mods.LootRandomizer.Mod.hints"
+                | "Mods.LootRandomizer.Mod.bl2"
+                | "Mods.LootRandomizer.Mod.tps",
+            ):
                 return spec_with_replacements(
                     fullname,
                     path,
@@ -254,6 +236,10 @@ def find_spec(  # noqa: D102, C901
                         b"inventory_template.Manufacturers = [(manufacturer[0], "
                         b"[((1, None), (1, 100), (0.5, None, None, 1), (1, None, None, 1))])]",
                     ),
+                    # This one's a break just due to upgrading python. Hints were trying to be a
+                    # string enum before StrEnum was introduced, so stringifying them now returns
+                    # the name, not the value. Make it a real StrEnum instead.
+                    (rb"class Hint\(str, enum\.Enum\):", b"class Hint(enum.StrEnum):"),
                 )
 
             case _, _:

src/legacy_compat/meta_path_finder.py

@@ -6,7 +6,7 @@
 from contextlib import contextmanager
 from dataclasses import dataclass
 from functools import cache, wraps
-from typing import Any, overload
+from typing import TYPE_CHECKING, Any, overload
 
 from unrealsdk import (
     __version_info__,
@@ -33,6 +33,7 @@
     UClassProperty,
     UComponentProperty,
     UDelegateProperty,
+    UEnumProperty,
     UFloatProperty,
     UFunction,
     UInterfaceProperty,
@@ -51,6 +52,9 @@
 from legacy_compat import compat_handlers, legacy_compat
 from mods_base import ENGINE
 
+if TYPE_CHECKING:
+    from enum import IntFlag
+
 # This is mutable so mod menu can add to it
 __all__: list[str] = [
     "CallPostEdit",
@@ -236,7 +240,11 @@ def LogAllCalls(should_log: bool, /) -> None:
 
 
 def CallPostEdit(_: bool, /) -> None:
-    # Never really useful and no way to replicate
+    # We use the context manager to replicate this being on all the time. DOn't really have a good
+    # way to turn it off.
+    # As of writing this, the only mod left which called this is Commander - where it turned out to
+    # be superfluous. There do seem to have been some actual uses, in BL2Eternal and Sliding,
+    # however they've been ported to new sdk already.
     pass
 
 
@@ -269,6 +277,8 @@ def KeepAlive(obj: UObject, /) -> None:
   accessed the object, the new sdk just returns it directly. We need to return the struct instead.
 - In the legacy sdk, name properties did not include the number when converted to a string, which we
   need to strip out.
+- In the legacy sdk, all enum properties returned a raw int, but now they return an IntFlag, which
+  behave slightly differently - e.g. they support an __iter__.
 
 UObject:
 - The `ObjectFlags` field on objects used to be split into the upper and lower 32 bits (B and A
@@ -343,7 +353,8 @@ def _convert_struct_tuple_if_required(
     return value
 
 
-_RE_NAME_SUFFIX = re.compile(r"^(.+)_\d+$")
+# Make sure not to allow leading zeros
+_RE_NAME_SUFFIX = re.compile(r"^(.+)_[1-9]\d*$")
 
 
 @overload
@@ -380,6 +391,8 @@ def _uobject_getattr(self: UObject, name: str) -> Any:
             return FScriptInterface(value)
         case UNameProperty():
             return _strip_name_property_suffix(value)  # type: ignore
+        case UByteProperty() | UEnumProperty() if prop.Enum is not None:
+            return value.value  # type: ignore
         case _:
             return value
 
@@ -463,6 +476,8 @@ def _struct_getattr(self: WrappedStruct, name: str) -> Any:
             return FScriptInterface(value)
         case UNameProperty():
             return _strip_name_property_suffix(value)  # type: ignore
+        case UByteProperty() | UEnumProperty() if prop.Enum is not None:
+            return value.value  # type: ignore
         case _:
             return value
 
@@ -495,6 +510,12 @@ def _array_getitem[T](self: WrappedArray[T], idx: int | slice) -> T | list[T]:
                 return [_strip_name_property_suffix(x) for x in val_seq]  # type: ignore
 
             return _strip_name_property_suffix(value)  # type: ignore
+        case UByteProperty() | UEnumProperty() if self._type.Enum is not None:
+            if isinstance(idx, slice):
+                val_seq: Sequence[IntFlag] = value  # type: ignore
+                return [x.value for x in val_seq]  # type: ignore
+
+            return value.value  # type: ignore
         case _:
             return value