Skip to content

Commit 4bcfb0a

Browse files
committed
Basic Logging
1 parent 56e6d45 commit 4bcfb0a

2 files changed

Lines changed: 16 additions & 4 deletions

File tree

SerialPrograms/Source/PokemonLZA/Programs/Farming/PokemonLZA_DonutMaker.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ void exit_menu_to_overworld(SingleSwitchProgramEnvironment& env, ProControllerCo
451451
void reset_map_filter_state(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
452452
env.log("Resetting fast travel map filters.");
453453

454-
open_map(env.console, context, false, false);
454+
open_map(env.console, context, true, false);
455455
open_fast_travel_menu(env.console, context);
456456
set_fast_travel_menu_filter(env.console, context, FAST_TRAVEL_FILTER::ALL_TRAVEL_SPOTS);
457457

SerialPrograms/Source/PokemonLZA/Programs/PokemonLZA_FastTravelNavigation.cpp

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ int get_current_selector_index(
4747
double stride = arrow_height + spacing;
4848
double relative_y = detected.y - box.y - (spacing / 2.0);
4949
int index = static_cast<int>(std::round(relative_y / stride));
50-
console.log("Current selector index: " + std::to_string(index));
51-
console.log("Detected arrow box: " + std::to_string(detected.x) + ", " + std::to_string(detected.y) + ", " + std::to_string(detected.width) + ", " + std::to_string(detected.height));
52-
50+
console.log("Current selector index: " + std::to_string(index));
5351
return index;
5452
}
5553
return -1;
@@ -129,6 +127,8 @@ bool navigate_to_destination_page_in_fast_travel_menu(
129127
Language language,
130128
const LocationItem& target_destination
131129
){
130+
console.log("Navigating to destination page for: " + target_destination.slug);
131+
console.overlay().add_log("Navigating to " + target_destination.slug + " page");
132132
WallClock deadline = current_time() + 30s;
133133
do{
134134
navigate_to_destination_page_in_fast_travel_menu_routine(console, context, language, target_destination);
@@ -198,6 +198,8 @@ bool navigate_to_destination_within_page(
198198
Language language,
199199
const LocationItem& target_destination
200200
){
201+
console.log("Navigating to destination within page for: " + target_destination.slug);
202+
console.overlay().add_log("Navigating to " + target_destination.slug + " in page");
201203
WallClock deadline = current_time() + 30s;
202204
do{
203205
navigate_to_destination_within_page_routine(console, context, language, target_destination);
@@ -219,6 +221,8 @@ bool navigate_to_lumiose_sewers_location(
219221
Language language,
220222
const LocationItem& target_destination
221223
){
224+
console.log("Navigating to lumiose sewers location for: " + target_destination.slug);
225+
console.overlay().add_log("Navigating to " + target_destination.slug);
222226
LocationNameReader location_name_reader;
223227
// Use this box to detect cafe woof icon to differentiate between lumiose-sewers-1 and lumiose-sewers-2
224228
const ImageFloatBox& cafe_woof_box = {0.537000, 0.783000, 0.043000, 0.077000};
@@ -307,6 +311,8 @@ bool navigate_to_destination_in_fast_travel_menu(
307311
Language language,
308312
const LocationItem& target_destination
309313
){
314+
console.log("Navigating to destination in fast travel menu: " + target_destination.slug);
315+
console.overlay().add_log("Navigating to " + target_destination.slug);
310316
// lumiose-sewers-1 and lumiose-sewers-2 have the same OCR result, handle that case separately here
311317
if (target_destination.location == Location::LUMIOSE_SEWERS_1 || target_destination.location == Location::LUMIOSE_SEWERS_2){
312318
return navigate_to_lumiose_sewers_location(console, context, language, target_destination);
@@ -328,6 +334,8 @@ bool open_fast_travel_filters_menu(
328334
ConsoleHandle& console,
329335
ProControllerContext& context
330336
){
337+
console.log("Opening fast travel filters menu");
338+
console.overlay().add_log("Opening filters menu");
331339
ButtonGoneWatcher filters_not_open(
332340
COLOR_RED,
333341
ButtonType::ButtonMinus,
@@ -384,6 +392,8 @@ void set_fast_travel_menu_filter(
384392
ProControllerContext& context,
385393
FAST_TRAVEL_FILTER filter
386394
){
395+
console.log("Setting fast travel menu filter to #" + std::to_string(static_cast<int>(filter)));
396+
console.overlay().add_log("Setting filter to #" + std::to_string(static_cast<int>(filter)));
387397
WallClock deadline = current_time() + 30s;
388398

389399
bool filters_menu_opened = open_fast_travel_filters_menu(console, context);
@@ -438,6 +448,8 @@ void open_fast_travel_menu(
438448
ConsoleHandle& console,
439449
ProControllerContext& context
440450
){
451+
console.log("Opening fast travel menu");
452+
console.overlay().add_log("Opening fast travel menu");
441453
MapOverWatcher map_over(COLOR_RED, &console.overlay());
442454
int ret = run_until<ProControllerContext>(
443455
console, context,

0 commit comments

Comments
 (0)