Minor tweaks

• Reinstate normalrupees • Make PoH and HC advancement
Z3DR · Apr 10, 2024 · 55bf0b2 · 55bf0b2
1 parent ddf6d21
commit 55bf0b2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/source/item_list.cpp b/source/item_list.cpp
@@ -187,8 +187,8 @@ void ItemTable_Init() {    //repeatable denotes that an item in a vanilla playth
     itemTable[PURPLE_RUPEE]                      = Item(false,     true,           &noVariable,                  Text{"Purple Rupee",                    "Rubis pourpre",                                    "Rupia morada"},                                     PURPLE_RUPEE,                      (u32)GetItemID::GI_RUPEE_PURPLE,  ITEMTYPE_ITEM);
     itemTable[HUGE_RUPEE]                        = Item(false,     true,           &noVariable,                  Text{"Huge Rupee",                      "Énorme rubis",                                     "Rupia gigante"},                                    HUGE_RUPEE,                        (u32)GetItemID::GI_RUPEE_GOLD,  ITEMTYPE_ITEM);
     itemTable[SILVER_RUPEE]                      = Item(false,     true,           &noVariable,                  Text{"Silver Rupee",                    "rubis d'argent",                                   "Rupia de plata"},                                   SILVER_RUPEE,                      (u32)GetItemID::GI_RUPEE_SILVER, ITEMTYPE_ITEM);
-    itemTable[PIECE_OF_HEART]                    = Item(false,     false,          &PiecesOfHeart,               Text{"Piece of Heart",                  "Quart de cœur",                                    "Pieza de corazón"},                                 PIECE_OF_HEART,                    (u32)GetItemID::GI_HEART_PIECE,  ITEMTYPE_ITEM);
-    itemTable[HEART_CONTAINER]                   = Item(false,     false,          &HeartContainers,             Text{"Heart Container",                 "Réceptacle de cœur",                               "Contenedor de corazón"},                            HEART_CONTAINER,                   (u32)GetItemID::GI_HEART_CONTAINER,  ITEMTYPE_ITEM);
+    itemTable[PIECE_OF_HEART]                    = Item(true,      false,          &PiecesOfHeart,               Text{"Piece of Heart",                  "Quart de cœur",                                    "Pieza de corazón"},                                 PIECE_OF_HEART,                    (u32)GetItemID::GI_HEART_PIECE,  ITEMTYPE_ITEM);
+    itemTable[HEART_CONTAINER]                   = Item(true,      false,          &HeartContainers,             Text{"Heart Container",                 "Réceptacle de cœur",                               "Contenedor de corazón"},                            HEART_CONTAINER,                   (u32)GetItemID::GI_HEART_CONTAINER,  ITEMTYPE_ITEM);
     itemTable[ICE_TRAP]                          = Item(false,     true,           &noVariable,                  Text{"Ice Trap",                        "Piège de glace",                                   "Trampa de hielo"},                                  ICE_TRAP,                          0x12,  ITEMTYPE_ITEM);
     itemTable[MILK]                              = Item(false,     true,           &HasBottle,                   Text{"Milk",                            "Lait",                                             "Leche Lon Lon"},                                    NONE,                              0x92,                          ITEMTYPE_ITEM);
 

diff --git a/source/item_pool.cpp b/source/item_pool.cpp
@@ -1119,7 +1119,7 @@ void GenerateItemPool() {
 	//TO-DO----SHOP SANITY
 	//for now... its all vanilla lol
 	//if (Settings::Shopsanity.Is(ShopsanitySetting::SHOPSANITY_OFF) || Settings::Shopsanity.Is(ShopsanitySetting::SHOPSANITY_ZERO)) {
-    //AddItemsToPool(ItemPool, normalRupees);
+    AddItemsToPool(ItemPool, normalRupees);
 	PlaceVanillaShopItems();
  	// } else { //Shopsanity 1-4, random
     //AddItemsToPool(ItemPool, shopsanityRupees); //Shopsanity gets extra large rupees

diff --git a/source/settings.cpp b/source/settings.cpp
@@ -639,7 +639,7 @@ namespace Settings {
     //ctx.shuffleFierceDeity = (ShuffleFierceDeity) ? 1:0;
     //ctx.shuffleMasks = (ShuffleMasks) ? 1 : 0;
     ctx.shuffleGreatFairyRewards = ShuffleGFRewards.Value<u8>();
-    ctx.shufflePiecesOfHeart = (ShufflePiecesOfHeart) ? 1:0;
+    //ctx.shufflePiecesOfHeart = (ShufflePiecesOfHeart) ? 1:0;
 
     ctx.iceTrapValue = IceTrapValue.Value<u8>();
     //ctx.randomTrapDmg = RandomTrapDmg.Value<u8>();
@@ -1350,7 +1350,7 @@ namespace Settings {
       } else {
         ShufflePiecesOfHeart.Unlock();
       }
-      
+
     //Groups the item categories; bottles are handled separately because the proper item is Empty Bottle (1)
       CollapseCategory(StartingInventoryToggle, 3, 25);
       CollapseCategory(StartingMaskToggle, 26, 50);