mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-23 01:42:19 -05:00
Code Issues Projects Releases Wiki Activity

Add bottle swipes to Fast Drops; rename to Skip Pickup Messages (#847)

Browse Source 
* Add bottle-swipes to Fast Drops; rename to Fast Pickups

* More freecam friendly

* Resolve freecam interaction

* Rename to "Skip Pickup Messages"
This commit is contained in:
vaguerant 2022-08-01 11:37:47 +10:00 committed by GitHub
parent b98c8b4abb
commit 361a986b8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libultraship/libultraship/ImGuiImpl.cpp
View File

@ -995,8 +995,8 @@ namespace SohImGui {
Tooltip("Wearing the Bunny Hood grants a speed\nincrease like in Majora's Mask"); Tooltip("Wearing the Bunny Hood grants a speed\nincrease like in Majora's Mask");
EnhancementCheckbox("Fast Chests", "gFastChests"); EnhancementCheckbox("Fast Chests", "gFastChests");
Tooltip("Kick open every chest"); Tooltip("Kick open every chest");
EnhancementCheckbox("Fast Drops", "gFastDrops"); EnhancementCheckbox("Skip Pickup Messages", "gFastDrops");
Tooltip("Skip first-time pickup messages for consumable items"); Tooltip("Skip pickup messages for new consumable items and bottle swipes");
EnhancementCheckbox("Better Owl", "gBetterOwl"); EnhancementCheckbox("Better Owl", "gBetterOwl");
Tooltip("The default response to Kaepora Gaebora is\nalways that you understood what he said"); Tooltip("The default response to Kaepora Gaebora is\nalways that you understood what he said");
EnhancementCheckbox("Fast Ocarina Playback", "gFastOcarinaPlayback"); EnhancementCheckbox("Fast Ocarina Playback", "gFastOcarinaPlayback");

9
soh/src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -13129,7 +13129,10 @@ void func_8084ECA4(Player* this, GlobalContext* globalCtx) {
if (LinkAnimation_Update(globalCtx, &this->skelAnime)) { if (LinkAnimation_Update(globalCtx, &this->skelAnime)) {
if (this->unk_84F != 0) { if (this->unk_84F != 0) {
if (this->unk_850 == 0) { if (this->unk_850 == 0) {
Message_StartTextbox(globalCtx, D_80854A04[this->unk_84F - 1].textId, &this->actor); if (CVar_GetS32("gFastDrops", 0))
{ this->unk_84F = 0; }
else
{ Message_StartTextbox(globalCtx, D_80854A04[this->unk_84F - 1].textId, &this->actor); }
Audio_PlayFanfare(NA_BGM_ITEM_GET | 0x900); Audio_PlayFanfare(NA_BGM_ITEM_GET | 0x900);
this->unk_850 = 1; this->unk_850 = 1;
} }
@ -13165,9 +13168,10 @@ void func_8084ECA4(Player* this, GlobalContext* globalCtx) {
if (i < 4) { if (i < 4) {
this->unk_84F = i + 1; this->unk_84F = i + 1;
this->unk_850 = 0; this->unk_850 = 0;
this->stateFlags1 |= PLAYER_STATE1_28 | PLAYER_STATE1_29;
this->interactRangeActor->parent = &this->actor; this->interactRangeActor->parent = &this->actor;
Player_UpdateBottleHeld(globalCtx, this, catchInfo->itemId, ABS(catchInfo->actionParam)); Player_UpdateBottleHeld(globalCtx, this, catchInfo->itemId, ABS(catchInfo->actionParam));
if (!CVar_GetS32("gFastDrops", 0)) {
this->stateFlags1 |= PLAYER_STATE1_28 | PLAYER_STATE1_29;
func_808322D0(globalCtx, this, sp24->unk_04); func_808322D0(globalCtx, this, sp24->unk_04);
func_80835EA4(globalCtx, 4); func_80835EA4(globalCtx, 4);
} }
@ -13176,6 +13180,7 @@ void func_8084ECA4(Player* this, GlobalContext* globalCtx) {
} }
} }
} }
}
if (this->skelAnime.curFrame <= 7.0f) { if (this->skelAnime.curFrame <= 7.0f) {
this->stateFlags1 |= PLAYER_STATE1_1; this->stateFlags1 |= PLAYER_STATE1_1;