- Updated for BT 1.9

- Replaced NuGet JSON DLL with BT JSON DLL - Fixed issue where 'Withdraw in X' turns wasn't displayed properly
BattletechModders · Feb 22, 2020 · 43fc506 · 43fc506
1 parent e74ba6e
commit 43fc506
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/DisorderlyWithdrawal/DisorderlyWithdrawal/DisorderlyWithdrawal.csproj b/DisorderlyWithdrawal/DisorderlyWithdrawal/DisorderlyWithdrawal.csproj
@@ -51,8 +51,9 @@
     <Reference Include="IRBTModUtils">
       <HintPath>E:\steam\SteamApps\common\BATTLETECH\Mods\IRBTModUtils\IRBTModUtils.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>E:\steam\SteamApps\common\BATTLETECH\BattleTech_Data\Managed\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -90,7 +91,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/DisorderlyWithdrawal/DisorderlyWithdrawal/Patches/Patches.cs b/DisorderlyWithdrawal/DisorderlyWithdrawal/Patches/Patches.cs
@@ -124,7 +124,7 @@ public static bool Prefix(CombatHUDRetreatEscMenu __instance, CombatGameState __
             }
 
             public static void OnContinue() {
-                Mod.Log.Debug($"CHUDREM:ORC OnContinue");
+                Mod.Log.Trace($"CHUDREM:ORC OnContinue");
                 ModState.HUD.SelectionHandler.GenericPopup = null;
             }
         }
@@ -199,6 +199,10 @@ static void Postfix(TurnDirector __instance, int round) {
 
                         ModState.RetreatButton.SetState(ButtonState.Enabled, false);
                         ModState.RetreatButtonText.SetText($"Withdraw");
+                    } else {
+                        int roundsToWait = ModState.CanWithdrawOnRound - round;
+                        Mod.Log.Info($" -- Player must wait:{roundsToWait} rounds for pickup.");
+                        ModState.RetreatButtonText.SetText($"In { roundsToWait } Rounds");
                     }
                 }
             }

diff --git a/DisorderlyWithdrawal/DisorderlyWithdrawal/Properties/AssemblyInfo.cs b/DisorderlyWithdrawal/DisorderlyWithdrawal/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("0.5.3.0")]
-[assembly: AssemblyFileVersion("0.5.3.0")]
+[assembly: AssemblyVersion("0.6.0.0")]
+[assembly: AssemblyFileVersion("0.6.0.0")]
diff --git a/DisorderlyWithdrawal/DisorderlyWithdrawal/packages.config b/DisorderlyWithdrawal/DisorderlyWithdrawal/packages.config
diff --git a/mod.json b/mod.json
@@ -1,7 +1,7 @@
 {
     "Name": "DisorderlyWithdrawal",
     "Enabled": true,
-    "Version": "0.5.3",
+    "Version": "0.6.0",
     "Description": "Makes hot-withdrawals more realistic",
     "Author": "IceRaptor",
     "Website": "https://github.com/IceRaptor/DisorderlyWithdrawal",