From e0e832276723e50c129f985d5417fca93c16305b Mon Sep 17 00:00:00 2001 From: Tacoman369 <90735287+Tacoman369@users.noreply.github.com> Date: Thu, 14 Mar 2024 20:43:24 -0500 Subject: [PATCH] ISTT FIx (#76) Adds in missing Inverted Eyegore Room and changes requirements to need small keys to enter --- source/include/keys.hpp | 1 + source/location_access.cpp | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/source/include/keys.hpp b/source/include/keys.hpp index 69b3b15..6e2e502 100644 --- a/source/include/keys.hpp +++ b/source/include/keys.hpp @@ -909,6 +909,7 @@ typedef enum { STONE_TOWER_TEMPLE_INVERTED_ENTRANCE_DEATH_ARMOS_LEDGE, STONE_TOWER_TEMPLE_PRE_GOMESS_ROOM, STONE_TOWER_TEMPLE_GOMESS_ROOM, + STONE_TOWER_TEMPLE_INVERTED_EYEGORE_ROOM, STONE_TOWER_TEMPLE_INVERTED_THIN_BRIDGE_ROOM, STONE_TOWER_TEMPLE_PRE_BOSS_ROOM, STONE_TOWER_TEMPLE_BOSS_ROOM, diff --git a/source/location_access.cpp b/source/location_access.cpp index 218f191..48ac88e 100644 --- a/source/location_access.cpp +++ b/source/location_access.cpp @@ -2860,7 +2860,7 @@ void AreaTable_Init() { { //Exits Entrance(STONE_TOWER_TEMPLE_UPDRAFT_ROOM, {[]{return true;}}), - Entrance(STONE_TOWER_TEMPLE_INVERTED_THIN_BRIDGE_ROOM, {[]{return Hookshot && InvertedChestSpawn;}}), + Entrance(STONE_TOWER_TEMPLE_INVERTED_EYEGORE_ROOM, {[]{return Hookshot && InvertedChestSpawn && SmallKeys(StoneTowerTempleKeys, 4);}}), }); areaTable[STONE_TOWER_TEMPLE_UPDRAFT_ROOM] = Area("Inverted Stone Tower Temple Updraft Room", "Inverted Stone Tower Temple Updraft Room", STONE_TOWER_TEMPLE, { @@ -2979,6 +2979,18 @@ void AreaTable_Init() { Entrance(STONE_TOWER_TEMPLE_PRE_GOMESS_ROOM, {[]{return LightArrows && Bow && MagicMeter;}}), }); + areaTable[STONE_TOWER_TEMPLE_INVERTED_EYEGORE_ROOM] = Area("Inverted Stone Tower Eyegore Room", "Inverted Stone Tower Eyegore Room", STONE_TOWER_TEMPLE, { + //Events + }, + { + //Locations + }, + { + //Exits + Entrance(STONE_TOWER_TEMPLE_INVERTED_ENTRANCE, {[]{return true;}}), + Entrance(STONE_TOWER_TEMPLE_INVERTED_THIN_BRIDGE_ROOM, {[]{return Bow && MagicMeter && LightArrows;}}) + }); + areaTable[STONE_TOWER_TEMPLE_INVERTED_THIN_BRIDGE_ROOM] = Area("Inverted Stone Tower Thin Bridge Room", "Inverted Stone Tower Thin Bridge Room", STONE_TOWER_TEMPLE, { //Events EventAccess(&ThinBridgeCrystalChest, {[]{return Fighting || Bow;}}), @@ -4056,7 +4068,7 @@ void AreaTable_Init() { } namespace Areas { - static std::array < const AreaKey, 266> allAreas = { + static std::array < const AreaKey, 267> allAreas = { ROOT, ROOT_EXITS, N_CLOCK_TOWN, @@ -4248,6 +4260,7 @@ namespace Areas { STONE_TOWER_TEMPLE_INVERTED_ENTRANCE_DEATH_ARMOS_LEDGE, STONE_TOWER_TEMPLE_PRE_GOMESS_ROOM, STONE_TOWER_TEMPLE_GOMESS_ROOM, + STONE_TOWER_TEMPLE_INVERTED_EYEGORE_ROOM, STONE_TOWER_TEMPLE_INVERTED_THIN_BRIDGE_ROOM, STONE_TOWER_TEMPLE_PRE_BOSS_ROOM, STONE_TOWER_TEMPLE_BOSS_ROOM,