[Cirilla.Core] Expose MasterRank and MasterXp properies

Author: Fusion86

misc/savedata.bt

@@ -117,7 +117,7 @@ struct GUILDCARD {
     uint64 createdOn; // Timestamp
     byte unk1;
     uint hunterRank;
-    uint playTimeSec;
+    uint masterRank;
     uint64 lastUpdated;
     uint zero1;
 
@@ -163,8 +163,8 @@ struct SAVEDATA_SAVESLOT {
     int masterRank;
     int zeni;
     int researchPoints;
-    int hunterXp;
-    int unk2;
+    int hunterRankXp;
+    int masterRankXp; // Probably?
     int timePlayedSec;
 
     CHARACTER_APPEARANCE characterAppearance;

src/Cirilla.Core/Cirilla.Core.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>0.12.0</Version>
+    <Version>0.13.0</Version>
     <Authors>Fusion86</Authors>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>

src/Cirilla.Core/Models/SaveData.cs

@@ -1,4 +1,4 @@
-using Cirilla.Core.Crypto;
+using Cirilla.Core.Crypto;
 using Cirilla.Core.Crypto.BlowFishCS;
 using Cirilla.Core.Enums;
 using Cirilla.Core.Exceptions;
@@ -241,6 +241,18 @@ public int HunterRank
             }
         }
 
+        public int MasterRank
+        {
+            get => Native.MasterRank;
+            set
+            {
+                if (value > 999)
+                    throw new Exception("MasterRank can't be higher than 999!");
+
+                Native.MasterRank = value;
+            }
+        }
+
         public int Zenny
         {
             get => Native.Zeni;
@@ -259,6 +271,12 @@ public int HunterXp
             set => Native.HunterXp = value;
         }
 
+        public int MasterXp
+        {
+            get => Native.MasterXp;
+            set => Native.MasterXp = value;
+        }
+
         public int PlayTime
         {
             get => Native.PlayTime;

src/Cirilla.Core/Structs/Native/SaveData.cs

@@ -37,11 +37,11 @@ public struct SaveData_SaveSlot
         public byte[] HunterName;
 
         public int HunterRank;
-        private int Zero1;
+        public int MasterRank;
         public int Zeni;
         public int ResearchPoints;
         public int HunterXp;
-        private int Zero2;
+        public int MasterXp;
         public int PlayTime; // In seconds
 
         public CharacterAppearance CharacterAppearance;
@@ -81,8 +81,8 @@ public struct SaveData_GuildCard
         public long SteamId;
         public long Created; // Timestamp
         private byte Unk1;
-        public uint HunterRank;
-        public uint PlayTime; // Seconds
+        public int HunterRank;
+        public int MasterRank;
         public long LastUpdate; // Timestamp
         private uint Zero1;
 
@@ -95,7 +95,7 @@ public struct SaveData_GuildCard
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16, ArraySubType = UnmanagedType.U1)]
         private byte[] Unk2;
 
-        public CharacterAppearance Appearance;
+        public CharacterAppearance CharacterAppearance;
 
         [MarshalAs(UnmanagedType.ByValArray, SizeConst = 212, ArraySubType = UnmanagedType.U1)]
         private byte[] Unk3;