Skip to content

Commit

Permalink
Update to develop-rando
Browse files Browse the repository at this point in the history
  • Loading branch information
@aMannus
aMannus committed Aug 20, 2024
1 parent 42d0aea commit ba44727
Show file tree
Hide file tree
Showing 9 changed files with 124 additions and 143 deletions.
92 changes: 42 additions & 50 deletions soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,10 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
/*french*/ "Selon moi, la #peste Mojo au coeur de la Caverne Dodongo# vend #[[1]]#.", {QM_RED, QM_GREEN}));
// /*spanish*/ Según dicen, un #deku custodiado por Lizalfos# vende #[[1]]#.

hintTextTable[RHT_POT_DODONGOS_CAVERN] = HintText(CustomMessage("They say that a #pot in Dodongo's Cavern# contains #[[1]]#.",
/*german*/ "",
/*french*/ "", {QM_RED, QM_GREEN}));

/*--------------------------
| JABU JABUS BELLY |
---------------------------*/
Expand Down Expand Up @@ -421,6 +425,11 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
/*german*/ "",
/*french*/ "Selon moi, la #peste Mojo dans le ventre du gardien# vend #[[1]]#.", {QM_RED, QM_GREEN}));
// /*spanish*/ Según dicen, un #deku dentro de cierta deidad# vende #[[1]]#.

hintTextTable[RHT_POT_JABU_JABUS_BELLY] = HintText(CustomMessage("They say that a #pot in Jabu Jabu's Belly# contains #[[1]]#.",
/*german*/ "",
/*french*/ "", {QM_RED, QM_GREEN}));

/*--------------------------
| FOREST TEMPLE |
---------------------------*/
Expand Down Expand Up @@ -638,10 +647,15 @@ hintTextTable[RHT_DODONGOS_CAVERN_BOSS_ROOM_CHEST] = HintText(CustomMessage("The
/*german*/ "",
/*french*/ "Selon moi, une #Skulltula dans le jardin du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
// /*spanish*/ Según dicen, una #Skulltula en un borde# del Templo del Bosque otorga #[[1]]#.
hintTextTable[RHT_FOREST_TEMPLE_MQ_GS_WELL] = HintText(CustomMessage("They say that #draining a well# in Forest Temple uncovers a spider with #[[1]]#.",
hintTextTable[RHT_FOREST_TEMPLE_MQ_GS_WELL] = HintText(CustomMessage("They say that #draining a well# in Forest Temple uncovers a spider with #[[1]]#.",
/*german*/ "",
/*french*/ "Selon moi, une #Skulltula au fond du Puits du Temple de la Forêt# a #[[1]]#.", {QM_RED, QM_GREEN}));
// /*spanish*/ Según dicen, #vaciar el pozo# del Templo del Bosque desvela una Skulltula que otorga #[[1]]#.

hintTextTable[RHT_POT_FOREST_TEMPLE] = HintText(CustomMessage("They say that a #pot in Forest Temple# contains #[[1]]#.",
/*german*/ "",
/*french*/ "", {QM_RED, QM_GREEN}));


/*--------------------------
| FIRE TEMPLE |
Expand Down Expand Up @@ -831,6 +845,10 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
/*french*/ "Selon moi, une #Skulltula près du labyrinthe enflammé du Temple du Feu# a #[[1]]#.", {QM_RED, QM_GREEN}));
// /*spanish*/ Según dicen, una #Skulltula junto a un ardiente laberinto# otorga #[[1]]#.

hintTextTable[RHT_POT_FIRE_TEMPLE] = HintText(CustomMessage("They say that a #pot in Fire Temple# contains #[[1]]#.",
/*german*/ "",
/*french*/ "", {QM_RED, QM_GREEN}));

/*--------------------------
| WATER TEMPLE |
---------------------------*/
Expand Down Expand Up @@ -958,6 +976,10 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
/*french*/ "Selon moi, une #Skulltula au dessus de la rivière du Temple de l'Eau# a #[[1]]#.", {QM_RED, QM_GREEN}));
// /*spanish*/ Según dicen, una #Skulltula sobre un río# del Templo del Agua otorga #[[1]]#.

hintTextTable[RHT_POT_WATER_TEMPLE] = HintText(CustomMessage("They say that a #pot in Water Temple# contains #[[1]]#.",
/*german*/ "",
/*french*/ "", {QM_RED, QM_GREEN}));

/*--------------------------
| SPIRIT TEMPLE |
---------------------------*/
Expand Down Expand Up @@ -1191,6 +1213,10 @@ hintTextTable[RHT_FIRE_TEMPLE_NEAR_BOSS_CHEST] = HintText(CustomMessage("They sa
/*french*/ "Selon moi, une #Skulltula sur une paroi de verre du Temple de l'Esprit# a #[[1]]#.", {QM_RED, QM_GREEN}));
// /*spanish*/ Según dicen, #sobre una plataforma de cristal# yace una Skulltula que otorga #[[1]]#.

hintTextTable[RHT_POT_SPIRIT_TEMPLE] = HintText(CustomMessage("They say that a #pot in Spirit Temple# contains #[[1]]#.",
/*german*/ "",
/*french*/ "", {QM_RED, QM_GREEN}));

/*--------------------------
| SHADOW TEMPLE |
---------------------------*/
Expand Down Expand Up @@ -1434,6 +1460,10 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
/*french*/ "Selon moi, une #Skulltula près du repère du Temple de l'Ombre# a #[[1]]#.", {QM_RED, QM_GREEN}));
// /*spanish*/ Según dicen, una #Skulltula flotante# del Templo de las Sombras otorga #[[1]]#.

hintTextTable[RHT_POT_SHADOW_TEMPLE] = HintText(CustomMessage("They say that a #pot in Shadow Temple# contains #[[1]]#.",
/*german*/ "",
/*french*/ "", {QM_RED, QM_GREEN}));

/*--------------------------
| BOTTOM OF THE WELL |
---------------------------*/
Expand Down Expand Up @@ -1552,6 +1582,10 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
/*french*/ "Selon moi, une #Skulltula embarrée dans la crypte au fonds du Puits# a #[[1]]#.", {QM_RED, QM_GREEN}));
// /*spanish*/ Según dicen, una #Skulltula encerrada en una cripta# del pozo otorga #[[1]]#.

hintTextTable[RHT_POT_BOTTOM_OF_THE_WELL] = HintText(CustomMessage("They say that a #pot in Bottom of the Well# contains #[[1]]#.",
/*german*/ "",
/*french*/ "", {QM_RED, QM_GREEN}));

/*--------------------------
| ICE CAVERN |
---------------------------*/
Expand Down Expand Up @@ -1625,6 +1659,10 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
/*french*/ "Selon moi, une #Skulltula figée dans la glace rouge# a #[[1]]#.", {QM_RED, QM_GREEN}));
// /*spanish*/ Según dicen, una #Skulltula tras un ardiente hielo# otorga #[[1]]#.

hintTextTable[RHT_POT_ICE_CAVERN] = HintText(CustomMessage("They say that a #pot in Ice Cavern# contains #[[1]]#.",
/*german*/ "",
/*french*/ "", { QM_RED, QM_GREEN }));

/*--------------------------
| GERUDO TRAINING GROUNDS |
---------------------------*/
Expand Down Expand Up @@ -1996,54 +2034,8 @@ hintTextTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say th
/*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
// /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.

hintTable[RHT_POT_DODONGOS_CAVERN] = HintText::Exclude({
//obscure text
Text{ "a #pot in Dodongo's Cavern# contains", /*french*/ "TRANSLATION NEEDED", /*spanish*/ "" },
});

hintTable[RHT_POT_JABU_JABUS_BELLY] = HintText::Exclude({
//obscure text
Text{ "a #pot in Jabu Jabu's Belly# contains", /*french*/ "TRANSLATION NEEDED", /*spanish*/ "" },
});

hintTable[RHT_POT_FOREST_TEMPLE] = HintText::Exclude({
//obscure text
Text{ "a #pot in Forest Temple# contains", /*french*/ "TRANSLATION NEEDED", /*spanish*/ "" },
});

hintTable[RHT_POT_FIRE_TEMPLE] = HintText::Exclude({
//obscure text
Text{ "a #pot in Fire Temple# contains", /*french*/ "TRANSLATION NEEDED", /*spanish*/ "" },
});

hintTable[RHT_POT_WATER_TEMPLE] = HintText::Exclude({
//obscure text
Text{ "a #pot in Water Temple# contains", /*french*/ "TRANSLATION NEEDED", /*spanish*/ "" },
});

hintTable[RHT_POT_SHADOW_TEMPLE] = HintText::Exclude({
//obscure text
Text{ "a #pot in Shadow Temple# contains", /*french*/ "TRANSLATION NEEDED", /*spanish*/ "" },
});

hintTable[RHT_POT_SPIRIT_TEMPLE] = HintText::Exclude({
//obscure text
Text{ "a #pot in Spirit Temple# contains", /*french*/ "TRANSLATION NEEDED", /*spanish*/ "" },
});

hintTable[RHT_POT_GANONS_CASTLE] = HintText::Exclude({
//obscure text
Text{ "a #pot in Ganon's Castle# contains", /*french*/ "TRANSLATION NEEDED", /*spanish*/ "" },
});

hintTable[RHT_POT_BOTTOM_OF_THE_WELL] = HintText::Exclude({
//obscure text
Text{ "a #pot in Bottom of the Well# contains", /*french*/ "TRANSLATION NEEDED", /*spanish*/ "" },
});

hintTable[RHT_POT_ICE_CAVERN] = HintText::Exclude({
//obscure text
Text{ "a #pot in Ice Cavern# contains", /*french*/ "TRANSLATION NEEDED", /*spanish*/ "" },
});
hintTextTable[RHT_POT_GANONS_CASTLE] = HintText(CustomMessage("They say that a #pot in Ganon's Castle# contains #[[1]]#.",
/*german*/ "",
/*french*/ "", {QM_RED, QM_GREEN}));
}
}
115 changes: 51 additions & 64 deletions soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_overworld.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1488,69 +1488,56 @@ void StaticData::HintTable_Init_Exclude_Overworld() {
/*french*/ "Selon moi, #[[1]]#.", {QM_RED, QM_GREEN}));
// /*spanish*/ Según dicen, una #colmena detrás del rey de los zoras# esconde #[[1]]#.

hintTable[RHT_POT_KOKIRI_FOREST] = HintText::Exclude({
// obscure text
Text{ "a #pot in Kokiri Forest# contains", /*french*/ "TRANSLATION NEEDED", /*spanish*/ "" },
});

hintTable[RHT_POT_GERUDO_FORTRESS] = HintText::Exclude({
// obscure text
Text{ "a #pot in Gerudo Fortress# contains", /*french*/ "TRANSLATION NEEDED", /*spanish*/ "" },
});

hintTable[RHT_POT_WASTELAND] = HintText::Exclude({
// obscure text
Text{ "a #pot in Haunted Wasteland# contains", /*french*/ "TRANSLATION NEEDED", /*spanish*/ "" },
});

hintTable[RHT_POT_MARKET] = HintText::Exclude({
// obscure text
Text{ "a #pot in Market# contains", /*french*/ "TRANSLATION NEEDED", /*spanish*/ "" },
});

hintTable[RHT_POT_KAKARIKO] = HintText::Exclude({
// obscure text
Text{ "a #pot in Kakariko Village# contains", /*french*/ "TRANSLATION NEEDED", /*spanish*/ "" },
});

hintTable[RHT_POT_GRAVEYARD] = HintText::Exclude({
// obscure text
Text{ "a #pot in Graveyard# contains", /*french*/ "TRANSLATION NEEDED", /*spanish*/ "" },
});

hintTable[RHT_POT_GORON_CITY] = HintText::Exclude({
// obscure text
Text{ "a #pot in Goron City# contains", /*french*/ "TRANSLATION NEEDED", /*spanish*/ "" },
});

hintTable[RHT_POT_DEATH_MOUNTAIN_CRATER] = HintText::Exclude({
// obscure text
Text{ "a #pot in Death Mountain Crater# contains", /*french*/ "TRANSLATION NEEDED", /*spanish*/ "" },
});

hintTable[RHT_POT_ZORAS_DOMAIN] = HintText::Exclude({
// obscure text
Text{ "a #pot in Zora's Domain# contains", /*french*/ "TRANSLATION NEEDED", /*spanish*/ "" },
});

hintTable[RHT_POT_ZORAS_FOUNTAIN] = HintText::Exclude({
// obscure text
Text{ "a #pot in Zora's Fountain# contains", /*french*/ "TRANSLATION NEEDED", /*spanish*/ "" },
});

hintTable[RHT_POT_LON_LON_RANCH] = HintText::Exclude({
// obscure text
Text{ "a #pot in Lon Lon Ranch# contains", /*french*/ "TRANSLATION NEEDED", /*spanish*/ "" },
});

hintTable[RHT_POT_HYRULE_FIELD] = HintText::Exclude({
// obscure text
Text{ "a #pot in Hyrule Field# contains", /*french*/ "TRANSLATION NEEDED", /*spanish*/ "" },
});

hintTable[RHT_POT_HYRULE_CASTLE] = HintText::Exclude({
// obscure text
Text{ "a #pot in Hyrule Castle# contains", /*french*/ "TRANSLATION NEEDED", /*spanish*/ "" },
});
hintTextTable[RHT_POT_KOKIRI_FOREST] = HintText(CustomMessage("They say that a #pot in Kokiri Forest# contains #[[1]]#.",
/*german*/ "",
/*french*/ "", {QM_RED, QM_GREEN}));

hintTextTable[RHT_POT_GERUDO_FORTRESS] = HintText(CustomMessage("They say that a #pot in Gerudo Fortress# contains #[[1]]#.",
/*german*/ "",
/*french*/ "", {QM_RED, QM_GREEN}));

hintTextTable[RHT_POT_WASTELAND] = HintText(CustomMessage("They say that a #pot in Haunted Wasteland# contains #[[1]]#.",
/*german*/ "",
/*french*/ "", {QM_RED, QM_GREEN}));

hintTextTable[RHT_POT_MARKET] = HintText(CustomMessage("They say that a #pot in Market# contains #[[1]]#.",
/*german*/ "",
/*french*/ "", {QM_RED, QM_GREEN}));

hintTextTable[RHT_POT_KAKARIKO] = HintText(CustomMessage("They say that a #pot in Kakariko Village# contains #[[1]]#.",
/*german*/ "",
/*french*/ "", {QM_RED, QM_GREEN}));

hintTextTable[RHT_POT_GRAVEYARD] = HintText(CustomMessage("They say that a #pot in Graveyard# contains #[[1]]#.",
/*german*/ "",
/*french*/ "", {QM_RED, QM_GREEN}));

hintTextTable[RHT_POT_GORON_CITY] = HintText(CustomMessage("They say that a #pot in Goron City# contains #[[1]]#.",
/*german*/ "",
/*french*/ "", {QM_RED, QM_GREEN}));

hintTextTable[RHT_POT_DEATH_MOUNTAIN_CRATER] = HintText(CustomMessage("They say that a #pot in Death Mountain Crater# contains #[[1]]#.",
/*german*/ "",
/*french*/ "", {QM_RED, QM_GREEN}));

hintTextTable[RHT_POT_ZORAS_DOMAIN] = HintText(CustomMessage("They say that a #pot in Zora's Domain# contains #[[1]]#.",
/*german*/ "",
/*french*/ "", {QM_RED, QM_GREEN}));

hintTextTable[RHT_POT_ZORAS_FOUNTAIN] = HintText(CustomMessage("They say that a #pot in Zora's Fountain# contains #[[1]]#.",
/*german*/ "",
/*french*/ "", {QM_RED, QM_GREEN}));

hintTextTable[RHT_POT_LON_LON_RANCH] = HintText(CustomMessage("They say that a #pot in Lon Lon Ranch# contains #[[1]]#.",
/*german*/ "",
/*french*/ "", {QM_RED, QM_GREEN}));

hintTextTable[RHT_POT_HYRULE_FIELD] = HintText(CustomMessage("They say that a #pot in Hyrule Field# contains #[[1]]#.",
/*german*/ "",
/*french*/ "", {QM_RED, QM_GREEN}));

hintTextTable[RHT_POT_HYRULE_CASTLE] = HintText(CustomMessage("They say that a #pot in Hyrule Castle# contains #[[1]]#.",
/*german*/ "",
/*french*/ "", {QM_RED, QM_GREEN}));
}
}
4 changes: 2 additions & 2 deletions soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ void AreaTable_Init_CastleTown() {
//Locations
LOCATION(RC_MARKET_10_BIG_POES, logic->IsAdult && logic->BigPoeKill),
LOCATION(RC_MARKET_GS_GUARD_HOUSE, logic->IsChild),
LocationAccess(RC_MK_GUARD_HOUSE_CHILD_POT_1, {[]{return logic->CanBreakPots;}}),
LocationAccess(RC_MK_GUARD_HOUSE_CHILD_POT_2, {[]{return logic->CanBreakPots;}}),
LOCATION(RC_MK_GUARD_HOUSE_CHILD_POT_1, logic->CanBreakPots),
LOCATION(RC_MK_GUARD_HOUSE_CHILD_POT_2, logic->CanBreakPots),
}, {
//Exits
Entrance(RR_MARKET_ENTRANCE, {[]{return true;}}),
Expand Down
Loading

0 comments on commit ba44727

Please sign in to comment.