Code Cleanup

Vultumast · Aug 10, 2024 · 4e4fffc · 4e4fffc
1 parent 09fb6b3
commit 4e4fffc
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 30 deletions.
diff --git a/RainWorldSaveEditor/Forms/MainForm.Designer.cs b/RainWorldSaveEditor/Forms/MainForm.Designer.cs
diff --git a/RainWorldSaveEditor/Forms/MainForm.cs b/RainWorldSaveEditor/Forms/MainForm.cs
@@ -9,6 +9,7 @@
 using System.Resources;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 using System.Text;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement.Window;
 
 namespace RainWorldSaveEditor;
 
@@ -94,6 +95,9 @@ void LoadSaveData(string filepath)
         File.Delete("original_indented.txt");
         File.Delete("parsed_indented.txt");
 
+        saveToolStripMenuItem.Enabled = true;
+        saveAsToolStripMenuItem.Enabled = true;
+
         WriteComparisons(saveData, _save.Write());
         UpdateTitle();
     }
@@ -118,6 +122,8 @@ void UnloadSave()
         slugConfigControl.FoodPipControl.FilledPips = 0;
         slugConfigControl.FoodPipControl.PipBarIndex = 4;
         slugConfigControl.FoodPipControl.PipCount = 7;
+        saveToolStripMenuItem.Enabled = false;
+        saveAsToolStripMenuItem.Enabled = false;
         ClearSlugcatCheckStates();
         UpdateTitle();
     }
@@ -177,7 +183,7 @@ private void MainForm_Load(object sender, EventArgs e)
             settings.Save();
         }
 
-        List<string> userDirs = [ ];
+        List<string> userDirs = [];
         var dirs = Directory.GetDirectories("C:\\Users\\");
 
         foreach (var dir in dirs)
@@ -517,6 +523,30 @@ private void closeToolStripMenuItem_Click(object sender, EventArgs e)
         this.Close();
     }
 
+    private void saveToolStripMenuItem_Click(object sender, EventArgs e)
+    {
+        string filepath = settings.RainWorldSaveDirectory + "\\sav" + (SaveID == 1 ? string.Empty : SaveID.ToString());
+
+        Logger.Info($"Writing save file {filepath}");
+
+
+        if (UsingExternalSave)
+        {
+            throw new NotImplementedException();
+        }
+        else
+            WriteSaveData(filepath);
+    }
+    private void saveAsToolStripMenuItem_Click(object sender, EventArgs e)
+    {
+        using var dialog = new SaveFileDialog();
+
+        if (dialog.ShowDialog() != DialogResult.OK)
+            return;
+
+        Logger.Info($"Writing save file {dialog.FileName}");
+        WriteSaveData(dialog.FileName);
+    }
 
     private void aboutToolStripMenuItem_Click(object sender, EventArgs e)
     {
@@ -549,14 +579,7 @@ private void importToolStripMenuItem_Click(object sender, EventArgs e)
     }
     #endregion
 
-    private void saveAsToolStripMenuItem1_Click(object sender, EventArgs e)
-    {
-        using var dialog = new SaveFileDialog();
 
-        if (dialog.ShowDialog() != DialogResult.OK)
-            return;
 
-        Logger.Info($"Writing save file {dialog.FileName}");
-        WriteSaveData(dialog.FileName);
-    }
+
 }