github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-19 21:03:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Split Skip Pickup Messages

Browse source 
following ZFG's comment https://youtube.com/clip/UgkxF-LDaR-zyTkqSkqtP3dkLrCca_KGScIw?si=RJY9SIG8QKSiWgVl

splits the Skip Pickup Messages time saver for consumables and bottle pickups
This commit is contained in:
OtherBlue 2025-07-02 21:01:42 -03:00
commit c95eb9fe6d
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
soh/soh/SohGui/SohMenuEnhancements.cpp
View file

@ -353,9 +353,12 @@ void SohMenu::AddMenuEnhancements() {
"Door Switch CS, Water Temple Dragon Switch CS, and the Box Skip One Point in Jabu."));
AddWidget(path, "Text", WIDGET_SEPARATOR_TEXT);
AddWidget(path, "Skip Pickup Messages", WIDGET_CVAR_CHECKBOX)
AddWidget(path, "Skip Bottle Pickup Messages", WIDGET_CVAR_CHECKBOX)
.CVar(CVAR_ENHANCEMENT("FastDrops"))
.Options(CheckboxOptions().Tooltip("Skip Pickup Messages for new Consumable Items and Bottle Swipes."));
.Options(CheckboxOptions().Tooltip("Skip Pickup Messages for Bottle Swipes."));
AddWidget(path, "Skip Consumable Item Pickup Messages", WIDGET_CVAR_CHECKBOX)
.CVar(CVAR_ENHANCEMENT("FastConsumables"))
.Options(CheckboxOptions().Tooltip("Skip Pickup Messages for new Consumable Items."));
AddWidget(path, "Skip Forced Dialog", WIDGET_CVAR_COMBOBOX)
.CVar(CVAR_ENHANCEMENT("TimeSavers.SkipForcedDialog"))
.Options(ComboboxOptions()

2
soh/src/overlays/actors/ovl_player_actor/z_player.c
View file

@ -7353,7 +7353,7 @@ s32 Player_ActionHandler_2(Player* this, PlayState* play) {
// Skip cutscenes from picking up consumables with "Fast Pickup Text" enabled, even when the player
// never picked it up before. But only for bushes/rocks/enemies because otherwise it can lead to
// softlocks in deku mask theatre and potentially other places.
uint8_t skipItemCutscene = CVarGetInteger(CVAR_ENHANCEMENT("FastDrops"), 0) && isDropToSkip;
uint8_t skipItemCutscene = CVarGetInteger(CVAR_ENHANCEMENT("FastConsumables"), 0) && isDropToSkip;
// Same as above but for rando. Rando is different because we want to enable cutscenes for items that
// the player already has because those items could be a randomized item coming from scrubs,