- Blue fixes

- Corrects Wang to Yang in dialog tree
- Fixes issue with unable to withdraw after Sumire is overhead and then leaves

DisorderlyWithdrawal/DisorderlyWithdrawal/Patches/UIPatches.cs

@@ -1,4 +1,5 @@
 using BattleTech;
+using BattleTech.Framework;
 using BattleTech.UI;
 using Harmony;
 using System;
@@ -9,11 +10,41 @@
 using UnityEngine;
 
 namespace DisorderlyWithdrawal.Patches {
-
+
+    [HarmonyPatch(typeof(SimGameState), "GetExpenditures")]
+    [HarmonyPatch(new Type[] { typeof(EconomyScale), typeof(bool) })]
+    [HarmonyAfter(new string[] { "de.morphyum.MechMaintenanceByCost", "us.frostraptor.IttyBittyLivingSpace" })]
+    public static class SimGameState_GetExpenditures {
+        public static void Postfix(SimGameState __instance, ref int __result, EconomyScale expenditureLevel, bool proRate) {
+            Mod.Log.Trace($"SGS:GE entered with {__result}");
+
+            Statistic aerospaceAssets = __instance.CompanyStats.GetStatistic("AerospaceAssets");
+            int aerospaceSupport = aerospaceAssets != null ? aerospaceAssets.Value<int>() : 0;
+
+            switch (aerospaceSupport) {
+                case 3:
+                    __result = __result + Mod.Config.HeavyWingMonthlyCost;
+                    Mod.Log.Trace($"Charging player for a heavy wing, result = {__result}.");
+                    break;
+                case 2:
+                    __result = __result + Mod.Config.MediumWingMonthlyCost;
+                    Mod.Log.Trace($"Charging player for a medium wing, result = {__result}.");
+                    break;
+                case 1:
+                    __result = __result + Mod.Config.LightWingMonthlyCost;
+                    Mod.Log.Trace($"Charging player for a light wing, result = {__result}.");
+                    break;
+                default:
+                    Mod.Log.Trace($"Charging player for no aerospace, result = {__result}");
+                    break;
+            }
+        }
+    }
+
     [HarmonyPatch(typeof(SGCaptainsQuartersStatusScreen), "RefreshData")]
-    [HarmonyAfter(new string[] { "dZ.Zappo.MonthlyTechAdjustment", "us.frostraptor.IttyBittyLivingSpace" })]
+    [HarmonyAfter(new string[] { "dZ.Zappo.MonthlyTechAdjustment", "us.frostraptor.IttyBittyLivingSpace", "us.frostraptor.IttyBittyLivingSpace" })]
     public static class SGCaptainsQuartersStatusScreen_RefreshData {
-        public static void Postfix(SGCaptainsQuartersStatusScreen __instance, bool showMoraleChange,
+        public static void Postfix(SGCaptainsQuartersStatusScreen __instance, EconomyScale expenditureLevel, bool showMoraleChange,
             Transform ___SectionOneExpensesList, TextMeshProUGUI ___SectionOneExpensesField, 
             SimGameState ___simState) {
 
@@ -23,6 +54,9 @@ public static void Postfix(SGCaptainsQuartersStatusScreen __instance, bool showM
                 return;
             }
 
+            // TODO: Add this to mech parts maybe?
+            //float expenditureCostModifier = simGameState.GetExpenditureCostModifier(expenditureLevel);
+
             // Determine the level of aerospace support
             Statistic aerospaceAssets = simGameState.CompanyStats.GetStatistic("AerospaceAssets");
             int aerospaceSupport = aerospaceAssets != null ? aerospaceAssets.Value<int>() : 0;
@@ -79,7 +113,6 @@ public static void Postfix(SGCaptainsQuartersStatusScreen __instance, bool showM
             }
         }
 
-
         public static List<KeyValuePair<string, int>> GetCurrentKeys(Transform container, SimGameState sgs) {
 
             List<KeyValuePair<string, int>> currentKeys = new List<KeyValuePair<string, int>>();
@@ -146,4 +179,34 @@ private static void ClearListLineItems(Transform container, SimGameState sgs) {
         }
     }
 
+    [HarmonyPatch(typeof(AAR_ContractObjectivesWidget), "FillInObjectives")]
+    [HarmonyAfter(new string[] { "de.morphyum.DropCostPerMech" })]
+    public static class AAR_ContractObjectivesWidget_FillInObjectives {
+
+        static void Prefix(AAR_ContractObjectivesWidget __instance, Contract ___theContract) {
+            int repairCost = (int)Math.Ceiling(State.CombatDamage) * Mod.Config.LeopardRepairCostPerDamage;
+            if (repairCost != 0) {
+                Mod.Log.Debug($"AAR_COW:FIO adding repair cost objective:{repairCost}");
+                string objectiveLabel = $"LEOPARD REPAIR COSTS: {SimGameState.GetCBillString(repairCost)}";
+                MissionObjectiveResult missionObjectiveResult = new MissionObjectiveResult(objectiveLabel, "7facf07a-626d-4a3b-a1ec-b29a35ff1ac0", false, true, ObjectiveStatus.Succeeded, false);
+                ___theContract.MissionObjectiveResultList.Add(missionObjectiveResult);
+            }
+        }
+    }
+
+    [HarmonyPatch(typeof(Contract), "CompleteContract")]
+    [HarmonyAfter(new string[] { "de.morphyum.DropCostPerMech", "de.morphyum.PersistentMapClient" })]
+    public static class Contract_CompleteContract {
+
+        static void Postfix(Contract __instance) {
+            int repairCost = (int)Math.Ceiling(State.CombatDamage) * Mod.Config.LeopardRepairCostPerDamage;
+            if (repairCost != 0) {
+                Mod.Log.Debug($"C:CC adding repair costs:{repairCost}");
+                int newMoneyResults = Mathf.FloorToInt(__instance.MoneyResults - repairCost);
+                Traverse traverse = Traverse.Create(__instance).Property("MoneyResults");
+                traverse.SetValue(newMoneyResults);
+            }
+        }
+    }
+
 }

DisorderlyWithdrawal/DisorderlyWithdrawal/Properties/AssemblyInfo.cs

@@ -32,5 +32,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("0.3.0.0")]
-[assembly: AssemblyFileVersion("0.3.0.0")]
+[assembly: AssemblyVersion("0.4.0.0")]
+[assembly: AssemblyFileVersion("0.4.0.0")]

DisorderlyWithdrawal/DisorderlyWithdrawal/Utils/Logger.cs

@@ -18,7 +18,8 @@ public Logger(string modDir, string logName) {
             LogStream = File.AppendText(LogFile);
         }
 
-        public void Debug(string message) { if (Mod.Config.Debug) { Info("[DBG] " + message); } }
+        public void Debug(string message) { if (Mod.Config.Debug) { Info(message); } }
+        public void Trace(string message) { if (Mod.Config.Trace) { Info(message); } }
 
         public void Info(string message) {
             string now = DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ss.fff", System.Globalization.CultureInfo.InvariantCulture);

DisorderlyWithdrawal/DisorderlyWithdrawal/Utils/ModConfig.cs

@@ -3,9 +3,12 @@ namespace DisorderlyWithdrawal {
 
     public class ModConfig {
 
-        // If true, extra logging will be used
+        // If true, troubleshooting logging will be enabled
         public bool Debug = false;
 
+        // If true, all logging will be enabled
+        public bool Trace = false;
+
         public int LeopardRepairCostPerDamage = 100;
 
         public int LightWingMonthlyCost = 50000;

DisorderlyWithdrawal/DisorderlyWithdrawal/Utils/State.cs

@@ -3,16 +3,31 @@
 
 namespace DisorderlyWithdrawal {
 
-    public static class ModState {
+    public static class State {
 
-        public static bool WithdrawalTriggered = false;
-        public static int RoundsUntilOverhead = -1;
-        public static int RoundsUntilReady = -1;
+        public static bool WithdrawStarted = false;
+
+        public static int CanWithdrawOnRound = -1;
+        public static int CanApproachOnRound = -1;
 
         public static HBSDOTweenButton RetreatButton = null;
         public static TextMeshProUGUI RetreatButtonText = null;
         public static CombatHUD HUD = null;
 
         public static float CombatDamage = 0f;
+
+        public static void Reset() {
+            // Reinitialize state
+            WithdrawStarted = false;
+
+            CanWithdrawOnRound = -1;
+            CanWithdrawOnRound = -1;
+
+            RetreatButton = null;
+            RetreatButtonText = null;
+            HUD = null;
+
+            CombatDamage = 0f;
+        }
     }
 }