mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

QPA restoration (#2422)

This commit is contained in:
Sirius902 2023-01-30 05:43:30 -08:00 committed by GitHub
parent f6c310ae84
commit 544460d909
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
soh/soh/Enhancements/presets.h
View File

@ -157,6 +157,7 @@ const std::vector<const char*> enhancementsCvars = {
"gHoverFishing",
"gN64WeirdFrames",
"gBombchusOOB",
"gQuickPutaway",
"gGsCutscene",
"gSkipSaveConfirmation",
"gAutosave",
@ -359,6 +360,8 @@ const std::vector<PresetEntry> vanillaPlusPresetEntries = {
PRESET_ENTRY_S32("gN64WeirdFrames", 1),
// Bombchus out of bounds
PRESET_ENTRY_S32("gBombchusOOB", 1),
// Quick Putaway
PRESET_ENTRY_S32("gQuickPutaway", 1),
// Skip save confirmation
PRESET_ENTRY_S32("gSkipSaveConfirmation", 1),
};
@ -424,6 +427,8 @@ const std::vector<PresetEntry> enhancedPresetEntries = {
PRESET_ENTRY_S32("gN64WeirdFrames", 1),
// Bombchus out of bounds
PRESET_ENTRY_S32("gBombchusOOB", 1),
// Quick Putaway
PRESET_ENTRY_S32("gQuickPutaway", 1),
// Skip save confirmation
PRESET_ENTRY_S32("gSkipSaveConfirmation", 1),
// Biggoron Forge Time (0 to 3)
@ -538,6 +543,8 @@ const std::vector<PresetEntry> randomizerPresetEntries = {
PRESET_ENTRY_S32("gN64WeirdFrames", 1),
// Bombchus out of bounds
PRESET_ENTRY_S32("gBombchusOOB", 1),
// Quick Putaway
PRESET_ENTRY_S32("gQuickPutaway", 1),
// Skip save confirmation
PRESET_ENTRY_S32("gSkipSaveConfirmation", 1),
// Biggoron Forge Time (0 to 3)

2
soh/soh/GameMenuBar.cpp
View File

@ -794,6 +794,8 @@ namespace GameMenuBar {
UIWidgets::Tooltip("Restores N64 Weird Frames allowing weirdshots to behave the same as N64");
UIWidgets::PaddedEnhancementCheckbox("Bombchus out of bounds", "gBombchusOOB", true, false);
UIWidgets::Tooltip("Allows bombchus to explode out of bounds\nSimilar to GameCube and Wii VC");
UIWidgets::PaddedEnhancementCheckbox("Quick Putaway", "gQuickPutaway", true, false);
UIWidgets::Tooltip("Restore a bug from NTSC 1.0 that allows putting away an item without an animation and performing Putaway Ocarina Items");
UIWidgets::PaddedEnhancementCheckbox("Restore old Gold Skulltula cutscene", "gGsCutscene", true, false);
ImGui::EndMenu();

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

@ -2167,7 +2167,7 @@ void func_808340DC(Player* this, PlayState* play) {
}
void func_80834298(Player* this, PlayState* play) {
if ((this->actor.category == ACTORCAT_PLAYER) && !(this->stateFlags1 & PLAYER_STATE1_8) &&
if ((this->actor.category == ACTORCAT_PLAYER) && (CVarGetInteger("gQuickPutaway", 0) || !(this->stateFlags1 & PLAYER_STATE1_8)) &&
((this->heldItemAction == this->itemAction) || (this->stateFlags1 & PLAYER_STATE1_22)) &&
(gSaveContext.health != 0) && (play->csCtx.state == CS_STATE_IDLE) && (this->csMode == 0) &&
(play->shootingGalleryStatus == 0) && (play->activeCamera == MAIN_CAM) &&