Skip to content

Commit 9661aeb

Browse files
committed
minor desc. and log updates
1 parent 65f2518 commit 9661aeb

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

SerialPrograms/Source/PokemonSV/Options/PokemonSV_BBQOption.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,15 @@ std::unique_ptr<EditableTableRow> BBQuestTableRow::clone() const{
106106
BBQuestTable::BBQuestTable()
107107
: EditableTableOption_t<BBQuestTableRow>(
108108
"<b>Quest Exclusions:</b><br>"
109-
"Exclude the quests in the table. If you are experiencing an issue or want to skip a quest, select it below. "
110-
"Do not exclude too many quests, as rerolling will cost BP. "
109+
"<b>Warning: Skipping Bonus quests will block the bonus slot.</b><br>"
110+
"Exclude the quests in the table. If you want to skip a quest, select it below. "
111+
"(Quests can be explicitly included, but this is not necessary.) "
112+
"Do not exclude too many quests, as rerolling costs BP. "
111113
"The program will automatically reroll all quests if none are possible, but will not handle being out of BP. "
112-
"Does not include egg hatching quest, as that is handled in the other options. "
113-
"<b>Warning: Skipping Bonus quests will block the bonus slot.</b>",
114+
"Does not include egg hatching or pickup quests, as eggs are handled in other options and pickup is not possible. ",
115+
//"Duplicates of the same quest",
116+
//duplicates will work in table order. might lead to weird behavior like rerolling and then marking a quest as complete.
117+
//won't break the program though.
114118
LockMode::LOCK_WHILE_RUNNING,
115119
make_defaults()
116120
)

SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ std::vector<BBQuests> process_quest_list(
293293
bool quest_in_table = false;
294294
for(const std::unique_ptr<BBQuestTableRow>& row : exclusions_table){
295295
if(n == row->quest) {
296-
stream.log("Quest found in exclusions table.");
296+
stream.log("Quest found in inclusions/exclusions table.");
297297
quest_in_table = true;
298298

299299
WhiteButtonWatcher rp2(COLOR_BLUE, WhiteButton::ButtonB, {0.484, 0.117, 0.022, 0.037});
@@ -334,7 +334,7 @@ std::vector<BBQuests> process_quest_list(
334334
pbf_wait(context, 100);
335335
context.wait_for_all_requests();
336336

337-
//Prevent error and allows program to reread the rerolled quests
337+
//Prevent error/rerolling again at the end (allows program to read the rerolled quests)
338338
rerolled = true;
339339

340340
press_Bs_to_back_to_overworld(info, stream, context);
@@ -346,7 +346,7 @@ std::vector<BBQuests> process_quest_list(
346346
}
347347
}
348348
if(!quest_in_table){
349-
stream.log("Quest not in exclusions table. Adding to list.");
349+
stream.log("Quest not in inclusion/exclusions table. Adding to list.");
350350
quests_to_do.push_back(n);
351351
}
352352
}

0 commit comments

Comments
 (0)