From 44e2a87b974175eb0d1964efc83c8dcd01979f2c Mon Sep 17 00:00:00 2001 From: dayfine Date: Wed, 28 Oct 2026 11:19:06 -0700 Subject: [PATCH] Test the Blueberry quest detector on the BP reference frames The two Traditional Chinese quest panel frames added for the BP reader also show three quests each. Read every slot at 1080p and 720p, and check that the empty fourth slot reads as nothing. The tests sit in the BBQ farmer's tests file. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01AKYzhrMnPK61XHWEch4a6E --- .../Programs/Farming/PokemonSV_BBQTests.cpp | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQTests.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQTests.cpp index 772ddfa2e9..fc8b078686 100644 --- a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQTests.cpp +++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQTests.cpp @@ -8,6 +8,7 @@ #include "CommonFramework/GlobalAutoPaths.h" #include "CommonFramework/ImageTypes/ImageRGB32.h" #include "VideoGames/PokemonSV/Inference/PokemonSV_BlueberryPointsReader.h" +#include "VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestDetector.h" #include "VideoGames/PokemonSV/Options/PokemonSV_BBQuests.h" #include "PokemonSV_BlueberryQuests.h" #include "PokemonSV_BBQTests.h" @@ -100,6 +101,42 @@ class Test_TeraEncounterAction : public UnitTest{ const TeraEncounterScenario m_scenario; }; +// One quest slot on a full frame of the quest panel. +struct BlueberryQuestScenario{ + std::string image; + Language language; + BlueberryQuestDetector::QuestPosition position; + std::string expected_slug; + size_t width; + size_t height; +}; + +class Test_BlueberryQuestDetector : public UnitTest{ +public: + Test_BlueberryQuestDetector(BlueberryQuestScenario scenario) + : UnitTest( + "PokemonSV::BlueberryQuestDetector - " + scenario.image + + " - slot " + std::to_string((int)scenario.position + 1) + + " - " + std::to_string(scenario.width) + ) + , m_scenario(std::move(scenario)) + {} + + virtual UnitTestResult run(Logger& logger, CancellableScope&) const override{ + ImageRGB32 reference(UNIT_TEST_RESOURCE_PATH() + m_scenario.image); + ImageRGB32 image = reference.scale_to(m_scenario.width, m_scenario.height); + BlueberryQuestDetector detector(logger, COLOR_RED, m_scenario.language, m_scenario.position); + const std::string actual = detector.detect_quest(image); + if (actual != m_scenario.expected_slug){ + return "Expected quest " + m_scenario.expected_slug + ", read \"" + actual + "\""; + } + return true; + } + +private: + const BlueberryQuestScenario m_scenario; +}; + } static void add_tests_TeraEncounterAction(UnitTestDatabase& database){ @@ -121,6 +158,36 @@ static void add_tests_TeraEncounterAction(UnitTestDatabase& database){ } +static void add_tests_BlueberryQuestDetector(UnitTestDatabase& database){ + using enum BlueberryQuestDetector::QuestPosition; + // The second frame is the first after rerolling the first quest. Singleplayer + // without a red quest shows 3 quests, so the fourth slot reads as nothing. + const struct{ + std::string image; + std::string slugs[4]; + } panels[] = { + {"PokemonSV/BlueberryPoints/6750.png", {"catch-any", "sneak-up", "auto-10", ""}}, + {"PokemonSV/BlueberryPoints/6740.png", {"photo-swim", "sneak-up", "auto-10", ""}}, + }; + const BlueberryQuestDetector::QuestPosition positions[] = {FIRST, SECOND, THIRD, FOURTH}; + const std::pair sizes[] = {{1920, 1080}, {1280, 720}}; + for (const auto& panel : panels){ + for (size_t slot = 0; slot < 4; slot++){ + for (const auto& [width, height] : sizes){ + database.add(BlueberryQuestScenario{ + .image = panel.image, + .language = Language::ChineseTraditional, + .position = positions[slot], + .expected_slug = panel.slugs[slot], + .width = width, + .height = height, + }); + } + } + } +} + + void add_tests_BBQ(UnitTestDatabase& database){ database.add(); @@ -133,6 +200,7 @@ void add_tests_BBQ(UnitTestDatabase& database){ database.add("PokemonSV/BlueberryPoints/6740.png", 6740, 1280, 720); add_tests_TeraEncounterAction(database); + add_tests_BlueberryQuestDetector(database); }