ihateninjas/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-04-23 08:14:31 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Don't refer to grass patch as bush (#6335)

Browse source 
Decomp refers to both kusa & wood02 as bushes, but for shuffles reserve bush for wood02
This commit is contained in:
Philip Dubé 2026-03-08 19:15:16 +00:00 committed by GitHub
parent 0f948efb51
commit 63859efa40
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
soh/soh/Enhancements/randomizer/option_descriptions.cpp
View file

@ -508,16 +508,16 @@ void Settings::CreateOptionDescriptions() {
"\n"
"This excludes gossip stones and magic bean locations.";
mOptionDescriptions[RSK_SHUFFLE_GRASS] =
"Grass/Bushes will drop a randomized item the first time they're cut and collected. "
"Grass/Bushes will have a different appearance when they hold a randomized item.\n"
"Grass will drop a randomized item the first time they're cut and collected. "
"Grass will have a different appearance when they hold a randomized item.\n"
"\n"
"Off - Grass/Bushes will not be shuffled.\n"
"Off - Grass will not be shuffled.\n"
"\n"
"Dungeons - Only shuffle grass/bushes that are within dungeons.\n"
"Dungeons - Only shuffle grass that are within dungeons.\n"
"\n"
"Overworld - Only shuffle grass/bushes that are outside of dungeons.\n"
"Overworld - Only shuffle grass that are outside of dungeons.\n"
"\n"
"All Grass/Bushes - Shuffle all grass/bushes.";
"All Grass - Shuffle all grass.";
mOptionDescriptions[RSK_SHUFFLE_DUNGEON_REWARDS] =
"Shuffles the location of Spiritual Stones and medallions.\n"
"Vanilla - Spiritual Stones and medallions will be given from their respective boss.\n"

2
soh/soh/Enhancements/randomizer/settings.cpp
View file

@ -840,7 +840,7 @@ void Settings::CreateOptions() {
OPT_BOOL(RSK_SHUFFLE_WEIRD_EGG, "Shuffle Weird Egg", CVAR_RANDOMIZER_SETTING("ShuffleWeirdEgg"), mOptionDescriptions[RSK_SHUFFLE_WEIRD_EGG]);
OPT_BOOL(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD, "Shuffle Gerudo Membership Card", CVAR_RANDOMIZER_SETTING("ShuffleGerudoToken"), mOptionDescriptions[RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD]);
OPT_U8(RSK_SHUFFLE_POTS, "Shuffle Pots", {"Off", "Dungeons", "Overworld", "All Pots"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShufflePots"), mOptionDescriptions[RSK_SHUFFLE_POTS], WIDGET_CVAR_COMBOBOX, RO_SHUFFLE_POTS_OFF);
OPT_U8(RSK_SHUFFLE_GRASS, "Shuffle Grass", {"Off", "Dungeons", "Overworld", "All Grass/Bushes"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleGrass"), mOptionDescriptions[RSK_SHUFFLE_GRASS], WIDGET_CVAR_COMBOBOX, RO_SHUFFLE_GRASS_OFF);
OPT_U8(RSK_SHUFFLE_GRASS, "Shuffle Grass", {"Off", "Dungeons", "Overworld", "All Grass"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleGrass"), mOptionDescriptions[RSK_SHUFFLE_GRASS], WIDGET_CVAR_COMBOBOX, RO_SHUFFLE_GRASS_OFF);
OPT_U8(RSK_SHUFFLE_CRATES, "Shuffle Crates", {"Off", "Dungeons", "Overworld", "All Crates"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleCrates"), mOptionDescriptions[RSK_SHUFFLE_CRATES], WIDGET_CVAR_COMBOBOX, RO_SHUFFLE_CRATES_OFF);
OPT_BOOL(RSK_SHUFFLE_TREES, "Shuffle Trees", CVAR_RANDOMIZER_SETTING("ShuffleTrees"), mOptionDescriptions[RSK_SHUFFLE_TREES]);
OPT_BOOL(RSK_SHUFFLE_BUSHES, "Shuffle Bushes", CVAR_RANDOMIZER_SETTING("ShuffleBushes"), mOptionDescriptions[RSK_SHUFFLE_BUSHES]);