Include Giant Mask unshuffling for now as the check is not giving pro…

…per items. (#33) Fix Gabora not giving proper sword rewards.
Z3DR · Jan 30, 2024 · 177bc4d · 177bc4d
1 parent d18a3b8
commit 177bc4d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/source/include/version.hpp b/source/include/version.hpp
@@ -1,4 +1,4 @@
 #pragma once
 
-#define RANDOMIZER_VERSION "v1.1.1"
+#define RANDOMIZER_VERSION "v1.1.2"
 #define COMMIT_NUMBER "develop"
diff --git a/source/item_location.cpp b/source/item_location.cpp
@@ -108,7 +108,7 @@ void LocationTable_Init() {
  locationTable[MILK_ROAD_KEATON_QUIZ]                              = ItemLocation::Base       (0x6A, 0x0C, false, "MR Keaton Quiz",                                           MILK_ROAD_KEATON_QUIZ,                          PIECE_OF_HEART,               {Category::cMilkRoad, Category::cDayOne},                                                                                  SpoilerCollectionCheck::ItemGetInf(0),      SpoilerCollectionCheckGroup::GROUP_MILK_ROAD );
 
  //Mountain Village
- locationTable[MOUNTAIN_VILLAGE_SMITH_DAY_ONE]                     = ItemLocation::Base       (0x2C, 0x4A, false, "MV Smith Day 1",                                           MOUNTAIN_VILLAGE_SMITH_DAY_ONE,                 RAZOR_SWORD,                  {Category::cMountainVillage,Category::cDayOne},                                                                            SpoilerCollectionCheck::ItemGetInf(0),      SpoilerCollectionCheckGroup::GROUP_MOUNTAIN_VILLAGE );
+ locationTable[MOUNTAIN_VILLAGE_SMITH_DAY_ONE]                     = ItemLocation::Base       (0x2C, 0x38, false, "MV Smith Day 1",                                           MOUNTAIN_VILLAGE_SMITH_DAY_ONE,                 RAZOR_SWORD,                  {Category::cMountainVillage,Category::cDayOne},                                                                            SpoilerCollectionCheck::ItemGetInf(0),      SpoilerCollectionCheckGroup::GROUP_MOUNTAIN_VILLAGE );
  locationTable[MOUNTAIN_VILLAGE_SMITH_DAY_TWO]                     = ItemLocation::Base       (0x2C, 0x39, false, "MV Smith Day 2",                                           MOUNTAIN_VILLAGE_SMITH_DAY_TWO,                 GILDED_SWORD,                 {Category::cMountainVillage,Category::cDayTwo},                                                                            SpoilerCollectionCheck::ItemGetInf(0),      SpoilerCollectionCheckGroup::GROUP_MOUNTAIN_VILLAGE );
  locationTable[MOUNTAIN_VILLAGE_FROG_CHOIR]                        = ItemLocation::Base       (0x5A, 0x0C, false, "MV Frog Choir",                                            MOUNTAIN_VILLAGE_FROG_CHOIR,                    PIECE_OF_HEART,               {Category::cMountainVillage, Category::cVanillaHeartPiece,Category::cDayOne},                                              SpoilerCollectionCheck::ItemGetInf(0),      SpoilerCollectionCheckGroup::GROUP_MOUNTAIN_VILLAGE );
  locationTable[MOUNTAIN_VILLAGE_DARMANI]                           = ItemLocation::Base       (0x4E, 0x79, false, "MV Graveyard Darmani",                                     MOUNTAIN_VILLAGE_DARMANI,                       GORON_MASK,                   {Category::cMountainVillage, Category::cTransformMask,Category::cDayOne},                                                  SpoilerCollectionCheck::ItemGetInf(0),      SpoilerCollectionCheckGroup::GROUP_MOUNTAIN_VILLAGE );

diff --git a/source/item_pool.cpp b/source/item_pool.cpp
@@ -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,
@@ -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,
 };
 
@@ -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);
@@ -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);