Character data is now correctly saved

hozuki · Mar 2, 2020 · 00c2538 · 00c2538
1 parent 78a65eb
commit 00c2538
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/KoikatuGameSaveEditor.Entities/Entities/Internal/KkCharacter.cs b/KoikatuGameSaveEditor.Entities/Entities/Internal/KkCharacter.cs
@@ -215,11 +215,9 @@ internal sealed class KkCharacter {
                 throw new InvalidOperationException("Cannot set value to a placeholder.");
             }
 
-            var a = k.SubArray(2);
-
             var mapped = PercentageKeyMap[value];
 
-            KkBinaryIo.WriteUInt16LE(a, mapped);
+            KkBinaryIo.WriteUInt16LE(k, mapped, 2);
         }
 
         [CanBeNull]

diff --git a/KoikatuGameSaveEditor.Entities/IO/KkBinaryIo.cs b/KoikatuGameSaveEditor.Entities/IO/KkBinaryIo.cs
@@ -165,16 +165,16 @@ internal sealed class KkBinaryIo {
             return u;
         }
 
-        public static void WriteUInt16LE([NotNull] byte[] span, ushort value) {
-            Trace.Assert(span.Length >= 2);
+        public static void WriteUInt16LE([NotNull] byte[] span, ushort value, int offset) {
+            Trace.Assert(span.Length >= 2 + offset);
 
             if (!BitConverter.IsLittleEndian) {
                 value = SwapEndian(value);
             }
 
             var bytes = BitConverter.GetBytes(value);
 
-            Array.Copy(bytes, span, bytes.Length);
+            Array.Copy(bytes, 0, span, offset, bytes.Length);
         }
 
         public string ReadUtf8String([NotNull] Stream stream) {

diff --git a/KoikatuGameSaveEditor/UI/Form1.cs b/KoikatuGameSaveEditor/UI/Form1.cs
@@ -260,6 +260,14 @@ public partial class Form1 : Form, ITranslateable {
         }
 
         private void SaveCurrentSaveGameTo([NotNull] string path) {
+            foreach (var o in mainPanel.Tiles) {
+                var control = o as ICharacterControl;
+
+                Trace.Assert(control != null);
+
+                control.SaveToCharacter();
+            }
+
             Trace.Assert(_saveData != null, nameof(_saveData) + " != null");
 
             try {