Skip to content

fix: logic and vanilla shop item fixes #227

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

Closed
GonzaloJMora wants to merge 1 commit into from
Closed

fix: logic and vanilla shop item fixes #227

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
6 changes: 6 additions & 0 deletions source/hint_list.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3885,6 +3885,12 @@ void HintTable_Init() {
}, //clear
Text{"the Stone Tower Temple", "le temple de la forteresse de pierre", "el Templo de la Torre de Piedra", "den Felsenturm-Tempel"}
);
hintTable[GIANTS_OATH_AREA] = HintText::DungeonName({
//obscure
Text{"an oath", "un serment", "un juramento", "ein Schwur"}
}, //clear
Text{"the Oath to Order", "l'Ode de l'appel", "la oda al orden", "den Gesang des Himmels"}
);
hintTable[PIRATE_FORTRESS] = HintText::DungeonName({
//obscure
Text{"the home of pirates", "le foyer des pirates", "el hogar de las piratas", "die Heimat der Piraten"}
Expand Down
1 change: 1 addition & 0 deletions source/include/keys.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,6 +931,7 @@ typedef enum {
STONE_TOWER_TEMPLE_INVERTED_THIN_BRIDGE_ROOM,
STONE_TOWER_TEMPLE_PRE_BOSS_ROOM,
STONE_TOWER_TEMPLE_BOSS_ROOM,
GIANTS_OATH_AREA,
PIRATE_FORTRESS_EXTERIOR,
PIRATE_FORTRESS_MAZE_ROOM,
PIRATE_FORTRESS_CAGE_ROOM,
Expand Down
4 changes: 2 additions & 2 deletions source/item_list.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,8 @@ void ItemTable_Init() {
itemTable[GREEN_POTION_REFILL] = Item(false, &noVariable, Text{"Green Potion Refill", "Potion verte", "Recarga de poción verde", "Grünes Elixir", }, GREEN_POTION_REFILL, (u32)GetItemID::GI_POTION_GREEN, ITEMTYPE_REFILL);
itemTable[BLUE_POTION_REFILL] = Item(true, &RedOrBluePotionAccess, Text{"Blue Potion Refill", "Potion bleue", "Recarga de poción azul", "Blaues Elixir", }, BLUE_POTION_REFILL, (u32)GetItemID::GI_POTION_BLUE, ITEMTYPE_REFILL);
//Shop Items (&logicVar = Price?)
itemTable[BUY_ARROWS_10] = Item(false, &noVariable, Text{"Buy Arrows (10)", "Acheter: Flèches (10)", "Comprar flechas (10)", "Kaufe 10 Pfeile", }, BUY_ARROWS_10, (u32)GetItemID::GI_ARROWS_MEDIUM, ITEMTYPE_SHOP);
itemTable[BUY_ARROWS_30] = Item(false, &noVariable, Text{"Buy Arrows (30)", "Acheter: Flèches (30)", "Comprar flechas (30)", "Kaufe 30 Pfeile", }, BUY_ARROWS_30, (u32)GetItemID::GI_ARROWS_LARGE, ITEMTYPE_SHOP);
itemTable[BUY_ARROWS_10] = Item(false, &noVariable, Text{"Buy Arrows (10)", "Acheter: Flèches (10)", "Comprar flechas (10)", "Kaufe 10 Pfeile", }, BUY_ARROWS_10, (u32)GetItemID::GI_ARROWS_SMALL, ITEMTYPE_SHOP);
itemTable[BUY_ARROWS_30] = Item(false, &noVariable, Text{"Buy Arrows (30)", "Acheter: Flèches (30)", "Comprar flechas (30)", "Kaufe 30 Pfeile", }, BUY_ARROWS_30, (u32)GetItemID::GI_ARROWS_MEDIUM, ITEMTYPE_SHOP);
itemTable[BUY_DEKU_NUT_10] = Item(false, &noVariable, Text{"Buy Deku Nut (10)", "Acheter: Noix Mojos (10)", "Comprar nueces deku (10)", "Kaufe 10 Deku-Nüsse", "", "Acheter: Noix Mojo (10)", "" }, BUY_DEKU_NUT_10, (u32)GetItemID::GI_NUTS_10, ITEMTYPE_SHOP);
itemTable[BUY_DEKU_STICK_1] = Item(false, &noVariable, Text{"Buy Deku Stick (1)", "Acheter: Bâton Mojo (1)", "Comprar palos deku (1)", "Kaufe einen Deku-Stab", }, BUY_DEKU_STICK_1, (u32)GetItemID::GI_STICKS_1, ITEMTYPE_SHOP);
itemTable[BUY_BOMBS_10] = Item(false, &noVariable, Text{"Buy Bombs (10)", "Acheter: Bombes (10)", "Comprar Bombas (10)", "Kaufe 10 Bomben", }, BUY_BOMBS_10, (u32)GetItemID::GI_BOMBS_10, ITEMTYPE_SHOP);
Expand Down
12 changes: 6 additions & 6 deletions source/item_location.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ void LocationTable_Init() {
locationTable[E_CLOCK_TOWN_CHEST] = ItemLocation::Chest (0x6C, 0x0A, "ECT Chest", E_CLOCK_TOWN_CHEST, SILVER_RUPEE, {Category::cEastClockTown, Category::cChest ,Category::cDayOne, Category::cNoOcarinaStart}, SpoilerCollectionCheckGroup::GROUP_E_CLOCK_TOWN );
locationTable[E_CLOCK_TOWN_MILK_BAR_CHATEAU] = ItemLocation::Base (0x15, 0x91, "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, "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_DAY_1] = ItemLocation::MiniGame (0x11, 0x01, "ECT Honey and Darling Day 1", E_CLOCK_TOWN_HONEY_DARLING_DAY_1, FISHING_PASS, {Category::cEastClockTown, Category::cMinigame, Category::cDayOne, Category::cNoOcarinaStart}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_E_CLOCK_TOWN );
locationTable[E_CLOCK_TOWN_HONEY_DARLING_DAY_2] = ItemLocation::MiniGame (0x11, 0x02, "ECT Honey and Darling Day 2", E_CLOCK_TOWN_HONEY_DARLING_DAY_2, FISHING_PASS, {Category::cEastClockTown, Category::cMinigame, Category::cDayTwo, Category::cNoOcarinaStart}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_E_CLOCK_TOWN );
locationTable[E_CLOCK_TOWN_POSTBOX] = ItemLocation::Base (0x6C, 0xBA, "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 );
locationTable[E_CLOCK_TOWN_HONEY_DARLING_DAY_1] = ItemLocation::MiniGame (0x11, 0x01, "ECT Honey and Darling Day 1", E_CLOCK_TOWN_HONEY_DARLING_DAY_1, FISHING_PASS, {Category::cEastClockTown, Category::cMinigame, Category::cDayOne, Category::cNoOcarinaStart, Category::cExtraMinigames}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_E_CLOCK_TOWN );
locationTable[E_CLOCK_TOWN_HONEY_DARLING_DAY_2] = ItemLocation::MiniGame (0x11, 0x02, "ECT Honey and Darling Day 2", E_CLOCK_TOWN_HONEY_DARLING_DAY_2, FISHING_PASS, {Category::cEastClockTown, Category::cMinigame, Category::cDayTwo, Category::cNoOcarinaStart, Category::cExtraMinigames}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_E_CLOCK_TOWN );
locationTable[E_CLOCK_TOWN_POSTBOX] = ItemLocation::Base (0x6C, 0xBA, "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
locationTable[GORON_VILLAGE_POWDER_KEG_CHALLENGE] = ItemLocation::Base (0x4D, 0x34, "GV Powder Keg Challenge", GORON_VILLAGE_POWDER_KEG_CHALLENGE, POWDER_KEG, {Category::cGoronVillage, Category::cDayOne, Category::cMainInventory, Category::cNoOcarinaStart}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_GORON_VILLAGE );
Expand Down Expand Up @@ -283,7 +283,7 @@ void LocationTable_Init() {
locationTable[WOODFALL_TEMPLE_COMPASS_CHEST] = ItemLocation::Chest (0x1B, 0x1C, "WT Compass Chest", WOODFALL_TEMPLE_COMPASS_CHEST, WOODFALL_TEMPLE_COMPASS, {Category::cWoodfall, Category::cWoodfallTemple,Category::cVanillaCompass,Category::cDayOne}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WOODFALL_TEMPLE );
locationTable[WOODFALL_TEMPLE_BOSS_KEY_CHEST] = ItemLocation::Chest (0x1B, 0x1E, "WT Boss Key Chest", WOODFALL_TEMPLE_BOSS_KEY_CHEST, WOODFALL_TEMPLE_BOSS_KEY, {Category::cWoodfall, Category::cWoodfallTemple,Category::cVanillaBossKey,Category::cDayOne}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WOODFALL_TEMPLE );
locationTable[WOODFALL_TEMPLE_SMALL_KEY_CHEST] = ItemLocation::Chest (0x1B, 0x01, "WT Small Key Chest", WOODFALL_TEMPLE_SMALL_KEY_CHEST, WOODFALL_TEMPLE_SMALL_KEY, {Category::cWoodfall, Category::cWoodfallTemple,Category::cVanillaSmallKey,Category::cDayOne}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WOODFALL_TEMPLE );
locationTable[GIANTS_OATH_TO_ORDER] = ItemLocation::Base (0x69, 0x51, "Oath to Order", GIANTS_OATH_TO_ORDER, OATH_TO_ORDER, {Category::cWoodfall, Category::cWoodfallTemple, Category::cSong,Category::cDayOne}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_DUNGEON_WOODFALL_TEMPLE );
locationTable[GIANTS_OATH_TO_ORDER] = ItemLocation::Base (0x69, 0x51, "Oath to Order", GIANTS_OATH_TO_ORDER, OATH_TO_ORDER, {Category::cWoodfall, Category::cWoodfallTemple, Category::cSong,Category::cDayOne}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_DUNGEON_WOODFALL_TEMPLE );
locationTable[WOODFALL_TEMPLE_DEKU_PRINCESS] = ItemLocation::Base (0x1B, 0x5F, "Deku Princess", WOODFALL_TEMPLE_DEKU_PRINCESS, DEKU_PRINCESS, {Category::cWoodfall, Category::cWoodfallTemple, Category::cBottleCatch,Category::cDayOne}, SpoilerCollectionCheck::ItemGetInf(0), SpoilerCollectionCheckGroup::GROUP_DUNGEON_WOODFALL_TEMPLE );

//Snowhead Temple
Expand Down Expand Up @@ -579,9 +579,9 @@ void LocationTable_Init() {
locationTable[W_CLOCK_TOWN_BOMB_BAG_BUY] = ItemLocation::Shop (0x68,0x17, "WCT Bomb Bag Purchase", W_CLOCK_TOWN_BOMB_BAG_BUY, PROGRESSIVE_BOMB_BAG, {Category::cWestClockTown,Category::cDayOne, Category::cShop, Category::cMainInventory, Category::cNoOcarinaStart}, SpoilerCollectionCheckGroup::GROUP_W_CLOCK_TOWN );
locationTable[W_CLOCK_TOWN_BIG_BOMB_BAG_BUY] = ItemLocation::Shop (0x68,0x18, "WCT Big Bomb Bag Purchase", W_CLOCK_TOWN_BIG_BOMB_BAG_BUY, PROGRESSIVE_BOMB_BAG, {Category::cWestClockTown,Category::cDayTwo, Category::cShop, Category::cMainInventory, Category::cNoOcarinaStart}, SpoilerCollectionCheckGroup::GROUP_W_CLOCK_TOWN );

locationTable[POTION_SHOP_ITEM_1] = ItemLocation::Shop (0x0A,0x00, "Potion Shop Item 1", POTION_SHOP_ITEM_1, BLUE_POTION_REFILL, {Category::cSouthernSwamp,Category::cShop,Category::cDayOne, Category::cNoOcarinaStart}, SpoilerCollectionCheckGroup::GROUP_SOUTHERN_SWAMP);
locationTable[POTION_SHOP_ITEM_1] = ItemLocation::Shop (0x0A,0x00, "Potion Shop Item 1", POTION_SHOP_ITEM_1, RED_POTION_REFILL, {Category::cSouthernSwamp,Category::cShop,Category::cDayOne, Category::cNoOcarinaStart}, SpoilerCollectionCheckGroup::GROUP_SOUTHERN_SWAMP);
locationTable[POTION_SHOP_ITEM_2] = ItemLocation::Shop (0x0A,0x01, "Potion Shop Item 2", POTION_SHOP_ITEM_2, GREEN_POTION_REFILL, {Category::cSouthernSwamp,Category::cShop,Category::cDayOne, Category::cNoOcarinaStart}, SpoilerCollectionCheckGroup::GROUP_SOUTHERN_SWAMP);
locationTable[POTION_SHOP_ITEM_3] = ItemLocation::Shop (0x0A,0x02, "Potion Shop Item 3", POTION_SHOP_ITEM_3, RED_POTION_REFILL, {Category::cSouthernSwamp,Category::cShop,Category::cDayOne, Category::cNoOcarinaStart}, SpoilerCollectionCheckGroup::GROUP_SOUTHERN_SWAMP);
locationTable[POTION_SHOP_ITEM_3] = ItemLocation::Shop (0x0A,0x02, "Potion Shop Item 3", POTION_SHOP_ITEM_3, BLUE_POTION_REFILL, {Category::cSouthernSwamp,Category::cShop,Category::cDayOne, Category::cNoOcarinaStart}, SpoilerCollectionCheckGroup::GROUP_SOUTHERN_SWAMP);

locationTable[GORON_SHOP_ITEM_1] = ItemLocation::Shop (0x3D,0x1E, "Goron Shop Item 1", GORON_SHOP_ITEM_1, BOMBS_10, {Category::cGoronVillage,Category::cShop,Category::cDayOne, Category::cNoOcarinaStart}, SpoilerCollectionCheckGroup::GROUP_GORON_VILLAGE);
locationTable[GORON_SHOP_ITEM_2] = ItemLocation::Shop (0x3D,0x1F, "Goron Shop Item 2", GORON_SHOP_ITEM_2, ARROWS_10, {Category::cGoronVillage,Category::cShop,Category::cDayOne, Category::cNoOcarinaStart}, SpoilerCollectionCheckGroup::GROUP_GORON_VILLAGE);
Expand Down
6 changes: 3 additions & 3 deletions source/item_pool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,11 +637,11 @@ static void PlaceVanillaShopItems() {
PlaceItemInLocation(W_CLOCK_TOWN_BIG_BOMB_BAG_BUY, PROGRESSIVE_BOMB_BAG);
PlaceItemInLocation(W_CLOCK_TOWN_CURIOSITY_BOMB_BAG, PROGRESSIVE_BOMB_BAG);
PlaceItemInLocation(W_CLOCK_TOWN_BOMB_SHOP_GORON, POWDER_KEG);
PlaceItemInLocation(POTION_SHOP_ITEM_1, BUY_BLUE_POTION);
PlaceItemInLocation(POTION_SHOP_ITEM_1, BUY_RED_POTION);
PlaceItemInLocation(POTION_SHOP_ITEM_2, BUY_GREEN_POTION);
PlaceItemInLocation(POTION_SHOP_ITEM_3, BUY_RED_POTION);
PlaceItemInLocation(POTION_SHOP_ITEM_3, BUY_BLUE_POTION);
PlaceItemInLocation(GORON_SHOP_ITEM_1, BUY_BOMBS_10);
PlaceItemInLocation(GORON_SHOP_ITEM_2, BUY_BOMBCHU_10);
PlaceItemInLocation(GORON_SHOP_ITEM_2, BUY_ARROWS_10);
PlaceItemInLocation(GORON_SHOP_ITEM_3, BUY_RED_POTION);
PlaceItemInLocation(ZORA_SHOP_ITEM_1, BUY_HEROS_SHIELD);
PlaceItemInLocation(ZORA_SHOP_ITEM_2, BUY_ARROWS_10);
Expand Down
Loading
Loading