Merge pull request #1 from SleepingPills/main

Update to 3.11

Author: TheBoogle

SkeletonKey/KeycardDoorPatch.cs

@@ -1,9 +1,8 @@
 using System.Reflection;
-using SPT.Reflection.Patching;
+using EFT;
 using EFT.Interactive;
 using EFT.InventoryLogic;
-using Diz.LanguageExtensions;
-using EFT;
+using SPT.Reflection.Patching;
 
 namespace Boogle
 {
@@ -17,30 +16,32 @@ protected override MethodBase GetTargetMethod()
 
         [PatchPrefix]
         private static bool PatchPrefix(
-            ref GStruct448<GClass3344> __result,
+            ref GStruct457<GClass3424> __result,
             KeyComponent key,
             Player player,
             KeycardDoor __instance)
         {
             // Check if the player can interact
-            Error canInteract = player.MovementContext.CanInteract;
+            var canInteract = player.MovementContext.CanInteract;
+            
             if (canInteract != null)
             {
                 __result = canInteract;
                 return false;
             }
 
             // Dynamically allow the "BoogleSkeletonKeycard"
-            bool isAuthorized = key.Template.KeyId == __instance.KeyId || key.Template.KeyId == "673e213fc6be39d06423d6b7";
+            var isAuthorized = key.Template.KeyId == __instance.KeyId || key.Template.KeyId == "673e213fc6be39d06423d6b7";
 
             if (!isAuthorized)
             {
-                __result = new GClass3344(key, null, false);
+                __result = new GClass3424(key, null, false);
                 return false;
             }
 
             // Simulate usage logic
             key.NumberOfUsages++;
+            
             if (key.NumberOfUsages >= key.Template.MaximumNumberOfUsage && key.Template.MaximumNumberOfUsage > 0)
             {
                 var discardResult = InteractionsHandlerClass.Discard(
@@ -57,7 +58,7 @@ private static bool PatchPrefix(
             }
 
             // Return successful interaction
-            __result = new GClass3344(key, null, true);
+            __result = new GClass3424(key, null, true);
             return false;
         }
     }

SkeletonKey/Method0Patch.cs

@@ -10,21 +10,19 @@ public class Method0Patch : ModulePatch
         protected override MethodBase GetTargetMethod()
         {
             // Target the method_0 function in Class1544
-            return typeof(Class1650).GetMethod("method_0", BindingFlags.Public | BindingFlags.Instance);
+            return typeof(Class1674).GetMethod("method_0", BindingFlags.Public | BindingFlags.Instance);
         }
 
         [PatchPrefix]
-        private static bool PatchPrefix(KeyComponent x, Class1650 __instance, ref bool __result)
+        private static bool PatchPrefix(KeyComponent x, Class1674 __instance, ref bool __result)
         {
             // Check if the key has the correct KeyId or is "BoogleSkeletonKey"
-            if (x.Template.KeyId == __instance.worldInteractiveObject.KeyId || x.Template.KeyId == "673e1f10aaf0fe810c488218")
-            {
-                __result = true; // Allow unlock
-                return false;    // Skip the original method
-            }
+            if (x.Template.KeyId != __instance.worldInteractiveObject.KeyId && x.Template.KeyId != "673e1f10aaf0fe810c488218") return true;
+            
+            __result = true; // Allow unlock
+            return false;    // Skip the original method
 
             // Otherwise, let the original logic handle it
-            return true;
         }
     }
 }

SkeletonKey/Plugin.cs

@@ -3,8 +3,8 @@
 
 namespace Boogle
 {
-    [BepInPlugin("com.boogle.skeletonkey", "Adds the Skeleton Key Item", "1.0.3")]
-    public class skeletonkey : BaseUnityPlugin
+    [BepInPlugin("com.boogle.skeletonkey", "Adds the Skeleton Key Item", "1.0.4")]
+    public class SkeletonKey : BaseUnityPlugin
     {
         public void Awake()
         {

SkeletonKey/UnlockOperationPatch.cs

@@ -1,9 +1,8 @@
 using System.Reflection;
-using SPT.Reflection.Patching;
-using EFT.Interactive;
 using EFT;
+using EFT.Interactive;
 using EFT.InventoryLogic;
-using Diz.LanguageExtensions;
+using SPT.Reflection.Patching;
 
 namespace Boogle
 {
@@ -18,21 +17,24 @@ protected override MethodBase GetTargetMethod()
 
         [PatchPrefix]
         private static bool PatchPrefix(
-            ref GStruct448<GClass3344> __result,
+            ref GStruct457<GClass3424> __result,
             KeyComponent key,
             Player player,
             WorldInteractiveObject __instance)
         {
-            Error canInteract = player.MovementContext.CanInteract;
+            var canInteract = player.MovementContext.CanInteract;
+            
             if (canInteract != null)
             {
                 __result = canInteract;
             }
             if (!(key.Template.KeyId == __instance.KeyId || key.Template.KeyId == "673e1f10aaf0fe810c488218"))
             {
-                __result = new GClass3757("Key doesn't match");
+                __result = new GClass3854("Key doesn't match");
             }
-            GStruct446<GClass3129> gstruct = default(GStruct446<GClass3129>);
+            
+            var gstruct = default(GStruct455<GClass3200>);
+            
             key.NumberOfUsages++;
             if (key.NumberOfUsages >= key.Template.MaximumNumberOfUsage && key.Template.MaximumNumberOfUsage > 0)
             {
@@ -42,7 +44,7 @@ private static bool PatchPrefix(
                     __result = gstruct.Error;
                 }
             }
-            __result = new GClass3344(key, gstruct.Value, true);
+            __result = new GClass3424(key, gstruct.Value, true);
 
             return false;
         }