audio only feedback type, rename program

Author: kichithewolf

SerialPrograms/CMakeLists.txt

@@ -1293,8 +1293,8 @@ file(GLOB MAIN_SOURCES
     Source/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.h
     Source/PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.cpp
     Source/PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.h
-    Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.cpp
-    Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.h
+    Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_AudioStarterReset.cpp
+    Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_AudioStarterReset.h
     Source/PokemonRSE/Programs/TestPrograms/PokemonRSE_SoundListener.cpp
     Source/PokemonRSE/Programs/TestPrograms/PokemonRSE_SoundListener.h
     Source/PokemonRSE/PokemonRSE_Navigation.cpp

SerialPrograms/Source/CommonFramework/Globals.h

@@ -69,6 +69,7 @@ enum class FeedbackType{
     NONE,
     OPTIONAL_,  //  Naming conflict with macro.
     REQUIRED,
+    AUDIO,
     VIDEO_AUDIO,
 };
 

SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.cpp

@@ -81,6 +81,12 @@ CollapsibleGroupBox* make_panel_header(
             header
         );
         break;
+    case FeedbackType::AUDIO:
+        text = new QLabel(
+            "<font color=\"green\">(This program requires audio feedback. Please make sure you choose the correct audio device.)</font>",
+            header
+        );
+        break;
     case FeedbackType::VIDEO_AUDIO:
         text = new QLabel(
             "<font color=\"green\">(This program requires video and audio feedback. Please make sure you choose the correct capture device, as well as the correct audio device.)</font>",

SerialPrograms/Source/PokemonRSE/PokemonRSE_Panels.cpp

@@ -10,7 +10,7 @@
 
 #include "PokemonRSE_Settings.h"
 
-#include "Programs/ShinyHunting/PokemonRSE_StarterReset.h"
+#include "Programs/ShinyHunting/PokemonRSE_AudioStarterReset.h"
 #include "Programs/TestPrograms/PokemonRSE_SoundListener.h"
 
 namespace PokemonAutomation{
@@ -20,7 +20,7 @@ namespace PokemonRSE{
 
 
 PanelListFactory::PanelListFactory()
-    : PanelListDescriptor("Pokemon Ruby, Sapphire, and Emerald")
+    : PanelListDescriptor("Pokemon Ruby and Sapphire, Pokemon Emerald")
 {}
 
 std::vector<PanelEntry> PanelListFactory::make_panels() const{
@@ -35,8 +35,8 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
 
 
     if (PreloadSettings::instance().DEVELOPER_MODE){
-        ret.emplace("---- WIP: Shiny Hunting (Audio only) ----");
-        ret.emplace_back(make_single_switch_program<StarterReset_Descriptor, StarterReset>());
+        ret.emplace_back("---- WIP: Shiny Hunting (Audio only) ----");
+        ret.emplace_back(make_single_switch_program<AudioStarterReset_Descriptor, AudioStarterReset>());
 
         ret.emplace_back("---- Developer Tools ----");
         ret.emplace_back(make_single_switch_program<SoundListener_Descriptor, SoundListener>());

SerialPrograms/Source/PokemonRSE/PokemonRSE_Settings.cpp

@@ -45,7 +45,7 @@ GameSettings::GameSettings()
     , SHINY_SOUND_THRESHOLD(
         "<b>Shiny Sound Threshold:</b><br>Maximum error coefficient to trigger a shiny detection.",
         LockMode::LOCK_WHILE_RUNNING,
-        0.87, 0, 1.0
+        0.97, 0, 1.0
     )
     , SHINY_SOUND_LOW_FREQUENCY(
         "<b>Shiny Sound Low Frequency (Hz):</b><br>High pass filter frequency for shiny sound.",

…ShinyHunting/PokemonRSE_StarterReset.cpp …Hunting/PokemonRSE_AudioStarterReset.cppSerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.cpp renamed to SerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_AudioStarterReset.cpp SerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.cpp renamed to SerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_AudioStarterReset.cpp

@@ -14,26 +14,25 @@
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
 #include "PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.h"
 #include "PokemonRSE/PokemonRSE_Navigation.h"
-#include "PokemonRSE_StarterReset.h"
+#include "PokemonRSE_AudioStarterReset.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonRSE{
 
-StarterReset_Descriptor::StarterReset_Descriptor()
+AudioStarterReset_Descriptor::AudioStarterReset_Descriptor()
     : SingleSwitchProgramDescriptor(
-        "PokemonRSE:StarterReset",
-        "Pokemon RSE", "Starter Reset",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonRSE/StarterReset.md",
-        "(Audio only) Soft reset for a shiny starter. WIP, audio recognition does not work well.",
-        //FeedbackType::VIDEO_AUDIO,
-        FeedbackType::NONE,
+        "PokemonRSE:AudioStarterReset",
+        "Pokemon RSE", "[RS] Starter Reset - Audio only",
+        "ComputerControl/blob/master/Wiki/Programs/PokemonRSE/AudioStarterReset.md",
+        "Soft reset for a shiny starter. Ruby and Sapphire only. WIP, audio recognition does not work well.",
+        FeedbackType::AUDIO,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
         PABotBaseLevel::PABOTBASE_12KB
     )
 {}
 
-struct StarterReset_Descriptor::Stats : public StatsTracker{
+struct AudioStarterReset_Descriptor::Stats : public StatsTracker{
     Stats()
         : resets(m_stats["Resets"])
         , poochyena(m_stats["Shiny Poochyena"])
@@ -47,11 +46,11 @@ struct StarterReset_Descriptor::Stats : public StatsTracker{
     std::atomic<uint64_t>& poochyena;
     std::atomic<uint64_t>& shinystarter;
 };
-std::unique_ptr<StatsTracker> StarterReset_Descriptor::make_stats() const{
+std::unique_ptr<StatsTracker> AudioStarterReset_Descriptor::make_stats() const{
     return std::unique_ptr<StatsTracker>(new Stats());
 }
 
-StarterReset::StarterReset()
+AudioStarterReset::AudioStarterReset()
     : TARGET(
         "<b>Starter:</b><br>",
         {
@@ -96,9 +95,9 @@ StarterReset::StarterReset()
     PA_ADD_OPTION(NOTIFICATIONS);
 }
 
-void StarterReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void AudioStarterReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
     //assert_16_9_720p_min(env.logger(), env.console);
-    StarterReset_Descriptor::Stats& stats = env.current_stats<StarterReset_Descriptor::Stats>();
+    AudioStarterReset_Descriptor::Stats& stats = env.current_stats<AudioStarterReset_Descriptor::Stats>();
 
     /*
     * Settings: Text Speed fast.
@@ -133,7 +132,7 @@ void StarterReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext&
         default:
             OperationFailedException::fire(
                 env.console, ErrorReport::SEND_ERROR_REPORT,
-                "StarterReset: Invalid target."
+                "AudioStarterReset: Invalid target."
             );
             break;
         }

…s/ShinyHunting/PokemonRSE_StarterReset.h …nyHunting/PokemonRSE_AudioStarterReset.hSerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.h renamed to SerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_AudioStarterReset.h SerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.h renamed to SerialPrograms/Source/PokemonRSE/Programs/ShinyHunting/PokemonRSE_AudioStarterReset.h

@@ -4,8 +4,8 @@
  *
  */
 
-#ifndef PokemonAutomation_PokemonRSE_StarterReset_H
-#define PokemonAutomation_PokemonRSE_StarterReset_H
+#ifndef PokemonAutomation_PokemonRSE_AudioStarterReset_H
+#define PokemonAutomation_PokemonRSE_AudioStarterReset_H
 
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
 #include "Common/Cpp/Options/TimeExpressionOption.h"
@@ -16,16 +16,16 @@ namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonRSE{
 
-class StarterReset_Descriptor : public SingleSwitchProgramDescriptor{
+class AudioStarterReset_Descriptor : public SingleSwitchProgramDescriptor{
 public:
-    StarterReset_Descriptor();
+    AudioStarterReset_Descriptor();
     struct Stats;
     virtual std::unique_ptr<StatsTracker> make_stats() const override;
 };
 
-class StarterReset : public SingleSwitchProgramInstance{
+class AudioStarterReset : public SingleSwitchProgramInstance{
 public:
-    StarterReset();
+    AudioStarterReset();
     virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
 
 private: