Fix race condition for flareups so player always gets credit

Author: BlueWinds

build.sh

@@ -13,4 +13,4 @@ then
     exit
 fi
 
-nodemon -x "~/.dotnet/dotnet build --verbosity normal --configuration Release -p:BattleTechGameDir='$BTPATH' && rm -f 'WarTechIIC.zip' && cd '$BTPATH/Mods/WarTechIIC' && zip -x WartechIIC.log -x WartechIIC.1.log -rq '$PWD/WarTechIIC.zip' ." -w src/ -w WarTechIIC.csproj -e .
+nodemon -x "~/.dotnet/dotnet build --verbosity normal --configuration Release -p:BattleTechGameDir='$BTPATH' && rm -f 'WarTechIIC.zip' && cd '$BTPATH/Mods/WarTechIIC' && zip -x WartechIIC.log -x WartechIIC.log.1 -rq '$PWD/WarTechIIC.zip' ." -w src/ -w WarTechIIC.csproj -e .

src/Attack.cs

@@ -188,7 +188,7 @@ public virtual string completionText() {
                 case CompletionResult.DefenderWonUnemployed: return "{1} drives the invasion by {0} from {2}.";
                 case CompletionResult.DefenderWonEmployerLost: return "{1} drives away the forces {0} sent to invade {2}. Your contract ends on a sour note with the invasion's defeat.";
                 case CompletionResult.DefenderWonReward: return "{1} drives away the forces {0} sent to invade {2}, leaving you to celebrate victory with your crew - and with a bonus from your employer.";
-                case CompletionResult.DefenderWonNoReward: return "{0} drives away the forces {1} sent to invade {2}, but your contact informs you that there will be no bonus forthcoming, since you failed to win at least half the offered missions.";
+                case CompletionResult.DefenderWonNoReward: return "{1} drives away the forces {0} sent to invade {2}, but your contact informs you that there will be no bonus forthcoming, since you failed to win at least half the offered missions.";
             }
 
             return "Something went wrong. Attacker: {0}. Defender: {1}. Location: {2}.";

src/ContractManager.cs

@@ -70,6 +70,7 @@ public static Contract getNewProceduralContract(FactionValue employer, FactionVa
             MapAndEncounters level = activeMaps.GetNext(false);
 
             var MapEncounterContractData = WIIC.sim.FillMapEncounterContractData(system, difficultyRange, potentialContracts, validParticipants, level);
+
             while (!MapEncounterContractData.HasContracts && activeMaps.ActiveListCount > 0) {
                 level = activeMaps.GetNext(false);
                 MapEncounterContractData = WIIC.sim.FillMapEncounterContractData(system, difficultyRange, potentialContracts, validParticipants, level);
@@ -86,7 +87,7 @@ public static Contract getNewProceduralContract(FactionValue employer, FactionVa
             GameContext gameContext = new GameContext(WIIC.sim.Context);
             gameContext.SetObject(GameContextObjectTagEnum.TargetStarSystem, system);
 
-            Contract contract = WIIC.sim.CreateProceduralContract(system, true, level, MapEncounterContractData, gameContext);
+            Contract contract = WIIC.sim.CreateProceduralContract(system, false, level, MapEncounterContractData, gameContext);
 
             // Restore system and faction to previous values, now that we've forced the game to generate our desired contract.
             system.Def.contractEmployerIDs = oldEmployers;

src/ExtendedContract.cs

@@ -321,6 +321,7 @@ public virtual void acceptContract(string contract) {
         }
 
         public virtual void launchContract(Entry entry, Contract contract) {
+            WIIC.l.Log($"Offering {type} mission ID={contract.Override.ID}.");
             if (contract.Override.contractRewardOverride < 0) {
                 WIIC.l.Log($"contractRewardOverride < 0, generating.");
                 contract.Override.contractRewardOverride = WIIC.sim.CalculateContractValueByContractType(contract.ContractTypeValue, contract.Override.finalDifficulty, WIIC.sim.Constants.Finances.ContractPricePerDifficulty, WIIC.sim.Constants.Finances.ContractPriceVariance, 0);
@@ -355,10 +356,11 @@ public virtual void launchContract(Entry entry, Contract contract) {
 
             WIIC.l.Log(message);
 
+            WIIC.l.Log($"Do we still have ID? ID={contract.Override.ID}.");
             SimGameInterruptManager queue = WIIC.sim.GetInterruptQueue();
             queue.QueuePauseNotification(title, message, WIIC.sim.GetCrewPortrait(SimGameCrew.Crew_Sumire), string.Empty, delegate {
                 try {
-                    WIIC.l.Log($"Accepted {type} mission {contract.Override.ID}.");
+                    WIIC.l.Log($"Accepted {type} mission ID={contract.Override.ID}.");
 
                     if (!WIIC.sim.CurSystem.SystemContracts.Contains(contract)) {
                         // Add it to the command center, so that it gets persisted in the pre-drop save.
@@ -386,6 +388,7 @@ public virtual void launchContract(Entry entry, Contract contract) {
             if (!queue.IsOpen) {
                 queue.DisplayIfAvailable();
             }
+            WIIC.l.Log($"Do we still have ID2? ID={contract.Override.ID}.");
         }
 
         public virtual void applyDeclinePenalty(DeclinePenalty declinePenalty) {

src/data/mod.json

@@ -1,26 +1,39 @@
 {
-  "Name": "WarTechIIC",
-  "Enabled": true,
-  "Version": "1.0.0",
-  "Author": "BlueWinds",
-  "DLL": "WarTechIIC.dll",
-  "DependsOn": [],
-  "CustomResourceTypes": [
-    "ExtendedContractType",
-    "ExtendedConversation",
-    "Campaign"
-  ],
-  "Manifest": [
-    { "Type": "ContractOverride", "Path": "contracts" },
-    { "Type": "BaseDescriptionDef", "Path": "descriptions" },
-    { "Type": "ExtendedContractType", "Path": "extendedContracts" },
-    { "Type": "Campaign", "Path": "campaigns" }
-  ],
-  "Logs": {
-    "WartechIIC.log": {
-      "Includes": [
-      { "LoggerNames": ["WartechIIC"] }
-      ]
-    }
-  }
+	"Name": "WarTechIIC",
+	"Enabled": true,
+	"Hidden": true,
+	"Version": "1.0.1",
+	"Author": "BlueWinds",
+	"DLL": "WarTechIIC.dll",
+	"DependsOn": [],
+	"CustomResourceTypes": [
+		"ExtendedContractType",
+		"ExtendedConversation",
+		"Campaign"
+	],
+	"Manifest": [
+		{
+			"Type": "ContractOverride",
+			"Path": "contracts"
+		},
+		{
+			"Type": "BaseDescriptionDef",
+			"Path": "descriptions"
+		},
+		{
+			"Type": "ExtendedContractType",
+			"Path": "extendedContracts"
+		},
+		{
+			"Type": "Campaign",
+			"Path": "campaigns"
+		}
+	],
+	"Logs": {
+		"WartechIIC.log": {
+			"Include": [
+				"WartechIIC"
+			]
+		}
+	}
 }

src/patches/AAR_ContractObjectivesWidget.cs

@@ -17,6 +17,8 @@ private static void Postfix(AAR_ContractObjectivesWidget __instance) {
                 Contract contract = __instance.theContract;
                 ExtendedContract ec = Utilities.currentExtendedContract();
 
+                WIIC.l.Log($"AAR_ContractObjectivesWidget_FillInObjectives: ec={ec}, currentContractName={ec.currentContractName}, Override.ID={contract.Override.ID}");
+
                 // Player not working here
                 if (ec == null || ec.currentContractName != contract.Override.ID) {
                     return;
@@ -74,7 +76,7 @@ public static class AAR_ContractObjectivesWidget_Init {
         private static void Postfix(AAR_ContractObjectivesWidget __instance) {
             try {
                 ExtendedContract ec = Utilities.currentExtendedContract();
-                WIIC.l.Log($"AAR_ContractObjectivesWidget_Init: contract: {__instance.theContract.Name}, ec={ec}");
+                WIIC.l.Log($"AAR_ContractObjectivesWidget_Init: ID={__instance.theContract.Override.ID}, ec={ec}");
 
                 string eventId = null;
 

src/patches/AAR_SalvageScreen.cs

@@ -0,0 +1,29 @@
+using System;
+using Harmony;
+using Localize;
+using BattleTech;
+using BattleTech.Framework;
+using BattleTech.UI;
+using UnityEngine;
+using HBS;
+using HBS.Extensions;
+
+namespace WarTechIIC {
+    [HarmonyPatch(typeof(AAR_SalvageScreen), "OnCompleted")]
+    public static class AAR_SalvageScreen_OnCompleted {
+        private static void Postfix(AAR_SalvageScreen __instance) {
+            try {
+                Contract contract = __instance.contract;
+                ExtendedContract ec = Utilities.currentExtendedContract();
+
+                WIIC.l.Log($"AAR_SalvageScreen_OnCompleted: ec={ec}, currentContractName={ec.currentContractName}, Override.ID={contract.Override.ID}");
+
+                if (ec?.currentContractName == contract.Override.ID) {
+                    ec.currentContractName = null;
+                }
+            } catch (Exception e) {
+                WIIC.l.LogException(e);
+            }
+        }
+    }
+}

src/patches/Contract.cs

@@ -28,7 +28,6 @@ public static void Postfix(Contract __instance, MissionResult result, bool isGoo
                     return;
                 }
 
-                current.currentContractName = null;
                 if (__instance.Name != current.currentContractName || current as Attack == null) {
                     return;
                 }