Frlg Held Item Farmer - Safari Zone (#1304)

* Add option to hunt dragonair

* rename lucky egg farmer to held item farmer - safari zone

* Use resently added fishing encounter method

* Use new party detector to know what pokemon to check for held item. Added user setup validation

* Hide new item behind beta

* Catch logic

* Add logs attempt to recover from missed transitions

* More recovery logic

Author: Dalton-V

SerialPrograms/Source/CommonFramework/ProgramStats/StatsDatabase.cpp

@@ -37,6 +37,7 @@ const std::map<std::string, std::string> STATS_DATABASE_ALIASES{
     {"PokemonSV:StatsResetBloodmoon", "PokemonSV:StatsResetEventBattle"},
     {"PokemonLZA:ShinyHunt-Bench", "PokemonLZA:ShinyHunt-BenchSit"},
     {"PokemonLZA:BerryBuyer", "PokemonLZA:StallBuyer"},
+    {"PokemonFRLG:LuckyEggFarmer", "PokemonFRLG:HeldItemFarmerSafariZone"},
 };
 
 

SerialPrograms/Source/PokemonFRLG/PokemonFRLG_Navigation.h

@@ -122,6 +122,9 @@ int grass_spin(ConsoleHandle& console, ProControllerContext& context, bool leftr
 // returns -1 if no encounter is triggered, 0 if a non-shiny is encounter, and 1 if a shiny is encountered
 int fish_encounter(ConsoleHandle& console, ProControllerContext& context, Seconds timeout = 300s);
 
+// tries to pull up the start menu to check if currently in the overworld
+bool in_overworld(ConsoleHandle& console, ProControllerContext& context);
+
 // Automatically catch a Pokemon.
 // Returns -1 if there are detection issues, 0 if the Pokemon was not caught, and the number of balls thrown if it was caught.
 int auto_catch(

SerialPrograms/Source/PokemonFRLG/PokemonFRLG_Panels.cpp

@@ -10,8 +10,8 @@
 #include "PokemonFRLG_Panels.h"
 
 #include "PokemonFRLG_Settings.h"
+#include "Programs/Farming/PokemonFRLG_HeldItemFarmer-SafariZone.h"
 #include "Programs/Farming/PokemonFRLG_ItemDuplication.h"
-#include "Programs/Farming/PokemonFRLG_LuckyEggFarmer.h"
 #include "Programs/Farming/PokemonFRLG_NuggetBridgeFarmer.h"
 #include "Programs/Farming/PokemonFRLG_PickupFarmer.h"
 #include "Programs/Farming/PokemonFRLG_EvTrainer.h"
@@ -59,7 +59,7 @@ std::vector<PanelEntry> PanelListFactory::make_panels() const{
     ret.emplace_back(make_single_switch_program<NuggetBridgeFarmer_Descriptor, NuggetBridgeFarmer>());
     ret.emplace_back(make_single_switch_program<PickupFarmer_Descriptor, PickupFarmer>());
     ret.emplace_back(make_single_switch_program<EvTrainer_Descriptor, EvTrainer>());
-    ret.emplace_back(make_single_switch_program<LuckyEggFarmer_Descriptor, LuckyEggFarmer>());
+    ret.emplace_back(make_single_switch_program<HeldItemFarmerSafariZone_Descriptor, HeldItemFarmerSafariZone>());
     ret.emplace_back(make_single_switch_program<ItemDuplication_Descriptor, ItemDuplication>());
 
     //ret.emplace_back("---- General ----");