Fix Logic by @Malkierian on PR HarbourMasters#6233 | V:13.6

Author: TheLynk

soh/soh/Enhancements/gameplaystats.cpp

@@ -448,7 +448,7 @@ void DrawGameplayStatsHeader() {
     // if tag is empty (not a release build)
     if (gGitCommitTag[0] == 0) {
         GameplayStatsRow("Git Branch:", (char*)gGitBranch);
-        GameplayStatsRow("Version : 13.5 | Git Commit Hash:", (char*)gGitCommitHash);
+        GameplayStatsRow("Version : 13.6 | Git Commit Hash:", (char*)gGitCommitHash);
     } else {
         GameplayStatsRow("Build Version:", (char*)gBuildVersion);
     }

soh/soh/Enhancements/randomizer/location_access/overworld/kokiri_forest.cpp

@@ -135,7 +135,7 @@ void RegionTable_Init_KokiriForest() {
     areaTable[RR_KF_LINKS_HOUSE] = Region("KF Link's House", SCENE_LINKS_HOUSE, {}, {
         //Locations
         LOCATION(RC_KF_LINKS_HOUSE_COW, logic->IsAdult && logic->CanUse(RG_EPONAS_SONG) && logic->Get(LOGIC_LINKS_COW)),
-        LOCATION(RC_KF_LINKS_HOUSE_POT, logic->CanBreakPots()),
+        LOCATION(RC_KF_LINKS_HOUSE_POT, logic->HasItem(RG_POWER_BRACELET)), // TODO: CanBreakPots() restricted
     }, {
         //Exits
         Entrance(RR_KF_LINKS_PORCH, []{return true;})
@@ -165,17 +165,17 @@ void RegionTable_Init_KokiriForest() {
 
     areaTable[RR_KF_HOUSE_OF_TWINS] = Region("KF House of Twins", SCENE_TWINS_HOUSE, {}, {
         //Locations
-        LOCATION(RC_KF_TWINS_HOUSE_POT_1, logic->CanBreakPots()),
-        LOCATION(RC_KF_TWINS_HOUSE_POT_2, logic->CanBreakPots()),
+        LOCATION(RC_KF_TWINS_HOUSE_POT_1, logic->HasItem(RG_POWER_BRACELET)), // TODO: CanBreakPots() restricted
+        LOCATION(RC_KF_TWINS_HOUSE_POT_2, logic->HasItem(RG_POWER_BRACELET)), // TODO: CanBreakPots() restricted
     }, {
         //Exits
         Entrance(RR_KOKIRI_FOREST, []{return true;}),
     });
 
     areaTable[RR_KF_KNOW_IT_ALL_HOUSE] = Region("KF Know It All House", SCENE_KNOW_IT_ALL_BROS_HOUSE, {}, {
         // Locations
-        LOCATION(RC_KF_BROTHERS_HOUSE_POT_1, logic->CanBreakPots()),
-        LOCATION(RC_KF_BROTHERS_HOUSE_POT_2, logic->CanBreakPots()),
+        LOCATION(RC_KF_BROTHERS_HOUSE_POT_1, logic->HasItem(RG_POWER_BRACELET)), // TODO: CanBreakPots() restricted
+        LOCATION(RC_KF_BROTHERS_HOUSE_POT_2, logic->HasItem(RG_POWER_BRACELET)), // TODO: CanBreakPots() restricted
     }, {
         //Exits
         Entrance(RR_KOKIRI_FOREST, []{return true;}),

soh/soh/Enhancements/randomizer/location_access/overworld/lon_lon_ranch.cpp

@@ -37,9 +37,9 @@ void RegionTable_Init_LonLonRanch() {
     areaTable[RR_LLR_TALONS_HOUSE] = Region("LLR Talons House", SCENE_LON_LON_BUILDINGS, {}, {
         //Locations
         LOCATION(RC_LLR_TALONS_CHICKENS,    logic->HasItem(RG_CHILD_WALLET) && logic->IsChild && logic->AtDay && logic->HasItem(RG_ZELDAS_LETTER)),
-        LOCATION(RC_LLR_TALONS_HOUSE_POT_1, logic->CanBreakPots()),
-        LOCATION(RC_LLR_TALONS_HOUSE_POT_2, logic->CanBreakPots()),
-        LOCATION(RC_LLR_TALONS_HOUSE_POT_3, logic->CanBreakPots()),
+        LOCATION(RC_LLR_TALONS_HOUSE_POT_1, logic->HasItem(RG_POWER_BRACELET) || logic->CanUseSword()), // TODO: CanBreakPots() restricted
+        LOCATION(RC_LLR_TALONS_HOUSE_POT_2, logic->HasItem(RG_POWER_BRACELET) || logic->CanUseSword()), // TODO: CanBreakPots() restricted
+        LOCATION(RC_LLR_TALONS_HOUSE_POT_3, logic->HasItem(RG_POWER_BRACELET) || logic->CanUseSword()), // TODO: CanBreakPots() restricted
     }, {
         //Exits
         Entrance(RR_LON_LON_RANCH, []{return true;}),

soh/soh/Enhancements/randomizer/location_access/overworld/market.cpp

@@ -235,9 +235,9 @@ void RegionTable_Init_Market() {
 
     areaTable[RR_MARKET_MAN_IN_GREEN_HOUSE] = Region("Market Man in Green House", SCENE_BACK_ALLEY_HOUSE, {}, {
         // Locations
-        LOCATION(RC_MK_BACK_ALLEY_HOUSE_POT_1, logic->CanBreakPots()),
-        LOCATION(RC_MK_BACK_ALLEY_HOUSE_POT_2, logic->CanBreakPots()),
-        LOCATION(RC_MK_BACK_ALLEY_HOUSE_POT_3, logic->CanBreakPots()),
+        LOCATION(RC_MK_BACK_ALLEY_HOUSE_POT_1, logic->HasItem(RG_POWER_BRACELET)), // TODO: CanBreakPots() restricted
+        LOCATION(RC_MK_BACK_ALLEY_HOUSE_POT_2, logic->HasItem(RG_POWER_BRACELET)), // TODO: CanBreakPots() restricted
+        LOCATION(RC_MK_BACK_ALLEY_HOUSE_POT_3, logic->HasItem(RG_POWER_BRACELET)), // TODO: CanBreakPots() restricted
     }, {
         //Exits
         Entrance(RR_MARKET_BACK_ALLEY, []{return true;}),