Fix check tracker + minor stuff

aMannus · Jan 21, 2024 · ed3dddf · ed3dddf
1 parent c2ffbe7
commit ed3dddf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp b/soh/soh/Enhancements/randomizer/3drando/location_access/locacc_lost_woods.cpp
@@ -48,7 +48,7 @@ void AreaTable_Init_LostWoods() {
   areaTable[RR_KF_LINKS_HOUSE] = Area("KF Link's House", "KF Link's House", RA_NONE, NO_DAY_NIGHT_CYCLE, {}, {
                   //Locations
                   LocationAccess(RC_KF_LINKS_HOUSE_COW, {[]{return logic->IsAdult && logic->CanUse(RG_EPONAS_SONG) && logic->LinksCow;}}),
-                  LocationAccess(RC_KF_LINKS_HOUSE_POT, {[]{return true;}}),
+                  LocationAccess(RC_KF_LINKS_HOUSE_POT, {[]{return logic->CanBreakPots;}}),
                 }, {
                   //Exits
                   Entrance(RR_KOKIRI_FOREST, {[]{return true;}})

diff --git a/soh/soh/Enhancements/randomizer/location_list.cpp b/soh/soh/Enhancements/randomizer/location_list.cpp
@@ -1517,7 +1517,7 @@ void Rando::StaticData::InitLocationTable() {
     locationTable[RC_GV_COW] =                  Location::Base(RC_GV_COW,                  RCQUEST_BOTH, RCTYPE_COW, RCAREA_GERUDO_VALLEY,        ACTOR_EN_COW, SCENE_GERUDO_VALLEY,     0x00,                         0x15, "Cow",               "GV Cow",                  RHT_GV_COW,                  RG_MILK, { Category::cCow }, SpoilerCollectionCheck::Cow(0x5A, 0x15), SpoilerCollectionCheckGroup::GROUP_GERUDO_VALLEY);
     locationTable[RC_JABU_JABUS_BELLY_MQ_COW] = Location::Base(RC_JABU_JABUS_BELLY_MQ_COW, RCQUEST_MQ,   RCTYPE_COW, RCAREA_JABU_JABUS_BELLY,     ACTOR_EN_COW, SCENE_JABU_JABU,         0x00,                         0x15, "MQ Cow",            "Jabu Jabus Belly MQ Cow", RHT_JABU_JABUS_BELLY_MQ_COW, RG_MILK, { Category::cCow }, SpoilerCollectionCheck::Cow(0x02, 0x15), SpoilerCollectionCheckGroup::GROUP_DUNGEON_JABUJABUS_BELLY);
 
-    // Pots       Randomizer Check                                 	Randomizer Check                                            Quest         Type        Area                          Actor ID         Scene ID                           Params                          Flags       Short Name                    		Spoiler Name                                Hint Text Key                   Vanilla         Item Categories     Spoiler Collection Check                 Collection Check Group
+    // Pots       Randomizer Check                                 	Randomizer Check                                            Quest         Type        Area                          Actor ID         Scene ID                           Params                          Flags       Short Name                    		Spoiler Name                                Hint Text Key                   Vanilla             Item Categories     Spoiler Collection Check                 Collection Check Group
     locationTable[RC_KF_LINKS_HOUSE_POT]                    	=	Location::Base(RC_KF_LINKS_HOUSE_POT,                       RCQUEST_BOTH, RCTYPE_POT, RCAREA_KOKIRI_FOREST,         ACTOR_OBJ_TSUBO, SCENE_LINKS_HOUSE,                 TWO_ACTOR_PARAMS(-118, 51),     0x4103, 	"Links House Pot",                  "KF Links House Pot",                       RHT_POT_KOKIRI_FOREST,	        RG_RECOVERY_HEART,  { Category::cPot }, SpoilerCollectionCheck::Pot(0x34, 0x00), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
     locationTable[RC_KF_TWINS_HOUSE_POT_1]                  	=	Location::Base(RC_KF_TWINS_HOUSE_POT_1,                     RCQUEST_BOTH, RCTYPE_POT, RCAREA_KOKIRI_FOREST,         ACTOR_OBJ_TSUBO, SCENE_TWINS_HOUSE,                 TWO_ACTOR_PARAMS(33, -55),      0x4300,  	"Twins House Pot 1",                "KF Twins House Pot 1",                     RHT_POT_KOKIRI_FOREST,	        RG_GREEN_RUPEE,     { Category::cPot }, SpoilerCollectionCheck::Pot(0x27, 0x00), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);
     locationTable[RC_KF_TWINS_HOUSE_POT_2]                  	=	Location::Base(RC_KF_TWINS_HOUSE_POT_2,                     RCQUEST_BOTH, RCTYPE_POT, RCAREA_KOKIRI_FOREST,         ACTOR_OBJ_TSUBO, SCENE_TWINS_HOUSE,                 TWO_ACTOR_PARAMS(35, 57),       0x4501,   	"Twins House Pot 2",                "KF Twins House Pot 2",                     RHT_POT_KOKIRI_FOREST,	        RG_BLUE_RUPEE,      { Category::cPot }, SpoilerCollectionCheck::Pot(0x27, 0x00), SpoilerCollectionCheckGroup::GROUP_KOKIRI_FOREST);

diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -756,6 +756,7 @@ void CheckTrackerFlagSet(int16_t flagType, int32_t flag) {
                scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_SHOP_ITEM ||
                scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_COW ||
                scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_FISH ||
+               scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_POT ||
                scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_SCRUB ||
                scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_MASTER_SWORD ||
                scCheckType == SpoilerCollectionCheckType::SPOILER_CHK_RANDOMIZER_INF)) {