init and use IncapacitatedDeathChance and LethalDeathChance company s…

…tats for FinalizeKilledMechwarriors
BattletechModders · May 29, 2022 · 59aaf23 · 59aaf23
1 parent 95cace2
commit 59aaf23
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 5 deletions.
diff --git a/Patches/InjuryPatches.cs b/Patches/InjuryPatches.cs
@@ -486,10 +486,16 @@ public static bool Prefix(Contract __instance)
 
                     else
                     {
-
-                        float num = pilot.LethalInjuries
-                            ? sim.Constants.Pilot.LethalDeathChance
+                        var lethalDeathChance = sim.CompanyStats.ContainsStatistic("LethalDeathChance")
+                            ? sim.CompanyStats.GetValue<float>("LethalDeathChance")
+                            : sim.Constants.Pilot.LethalDeathChance;
+                        var incapacitatedDeathChance = sim.CompanyStats.ContainsStatistic("IncapacitatedDeathChance")
+                            ? sim.CompanyStats.GetValue<float>("IncapacitatedDeathChance")
                             : sim.Constants.Pilot.IncapacitatedDeathChance;
+
+                        float num = pilot.LethalInjuries
+                            ? lethalDeathChance
+                            : incapacitatedDeathChance;
                         num = Mathf.Max(0f, num - sim.Constants.Pilot.GutsDeathReduction * (float) pilot.Guts);
                         float num2 = sim.NetworkRandom.Float();
                         string s = string.Format(

diff --git a/Patches/SaveAndStatePatches.cs b/Patches/SaveAndStatePatches.cs
@@ -57,6 +57,16 @@ public static void Postfix(SGCharacterCreationCareerBackgroundSelectionPanel __i
                         ModInit.modLog?.Info?.Write($"{p.Callsign} missing, added to pilotInjuriesMap with iGUID {pKey}");
                     }
                 }
+
+                //init deathchance stats for hospital upgrades:
+                if (!sim.CompanyStats.ContainsStatistic("LethalDeathChance"))
+                {
+                    sim.CompanyStats.AddStatistic("LethalDeathChance", sim.Constants.Pilot.LethalDeathChance);
+                }
+                if (!sim.CompanyStats.ContainsStatistic("IncapacitatedDeathChance"))
+                {
+                    sim.CompanyStats.AddStatistic("IncapacitatedDeathChance", sim.Constants.Pilot.IncapacitatedDeathChance);
+                }
             }
         }
 
@@ -348,6 +358,15 @@ public static void Postfix(SimGameState __instance)
                     ModInit.modLog?.Info?.Write(
                         $"Pilot with pilotID {key} not in roster, removing from pilotInjuriesMap");
                 }
+
+                if (!sim.CompanyStats.ContainsStatistic("LethalDeathChance"))
+                {
+                    sim.CompanyStats.AddStatistic("LethalDeathChance", sim.Constants.Pilot.LethalDeathChance);
+                }
+                if (!sim.CompanyStats.ContainsStatistic("IncapacitatedDeathChance"))
+                {
+                    sim.CompanyStats.AddStatistic("IncapacitatedDeathChance", sim.Constants.Pilot.IncapacitatedDeathChance);
+                }
             }
         }
 

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.3")]
-[assembly: AssemblyFileVersion("1.0.4.3")]
+[assembly: AssemblyVersion("1.0.4.4")]
+[assembly: AssemblyFileVersion("1.0.4.4")]
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