v0.20 - Fixed #84, #88, #89, #90, #91

Fix AppearanceHelper.
Deweh · May 7, 2022 · 90c9ba6 · 90c9ba6
1 parent bd10c76
commit 90c9ba6
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 22 deletions.
diff --git a/CP2077SaveEditor/Utils/AppearanceHelper.cs b/CP2077SaveEditor/Utils/AppearanceHelper.cs
@@ -65,15 +65,15 @@ public AppearanceGender BodyGender
                     playerPuppet.Gender = "Female";
                     if (!SuppressBodyGenderPrompt)
                     {
-                        SetAllValues(JsonConvert.DeserializeObject<CharacterCustomizationAppearances>(CP2077SaveEditor.Properties.Resources.FemaleDefaultPreset));
+                        SetAllValues(JsonConvert.DeserializeObject<CharacterCustomizationAppearances>(CP2077SaveEditor.Properties.Resources.FemaleDefaultPreset, new Utils.JsonConverters.AppearanceResourceConverter()));
                     }
                 }
                 else
                 {
                     playerPuppet.Gender = "Male";
                     if (!SuppressBodyGenderPrompt)
                     {
-                        SetAllValues(JsonConvert.DeserializeObject<CharacterCustomizationAppearances>(CP2077SaveEditor.Properties.Resources.MaleDefaultPreset));
+                        SetAllValues(JsonConvert.DeserializeObject<CharacterCustomizationAppearances>(CP2077SaveEditor.Properties.Resources.MaleDefaultPreset, new Utils.JsonConverters.AppearanceResourceConverter()));
                     }
                 }
 

diff --git a/CP2077SaveEditor/Utils/JsonConverters.cs b/CP2077SaveEditor/Utils/JsonConverters.cs
@@ -0,0 +1,39 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.Text;
+using System.Threading.Tasks;
+using WolvenKit.RED4.Types;
+
+namespace CP2077SaveEditor.Utils
+{
+    public static class JsonConverters
+    {
+        public class AppearanceResourceConverter : JsonConverter<CResourceReference<appearanceAppearanceResource>>
+        {
+            public override void WriteJson(JsonWriter writer, CResourceReference<appearanceAppearanceResource> value, JsonSerializer serializer)
+            {
+                writer.WriteValue((ulong)value.DepotPath);
+            }
+
+            public override CResourceReference<appearanceAppearanceResource> ReadJson(JsonReader reader, Type objectType, CResourceReference<appearanceAppearanceResource> existingValue, bool hasExistingValue, JsonSerializer serializer)
+            {
+                object value = reader.Value;
+                ulong final;
+
+                if (value is BigInteger bigVal)
+                {
+                    final = (ulong)bigVal;
+                }
+                else
+                {
+                    final = Convert.ToUInt64(value);
+                }
+
+                return new CResourceReference<appearanceAppearanceResource>() { DepotPath = final };
+            }
+        }
+    }
+}
diff --git a/CP2077SaveEditor/Views/Form1.Designer.cs b/CP2077SaveEditor/Views/Form1.Designer.cs
diff --git a/CP2077SaveEditor/Views/Form1.cs b/CP2077SaveEditor/Views/Form1.cs
@@ -676,6 +676,7 @@ await Task.Run(() =>
             }
 
             activeSaveFile = new SaveFileHelper() { SaveFile = bufferFile };
+            activeSaveFile.Appearance.SetMainSections();
 
             GC.Collect();
 
@@ -921,33 +922,33 @@ private void saveAppearButton_Click(object sender, EventArgs e)
             saveWindow.Filter = "Cyberpunk 2077 Character Preset|*.preset";
             if (saveWindow.ShowDialog() == DialogResult.OK)
             {
-                File.WriteAllText(saveWindow.FileName, JsonConvert.SerializeObject(activeSaveFile.GetAppearanceContainer()));
+                File.WriteAllText(saveWindow.FileName, JsonConvert.SerializeObject(activeSaveFile.GetAppearanceContainer(), new Utils.JsonConverters.AppearanceResourceConverter()));
                 statusLabel.Text = "Appearance preset saved.";
             }
         }
 
         private void loadAppearButton_Click(object sender, EventArgs e)
         {
-            //var fileWindow = new OpenFileDialog();
-            //fileWindow.Filter = "Cyberpunk 2077 Character Preset|*.preset";
-            //if (fileWindow.ShowDialog() == DialogResult.OK)
-            //{
-            //    var newValues = JsonConvert.DeserializeObject<CharacterCustomizationAppearances>(File.ReadAllText(fileWindow.FileName));
+            var fileWindow = new OpenFileDialog();
+            fileWindow.Filter = "Cyberpunk 2077 Character Preset|*.preset";
+            if (fileWindow.ShowDialog() == DialogResult.OK)
+            {
+                var newValues = JsonConvert.DeserializeObject<CharacterCustomizationAppearances>(File.ReadAllText(fileWindow.FileName), new Utils.JsonConverters.AppearanceResourceConverter());
 
-            //    if (newValues.UnknownFirstBytes.Length > 6)
-            //    {
-            //        newValues.UnknownFirstBytes = newValues.UnknownFirstBytes.Skip(newValues.UnknownFirstBytes.Length - 6).ToArray();
-            //    }
+                if (newValues.UnknownFirstBytes.Length > 6)
+                {
+                    newValues.UnknownFirstBytes = newValues.UnknownFirstBytes.Skip(newValues.UnknownFirstBytes.Length - 6).ToArray();
+                }
 
-            //    if (newValues.UnknownFirstBytes[4] != activeSaveFile.GetAppearanceContainer().UnknownFirstBytes[4])
-            //    {
-            //        activeSaveFile.Appearance.SuppressBodyGenderPrompt = true;
-            //        activeSaveFile.Appearance.BodyGender = (AppearanceGender)newValues.UnknownFirstBytes[4];
-            //    }
-            //    activeSaveFile.Appearance.SetAllValues(newValues);
-            //    RefreshAppearanceValues();
-            //    statusLabel.Text = "Appearance preset loaded.";
-            //}
+                if (newValues.UnknownFirstBytes[4] != activeSaveFile.GetAppearanceContainer().UnknownFirstBytes[4])
+                {
+                    activeSaveFile.Appearance.SuppressBodyGenderPrompt = true;
+                    activeSaveFile.Appearance.BodyGender = (AppearanceGender)newValues.UnknownFirstBytes[4];
+                }
+                activeSaveFile.Appearance.SetAllValues(newValues);
+                RefreshAppearanceValues();
+                statusLabel.Text = "Appearance preset loaded.";
+            }
         }
 
         private void factsButton_Click(object sender, EventArgs e)