Updated the formatting more

Reviewed additional programs and updated the code formatting.

Author: Developer-Butters

SerialPrograms/Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Fishing.cpp

@@ -7,19 +7,24 @@
 #include "CommonFramework/ProgramStats/StatsTracking.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
+
 #include "CommonTools/Async/InferenceRoutines.h"
 #include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+
 #include "Pokemon/Pokemon_Strings.h"
 #include "PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h"
 #include "PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h"
 #include "PokemonFRLG/Inference/PokemonFRLG_SelectionArrowDetector.h"
 #include "PokemonFRLG/Inference/Sounds/PokemonFRLG_ShinySoundDetector.h"
 #include "PokemonFRLG/PokemonFRLG_Navigation.h"
-#include "PokemonFRLG_ShinyHunt-Fishing.h"
+
 #include <chrono>
 
+#include "PokemonFRLG_ShinyHunt-Fishing.h"
+
 /*TODO LIST
  * Based on reading the included .h files, I believe I can add the following functionality in the future.
  * -An option to automatically register a new rod.
@@ -35,8 +40,8 @@ namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonFRLG{
 
-PokemonFRLG_ShinyHuntFishing_Descriptor::
-    PokemonFRLG_ShinyHuntFishing_Descriptor()
+ShinyHuntFishing_Descriptor::
+    ShinyHuntFishing_Descriptor()
     : SingleSwitchProgramDescriptor(
           "PokemonFRLG:ShinyHuntFishing",
           Pokemon::STRING_POKEMON + " FRLG", "Shiny Hunt - Fishing",
@@ -48,30 +53,29 @@ PokemonFRLG_ShinyHuntFishing_Descriptor::
           )
 {}
 
-struct PokemonFRLG_ShinyHuntFishing_Descriptor::Stats : public StatsTracker{
+struct ShinyHuntFishing_Descriptor::Stats : public StatsTracker{
     Stats()
         : encounters(m_stats["Encounters"])
         , shinies(m_stats["Shinies"])
         , errors(m_stats["Errors"])
     {
         m_display_order.emplace_back("Encounters");
         m_display_order.emplace_back("Shinies");
-        m_display_order.emplace_back("Errors");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
     }
 
     std::atomic<uint64_t>& encounters;
     std::atomic<uint64_t>& shinies;
     std::atomic<uint64_t>& errors;
 };
 
-std::unique_ptr<StatsTracker> PokemonFRLG_ShinyHuntFishing_Descriptor::make_stats() const{
+std::unique_ptr<StatsTracker> ShinyHuntFishing_Descriptor::make_stats() const{
     return std::make_unique<Stats>();
 }
 
 
-PokemonFRLG_ShinyHuntFishing::PokemonFRLG_ShinyHuntFishing()
+ShinyHuntFishing::ShinyHuntFishing()
     : SingleSwitchProgramInstance()
-
     , BITE_WAIT_MS(
           "<b>Bite Wait (ms)</b><br>"
           "Adaptive delay before pressing A.",
@@ -80,16 +84,18 @@ PokemonFRLG_ShinyHuntFishing::PokemonFRLG_ShinyHuntFishing()
           2400,
           4200
           )
-
     , GO_HOME_WHEN_DONE(true)
 
     , NOTIFICATION_SHINY(
           "Shiny found",
           true, true, ImageAttachmentMode::JPG,
           {"Notifs", "Showcase"}
           )
+
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
     , NOTIFICATIONS({
           &NOTIFICATION_SHINY,
+          &NOTIFICATION_STATUS_UPDATE,
           &NOTIFICATION_PROGRAM_FINISH
       })
 
@@ -104,15 +110,14 @@ PokemonFRLG_ShinyHuntFishing::PokemonFRLG_ShinyHuntFishing()
 }
 
 
-void PokemonFRLG_ShinyHuntFishing::program(SingleSwitchProgramEnvironment& env,ProControllerContext& context
+void ShinyHuntFishing::program(SingleSwitchProgramEnvironment& env,ProControllerContext& context
     ){
-    auto& stats = env.current_stats<PokemonFRLG_ShinyHuntFishing_Descriptor::Stats>();
+    auto& stats = env.current_stats<ShinyHuntFishing_Descriptor::Stats>();
 
     home_black_border_check(env.console, context);
     /*
-    * Settings: Text Speed fast. Audio required.
+    * Settings: Text Speed fast.
     * Setup: Stand in facing fishable water.
-    * Lead can't be shiny.
     */
 
     env.log("FRLG Fishing shiny hunt started.");
@@ -128,7 +133,7 @@ void PokemonFRLG_ShinyHuntFishing::program(SingleSwitchProgramEnvironment& env,P
     while (true){
 
         // cast rod (must already be registered)
-        pbf_press_button(context, BUTTON_MINUS, 20ms, 400ms);
+        pbf_press_button(context, BUTTON_MINUS, 20ms, 1400ms);
 
         // wait for bite dialog or battle transition
         int ret =

SerialPrograms/Source/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Fishing.h

@@ -3,8 +3,8 @@
  *  From: https://github.com/PokemonAutomation/
  *
  */
-#ifndef PokemonAutomation_PokemonFRLG_ShinyHuntFishing_H
-#define PokemonAutomation_PokemonFRLG_ShinyHuntFishing_H
+#ifndef PokemonAutomation_ShinyHuntFishing_H
+#define PokemonAutomation_ShinyHuntFishing_H
 
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
@@ -19,16 +19,18 @@ namespace NintendoSwitch{
 namespace PokemonFRLG{
 
 
-class PokemonFRLG_ShinyHuntFishing_Descriptor : public SingleSwitchProgramDescriptor{
+class ShinyHuntFishing_Descriptor
+ : public SingleSwitchProgramDescriptor{
 public:
-    PokemonFRLG_ShinyHuntFishing_Descriptor();
+    ShinyHuntFishing_Descriptor
+();
     struct Stats;
     virtual std::unique_ptr<StatsTracker> make_stats() const override;
 };
 
-class PokemonFRLG_ShinyHuntFishing : public SingleSwitchProgramInstance{
+class ShinyHuntFishing : public SingleSwitchProgramInstance{
 public:
-    PokemonFRLG_ShinyHuntFishing();
+    ShinyHuntFishing();
     virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 
@@ -45,6 +47,8 @@ class PokemonFRLG_ShinyHuntFishing : public SingleSwitchProgramInstance{
 
     EventNotificationOption NOTIFICATION_SHINY;
 
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+
     EventNotificationsOption NOTIFICATIONS;
 
 };