Internal code improvements and new readme

li223 · Jan 7, 2025 · b482b05 · b482b05
1 parent 6af4c1b
commit b482b05
Show file tree

Hide file tree

Showing 8 changed files with 303 additions and 155 deletions.
diff --git a/PermitSaveEditor/Data/MainWindowFunctions.cs b/PermitSaveEditor/Data/MainWindowFunctions.cs
@@ -1,10 +1,8 @@
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using PermitSaveEditor.Data;
 using PermitSaveEditor.Objects;
+using System.Linq;
+using System.Windows;
 using Color = System.Windows.Media.Color;
 
 namespace PermitSaveEditor;
@@ -97,5 +95,5 @@ public void HandleInputVisibility()
         HealAll.IsEnabled = !DataManager.AllEnabled(_loadedSave!.NpcHealthDataList.Select(x => !x.IsSick));
     }
 
-    public bool IsValid(string str, int min, int max) => int.TryParse(str, out int i) && i >= min && i <= max;
+    private bool IsValid(string str, int min, int max) => int.TryParse(str, out int i) && i >= min && i <= max;
 }
diff --git a/PermitSaveEditor/MainWindow.xaml.cs b/PermitSaveEditor/MainWindow.xaml.cs
@@ -61,6 +61,8 @@ private async void LoadFileBtn_Click(object sender, RoutedEventArgs e)
             }
             catch (Exception ex)
             {
+                File.AppendAllText("log.txt", $"Error on file load: {ex.Message}");
+
                 LoadedFileText.Text = "File Name";
                 MessageBox.Show("Failed to load save file, data may be corrupted.", "Error", MessageBoxButton.OK);
             }

diff --git a/PermitSaveEditor/Objects/Color.cs b/PermitSaveEditor/Objects/Color.cs
@@ -24,6 +24,9 @@ public Color(string r, string g, string b, string a)
         A = double.Parse(a);
     }
 
+    [JsonProperty("a")]
+    public double A { get; set; }
+
     [JsonProperty("r")] 
     public double R { get; set; }
 
@@ -33,9 +36,6 @@ public Color(string r, string g, string b, string a)
     [JsonProperty("b")] 
     public double B { get; set; }
 
-    [JsonProperty("a")] 
-    public double A { get; set; }
-
     public (byte A, byte R, byte G, byte B) ToArgb()
     {
         return ((byte)(A * 255.0), (byte)(R * 255.0), (byte)(G * 255.0), (byte)(B * 255.0));

diff --git a/PermitSaveEditor/Objects/GameSaveData.cs b/PermitSaveEditor/Objects/GameSaveData.cs
@@ -136,10 +136,10 @@ public GameSaveData()
     public List<object> NewDiseaseDataList { get; set; }
 
     [JsonProperty("newQuestDataList")] 
-    public NewQuestDataList[] NewQuestDataList { get; set; }
+    public string[] NewQuestDataList { get; set; }
 
     [JsonProperty("eventStateData")] 
-    public List<EventStateDatum> EventStateData { get; set; }
+    public List<EventStateData> EventStateData { get; set; }
 
     [JsonProperty("activeQuestList")] 
     public List<ActiveQuestList> ActiveQuestList { get; set; }
@@ -163,7 +163,7 @@ public GameSaveData()
     public List<NpcHealthDataList> NpcHealthDataList { get; set; }
 
     [JsonProperty("roomEditorData")] 
-    public List<RoomEditorDatum> RoomEditorData { get; set; }
+    public List<RoomEditorData> RoomEditorData { get; set; }
 
     [JsonProperty("diseaseDay")] 
     public int DiseaseDay { get; set; }