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

Prevent winning Talon's game without str0. Prevent starting Diving Game without Zora Jabbernut (#6324)

Browse source
This commit is contained in:
Philip Dubé 2026-03-04 15:35:45 +00:00 committed by GitHub
parent 7522f31cc8
commit 63597ec633
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
soh/soh/Enhancements/randomizer/ShuffleSpeak.cpp
View file

@ -93,6 +93,7 @@ void RegisterShuffleSpeak() {
case ACTOR_EN_SKJ:
inf = RAND_INF_CAN_SPEAK_KOKIRI;
break;
case ACTOR_EN_DIVING_GAME:
case ACTOR_EN_KZ:
case ACTOR_EN_RU1:
case ACTOR_EN_RU2:

2
soh/soh/Enhancements/randomizer/location_access/overworld/lon_lon_ranch.cpp
View file

@ -36,7 +36,7 @@ void RegionTable_Init_LonLonRanch() {
areaTable[RR_LLR_TALONS_HOUSE] = Region("LLR Talons House", SCENE_LON_LON_BUILDINGS, {}, {
//Locations
LOCATION(RC_LLR_TALONS_CHICKENS, logic->HasItem(RG_CHILD_WALLET) && logic->HasItem(RG_SPEAK_HYLIAN) && logic->IsChild && logic->AtDay && logic->HasItem(RG_ZELDAS_LETTER)),
LOCATION(RC_LLR_TALONS_CHICKENS, logic->HasItem(RG_CHILD_WALLET) && logic->HasItem(RG_SPEAK_HYLIAN) && logic->IsChild && logic->AtDay && logic->HasItem(RG_ZELDAS_LETTER) && logic->HasItem(RG_POWER_BRACELET)),
LOCATION(RC_LLR_TALONS_HOUSE_POT_1, logic->HasItem(RG_POWER_BRACELET) || logic->CanUseSword()), // TODO: CanBreakPots() restricted
LOCATION(RC_LLR_TALONS_HOUSE_POT_2, logic->HasItem(RG_POWER_BRACELET) || logic->CanUseSword()), // TODO: CanBreakPots() restricted
LOCATION(RC_LLR_TALONS_HOUSE_POT_3, logic->HasItem(RG_POWER_BRACELET) || logic->CanUseSword()), // TODO: CanBreakPots() restricted

2
soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c
View file

@ -697,7 +697,7 @@ void EnTa_RunCuccoGame(EnTa* this, PlayState* play) {
this->superCuccos[i]->actor.gravity -= 0.03f;
}
if (func_80B150AC(this, play, i)) {
if (!GameInteractor_Should(VB_PREVENT_STRENGTH, !func_80B150AC(this, play, i))) {
if (this->unk_2C4[i] > 0) {
this->unk_2C4[i]--;
} else {