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

fix mido

Browse source
This commit is contained in:
Demur Rumed 2025-08-02 04:06:11 +00:00
commit 0bc8d47492
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
soh/soh/Enhancements/TimeSavers/SkipMiscInteractions/MoveMidoInKokiriForest.cpp
View file

@ -19,7 +19,9 @@ void RegisterMoveMidoInKokiriForest() {
VB_MOVE_MIDO_IN_KOKIRI_FOREST, CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO), { VB_MOVE_MIDO_IN_KOKIRI_FOREST, CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions"), IS_RANDO), {
if (!Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD) && if (!Flags_GetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD) &&
(CUR_EQUIP_VALUE(EQUIP_TYPE_SHIELD) == EQUIP_VALUE_SHIELD_DEKU) && (CUR_EQUIP_VALUE(EQUIP_TYPE_SHIELD) == EQUIP_VALUE_SHIELD_DEKU) &&
(CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD) == EQUIP_VALUE_SWORD_KOKIRI) && gSaveContext.cutsceneIndex == 0) { (CUR_EQUIP_VALUE(EQUIP_TYPE_SWORD) == EQUIP_VALUE_SWORD_KOKIRI) && gSaveContext.cutsceneIndex == 0 &&
!(IS_RANDO && RAND_GET_OPTION(RSK_SHUFFLE_SPEAK) &&
!Flags_GetRandomizerInf(RAND_INF_CAN_SPEAK_KOKIRI))) {
Flags_SetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD); Flags_SetEventChkInf(EVENTCHKINF_SHOWED_MIDO_SWORD_SHIELD);
*should = true; *should = true;
} }

1
soh/soh/Enhancements/TimeSavers/SkipMiscInteractions/SkipChildRutoInteractions.cpp
View file

@ -11,7 +11,6 @@ Actor* func_80AEB124(PlayState* play);
void Ru1Init(void* actorRef) { void Ru1Init(void* actorRef) {
if (IS_RANDO && RAND_GET_OPTION(RSK_SHUFFLE_SPEAK) && !Flags_GetRandomizerInf(RAND_INF_CAN_SPEAK_ZORA)) { if (IS_RANDO && RAND_GET_OPTION(RSK_SHUFFLE_SPEAK) && !Flags_GetRandomizerInf(RAND_INF_CAN_SPEAK_ZORA)) {
// require zora jabbernut
return; return;
} }

6
soh/soh/Enhancements/randomizer/randomizer.cpp
View file

@ -5716,13 +5716,11 @@ void Randomizer::CreateCustomMessages() {
"Du hast die %rBronzene Schuppe%w&erhalten! Die Fähigkeit zu&Schwimmen ist nun dein!", "Du hast die %rBronzene Schuppe%w&erhalten! Die Fähigkeit zu&Schwimmen ist nun dein!",
"Vous obtenez l'%rÉcaille de Bronze%w!&Le pouvoir de la flottabilité est&à vous!"), "Vous obtenez l'%rÉcaille de Bronze%w!&Le pouvoir de la flottabilité est&à vous!"),
GIMESSAGE(RG_SPEAK_DEKU, ITEM_NUT, "You got the %rDeku Jabbernut%w!&Use your words!", "!!!", "!!!"), GIMESSAGE(RG_SPEAK_DEKU, ITEM_NUT, "You got the %rDeku Jabbernut%w!&Use your words!", "!!!", "!!!"),
GIMESSAGE(RG_SPEAK_GERUDO, ITEM_NUT, "You got the %rGerudo Jabbernut%w!&Use your words!", "!!!", GIMESSAGE(RG_SPEAK_GERUDO, ITEM_NUT, "You got the %rGerudo Jabbernut%w!&Use your words!", "!!!", "!!!"),
"!!!"),
GIMESSAGE(RG_SPEAK_GORON, ITEM_NUT, "You got the %rGoron Jabbernut%w!&Use your words!", "!!!", "!!!"), GIMESSAGE(RG_SPEAK_GORON, ITEM_NUT, "You got the %rGoron Jabbernut%w!&Use your words!", "!!!", "!!!"),
GIMESSAGE(RG_SPEAK_HYLIAN, ITEM_NUT, GIMESSAGE(RG_SPEAK_HYLIAN, ITEM_NUT,
"You got the %rHylian Jabbernut%w!&Use your words! You can also speak with owls.", "!!!", "!!!"), "You got the %rHylian Jabbernut%w!&Use your words! You can also speak with owls.", "!!!", "!!!"),
GIMESSAGE(RG_SPEAK_KOKIRI, ITEM_NUT, "You got the %rKokiri Jabbernut%w!&Use your words!", "!!!", GIMESSAGE(RG_SPEAK_KOKIRI, ITEM_NUT, "You got the %rKokiri Jabbernut%w!&Use your words!", "!!!", "!!!"),
"!!!"),
GIMESSAGE(RG_SPEAK_ZORA, ITEM_NUT, "You got the %rZora Jabbernut%w!&Use your words!", "!!!", "!!!"), GIMESSAGE(RG_SPEAK_ZORA, ITEM_NUT, "You got the %rZora Jabbernut%w!&Use your words!", "!!!", "!!!"),
GIMESSAGE(RG_FISHING_POLE, ITEM_FISHING_POLE, "You found a lost %rFishing Pole%w!&Time to hit the pond!", GIMESSAGE(RG_FISHING_POLE, ITEM_FISHING_POLE, "You found a lost %rFishing Pole%w!&Time to hit the pond!",
"Du hast eine verlorene %rAngelrute%w&gefunden!&Zeit, im Teich&zu angeln!", "Du hast eine verlorene %rAngelrute%w&gefunden!&Zeit, im Teich&zu angeln!",