Update SearchAndDestroy (#491)

Update to make the patch work with the unofficial continuation of the mod since the original appears to be abandoned
rwmt · Oct 26, 2024 · f831645 · f831645
1 parent c7a46f2
commit f831645
Showing 1 changed file with 28 additions and 18 deletions.
diff --git a/Source/Mods/SearchAndDestroy.cs b/Source/Mods/SearchAndDestroy.cs
@@ -5,36 +5,46 @@
 
 namespace Multiplayer.Compat
 {
-    /// <summary>Search and Destroy by Roolo</summary>
-    /// <see href="https://github.com/rheirman/SearchAndDestroy"/>
-    /// <see href="https://steamcommunity.com/sharedfiles/filedetails/?id=1467764609"/>
-    [MpCompatFor("roolo.SearchAndDestroy")]
+    /// <summary>Search and Destroy updated mod by MemeGoddess</summary>
+    /// <see href="https://github.com/MemeGoddess/SearchAndDestroy"/>
+    /// <see href="https://steamcommunity.com/sharedfiles/filedetails/?id=3232242247"/>
+    [MpCompatFor("MemeGoddess.SearchAndDestroy")]
     public class SearchAndDestroy
     {
-        // Base class
+        // Fields for accessing private data structures
         private static FastInvokeHandler searchAndDestroyInstance;
         private static AccessTools.FieldRef<object, object> extendedDataStorageField;
-
-        // ExtendedDataStorage class
         private static AccessTools.FieldRef<object, IDictionary> storeField;
 
         public SearchAndDestroy(ModContentPack mod)
         {
-            var type = AccessTools.TypeByName("SearchAndDestroy.Harmony.Pawn_DraftController_GetGizmos");
-
-            MpCompat.RegisterLambdaDelegate(type, "CreateGizmo_SearchAndDestroy_Melee", 1);
-            MpCompat.RegisterLambdaDelegate(type, "CreateGizmo_SearchAndDestroy_Ranged", 1);
+            // Register the gizmo creation methods to synchronize their actions across clients
+            MpCompat.RegisterLambdaDelegate(
+                "SearchAndDestroy.Harmony.Pawn_DraftController_GetGizmos",
+                "CreateGizmo_SearchAndDestroy_Melee",
+                1
+            );
+            MpCompat.RegisterLambdaDelegate(
+                "SearchAndDestroy.Harmony.Pawn_DraftController_GetGizmos",
+                "CreateGizmo_SearchAndDestroy_Ranged",
+                1
+            );
 
-            type = AccessTools.TypeByName("SearchAndDestroy.Base");
-            searchAndDestroyInstance = MethodInvoker.GetHandler(AccessTools.PropertyGetter(type, "Instance"));
-            extendedDataStorageField = AccessTools.FieldRefAccess<object>(type, "_extendedDataStorage");
+            // Register a SyncWorker for ExtendedPawnData to synchronize custom data
+            var extendedPawnDataType = AccessTools.TypeByName("SearchAndDestroy.Storage.ExtendedPawnData");
+            MP.RegisterSyncWorker<object>(SyncExtendedPawnData, extendedPawnDataType);
 
-            type = AccessTools.TypeByName("SearchAndDestroy.Storage.ExtendedPawnData");
-            MP.RegisterSyncWorker<object>(SyncExtendedPawnData, type);
+            // Initialize reflection accessors for private fields and properties
+            var baseType = AccessTools.TypeByName("SearchAndDestroy.Base");
+            searchAndDestroyInstance = MethodInvoker.GetHandler(AccessTools.PropertyGetter(baseType, "Instance"));
+            extendedDataStorageField = AccessTools.FieldRefAccess<object>(baseType, "_extendedDataStorage");
 
-            storeField = AccessTools.FieldRefAccess<IDictionary>("SearchAndDestroy.Storage.ExtendedDataStorage:_store");
+            storeField = AccessTools.FieldRefAccess<IDictionary>(
+                "SearchAndDestroy.Storage.ExtendedDataStorage:_store"
+            );
         }
 
+        // SyncWorker method to synchronize ExtendedPawnData across clients
         public static void SyncExtendedPawnData(SyncWorker sync, ref object pawnData)
         {
             var instance = searchAndDestroyInstance(null);
@@ -66,4 +76,4 @@ public static void SyncExtendedPawnData(SyncWorker sync, ref object pawnData)
             }
         }
     }
-}
+}