Merge pull request #44 from apple1417/master

more legacy compat

Author: apple1417

changelog.md

@@ -3,8 +3,8 @@
 ## v3.5 (Upcoming)
 
 ### Legacy Compat v1.4
-- Added more fixups for previously unreported issues in Gear Randomizer, Loot Randomizer
-  and Reign of Giants.
+- Added more fixups for previously unreported issues in Gear Randomizer, Loot Randomizer, Player
+  Randomizer and Reign of Giants.
 
 ### Willow2 Mod Menu v3.4
 - Fixed that some keybinds would not be displayed properly if there were two separate grouped/nested

src/legacy_compat/meta_path_finder.py

@@ -188,7 +188,7 @@ def find_spec(  # noqa: D102, C901
                     ),
                 )
 
-            # Loot randomizer needs a few fixes
+            # Loot randomizer needs quite a few fixes
             case (
                 # Here's the downside of using a single folder name, these cases just look weird.
                 ("Mod", "Mods.LootRandomizer.Mod.missions")
@@ -211,6 +211,18 @@ def find_spec(  # noqa: D102, C901
                         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"):

src/legacy_compat/unrealsdk/__init__.py

@@ -6,7 +6,7 @@
 from contextlib import contextmanager
 from dataclasses import dataclass
 from functools import cache, wraps
-from typing import Any
+from typing import Any, overload
 
 from unrealsdk import (
     __version_info__,
@@ -346,15 +346,23 @@ def _convert_struct_tuple_if_required(
 _RE_NAME_SUFFIX = re.compile(r"^(.+)_\d+$")
 
 
-def _strip_name_property_suffix(name: str) -> str:
+@overload
+def _strip_name_property_suffix(name: str) -> str: ...
+@overload
+def _strip_name_property_suffix(name: tuple[str, ...]) -> tuple[str, ...]: ...
+
+
+def _strip_name_property_suffix(name: str | tuple[str, ...]) -> str | tuple[str, ...]:
     """
     Tries to strip the numeric suffix from a name property.
 
     Args:
-        name: The input name.
+        name: The input name(s).
     Returns:
-        The stripped name.
+        The stripped name(s).
     """
+    if isinstance(name, tuple):
+        return tuple(_strip_name_property_suffix(x) for x in name)
     return match.group(1) if (match := _RE_NAME_SUFFIX.match(name)) else name
 
 
@@ -371,7 +379,7 @@ def _uobject_getattr(self: UObject, name: str) -> Any:
         case UInterfaceProperty():
             return FScriptInterface(value)
         case UNameProperty():
-            return _strip_name_property_suffix(value)
+            return _strip_name_property_suffix(value)  # type: ignore
         case _:
             return value
 
@@ -412,7 +420,7 @@ def _uobject_getattribute(self: UObject, name: str) -> Any:
         case "ObjectFlags":
             return _ObjectFlagsProxy(self)
         case "Name":
-            return _strip_name_property_suffix(_default_object_getattribute(self, "Name"))
+            return _strip_name_property_suffix(_default_object_getattribute(self, "Name"))  # type: ignore
         case _:
             return _default_object_getattribute(self, name)
 
@@ -454,7 +462,7 @@ def _struct_getattr(self: WrappedStruct, name: str) -> Any:
         case UInterfaceProperty():
             return FScriptInterface(value)
         case UNameProperty():
-            return _strip_name_property_suffix(value)
+            return _strip_name_property_suffix(value)  # type: ignore
         case _:
             return value
 
@@ -487,8 +495,6 @@ 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
-
-            return _strip_name_property_suffix(value)
         case _:
             return value
 
@@ -614,6 +620,14 @@ def _uobject_get_name(obj: UObject, /) -> str:
     return obj.Name
 
 
+def _uobject_get_object_name(obj: UObject, /) -> str:
+    current = obj
+    output = f"{obj.Name}"
+    while current := current.Outer:
+        output = f"{current.Name}.{output}"
+    return output
+
+
 @staticmethod
 def _uobject_path_name(obj: UObject | None, /) -> str:
     if obj is None:
@@ -657,6 +671,7 @@ def _unreal_method_compat_handler() -> Iterator[None]:
     UObject.GetAddress = UObject._get_address  # type: ignore
     UObject.GetFullName = _uobject_repr  # type: ignore
     UObject.GetName = _uobject_get_name  # type: ignore
+    UObject.GetObjectName = _uobject_get_object_name  # type: ignore
     UObject.PathName = _uobject_path_name  # type: ignore
     UStructProperty.GetStruct = _ustructproperty_get_struct  # type: ignore
     WrappedStruct.structType = _wrapped_struct_structType  # type: ignore
@@ -680,6 +695,7 @@ def _unreal_method_compat_handler() -> Iterator[None]:
         del UObject.GetAddress  # type: ignore
         del UObject.GetFullName  # type: ignore
         del UObject.GetName  # type: ignore
+        del UObject.GetObjectName  # type: ignore
         del UObject.PathName  # type: ignore
         del UStructProperty.GetStruct  # type: ignore
         del WrappedStruct.structType  # type: ignore