fix certain items being marked as major items for hints (#648)

gamestabled · Mar 10, 2023 · d7ac3ea · d7ac3ea
1 parent b13a615
commit d7ac3ea
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/source/item.hpp b/source/item.hpp
@@ -97,6 +97,10 @@ class Item {
             return false;
         }
 
+        if (hintKey == HEART_CONTAINER || hintKey == PIECE_OF_HEART || hintKey == TREASURE_GAME_HEART) {
+            return false;
+        }
+
         if (type == ITEMTYPE_SMALLKEY && (Keysanity.Is(KEYSANITY_VANILLA) || Keysanity.Is(KEYSANITY_OWN_DUNGEON))) {
             return false;
         }

diff --git a/source/item_list.cpp b/source/item_list.cpp
@@ -190,9 +190,9 @@ void ItemTable_Init() {                               //Item Type
     itemTable[BOMBS_5]                           = Item(ITEMTYPE_REFILL,            GI_BOMBS_5,           false,       &noVariable,                BOMBS_5,                           Text{"Bombs (5)",                       "Bombes (5)",                       "Bombas (5)",                               "5 bombe",                                  "Bomben (5 Stück)"});
     itemTable[BOMBS_10]                          = Item(ITEMTYPE_REFILL,            GI_BOMBS_10,          false,       &noVariable,                BOMBS_10,                          Text{"Bombs (10)",                      "Bombes (10)",                      "Bombas (10)",                              "10 bombe",                                 "Bomben (10 Stück)"});
     itemTable[BOMBS_20]                          = Item(ITEMTYPE_REFILL,            GI_BOMBS_20,          false,       &noVariable,                BOMBS_20,                          Text{"Bombs (20)",                      "Bombes (20)",                      "Bombas (20)",                              "20 bombe",                                 "Bomben (20 Stück)"});
-    itemTable[BOMBCHU_5]                         = Item(ITEMTYPE_REFILL,            GI_BOMBCHUS_5,        true,        &Bombchus5,                 BOMBCHU_5,                         Text{"Bombchu (5)",                     "Bombchus (5)",                     "Bombchus (5)",                             "5 radiomine",                              "Krabbelminen (5 Stück)"});
-    itemTable[BOMBCHU_10]                        = Item(ITEMTYPE_REFILL,            GI_BOMBCHUS_10,       true,        &Bombchus10,                BOMBCHU_10,                        Text{"Bombchu (10)",                    "Bombchus (10)",                    "Bombchus (10)",                            "10 radiomine",                             "Krabbelminen (10 Stück)"});
-    itemTable[BOMBCHU_20]                        = Item(ITEMTYPE_REFILL,            GI_BOMBCHUS_20,       true,        &Bombchus20,                BOMBCHU_20,                        Text{"Bombchu (20)",                    "Bombchus (20)",                    "Bombchus (20)",                            "20 radiomine",                             "Krabbelminen (20 Stück)"});
+    itemTable[BOMBCHU_5]                         = Item(ITEMTYPE_REFILL,            GI_BOMBCHUS_5,        true,        &Bombchus5,                 BOMBCHU_5,                         Text{"Bombchus (5)",                    "Bombchus (5)",                     "Bombchus (5)",                             "5 radiomine",                              "Krabbelminen (5 Stück)"});
+    itemTable[BOMBCHU_10]                        = Item(ITEMTYPE_REFILL,            GI_BOMBCHUS_10,       true,        &Bombchus10,                BOMBCHU_10,                        Text{"Bombchus (10)",                   "Bombchus (10)",                    "Bombchus (10)",                            "10 radiomine",                             "Krabbelminen (10 Stück)"});
+    itemTable[BOMBCHU_20]                        = Item(ITEMTYPE_REFILL,            GI_BOMBCHUS_20,       true,        &Bombchus20,                BOMBCHU_20,                        Text{"Bombchus (20)",                   "Bombchus (20)",                    "Bombchus (20)",                            "20 radiomine",                             "Krabbelminen (20 Stück)"});
     itemTable[BOMBCHU_DROP]                      = Item(ITEMTYPE_DROP,              GI_BOMBCHUS_10,       true,        &BombchuDrop,               NONE,                              Text{"Bombchu Drop",                    "Bombchus",                         "Bombchus",                                 "Drop di radiomine",                        "Krabbelminen"});
     itemTable[ARROWS_5]                          = Item(ITEMTYPE_REFILL,            GI_ARROWS_SMALL,      false,       &noVariable,                ARROWS_5,                          Text{"Arrows (5)",                      "Flèches (5)",                      "Flechas (5)",                              "5 frecce",                                 "Pfeile (5 Stück)"});
     itemTable[ARROWS_10]                         = Item(ITEMTYPE_REFILL,            GI_ARROWS_MEDIUM,     false,       &noVariable,                ARROWS_10,                         Text{"Arrows (10)",                     "Flèches (10)",                     "Flechas (10)",                             "10 frecce",                                "Pfeile (10 Stück)"});