Skip to content

Commit f6b4933

Browse files
committed
Change notification text for Burmy/LeapGrinder to be less misleading.
1 parent 0e4e241 commit f6b4933

File tree

4 files changed

+31
-1
lines changed

4 files changed

+31
-1
lines changed

SerialPrograms/Source/PokemonLA/Options/PokemonLA_ShinyDetectedAction.cpp

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,25 @@ ShinyRequiresAudioText::ShinyRequiresAudioText()
3232

3333

3434

35+
3536
ShinyDetectedActionOption::ShinyDetectedActionOption(
3637
std::string label, std::string description,
3738
std::string default_delay,
3839
ShinyDetectedAction default_action
40+
)
41+
: ShinyDetectedActionOption(
42+
label,
43+
std::move(description),
44+
label,
45+
std::move(default_delay),
46+
std::move(default_action)
47+
)
48+
{}
49+
ShinyDetectedActionOption::ShinyDetectedActionOption(
50+
std::string label, std::string description,
51+
std::string notification_label,
52+
std::string default_delay,
53+
ShinyDetectedAction default_action
3954
)
4055
: GroupOption(std::move(label), LockMode::LOCK_WHILE_RUNNING)
4156
, DESCRIPTION(std::move(description))
@@ -58,7 +73,12 @@ ShinyDetectedActionOption::ShinyDetectedActionOption(
5873
LockMode::LOCK_WHILE_RUNNING,
5974
std::move(default_delay)
6075
)
61-
, NOTIFICATIONS(this->label(), true, true, ImageAttachmentMode::JPG, {"Notifs", "Showcase"})
76+
, NOTIFICATIONS(
77+
std::move(notification_label),
78+
true, true,
79+
ImageAttachmentMode::JPG,
80+
{"Notifs", "Showcase"}
81+
)
6282
{
6383
if (!DESCRIPTION.text().empty()){
6484
PA_ADD_OPTION(DESCRIPTION);

SerialPrograms/Source/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,12 @@ class ShinyDetectedActionOption : public GroupOption{
5555
std::string default_delay,
5656
ShinyDetectedAction default_action = ShinyDetectedAction::TAKE_VIDEO_STOP_PROGRAM
5757
);
58+
ShinyDetectedActionOption(
59+
std::string label, std::string description,
60+
std::string notification_label,
61+
std::string default_delay,
62+
ShinyDetectedAction default_action = ShinyDetectedAction::TAKE_VIDEO_STOP_PROGRAM
63+
);
5864

5965
bool stop_on_shiny() const;
6066

SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,13 @@ LeapGrinder::LeapGrinder()
113113
, SHINY_DETECTED_ENROUTE(
114114
"Enroute Shiny Action",
115115
"This applies if a shiny is detected while enroute to destination.",
116+
"Enroute Shiny Action",
116117
"0 ms"
117118
)
118119
, MATCH_DETECTED_OPTIONS(
119120
"Match Action",
120121
"What to do when the leaping Pokemon matches the *Stop On*.",
122+
"Found Shiny or Alpha",
121123
"0 ms"
122124
)
123125
, NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))

SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,13 @@ BurmyFinder::BurmyFinder()
100100
, SHINY_DETECTED_ENROUTE(
101101
"Enroute Shiny Action",
102102
"This applies if a shiny is detected while traveling in the overworld.",
103+
"Enroute Shiny Action",
103104
"0 ms"
104105
)
105106
, MATCH_DETECTED_OPTIONS(
106107
"Match Action",
107108
"What to do when a Burmy is found that matches the \"Stop On\" parameter.",
109+
"Found Shiny or Alpha",
108110
"0 ms"
109111
)
110112
, NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))

0 commit comments

Comments
 (0)