mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-16 15:20:11 -05:00
Code Issues Projects Releases Wiki Activity

hintless altar text (#2456)

Browse Source 
Co-authored-by: briaguya <briaguya@alice>
This commit is contained in:
briaguya 2023-02-15 21:00:44 -05:00 committed by GitHub
parent 622d8c4aff
commit deb47ea430
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
soh/soh/Enhancements/randomizer/3drando/fill.cpp
View File

@ -1079,9 +1079,7 @@ int Fill() {
} }
//Always execute ganon hint generation for the funny line //Always execute ganon hint generation for the funny line
CreateGanonText(); CreateGanonText();
if (AltarHintText) { CreateAltarText(AltarHintText);
CreateAltarText();
}
if (DampeHintText) { if (DampeHintText) {
CreateDampesDiaryText(); CreateDampesDiaryText();
} }

60
soh/soh/Enhancements/randomizer/3drando/hints.cpp
View File

@ -678,37 +678,45 @@ static Text BuildGanonBossKeyText() {
return Text()+"$b"+ganonBossKeyText+"^"; return Text()+"$b"+ganonBossKeyText+"^";
} }
void CreateAltarText() { void CreateAltarText(Option withHints) {
//Child Altar Text //Child Altar Text
childAltarText = Hint(SPIRITUAL_STONE_TEXT_START).GetText()+"^"+ if (withHints) {
//Spiritual Stones childAltarText = Hint(SPIRITUAL_STONE_TEXT_START).GetText()+"^"+
(StartingKokiriEmerald.Value<uint8_t>() ? Text{ "##", "##", "##" } //Spiritual Stones
: BuildDungeonRewardText(KOKIRI_EMERALD)) + (StartingKokiriEmerald.Value<uint8_t>() ? Text{ "##", "##", "##" }
(StartingGoronRuby.Value<uint8_t>() ? Text{ "##", "##", "##" } : BuildDungeonRewardText(KOKIRI_EMERALD)) +
: BuildDungeonRewardText(GORON_RUBY)) + (StartingGoronRuby.Value<uint8_t>() ? Text{ "##", "##", "##" }
(StartingZoraSapphire.Value<uint8_t>() ? Text{ "##", "##", "##" } : BuildDungeonRewardText(GORON_RUBY)) +
: BuildDungeonRewardText(ZORA_SAPPHIRE)) + (StartingZoraSapphire.Value<uint8_t>() ? Text{ "##", "##", "##" }
//How to open Door of Time, the event trigger is necessary to read the altar multiple times : BuildDungeonRewardText(ZORA_SAPPHIRE)) +
BuildDoorOfTimeText(); //How to open Door of Time, the event trigger is necessary to read the altar multiple times
BuildDoorOfTimeText();
} else {
childAltarText = BuildDoorOfTimeText();
}
CreateMessageFromTextObject(0x7040, 0, 2, 3, AddColorsAndFormat(childAltarText, {QM_GREEN, QM_RED, QM_BLUE})); CreateMessageFromTextObject(0x7040, 0, 2, 3, AddColorsAndFormat(childAltarText, {QM_GREEN, QM_RED, QM_BLUE}));
//Adult Altar Text //Adult Altar Text
adultAltarText = Hint(ADULT_ALTAR_TEXT_START).GetText()+"^"+ adultAltarText = Hint(ADULT_ALTAR_TEXT_START).GetText() + "^";
//Medallion Areas if (withHints) {
(StartingLightMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" } adultAltarText = adultAltarText +
: BuildDungeonRewardText(LIGHT_MEDALLION)) + //Medallion Areas
(StartingForestMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" } (StartingLightMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" }
: BuildDungeonRewardText(FOREST_MEDALLION)) + : BuildDungeonRewardText(LIGHT_MEDALLION)) +
(StartingFireMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" } (StartingForestMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" }
: BuildDungeonRewardText(FIRE_MEDALLION)) + : BuildDungeonRewardText(FOREST_MEDALLION)) +
(StartingWaterMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" } (StartingFireMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" }
: BuildDungeonRewardText(WATER_MEDALLION)) + : BuildDungeonRewardText(FIRE_MEDALLION)) +
(StartingSpiritMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" } (StartingWaterMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" }
: BuildDungeonRewardText(SPIRIT_MEDALLION)) + : BuildDungeonRewardText(WATER_MEDALLION)) +
(StartingShadowMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" } (StartingSpiritMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" }
: BuildDungeonRewardText(SHADOW_MEDALLION)) + : BuildDungeonRewardText(SPIRIT_MEDALLION)) +
(StartingShadowMedallion.Value<uint8_t>() ? Text{ "##", "##", "##" }
: BuildDungeonRewardText(SHADOW_MEDALLION));
}
adultAltarText = adultAltarText +
//Bridge requirement //Bridge requirement
BuildBridgeReqsText()+ BuildBridgeReqsText()+

2
soh/soh/Enhancements/randomizer/3drando/hints.hpp
View File

@ -223,7 +223,7 @@ extern void CreateMerchantsHints();
extern void CreateWarpSongTexts(); extern void CreateWarpSongTexts();
extern void CreateDampesDiaryText(); extern void CreateDampesDiaryText();
extern void CreateGanonText(); extern void CreateGanonText();
extern void CreateAltarText(); extern void CreateAltarText(Option withHints);
Text& GetChildAltarText(); Text& GetChildAltarText();
Text& GetAdultAltarText(); Text& GetAdultAltarText();

2
soh/soh/OTRGlobals.cpp
View File

@ -1570,7 +1570,7 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
Randomizer_GetCheckFromActor(stone->id, play->sceneNum, actorParams); Randomizer_GetCheckFromActor(stone->id, play->sceneNum, actorParams);
messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, hintCheck); messageEntry = CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, hintCheck);
} else if ((textId == TEXT_ALTAR_CHILD || textId == TEXT_ALTAR_ADULT) && Randomizer_GetSettingValue(RSK_TOT_ALTAR_HINT)) { } else if ((textId == TEXT_ALTAR_CHILD || textId == TEXT_ALTAR_ADULT)) {
// rando hints at altar // rando hints at altar
messageEntry = (LINK_IS_ADULT) messageEntry = (LINK_IS_ADULT)
? CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, TEXT_ALTAR_ADULT) ? CustomMessageManager::Instance->RetrieveMessage(Randomizer::hintMessageTableID, TEXT_ALTAR_ADULT)