Archive/Shipwright
0
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-04-28 21:27:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't unset Zelda's Letter.

Browse source
This commit is contained in:
Anthony Stewart 2025-03-20 20:31:31 -05:00
parent 8c9fe88a22
commit 4b5903940f
3 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
soh/soh/Enhancements/randomizer/hook_handlers.cpp
View file

@ -1615,13 +1615,6 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
} }
break; break;
} }
case VB_HEISHI2_ACCEPT_ITEM_AS_ZELDAS_LETTER: {
if (*should) {
//remove zelda's letter as this is the only use for it
Flags_UnsetRandomizerInf(RAND_INF_CHILD_TRADES_HAS_LETTER_ZELDA);
}
break;
}
case VB_FREEZE_ON_SKULL_TOKEN: case VB_FREEZE_ON_SKULL_TOKEN:
case VB_TRADE_TIMER_ODD_MUSHROOM: case VB_TRADE_TIMER_ODD_MUSHROOM:
case VB_TRADE_TIMER_FROG: case VB_TRADE_TIMER_FROG:

8
soh/soh/Enhancements/randomizer/logic.cpp
View file

@ -1346,8 +1346,8 @@ namespace Rando {
}; };
std::map<RandomizerGet, uint32_t> Logic::RandoGetToRandInf = { std::map<RandomizerGet, uint32_t> Logic::RandoGetToRandInf = {
{ RG_ZELDAS_LETTER, RAND_INF_ZELDAS_LETTER }, { RG_ZELDAS_LETTER, RAND_INF_CHILD_TRADES_HAS_LETTER_ZELDA },
{ RG_WEIRD_EGG, RAND_INF_WEIRD_EGG }, { RG_WEIRD_EGG, RAND_INF_CHILD_TRADES_HAS_WEIRD_EGG },
{ RG_GOHMA_SOUL, RAND_INF_GOHMA_SOUL }, { RG_GOHMA_SOUL, RAND_INF_GOHMA_SOUL },
{ RG_KING_DODONGO_SOUL, RAND_INF_KING_DODONGO_SOUL }, { RG_KING_DODONGO_SOUL, RAND_INF_KING_DODONGO_SOUL },
{ RG_BARINADE_SOUL, RAND_INF_BARINADE_SOUL }, { RG_BARINADE_SOUL, RAND_INF_BARINADE_SOUL },
@ -1497,10 +1497,10 @@ namespace Rando {
SetQuestItem(RandoGetToQuestItem.at(randoGet), state); SetQuestItem(RandoGetToQuestItem.at(randoGet), state);
break; break;
case RG_WEIRD_EGG: case RG_WEIRD_EGG:
SetRandoInf(RAND_INF_WEIRD_EGG, state); SetRandoInf(RAND_INF_CHILD_TRADES_HAS_WEIRD_EGG, state);
break; break;
case RG_ZELDAS_LETTER: case RG_ZELDAS_LETTER:
SetRandoInf(RAND_INF_ZELDAS_LETTER, state); SetRandoInf(RAND_INF_CHILD_TRADES_HAS_LETTER_ZELDA, state);
break; break;
case RG_DOUBLE_DEFENSE: case RG_DOUBLE_DEFENSE:
mSaveContext->isDoubleDefenseAcquired = state; mSaveContext->isDoubleDefenseAcquired = state;

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

@ -371,7 +371,6 @@ extern "C" void Randomizer_InitSaveFile() {
if (Randomizer_GetSettingValue(RSK_KAK_GATE) == RO_KAK_GATE_OPEN) { if (Randomizer_GetSettingValue(RSK_KAK_GATE) == RO_KAK_GATE_OPEN) {
Flags_SetInfTable(INFTABLE_SHOWED_ZELDAS_LETTER_TO_GATE_GUARD); Flags_SetInfTable(INFTABLE_SHOWED_ZELDAS_LETTER_TO_GATE_GUARD);
Flags_UnsetRandomizerInf(RAND_INF_CHILD_TRADES_HAS_LETTER_ZELDA);
} }
if (Randomizer_GetSettingValue(RSK_GERUDO_FORTRESS) == RO_GF_CARPENTERS_FAST || if (Randomizer_GetSettingValue(RSK_GERUDO_FORTRESS) == RO_GF_CARPENTERS_FAST ||