Skip to content

Commit c880f6e

Browse files
moved the Shoudu Region Completion to the correct AP Region; reorganized home_points.py file; added a few missing shoudu region connections and added Shoudu Waterways AP Region to make the region connections around there less likely to miss swimming routes
1 parent cc399d2 commit c880f6e

File tree

5 files changed

+98
-71
lines changed

5 files changed

+98
-71
lines changed

worlds/crystal_project/constants/ap_regions.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@
160160
JIDAMBA_ATOLLS_AP_REGION = "Jidamba Atolls"
161161
BAZAAR_COAST_AP_REGION = "Sara Sara Bazaar Coast"
162162
#The Open Sea end
163+
#Shoudu Province start
163164
SHOUDU_DOCKSIDE_AP_REGION = "Shoudu Province Dockside"
164165
SHOUDU_DOCKSIDE_AP_REGION_TELEPORT_LOCATION = "756,101,-166"
165166
SHOUDU_PROVINCE_PROPER_AP_REGION = "Shoudu Province Proper"
@@ -169,6 +170,8 @@
169170
SHOUDU_FIELDS_WEST_SCAFFOLDING_AP_REGION = "Shoudu Fields and Western Scaffolding"
170171
SHOUDU_GOLD_NEAR_GANYMEDE_AP_REGION = "Gold Near Ganymede"
171172
SKY_ARENA_AP_REGION = "Sky Arena"
173+
SHOUDU_WATERWAYS_AP_REGION = "Shoudu Waterways"
174+
#Shoudu Province end
172175
THE_UNDERCITY_AP_REGION = "The Undercity"
173176
THE_UNDERCITY_AP_REGION_TELEPORT_LOCATION = "732,97,-197"
174177
#Ganymede Shrine start

worlds/crystal_project/constants/display_regions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
THE_OPEN_SEA_DISPLAY_NAME = "The Open Sea"
7070
THE_OPEN_SEA_DISPLAY_SUBREGIONS = [THE_OPEN_SEA_AP_REGION, JIDAMBA_ATOLLS_AP_REGION, BAZAAR_COAST_AP_REGION]
7171
SHOUDU_PROVINCE_DISPLAY_NAME = "Shoudu Province"
72-
SHOUDU_PROVINCE_DISPLAY_SUBREGIONS = [SHOUDU_DOCKSIDE_AP_REGION, SHOUDU_PROVINCE_PROPER_AP_REGION, SHOUDU_ELEVATOR_BASE_AP_REGION, NORTHEAST_MIDPOINT_SCAFFOLDING_AP_REGION, NORTHEAST_UPPER_SCAFFOLDING_AP_REGION, SHOUDU_FIELDS_WEST_SCAFFOLDING_AP_REGION, SHOUDU_GOLD_NEAR_GANYMEDE_AP_REGION, SKY_ARENA_AP_REGION]
72+
SHOUDU_PROVINCE_DISPLAY_SUBREGIONS = [SHOUDU_DOCKSIDE_AP_REGION, SHOUDU_PROVINCE_PROPER_AP_REGION, SHOUDU_ELEVATOR_BASE_AP_REGION, NORTHEAST_MIDPOINT_SCAFFOLDING_AP_REGION, NORTHEAST_UPPER_SCAFFOLDING_AP_REGION, SHOUDU_FIELDS_WEST_SCAFFOLDING_AP_REGION, SHOUDU_GOLD_NEAR_GANYMEDE_AP_REGION, SKY_ARENA_AP_REGION, SHOUDU_WATERWAYS_AP_REGION]
7373
THE_UNDERCITY_DISPLAY_NAME = "The Undercity"
7474
THE_UNDERCITY_DISPLAY_SUBREGIONS = [THE_UNDERCITY_AP_REGION]
7575
GANYMEDE_SHRINE_DISPLAY_NAME = "Ganymede Shrine"

worlds/crystal_project/constants/home_points.py

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77
HOMEPOINT_OLD_NANS_WATERING_HOLE_NAME = "HomePoint - Old Nan's Watering Hole"
88
HOMEPOINT_OLD_NANS_WATERING_HOLE_AP_REGION = SPAWNING_MEADOWS_AP_REGION
99
#Delende
10-
HOMEPOINT_THE_PALE_GROTTO_ENTRANCE_NAME = "HomePoint - The Pale Grotto Entrance"
11-
HOMEPOINT_THE_PALE_GROTTO_ENTRANCE_AP_REGION = DELENDE_PLAINS_AP_REGION
12-
HOMEPOINT_SOILED_DEN_NAME = "HomePoint - Soiled Den"
13-
HOMEPOINT_SOILED_DEN_AP_REGION = DELENDE_PLAINS_AP_REGION
1410
HOMEPOINT_FISH_HATCHERY_NAME = "HomePoint - Fish Hatchery"
1511
HOMEPOINT_FISH_HATCHERY_AP_REGION = DELENDE_PLAINS_AP_REGION
16-
HOMEPOINT_CABIN_ON_THE_CLIFF_NAME = "HomePoint - Cabin On The Cliff"
17-
HOMEPOINT_CABIN_ON_THE_CLIFF_AP_REGION = DELENDE_HIGH_BRIDGES_AP_REGION
12+
HOMEPOINT_SOILED_DEN_NAME = "HomePoint - Soiled Den"
13+
HOMEPOINT_SOILED_DEN_AP_REGION = DELENDE_PLAINS_AP_REGION
14+
HOMEPOINT_THE_PALE_GROTTO_ENTRANCE_NAME = "HomePoint - The Pale Grotto Entrance"
15+
HOMEPOINT_THE_PALE_GROTTO_ENTRANCE_AP_REGION = DELENDE_PLAINS_AP_REGION
1816
HOMEPOINT_DELENDE_FALLS_NAME = "HomePoint - Delende Falls"
1917
HOMEPOINT_DELENDE_FALLS_AP_REGION = DELENDE_HIGH_BRIDGES_AP_REGION
2018
HOMEPOINT_DELENDE_PEAK_NAME = "HomePoint - Delende Peak"
2119
HOMEPOINT_DELENDE_PEAK_AP_REGION = DELENDE_PEAK_AP_REGION
20+
HOMEPOINT_CABIN_ON_THE_CLIFF_NAME = "HomePoint - Cabin On The Cliff"
21+
HOMEPOINT_CABIN_ON_THE_CLIFF_AP_REGION = DELENDE_HIGH_BRIDGES_AP_REGION
2222
#Mercury Shrine
2323
HOMEPOINT_MERCURY_SHRINE_NAME = "HomePoint - Mercury Shrine"
2424
HOMEPOINT_MERCURY_SHRINE_AP_REGION = MERCURY_SHRINE_AP_REGION
@@ -44,26 +44,26 @@
4444
#Capital Sequoia
4545
HOMEPOINT_SKUMPARADISE_EXIT_NAME = "HomePoint - Skumparadise Exit"
4646
HOMEPOINT_SKUMPARADISE_EXIT_AP_REGION = CAPITAL_SEQUOIA_AP_REGION
47-
HOMEPOINT_GAEA_SHRINE_NAME = "HomePoint - Gaea Shrine"
48-
HOMEPOINT_GAEA_SHRINE_AP_REGION = CAPITAL_SEQUOIA_AP_REGION
49-
HOMEPOINT_EAST_MARKET_DISTRICT_NAME = "HomePoint - East Market District"
50-
HOMEPOINT_EAST_MARKET_DISTRICT_AP_REGION = CAPITAL_SEQUOIA_AP_REGION
51-
HOMEPOINT_BULLETIN_SQUARE_NAME = "HomePoint - Bulletin Square"
52-
HOMEPOINT_BULLETIN_SQUARE_AP_REGION = CAPITAL_SEQUOIA_AP_REGION
53-
HOMEPOINT_KNOW_IT_ALL_DUCKS_HOUSE_NAME = "HomePoint - Know-It-All Ducks' House"
54-
HOMEPOINT_KNOW_IT_ALL_DUCKS_HOUSE_AP_REGION = CAPITAL_SEQUOIA_AP_REGION
5547
HOMEPOINT_WEST_MARKET_DISTRICT_NAME = "HomePoint - West Market District"
5648
HOMEPOINT_WEST_MARKET_DISTRICT_AP_REGION = CAPITAL_SEQUOIA_AP_REGION
49+
HOMEPOINT_KNOW_IT_ALL_DUCKS_HOUSE_NAME = "HomePoint - Know-It-All Ducks' House"
50+
HOMEPOINT_KNOW_IT_ALL_DUCKS_HOUSE_AP_REGION = CAPITAL_SEQUOIA_AP_REGION
51+
HOMEPOINT_EAST_MARKET_DISTRICT_NAME = "HomePoint - East Market District"
52+
HOMEPOINT_EAST_MARKET_DISTRICT_AP_REGION = CAPITAL_SEQUOIA_AP_REGION
5753
HOMEPOINT_TRAINING_GROUNDS_NAME = "HomePoint - Training Grounds"
5854
HOMEPOINT_TRAINING_GROUNDS_AP_REGION = CAPITAL_SEQUOIA_AP_REGION
55+
HOMEPOINT_BULLETIN_SQUARE_NAME = "HomePoint - Bulletin Square"
56+
HOMEPOINT_BULLETIN_SQUARE_AP_REGION = CAPITAL_SEQUOIA_AP_REGION
57+
HOMEPOINT_GAEA_SHRINE_NAME = "HomePoint - Gaea Shrine"
58+
HOMEPOINT_GAEA_SHRINE_AP_REGION = CAPITAL_SEQUOIA_AP_REGION
5959
#Boomer Society
6060
HOMEPOINT_BOOMER_SOCIETY_NAME = "HomePoint - Boomer Society"
6161
HOMEPOINT_BOOMER_SOCIETY_AP_REGION = BOOMER_SOCIETY_AP_REGION
6262
#Rolling Quintar Fields
63-
HOMEPOINT_QUINTAR_ENTHUSIASTS_HOUSE_NAME = "HomePoint - Quintar Enthusiast's House"
64-
HOMEPOINT_QUINTAR_ENTHUSIASTS_HOUSE_AP_REGION = ROLLING_QUINTAR_FIELDS_AP_REGION
6563
HOMEPOINT_RENT_A_QUINTAR_NAME = "HomePoint - Rent-A-Quintar"
6664
HOMEPOINT_RENT_A_QUINTAR_AP_REGION = ROLLING_QUINTAR_FIELDS_AP_REGION
65+
HOMEPOINT_QUINTAR_ENTHUSIASTS_HOUSE_NAME = "HomePoint - Quintar Enthusiast's House"
66+
HOMEPOINT_QUINTAR_ENTHUSIASTS_HOUSE_AP_REGION = ROLLING_QUINTAR_FIELDS_AP_REGION
6767
HOMEPOINT_QUINTAR_SANCTUM_NAME = "HomePoint - Quintar Sanctum"
6868
HOMEPOINT_QUINTAR_SANCTUM_AP_REGION = SANCTUM_ENTRANCE_AP_REGION
6969
#Quintar Sanctum
@@ -116,20 +116,20 @@
116116
HOMEPOINT_SAILORS_RAFT_NAME = "HomePoint - Sailor's Raft"
117117
HOMEPOINT_SAILORS_RAFT_AP_REGION = THE_OPEN_SEA_AP_REGION
118118
#Shoudu Province
119-
HOMEPOINT_SHOUDU_FIELDS_NAME = "HomePoint - Shoudu Fields"
120-
HOMEPOINT_SHOUDU_FIELDS_AP_REGION = SHOUDU_FIELDS_WEST_SCAFFOLDING_AP_REGION
121-
HOMEPOINT_SHOUDU_MARKET_NAME = "HomePoint - Shoudu Market"
122-
HOMEPOINT_SHOUDU_MARKET_AP_REGION = SHOUDU_PROVINCE_PROPER_AP_REGION
123119
HOMEPOINT_SHOUDU_PORT_NAME = "HomePoint - Shoudu Port"
124120
HOMEPOINT_SHOUDU_PORT_AP_REGION = SHOUDU_DOCKSIDE_AP_REGION
125121
HOMEPOINT_SHANTY_INN_NAME = "HomePoint - Shanty Inn"
126122
HOMEPOINT_SHANTY_INN_AP_REGION = SHOUDU_DOCKSIDE_AP_REGION
127-
HOMEPOINT_SKY_ARENA_NAME = "HomePoint - Sky Arena"
128-
HOMEPOINT_SKY_ARENA_AP_REGION = SKY_ARENA_AP_REGION
123+
HOMEPOINT_SHOUDU_MARKET_NAME = "HomePoint - Shoudu Market"
124+
HOMEPOINT_SHOUDU_MARKET_AP_REGION = SHOUDU_PROVINCE_PROPER_AP_REGION
129125
HOMEPOINT_PRIZE_COUNTER_NAME = "HomePoint - Prize Counter"
130126
HOMEPOINT_PRIZE_COUNTER_AP_REGION = SHOUDU_PROVINCE_PROPER_AP_REGION
131127
HOMEPOINT_SHOUDU_ELEVATOR_NAME = "HomePoint - Shoudu Elevator"
132128
HOMEPOINT_SHOUDU_ELEVATOR_AP_REGION = SHOUDU_ELEVATOR_BASE_AP_REGION
129+
HOMEPOINT_SHOUDU_FIELDS_NAME = "HomePoint - Shoudu Fields"
130+
HOMEPOINT_SHOUDU_FIELDS_AP_REGION = SHOUDU_FIELDS_WEST_SCAFFOLDING_AP_REGION
131+
HOMEPOINT_SKY_ARENA_NAME = "HomePoint - Sky Arena"
132+
HOMEPOINT_SKY_ARENA_AP_REGION = SKY_ARENA_AP_REGION
133133
#The Undercity
134134
HOMEPOINT_THE_UNDERCITY_NAME = "HomePoint - The Undercity"
135135
HOMEPOINT_THE_UNDERCITY_AP_REGION = THE_UNDERCITY_AP_REGION
@@ -151,33 +151,33 @@
151151
HOMEPOINT_FLYERS_LOOKOUT_NAME = "HomePoint - Flyer's Lookout"
152152
HOMEPOINT_FLYERS_LOOKOUT_AP_REGION = DIONE_SHRINE_AP_REGION
153153
#Tall, Tall Heights
154-
HOMEPOINT_SEQUOIA_ATHENAEUM_NAME = "HomePoint - Sequoia Athenaeum"
155-
HOMEPOINT_SEQUOIA_ATHENAEUM_AP_REGION = SEQUOIA_ATHENAEUM_ENTRANCE_AP_REGION
154+
HOMEPOINT_TALL_TALL_HEIGHTS_NAME = "HomePoint - Tall, Tall Heights"
155+
HOMEPOINT_TALL_TALL_HEIGHTS_AP_REGION = TALL_TALL_SAVE_POINT_AP_REGION
156+
HOMEPOINT_ICE_FISHERS_HUT_NAME = "HomePoint - Ice Fisher's Hut"
157+
HOMEPOINT_ICE_FISHERS_HUT_AP_REGION = LOWER_ICE_LAKES_AP_REGION
156158
HOMEPOINT_ICE_PASS_NAME = "HomePoint - Ice Pass"
157159
HOMEPOINT_ICE_PASS_AP_REGION = LOWER_ICE_LAKES_AP_REGION
158-
HOMEPOINT_TALL_TALL_SOUVENIR_SHOP_NAME = "HomePoint - Tall, Tall Souvenir Shop"
159-
HOMEPOINT_TALL_TALL_SOUVENIR_SHOP_AP_REGION = SOUVENIR_SHOP_AP_REGION
160160
HOMEPOINT_LANDS_END_COTTAGE_NAME = "HomePoint - Land's End Cottage"
161161
HOMEPOINT_LANDS_END_COTTAGE_AP_REGION = LOWER_ICE_LAKES_AP_REGION
162-
HOMEPOINT_SLIP_GLIDE_RIDE_EXIT_NAME = "HomePoint - Slip Glide Ride Exit"
163-
HOMEPOINT_SLIP_GLIDE_RIDE_EXIT_AP_REGION = SLIP_GLIDE_RIDE_EXIT_AP_REGION
164-
HOMEPOINT_ICE_FISHERS_HUT_NAME = "HomePoint - Ice Fisher's Hut"
165-
HOMEPOINT_ICE_FISHERS_HUT_AP_REGION = LOWER_ICE_LAKES_AP_REGION
166162
HOMEPOINT_TRITON_SHRINE_NAME = "HomePoint - Triton Shrine"
167163
HOMEPOINT_TRITON_SHRINE_AP_REGION = UPPER_ICE_LAKES_AP_REGION
168-
HOMEPOINT_TALL_TALL_HEIGHTS_NAME = "HomePoint - Tall, Tall Heights"
169-
HOMEPOINT_TALL_TALL_HEIGHTS_AP_REGION = TALL_TALL_SAVE_POINT_AP_REGION
164+
HOMEPOINT_SLIP_GLIDE_RIDE_EXIT_NAME = "HomePoint - Slip Glide Ride Exit"
165+
HOMEPOINT_SLIP_GLIDE_RIDE_EXIT_AP_REGION = SLIP_GLIDE_RIDE_EXIT_AP_REGION
166+
HOMEPOINT_TALL_TALL_SOUVENIR_SHOP_NAME = "HomePoint - Tall, Tall Souvenir Shop"
167+
HOMEPOINT_TALL_TALL_SOUVENIR_SHOP_AP_REGION = SOUVENIR_SHOP_AP_REGION
168+
HOMEPOINT_SEQUOIA_ATHENAEUM_NAME = "HomePoint - Sequoia Athenaeum"
169+
HOMEPOINT_SEQUOIA_ATHENAEUM_AP_REGION = SEQUOIA_ATHENAEUM_ENTRANCE_AP_REGION
170170
#Land's End
171171
HOMEPOINT_SUMMIT_SHRINE_NAME = "HomePoint - Summit Shrine"
172172
HOMEPOINT_SUMMIT_SHRINE_AP_REGION = LANDS_END_AP_REGION
173173
#Slip Glide Ride
174174
HOMEPOINT_SLIP_GLIDE_RIDE_ENTRANCE_NAME = "HomePoint - Slip Glide Ride Entrance"
175175
HOMEPOINT_SLIP_GLIDE_RIDE_ENTRANCE_AP_REGION = SLIP_GLIDE_RIDE_ENTRANCE_AP_REGION
176176
#Castle Ramparts
177-
HOMEPOINT_EAST_RAMPARTS_NAME = "HomePoint - East Ramparts"
178-
HOMEPOINT_EAST_RAMPARTS_AP_REGION = PEAK_RAMPARTS_AP_REGION
179177
HOMEPOINT_WEST_RAMPARTS_NAME = "HomePoint - West Ramparts"
180178
HOMEPOINT_WEST_RAMPARTS_AP_REGION = PEAK_RAMPARTS_AP_REGION
179+
HOMEPOINT_EAST_RAMPARTS_NAME = "HomePoint - East Ramparts"
180+
HOMEPOINT_EAST_RAMPARTS_AP_REGION = PEAK_RAMPARTS_AP_REGION
181181
#The Chalice of Tar
182182
HOMEPOINT_THE_CHALICE_OF_TAR_NAME = "HomePoint - The Chalice of Tar"
183183
HOMEPOINT_THE_CHALICE_OF_TAR_AP_REGION = CHALICE_FOOT_AP_REGION
@@ -209,7 +209,7 @@
209209
#The New World
210210
HOMEPOINT_ASTLEYS_SHRINE_NAME = "HomePoint - Astley's Shrine"
211211
HOMEPOINT_ASTLEYS_SHRINE_AP_REGION = THE_NEW_WORLD_AP_REGION
212-
HOMEPOINT_ASTLEYS_KEEP_NAME = "HomePoint - Astley's Keep"
213-
HOMEPOINT_ASTLEYS_KEEP_AP_REGION = THE_NEW_WORLD_AP_REGION
214212
HOMEPOINT_DISCIPLINE_HOLLOW_NAME = "HomePoint - Discipline Hollow"
215-
HOMEPOINT_DISCIPLINE_HOLLOW_AP_REGION = DISCIPLINE_HOLLOW_AP_REGION
213+
HOMEPOINT_DISCIPLINE_HOLLOW_AP_REGION = DISCIPLINE_HOLLOW_AP_REGION
214+
HOMEPOINT_ASTLEYS_KEEP_NAME = "HomePoint - Astley's Keep"
215+
HOMEPOINT_ASTLEYS_KEEP_AP_REGION = THE_NEW_WORLD_AP_REGION

worlds/crystal_project/locations.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1985,7 +1985,7 @@ def get_region_completion_locations() -> List[LocationData]:
19851985
LocationData(SALMON_BAY_AP_REGION, SALMON_BAY_DISPLAY_NAME + " Region Completion", 6030 + regionsanity_index_offset, regionsanity=True),
19861986
LocationData(THE_OPEN_SEA_AP_REGION, THE_OPEN_SEA_DISPLAY_NAME + " Region Completion", 6031 + regionsanity_index_offset, regionsanity=True),
19871987
LocationData(SHOUDU_WATERFRONT_AP_REGION, SHOUDU_WATERFRONT_DISPLAY_NAME + " Region Completion", 6032 + regionsanity_index_offset, regionsanity=True),
1988-
LocationData(SHOUDU_PROVINCE_PROPER_AP_REGION, SHOUDU_PROVINCE_DISPLAY_NAME + " Region Completion", 6033 + regionsanity_index_offset, regionsanity=True),
1988+
LocationData(SHOUDU_DOCKSIDE_AP_REGION, SHOUDU_PROVINCE_DISPLAY_NAME + " Region Completion", 6033 + regionsanity_index_offset, regionsanity=True),
19891989
LocationData(THE_UNDERCITY_AP_REGION, THE_UNDERCITY_DISPLAY_NAME + " Region Completion", 6034 + regionsanity_index_offset, regionsanity=True),
19901990
LocationData(GANYMEDE_SHRINE_AP_REGION, GANYMEDE_SHRINE_DISPLAY_NAME + " Region Completion", 6035 + regionsanity_index_offset, regionsanity=True),
19911991
LocationData(BEAURIOR_VOLCANO_AP_REGION, BEAURIOR_VOLCANO_DISPLAY_NAME + " Region Completion", 6036 + regionsanity_index_offset, regionsanity=True),

0 commit comments

Comments
 (0)