Skip to content

feat: Include other forms to be shuffled in treasure chest minigame. #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PhlexPlexico merged 1 commit into from
Oct 10, 2026
Merged

feat: Include other forms to be shuffled in treasure chest minigame. #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Z3DR
Open in desktop
Submodule Z3DR updated 13 files
+2 −0 code/include/game/actor.h
+3 −0 code/include/game/common_data.h
+9 −10 code/include/game/items.h
+22 −0 code/include/rnd/actors/en_fu.h
+33 −0 code/include/rnd/actors/item00.h
+2 −0 code/include/rnd/item_override.h
+5 −5 code/source/game/items.cpp
+2 −0 code/source/rnd/actors/en_box.cpp
+18 −0 code/source/rnd/actors/en_fu.cpp
+2 −2 code/source/rnd/actors/en_girla.cpp
+26 −19 code/source/rnd/item_override.cpp
+6 −6 code/source/rnd/item_table.cpp
+2 −2 code/source/rnd/shops.cpp
36 changes: 18 additions & 18 deletions source/hint_list.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 8 additions & 7 deletions source/item_location.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand All @@ -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
Expand Down Expand Up @@ -823,9 +824,9 @@ std::vector<LocationKey> 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,
Expand Down
3 changes: 3 additions & 0 deletions source/location_access.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading