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

fix warp song hints not being set if gossip stones are turned off (#2197)

Browse source
This commit is contained in:
Adam Bird 2022-12-17 20:06:23 -05:00 • committed by GitHub
commit c4b077d83b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
soh/soh/Enhancements/randomizer/3drando/fill.cpp
View file

@ -909,6 +909,9 @@ void VanillaFill() {
CreateItemOverrides(); CreateItemOverrides();
CreateEntranceOverrides(); CreateEntranceOverrides();
CreateAlwaysIncludedMessages(); CreateAlwaysIncludedMessages();
if (ShuffleWarpSongs) {
CreateWarpSongTexts();
}
} }
void ClearProgress() { void ClearProgress() {
@ -1071,6 +1074,9 @@ int Fill() {
if (ShuffleMerchants.Is(SHUFFLEMERCHANTS_HINTS)) { if (ShuffleMerchants.Is(SHUFFLEMERCHANTS_HINTS)) {
CreateMerchantsHints(); CreateMerchantsHints();
} }
if (ShuffleWarpSongs) {
CreateWarpSongTexts();
}
return 1; return 1;
} }
//Unsuccessful placement //Unsuccessful placement

1
soh/soh/Enhancements/randomizer/3drando/hints.cpp
View file

@ -779,7 +779,6 @@ void CreateAllHints() {
CreateGanonText(); CreateGanonText();
CreateAltarText(); CreateAltarText();
CreateWarpSongTexts();
SPDLOG_DEBUG("\nNOW CREATING HINTS\n"); SPDLOG_DEBUG("\nNOW CREATING HINTS\n");
const HintSetting& hintSetting = hintSettingTable[Settings::HintDistribution.Value<uint8_t>()]; const HintSetting& hintSetting = hintSettingTable[Settings::HintDistribution.Value<uint8_t>()];

1
soh/soh/Enhancements/randomizer/3drando/hints.hpp
View file

@ -220,6 +220,7 @@ extern std::array<ConditionalAlwaysHint, 9> conditionalAlwaysHints;
extern uint32_t GetHintRegionHintKey(const uint32_t area); extern uint32_t GetHintRegionHintKey(const uint32_t area);
extern void CreateAllHints(); extern void CreateAllHints();
extern void CreateMerchantsHints(); extern void CreateMerchantsHints();
extern void CreateWarpSongTexts();
Text& GetChildAltarText(); Text& GetChildAltarText();
Text& GetAdultAltarText(); Text& GetAdultAltarText();