fix: diva song in guild hall

closes #276
DorielRivalet · Feb 4, 2024 · ff1651b · ff1651b
1 parent 4bc6ec8
commit ff1651b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/MHFZ_Overlay/Models/Addresses/AddressModelHGE.cs b/MHFZ_Overlay/Models/Addresses/AddressModelHGE.cs
@@ -1887,4 +1887,7 @@ public AddressModelHGE(Mem m)
     /// <inheritdoc/>
     public override bool HalkPotEffectOn() => this.M.ReadByte("mhfo-hd.dll+DC6C524") > 0 ? true : false;
 
+    /// <inheritdoc/>
+    public override int DivaSongFromGuildStart() => this.M.ReadInt("mhfo-hd.dll+ED3EB24");
+
 }
diff --git a/MHFZ_Overlay/Models/Addresses/AddressModelNotHGE.cs b/MHFZ_Overlay/Models/Addresses/AddressModelNotHGE.cs
@@ -1805,4 +1805,7 @@ public AddressModelNotHGE(Mem m)
 
     /// <inheritdoc/>
     public override bool HalkPotEffectOn() => this.M.ReadByte("mhfo.dll+5034964") > 0 ? true : false;
+
+    /// <inheritdoc/>
+    public override int DivaSongFromGuildStart() => this.M.ReadInt("mhfo.dll+6104384");
 }
diff --git a/MHFZ_Overlay/Models/Addresses/README.md b/MHFZ_Overlay/Models/Addresses/README.md
@@ -7,7 +7,7 @@ For the addresses, check the respective files.
 
 ## IDs
 
-- [Mappers](../Mappers)
+- [Mappers](https://github.com/DorielRivalet/ezlion/tree/main/src/packages/csharp/EZlion/EZlion/Mapper)
 - [Bitfields and Enumerations](../Structures)
 
 ### Sigil Skills

diff --git a/MHFZ_Overlay/ViewModels/Windows/AddressModel.cs b/MHFZ_Overlay/ViewModels/Windows/AddressModel.cs
@@ -1376,6 +1376,7 @@ 21747 or
 
     public abstract bool HalkPotEffectOn();
 
+    public abstract int DivaSongFromGuildStart();
 
     /// <TODO>
     /// [] Not Done
@@ -2590,12 +2591,14 @@ public bool DivaSongEnding
     {
         get
         {
-            if (DivaSongStart() <= 0)
+            var divaSongStart = Math.Max(DivaSongStart(), DivaSongFromGuildStart());
+
+            if (divaSongStart <= 0)
             {
                 return true;
             }
 
-            var expiry = DivaSongStart() + (60 * 90);
+            var expiry = divaSongStart + (60 * 90);
             double secondsLeft = expiry - ServerHeartbeat();
 
             return secondsLeft <= 60*10;
@@ -2606,12 +2609,14 @@ public bool DivaSongEnded
     {
         get
         {
-            if (DivaSongStart() <= 0)
+            var divaSongStart = Math.Max(DivaSongStart(), DivaSongFromGuildStart());
+
+            if (divaSongStart <= 0)
             {
                 return true;
             }
 
-            var expiry = DivaSongStart() + (60 * 90);
+            var expiry = divaSongStart + (60 * 90);
             double secondsLeft = expiry - ServerHeartbeat();
 
             return secondsLeft <= 0;
@@ -13112,12 +13117,14 @@ public string DivaSongTimeLeft
     {
         get
         {
-            if (DivaSongStart() <= 0)
+            var divaSongStart = Math.Max(DivaSongStart(), DivaSongFromGuildStart());
+
+            if (divaSongStart <= 0)
             {
                 return "0m";
             }
 
-            var expiry = DivaSongStart() + (60 * 90);
+            var expiry = divaSongStart + (60 * 90);
             double secondsLeft = expiry - ServerHeartbeat();
 
             if (secondsLeft <= 0)