diff --git a/Z3DR b/Z3DR index ec23d00..b147e93 160000 --- a/Z3DR +++ b/Z3DR @@ -1 +1 @@ -Subproject commit ec23d006a6ddfe9fefc8d0bcef6b9f8b037de953 +Subproject commit b147e93d8dc601f4a5276c977e6ee673a5443bb9 diff --git a/source/hint_list.cpp b/source/hint_list.cpp index 319ca28..3c9efbd 100644 --- a/source/hint_list.cpp +++ b/source/hint_list.cpp @@ -1207,24 +1207,24 @@ void HintTable_Init() { // }, //clear // Text{"#Honey and Darling's Shop's daily reward# is", "le #prix quotidien de l’arcade des amoureux# est", "la recompensa diaria en el juego de Honey y Darling es", "die tägliche Belohnung vom #Spielecenter Liebling und Schätzchen# ist", "", "le #prix quotidien du manège des amoureux# est", ""} //); - //hintTable[E_CLOCK_TOWN_TREASURE_CHEST_GAME_HUMAN] = HintText::Sometimes({ - // //obscure - // Text{"**ENGLISH**", "une #partie à 20 rubis# offre", "un juego del tesoro recompensa con", "ein #Menschenschatzspiel# entlohnt"} - // }, //clear - // Text{"the #Treasure Chest Game's reward for Hylians# is", "le #prix pour humains du Coffre au trésor# est", "la recompensa para Hylianos en el juego del Cofre del Tesoro es", "die Belohnung beim #Truhenspiel für Hylianer# ist", "", "le #prix pour humains de la chasse au trésors# est", ""} - //); - //hintTable[E_CLOCK_TOWN_TREASURE_CHEST_GAME_ZORA] = HintText::Sometimes({ - // //obscure - // Text{"**ENGLISH**", "une #partie à 10 rubis# offre", "un juego del tesoro recompensa con", "ein #Zora-Schatzspiel# entlohnt"} - // }, //clear - // Text{"the #Treasure Chest Game's reward for Zoras# is", "le #prix pour zoras du Coffre au trésor# est", "la recompensa para Zoras en el juego del Cofre del Tesoro es", "die Belohnung beim #Truhenspiel für Zoras# ist", "", "le #prix pour zoras de la chasse au trésors# est", ""} - //); - //hintTable[E_CLOCK_TOWN_TREASURE_CHEST_GAME_DEKU] = HintText::Sometimes({ - // //obscure - // Text{"**ENGLISH**", "une #partie à 5 rubis# offre", "un juego del tesoro recompensa con", "ein #Deku-Schatzspiel# entlohnt"} - // }, //clear - // Text{"the #Treasure Chest Game's reward for Dekus# is", "le #prix pour pestes mojo du Coffre au trésor# est", "la recompensa para Dekus en el juego del Cofre del Tesoro es", "die Belohnung beim #Truhenspiel für Dekus# ist", "", "le #prix pour pestes mojo de la chasse au trésors# est", ""} - //); + hintTable[E_CLOCK_TOWN_TREASURE_CHEST_GAME_HUMAN] = HintText::Sometimes({ + //obscure + Text{"a #20-rupee treasure game# rewards", "une #partie à 20 rubis# offre", "un juego del tesoro recompensa con", "ein #Menschenschatzspiel# entlohnt"} + }, //clear + Text{"the #Treasure Chest Game's reward for Hylians# is", "le #prix pour humains du Coffre au trésor# est", "la recompensa para Hylianos en el juego del Cofre del Tesoro es", "die Belohnung beim #Truhenspiel für Hylianer# ist", "", "le #prix pour humains de la chasse au trésors# est", ""} + ); + hintTable[E_CLOCK_TOWN_TREASURE_CHEST_GAME_ZORA] = HintText::Sometimes({ + //obscure + Text{"a #10-rupee treasure game# rewards", "une #partie à 10 rubis# offre", "un juego del tesoro recompensa con", "ein #Zora-Schatzspiel# entlohnt"} + }, //clear + Text{"the #Treasure Chest Game's reward for Zoras# is", "le #prix pour zoras du Coffre au trésor# est", "la recompensa para Zoras en el juego del Cofre del Tesoro es", "die Belohnung beim #Truhenspiel für Zoras# ist", "", "le #prix pour zoras de la chasse au trésors# est", ""} + ); + hintTable[E_CLOCK_TOWN_TREASURE_CHEST_GAME_DEKU] = HintText::Sometimes({ + //obscure + Text{"a #5-rupee treasure game# rewards", "une #partie à 5 rubis# offre", "un juego del tesoro recompensa con", "ein #Deku-Schatzspiel# entlohnt"} + }, //clear + Text{"the #Treasure Chest Game's reward for Dekus# is", "le #prix pour pestes mojo du Coffre au trésor# est", "la recompensa para Dekus en el juego del Cofre del Tesoro es", "die Belohnung beim #Truhenspiel für Dekus# ist", "", "le #prix pour pestes mojo de la chasse au trésors# est", ""} + ); //Goron Village hintTable[GORON_VILLAGE_POWDER_KEG_CHALLENGE] = HintText::Sometimes({ //obscure diff --git a/source/item_location.cpp b/source/item_location.cpp index a0285dd..505515c 100644 --- a/source/item_location.cpp +++ b/source/item_location.cpp @@ -38,7 +38,11 @@ void LocationTable_Init() { locationTable[E_CLOCK_TOWN_MAYOR] = ItemLocation::Base (0x12, 0x0C, false, "ECT Mayor Reward", E_CLOCK_TOWN_MAYOR, PIECE_OF_HEART, {Category::cEastClockTown, Category::cVanillaHeartPiece ,Category::cDayOne, Category::cNoOcarinaStart}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_E_CLOCK_TOWN ); locationTable[E_CLOCK_TOWN_ARCHERY_2] = ItemLocation::Base (0x20, 0x0C, false, "ECT Archery #2", E_CLOCK_TOWN_ARCHERY_2, PIECE_OF_HEART, {Category::cEastClockTown, Category::cMinigame , Category::cVanillaHeartPiece,Category::cDayOne, Category::cNoOcarinaStart}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_E_CLOCK_TOWN ); locationTable[E_CLOCK_TOWN_HONEY_DARLING_3DAYS] = ItemLocation::Base (0x11, 0x0C, false, "ECT Honey and Darling 3 Days", E_CLOCK_TOWN_HONEY_DARLING_3DAYS, PIECE_OF_HEART, {Category::cEastClockTown, Category::cMinigame , Category::cVanillaHeartPiece,Category::cDayThree, Category::cNoOcarinaStart}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_E_CLOCK_TOWN ); - locationTable[E_CLOCK_TOWN_TREASURE_CHEST_GAME_GORON] = ItemLocation::Chest (0x17, 0x00, true, "ECT Treasure Chest Game (Goron)", E_CLOCK_TOWN_TREASURE_CHEST_GAME_GORON, PIECE_OF_HEART, {Category::cEastClockTown, Category::cMinigame, Category::cVanillaHeartPiece,Category::cDayOne, Category::cNoOcarinaStart}, SpoilerCollectionCheckGroup::GROUP_E_CLOCK_TOWN ); + locationTable[E_CLOCK_TOWN_TREASURE_CHEST_GAME_GORON] = ItemLocation::Chest (0x17, 0x01, true, "ECT Treasure Chest Game (Goron)", E_CLOCK_TOWN_TREASURE_CHEST_GAME_GORON, PIECE_OF_HEART, {Category::cEastClockTown, Category::cMinigame, Category::cVanillaHeartPiece,Category::cDayOne, Category::cNoOcarinaStart}, SpoilerCollectionCheckGroup::GROUP_E_CLOCK_TOWN ); + locationTable[E_CLOCK_TOWN_TREASURE_CHEST_GAME_ZORA] = ItemLocation::Chest (0x17, 0x02, true, "ECT Treasure Chest Game (Zora)", E_CLOCK_TOWN_TREASURE_CHEST_GAME_ZORA, RED_RUPEE, {Category::cEastClockTown, Category::cMinigame,Category::cDayOne, Category::cNoOcarinaStart}, SpoilerCollectionCheckGroup::GROUP_E_CLOCK_TOWN ); + locationTable[E_CLOCK_TOWN_TREASURE_CHEST_GAME_DEKU] = ItemLocation::Chest (0x17, 0x03, true, "ECT Treasure Chest Game (Deku)", E_CLOCK_TOWN_TREASURE_CHEST_GAME_DEKU, DEKU_NUTS_10, {Category::cEastClockTown, Category::cMinigame,Category::cDayOne, Category::cNoOcarinaStart}, SpoilerCollectionCheckGroup::GROUP_E_CLOCK_TOWN ); + locationTable[E_CLOCK_TOWN_TREASURE_CHEST_GAME_HUMAN] = ItemLocation::Chest (0x17, 0x04, true, "ECT Treasure Chest Game (Human)", E_CLOCK_TOWN_TREASURE_CHEST_GAME_HUMAN, PURPLE_RUPEE, {Category::cEastClockTown, Category::cMinigame,Category::cDayOne, Category::cNoOcarinaStart}, SpoilerCollectionCheckGroup::GROUP_E_CLOCK_TOWN ); + locationTable[E_CLOCK_TOWN_POSTMAN_FREEDOM] = ItemLocation::Base (0x6C, 0x84, false, "ECT Postman's Freedom", E_CLOCK_TOWN_POSTMAN_FREEDOM, POSTMANS_HAT, {Category::cEastClockTown, Category::cVanillaMask,Category::cDayThree}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_E_CLOCK_TOWN ); locationTable[E_CLOCK_TOWN_GORMAN] = ItemLocation::Base (0x15, 0x83, false, "ECT Milk Bar Gorman", E_CLOCK_TOWN_GORMAN, CIRCUS_LEADERS_MASK, {Category::cEastClockTown, Category::cVanillaMask,Category::cDayOne}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_E_CLOCK_TOWN ); locationTable[E_CLOCK_TOWN_AROMA_IN_OFFICE] = ItemLocation::Base (0x12, 0x8F, false, "ECT Mayor's Office Madame Aroma", E_CLOCK_TOWN_AROMA_IN_OFFICE, KAFEIS_MASK, {Category::cEastClockTown, Category::cDayOne, Category::cAnjuAndKafei}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_E_CLOCK_TOWN ); @@ -47,9 +51,6 @@ void LocationTable_Init() { locationTable[E_CLOCK_TOWN_MILK_BAR_CHATEAU] = ItemLocation::Base (0x15, 0x91, true, "Milk Bar Chateau Buy", E_CLOCK_TOWN_MILK_BAR_CHATEAU, CHATEAU_ROMANI_REFILL, {Category::cEastClockTown, Category::cDayOne, Category::cShop}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_E_CLOCK_TOWN ); locationTable[E_CLOCK_TOWN_MILK_BAR_MILK] = ItemLocation::Base (0x15, 0x92, true, "Milk Bar Milk Buy", E_CLOCK_TOWN_MILK_BAR_MILK, MILK, {Category::cEastClockTown, Category::cDayOne, Category::cShop}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_E_CLOCK_TOWN ); //locationTable[E_CLOCK_TOWN_HONEY_DARLING_ANY_DAY] = ItemLocation::Base (0x11, 0x00, true, "Honey and Darling Any Day", E_CLOCK_TOWN_HONEY_DARLING_ANY_DAY, PURPLE_RUPEE, {Category::cEClockTown,Category::cMinigame}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_E_CLOCK_TOWN ); - //locationTable[E_CLOCK_TOWN_TREASURE_CHEST_GAME_HUMAN] = ItemLocation::Base (0x17, 0x00, true, "Treasure Chest Game (Human)", E_CLOCK_TOWN_TREASURE_CHEST_GAME_HUMAN PURPLE_RUPEE, {Category::cEClockTown,Category::cMinigame,Category::cDayOne}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_E_CLOCK_TOWN ); - //locationTable[E_CLOCK_TOWN_TREASURE_CHEST_GAME_ZORA] = ItemLocation::Base (0x17, 0x00, true, "Treasure Chest Game (Zora)", E_CLOCK_TOWN_TREASURE_CHEST_GAME_ZORA, RED_RUPEE, {Category::cEClockTown,Category::cMinigame ,Category::cDayOne}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_E_CLOCK_TOWN ); - //locationTable[E_CLOCK_TOWN_TREASURE_CHEST_GAME_DEKU] = ItemLocation::Base (0x17, 0x00, true, "Treasure Chest Game (Deku)", E_CLOCK_TOWN_TREASURE_CHEST_GAME_DEKU, DEKU_NUTS_10, {Category::cEClockTown,Category::cMinigame,Category::cDayOne}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_E_CLOCK_TOWN ); locationTable[E_CLOCK_TOWN_POSTBOX] = ItemLocation::Base (0x6C, 0xBA, false, "ECT Postbox", E_CLOCK_TOWN_POSTBOX, PIECE_OF_HEART, {Category::cEastClockTown, Category::cVanillaHeartPiece,Category::cDayOne, Category::cNoOcarinaStart, Category::cAlternateCheck}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_E_CLOCK_TOWN ); //Goron Village @@ -823,9 +824,9 @@ std::vector overworldLocations = { E_CLOCK_TOWN_MILK_BAR_MILK, GORMAN_TRACK_MYSTERY_MILK_QUEST, //E_CLOCK_TOWN_HONEY_DARLING_ANY_DAY, - //E_CLOCK_TOWN_TREASURE_CHEST_GAME_HUMAN, - //E_CLOCK_TOWN_TREASURE_CHEST_GAME_ZORA, - //E_CLOCK_TOWN_TREASURE_CHEST_GAME_DEKU, + E_CLOCK_TOWN_TREASURE_CHEST_GAME_HUMAN, + E_CLOCK_TOWN_TREASURE_CHEST_GAME_ZORA, + E_CLOCK_TOWN_TREASURE_CHEST_GAME_DEKU, E_CLOCK_TOWN_SF, //Goron Village GORON_VILLAGE_POWDER_KEG_CHALLENGE, diff --git a/source/location_access.cpp b/source/location_access.cpp index 939597f..d0ae186 100644 --- a/source/location_access.cpp +++ b/source/location_access.cpp @@ -409,6 +409,9 @@ void AreaTable_Init() { { //Locations LocationAccess(E_CLOCK_TOWN_TREASURE_CHEST_GAME_GORON, {[] {return GoronMask;}}), + LocationAccess(E_CLOCK_TOWN_TREASURE_CHEST_GAME_ZORA, {[] {return ZoraMask;}}), + LocationAccess(E_CLOCK_TOWN_TREASURE_CHEST_GAME_DEKU, {[] {return DekuMask;}}), + LocationAccess(E_CLOCK_TOWN_TREASURE_CHEST_GAME_HUMAN, {[] {return true;}}), }, { //Exits