Live Swapping

Source/Frontend/UI/Components/Blast Editor/SanitizeToolForm.cs

@@ -286,7 +286,8 @@ private void AddToStockpile(object sender, EventArgs e)
                 SystemCore = oldSk.SystemCore,
                 GameName = oldSk.GameName,
                 SyncSettings = oldSk.SyncSettings,
-                StateLocation = oldSk.StateLocation
+                StateLocation = oldSk.StateLocation,
+                EmuVer = oldSk.EmuVer
             };
             newSk.BlastLayer = (BlastLayer)oldSk.BlastLayer.Clone();
             StockpileManagerUISide.StashHistory.Add(newSk);
@@ -323,7 +324,8 @@ private void AddToStash(object sender, EventArgs e)
                 SystemCore = oldSk.SystemCore,
                 GameName = oldSk.GameName,
                 SyncSettings = oldSk.SyncSettings,
-                StateLocation = oldSk.StateLocation
+                StateLocation = oldSk.StateLocation,
+                EmuVer = oldSk.EmuVer
             };
             newSk.BlastLayer = (BlastLayer)oldSk.BlastLayer.Clone();
             StockpileManagerUISide.StashHistory.Add(newSk);
@@ -390,7 +392,8 @@ public FastSanitizer(StashKey originalStashkey, BlastLayer blClone)
                 SystemCore = originalStashkey.SystemCore,
                 GameName = originalStashkey.GameName,
                 SyncSettings = originalStashkey.SyncSettings,
-                StateLocation = originalStashkey.StateLocation
+                StateLocation = originalStashkey.StateLocation,
+                EmuVer = originalStashkey.EmuVer
             };
             internalSK.BlastLayer = blClone;
             OriginalLayer = blClone;
@@ -522,7 +525,7 @@ internal async Task Disable50()
         internal async Task LoadCorrupt()
         {
             internalSK.BlastLayer = new BlastLayer(shownHalf);
-            S.GET<GlitchHarvesterBlastForm>().IsCorruptionApplied = internalSK.Run();
+            S.GET<GlitchHarvesterBlastForm>().IsCorruptionApplied = await internalSK.Run();
 
             await Task.Delay(1);
         }
@@ -554,7 +557,7 @@ internal StashKey GetStashKeyMinusChanges()
 
         internal async Task Replay()
         {
-            S.GET<GlitchHarvesterBlastForm>().IsCorruptionApplied = internalSK.Run();
+            S.GET<GlitchHarvesterBlastForm>().IsCorruptionApplied = await internalSK.Run();
 
             await Task.Delay(1);
         }

Source/Frontend/UI/Components/Controls/SavestateList.cs

@@ -8,6 +8,7 @@ namespace RTCV.UI.Components.Controls
     using System.Drawing.Design;
     using System.IO;
     using System.Linq;
+    using System.Threading.Tasks;
     using System.Windows.Forms;
     using CorruptCore;
     using NetCore;
@@ -255,7 +256,8 @@ public void BtnSavestate_MouseDown(object sender, MouseEventArgs e)
                             SystemCore = psk.SystemCore,
                             GameName = psk.GameName,
                             SyncSettings = psk.SyncSettings,
-                            StateLocation = psk.StateLocation
+                            StateLocation = psk.StateLocation,
+                            EmuVer = psk.EmuVer
                         };
 
                         newStashkey.BlastLayer = new BlastLayer();
@@ -268,7 +270,7 @@ public void BtnSavestate_MouseDown(object sender, MouseEventArgs e)
                         StashKey sk = StockpileManagerUISide.SaveState();
                         RegisterStashKeyTo(holder, sk);
                     })
-                    .AddItem("Load this entry", (ob, ev) =>
+                    .AddItem("Load this entry", async (ob, ev) =>
                     {
                         var holder = (SavestateHolder)((Button)sender).Parent;
                         StashKey psk = holder.sk;
@@ -279,7 +281,7 @@ public void BtnSavestate_MouseDown(object sender, MouseEventArgs e)
                                 return;
                             }
 
-                            StockpileManagerUISide.LoadState(psk);
+                            await StockpileManagerUISide.LoadState(psk);
                         }
                         else
                         {
@@ -404,7 +406,7 @@ private bool CheckAndFixingMissingStates(StashKey psk)
             return true;
         }
 
-        public void LoadCurrentState()
+        public async Task LoadCurrentState()
         {
             StashKey psk = SelectedHolder?.sk;
             if (psk != null)
@@ -414,7 +416,7 @@ public void LoadCurrentState()
                     return;
                 }
 
-                StockpileManagerUISide.LoadState(psk);
+                await StockpileManagerUISide.LoadState(psk);
             }
             else
             {
@@ -524,7 +526,7 @@ private void btnSaveLoad_MouseDown(object sender, MouseEventArgs e)
             }
         }
 
-        internal void LoadPreviousSavestateNow()
+        internal async Task LoadPreviousSavestateNow()
         {
             var sk = SelectedHolder?.sk;
 
@@ -549,8 +551,7 @@ internal void LoadPreviousSavestateNow()
                 return;
             }
 
-
-            StockpileManagerUISide.LoadState(prevHolder.sk);
+            await StockpileManagerUISide.LoadState(prevHolder.sk);
             StockpileManagerUISide.CurrentStashkey = null;
             S.GET<GlitchHarvesterBlastForm>().IsCorruptionApplied = false;
             LocalNetCoreRouter.Route(NetCore.Endpoints.CorruptCore, NetCore.Commands.Remote.ClearBlastlayerCache, false);

Source/Frontend/UI/Components/Engine Config/GeneralParametersForm.cs

@@ -39,14 +39,22 @@ private void UpdateCreateInfiniteUnits(object sender, EventArgs e)
             RtcCore.CreateInfiniteUnits = cbCreateInfiniteUnits.Checked;
         }
 
-        private void OnFormShown(object sender, EventArgs e)
+        public void UpdateMaxIntensity()
         {
             object paramValue = AllSpec.VanguardSpec[VSPEC.OVERRIDE_DEFAULTMAXINTENSITY];
 
             if (paramValue is int maxIntensity)
-            {
                 multiTB_Intensity.SetMaximum(maxIntensity, false);
-            }
+            else
+                multiTB_Intensity.SetMaximum(65535, false);
+
+            if (multiTB_Intensity.Value > multiTB_Intensity.Maximum)
+                multiTB_Intensity.Value = multiTB_Intensity.Maximum;
+        }
+
+        private void OnFormShown(object sender, EventArgs e)
+        {
+            UpdateMaxIntensity();
         }
     }
 }

Source/Frontend/UI/Components/Glitch Harvester/GlitchHarvesterBlastForm.cs

@@ -11,6 +11,10 @@ namespace RTCV.UI
     using NetCore;
     using RTCV.Common;
     using Modular;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using RTCV.NetCore.Enums;
+    using System.Timers;
 
     public partial class GlitchHarvesterBlastForm : ComponentForm, IBlockable
     {
@@ -95,7 +99,7 @@ private void UpdateBlastToggleColor(bool value)
             this.updatingBackColor = false;
         }
 
-        private void OnDragDrop(object sender, DragEventArgs e)
+        private async void OnDragDrop(object sender, DragEventArgs e)
         {
             string[] files = (string[])e.Data.GetData(DataFormats.FileDrop, false);
             foreach (var f in files)
@@ -104,7 +108,7 @@ private void OnDragDrop(object sender, DragEventArgs e)
                 {
                     BlastLayer bl = BlastTools.LoadBlastLayerFromFile(f);
                     var newStashKey = new StashKey(RtcCore.GetRandomKey(), null, bl);
-                    S.GET<GlitchHarvesterBlastForm>().IsCorruptionApplied = StockpileManagerUISide.ApplyStashkey(newStashKey, false, false);
+                    S.GET<GlitchHarvesterBlastForm>().IsCorruptionApplied = await StockpileManagerUISide.ApplyStashkey(newStashKey, false, false);
                 }
             }
         }
@@ -114,24 +118,35 @@ private void OnDragEnter(object sender, DragEventArgs e)
             e.Effect = DragDropEffects.Link;
         }
 
-        public void OneTimeExecute()
+
+
+        public async void OneTimeExecute()
         {
             logger.Trace("Entering OneTimeExecute()");
             //Disable autocorrupt
             S.GET<CoreForm>().AutoCorrupt = false;
 
+            bool killswitchWasEnabled = AutoKillSwitch.Enabled;
+
+            // If the stockpile entry is from a different emulator, close the current one and wait until the new one has connected
+            if (!String.Equals(StockpileManagerUISide.CurrentStashkey.EmuVer, new DirectoryInfo(RtcCore.EmuDir).Name, StringComparison.OrdinalIgnoreCase))
+            {
+                if (!(await VanguardImplementation.SwapImplementation(StockpileManagerUISide.CurrentStashkey.EmuVer)))
+                    return;
+            }
+
             if (ghMode == GlitchHarvesterMode.CORRUPT)
             {
-                IsCorruptionApplied = StockpileManagerUISide.ApplyStashkey(StockpileManagerUISide.CurrentStashkey, loadBeforeOperation);
+                IsCorruptionApplied = await StockpileManagerUISide.ApplyStashkey(StockpileManagerUISide.CurrentStashkey, loadBeforeOperation);
             }
             else if (ghMode == GlitchHarvesterMode.INJECT)
             {
-                IsCorruptionApplied = StockpileManagerUISide.InjectFromStashkey(StockpileManagerUISide.CurrentStashkey, loadBeforeOperation);
+                IsCorruptionApplied = await StockpileManagerUISide.InjectFromStashkey(StockpileManagerUISide.CurrentStashkey, loadBeforeOperation);
                 S.GET<StashHistoryForm>().RefreshStashHistory();
             }
             else if (ghMode == GlitchHarvesterMode.ORIGINAL)
             {
-                IsCorruptionApplied = StockpileManagerUISide.OriginalFromStashkey(StockpileManagerUISide.CurrentStashkey);
+                IsCorruptionApplied = await StockpileManagerUISide.OriginalFromStashkey(StockpileManagerUISide.CurrentStashkey);
             }
 
             if (Render.RenderAtLoad && loadBeforeOperation)
@@ -142,6 +157,13 @@ public void OneTimeExecute()
             {
                 Render.StopRender();
             }
+
+            logger.Trace("Unlocking Interface");
+            UICore.UnlockInterface();
+            logger.Trace("Load done");
+
+            AutoKillSwitch.Enabled = killswitchWasEnabled;
+
             logger.Trace("Exiting OneTimeExecute()");
         }
 
@@ -196,7 +218,7 @@ public void refreshRenderOutputButton()
             }
         }
 
-        public void Corrupt(object sender, EventArgs e)
+        public async void Corrupt(object sender, EventArgs e)
         {
             logger.Trace("btnCorrupt Clicked");
 
@@ -212,12 +234,6 @@ public void Corrupt(object sender, EventArgs e)
             {
                 SetBlastButtonVisibility(false);
 
-                if (!(AllSpec.UISpec[UISPEC.SELECTEDDOMAINS] is string[] domains) || domains.Length == 0)
-                {
-                    MessageBox.Show("Can't corrupt with no domains selected.");
-                    return;
-                }
-
                 //Shut off autocorrupt if it's on.
                 //Leave this check here so we don't wastefully update the spec
                 if (S.GET<CoreForm>().AutoCorrupt)
@@ -238,7 +254,7 @@ public void Corrupt(object sender, EventArgs e)
                         sks.Add((StashKey)row.Cells[0].Value);
                     }
 
-                    IsCorruptionApplied = StockpileManagerUISide.MergeStashkeys(sks);
+                    IsCorruptionApplied = await StockpileManagerUISide.MergeStashkeys(sks);
 
                     S.GET<StashHistoryForm>().RefreshStashHistorySelectLast();
                     //lbStashHistory.TopIndex = lbStashHistory.Items.Count - 1;
@@ -257,7 +273,7 @@ public void Corrupt(object sender, EventArgs e)
                     }
 
                     S.GET<StashHistoryForm>().DontLoadSelectedStash = true;
-                    IsCorruptionApplied = StockpileManagerUISide.Corrupt(loadBeforeOperation);
+                    IsCorruptionApplied = await StockpileManagerUISide.Corrupt(loadBeforeOperation);
                     S.GET<StashHistoryForm>().RefreshStashHistorySelectLast();
                 }
                 else if (ghMode == GlitchHarvesterMode.INJECT)
@@ -278,7 +294,7 @@ public void Corrupt(object sender, EventArgs e)
 
                     S.GET<StashHistoryForm>().DontLoadSelectedStash = true;
 
-                    IsCorruptionApplied = StockpileManagerUISide.InjectFromStashkey(StockpileManagerUISide.CurrentStashkey, loadBeforeOperation);
+                    IsCorruptionApplied = await StockpileManagerUISide.InjectFromStashkey(StockpileManagerUISide.CurrentStashkey, loadBeforeOperation);
                     S.GET<StashHistoryForm>().RefreshStashHistorySelectLast();
                 }
                 else if (ghMode == GlitchHarvesterMode.ORIGINAL)
@@ -296,7 +312,7 @@ public void Corrupt(object sender, EventArgs e)
                     }
 
                     S.GET<StashHistoryForm>().DontLoadSelectedStash = true;
-                    IsCorruptionApplied = StockpileManagerUISide.OriginalFromStashkey(StockpileManagerUISide.CurrentStashkey);
+                    IsCorruptionApplied = await StockpileManagerUISide.OriginalFromStashkey(StockpileManagerUISide.CurrentStashkey);
                 }
 
                 if (Render.RenderAtLoad && loadBeforeOperation)
@@ -330,9 +346,9 @@ public void btnCorrupt_MouseDown(object sender, MouseEventArgs e)
 
             new ContextMenuBuilder()
                 .AddItem("Blast + Send RAW To Stash", (ob, ev) => BlastRawStash())
-                .AddItem("Corrupt", (ob, ev) => CorruptWithMode(GlitchHarvesterMode.CORRUPT))
-                .AddItem("Inject", (ob, ev) => CorruptWithMode(GlitchHarvesterMode.INJECT))
-                .AddItem("Original", (ob, ev) => CorruptWithMode(GlitchHarvesterMode.ORIGINAL))
+                .AddItem("Corrupt", async (ob, ev) => await Task.Run(() => CorruptWithMode(GlitchHarvesterMode.CORRUPT)))
+                .AddItem("Inject", async (ob, ev) => await Task.Run(() => CorruptWithMode(GlitchHarvesterMode.INJECT)))
+                .AddItem("Original", async (ob, ev) => await Task.Run(() => CorruptWithMode(GlitchHarvesterMode.ORIGINAL)))
                 .Build()
                 .Show(this, locate);
 
@@ -428,7 +444,7 @@ private void OnRerollButtonMouseDown(object sender, MouseEventArgs e)
             }
         }
 
-        public void RerollSelected(object sender, EventArgs e)
+        public async void RerollSelected(object sender, EventArgs e)
         {
             if (!btnRerollSelected.Visible)
             {
@@ -476,7 +492,7 @@ public void RerollSelected(object sender, EventArgs e)
                             .lbStashHistory.Items.Count - 1;
                     }
 
-                    IsCorruptionApplied = StockpileManagerUISide.ApplyStashkey(StockpileManagerUISide.CurrentStashkey);
+                    IsCorruptionApplied = await StockpileManagerUISide.ApplyStashkey(StockpileManagerUISide.CurrentStashkey);
                 }
             }
             finally

Source/Frontend/UI/Components/Glitch Harvester/GlitchHarvesterIntensityForm.cs

@@ -20,14 +20,22 @@ public GlitchHarvesterIntensityForm()
             multiTB_Intensity.ValueChanged += (sender, args) => RtcCore.Intensity = multiTB_Intensity.Value;
         }
 
-        private void OnFormShown(object sender, EventArgs e)
+        public void UpdateMaxIntensity()
         {
             object paramValue = AllSpec.VanguardSpec[VSPEC.OVERRIDE_DEFAULTMAXINTENSITY];
 
-            if (paramValue != null && paramValue is int maxintensity)
-            {
-                multiTB_Intensity.SetMaximum(maxintensity, false);
-            }
+            if (paramValue is int maxIntensity)
+                multiTB_Intensity.SetMaximum(maxIntensity, false);
+            else
+                multiTB_Intensity.SetMaximum(65535, false);
+
+            if (multiTB_Intensity.Value > multiTB_Intensity.Maximum)
+                multiTB_Intensity.Value = multiTB_Intensity.Maximum;
+        }
+
+        private void OnFormShown(object sender, EventArgs e)
+        {
+            UpdateMaxIntensity();
         }
     }
 }

Source/Frontend/UI/Components/Glitch Harvester/SavestateManagerForm.cs

@@ -130,11 +130,13 @@ private void loadSSK(bool import, string fileName)
             }
 
             var s = (string)AllSpec.VanguardSpec?[VSPEC.NAME] ?? "ERROR";
+            /*
             if (!string.IsNullOrEmpty(ssk.VanguardImplementation) && !ssk.VanguardImplementation.Equals(s, StringComparison.OrdinalIgnoreCase) && ssk.VanguardImplementation != "ERROR")
             {
                 MessageBox.Show($"The ssk you loaded is for a different Vanguard implementation.\nThe ssk reported {ssk.VanguardImplementation} but you're connected to {s}.\nThis is a fatal error. Aborting load.");
                 return;
             }
+            */
 
             if (import)
             {