fix skirmish and maybe catch pilot timeout better. fatigue will proba…

…bly still fuck things up bc it sucks
BattletechModders · Jul 15, 2022 · 445d81a · 445d81a
1 parent 019601e
commit 445d81a
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 3 deletions.
diff --git a/Patches/DescriptionPatches.cs b/Patches/DescriptionPatches.cs
@@ -149,6 +149,7 @@ public static class TaskTimelineWidget_OnTaskDetailsClicked_Patch
         {
             static void Postfix(TaskTimelineWidget __instance, TaskManagementElement element)
             {
+                if (Input.GetKey(KeyCode.LeftShift) || Input.GetKey(KeyCode.RightShift)) return; //needed so Timeline mods AdvanceToTask works.
                 if (element == null) return;
                 if (element.Entry.Type != WorkOrderType.MedLabHeal) return;
                 if (!(element.Entry is WorkOrderEntry_MedBayHeal medbayHealEntry) ||

diff --git a/Patches/InjuryPatches.cs b/Patches/InjuryPatches.cs
@@ -421,7 +421,7 @@ public static void Postfix(Pilot __instance, ref bool __result)
                 {
                     __result = true;
                 }
-                if (__instance.pilotDef.PilotTags.Contains(DEBILITATEDTAG) || __instance.Injuries >= __instance.Health)
+                if (__instance.pilotDef.PilotTags.Contains(DEBILITATEDTAG) || __instance.Injuries >= __instance.Health || __instance.pilotDef.TimeoutRemaining > 0)
                 {
                     __result = false;
                 }

diff --git a/Patches/SaveAndStatePatches.cs b/Patches/SaveAndStatePatches.cs
@@ -649,6 +649,7 @@ public static class Contract_CompleteContract_Patch
             public static void Prefix(Contract __instance, MissionResult result, bool isGoodFaithEffort)
             {
                 var sim = UnityGameInstance.BattleTechGame.Simulation;
+                if (sim == null) return;
                 var playerPilots = new List<Pilot>();
                 playerPilots.AddRange(sim.PilotRoster);
                 playerPilots.Add(sim.Commander);

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.4.5")]
-[assembly: AssemblyFileVersion("1.0.4.5")]
+[assembly: AssemblyVersion("1.0.4.6")]
+[assembly: AssemblyFileVersion("1.0.4.6")]
diff --git a/bin/Debug/TisButAScratch.dll b/bin/Debug/TisButAScratch.dll
diff --git a/bin/Debug/TisButAScratch.pdb b/bin/Debug/TisButAScratch.pdb
diff --git a/obj/Debug/TisButAScratch.dll b/obj/Debug/TisButAScratch.dll
diff --git a/obj/Debug/TisButAScratch.pdb b/obj/Debug/TisButAScratch.pdb