Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
346b15a
BDSP MenuDetector and ShortDialogDetector: also detect the new game's…
dayfine Nov 2, 2026
b033840
BDSP MenuDetector: keep its check; test the new game's menu with skip…
dayfine Nov 2, 2026
5059026
Merge remote-tracking branch 'origin/bdsp/walk-v4' into bdsp/detector…
dayfine Nov 2, 2026
2b44bfe
Merge bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 2, 2026
cc96587
Merge bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 2, 2026
a947b3d
Merge bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 2, 2026
25068d0
Merge bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 2, 2026
c20de26
Merge bdsp/walk-v4 forward
dayfine Nov 2, 2026
6bafbb4
Merge bdsp/nav-v4 forward
dayfine Nov 2, 2026
15100a0
Merge bdsp/nav-v4 forward
dayfine Nov 2, 2026
4f6d3d2
Merge the BDSP chain forward
dayfine Nov 2, 2026
28d6105
Merge the BDSP chain forward
dayfine Nov 2, 2026
451cfaf
Merge the BDSP chain forward
dayfine Nov 2, 2026
6195ebc
Merge the BDSP chain forward
dayfine Nov 2, 2026
cddc4a8
Merge the BDSP chain forward
dayfine Nov 2, 2026
b05be8a
Merge origin/bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 2, 2026
41cfcf1
Merge origin/bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 2, 2026
f85bad6
Merge origin/bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 2, 2026
a46a54f
Merge origin/bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 2, 2026
3934be6
Merge origin/bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 2, 2026
25f75b7
Merge bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 2, 2026
a69880e
BDSP MenuDetector: columns clear of the NEW tags' edges
dayfine Nov 2, 2026
81d410d
Merge bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 2, 2026
67c6ca5
BDSP detectors: Floaroma and Jubilife menu and dialogue images
dayfine Nov 2, 2026
99f22ff
Merge origin/bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 2, 2026
13a56e1
Merge bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 2, 2026
843d063
Merge bdsp/maps-v4 (coord events) into bdsp/detectors-v4
dayfine Nov 2, 2026
0d4d23e
Merge bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 2, 2026
139d483
Merge bdsp/walk-v4 (b22e9471c: verify mode from #122) into bdsp/detec…
dayfine Nov 3, 2026
f5a3c42
Merge commit '89f673f74988cea2333e7dd157136f3aa5f39f0e' into HEAD
dayfine Nov 5, 2026
6251b06
Merge remote-tracking branch 'origin/bdsp/walk-v4' into bdsp/detector…
dayfine Nov 6, 2026
1b23b0c
BDSP MenuDetector: label namespace closing braces
dayfine Nov 6, 2026
176f793
BDSP detectors: use explicit image test cases and current style
dayfine Nov 7, 2026
814798e
Merge remote-tracking branch 'origin/bdsp/walk-v4' into bdsp/detector…
dayfine Nov 7, 2026
46a5fae
Merge remote-tracking branch 'origin/bdsp/walk-v4' into bdsp/detector…
dayfine Nov 7, 2026
48f3792
Merge origin/bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 8, 2026
8cde2ac
Merge remote-tracking branch 'origin/bdsp/walk-v4' into bdsp/detector…
dayfine Nov 8, 2026
f4dfe38
Merge remote-tracking branch 'origin/bdsp/walk-v4' into bdsp/detector…
dayfine Nov 8, 2026
27ce3d5
Merge origin/bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 8, 2026
305f659
Merge remote-tracking branch 'origin/bdsp/walk-v4' into HEAD
dayfine Nov 9, 2026
024466b
Merge bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 9, 2026
efc8d9a
Merge bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 9, 2026
5678f2f
Merge bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 9, 2026
e8c03d0
Merge bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 9, 2026
cc9e573
Merge bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 9, 2026
6be7975
Merge bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 9, 2026
19e1038
Merge bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 9, 2026
cd4cf05
BDSP: register the dialog and menu detector tests with the BDSP tests
dayfine Nov 9, 2026
2e01abc
Merge bdsp/walk-v4 (merge of #122 b3aa69e19) into bdsp/detectors-v4
dayfine Nov 9, 2026
3b2e4a2
Merge bdsp/walk-v4 (timed walk events, open-leg battle placement) int…
dayfine Nov 9, 2026
a770bf7
Merge bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 9, 2026
f3b024b
Merge bdsp/walk-v4 (open-leg battles placed by screen events) into bd…
dayfine Nov 9, 2026
5b662ec
Merge bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 9, 2026
9700de8
Merge bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 9, 2026
c0a292e
Merge bdsp/walk-v4 into bdsp/detectors-v4 (wait for a battle's openin…
dayfine Nov 9, 2026
4c241ee
Merge bdsp/walk-v4 into bdsp/detectors-v4 (scene ends after its fade;…
dayfine Nov 9, 2026
7f36593
Merge bdsp/walk-v4 into bdsp/detectors-v4: a step on the Switch HOME …
dayfine Nov 9, 2026
328befd
Merge origin/bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 10, 2026
b6c8c88
Merge remote-tracking branch 'origin/bdsp/walk-v4' into bdsp/detector…
dayfine Nov 10, 2026
ea91463
Merge origin/bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 11, 2026
9621d89
Merge bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 11, 2026
65456ff
Merge origin/bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 12, 2026
cb835e9
Merge branch 'bdsp/walk-v4' into bdsp/detectors-v4
dayfine Nov 12, 2026
9223d35
BDSP: register the Dialog/Menu detector suites once
dayfine Nov 12, 2026
3ae94ca
Merge branch 'bdsp/walk-v4' into bdsp/detectors-v4
dayfine Nov 12, 2026
7039f8c
Merge origin/bdsp/walk-v4 into bdsp/detectors-v4
dayfine Nov 12, 2026
168d728
BDSP MenuDetector: narrow the white columns clear of the cursor glow
dayfine Nov 12, 2026
5358225
Merge bdsp/menu-detector-cursor-glow (#430) into bdsp/detectors-v4
dayfine Nov 13, 2026
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 @@ -32,8 +32,6 @@
#include "NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.h"
#include "NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter_Tests.h"
#include "NintendoSwitch/Controllers/SysbotBase/SysbotBase_Connection.h"
#include "PokemonBDSP/Inference/PokemonBDSP_DialogDetector.h"
#include "PokemonBDSP/Inference/PokemonBDSP_MenuDetector.h"

#include "Pokemon/Navigation/Pokemon_ConnectedMaps_Tests.h"
#include "Pokemon/Navigation/Pokemon_LegPlanner_Tests.h"
Expand Down Expand Up @@ -62,7 +60,7 @@



UnitTestDatabase make_UNIT_TESTS_ALL(){

Check warning on line 63 in SerialPrograms/Source/ComputerPrograms/ComputerPrograms_UnitTestRunner.cpp

View workflow job for this annotation

GitHub Actions / code-health

Code health (advisory)

PokemonAutomation::ComputerPrograms::make_UNIT_TESTS_ALL(): function_lines=44 (advisory above 25, limit 50)
UnitTestDatabase ret;

add_tests_QtEventThreadPool(ret, GlobalThreadPools::computation_normal());
Expand Down Expand Up @@ -96,8 +94,6 @@
NintendoSwitch::add_tests_UpdatePopupDetector(ret);
NintendoSwitch::Typewriter::add_tests_TypewriterTextMapping(ret);
NintendoSwitch::PokemonBDSP::add_tests(ret);
NintendoSwitch::PokemonBDSP::add_tests_DialogDetector(ret);
NintendoSwitch::PokemonBDSP::add_tests_MenuDetector(ret);
NintendoSwitch::PokemonFRLG::add_tests(ret);
NintendoSwitch::PokemonRSE::add_tests(ret);
NintendoSwitch::PokemonHome::add_tests(ret);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,14 @@ constexpr double STRIPE_BOTTOM = 0.598;
// Each column sits in the gap right of an icon, clear of the "NEW" tag on
// its top right corner. The tag on TOWN MAP extends into a column at 0.160.
constexpr double STRIPE_LEFT = 0.166;
// The selected icon glows about 0.008 past its left edge, into the gap left
// of it. A column of 0.015 reached the glow from 0.177 (cursor on the first
// icon of a row); 0.010 ends just short of it.
constexpr double STRIPE_WIDTH = 0.010;

ImageFloatBox menu_stripe(size_t index, bool skip_new_banner){
double top = skip_new_banner ? STRIPE_TOP_BELOW_BANNER : STRIPE_TOP;
return ImageFloatBox(STRIPE_LEFT + 0.166 * (double)index, top, 0.015, STRIPE_BOTTOM - top);
return ImageFloatBox(STRIPE_LEFT + 0.166 * (double)index, top, STRIPE_WIDTH, STRIPE_BOTTOM - top);
}

} // namespace
Expand Down Expand Up @@ -149,52 +153,58 @@ class Test_MenuDetector : public ImageUnitTest{
MenuExpectation m_expectation;
};

// Every image runs with both column modes.
constexpr std::array<MenuCase, 22> MENU_CASES{{
{.input = {.image = "PokemonBDSP/MenuDetector/FrenchCursorOnMap_True.png", .columns = Columns::FromTop},
.expectation = {.detected = true}},
{.input = {.image = "PokemonBDSP/MenuDetector/FrenchCursorOnMap_True.png", .columns = Columns::BelowNewTags},
.expectation = {.detected = true}},
{.input = {.image = "PokemonBDSP/MenuDetector/NewGameBagOptions_True.png", .columns = Columns::FromTop},
.expectation = {.detected = true}},
{.input = {.image = "PokemonBDSP/MenuDetector/NewGameBagOptions_True.png", .columns = Columns::BelowNewTags},
.expectation = {.detected = true}},
{.input = {.image = "PokemonBDSP/MenuDetector/JubilifeTownMapNew_True.png", .columns = Columns::FromTop},
.expectation = {.detected = true}},
{.input = {.image = "PokemonBDSP/MenuDetector/JubilifeTownMapNew_True.png", .columns = Columns::BelowNewTags},
.expectation = {.detected = true}},
{.input = {.image = "PokemonBDSP/MenuDetector/FloaromaMenuThreeNew_True.png", .columns = Columns::FromTop},
.expectation = {.detected = true}},
{.input = {.image = "PokemonBDSP/MenuDetector/FloaromaMenuThreeNew_True.png", .columns = Columns::BelowNewTags},
.expectation = {.detected = true}},
{.input = {.image = "PokemonBDSP/MenuDetector/Home_False.png", .columns = Columns::FromTop},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/Home_False.png", .columns = Columns::BelowNewTags},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/OverworldSandgemMart_False.png", .columns = Columns::FromTop},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/OverworldSandgemMart_False.png", .columns = Columns::BelowNewTags},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/OverworldOreburghMine_False.png", .columns = Columns::FromTop},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/OverworldOreburghMine_False.png", .columns = Columns::BelowNewTags},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/IntroDialog_False.png", .columns = Columns::FromTop},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/IntroDialog_False.png", .columns = Columns::BelowNewTags},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/IntroBarry_False.png", .columns = Columns::FromTop},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/IntroBarry_False.png", .columns = Columns::BelowNewTags},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/FloaromaOldManDialog_False.png", .columns = Columns::FromTop},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/FloaromaOldManDialog_False.png", .columns = Columns::BelowNewTags},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/FloaromaCloudShadows_False.png", .columns = Columns::FromTop},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/FloaromaCloudShadows_False.png", .columns = Columns::BelowNewTags},
.expectation = {.detected = false}},
}};

} // namespace

void add_tests_MenuDetector(UnitTestDatabase& database){
static constexpr std::array<MenuCase, 20> CASES{{
{.input = {.image = "PokemonBDSP/MenuDetector/NewGameBagOptions_True.png", .columns = Columns::FromTop},
.expectation = {.detected = true}},
{.input = {.image = "PokemonBDSP/MenuDetector/NewGameBagOptions_True.png", .columns = Columns::BelowNewTags},
.expectation = {.detected = true}},
{.input = {.image = "PokemonBDSP/MenuDetector/JubilifeTownMapNew_True.png", .columns = Columns::FromTop},
.expectation = {.detected = true}},
{.input = {.image = "PokemonBDSP/MenuDetector/JubilifeTownMapNew_True.png", .columns = Columns::BelowNewTags},
.expectation = {.detected = true}},
{.input = {.image = "PokemonBDSP/MenuDetector/FloaromaMenuThreeNew_True.png", .columns = Columns::FromTop},
.expectation = {.detected = true}},
{.input = {.image = "PokemonBDSP/MenuDetector/FloaromaMenuThreeNew_True.png", .columns = Columns::BelowNewTags},
.expectation = {.detected = true}},
{.input = {.image = "PokemonBDSP/MenuDetector/Home_False.png", .columns = Columns::FromTop},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/Home_False.png", .columns = Columns::BelowNewTags},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/OverworldSandgemMart_False.png", .columns = Columns::FromTop},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/OverworldSandgemMart_False.png", .columns = Columns::BelowNewTags},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/OverworldOreburghMine_False.png", .columns = Columns::FromTop},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/OverworldOreburghMine_False.png", .columns = Columns::BelowNewTags},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/IntroDialog_False.png", .columns = Columns::FromTop},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/IntroDialog_False.png", .columns = Columns::BelowNewTags},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/IntroBarry_False.png", .columns = Columns::FromTop},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/IntroBarry_False.png", .columns = Columns::BelowNewTags},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/FloaromaOldManDialog_False.png", .columns = Columns::FromTop},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/FloaromaOldManDialog_False.png", .columns = Columns::BelowNewTags},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/FloaromaCloudShadows_False.png", .columns = Columns::FromTop},
.expectation = {.detected = false}},
{.input = {.image = "PokemonBDSP/MenuDetector/FloaromaCloudShadows_False.png", .columns = Columns::BelowNewTags},
.expectation = {.detected = false}},
}};
for (const MenuCase& test : CASES){
for (const MenuCase& test : MENU_CASES){
database.add<Test_MenuDetector>(test);
}
}
Expand Down
4 changes: 4 additions & 0 deletions SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
*/

#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
#include "Inference/PokemonBDSP_DialogDetector.h"
#include "Inference/PokemonBDSP_MenuDetector.h"
#include "Programs/AutoStory/PokemonBDSP_AutoStory_Maps_Tests.h"
#include "Programs/AutoStory/PokemonBDSP_AutoStory_PlannedRoute_Tests.h"
#include "Programs/AutoStory/PokemonBDSP_AutoStory_RoutePlanner_Tests.h"
Expand All @@ -21,6 +23,8 @@ namespace PokemonBDSP{


void add_tests(UnitTestDatabase& database){
add_tests_DialogDetector(database);
add_tests_MenuDetector(database);
add_tests_AutoStory_Maps(database);
add_tests_AutoStory_StoryWorld(database);
add_tests_AutoStory_RoutePlanner(database);
Expand Down
Loading