feat: add missing run buffs

closes #259 closes #265 closes #250 closes #264
DorielRivalet · Jan 31, 2024 · d7f2527 · d7f2527
1 parent b76b8ce
commit d7f2527
Show file tree

Hide file tree

Showing 13 changed files with 706 additions and 22 deletions.
diff --git a/MHFZ_Overlay/Models/Addresses/AddressModelHGE.cs b/MHFZ_Overlay/Models/Addresses/AddressModelHGE.cs
@@ -527,6 +527,60 @@ public AddressModelHGE(Mem m)
     /// <inheritdoc/>
     public override int HalkFullness() => this.M.ReadByte("mhfo-hd.dll+ED3C123");
 
+    /// <inheritdoc/>
+    public override int HalkLevel() => this.M.ReadByte("mhfo-hd.dll+ED3C124");
+
+    /// <inheritdoc/>
+    public override int HalkIntimacy() => this.M.ReadByte("mhfo-hd.dll+ED3C125");
+
+    /// <inheritdoc/>
+    public override int HalkHealth() => this.M.ReadByte("mhfo-hd.dll+ED3C126");
+
+    /// <inheritdoc/>
+    public override int HalkAttack() => this.M.ReadByte("mhfo-hd.dll+ED3C127");
+
+    /// <inheritdoc/>
+    public override int HalkDefense() => this.M.ReadByte("mhfo-hd.dll+ED3C128");
+
+    /// <inheritdoc/>
+    public override int HalkIntelligence() => this.M.ReadByte("mhfo-hd.dll+ED3C129");
+
+    /// <inheritdoc/>
+    public override int HalkSkill1() => this.M.ReadByte("mhfo-hd.dll+ED3C12A");
+
+    /// <inheritdoc/>
+    public override int HalkSkill2() => this.M.ReadByte("mhfo-hd.dll+ED3C12B");
+
+    /// <inheritdoc/>
+    public override int HalkSkill3() => this.M.ReadByte("mhfo-hd.dll+ED3C12C");
+
+    /// <inheritdoc/>
+    public override int HalkElementNone() => this.M.ReadByte("mhfo-hd.dll+ED3C12E");
+
+    /// <inheritdoc/>
+    public override int HalkFire() => this.M.ReadByte("mhfo-hd.dll+ED3C12F");
+
+    /// <inheritdoc/>
+    public override int HalkThunder() => this.M.ReadByte("mhfo-hd.dll+ED3C130");
+
+    /// <inheritdoc/>
+    public override int HalkWater() => this.M.ReadByte("mhfo-hd.dll+ED3C131");
+
+    /// <inheritdoc/>
+    public override int HalkIce() => this.M.ReadByte("mhfo-hd.dll+ED3C132");
+
+    /// <inheritdoc/>
+    public override int HalkDragon() => this.M.ReadByte("mhfo-hd.dll+ED3C133");
+
+    /// <inheritdoc/>
+    public override int HalkSleep() => this.M.ReadByte("mhfo-hd.dll+ED3C134");
+
+    /// <inheritdoc/>
+    public override int HalkParalysis() => this.M.ReadByte("mhfo-hd.dll+ED3C135");
+
+    /// <inheritdoc/>
+    public override int HalkPoison() => this.M.ReadByte("mhfo-hd.dll+ED3C136");
+
     /// <inheritdoc/>
     public override int RankBand() => this.M.ReadByte("mhfo-hd.dll+2AFA788");
 
@@ -1790,4 +1844,44 @@ public AddressModelHGE(Mem m)
 
     /// <inheritdoc/>
     //public override int DivaPrayerGemStart() => this.M.ReadInt("mhfo-hd.dll+E820DF8");
+
+    /// <inheritdoc/>
+    public override int GuildPoogie1Skill() => this.M.ReadByte("mhfo-hd.dll+E76BBDB");
+
+    /// <inheritdoc/>
+    public override int GuildPoogie2Skill() => this.M.ReadByte("mhfo-hd.dll+E76BBEB");
+
+    /// <inheritdoc/>
+    public override int GuildPoogie3Skill() => this.M.ReadByte("mhfo-hd.dll+E76BBFB");
+
+    /// <inheritdoc/>
+    public override int DivaPrayerGemRedSkill() => this.M.Read2Byte("mhfo-hd.dll+E6CCF14");
+
+    /// <inheritdoc/>
+    public override int DivaPrayerGemRedLevel() => this.M.Read2Byte("mhfo-hd.dll+E6CCF16");
+
+    /// <inheritdoc/>
+    public override int DivaPrayerGemYellowSkill() => this.M.Read2Byte("mhfo-hd.dll+E6CCF18");
+
+    /// <inheritdoc/>
+    public override int DivaPrayerGemYellowLevel() => this.M.Read2Byte("mhfo-hd.dll+E6CCF1A");
+
+    /// <inheritdoc/>
+    public override int DivaPrayerGemGreenSkill() => this.M.Read2Byte("mhfo-hd.dll+E6CCF1C");
+
+    /// <inheritdoc/>
+    public override int DivaPrayerGemGreenLevel() => this.M.Read2Byte("mhfo-hd.dll+E6CCF1E");
+
+    /// <inheritdoc/>
+    public override int DivaPrayerGemBlueSkill() => this.M.Read2Byte("mhfo-hd.dll+E6CCF20");
+
+    /// <inheritdoc/>
+    public override int DivaPrayerGemBlueLevel() => this.M.Read2Byte("mhfo-hd.dll+E6CCF22");
+
+    /// <inheritdoc/>
+    public override bool HalkOn() => this.M.ReadByte("mhfo-hd.dll+E7FE233") > 0 ? true : false;
+
+    /// <inheritdoc/>
+    public override bool HalkPotEffectOn() => this.M.ReadByte("mhfo-hd.dll+DC6C524") > 0 ? true : false;
+
 }
diff --git a/MHFZ_Overlay/Models/Addresses/AddressModelNotHGE.cs b/MHFZ_Overlay/Models/Addresses/AddressModelNotHGE.cs
@@ -442,6 +442,60 @@ public AddressModelNotHGE(Mem m)
     /// <inheritdoc/>
     public override int HalkFullness() => this.M.ReadByte("mhfo.dll+6101983");
 
+    /// <inheritdoc/>
+    public override int HalkLevel() => this.M.ReadByte("mhfo.dll+6101984");
+
+    /// <inheritdoc/>
+    public override int HalkIntimacy() => this.M.ReadByte("mhfo.dll+6101985");
+
+    /// <inheritdoc/>
+    public override int HalkHealth() => this.M.ReadByte("mhfo.dll+6101986");
+
+    /// <inheritdoc/>
+    public override int HalkAttack() => this.M.ReadByte("mhfo.dll+6101987");
+
+    /// <inheritdoc/>
+    public override int HalkDefense() => this.M.ReadByte("mhfo.dll+6101988");
+
+    /// <inheritdoc/>
+    public override int HalkIntelligence() => this.M.ReadByte("mhfo.dll+6101989");
+
+    /// <inheritdoc/>
+    public override int HalkSkill1() => this.M.ReadByte("mhfo.dll+610198A");
+
+    /// <inheritdoc/>
+    public override int HalkSkill2() => this.M.ReadByte("mhfo.dll+610198B");
+
+    /// <inheritdoc/>
+    public override int HalkSkill3() => this.M.ReadByte("mhfo.dll+610198C");
+
+    /// <inheritdoc/>
+    public override int HalkElementNone() => this.M.ReadByte("mhfo.dll+610198E");
+
+    /// <inheritdoc/>
+    public override int HalkFire() => this.M.ReadByte("mhfo.dll+610198F");
+
+    /// <inheritdoc/>
+    public override int HalkThunder() => this.M.ReadByte("mhfo.dll+6101990");
+
+    /// <inheritdoc/>
+    public override int HalkWater() => this.M.ReadByte("mhfo.dll+6101991");
+
+    /// <inheritdoc/>
+    public override int HalkIce() => this.M.ReadByte("mhfo.dll+6101992");
+
+    /// <inheritdoc/>
+    public override int HalkDragon() => this.M.ReadByte("mhfo.dll+6101993");
+
+    /// <inheritdoc/>
+    public override int HalkSleep() => this.M.ReadByte("mhfo.dll+6101994");
+
+    /// <inheritdoc/>
+    public override int HalkParalysis() => this.M.ReadByte("mhfo.dll+6101995");
+
+    /// <inheritdoc/>
+    public override int HalkPoison() => this.M.ReadByte("mhfo.dll+6101996");
+
     /// <inheritdoc/>
     public override int RankBand() => this.M.ReadByte("mhfo.dll+28C2BD8");
 
@@ -1710,4 +1764,42 @@ public AddressModelNotHGE(Mem m)
     /// <inheritdoc/>
     //public override int DivaPrayerGemStart() => this.M.ReadInt("mhfo.dll+5BE91C8");
 
+    /// <inheritdoc/>
+    public override int GuildPoogie1Skill() => this.M.ReadByte("mhfo.dll+5B33FB3");
+
+    /// <inheritdoc/>
+    public override int GuildPoogie2Skill() => this.M.ReadByte("mhfo.dll+5B33FC3");
+
+    /// <inheritdoc/>
+    public override int GuildPoogie3Skill() => this.M.ReadByte("mhfo.dll+5B33FD3");
+
+    /// <inheritdoc/>
+    public override int DivaPrayerGemRedSkill() => this.M.Read2Byte("mhfo.dll+5A95354");
+
+    /// <inheritdoc/>
+    public override int DivaPrayerGemRedLevel() => this.M.Read2Byte("mhfo.dll+5A95356");
+
+    /// <inheritdoc/>
+    public override int DivaPrayerGemYellowSkill() => this.M.Read2Byte("mhfo.dll+5A95358");
+
+    /// <inheritdoc/>
+    public override int DivaPrayerGemYellowLevel() => this.M.Read2Byte("mhfo.dll+5A9535A");
+
+    /// <inheritdoc/>
+    public override int DivaPrayerGemGreenSkill() => this.M.Read2Byte("mhfo.dll+5A9535C");
+
+    /// <inheritdoc/>
+    public override int DivaPrayerGemGreenLevel() => this.M.Read2Byte("mhfo.dll+5A9535E");
+
+    /// <inheritdoc/>
+    public override int DivaPrayerGemBlueSkill() => this.M.Read2Byte("mhfo.dll+5A95360");
+
+    /// <inheritdoc/>
+    public override int DivaPrayerGemBlueLevel() => this.M.Read2Byte("mhfo.dll+5A95362");
+
+    /// <inheritdoc/>
+    public override bool HalkOn() => this.M.ReadByte("mhfo.dll+5BC6603") > 0 ? true : false;
+
+    /// <inheritdoc/>
+    public override bool HalkPotEffectOn() => this.M.ReadByte("mhfo.dll+5034964") > 0 ? true : false;
 }
diff --git a/MHFZ_Overlay/Models/Collections/Monsters.cs b/MHFZ_Overlay/Models/Collections/Monsters.cs
@@ -47,7 +47,7 @@ public static class Monsters
         { 29, "Rocks" },
         { 30, "Ioprey" },
         { 31, "Iodrome" },
-        { 32, "Pugis" },
+        { 32, "Poogies" },
         { 33, "Kirin" },
         { 34, "Cephalos" },
         { 35, "Giaprey / Giadrome" },

diff --git a/MHFZ_Overlay/Models/QuestsActiveFeature.cs b/MHFZ_Overlay/Models/QuestsActiveFeature.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 QuestsActiveFeature
+{
+    public long? QuestsActiveFeatureID { get; set; }
+
+    public long? ActiveFeature { get; set; }
+
+    public long? RunID { get; set; }
+}
diff --git a/MHFZ_Overlay/Models/QuestsCourse.cs b/MHFZ_Overlay/Models/QuestsCourse.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 QuestsCourse
+{
+    public long? QuestsCourseID { get; set; }
+
+    public long? Rights { get; set; }
+
+    public long? RunID { get; set; }
+}
diff --git a/MHFZ_Overlay/Models/QuestsDiva.cs b/MHFZ_Overlay/Models/QuestsDiva.cs
@@ -0,0 +1,23 @@
+// © 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 QuestsDiva
+{
+    public long? QuestsDivaID { get; set; }
+    public bool? DivaSongBuffOn { get; set; }
+    public long? DivaPrayerGemRedSkill { get; set; }
+    public long? DivaPrayerGemRedLevel { get; set; }
+    public long? DivaPrayerGemYellowSkill { get; set; }
+    public long? DivaPrayerGemYellowLevel { get; set; }
+    public long? DivaPrayerGemGreenSkill { get; set; }
+    public long? DivaPrayerGemGreenLevel { get; set; }
+    public long? DivaPrayerGemBlueSkill { get; set; }
+    public long? DivaPrayerGemBlueLevel { get; set; }
+    public long? RunID { get; set; }
+}
diff --git a/MHFZ_Overlay/Models/QuestsGuildPoogie.cs b/MHFZ_Overlay/Models/QuestsGuildPoogie.cs
@@ -0,0 +1,21 @@
+// © 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 QuestsGuildPoogie
+{
+    public long? QuestsGuildPoogieID { get; set; }
+
+    public long? GuildPoogie1Skill { get; set; }
+
+    public long? GuildPoogie2Skill { get; set; }
+
+    public long? GuildPoogie3Skill { get; set; }
+
+    public long? RunID { get; set; }
+}
diff --git a/MHFZ_Overlay/Models/QuestsHalk.cs b/MHFZ_Overlay/Models/QuestsHalk.cs
@@ -0,0 +1,57 @@
+// © 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 QuestsHalk
+{
+    public long? QuestsHalkID { get; set; }
+
+    public bool? HalkOn { get; set; }
+
+    public bool? HalkPotEffectOn { get; set; }
+
+    public long? HalkFullness { get; set; }
+
+    public long? HalkLevel { get; set; }
+
+    public long? HalkIntimacy { get; set; }
+
+    public long? HalkHealth { get; set; }
+
+    public long? HalkAttack { get; set; }
+
+    public long? HalkDefense { get; set; }
+
+    public long? HalkIntelligence { get; set; }
+
+    public long? HalkSkill1 { get; set; }
+
+    public long? HalkSkill2 { get; set; }
+
+    public long? HalkSkill3 { get; set; }
+
+    public long? HalkElementNone { get; set; }
+
+    public long? HalkFire { get; set; }
+
+    public long? HalkThunder { get; set; }
+
+    public long? HalkWater { get; set; }
+
+    public long? HalkIce { get; set; }
+
+    public long? HalkDragon { get; set; }
+
+    public long? HalkSleep { get; set; }
+
+    public long? HalkParalysis { get; set; }
+
+    public long? HalkPoison { get; set; }
+
+    public long? RunID { get; set; }
+}
diff --git a/MHFZ_Overlay/Models/Structures/Bitfields.cs b/MHFZ_Overlay/Models/Structures/Bitfields.cs
@@ -425,22 +425,24 @@ public enum RunBuff : uint
     [DefaultValue(None)]
     None = 0,
     Halk = 1,
-    PugiItem = 2,
+    PoogieItem = 2,
     DivaSong = 4,
-    HalkPot = 8,
-    LoginBoost = 16,
-    Bento = 32,
-    GuildPugi = 64,
-    ActiveFeature = 128,
-    GuildFood = 256,
-    DivaSkill = 512,
-    SecretTechnique = 1024,
-    DivaPrayerGem = 2048,
-    HunterSupportCourse = 4096,
+    HalkPotEffect = 8,
+    Bento = 16,
+    GuildPoogie = 32,
+    ActiveFeature = 64,
+    GuildFood = 128,
+    DivaSkill = 256,
+    SecretTechnique = 512,
+    DivaPrayerGem = 1024,
+    /// <summary>
+    /// Can come from hunter aid/support course.
+    /// </summary>
+    CourseAttackBoost = 2048,
 
     // old categories
-    TimeAttack = PugiItem | DivaSong | Bento,
-    FreestyleNoSecretTech = Halk | PugiItem | DivaSong | Bento | GuildPugi | ActiveFeature | GuildFood | DivaSkill | DivaPrayerGem,
+    TimeAttack = PoogieItem | DivaSong | Bento,
+    FreestyleNoSecretTech = Halk | PoogieItem | DivaSong | Bento | GuildPoogie | ActiveFeature | GuildFood | DivaSkill | DivaPrayerGem,
     FreestyleWithSecretTech = FreestyleNoSecretTech | SecretTechnique,
 }