feat: add buff timers

closes #260
closes #268
closes #267

MHFZ_Overlay/App.config

@@ -1005,6 +1005,24 @@
             <setting name="PlayerPositionMode" serializeAs="String">
                 <value>Automatic</value>
             </setting>
+            <setting name="DivaSongTimerShown" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="DivaSongTimerX" serializeAs="String">
+                <value>5</value>
+            </setting>
+            <setting name="DivaSongTimerY" serializeAs="String">
+                <value>100</value>
+            </setting>
+            <setting name="GuildFoodTimerShown" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="GuildFoodTimerX" serializeAs="String">
+                <value>5</value>
+            </setting>
+            <setting name="GuildFoodTimerY" serializeAs="String">
+                <value>60</value>
+            </setting>
         </MHFZ_Overlay.Settings>
     </userSettings>
 </configuration>

MHFZ_Overlay/MHFZ_Overlay.csproj

@@ -168,6 +168,7 @@
     <None Remove="Assets\Icons\png\attack_icon.png" />
     <None Remove="Assets\Icons\png\attack_up.png" />
     <None Remove="Assets\Icons\png\attack_up_red.png" />
+    <None Remove="Assets\Icons\png\blacksmith.png" />
     <None Remove="Assets\Icons\png\blast.png" />
     <None Remove="Assets\Icons\png\blue_soul.png" />
     <None Remove="Assets\Icons\png\board.png" />
@@ -185,6 +186,7 @@
     <None Remove="Assets\Icons\png\defense_icon.png" />
     <None Remove="Assets\Icons\png\defense_up.png" />
     <None Remove="Assets\Icons\png\description_FILL0_wght400_GRAD0_opsz48.png" />
+    <None Remove="Assets\Icons\png\diva_fountain.png" />
     <None Remove="Assets\Icons\png\diva_prayer_gems.png" />
     <None Remove="Assets\Icons\png\dure2.png" />
     <None Remove="Assets\Icons\png\dure_attack.png" />
@@ -257,6 +259,7 @@
     <None Remove="Assets\Icons\png\gauntlet_red.png" />
     <None Remove="Assets\Icons\png\gauntlet_white.png" />
     <None Remove="Assets\Icons\png\guild_food.png" />
+    <None Remove="Assets\Icons\png\guild_hall.png" />
     <None Remove="Assets\Icons\png\helm.png" />
     <None Remove="Assets\Icons\png\here.png" />
     <None Remove="Assets\Icons\png\key_1.png" />
@@ -691,19 +694,28 @@
     <None Remove="Assets\Icons\png\monster\zerureusu.png" />
     <None Remove="Assets\Icons\png\monster\zinogre.png" />
     <None Remove="Assets\Icons\png\monster_info.png" />
+    <None Remove="Assets\Icons\png\my_gallery.png" />
+    <None Remove="Assets\Icons\png\my_garden.png" />
+    <None Remove="Assets\Icons\png\my_house.png" />
+    <None Remove="Assets\Icons\png\my_missions.png" />
+    <None Remove="Assets\Icons\png\my_support.png" />
+    <None Remove="Assets\Icons\png\my_tore.png" />
     <None Remove="Assets\Icons\png\note_pink.png" />
+    <None Remove="Assets\Icons\png\pallone_caravan.png" />
     <None Remove="Assets\Icons\png\paralysis.png" />
     <None Remove="Assets\Icons\png\photo.png" />
     <None Remove="Assets\Icons\png\point_down.png" />
     <None Remove="Assets\Icons\png\point_left.png" />
     <None Remove="Assets\Icons\png\point_right.png" />
     <None Remove="Assets\Icons\png\point_up.png" />
     <None Remove="Assets\Icons\png\poison.png" />
+    <None Remove="Assets\Icons\png\pvp.png" />
     <None Remove="Assets\Icons\png\quest_1.png" />
     <None Remove="Assets\Icons\png\quest_clock.png" />
     <None Remove="Assets\Icons\png\quest_clock_red.png" />
     <None Remove="Assets\Icons\png\quest_host.png" />
     <None Remove="Assets\Icons\png\quest_info.png" />
+    <None Remove="Assets\Icons\png\rasta_bar.png" />
     <None Remove="Assets\Icons\png\red_soul.png" />
     <None Remove="Assets\Icons\png\right_click.png" />
     <None Remove="Assets\Icons\png\sand_clock.png" />
@@ -727,6 +739,8 @@
     <None Remove="Assets\Icons\png\small_tonfa.png" />
     <None Remove="Assets\Icons\png\study.png" />
     <None Remove="Assets\Icons\png\stun.png" />
+    <None Remove="Assets\Icons\png\tenrou.png" />
+    <None Remove="Assets\Icons\png\tent.png" />
     <None Remove="Assets\Icons\png\ticket.png" />
     <None Remove="Assets\Icons\png\transcend.png" />
     <None Remove="Assets\Icons\png\transcend_active.png" />
@@ -1178,6 +1192,7 @@
     <Resource Include="Assets\Icons\png\attack_icon.png" />
     <Resource Include="Assets\Icons\png\attack_up.png" />
     <Resource Include="Assets\Icons\png\attack_up_red.png" />
+    <Resource Include="Assets\Icons\png\blacksmith.png" />
     <Resource Include="Assets\Icons\png\blast.png" />
     <Resource Include="Assets\Icons\png\blue_soul.png" />
     <Resource Include="Assets\Icons\png\board.png" />
@@ -1195,6 +1210,7 @@
     <Resource Include="Assets\Icons\png\defense_icon.png" />
     <Resource Include="Assets\Icons\png\defense_up.png" />
     <Resource Include="Assets\Icons\png\description_FILL0_wght400_GRAD0_opsz48.png" />
+    <Resource Include="Assets\Icons\png\diva_fountain.png" />
     <Resource Include="Assets\Icons\png\diva_prayer_gems.png" />
     <Resource Include="Assets\Icons\png\dure2.png" />
     <Resource Include="Assets\Icons\png\dure_attack.png" />
@@ -1267,6 +1283,7 @@
     <Resource Include="Assets\Icons\png\gauntlet_red.png" />
     <Resource Include="Assets\Icons\png\gauntlet_white.png" />
     <Resource Include="Assets\Icons\png\guild_food.png" />
+    <Resource Include="Assets\Icons\png\guild_hall.png" />
     <Resource Include="Assets\Icons\png\helm.png" />
     <Resource Include="Assets\Icons\png\here.png" />
     <Resource Include="Assets\Icons\png\key_1.png" />
@@ -1701,19 +1718,28 @@
     <Resource Include="Assets\Icons\png\monster\zerureusu.png" />
     <Resource Include="Assets\Icons\png\monster\zinogre.png" />
     <Resource Include="Assets\Icons\png\monster_info.png" />
+    <Resource Include="Assets\Icons\png\my_gallery.png" />
+    <Resource Include="Assets\Icons\png\my_garden.png" />
+    <Resource Include="Assets\Icons\png\my_house.png" />
+    <Resource Include="Assets\Icons\png\my_missions.png" />
+    <Resource Include="Assets\Icons\png\my_support.png" />
+    <Resource Include="Assets\Icons\png\my_tore.png" />
     <Resource Include="Assets\Icons\png\note_pink.png" />
+    <Resource Include="Assets\Icons\png\pallone_caravan.png" />
     <Resource Include="Assets\Icons\png\paralysis.png" />
     <Resource Include="Assets\Icons\png\photo.png" />
     <Resource Include="Assets\Icons\png\point_down.png" />
     <Resource Include="Assets\Icons\png\point_left.png" />
     <Resource Include="Assets\Icons\png\point_right.png" />
     <Resource Include="Assets\Icons\png\point_up.png" />
     <Resource Include="Assets\Icons\png\poison.png" />
+    <Resource Include="Assets\Icons\png\pvp.png" />
     <Resource Include="Assets\Icons\png\quest_1.png" />
     <Resource Include="Assets\Icons\png\quest_clock.png" />
     <Resource Include="Assets\Icons\png\quest_clock_red.png" />
     <Resource Include="Assets\Icons\png\quest_host.png" />
     <Resource Include="Assets\Icons\png\quest_info.png" />
+    <Resource Include="Assets\Icons\png\rasta_bar.png" />
     <Resource Include="Assets\Icons\png\red_soul.png" />
     <Resource Include="Assets\Icons\png\right_click.png" />
     <Resource Include="Assets\Icons\png\sand_clock.png" />
@@ -1737,6 +1763,8 @@
     <Resource Include="Assets\Icons\png\small_tonfa.png" />
     <Resource Include="Assets\Icons\png\study.png" />
     <Resource Include="Assets\Icons\png\stun.png" />
+    <Resource Include="Assets\Icons\png\tenrou.png" />
+    <Resource Include="Assets\Icons\png\tent.png" />
     <Resource Include="Assets\Icons\png\ticket.png" />
     <Resource Include="Assets\Icons\png\transcend.png" />
     <Resource Include="Assets\Icons\png\transcend_active.png" />

MHFZ_Overlay/Models/Addresses/AddressModelHGE.cs

@@ -1778,4 +1778,16 @@ public AddressModelHGE(Mem m)
 
     /// <inheritdoc/>
     public override int ActiveFeature3() => this.M.Read2Byte("mhfo-hd.dll+E41A2A8");
+
+    /// <inheritdoc/>
+    public override int ServerHeartbeat() => this.M.ReadInt("mhfo-hd.dll+EABD4F0");
+
+    /// <inheritdoc/>
+    public override int GuildFoodStart() => this.M.ReadInt("mhfo-hd.dll+E7FED08");
+
+    /// <inheritdoc/>
+    public override int DivaSongStart() => this.M.ReadInt("mhfo-hd.dll+ED3DB50");
+
+    /// <inheritdoc/>
+    //public override int DivaPrayerGemStart() => this.M.ReadInt("mhfo-hd.dll+E820DF8");
 }

MHFZ_Overlay/Models/Addresses/AddressModelNotHGE.cs

@@ -1698,4 +1698,16 @@ public AddressModelNotHGE(Mem m)
     /// <inheritdoc/>
     public override int ActiveFeature3() => this.M.Read2Byte("mhfo.dll+57E26E8");
 
+    /// <inheritdoc/>
+    public override int ServerHeartbeat() => this.M.ReadInt("mhfo.dll+5E83A00");
+
+    /// <inheritdoc/>
+    public override int GuildFoodStart() => this.M.ReadInt("mhfo.dll+5BC70E0");
+
+    /// <inheritdoc/>
+    public override int DivaSongStart() => this.M.ReadInt("mhfo.dll+61033B0");
+
+    /// <inheritdoc/>
+    //public override int DivaPrayerGemStart() => this.M.ReadInt("mhfo.dll+5BE91C8");
+
 }

MHFZ_Overlay/Settings.settings

@@ -998,5 +998,23 @@
     <Setting Name="PlayerPositionMode" Type="System.String" Scope="User">
       <Value Profile="(Default)">Automatic</Value>
     </Setting>
+    <Setting Name="DivaSongTimerShown" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
+    <Setting Name="DivaSongTimerX" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">5</Value>
+    </Setting>
+    <Setting Name="DivaSongTimerY" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">100</Value>
+    </Setting>
+    <Setting Name="GuildFoodTimerShown" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
+    <Setting Name="GuildFoodTimerX" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">5</Value>
+    </Setting>
+    <Setting Name="GuildFoodTimerY" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">60</Value>
+    </Setting>
   </Settings>
 </SettingsFile>