mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-17 22:02:19 -05:00
Code Issues Projects Releases Wiki Activity

Fix boss hints and gift from sages hint. (#4634)

Browse Source
This commit is contained in:
Pepper0ni 2024-12-10 02:24:51 +00:00 committed by GitHub
parent f852d70767
commit 7d80d1c85d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 72 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2493,86 +2493,91 @@ void StaticData::HintTable_Init() {
/*--------------------------
| BOSS HINT TEXT |
---------------------------*/
hintTextTable[RHT_QUEEN_GOHMA] = HintText(CustomMessage("#Queen Gohma# holds",
/*german*/ "#Königin Gohma# hält",
/*french*/ "la #Reine Gohma# possède"),
// /*spanish*/la #Reina Goma# porta
//RANDOTODO check the beginning and end on the french and german translations
hintTextTable[RHT_QUEEN_GOHMA] = HintText(CustomMessage("They say that #Queen Gohma# holds #[[1]]#.",
/*german*/ "Man erzählt sich, daß #Königin Gohma# hält #[[1]]# lehre.",
/*french*/ "Selon moi, la #Reine Gohma# possède #[[1]]#.", {QM_RED, QM_GREEN}),
// /*spanish*/la #Reina Goma# porta #[[1]]#.
{},
{CustomMessage("the #Parasitic Armored Arachnid# holds",
/*german*/ "die #gepanzerte parasitäre Spinne# hält",
/*french*/ "le #monstre insectoïde géant# possède")});
// /*spanish*/el #arácnido parasitario acorazado# porta
{CustomMessage("They say that the #Parasitic Armored Arachnid# holds #[[1]]#.",
/*german*/ "Man erzählt sich, daß die #gepanzerte parasitäre Spinne# hält #[[1]]# lehre.",
/*french*/ "Selon moi, le #monstre insectoïde géant# possède #[[1]]#.", {QM_RED, QM_GREEN})});
// /*spanish*/el #arácnido parasitario acorazado# porta #[[1]]#.
hintTextTable[RHT_KING_DODONGO] = HintText(CustomMessage("#King Dodongo# holds",
/*german*/ "#König Dodongo# hält",
/*french*/ "le #Roi Dodongo# possède"),
// /*spanish*/el #Rey Dodongo# porta
hintTextTable[RHT_KING_DODONGO] = HintText(CustomMessage("They say that #King Dodongo# holds #[[1]]#.",
/*german*/ "Man erzählt sich, daß #König Dodongo# hält #[[1]]# lehre.",
/*french*/ "Selon moi, le #Roi Dodongo# possède #[[1]]#.", {QM_RED, QM_GREEN}),
// /*spanish*/el #Rey Dodongo# porta #[[1]]#.
{},
{CustomMessage("the #Infernal Dinosaur# holds",
/*german*/ "der #infernalische Dinosaurier# hält",
/*french*/ "le #dinosaure infernal# possède")});
// /*spanish*/el #dinosaurio infernal# porta
{CustomMessage("They say that the #Infernal Dinosaur# holds #[[1]]#.",
/*german*/ "Man erzählt sich, daß der #infernalische Dinosaurier# hält #[[1]]# lehre.",
/*french*/ "Selon moi, le #dinosaure infernal# possède #[[1]]#.", {QM_RED, QM_GREEN})});
// /*spanish*/el #dinosaurio infernal# porta #[[1]]#.
hintTextTable[RHT_BARINADE] = HintText(CustomMessage("#Barinade# holds",
/*german*/ "#Barinade# hält",
/*french*/ "#Barinade# possède"),
// /*spanish*/#Barinade# porta
hintTextTable[RHT_BARINADE] = HintText(CustomMessage("They say that #Barinade# holds #[[1]]#.",
/*german*/ "Man erzählt sich, daß #Barinade# hält #[[1]]# lehre.",
/*french*/ "Selon moi, #Barinade# possède #[[1]]#.", {QM_RED, QM_GREEN}),
// /*spanish*/#Barinade# porta #[[1]]#.
{},
{CustomMessage("the #Bio-Electric Anemone# holds",
/*german*/ "die #bioelektrische Anemone# hält",
/*french*/ "l'#anémone bioélectrique# possède")});
// /*spanish*/la #anémona bioeléctrica# porta
{CustomMessage("They say that the #Bio-Electric Anemone# holds #[[1]]#.",
/*german*/ "Man erzählt sich, daß die #bioelektrische Anemone# hält #[[1]]# lehre.",
/*french*/ "Selon moi, l'#anémone bioélectrique# possède #[[1]]#.", {QM_RED, QM_GREEN})});
// /*spanish*/la #anémona bioeléctrica# porta #[[1]]#.
hintTextTable[RHT_PHANTOM_GANON] = HintText(CustomMessage("#Phantom Ganon# holds",
/*german*/ "#Phantom-Ganon# hält",
/*french*/ "#Ganon Spectral# possède"),
// /*spanish*/#Ganon Fantasma# porta
hintTextTable[RHT_PHANTOM_GANON] = HintText(CustomMessage("They say that #Phantom Ganon# holds #[[1]]#.",
/*german*/ "Man erzählt sich, daß #Phantom-Ganon# hält #[[1]]# lehre.",
/*french*/ "Selon moi, #Ganon Spectral# possède #[[1]]#.", {QM_RED, QM_GREEN}),
// /*spanish*/#Ganon Fantasma# porta #[[1]]#.
{},
{CustomMessage("the #Evil Spirit from Beyond# holds",
/*german*/ "der #böse Geist aus dem Jenseits# hält",
/*french*/ "l'#esprit maléfique de l'au-delà# possède")});
// /*spanish*/el #espíritu maligno de ultratumba# porta
{CustomMessage("They say that the #Evil Spirit from Beyond# holds #[[1]]#.",
/*german*/ "Man erzählt sich, daß der #böse Geist aus dem Jenseits# hält #[[1]]# lehre.",
/*french*/ "Selon moi, l'#esprit maléfique de l'au-delà# possède #[[1]]#.", {QM_RED, QM_GREEN})});
// /*spanish*/el #espíritu maligno de ultratumba# porta #[[1]]#.
hintTextTable[RHT_VOLVAGIA] = HintText(CustomMessage("#Volvagia# holds",
/*german*/ "#Volvagia# hält",
/*french*/ "#Volvagia# possède"),
// /*spanish*/#Volvagia# porta
hintTextTable[RHT_VOLVAGIA] = HintText(CustomMessage("They say that #Volvagia# holds #[[1]]#.",
/*german*/ "Man erzählt sich, daß #Volvagia# hält #[[1]]# lehre.",
/*french*/ "Selon moi, #Volvagia# possède #[[1]]#.", {QM_RED, QM_GREEN}),
// /*spanish*/#Volvagia# porta #[[1]]#.
{},
{CustomMessage("the #Subterranean Lava Dragon# holds",
/*german*/ "der #subterrane Lavadrache# hält",
/*french*/ "le #dragon des profondeurs# possède")});
// /*spanish*/el #dragón de lava subterráneo# porta
{CustomMessage("They say that the #Subterranean Lava Dragon# holds #[[1]]#.",
/*german*/ "Man erzählt sich, daß der #subterrane Lavadrache# hält #[[1]]# lehre.",
/*french*/ "Selon moi, le #dragon des profondeurs# possède #[[1]]#.", {QM_RED, QM_GREEN})});
// /*spanish*/el #dragón de lava subterráneo# porta #[[1]]#.
hintTextTable[RHT_MORPHA] = HintText(CustomMessage("#Morpha# holds",
/*german*/ "#Morpha# hält",
/*french*/ "#Morpha# possède"),
// /*spanish*/#Morpha# porta
hintTextTable[RHT_MORPHA] = HintText(CustomMessage("They say that #Morpha# holds #[[1]]#.",
/*german*/ "Man erzählt sich, daß #Morpha# hält #[[1]]# lehre.",
/*french*/ "Selon moi, #Morpha# possède #[[1]]#.", {QM_RED, QM_GREEN}),
// /*spanish*/#Morpha# porta #[[1]]#.
{},
{CustomMessage("the #Giant Aquatic Amoeba# holds",
/*german*/ "die #gigantische aquatische Amöbe# hält",
/*french*/ "l'#amibe aquatique géante# possède")});
// /*spanish*/la #ameba acuática gigante# porta
{CustomMessage("They say that the #Giant Aquatic Amoeba# holds #[[1]]#.",
/*german*/ "Man erzählt sich, daß die #gigantische aquatische Amöbe# hält #[[1]]# lehre.",
/*french*/ "Selon moi, l'#amibe aquatique géante# possède #[[1]]#.", {QM_RED, QM_GREEN})});
// /*spanish*/la #ameba acuática gigante# porta #[[1]]#.
hintTextTable[RHT_BONGO_BONGO] = HintText(CustomMessage("#Bongo Bongo# holds",
/*german*/ "#Bongo Bongo# hält",
/*french*/ "#Bongo Bongo# possède"),
// /*spanish*/#Bongo Bongo# porta
hintTextTable[RHT_BONGO_BONGO] = HintText(CustomMessage("They say that #Bongo Bongo# holds #[[1]]#.",
/*german*/ "Man erzählt sich, daß #Bongo Bongo# hält #[[1]]# lehre.",
/*french*/ "Selon moi, #Bongo Bongo# possède #[[1]]#.", {QM_RED, QM_GREEN}),
// /*spanish*/#Bongo Bongo# porta #[[1]]#.
{},
{CustomMessage("the #Phantom Shadow Beast# holds",
/*german*/ "das #Phantomschattenbiest# hält",
/*french*/ "le #monstre de l'ombre# possède")});
// /*spanish*/la #alimaña oscura espectral# porta
{CustomMessage("They say that the #Phantom Shadow Beast# holds #[[1]]#.",
/*german*/ "Man erzählt sich, daß das #Phantomschattenbiest# hält #[[1]]# lehre.",
/*french*/ "Selon moi, le #monstre de l'ombre# possède #[[1]]#.", {QM_RED, QM_GREEN})});
// /*spanish*/la #alimaña oscura espectral# porta #[[1]]#.
hintTextTable[RHT_TWINROVA] = HintText(CustomMessage("#Twinrova# holds",
/*german*/ "#Twinrova# hält",
/*french*/ "#Twinrova# possède"),
// /*spanish*/#Birova# porta
hintTextTable[RHT_TWINROVA] = HintText(CustomMessage("They say that #Twinrova# holds #[[1]]#.",
/*german*/ "Man erzählt sich, daß #Twinrova# hält #[[1]]# lehre.",
/*french*/ "Selon moi, #Twinrova# possède #[[1]]#.", {QM_RED, QM_GREEN}),
// /*spanish*/#Birova# porta #[[1]]#.
{},
{CustomMessage("the #Sorceress Sisters# hold",
/*german*/ "die #Hexenschwestern# halten",
/*french*/ "#les sorcières jumelles# possède")});
// /*spanish*/las #hermanas hechiceras# portan
{CustomMessage("They say that the #Sorceress Sisters# hold #[[1]]#.",
/*german*/ "Man erzählt sich, daß die #Hexenschwestern# halten #[[1]]# lehre.",
/*french*/ "Selon moi, #les sorcières jumelles# possède #[[1]]#.", {QM_RED, QM_GREEN})});
// /*spanish*/las #hermanas hechiceras# portan #[[1]]#.
hintTextTable[RHT_GIFT_FROM_SAGES] = HintText(CustomMessage("They say that the #Sage of Light# gifts @ #[[1]]#.", {QM_RED, QM_GREEN}),
{},
{CustomMessage("They say that #a former owl# gifts @ #[[1]]#.", {QM_RED, QM_GREEN})});
/*--------------------------
| BRIDGE HINT TEXT |
---------------------------*/

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

@ -818,7 +818,7 @@ void Rando::StaticData::InitLocationTable() { //
locationTable[RC_TWINROVA] = Location::Base(RC_TWINROVA, RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, ACTOR_DOOR_WARP1, SCENE_SPIRIT_TEMPLE_BOSS, 0x00, "Twinrova", "Twinrova", RHT_TWINROVA, RG_SPIRIT_MEDALLION, SpoilerCollectionCheck::RandomizerInf(RAND_INF_DUNGEONS_DONE_SPIRIT_TEMPLE), true);
locationTable[RC_BONGO_BONGO] = Location::Base(RC_BONGO_BONGO, RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, ACTOR_DOOR_WARP1, SCENE_SHADOW_TEMPLE_BOSS, 0x00, "Bongo Bongo", "Bongo Bongo", RHT_BONGO_BONGO, RG_SHADOW_MEDALLION, SpoilerCollectionCheck::RandomizerInf(RAND_INF_DUNGEONS_DONE_SHADOW_TEMPLE), true);
locationTable[RC_GANON] = Location::Base(RC_GANON, RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, ACTOR_DOOR_WARP1, SCENE_GANON_BOSS, 0x00, "Ganon", "Ganon", RHT_NONE, RG_TRIFORCE);
locationTable[RC_GIFT_FROM_SAGES] = Location::Base(RC_GIFT_FROM_SAGES, RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_MARKET, ACTOR_ID_MAX, SCENE_ID_MAX, 0x00, "Gift from Raoru", "Gift from Raoru", RHT_NONE, RG_LIGHT_MEDALLION, SpoilerCollectionCheck::EventChkInf(0xC9), true);
locationTable[RC_GIFT_FROM_SAGES] = Location::Base(RC_GIFT_FROM_SAGES, RCQUEST_BOTH, RCTYPE_DUNGEON_REWARD, RCAREA_MARKET, ACTOR_ID_MAX, SCENE_ID_MAX, 0x00, "Gift from Raoru", "Gift from Raoru", RHT_GIFT_FROM_SAGES, RG_LIGHT_MEDALLION, SpoilerCollectionCheck::EventChkInf(0xC9), true);
// Heart Containers
locationTable[RC_DEKU_TREE_QUEEN_GOHMA_HEART] = Location::Base(RC_DEKU_TREE_QUEEN_GOHMA_HEART, RCQUEST_BOTH, RCTYPE_BOSS_HEART_OR_OTHER_REWARD, ACTOR_ITEM_B_HEART, SCENE_DEKU_TREE_BOSS, 0x00, "Queen Gohma Heart Container", RHT_DEKU_TREE_QUEEN_GOHMA_HEART, RG_HEART_CONTAINER, SpoilerCollectionCheck::Collectable(0x11, 0x1F), true);

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

@ -2661,6 +2661,7 @@ typedef enum {
RHT_MORPHA,
RHT_BONGO_BONGO,
RHT_TWINROVA,
RHT_GIFT_FROM_SAGES,
RHT_SONG_FROM_IMPA,
RHT_SONG_FROM_MALON,
RHT_SONG_FROM_SARIA,