mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-22 09:22:18 -05:00
Code Issues Projects Releases Wiki Activity

Add an option to always win the Goron spinning pot jackpot (#913)

Browse Source
This commit is contained in:
Josh Bodner 2022-07-24 13:00:54 -07:00 committed by GitHub
parent 62d9390c9b
commit ffb3523cb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libultraship/libultraship/ImGuiImpl.cpp
View File

@ -1021,6 +1021,8 @@ namespace SohImGui {
Tooltip("Disables random drops, except from the Goron Pot, Dampe, and bosses"); Tooltip("Disables random drops, except from the Goron Pot, Dampe, and bosses");
EnhancementCheckbox("No Heart Drops", "gNoHeartDrops"); EnhancementCheckbox("No Heart Drops", "gNoHeartDrops");
Tooltip("Disables heart drops, but not heart placements, like from a Deku Scrub running off\nThis simulates Hero Mode from other games in the series"); Tooltip("Disables heart drops, but not heart placements, like from a Deku Scrub running off\nThis simulates Hero Mode from other games in the series");
EnhancementCheckbox("Always Win Goron Pot", "gGoronPot");
Tooltip("Always get the heart piece/purple rupee from the spinning Goron pot");
if (ImGui::BeginMenu("Potion Values")) if (ImGui::BeginMenu("Potion Values"))
{ {

2
soh/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c
View File

@ -297,7 +297,7 @@ void func_808B7F74(BgSpot18Basket* this) {
shapeRotY = this->dyna.actor.shape.rot.y; shapeRotY = this->dyna.actor.shape.rot.y;
this->actionFunc = func_808B7FC0; this->actionFunc = func_808B7FC0;
if ((shapeRotY < -0x2E93) || (shapeRotY >= 0x7C19)) { if ((shapeRotY < -0x2E93) || (shapeRotY >= 0x7C19) || CVar_GetS32("gGoronPot", 0)) {
this->unk_218 = 2; this->unk_218 = 2;
} else if (shapeRotY < 0x26C2) { } else if (shapeRotY < 0x26C2) {
this->unk_218 = 1; this->unk_218 = 1;