Skip to content

Commit

Permalink
Include Giant Mask unshuffling for now as the check is not giving pro…
Browse files Browse the repository at this point in the history
…per items.
  • Loading branch information
PhlexPlexico committed Jan 29, 2024
1 parent d18a3b8 commit aeb1e46
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion source/include/version.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma once

#define RANDOMIZER_VERSION "v1.1.1"
#define RANDOMIZER_VERSION "v1.1.2"
#define COMMIT_NUMBER "develop"
11 changes: 8 additions & 3 deletions source/item_pool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,8 @@ static void PlaceVanillaSongs() {
PlaceItemInLocation(GIANTS_OATH_TO_ORDER, OATH_TO_ORDER);
};

const std::array<ItemKey, 18> maskList = {
// TODO: Change back to 18 when the override value is correct.
const std::array<ItemKey, 17> maskList = {
KEATON_MASK,
BUNNY_HOOD,
POSTMANS_HAT,
Expand All @@ -300,7 +301,7 @@ const std::array<ItemKey, 18> maskList = {
GIBDOS_MASK,
GAROS_MASK,
CAPTAINS_HAT,
GIANTS_MASK,
// GIANTS_MASK, // TODO: Add this back in after the override is completed.
MASK_OF_TRUTH,
};

Expand Down Expand Up @@ -799,7 +800,8 @@ static void PlaceVanillaShopItems() {
PlaceItemInLocation(TRADING_POST_ITEM_7, BUY_DEKU_NUT_10);
PlaceItemInLocation(TRADING_POST_ITEM_8, BUY_MAGIC_BEAN);
PlaceItemInLocation(BOMB_SHOP_ITEM_1, BUY_BOMBS_10);
PlaceItemInLocation(BOMB_SHOP_ITEM_2, BUY_BOMBCHU_10);
PlaceItemInLocation(BOMB_SHOP_ITEM_2, BUY_BOMBCHU_10);
PlaceItemInLocation(W_CLOCK_TOWN_BOMB_SHOP_GORON, POWDER_KEG);
PlaceItemInLocation(POTION_SHOP_ITEM_1, BUY_BLUE_POTION);
PlaceItemInLocation(POTION_SHOP_ITEM_2, BUY_GREEN_POTION);
PlaceItemInLocation(POTION_SHOP_ITEM_3, BUY_RED_POTION);
Expand Down Expand Up @@ -891,6 +893,9 @@ void GenerateItemPool() {
//temp placement until shopsanity works
PlaceItemInLocation(SOUTHERN_SWAMP_SCRUB_PURCHASE, MAGIC_BEAN);

// TODO: Remove these once overrides are fixed.
PlaceItemInLocation(STONE_TOWER_TEMPLE_GIANTS_MASK_CHEST, GIANTS_MASK);


//Place Temp Items at alt locations so they don't get filled with important stuff - will be replaced later
PlaceItemInLocation(SOUTHERN_SWAMP_KOTAKE_IN_WOODS, BLUE_RUPEE);
Expand Down

0 comments on commit aeb1e46

Please sign in to comment.