Small SaveData struct changes

Author: Fusion86

Cirilla.Core/Models/SaveData.cs

@@ -23,10 +23,7 @@ public class SaveData : FileTypeBase
 
         private BlowFish _blowfish = new BlowFish(ExEncoding.ASCII.GetBytes(ENCRYPTION_KEY));
         private SaveData_Header _header;
-        private long _offset1;
-        private long _offset2;
-        private long _offset3;
-        private long _offset4;
+        private long[] _sectionOffsets;
         private byte[] _unk1;
         private byte[] _unk4;
 
@@ -49,13 +46,14 @@ public SaveData(string path) : base(path)
                 if (_header.Magic[0] != 0x01 || _header.Magic[1] != 0x00 || _header.Magic[2] != 0x00 || _header.Magic[3] != 0x00)
                     throw new Exception("Decryption failed!");
 
-                _offset1 = br.ReadInt64();
-                _offset2 = br.ReadInt64();
-                _offset3 = br.ReadInt64();
-                _offset4 = br.ReadInt64();
+                _sectionOffsets = new long[4];
+                _sectionOffsets[0] = br.ReadInt64();
+                _sectionOffsets[1] = br.ReadInt64();
+                _sectionOffsets[2] = br.ReadInt64();
+                _sectionOffsets[3] = br.ReadInt64();
 
                 // There are 3 unk blocks here, to keep things simple we combine it into one block for now
-                _unk1 = br.ReadBytes((int)(_offset4 - _offset1));
+                _unk1 = br.ReadBytes((int)(_sectionOffsets[3] - _sectionOffsets[0]));
                 _unk4 = br.ReadBytes(20);
 
                 // Initialize SaveSlots
@@ -91,10 +89,10 @@ public byte[] GetBytes(bool encrypt = true)
 
                 bw.Write(_header.ToBytes());
 
-                bw.Write(_offset1);
-                bw.Write(_offset2);
-                bw.Write(_offset3);
-                bw.Write(_offset4);
+                bw.Write(_sectionOffsets[0]);
+                bw.Write(_sectionOffsets[1]);
+                bw.Write(_sectionOffsets[2]);
+                bw.Write(_sectionOffsets[3]);
 
                 bw.Write(_unk1);
                 bw.Write(_unk4);

Cirilla.Core/Structs/Native/SaveData.cs

@@ -8,23 +8,25 @@ public struct SaveData_Header
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4, ArraySubType = UnmanagedType.U1)]
         public byte[] Magic; // 0x01'00'00'00
 
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8, ArraySubType = UnmanagedType.U1)]
-        public byte[] Unk1;
+        public uint Unk1;
+        public uint Unk2;
 
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20, ArraySubType = UnmanagedType.U1)]
         public byte[] Hash;
+
         public long DataSize;
         public long SteamId;
 
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16, ArraySubType = UnmanagedType.U1)]
-        public byte[] Unk2;
+        public byte[] Padding; 
     }
 
     [StructLayout(LayoutKind.Sequential, Pack = 4)]
     public struct SaveData_SaveSlot
     {
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64, ArraySubType = UnmanagedType.U1)]
         public byte[] HunterName;
+
         public int HunterRank;
         public int Zeni;
         public int ResearchPoints;
@@ -36,6 +38,7 @@ public struct SaveData_SaveSlot
 
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 44, ArraySubType = UnmanagedType.U1)]
         public byte[] Unk2;
+
         public SaveData_GuildCard GuildCard;
 
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 100, ArraySubType = UnmanagedType.U1)]
@@ -52,6 +55,7 @@ public struct SaveData_Appearance
 
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4, ArraySubType = UnmanagedType.U1)]
         public byte[] MakeUp2Color;
+
         public float MakeUp2PosX;
         public float MakeUp2PosY;
         public float MakeUp2SizeX;
@@ -62,6 +66,7 @@ public struct SaveData_Appearance
 
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4, ArraySubType = UnmanagedType.U1)]
         public byte[] MakeUp1Color;
+
         public float MakeUp1PosX;
         public float MakeUp1PosY;
         public float MakeUp1SizeX;
@@ -81,6 +86,7 @@ public struct SaveData_Appearance
 
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4, ArraySubType = UnmanagedType.U1)]
         public byte[] FacialHairColor;
+
         public byte EyeWidth;
         public byte EyeHeight;
         public byte SkinColorX;
@@ -105,6 +111,7 @@ public struct SaveData_Appearance
 
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4, ArraySubType = UnmanagedType.U1)]
         public byte[] ClothingColor;
+
         public short HairType;
         public byte ClothingType;
         public byte Voice;
@@ -115,7 +122,6 @@ public struct SaveData_Appearance
     public struct SaveData_GuildCard
     {
         public long SteamId;
-
         public long Created; // Timestamp
         public byte Unk1;
         public uint HunterRank;
@@ -130,13 +136,15 @@ public struct SaveData_GuildCard
 
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16, ArraySubType = UnmanagedType.U1)]
         public byte[] Unk3;
+
         public SaveData_Appearance Appearance;
 
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 208, ArraySubType = UnmanagedType.U1)]
         public byte[] Unk4;
 
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64, ArraySubType = UnmanagedType.U1)]
         public byte[] PalicoName;
+
         public uint PalicoRank; // Actual rank minus 1?
         public uint PalicoHealth;
         public uint PalicoAttackMagic;
@@ -151,6 +159,7 @@ public struct SaveData_GuildCard
 
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 37, ArraySubType = UnmanagedType.U1)]
         public byte[] Unk6;
+
         public byte PalicoG1;
         public byte PalicoG2;
         public byte PalicoG3;
@@ -161,6 +170,7 @@ public struct SaveData_GuildCard
 
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16, ArraySubType = UnmanagedType.U1)]
         public byte[] Unk7;
+
         public short QuestsCompletedLowRank;
         public short QuestsCompletedHighRank;
         public short InvestigationsCompleted;