feat: update gear section

DorielRivalet · Feb 2, 2024 · 2559133 · 2559133
1 parent 8c3bff1
commit 2559133
Show file tree

Hide file tree

Showing 10 changed files with 1,208 additions and 65 deletions.
diff --git a/MHFZ_Overlay/MHFZ_Overlay.csproj b/MHFZ_Overlay/MHFZ_Overlay.csproj
@@ -1859,7 +1859,7 @@
     <PackageReference Include="CsvHelper" Version="30.0.1" />
     <PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
     <PackageReference Include="DotNetProjects.Extended.Wpf.Toolkit" Version="5.0.103" />
-    <PackageReference Include="EZlion" Version="6.1.0-beta" />
+    <PackageReference Include="EZlion" Version="7.0.0-beta" />
     <PackageReference Include="FontAwesome.Sharp" Version="6.3.0" />
     <PackageReference Include="LiveChartsCore.SkiaSharpView.WPF" Version="2.0.0-beta.920" />
     <PackageReference Include="Memory.dll.x86" Version="1.2.24" />

diff --git a/MHFZ_Overlay/Models/Addresses/AddressModelHGE.cs b/MHFZ_Overlay/Models/Addresses/AddressModelHGE.cs
@@ -546,7 +546,7 @@ public AddressModelHGE(Mem m)
     public override int HalkDefense() => this.M.ReadByte("mhfo-hd.dll+ED3C128");
 
     /// <inheritdoc/>
-    public override int HalkIntelligence() => this.M.ReadByte("mhfo-hd.dll+ED3C129");
+    public override int HalkIntellect() => this.M.ReadByte("mhfo-hd.dll+ED3C129");
 
     /// <inheritdoc/>
     public override int HalkSkill1() => this.M.ReadByte("mhfo-hd.dll+ED3C12A");

diff --git a/MHFZ_Overlay/Models/Addresses/AddressModelNotHGE.cs b/MHFZ_Overlay/Models/Addresses/AddressModelNotHGE.cs
@@ -461,7 +461,7 @@ public AddressModelNotHGE(Mem m)
     public override int HalkDefense() => this.M.ReadByte("mhfo.dll+6101988");
 
     /// <inheritdoc/>
-    public override int HalkIntelligence() => this.M.ReadByte("mhfo.dll+6101989");
+    public override int HalkIntellect() => this.M.ReadByte("mhfo.dll+6101989");
 
     /// <inheritdoc/>
     public override int HalkSkill1() => this.M.ReadByte("mhfo.dll+610198A");

diff --git a/MHFZ_Overlay/Models/QuestsDiva.cs b/MHFZ_Overlay/Models/QuestsDiva.cs
@@ -10,7 +10,7 @@ namespace MHFZ_Overlay.Models;
 public sealed class QuestsDiva
 {
     public long? QuestsDivaID { get; set; }
-    public bool? DivaSongBuffOn { get; set; }
+    public long? DivaSongBuffOn { get; set; }
     public long? DivaPrayerGemRedSkill { get; set; }
     public long? DivaPrayerGemRedLevel { get; set; }
     public long? DivaPrayerGemYellowSkill { get; set; }

diff --git a/MHFZ_Overlay/Models/QuestsHalk.cs b/MHFZ_Overlay/Models/QuestsHalk.cs
@@ -11,9 +11,9 @@ public sealed class QuestsHalk
 {
     public long? QuestsHalkID { get; set; }
 
-    public bool? HalkOn { get; set; }
+    public long? HalkOn { get; set; }
 
-    public bool? HalkPotEffectOn { get; set; }
+    public long? HalkPotEffectOn { get; set; }
 
     public long? HalkFullness { get; set; }
 
@@ -27,7 +27,7 @@ public sealed class QuestsHalk
 
     public long? HalkDefense { get; set; }
 
-    public long? HalkIntelligence { get; set; }
+    public long? HalkIntellect { get; set; }
 
     public long? HalkSkill1 { get; set; }
 

diff --git a/MHFZ_Overlay/Models/QuestsOverlayHash.cs b/MHFZ_Overlay/Models/QuestsOverlayHash.cs
@@ -0,0 +1,17 @@
+// © 2023 The mhfz-overlay developers.
+// Use of this source code is governed by a MIT license that can be
+// found in the LICENSE file.
+
+namespace MHFZ_Overlay.Models;
+
+using System;
+
+// TODO: ORM
+public sealed class QuestsOverlayHash
+{
+    public long? QuestsOverlayHashID { get; set; }
+
+    public string? OverlayHash { get; set; }
+
+    public long? RunID { get; set; }
+}
diff --git a/MHFZ_Overlay/Models/Structures/Bitfields.cs b/MHFZ_Overlay/Models/Structures/Bitfields.cs
@@ -415,6 +415,25 @@ public enum CourseRightsFirstByte : uint
     All = Assist | N | Hiden | Support | NBoost,
 }
 
+/// <summary>
+/// Course Rights second byte.
+/// </summary>
+[Flags]
+[JsonConverter(typeof(JsonStringEnumConverter))]
+public enum CourseRightsSecondByte : uint
+{
+    [DefaultValue(None)]
+    None = 0,
+    UNK1 = 1,
+    Trial = 2,
+    HunterLife = 4,
+    Extra = 8,
+    UNK2 = 16,
+    UNK3 = 32,
+    Premium = 64,
+    All = UNK1 | Trial | HunterLife | Extra | UNK2 | UNK3 | Premium,
+}
+
 /// <summary>
 /// TODO Run filters by buff.
 /// </summary>