Skip to content

Added an option to track shiny sounds without notifications. #854

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mysticial merged 5 commits into from
Nov 25, 2025
Merged

Added an option to track shiny sounds without notifications. #854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
296d002
Add saving every X resets
Dalton-V Nov 23, 2025
a4d4101
Added an option to track shiny sounds without notifications.
Dalton-V Nov 24, 2025
0ad9eeb
Merge branch 'main' into AddNoShinyNodifications
Dalton-V Nov 24, 2025
84e7889
Should be not equal
Dalton-V Nov 24, 2025
20aca99
Update Record Video discription
Dalton-V Nov 24, 2025
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
20 changes: 17 additions & 3 deletions SerialPrograms/Source/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@ ShinySoundDetectedActionOption::ShinySoundDetectedActionOption(
{
{ShinySoundDetectedAction::STOP_PROGRAM, "stop", "Stop program and go Home. Send notification."},
{ShinySoundDetectedAction::NOTIFY_ON_FIRST_ONLY, "notify-first", "Keep running. Notify on first shiny sound only."},
{ShinySoundDetectedAction::NO_NOTIFICATIONS, "no-notifications", "Keep running. Track shiny sounds without sending notifications."},
// {ShinySoundDetectedAction::NOTIFY_ON_ALL, "notify-all", "Keep running. Notify on all shiny sounds."},
},
LockMode::UNLOCK_WHILE_RUNNING,
default_action
)
, TAKE_VIDEO(
"<b>Take Video:</b>",
"<b>Take Video:</b><br>"
"Records the first shiny sound using the switch capture button.<br>",
LockMode::UNLOCK_WHILE_RUNNING,
true
)
Expand Down Expand Up @@ -84,12 +86,18 @@ bool ShinySoundDetectedActionOption::on_shiny_sound(
return false;
}

if (action == ShinySoundDetectedAction::NO_NOTIFICATIONS && current_count > 1) {
Copy link
Collaborator

@Mysticial Mysticial Nov 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should just be an unconditional return here. If we're ignoring shinies, we don't need to do anything here.

Copy link
Contributor Author

@Dalton-V Dalton-V Nov 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if the user selects "No Notifications" and "Take Video"
image

If the code returns here on every shiny the video would never be recorded. Maybe I should add a listener to this and hide the video option if no notifications are selected?

Copy link
Collaborator

@Mysticial Mysticial Nov 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh lol. I intended this to be "ignore all shinies". But this works too.

Copy link
Contributor Author

@Dalton-V Dalton-V Nov 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When reading your message
" add an extra enum that will ignore all shinies (no notifications), but it will continue counting them."
I suppose I took "(no notifications)" as the literal ask. But I could see how an ignore option would be nice especially if there are more options or additional logic added later.

I have time to change this today. Let me know what you think people would find the most useful.

  1. Leave it as it is
  2. Change to ignore shinies, hide other options to avoid the questions about "Take Video dosen't work when I ignore shinies" 😆
  3. Add another enum to support both options. "No notifications" and "Ignore shinies do nothing"

I have no opinion on what would be the best option from above. Doesn't bother me to change anything, just let me know.

return false;
}

if (TAKE_VIDEO){
context.wait_for(SCREENSHOT_DELAY);
pbf_press_button(context, BUTTON_CAPTURE, 2 * TICKS_PER_SECOND, 0);
}

send_shiny_sound_notification(env, stream, error_coefficient);
if (action != ShinySoundDetectedAction::NO_NOTIFICATIONS) {
send_shiny_sound_notification(env, stream, error_coefficient);
}

return action == ShinySoundDetectedAction::STOP_PROGRAM;
}
Expand Down Expand Up @@ -141,7 +149,13 @@ bool ShinySoundHandler::on_shiny_sound(
return false;
}

m_option.send_shiny_sound_notification(env, stream, error_coefficient);
if (action == ShinySoundDetectedAction::NO_NOTIFICATIONS && current_count > 1){
return false;
}

if (action != ShinySoundDetectedAction::NO_NOTIFICATIONS){
m_option.send_shiny_sound_notification(env, stream, error_coefficient);
}

if (m_pending_video.load(std::memory_order_acquire)){
stream.log("Back-to-back shiny sounds. Suppressing video.", COLOR_RED);
Expand Down
1 change: 1 addition & 0 deletions SerialPrograms/Source/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ enum class ShinySoundDetectedAction{
STOP_PROGRAM, // stop program at first detected shiny sound
NOTIFY_ON_FIRST_ONLY, // notify user only on the first shiny sound, keep running the program
NOTIFY_ON_ALL, // notify on all shiny sounds, keep running the program
NO_NOTIFICATIONS // no notifications, still track shiny sounds
};


Expand Down