diff --git a/README.md b/README.md index 5350d03..eb10d9a 100644 --- a/README.md +++ b/README.md @@ -34,9 +34,11 @@ For an install guide see here: [https://github.com/janxious/ModTek/wiki/The-Drop - Replace the MechLab UI with a virtual one, which allocates only enough prefabs for what you're currently seeing on the screen. - This fix sees more gain for late game players with lots of items inventory. - DMFix - - Fix exponential dependency checking explosion (Drops around 2 minutes from loads in roguetech) + - Fix exponential dependency checking explosion (Drops around 2 minutes from loads in roguetech). - RemovedFlashpointFix - - This fix removes invalid flashpoints allowing saves to load if a user created flashpoint was removed from the mods in use + - This fix removes invalid flashpoints allowing saves to load if a user created flashpoint was removed from the mods in use. +- DisableSimAnimations + - Make all simgame room transitions instant. # Experimental patches - MDDB_TagsetQueryInChunks diff --git a/source/AssemblyInfo.cs b/source/AssemblyInfo.cs index 49dfde9..130f56f 100644 --- a/source/AssemblyInfo.cs +++ b/source/AssemblyInfo.cs @@ -31,4 +31,4 @@ // 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("2.10.2.*")] +[assembly: AssemblyVersion("2.10.3.*")] diff --git a/source/BattletechPerformanceFix.csproj b/source/BattletechPerformanceFix.csproj index 25ec03d..5a8028c 100644 --- a/source/BattletechPerformanceFix.csproj +++ b/source/BattletechPerformanceFix.csproj @@ -102,6 +102,7 @@ + @@ -129,4 +130,4 @@ yes | cp "$(TargetDir)$(TargetName).dll" "$(SolutionDir)../../Mods/BattletechPerformanceFix/$(TargetName).dll" yes | cp "$(TargetDir)$(TargetName).dll" "$(SolutionDir)../../Mods/BattletechPerformanceFix/$(TargetName).dll" - + \ No newline at end of file diff --git a/source/DisableCombatTurnDelays.cs b/source/DisableCombatTurnDelays.cs deleted file mode 100644 index bc00916..0000000 --- a/source/DisableCombatTurnDelays.cs +++ /dev/null @@ -1,25 +0,0 @@ -using BattleTech.UI; -using Harmony; - -namespace BattletechPerformanceFix -{ - public class DisableCombatTurnDelays : Feature - { - public void Activate() - { - var fadeOut = "FadeOutNotificationOverSecondsCoroutine"; - var showTeam = "ShowTeamNotification"; - fadeOut.Pre(); - showTeam.Pre(); - } - - [HarmonyPatch(typeof(TurnEventNotification), "FadeOutNotificationOverSecondsCoroutine")] - public class FadeOutNotificationOverSecondsCoroutine_Pre - { - public static void Prefix(ref float seconds) - { - seconds = 0; - } - } - } -} diff --git a/source/DisableSimAnimations.cs b/source/DisableSimAnimations.cs index daf86cb..6fa8c50 100644 --- a/source/DisableSimAnimations.cs +++ b/source/DisableSimAnimations.cs @@ -7,35 +7,22 @@ namespace BattletechPerformanceFix class DisableSimAnimations : Feature { public void Activate() - { - var init = "Init"; - var transitionMech = "TransitionMech"; - - init.Pre(); - transitionMech.Pre(); + { + "Init".Pre(); + "TransitionMech".Pre(); } // disables scene transition animation - [HarmonyPatch(typeof(SimGameCameraController), "Init")] - public static class Init_Pre + public static void Init_Pre(ref float ___betweenRoomTransitionTime, ref float ___inRoomTransitionTime) { - public static void Prefix( - ref float ___betweenRoomTransitionTime, ref float ___inRoomTransitionTime) - { - ___betweenRoomTransitionTime = ___inRoomTransitionTime = 0f; - } + ___betweenRoomTransitionTime = ___inRoomTransitionTime = 0f; } // disables mech transition animation - [HarmonyPatch(typeof(SGRoomController_MechBay), "TransitionMech")] - public static class TransitionMech_Pre + public static void TransitionMech_Pre(ref float fadeDuration) { - // ReSharper disable once RedundantAssignment - public static void Prefix(ref float fadeDuration) - { - UnityGameInstance.BattleTechGame.Simulation.CameraController.mechLabSpin = null; - fadeDuration = 0f; - } + UnityGameInstance.BattleTechGame.Simulation.CameraController.mechLabSpin = null; + fadeDuration = 0f; } } } diff --git a/source/Main.cs b/source/Main.cs index 8f0738f..19894af 100644 --- a/source/Main.cs +++ b/source/Main.cs @@ -94,7 +94,8 @@ public static void Start(string modDirectory, string json) { typeof(ShaderDependencyOverride), true }, { typeof(GhostBlipOverride), true }, { typeof(DisableDeployAudio), false }, - { typeof(RemovedFlashpointFix), true } + { typeof(RemovedFlashpointFix), true }, + { typeof(DisableSimAnimations), false }, }; Dictionary want = allFeatures.ToDictionary(f => f.Key, f => settings.features.TryGetValue(f.Key.Name, out var userBool) ? userBool : f.Value);