Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,12 @@
#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
#include "VideoGames/PokemonSV/Options/PokemonSV_TeraAIOption.h"
#include "VideoGames/PokemonSV/Options/PokemonSV_TeraCatchOnWinOption.h"
#include "VideoGames/PokemonSV/Options/PokemonSV_BBQuests.h"

namespace PokemonAutomation{
namespace NintendoSwitch{
namespace PokemonSV{

enum class BBQuests{
auto_10, make_tm, pickup_10, sneak_up, photo_fly, photo_swim, photo_canyon, photo_coastal, photo_polar, photo_savanna, tera_self_defeat,
travel_500, catch_any, catch_normal, catch_fighting, catch_flying, catch_poison, catch_ground, catch_rock, catch_bug, catch_ghost, catch_steel,
catch_fire, catch_water, catch_grass, catch_electric, catch_psychic, catch_ice, catch_dragon, catch_dark, catch_fairy,
wash_pokemon, wild_tera, auto_30, tera_raid, sandwich_three, bitter_sandwich, sweet_sandwich, salty_sandwich, sour_sandwich, spicy_sandwich, hatch_egg,
photo_normal, photo_fighting, photo_flying, photo_poison, photo_ground, photo_rock, photo_bug, photo_ghost, photo_steel, photo_fire, photo_water,
photo_grass, photo_electric, photo_psychic, photo_ice, photo_dragon, photo_dark, photo_fairy,
ditto_central, ditto_canyon, ditto_coastal, ditto_polar, ditto_savanna, group_canyon, group_coastal, group_polar, group_savanna, group_eyewear, group_nonuniform,
group_masks, sandwich_four, catch_hint, catch_hint2,
UnableToDetect
};

enum class BBQAction{
run,
skip,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
/* Blueberry Quests
*
* From: https://github.com/PokemonAutomation/
*
*/

#include <map>
#include "PokemonSV_BBQuests.h"

namespace PokemonAutomation{
namespace NintendoSwitch{
namespace PokemonSV{

namespace{

const std::map<std::string, BBQuests>& BBQuests_TOKEN_TO_ENUM(){
static std::map<std::string, BBQuests> data{
{"auto-10", BBQuests::auto_10},
{"make-tm", BBQuests::make_tm },
{"pickup-10", BBQuests::pickup_10},
{"sneak-up", BBQuests::sneak_up},
{"photo-fly", BBQuests::photo_fly},
{"photo-swim", BBQuests::photo_swim},
{"photo-canyon", BBQuests::photo_canyon},
{"photo-coastal", BBQuests::photo_coastal},
{"photo-polar", BBQuests::photo_polar},
{"photo-savanna", BBQuests::photo_savanna},
{"tera-self-defeat", BBQuests::tera_self_defeat},
{"travel-500", BBQuests::travel_500},
{"catch-any", BBQuests::catch_any},
{"catch-normal", BBQuests::catch_normal},
{"catch-fighting", BBQuests::catch_fighting},
{"catch-flying", BBQuests::catch_flying},
{"catch-poison", BBQuests::catch_poison},
{"catch-ground", BBQuests::catch_ground},
{"catch-rock", BBQuests::catch_rock},
{"catch-bug", BBQuests::catch_bug},
{"catch-ghost", BBQuests::catch_ghost},
{"catch-steel", BBQuests::catch_steel},
{"catch-fire", BBQuests::catch_fire},
{"catch-water", BBQuests::catch_water},
{"catch-grass", BBQuests::catch_grass},
{"catch-electric", BBQuests::catch_electric},
{"catch-psychic", BBQuests::catch_psychic},
{"catch-ice", BBQuests::catch_ice},
{"catch-dragon", BBQuests::catch_dragon},
{"catch-dark", BBQuests::catch_dark},
{"catch-fairy", BBQuests::catch_fairy},
{"wash-pokemon", BBQuests::wash_pokemon},
{"wild-tera", BBQuests::wild_tera},
{"auto-30", BBQuests::auto_30},
{"tera-raid", BBQuests::tera_raid},
{"sandwich-three", BBQuests::sandwich_three},
{"bitter-sandwich", BBQuests::bitter_sandwich},
{"sweet-sandwich", BBQuests::sweet_sandwich},
{"salty-sandwich", BBQuests::salty_sandwich},
{"sour-sandwich", BBQuests::sour_sandwich},
{"spicy-sandwich", BBQuests::spicy_sandwich},
{"hatch-egg", BBQuests::hatch_egg},
{"photo-normal", BBQuests::photo_normal},
{"photo-fighting", BBQuests::photo_fighting},
{"photo-flying", BBQuests::photo_flying},
{"photo-poison", BBQuests::photo_poison},
{"photo-ground", BBQuests::photo_ground},
{"photo-rock", BBQuests::photo_rock},
{"photo-bug", BBQuests::photo_bug},
{"photo-ghost", BBQuests::photo_ghost},
{"photo-steel", BBQuests::photo_steel},
{"photo-fire", BBQuests::photo_fire},
{"photo-water", BBQuests::photo_water},
{"photo-grass", BBQuests::photo_grass},
{"photo-electric", BBQuests::photo_electric},
{"photo-psychic", BBQuests::photo_psychic},
{"photo-ice", BBQuests::photo_ice},
{"photo-dragon", BBQuests::photo_dragon},
{"photo-dark", BBQuests::photo_dark},
{"photo-fairy", BBQuests::photo_fairy},
{"ditto-central", BBQuests::ditto_central},
{"ditto-canyon", BBQuests::ditto_canyon},
{"ditto-coastal", BBQuests::ditto_coastal},
{"ditto-polar", BBQuests::ditto_polar},
{"ditto-savanna", BBQuests::ditto_savanna},
{"group-canyon", BBQuests::group_canyon},
{"group-coastal", BBQuests::group_coastal},
{"group-polar", BBQuests::group_polar},
{"group-savanna", BBQuests::group_savanna},
{"group-eyewear", BBQuests::group_eyewear},
{"group-nonuniform", BBQuests::group_nonuniform},
{"group-masks", BBQuests::group_masks},
{"sandwich-four", BBQuests::sandwich_four},
{"catch-hint", BBQuests::catch_hint},
{"catch-hint2", BBQuests::catch_hint2},
{"", BBQuests::UnableToDetect},
};
return data;
}

const std::map<BBQuests, std::string>& BBQuests_ENUM_TO_TOKEN(){
static std::map<BBQuests, std::string> data = []{
std::map<BBQuests, std::string> ret;
for (const auto& [token, quest] : BBQuests_TOKEN_TO_ENUM()){
ret.emplace(quest, token);
}
return ret;
}();
return data;
}

}

BBQuests BBQuests_string_to_enum(const std::string& token){
auto iter = BBQuests_TOKEN_TO_ENUM().find(token);
if (iter == BBQuests_TOKEN_TO_ENUM().end()){
return BBQuests::UnableToDetect;
}
return iter->second;
}

const std::string& BBQuests_enum_to_string(BBQuests quest){
static const std::string EMPTY;
auto iter = BBQuests_ENUM_TO_TOKEN().find(quest);
if (iter == BBQuests_ENUM_TO_TOKEN().end()){
return EMPTY;
}
return iter->second;
}


}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/* Blueberry Quests
*
* From: https://github.com/PokemonAutomation/
*
*/

#ifndef PokemonAutomation_PokemonSV_BBQuests_H
#define PokemonAutomation_PokemonSV_BBQuests_H

#include <string>

namespace PokemonAutomation{
namespace NintendoSwitch{
namespace PokemonSV{

enum class BBQuests{
auto_10, make_tm, pickup_10, sneak_up, photo_fly, photo_swim, photo_canyon, photo_coastal, photo_polar, photo_savanna, tera_self_defeat,
travel_500, catch_any, catch_normal, catch_fighting, catch_flying, catch_poison, catch_ground, catch_rock, catch_bug, catch_ghost, catch_steel,
catch_fire, catch_water, catch_grass, catch_electric, catch_psychic, catch_ice, catch_dragon, catch_dark, catch_fairy,
wash_pokemon, wild_tera, auto_30, tera_raid, sandwich_three, bitter_sandwich, sweet_sandwich, salty_sandwich, sour_sandwich, spicy_sandwich, hatch_egg,
photo_normal, photo_fighting, photo_flying, photo_poison, photo_ground, photo_rock, photo_bug, photo_ghost, photo_steel, photo_fire, photo_water,
photo_grass, photo_electric, photo_psychic, photo_ice, photo_dragon, photo_dark, photo_fairy,
ditto_central, ditto_canyon, ditto_coastal, ditto_polar, ditto_savanna, group_canyon, group_coastal, group_polar, group_savanna, group_eyewear, group_nonuniform,
group_masks, sandwich_four, catch_hint, catch_hint2,
UnableToDetect
};

// Map a quest slug (as returned by BlueberryQuestDetector) to its enum.
// Unrecognized slugs return UnableToDetect.
BBQuests BBQuests_string_to_enum(const std::string& token);

// Map a quest to its slug. UnableToDetect maps to the empty string.
const std::string& BBQuests_enum_to_string(BBQuests quest);


}
}
}
#endif
107 changes: 107 additions & 0 deletions SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,122 @@
#include "Inference/Overworld/PokemonSV_LetsGoKillDetector.h"
#include "Inference/Picnics/PokemonSV_SandwichRecipeDetector.h"
Comment thread
dayfine marked this conversation as resolved.
Resolved
#include "Inference/Picnics/PokemonSV_SandwichHandDetector.h"
#include "Options/PokemonSV_BBQuests.h"
#include "Programs/Farming/PokemonSV_BBQLogger.h"
#include "PokemonSV_Tests.h"

namespace PokemonAutomation{
namespace NintendoSwitch{
namespace PokemonSV{

namespace{

class Test_BBQuestsSlugs : public UnitTest{
public:
Test_BBQuestsSlugs()
: UnitTest("PokemonSV::BBQuests - slug round trip")
{}

virtual UnitTestResult run(Logger&, CancellableScope&) const override{
for (int c = 0; c < (int)BBQuests::UnableToDetect; c++){
const BBQuests quest = (BBQuests)c;
const std::string& slug = BBQuests_enum_to_string(quest);
if (slug.empty()){
return "Quest " + std::to_string(c) + " has no slug.";
}
if (BBQuests_string_to_enum(slug) != quest){
return "Slug " + slug + " does not map back to quest " + std::to_string(c) + ".";
}
}
if (!BBQuests_enum_to_string(BBQuests::UnableToDetect).empty()){
return "UnableToDetect must map to the empty slug.";
}
if (BBQuests_string_to_enum("not-a-quest") != BBQuests::UnableToDetect){
return "An unrecognized slug must map to UnableToDetect.";
}
return true;
}
};

class BBQTestLogger : public Logger{
public:
virtual void log(const std::string& message, Color) override{
messages.push_back(message);
}
std::vector<std::string> messages;
};

class Test_BBQDiagnosticLogs : public UnitTest{
public:
Test_BBQDiagnosticLogs(const std::string& scenario)
: UnitTest("PokemonSV::BBQDiagnosticLogs - " + scenario), m_scenario(scenario)
{}

virtual UnitTestResult run(Logger&, CancellableScope&) const override{
BBQTestLogger logger;
std::vector<std::string> expected;
const BBQAttemptLog::Clock::time_point start{};
if (m_scenario == "board"){
BBQLogger(logger).board(true,
{BBQuests::photo_swim, BBQuests::sneak_up, BBQuests::auto_10});
BBQLogger(logger).board(false, {BBQuests::UnableToDetect});
BBQLogger(logger).board(true, {});
expected = {
"BBQ event=board panel_detected=1 quests=photo-swim,sneak-up,auto-10",
"BBQ event=board panel_detected=0 quests=unknown",
"BBQ event=board panel_detected=1 quests=",
};
}else if (m_scenario == "success"){
BBQAttemptLog attempt_log(logger, BBQuests::make_tm, 1, 2, start);
attempt_log.route_return(start + std::chrono::milliseconds(2000));
attempt_log.result(true, start + std::chrono::milliseconds(2500));
expected = {
"BBQ quest=make-tm attempt=1 limit=2 event=start",
"BBQ quest=make-tm attempt=1 limit=2 event=route_return elapsed_ms=2000 elapsed=\"2.000 seconds\"",
"BBQ quest=make-tm attempt=1 limit=2 event=result outcome=absent_from_board verification_ms=500 verification=\"0.500 seconds\" total_ms=2500 total=\"2.500 seconds\"",
};
}else if (m_scenario == "retry-exhausted"){
BBQLogger(logger).battle_entry_timeout(BBQuests::catch_any);
BBQAttemptLog attempt_log(logger, BBQuests::catch_any, 2, 2, start);
attempt_log.route_return(start + std::chrono::milliseconds(3345));
attempt_log.result(false, start + std::chrono::milliseconds(4110));
BBQLogger(logger).retry_exhausted(BBQuests::catch_any);
expected = {
"BBQ quest=catch-any event=battle_entry outcome=timeout",
"BBQ quest=catch-any attempt=2 limit=2 event=start",
"BBQ quest=catch-any attempt=2 limit=2 event=route_return elapsed_ms=3345 elapsed=\"3.345 seconds\"",
"BBQ quest=catch-any attempt=2 limit=2 event=result outcome=still_on_board verification_ms=765 verification=\"0.765 seconds\" total_ms=4110 total=\"4.110 seconds\"",
"BBQ quest=catch-any event=retry_exhausted recovery=skip_current_batch",
};
}else if (m_scenario == "long-duration"){
BBQAttemptLog attempt_log(logger, BBQuests::UnableToDetect, 256, 256, start);
attempt_log.route_return(start + std::chrono::milliseconds(120000));
attempt_log.result(false, start + std::chrono::milliseconds(120000));
expected = {
"BBQ quest=unknown attempt=256 limit=256 event=start",
"BBQ quest=unknown attempt=256 limit=256 event=route_return elapsed_ms=120000 elapsed=\"2.000 minutes\"",
"BBQ quest=unknown attempt=256 limit=256 event=result outcome=still_on_board verification_ms=0 verification=\"0.000 seconds\" total_ms=120000 total=\"2.000 minutes\"",
};
}else{
return "Unknown BBQ log test scenario.";
}
if (logger.messages != expected){
return "Unexpected BBQ diagnostic log sequence for " + m_scenario;
}
return true;
}

private:
const std::string m_scenario;
};

}

void add_tests(UnitTestDatabase& database){
for (const char* scenario : {"board", "success", "retry-exhausted", "long-duration"}){
database.add<Test_BBQDiagnosticLogs>(scenario);
}
database.add<Test_BBQuestsSlugs>();
add_tests_WhiteButtonDetector(database);
add_tests_BoxInfoDetector(database);
add_tests_BoxEggDetector(database);
Expand Down
Loading