Fix for BCP update that added an easier-to-use LoadState which means …

…G+Go didn't know which LoadState to use anymore, whoops
alextd · Sep 3, 2020 · 6567668 · 6567668
1 parent 4989a1a
commit 6567668
Showing 1 changed file with 19 additions and 13 deletions.
diff --git a/Source/SetBetterPawnControl.cs b/Source/SetBetterPawnControl.cs
@@ -10,6 +10,7 @@
 
 namespace GearUpAndGo
 {
+	[StaticConstructorOnStartup]
 	static class SetBetterPawnControl
 	{
 		public static bool Active()
@@ -39,29 +40,34 @@ public static void SetPawnControlPolicy(string policyName)
 			}
 		}
 
-		static Type assignManager = AccessTools.TypeByName("AssignManager");
-		static FieldInfo linksInfo = AccessTools.Field(assignManager, "links");
-		static FieldInfo policiesInfo = AccessTools.Field(assignManager, "policies");
-		static MethodInfo LoadStateInfo = AccessTools.Method(AccessTools.TypeByName("AssignManager"), "LoadState");
+
+		static Type assignManager;
+		static Type policyType;
+		static FieldInfo policiesInfo;
+		static MethodInfo LoadStateInfo;
+		static SetBetterPawnControl()
+		{
+			assignManager = AccessTools.TypeByName("BetterPawnControl.AssignManager");
+			Log.Message($"BCP assignManager: {assignManager}");
+			policyType = AccessTools.TypeByName("BetterPawnControl.Policy");
+			Log.Message($"BCP policyType: {policyType}");
+			policiesInfo = AccessTools.Field(assignManager, "policies");
+			Log.Message($"BCP policiesInfo: {policiesInfo}");
+			LoadStateInfo = AccessTools.Method(assignManager, "LoadState", new Type[] { policyType });
+			Log.Message($"BCP LoadStateInfo: {LoadStateInfo}");
+		}
 		public static void SetPawnControlPolicyEx(string policyName)
 		{ 
-			List<AssignLink> links = (List<AssignLink>)linksInfo.GetValue(default(object));
-			Log.Message($"links are: {links.ToStringSafeEnumerable()}");
-
 			List<Policy> assignPolicies = (List<Policy>)policiesInfo.GetValue(default(object));
 			Log.Message($"assignPolicies are: {assignPolicies.ToStringSafeEnumerable()}");
-
-			List<Pawn> pawns = Find.CurrentMap.mapPawns.FreeColonists.ToList();
-			Log.Message($"pawns are: {pawns.ToStringSafeEnumerable()}");
-
 			Policy policy = assignPolicies.FirstOrDefault(p => p.label == policyName);
 
 			if (policy != null)
 			{
 				Log.Message($"using policy: {policy}");
 				//MainTabWindow_Assign_Policies
-				//private static void LoadState(List<AssignLink> links, List< Pawn > pawns, Policy policy)
-				LoadStateInfo.Invoke(default(object), new object[] {links, pawns, policy});
+				//private static void LoadState(Policy policy)
+				LoadStateInfo.Invoke(default(object), new object[] {policy});
 			}
 		}