diff options
Diffstat (limited to 'mm/2s2h/Rando/Logic/Regions/SpiderHouses.cpp')
| -rw-r--r-- | mm/2s2h/Rando/Logic/Regions/SpiderHouses.cpp | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/mm/2s2h/Rando/Logic/Regions/SpiderHouses.cpp b/mm/2s2h/Rando/Logic/Regions/SpiderHouses.cpp index ab42d3597..c720ee131 100644 --- a/mm/2s2h/Rando/Logic/Regions/SpiderHouses.cpp +++ b/mm/2s2h/Rando/Logic/Regions/SpiderHouses.cpp @@ -40,7 +40,10 @@ static RegisterShipInitFunc initFunc([]() { CHECK(RC_OCEAN_SPIDER_HOUSE_ENTRANCE_POT_01, true), CHECK(RC_OCEAN_SPIDER_HOUSE_ENTRANCE_POT_02, true), CHECK(RC_OCEAN_SPIDER_HOUSE_ENTRANCE_POT_03, true), - CHECK(RC_OCEAN_SPIDER_HOUSE_ENTRANCE_POT_04, true) + CHECK(RC_OCEAN_SPIDER_HOUSE_ENTRANCE_POT_04, true), + CHECK(RC_OCEAN_SPIDER_HOUSE_WONDER_ITEM_07, CAN_USE_PROJECTILE || CAN_USE_EXPLOSIVE || HAS_ITEM(ITEM_DEKU_NUT)), + CHECK(RC_OCEAN_SPIDER_HOUSE_WONDER_ITEM_08, CAN_USE_PROJECTILE || CAN_USE_EXPLOSIVE || HAS_ITEM(ITEM_DEKU_NUT)), + CHECK(RC_OCEAN_SPIDER_HOUSE_WONDER_ITEM_09, CAN_USE_PROJECTILE || CAN_USE_EXPLOSIVE || HAS_ITEM(ITEM_DEKU_NUT)), }, .connections = { CONNECTION(RR_OCEAN_SPIDER_HOUSE_ENTRANCE_UPPER, CAN_BE_GORON), @@ -50,6 +53,12 @@ static RegisterShipInitFunc initFunc([]() { Regions[RR_OCEAN_SPIDER_HOUSE_ENTRANCE_UPPER] = RandoRegion{ .name = "Entrance Upper", .sceneId = SCENE_KINDAN2, .checks = { CHECK(RC_OCEAN_SPIDER_HOUSE_WALLET, HAS_ENOUGH_SKULLTULA_TOKENS(SCENE_KINDAN2)), + CHECK(RC_OCEAN_SPIDER_HOUSE_WONDER_ITEM_01, CAN_USE_PROJECTILE || CAN_USE_EXPLOSIVE), + CHECK(RC_OCEAN_SPIDER_HOUSE_WONDER_ITEM_02, CAN_USE_PROJECTILE || CAN_USE_EXPLOSIVE), + CHECK(RC_OCEAN_SPIDER_HOUSE_WONDER_ITEM_03, CAN_USE_PROJECTILE || CAN_USE_EXPLOSIVE), + CHECK(RC_OCEAN_SPIDER_HOUSE_WONDER_ITEM_04, CAN_USE_PROJECTILE || CAN_USE_EXPLOSIVE), + CHECK(RC_OCEAN_SPIDER_HOUSE_WONDER_ITEM_05, CAN_USE_PROJECTILE || CAN_USE_EXPLOSIVE), + CHECK(RC_OCEAN_SPIDER_HOUSE_WONDER_ITEM_06, CAN_USE_PROJECTILE || CAN_USE_EXPLOSIVE), }, .exits = { // TO FROM EXIT(ENTRANCE(GREAT_BAY_COAST, 8), ENTRANCE(OCEANSIDE_SPIDER_HOUSE, 0), true) @@ -140,6 +149,11 @@ static RegisterShipInitFunc initFunc([]() { CHECK(RC_SWAMP_SKULLTULA_POT_ROOM_WALL, CanKillEnemy(ACTOR_EN_SW)), CHECK(RC_SWAMP_SPIDER_HOUSE_JAR_ROOM_POT_06, true), CHECK(RC_SWAMP_SPIDER_HOUSE_JAR_ROOM_POT_07, true), + CHECK(RC_SWAMP_SPIDER_HOUSE_WONDER_ITEM_01, true), + CHECK(RC_SWAMP_SPIDER_HOUSE_WONDER_ITEM_02, true), + CHECK(RC_SWAMP_SPIDER_HOUSE_WONDER_ITEM_03, true), + CHECK(RC_SWAMP_SPIDER_HOUSE_WONDER_ITEM_04, true), + CHECK(RC_SWAMP_SPIDER_HOUSE_WONDER_ITEM_05, true), }, .connections = { CONNECTION(RR_SWAMP_SPIDER_HOUSE_CENTER_ROOM_UPPER, true), @@ -157,9 +171,18 @@ static RegisterShipInitFunc initFunc([]() { CHECK(RC_SWAMP_SKULLTULA_MAIN_ROOM_LOWER_RIGHT_SOFT_SOIL, HAS_BOTTLE && CAN_ACCESS(BUGS) && CanKillEnemy(ACTOR_EN_SW)), CHECK(RC_SWAMP_SKULLTULA_MAIN_ROOM_PILLAR, CanKillEnemy(ACTOR_EN_SW)), CHECK(RC_SWAMP_SKULLTULA_MAIN_ROOM_WATER, CanKillEnemy(ACTOR_EN_SW)), - CHECK(RC_SWAMP_SPIDER_HOUSE_MAIN_ROOM_LOWER_POT_01, true), - CHECK(RC_SWAMP_SPIDER_HOUSE_MAIN_ROOM_LOWER_POT_02, true), - CHECK(RC_SWAMP_SPIDER_HOUSE_MAIN_ROOM_LOWER_POT_03, true), + CHECK(RC_SWAMP_SPIDER_HOUSE_WONDER_ITEM_06, CAN_USE_PROJECTILE), + CHECK(RC_SWAMP_SPIDER_HOUSE_WONDER_ITEM_07, CAN_USE_PROJECTILE), + CHECK(RC_SWAMP_SPIDER_HOUSE_WONDER_ITEM_08, CAN_USE_PROJECTILE), + CHECK(RC_SWAMP_SPIDER_HOUSE_WONDER_ITEM_09, CAN_USE_PROJECTILE), + CHECK(RC_SWAMP_SPIDER_HOUSE_WONDER_ITEM_10, CAN_USE_PROJECTILE), + CHECK(RC_SWAMP_SPIDER_HOUSE_WONDER_ITEM_11, CAN_USE_PROJECTILE), + CHECK(RC_SWAMP_SPIDER_HOUSE_WONDER_ITEM_12, CAN_USE_PROJECTILE), + CHECK(RC_SWAMP_SPIDER_HOUSE_WONDER_ITEM_13, CAN_USE_PROJECTILE), + CHECK(RC_SWAMP_SPIDER_HOUSE_WONDER_ITEM_14, CAN_USE_PROJECTILE), + CHECK(RC_SWAMP_SPIDER_HOUSE_WONDER_ITEM_15, CAN_USE_PROJECTILE), + CHECK(RC_SWAMP_SPIDER_HOUSE_WONDER_ITEM_16, CAN_USE_PROJECTILE), + CHECK(RC_SWAMP_SPIDER_HOUSE_WONDER_ITEM_17, CAN_USE_PROJECTILE), }, .connections = { CONNECTION(RR_SWAMP_SPIDER_HOUSE_ENTRANCE, true), |