Slip Glide Ride rework; also caught some errors with Northern Cave connections

Author: dragonsbutalsorabbits

worlds/crystal_project/constants/ap_regions.py

@@ -285,7 +285,10 @@
 #Slip Glide Ride start
 SLIP_GLIDE_RIDE_ENTRANCE_AP_REGION = "Slip Glide Ride Entrance"
 SLIP_GLIDE_RIDE_ENTRANCE_AP_REGION_TELEPORT_LOCATION = "119,182,-520"
-SLIP_GLIDE_RIDE_AP_REGION = "Slip Glide Ride"
+SLIP_GLIDE_RIDE_ROOM_ONE_AP_REGION = "Slip Glide Ride 1st Room"
+SLIP_GLIDE_RIDE_ROOM_TWO_AP_REGION = "Slip Glide Ride Through the Locked Red Door"
+SLIP_GLIDE_RIDE_ROOM_THREE_AP_REGION = "Slip Gide Ride Through the 2nd Locked Red Door"
+RED_GUARDIAN_AP_REGION = "Red Guardian's Icy Chamber Above the Tar"
 #Slip Glide Ride end
 SEQUOIA_ATHENAEUM_AP_REGION = "Sequoia Athenaeum"
 SEQUOIA_ATHENAEUM_AP_REGION_TELEPORT_LOCATION = "415,196,-546"

worlds/crystal_project/constants/display_regions.py

@@ -96,7 +96,7 @@
 LANDS_END_DISPLAY_NAME = "Land's End"
 LANDS_END_DISPLAY_SUBREGIONS = [LANDS_END_AP_REGION, LANDS_END_NORTHERN_PEAK_AP_REGION, OWL_TREE_AP_REGION]
 SLIP_GLIDE_RIDE_DISPLAY_NAME = "Slip Glide Ride"
-SLIP_GLIDE_RIDE_DISPLAY_SUBREGIONS = [SLIP_GLIDE_RIDE_ENTRANCE_AP_REGION, SLIP_GLIDE_RIDE_AP_REGION]
+SLIP_GLIDE_RIDE_DISPLAY_SUBREGIONS = [SLIP_GLIDE_RIDE_ENTRANCE_AP_REGION, SLIP_GLIDE_RIDE_ROOM_ONE_AP_REGION, SLIP_GLIDE_RIDE_ROOM_TWO_AP_REGION, SLIP_GLIDE_RIDE_ROOM_THREE_AP_REGION, RED_GUARDIAN_AP_REGION]
 SEQUOIA_ATHENAEUM_DISPLAY_NAME = "Sequoia Athenaeum"
 SEQUOIA_ATHENAEUM_DISPLAY_SUBREGIONS = [SEQUOIA_ATHENAEUM_AP_REGION]
 NORTHERN_STRETCH_DISPLAY_NAME = "Northern Stretch"

worlds/crystal_project/locations.py

@@ -1129,14 +1129,16 @@ def get_treasure_and_npc_locations(player: int, options: CrystalProjectOptions |
         LocationData(OWL_TREE_AP_REGION, LANDS_END_DISPLAY_NAME + " NPC - Owl Drum", 1176 + npc_index_offset),
 
         #Slip Glide Ride
-        #Treasure chests
-        LocationData(SLIP_GLIDE_RIDE_AP_REGION, SLIP_GLIDE_RIDE_DISPLAY_NAME + " Chest - Back out to 1st room", 2554 + treasure_index_offset, lambda state: logic.has_key(state, RED_DOOR_KEY)), #Money chest
-        LocationData(SLIP_GLIDE_RIDE_AP_REGION, SLIP_GLIDE_RIDE_DISPLAY_NAME + " Chest - Climb up and fall down", 1172 + treasure_index_offset), #Plate of Lion chest
-        LocationData(SLIP_GLIDE_RIDE_AP_REGION, SLIP_GLIDE_RIDE_DISPLAY_NAME + " Chest - Sparks and tar", 1298 + treasure_index_offset), #Red Door Key chest
-        LocationData(SLIP_GLIDE_RIDE_AP_REGION, SLIP_GLIDE_RIDE_DISPLAY_NAME + " Chest - To the left through 2nd red lock", 1698 + treasure_index_offset, lambda state: logic.has_key(state, RED_DOOR_KEY, 2)), #Red Door Key chest
-        LocationData(SLIP_GLIDE_RIDE_AP_REGION, SLIP_GLIDE_RIDE_DISPLAY_NAME + " Chest - Through 1st red lock", 1716 + treasure_index_offset, lambda state: logic.has_key(state, RED_DOOR_KEY)), #Red Door Key chest
-        LocationData(SLIP_GLIDE_RIDE_AP_REGION, SLIP_GLIDE_RIDE_DISPLAY_NAME + " Chest - Past the mean Ibek jump", 1282 + treasure_index_offset, lambda state: logic.has_key(state, RED_DOOR_KEY)), #Sages Walker chest
-        LocationData(SLIP_GLIDE_RIDE_AP_REGION, SLIP_GLIDE_RIDE_DISPLAY_NAME + " Chest - Nickelodeon slime time :)", 1269 + treasure_index_offset), #Seekers Garb chest
+        #1st Room
+        LocationData(SLIP_GLIDE_RIDE_ROOM_ONE_AP_REGION, SLIP_GLIDE_RIDE_DISPLAY_NAME + " Chest - Nickelodeon slime time :)", 1269 + treasure_index_offset, lambda state: logic.has_glide(state)), #Seekers Garb chest
+        LocationData(SLIP_GLIDE_RIDE_ROOM_ONE_AP_REGION, SLIP_GLIDE_RIDE_DISPLAY_NAME + " Chest - Sparks and tar", 1298 + treasure_index_offset, lambda state: logic.has_vertical_movement(state) or logic.has_glide(state)), #Red Door Key chest
+        LocationData(SLIP_GLIDE_RIDE_ROOM_ONE_AP_REGION, SLIP_GLIDE_RIDE_DISPLAY_NAME + " Chest - Climb up and fall down", 1172 + treasure_index_offset, lambda state: logic.has_vertical_movement(state) and logic.has_glide(state)), #Plate of Lion chest
+        #2nd Room
+        LocationData(SLIP_GLIDE_RIDE_ROOM_TWO_AP_REGION, SLIP_GLIDE_RIDE_DISPLAY_NAME + " Chest - Through 1st red lock", 1716 + treasure_index_offset), #Red Door Key chest
+        LocationData(SLIP_GLIDE_RIDE_ROOM_TWO_AP_REGION, SLIP_GLIDE_RIDE_DISPLAY_NAME + " Chest - Back out to 1st room", 2554 + treasure_index_offset), #Money chest
+        LocationData(SLIP_GLIDE_RIDE_ROOM_TWO_AP_REGION, SLIP_GLIDE_RIDE_DISPLAY_NAME + " Chest - Past the mean Ibek jump", 1282 + treasure_index_offset, lambda state: logic.has_vertical_movement(state)), #Sages Walker chest
+        #3rd Room
+        LocationData(SLIP_GLIDE_RIDE_ROOM_THREE_AP_REGION, SLIP_GLIDE_RIDE_DISPLAY_NAME + " Chest - To the left through 2nd red lock", 1698 + treasure_index_offset, lambda state: logic.has_glide(state)), #Red Door Key chest
 
         #Sequoia Athenaeum
         #Treasure chests
@@ -1444,7 +1446,7 @@ def get_crystal_locations(player: int, options: CrystalProjectOptions | None) ->
         # Can just swim or defeat the Undercity Masters; Blade Master: Ibek or Owl, Shadow Master: Horizontal or Fish, Duel Master: Ibek or Owl; to defeat all masters, you either need both ibek + quintar, owl, or fish
         LocationData(THE_UNDERCITY_HOMEPOINT_AND_BLADE_MASTER_AP_REGION, THE_UNDERCITY_DISPLAY_NAME + ASSASSIN_JOB_CRYSTAL_LOCATION, 1204 + crystal_index_offset, lambda state: (logic.has_horizontal_movement(state) and logic.has_vertical_movement(state)) or logic.has_glide(state) or logic.has_swimming(state)),
         LocationData(VOLCANO_PEAK_AP_REGION, BEAURIOR_VOLCANO_DISPLAY_NAME + VALKYRIE_JOB_CRYSTAL_LOCATION, 1086 + crystal_index_offset),
-        LocationData(SLIP_GLIDE_RIDE_AP_REGION, SLIP_GLIDE_RIDE_DISPLAY_NAME + SUMMONER_JOB_CRYSTAL_LOCATION, 1714 + crystal_index_offset, lambda state: logic.has_key(state, RED_DOOR_KEY, 3)),
+        LocationData(RED_GUARDIAN_AP_REGION, SLIP_GLIDE_RIDE_DISPLAY_NAME + SUMMONER_JOB_CRYSTAL_LOCATION, 1714 + crystal_index_offset, lambda state: logic.has_glide(state)),
         # (404, 243, -386)
         LocationData(PEAK_RAMPARTS_AP_REGION, CASTLE_RAMPARTS_DISPLAY_NAME + BEASTMASTER_JOB_CRYSTAL_LOCATION, 1370 + crystal_index_offset, lambda state: logic.has_glide(state)),
         LocationData(CHALICE_RIM_AP_REGION, THE_CHALICE_OF_TAR_DISPLAY_NAME + MIMIC_JOB_CRYSTAL_LOCATION, 3701 + crystal_index_offset, lambda state: logic.has_glide(state)),
@@ -1499,7 +1501,7 @@ def get_boss_locations(player: int, options: CrystalProjectOptions | None) -> Li
         LocationData(EASTERN_CHASM_AP_REGION, EASTERN_CHASM_DISPLAY_NAME + " Boss - Undergrowth", 3476 + boss_index_offset, lambda state: logic.is_area_in_level_range(state, UNDERGROWTH_FIGHT_LEVEL)), #Monster ID: 293
         LocationData(SEQUOIA_ATHENAEUM_ENTRANCE_AP_REGION, TALL_TALL_HEIGHTS_DISPLAY_NAME + " Boss - Hermetic", 3637 + boss_index_offset, lambda state: logic.is_area_in_level_range(state, HERMETIC_FIGHT_LEVEL)), #Monster ID: 309
         LocationData(LANDS_END_AP_REGION, LANDS_END_DISPLAY_NAME + " Boss - The Owlbear", 2104 + boss_index_offset, lambda state: logic.is_area_in_level_range(state, OWLBEAR_FIGHT_LEVEL)), #Monster ID: 143
-        LocationData(SLIP_GLIDE_RIDE_AP_REGION, SLIP_GLIDE_RIDE_DISPLAY_NAME + " Boss - Red Guardian", 1713 + boss_index_offset, lambda state: logic.has_key(state, RED_DOOR_KEY, 3) and logic.is_area_in_level_range(state, RED_GUARDIAN_FIGHT_LEVEL)), #Monster ID: 224
+        LocationData(RED_GUARDIAN_AP_REGION, SLIP_GLIDE_RIDE_DISPLAY_NAME + " Boss - Red Guardian", 1713 + boss_index_offset, lambda state: logic.is_area_in_level_range(state, RED_GUARDIAN_FIGHT_LEVEL)), #Monster ID: 224
         LocationData(PEAK_RAMPARTS_AP_REGION, CASTLE_RAMPARTS_DISPLAY_NAME + " Boss - Rampart Demon", 1373 + boss_index_offset, lambda state: logic.has_glide(state) and logic.is_area_in_level_range(state, RAMPART_DEMON_FIGHT_LEVEL)), #Monster ID: 222
         LocationData(CONTINENTAL_TRAM_AP_REGION, CONTINENTAL_TRAM_DISPLAY_NAME + " Boss - Conscript", 1621 + boss_index_offset, lambda state: logic.is_area_in_level_range(state, CONSCRIPT_FIGHT_LEVEL)), #Monster ID: 242
         LocationData(LABYRINTH_CORE_AP_REGION, ANCIENT_LABYRINTH_DISPLAY_NAME + " Boss - Anubis", 2473 + boss_index_offset, lambda state: logic.is_area_in_level_range(state, ANUBIS_FIGHT_LEVEL)), #Monster ID: 117

worlds/crystal_project/regions.py

@@ -934,14 +934,13 @@ def init_areas(world: "CrystalProjectWorld", locations: List[LocationData], opti
                      CHALICE_FOOT_AP_REGION: lambda state: logic.has_glide(state)})
     #Tall, Tall Heights end
     #Northern Cave start
-    fancy_add_exits(world, UPPER_NORTHERN_CAVE_AP_REGION, [SLIP_TO_CAVE_OR_SOUVENIRS_AP_REGION, SLIP_GLIDE_RIDE_AP_REGION],
-                    {SLIP_GLIDE_RIDE_AP_REGION: lambda state: logic.has_glide(state) and logic.has_vertical_movement(state),
-                     SLIP_TO_CAVE_OR_SOUVENIRS_AP_REGION: lambda state: logic.has_vertical_movement(state)})
+    fancy_add_exits(world, UPPER_NORTHERN_CAVE_AP_REGION, [UPPER_ICE_LAKES_AP_REGION, SLIP_TO_CAVE_OR_SOUVENIRS_AP_REGION, MIDDLE_NORTHERN_CAVE_AP_REGION])
     fancy_add_exits(world, MIDDLE_NORTHERN_CAVE_AP_REGION, [ICE_CELL_AP_REGION, LOWER_NORTHERN_CAVE_AP_REGION])
     fancy_add_exits(world, ICE_CELL_AP_REGION, [LOWER_NORTHERN_CAVE_AP_REGION, SLIP_GLIDE_RIDE_ENTRANCE_AP_REGION],
                     {LOWER_NORTHERN_CAVE_AP_REGION: lambda state: logic.has_key(state, ICE_CELL_KEY),
-                     SLIP_GLIDE_RIDE_ENTRANCE_AP_REGION: lambda state: logic.can_push_ice_block_and_goat(state, NORTHERN_CAVE_DISPLAY_NAME) or logic.has_glide(state)})
-    fancy_add_exits(world, LOWER_NORTHERN_CAVE_AP_REGION, [ICE_CELL_AP_REGION, LOWER_ICE_LAKES_AP_REGION])
+                     SLIP_GLIDE_RIDE_ENTRANCE_AP_REGION: lambda state: logic.has_glide(state)})
+    fancy_add_exits(world, LOWER_NORTHERN_CAVE_AP_REGION, [ICE_CELL_AP_REGION, LOWER_ICE_LAKES_AP_REGION],
+                    {ICE_CELL_AP_REGION: lambda state: logic.has_key(state, ICE_CELL_KEY)})
     #Northern Cave end
     #Land's End start
     fancy_add_exits(world, LANDS_END_AP_REGION, [LANDS_END_NORTHERN_PEAK_AP_REGION, OWL_TREE_AP_REGION, ATOP_FISH_HATCHERY_AP_REGION, HEART_TARN_AP_REGION, SOUTH_SALMON_RIVER_AP_REGION, ATOP_DAM_AP_REGION, LOWER_ICE_LAKES_AP_REGION, LANDS_END_COTTAGE_RIDGE_AP_REGION, THE_OPEN_SEA_AP_REGION, VOLCANO_PEAK_AP_REGION],
@@ -960,11 +959,18 @@ def init_areas(world: "CrystalProjectWorld", locations: List[LocationData], opti
     fancy_add_exits(world, OWL_TREE_AP_REGION, [LANDS_END_AP_REGION])
     #Land's End end
     #Slip Glide Ride start
-    fancy_add_exits(world, SLIP_GLIDE_RIDE_ENTRANCE_AP_REGION, [ICE_CELL_AP_REGION, SLIP_GLIDE_RIDE_AP_REGION],
+    fancy_add_exits(world, SLIP_GLIDE_RIDE_ENTRANCE_AP_REGION, [ICE_CELL_AP_REGION, SLIP_GLIDE_RIDE_ROOM_ONE_AP_REGION, SLIP_GLIDE_RIDE_ROOM_TWO_AP_REGION, SLIP_GLIDE_RIDE_ROOM_THREE_AP_REGION],
                     {ICE_CELL_AP_REGION: lambda state: logic.has_glide(state),
-                     SLIP_GLIDE_RIDE_AP_REGION: lambda state: logic.has_glide(state)})
-    fancy_add_exits(world, SLIP_GLIDE_RIDE_AP_REGION, [SLIP_GLIDE_RIDE_EXIT_AP_REGION],
-                    {SLIP_GLIDE_RIDE_EXIT_AP_REGION: lambda state: logic.has_vertical_movement(state) and logic.has_glide(state) and logic.has_key(state, RED_DOOR_KEY, 3)})
+                     SLIP_GLIDE_RIDE_ROOM_ONE_AP_REGION: lambda state: logic.has_vertical_movement(state),
+                     SLIP_GLIDE_RIDE_ROOM_TWO_AP_REGION: lambda state: logic.has_key(state, RED_DOOR_KEY, 1) and logic.has_glide(state),
+                     SLIP_GLIDE_RIDE_ROOM_THREE_AP_REGION: lambda state: logic.has_key(state, RED_DOOR_KEY, 2)})
+    fancy_add_exits(world, SLIP_GLIDE_RIDE_ROOM_ONE_AP_REGION, [MENU_AP_REGION])
+    fancy_add_exits(world, SLIP_GLIDE_RIDE_ROOM_TWO_AP_REGION, [SLIP_GLIDE_RIDE_ROOM_ONE_AP_REGION],
+                    {SLIP_GLIDE_RIDE_ROOM_ONE_AP_REGION: lambda state: logic.has_glide(state)})
+    fancy_add_exits(world, SLIP_GLIDE_RIDE_ROOM_THREE_AP_REGION, [RED_GUARDIAN_AP_REGION],
+                    {RED_GUARDIAN_AP_REGION: lambda state: logic.has_key(state, RED_DOOR_KEY, 3) and (logic.has_horizontal_movement(state) or logic.has_vertical_movement(state))})
+    fancy_add_exits(world, RED_GUARDIAN_AP_REGION, [SLIP_GLIDE_RIDE_EXIT_AP_REGION],
+                    {SLIP_GLIDE_RIDE_EXIT_AP_REGION: lambda state: logic.has_glide(state)})
     #Slip Glide Ride end
     #Regionsanity: can't get out of Athenaeum because you can't reach the duck through the door
     fancy_add_exits(world, SEQUOIA_ATHENAEUM_AP_REGION, [MENU_AP_REGION])