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

Fix build

This commit is contained in:
Pepe20129 2024-05-16 17:48:50 +02:00
parent 6b6b83e638
commit 5b411d6135
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
View File

@ -2752,6 +2752,9 @@ void StaticData::HintTable_Init() {
/*french*/ "As-tu récemment ressenti une vague de #puissance magique#? Un mystérieux hibou m'a dit qu'elle provenait du #[[1]]#. Tu devrais aller y jeter un coup d'oeil, @!\x0B",
{QM_GREEN, QM_RED}, {}, TEXTBOX_TYPE_BLUE));
hintTextTable[RHT_LOACH_HINT] = HintText(CustomMessage("What?^You wanna know about the&%rHyrule Loach%w?^It's a big fish, but it's so rare that&I'll give my %g[[1]]%w&to anyone who catches it. Seriously!",
{QM_RED}));
hintTextTable[RHT_FISHING_POLE_HINT] = HintText(CustomMessage("^If I remember correctly, I lost it somewhere in #[[1]]#...&Let me know if you find it!",
{QM_RED}));

2
soh/soh/Enhancements/randomizer/randomizerTypes.h
View File

@ -2064,6 +2064,7 @@ typedef enum {
RH_ALTAR_CHILD,
RH_ALTAR_ADULT,
RH_SARIA_HINT,
RH_LOACH_HINT,
RH_FISHING_POLE,
RH_MINUET_WARP_LOC,
RH_BOLERO_WARP_LOC,
@ -3425,6 +3426,7 @@ typedef enum {
RHT_GREG_HINT,
RHT_SARIA_TALK_HINT,
RHT_SARIA_SONG_HINT,
RHT_LOACH_HINT,
RHT_FISHING_POLE_HINT,
// Static Entrance Hints
RHT_WARP_SONG,

2
soh/soh/Enhancements/randomizer/static_data.cpp
View File

@ -71,6 +71,7 @@ std::unordered_map<uint32_t, CustomMessage> StaticData::hintNames = {
{RH_ALTAR_CHILD, CustomMessage("ToT Altar as Child")},
{RH_ALTAR_ADULT, CustomMessage("ToT Altar as Adult")},
{RH_SARIA_HINT, CustomMessage("Saria's Magic Hint")},
{RH_LOACH_HINT, CustomMessage("Loach Hint")},
{RH_FISHING_POLE, CustomMessage("Fishing Pole Hint")},
{RH_MINUET_WARP_LOC, CustomMessage("Minuet of Forest Destination")},
{RH_BOLERO_WARP_LOC, CustomMessage("Bolero of Fire Destination")},
@ -197,6 +198,7 @@ std::unordered_map<RandomizerHint, StaticHintInfo> StaticData::staticHintInfoMap
{RH_DAMPES_DIARY, StaticHintInfo(HINT_TYPE_AREA, {RHT_DAMPE_DIARY}, RSK_DAMPES_DIARY_HINT, true, {}, {RG_PROGRESSIVE_HOOKSHOT}, {RC_DAMPE_HINT})},
{RH_GREG_RUPEE, StaticHintInfo(HINT_TYPE_AREA, {RHT_GREG_HINT}, RSK_GREG_HINT, true, {}, {RG_GREG_RUPEE}, {RC_GREG_HINT})},
{RH_SARIA_HINT, StaticHintInfo(HINT_TYPE_AREA, {RHT_SARIA_TALK_HINT, RHT_SARIA_SONG_HINT}, RSK_SARIA_HINT, true, {}, {RG_PROGRESSIVE_MAGIC_METER}, {RC_SARIA_SONG_HINT, RC_SONG_FROM_SARIA}, true)},
{RH_LOACH_HINT, StaticHintInfo(HINT_TYPE_AREA, {RHT_LOACH_HINT}, RSK_SARIA_HINT, true, {RC_LH_HYRULE_LOACH})},
{RH_FISHING_POLE, StaticHintInfo(HINT_TYPE_AREA, {RHT_FISHING_POLE_HINT}, RSK_FISHING_POLE_HINT, true, {}, {RG_FISHING_POLE}, {RC_FISHING_POLE_HINT}, true)},
{RH_MEDIGORON, StaticHintInfo(HINT_TYPE_MERCHANT, {RHT_MEDIGORON_HINT}, RSK_SHUFFLE_MERCHANTS, (uint8_t)RO_SHUFFLE_MERCHANTS_ON_HINT, {RC_GC_MEDIGORON})},
{RH_GRANNY, StaticHintInfo(HINT_TYPE_MERCHANT, {RHT_GRANNY_HINT}, RSK_SHUFFLE_MERCHANTS, (uint8_t)RO_SHUFFLE_MERCHANTS_ON_HINT, {RC_KAK_GRANNYS_SHOP})},

3
soh/soh/SaveManager.cpp
View File

@ -324,6 +324,9 @@ void SaveManager::LoadRandomizerVersion2() {
std::string sariaText;
SaveManager::Instance->LoadData("sariaText", sariaText);
randoContext->AddHint(RH_SARIA_HINT, Rando::Hint(RH_SARIA_HINT, {CustomMessage(sariaText)}));
std::string loachText;
SaveManager::Instance->LoadData("loachText", loachText);
randoContext->AddHint(RH_LOACH_HINT, Rando::Hint(RH_LOACH_HINT, {CustomMessage(loachText)}));
std::string fishingPoleText;
SaveManager::Instance->LoadData("fishingPoleText", fishingPoleText);
randoContext->AddHint(RH_FISHING_POLE, Rando::Hint(RH_FISHING_POLE, {CustomMessage(fishingPoleText)}));