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

Author: dragonsbutalsorabbits

worlds/crystal_project/constants/ap_regions.py

@@ -160,6 +160,7 @@
 JIDAMBA_ATOLLS_AP_REGION = "Jidamba Atolls"
 BAZAAR_COAST_AP_REGION = "Sara Sara Bazaar Coast"
 #The Open Sea end
+#Shoudu Province start
 SHOUDU_DOCKSIDE_AP_REGION = "Shoudu Province Dockside"
 SHOUDU_DOCKSIDE_AP_REGION_TELEPORT_LOCATION = "756,101,-166"
 SHOUDU_PROVINCE_PROPER_AP_REGION = "Shoudu Province Proper"
@@ -169,6 +170,8 @@
 SHOUDU_FIELDS_WEST_SCAFFOLDING_AP_REGION = "Shoudu Fields and Western Scaffolding"
 SHOUDU_GOLD_NEAR_GANYMEDE_AP_REGION = "Gold Near Ganymede"
 SKY_ARENA_AP_REGION = "Sky Arena"
+SHOUDU_WATERWAYS_AP_REGION = "Shoudu Waterways"
+#Shoudu Province end
 THE_UNDERCITY_AP_REGION = "The Undercity"
 THE_UNDERCITY_AP_REGION_TELEPORT_LOCATION = "732,97,-197"
 #Ganymede Shrine start

worlds/crystal_project/constants/display_regions.py

@@ -69,7 +69,7 @@
 THE_OPEN_SEA_DISPLAY_NAME = "The Open Sea"
 THE_OPEN_SEA_DISPLAY_SUBREGIONS = [THE_OPEN_SEA_AP_REGION, JIDAMBA_ATOLLS_AP_REGION, BAZAAR_COAST_AP_REGION]
 SHOUDU_PROVINCE_DISPLAY_NAME = "Shoudu Province"
-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_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]
 THE_UNDERCITY_DISPLAY_NAME = "The Undercity"
 THE_UNDERCITY_DISPLAY_SUBREGIONS = [THE_UNDERCITY_AP_REGION]
 GANYMEDE_SHRINE_DISPLAY_NAME = "Ganymede Shrine"

worlds/crystal_project/constants/home_points.py

@@ -7,18 +7,18 @@
 HOMEPOINT_OLD_NANS_WATERING_HOLE_NAME = "HomePoint - Old Nan's Watering Hole"
 HOMEPOINT_OLD_NANS_WATERING_HOLE_AP_REGION = SPAWNING_MEADOWS_AP_REGION
 #Delende
-HOMEPOINT_THE_PALE_GROTTO_ENTRANCE_NAME = "HomePoint - The Pale Grotto Entrance"
-HOMEPOINT_THE_PALE_GROTTO_ENTRANCE_AP_REGION = DELENDE_PLAINS_AP_REGION
-HOMEPOINT_SOILED_DEN_NAME = "HomePoint - Soiled Den"
-HOMEPOINT_SOILED_DEN_AP_REGION = DELENDE_PLAINS_AP_REGION
 HOMEPOINT_FISH_HATCHERY_NAME = "HomePoint - Fish Hatchery"
 HOMEPOINT_FISH_HATCHERY_AP_REGION = DELENDE_PLAINS_AP_REGION
-HOMEPOINT_CABIN_ON_THE_CLIFF_NAME = "HomePoint - Cabin On The Cliff"
-HOMEPOINT_CABIN_ON_THE_CLIFF_AP_REGION = DELENDE_HIGH_BRIDGES_AP_REGION
+HOMEPOINT_SOILED_DEN_NAME = "HomePoint - Soiled Den"
+HOMEPOINT_SOILED_DEN_AP_REGION = DELENDE_PLAINS_AP_REGION
+HOMEPOINT_THE_PALE_GROTTO_ENTRANCE_NAME = "HomePoint - The Pale Grotto Entrance"
+HOMEPOINT_THE_PALE_GROTTO_ENTRANCE_AP_REGION = DELENDE_PLAINS_AP_REGION
 HOMEPOINT_DELENDE_FALLS_NAME = "HomePoint - Delende Falls"
 HOMEPOINT_DELENDE_FALLS_AP_REGION = DELENDE_HIGH_BRIDGES_AP_REGION
 HOMEPOINT_DELENDE_PEAK_NAME = "HomePoint - Delende Peak"
 HOMEPOINT_DELENDE_PEAK_AP_REGION = DELENDE_PEAK_AP_REGION
+HOMEPOINT_CABIN_ON_THE_CLIFF_NAME = "HomePoint - Cabin On The Cliff"
+HOMEPOINT_CABIN_ON_THE_CLIFF_AP_REGION = DELENDE_HIGH_BRIDGES_AP_REGION
 #Mercury Shrine
 HOMEPOINT_MERCURY_SHRINE_NAME = "HomePoint - Mercury Shrine"
 HOMEPOINT_MERCURY_SHRINE_AP_REGION = MERCURY_SHRINE_AP_REGION
@@ -44,26 +44,26 @@
 #Capital Sequoia
 HOMEPOINT_SKUMPARADISE_EXIT_NAME = "HomePoint - Skumparadise Exit"
 HOMEPOINT_SKUMPARADISE_EXIT_AP_REGION = CAPITAL_SEQUOIA_AP_REGION
-HOMEPOINT_GAEA_SHRINE_NAME = "HomePoint - Gaea Shrine"
-HOMEPOINT_GAEA_SHRINE_AP_REGION = CAPITAL_SEQUOIA_AP_REGION
-HOMEPOINT_EAST_MARKET_DISTRICT_NAME = "HomePoint - East Market District"
-HOMEPOINT_EAST_MARKET_DISTRICT_AP_REGION = CAPITAL_SEQUOIA_AP_REGION
-HOMEPOINT_BULLETIN_SQUARE_NAME = "HomePoint - Bulletin Square"
-HOMEPOINT_BULLETIN_SQUARE_AP_REGION = CAPITAL_SEQUOIA_AP_REGION
-HOMEPOINT_KNOW_IT_ALL_DUCKS_HOUSE_NAME = "HomePoint - Know-It-All Ducks' House"
-HOMEPOINT_KNOW_IT_ALL_DUCKS_HOUSE_AP_REGION = CAPITAL_SEQUOIA_AP_REGION
 HOMEPOINT_WEST_MARKET_DISTRICT_NAME = "HomePoint - West Market District"
 HOMEPOINT_WEST_MARKET_DISTRICT_AP_REGION = CAPITAL_SEQUOIA_AP_REGION
+HOMEPOINT_KNOW_IT_ALL_DUCKS_HOUSE_NAME = "HomePoint - Know-It-All Ducks' House"
+HOMEPOINT_KNOW_IT_ALL_DUCKS_HOUSE_AP_REGION = CAPITAL_SEQUOIA_AP_REGION
+HOMEPOINT_EAST_MARKET_DISTRICT_NAME = "HomePoint - East Market District"
+HOMEPOINT_EAST_MARKET_DISTRICT_AP_REGION = CAPITAL_SEQUOIA_AP_REGION
 HOMEPOINT_TRAINING_GROUNDS_NAME = "HomePoint - Training Grounds"
 HOMEPOINT_TRAINING_GROUNDS_AP_REGION = CAPITAL_SEQUOIA_AP_REGION
+HOMEPOINT_BULLETIN_SQUARE_NAME = "HomePoint - Bulletin Square"
+HOMEPOINT_BULLETIN_SQUARE_AP_REGION = CAPITAL_SEQUOIA_AP_REGION
+HOMEPOINT_GAEA_SHRINE_NAME = "HomePoint - Gaea Shrine"
+HOMEPOINT_GAEA_SHRINE_AP_REGION = CAPITAL_SEQUOIA_AP_REGION
 #Boomer Society
 HOMEPOINT_BOOMER_SOCIETY_NAME = "HomePoint - Boomer Society"
 HOMEPOINT_BOOMER_SOCIETY_AP_REGION = BOOMER_SOCIETY_AP_REGION
 #Rolling Quintar Fields
-HOMEPOINT_QUINTAR_ENTHUSIASTS_HOUSE_NAME = "HomePoint - Quintar Enthusiast's House"
-HOMEPOINT_QUINTAR_ENTHUSIASTS_HOUSE_AP_REGION = ROLLING_QUINTAR_FIELDS_AP_REGION
 HOMEPOINT_RENT_A_QUINTAR_NAME = "HomePoint - Rent-A-Quintar"
 HOMEPOINT_RENT_A_QUINTAR_AP_REGION = ROLLING_QUINTAR_FIELDS_AP_REGION
+HOMEPOINT_QUINTAR_ENTHUSIASTS_HOUSE_NAME = "HomePoint - Quintar Enthusiast's House"
+HOMEPOINT_QUINTAR_ENTHUSIASTS_HOUSE_AP_REGION = ROLLING_QUINTAR_FIELDS_AP_REGION
 HOMEPOINT_QUINTAR_SANCTUM_NAME = "HomePoint - Quintar Sanctum"
 HOMEPOINT_QUINTAR_SANCTUM_AP_REGION = SANCTUM_ENTRANCE_AP_REGION
 #Quintar Sanctum
@@ -116,20 +116,20 @@
 HOMEPOINT_SAILORS_RAFT_NAME = "HomePoint - Sailor's Raft"
 HOMEPOINT_SAILORS_RAFT_AP_REGION = THE_OPEN_SEA_AP_REGION
 #Shoudu Province
-HOMEPOINT_SHOUDU_FIELDS_NAME = "HomePoint - Shoudu Fields"
-HOMEPOINT_SHOUDU_FIELDS_AP_REGION = SHOUDU_FIELDS_WEST_SCAFFOLDING_AP_REGION
-HOMEPOINT_SHOUDU_MARKET_NAME = "HomePoint - Shoudu Market"
-HOMEPOINT_SHOUDU_MARKET_AP_REGION = SHOUDU_PROVINCE_PROPER_AP_REGION
 HOMEPOINT_SHOUDU_PORT_NAME = "HomePoint - Shoudu Port"
 HOMEPOINT_SHOUDU_PORT_AP_REGION = SHOUDU_DOCKSIDE_AP_REGION
 HOMEPOINT_SHANTY_INN_NAME = "HomePoint - Shanty Inn"
 HOMEPOINT_SHANTY_INN_AP_REGION = SHOUDU_DOCKSIDE_AP_REGION
-HOMEPOINT_SKY_ARENA_NAME = "HomePoint - Sky Arena"
-HOMEPOINT_SKY_ARENA_AP_REGION = SKY_ARENA_AP_REGION
+HOMEPOINT_SHOUDU_MARKET_NAME = "HomePoint - Shoudu Market"
+HOMEPOINT_SHOUDU_MARKET_AP_REGION = SHOUDU_PROVINCE_PROPER_AP_REGION
 HOMEPOINT_PRIZE_COUNTER_NAME = "HomePoint - Prize Counter"
 HOMEPOINT_PRIZE_COUNTER_AP_REGION = SHOUDU_PROVINCE_PROPER_AP_REGION
 HOMEPOINT_SHOUDU_ELEVATOR_NAME = "HomePoint - Shoudu Elevator"
 HOMEPOINT_SHOUDU_ELEVATOR_AP_REGION = SHOUDU_ELEVATOR_BASE_AP_REGION
+HOMEPOINT_SHOUDU_FIELDS_NAME = "HomePoint - Shoudu Fields"
+HOMEPOINT_SHOUDU_FIELDS_AP_REGION = SHOUDU_FIELDS_WEST_SCAFFOLDING_AP_REGION
+HOMEPOINT_SKY_ARENA_NAME = "HomePoint - Sky Arena"
+HOMEPOINT_SKY_ARENA_AP_REGION = SKY_ARENA_AP_REGION
 #The Undercity
 HOMEPOINT_THE_UNDERCITY_NAME = "HomePoint - The Undercity"
 HOMEPOINT_THE_UNDERCITY_AP_REGION = THE_UNDERCITY_AP_REGION
@@ -151,33 +151,33 @@
 HOMEPOINT_FLYERS_LOOKOUT_NAME = "HomePoint - Flyer's Lookout"
 HOMEPOINT_FLYERS_LOOKOUT_AP_REGION = DIONE_SHRINE_AP_REGION
 #Tall, Tall Heights
-HOMEPOINT_SEQUOIA_ATHENAEUM_NAME = "HomePoint - Sequoia Athenaeum"
-HOMEPOINT_SEQUOIA_ATHENAEUM_AP_REGION = SEQUOIA_ATHENAEUM_ENTRANCE_AP_REGION
+HOMEPOINT_TALL_TALL_HEIGHTS_NAME = "HomePoint - Tall, Tall Heights"
+HOMEPOINT_TALL_TALL_HEIGHTS_AP_REGION = TALL_TALL_SAVE_POINT_AP_REGION
+HOMEPOINT_ICE_FISHERS_HUT_NAME = "HomePoint - Ice Fisher's Hut"
+HOMEPOINT_ICE_FISHERS_HUT_AP_REGION = LOWER_ICE_LAKES_AP_REGION
 HOMEPOINT_ICE_PASS_NAME = "HomePoint - Ice Pass"
 HOMEPOINT_ICE_PASS_AP_REGION = LOWER_ICE_LAKES_AP_REGION
-HOMEPOINT_TALL_TALL_SOUVENIR_SHOP_NAME = "HomePoint - Tall, Tall Souvenir Shop"
-HOMEPOINT_TALL_TALL_SOUVENIR_SHOP_AP_REGION = SOUVENIR_SHOP_AP_REGION
 HOMEPOINT_LANDS_END_COTTAGE_NAME = "HomePoint - Land's End Cottage"
 HOMEPOINT_LANDS_END_COTTAGE_AP_REGION = LOWER_ICE_LAKES_AP_REGION
-HOMEPOINT_SLIP_GLIDE_RIDE_EXIT_NAME = "HomePoint - Slip Glide Ride Exit"
-HOMEPOINT_SLIP_GLIDE_RIDE_EXIT_AP_REGION = SLIP_GLIDE_RIDE_EXIT_AP_REGION
-HOMEPOINT_ICE_FISHERS_HUT_NAME = "HomePoint - Ice Fisher's Hut"
-HOMEPOINT_ICE_FISHERS_HUT_AP_REGION = LOWER_ICE_LAKES_AP_REGION
 HOMEPOINT_TRITON_SHRINE_NAME = "HomePoint - Triton Shrine"
 HOMEPOINT_TRITON_SHRINE_AP_REGION = UPPER_ICE_LAKES_AP_REGION
-HOMEPOINT_TALL_TALL_HEIGHTS_NAME = "HomePoint - Tall, Tall Heights"
-HOMEPOINT_TALL_TALL_HEIGHTS_AP_REGION = TALL_TALL_SAVE_POINT_AP_REGION
+HOMEPOINT_SLIP_GLIDE_RIDE_EXIT_NAME = "HomePoint - Slip Glide Ride Exit"
+HOMEPOINT_SLIP_GLIDE_RIDE_EXIT_AP_REGION = SLIP_GLIDE_RIDE_EXIT_AP_REGION
+HOMEPOINT_TALL_TALL_SOUVENIR_SHOP_NAME = "HomePoint - Tall, Tall Souvenir Shop"
+HOMEPOINT_TALL_TALL_SOUVENIR_SHOP_AP_REGION = SOUVENIR_SHOP_AP_REGION
+HOMEPOINT_SEQUOIA_ATHENAEUM_NAME = "HomePoint - Sequoia Athenaeum"
+HOMEPOINT_SEQUOIA_ATHENAEUM_AP_REGION = SEQUOIA_ATHENAEUM_ENTRANCE_AP_REGION
 #Land's End
 HOMEPOINT_SUMMIT_SHRINE_NAME = "HomePoint - Summit Shrine"
 HOMEPOINT_SUMMIT_SHRINE_AP_REGION = LANDS_END_AP_REGION
 #Slip Glide Ride
 HOMEPOINT_SLIP_GLIDE_RIDE_ENTRANCE_NAME = "HomePoint - Slip Glide Ride Entrance"
 HOMEPOINT_SLIP_GLIDE_RIDE_ENTRANCE_AP_REGION = SLIP_GLIDE_RIDE_ENTRANCE_AP_REGION
 #Castle Ramparts
-HOMEPOINT_EAST_RAMPARTS_NAME = "HomePoint - East Ramparts"
-HOMEPOINT_EAST_RAMPARTS_AP_REGION = PEAK_RAMPARTS_AP_REGION
 HOMEPOINT_WEST_RAMPARTS_NAME = "HomePoint - West Ramparts"
 HOMEPOINT_WEST_RAMPARTS_AP_REGION = PEAK_RAMPARTS_AP_REGION
+HOMEPOINT_EAST_RAMPARTS_NAME = "HomePoint - East Ramparts"
+HOMEPOINT_EAST_RAMPARTS_AP_REGION = PEAK_RAMPARTS_AP_REGION
 #The Chalice of Tar
 HOMEPOINT_THE_CHALICE_OF_TAR_NAME = "HomePoint - The Chalice of Tar"
 HOMEPOINT_THE_CHALICE_OF_TAR_AP_REGION = CHALICE_FOOT_AP_REGION
@@ -209,7 +209,7 @@
 #The New World
 HOMEPOINT_ASTLEYS_SHRINE_NAME = "HomePoint - Astley's Shrine"
 HOMEPOINT_ASTLEYS_SHRINE_AP_REGION = THE_NEW_WORLD_AP_REGION
-HOMEPOINT_ASTLEYS_KEEP_NAME = "HomePoint - Astley's Keep"
-HOMEPOINT_ASTLEYS_KEEP_AP_REGION = THE_NEW_WORLD_AP_REGION
 HOMEPOINT_DISCIPLINE_HOLLOW_NAME = "HomePoint - Discipline Hollow"
-HOMEPOINT_DISCIPLINE_HOLLOW_AP_REGION = DISCIPLINE_HOLLOW_AP_REGION
+HOMEPOINT_DISCIPLINE_HOLLOW_AP_REGION = DISCIPLINE_HOLLOW_AP_REGION
+HOMEPOINT_ASTLEYS_KEEP_NAME = "HomePoint - Astley's Keep"
+HOMEPOINT_ASTLEYS_KEEP_AP_REGION = THE_NEW_WORLD_AP_REGION

worlds/crystal_project/locations.py

@@ -1985,7 +1985,7 @@ def get_region_completion_locations() -> List[LocationData]:
         LocationData(SALMON_BAY_AP_REGION, SALMON_BAY_DISPLAY_NAME + " Region Completion", 6030 + regionsanity_index_offset, regionsanity=True),
         LocationData(THE_OPEN_SEA_AP_REGION, THE_OPEN_SEA_DISPLAY_NAME + " Region Completion", 6031 + regionsanity_index_offset, regionsanity=True),
         LocationData(SHOUDU_WATERFRONT_AP_REGION, SHOUDU_WATERFRONT_DISPLAY_NAME + " Region Completion", 6032 + regionsanity_index_offset, regionsanity=True),
-        LocationData(SHOUDU_PROVINCE_PROPER_AP_REGION, SHOUDU_PROVINCE_DISPLAY_NAME + " Region Completion", 6033 + regionsanity_index_offset, regionsanity=True),
+        LocationData(SHOUDU_DOCKSIDE_AP_REGION, SHOUDU_PROVINCE_DISPLAY_NAME + " Region Completion", 6033 + regionsanity_index_offset, regionsanity=True),
         LocationData(THE_UNDERCITY_AP_REGION, THE_UNDERCITY_DISPLAY_NAME + " Region Completion", 6034 + regionsanity_index_offset, regionsanity=True),
         LocationData(GANYMEDE_SHRINE_AP_REGION, GANYMEDE_SHRINE_DISPLAY_NAME + " Region Completion", 6035 + regionsanity_index_offset, regionsanity=True),
         LocationData(BEAURIOR_VOLCANO_AP_REGION, BEAURIOR_VOLCANO_DISPLAY_NAME + " Region Completion", 6036 + regionsanity_index_offset, regionsanity=True),