Skip to content

Commit e042a57

Browse files
made the Salmon Room The Deep Sea's start point; give players Eaclaneya Pass if they get The Deep Sea as well, and manually place the Salmon Violin in its chest; removed Deep Sea -> Salmon Room swimming requirement to make tracking happy
1 parent 7d17d6e commit e042a57

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

worlds/crystal_project/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,10 @@ def create_regions(self) -> None:
356356
#Giving players who start in a swimming-required region a salmon to start
357357
if self.starter_ap_region in display_regions_desperate_for_a_salmon:
358358
self.multiworld.push_precollected(self.create_item(PROGRESSIVE_SALMON_VIOLA))
359+
#Decided it would be cute to start players in the Salmon Room with the Salmon Violin in its chest for The Deep Sea
360+
if self.starter_ap_region == THE_DEEP_SEA_AP_REGION:
361+
self.multiworld.push_precollected(self.create_item(JIDAMBA_EACLANEYA_PASS))
362+
self.get_location(JIDAMBA_EACLANEYA_DISPLAY_NAME + " Chest - Claim the prize of the Timer Fishes").place_locked_item(self.create_item(PROGRESSIVE_SALMON_VIOLA))
359363

360364
self.origin_region_name = self.starter_ap_region
361365
logging.getLogger().info("Starting region for " + self.player_name + " is " + ap_region_to_display_region_dictionary[self.starter_ap_region])

worlds/crystal_project/constants/ap_regions.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,22 +347,29 @@
347347
LAND_OF_TIMER_FISHES_AP_REGION_TELEPORT_LOCATION = "740,37,69"
348348
SALMON_ROOM_AP_REGION = "Jidamba Eaclaneya Salmon Room"
349349
#Jidamba Eaclaneya end
350+
#The Deep Sea start
350351
THE_DEEP_SEA_AP_REGION = "The Deep Sea"
351-
THE_DEEP_SEA_AP_REGION_TELEPORT_LOCATION = "-323,67,-618"
352+
THE_DEEP_SEA_AP_REGION_TELEPORT_LOCATION = "713,21,15"
353+
#THE_DEEP_SEA_AP_REGION_TELEPORT_LOCATION = "-323,67,-618" (old teleport location near fastest squid in the West)
352354
SARA_SARA_SAND_BAR_AP_REGION = "Sara Sara Sand Bar"
355+
#The Deep Sea end
353356
NEPTUNE_SHRINE_AP_REGION = "Neptune Shrine"
354357
NEPTUNE_SHRINE_AP_REGION_TELEPORT_LOCATION = "-270,58,221"
358+
#Jade Cavern start
355359
JADE_CAVERN_AP_REGION = "Jade Cavern"
356360
JADE_CAVERN_AP_REGION_TELEPORT_LOCATION = "239,95,-113"
357361
JADE_WATERWAYS_AP_REGION = "Jade Waterways"
358362
JADE_WATERWAYS_AP_REGION_TELEPORT_LOCATION = "239,95,-113"
363+
#Jade Cavern end
359364
CONTINENTAL_TRAM_AP_REGION = "Continental Tram"
360365
CONTINENTAL_TRAM_AP_REGION_TELEPORT_LOCATION = "-129,68,64"
361366
#End Game
367+
#Ancient Labyrinth start
362368
ANCIENT_LABYRINTH_AP_REGION = "Ancient Labyrinth"
363369
ANCIENT_LABYRINTH_AP_REGION_TELEPORT_LOCATION = "-179,142,-313"
364370
LABYRINTH_WEIRD_REBAR_HALLWAY_AP_REGION = "Ancient Labyrinth Weird Rebar Hallway"
365371
LABYRINTH_CORE_AP_REGION = "Ancient Labyrinth Core"
372+
#Ancient Labyrinth end
366373
THE_SEQUOIA_AP_REGION = "The Sequoia"
367374
THE_SEQUOIA_AP_REGION_TELEPORT_LOCATION = "-268,221,-505"
368375
THE_DEPTHS_AP_REGION = "The Depths"

worlds/crystal_project/regions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1101,9 +1101,9 @@ def init_areas(world: "CrystalProjectWorld", locations: List[LocationData], opti
11011101
#Jidamba Eaclaneya end
11021102
#The Deep Sea start
11031103
fancy_add_exits(world, THE_DEEP_SEA_AP_REGION, [SARA_SARA_SAND_BAR_AP_REGION, THE_OPEN_SEA_AP_REGION, SALMON_ROOM_AP_REGION, NEPTUNE_SHRINE_AP_REGION, THE_DEPTHS_AP_REGION, THE_SEQUOIA_AP_REGION],
1104+
#Removed swimming rule from The Deep Sea into the Salmon Room b/c i'm using the Salmon Room as The Deep Sea starting location
11041105
{SARA_SARA_SAND_BAR_AP_REGION: lambda state: logic.has_swimming(state),
11051106
THE_OPEN_SEA_AP_REGION: lambda state: logic.has_swimming(state),
1106-
SALMON_ROOM_AP_REGION: lambda state: logic.has_swimming(state),
11071107
NEPTUNE_SHRINE_AP_REGION: lambda state: logic.has_swimming(state),
11081108
THE_DEPTHS_AP_REGION: lambda state: logic.has_swimming(state),
11091109
THE_SEQUOIA_AP_REGION: lambda state: logic.has_golden_quintar(state) or (logic.is_hop_to_it_pray() and logic.has_swimming(state) and logic.has_glide(state))})

0 commit comments

Comments
 (0)