Do not disable the Mods button when quitting to the Main Menu from ga…

…meplay in Stock Bug Fix, as Steam mods obviously have to be fully loaded by then.

Fix a very rare race condition in Fast Track.

FastTrack/GamePatches/SuitMarkerUpdater.cs

@@ -33,12 +33,14 @@ public sealed class SuitMarkerUpdater : KMonoBehaviour, ISim1000ms, ISim200ms {
 		/// <param name="equipment">The assignables containing the suit to drop.</param>
 		private static void DropSuit(Assignables equipment) {
 			var assignable = equipment.GetAssignable(Db.Get().AssignableSlots.Suit);
-			var notification = new Notification(STRINGS.MISC.NOTIFICATIONS.SUIT_DROPPED.NAME,
-				NotificationType.BadMinor, (_, data) => STRINGS. MISC.NOTIFICATIONS.
-				SUIT_DROPPED.TOOLTIP);
-			assignable.Unassign();
-			if (assignable.TryGetComponent(out Notifier notifier))
-				notifier.Add(notification);
+			if (assignable != null) {
+				var notification = new Notification(STRINGS.MISC.NOTIFICATIONS.SUIT_DROPPED.NAME,
+					NotificationType.BadMinor, (_, data) => STRINGS. MISC.NOTIFICATIONS.
+					SUIT_DROPPED.TOOLTIP);
+				assignable.Unassign();
+				if (assignable.TryGetComponent(out Notifier notifier))
+					notifier.Add(notification);
+			}
 		}
 
 		/// <summary>
@@ -263,7 +265,7 @@ internal void UpdateSuitStatus() {
 
 	/// <summary>
 	/// Applied to SuitMarker.EquipSuitReactable to make the Run method more efficient and
-	/// use the SuitMarkerUpdater..
+	/// use the SuitMarkerUpdater.
 	/// </summary>
 	[HarmonyPatch(typeof(SuitMarker.EquipSuitReactable), nameof(SuitMarker.
 		EquipSuitReactable.Run))]
@@ -316,7 +318,7 @@ internal static bool Prefix() {
 
 	/// <summary>
 	/// Applied to SuitMarker.UnequipSuitReactable to make the Run method more efficient and
-	/// use the SuitMarkerUpdater..
+	/// use the SuitMarkerUpdater.
 	/// </summary>
 	[HarmonyPatch(typeof(SuitMarker.UnequipSuitReactable), nameof(SuitMarker.
 		UnequipSuitReactable.Run))]

PLibCore/PatchManager/PLibMethodAttribute.cs

@@ -108,7 +108,7 @@ public void Run(Harmony instance) {
 						Method.Invoke(null, new object[] { instance, requiredType });
 				} else
 					PUtil.LogWarning("Invalid signature for PLibMethod - must have (), " +
-						"(HarmonyInstance), or (HarmonyInstance, Type)");
+						"(Harmony), or (Harmony, Type)");
 			}
 		}
 	}

StockBugFix/QueuedModReporter.cs

@@ -31,6 +31,16 @@ public sealed class QueuedModReporter : KMonoBehaviour {
 		private static readonly IDetouredField<MainMenu, KButton> RESUME_GAME = PDetours.
 			DetourFieldLazy<MainMenu, KButton>(nameof(MainMenu.Button_ResumeGame));
 
+		public static void Init() {
+			firstLoad = true;
+		}
+
+		/// <summary>
+		/// Only lock the button out on the first main menu load; loading and quitting a game
+		/// is so slow that it will certainly be loaded by then.
+		/// </summary>
+		private static volatile bool firstLoad;
+
 		/// <summary>
 		/// Is the mods button already enabled?
 		/// </summary>
@@ -74,8 +84,9 @@ private void FindModsButton(Transform buttonParent) {
 		protected override void OnSpawn() {
 			base.OnSpawn();
 			startupTime = 0.0f;
-			if (StockBugFixOptions.Instance.DelayModsMenu && TryGetComponent(out MainMenu mm))
-			{
+			if (firstLoad && StockBugFixOptions.Instance.DelayModsMenu && TryGetComponent(
+					out MainMenu mm)) {
+				firstLoad = false;
 				try {
 					Transform buttonParent;
 					KButton resumeButton;

StockBugFix/StockBugFix.csproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyTitle>Stock Bug Fix</AssemblyTitle>
-    <FileVersion>4.3.0.0</FileVersion>
+    <FileVersion>4.4.0.0</FileVersion>
     <RootNamespace>PeterHan.StockBugFix</RootNamespace>
     <Description>Fixes bugs and annoyances in the stock game.</Description>
     <AssemblyVersion>3.2.0.0</AssemblyVersion>

StockBugFix/StockBugsPatches.cs

@@ -55,6 +55,7 @@ internal static void AfterDbInit() {
 			FixRadiationSickness();
 			if (StockBugFixOptions.Instance.FixTraits)
 				TraitsExclusionPatches.FixTraits();
+			QueuedModReporter.Init();
 		}
 
 		/// <summary>
@@ -241,6 +242,7 @@ public override void OnLoad(Harmony instance) {
 			PUtil.InitLibrary();
 			var pm = new PPatchManager(instance);
 			pm.RegisterPatchClass(typeof(StockBugsPatches));
+			pm.RegisterPatchClass(typeof(DiseaseSourcesPatch));
 			pm.RegisterPatchClass(typeof(SweepFixPatches));
 			FixModUpdateRace(instance);
 			PRegistry.PutData("Bugs.TepidizerPulse", true);

StockBugFix/StockQOLPatches.cs

@@ -20,6 +20,7 @@
 using System.Collections.Generic;
 using System.Reflection;
 using PeterHan.PLib.Core;
+using PeterHan.PLib.PatchManager;
 using UnityEngine;
 
 namespace PeterHan.StockBugFix {
@@ -210,21 +211,27 @@ internal static bool Prefix(FoodDiagnostic __instance,
 	/// Applied to multiple types to add a Disease Source icon to Buddy Buds, Bristle
 	/// Blossoms and Bammoths.
 	/// </summary>
-	[HarmonyPatch]
-	public static class PollenDiseaseSources_Patch {
-		internal static IEnumerable<MethodBase> TargetMethods() {
+	internal static class DiseaseSourcesPatch {
+		/// <summary>
+		/// Since referencing the Bammoth causes localization to break through transitive
+		/// string references, apply the patch manually after the Db is loaded.
+		/// </summary>
+		[PLibMethod(RunAt.AfterDbInit)]
+		internal static void ApplyPatch(Harmony harmony) {
 			const string METHOD_NAME = nameof(IEntityConfig.CreatePrefab);
 			var bammothType = PPatchTools.GetTypeSafe("IceBellyConfig");
-			yield return typeof(BulbPlantConfig).GetMethodSafe(METHOD_NAME, false);
-			yield return typeof(PrickleFlowerConfig).GetMethodSafe(METHOD_NAME, false);
+			var patchMethod = new HarmonyMethod(typeof(DiseaseSourcesPatch),
+				nameof(PollenGermsPostfix));
+			harmony.Patch(typeof(BulbPlantConfig), METHOD_NAME, postfix: patchMethod);
+			harmony.Patch(typeof(PrickleFlowerConfig), METHOD_NAME, postfix: patchMethod);
 			if (bammothType != null)
-				yield return bammothType.GetMethodSafe(METHOD_NAME, false);
+				harmony.Patch(bammothType, METHOD_NAME, postfix: patchMethod);
 		}
 
 		/// <summary>
 		/// Applied after CreatePrefab runs.
 		/// </summary>
-		internal static void Postfix(GameObject __result) {
+		internal static void PollenGermsPostfix(GameObject __result) {
 			__result.AddOrGet<DiseaseSourceVisualizer>().alwaysShowDisease = "PollenGerms";
 		}
 	}