Skip to content

Commit cc399d2

Browse files
committed
Shoudu refactor to be correct for homepoint hustle
1 parent 992bedc commit cc399d2

File tree

6 files changed

+214
-170
lines changed

6 files changed

+214
-170
lines changed

worlds/crystal_project/constants/ap_regions.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,15 @@
160160
JIDAMBA_ATOLLS_AP_REGION = "Jidamba Atolls"
161161
BAZAAR_COAST_AP_REGION = "Sara Sara Bazaar Coast"
162162
#The Open Sea end
163-
SHOUDU_PROVINCE_AP_REGION = "Shoudu Province"
164-
SHOUDU_PROVINCE_AP_REGION_TELEPORT_LOCATION = "756,101,-166"
163+
SHOUDU_DOCKSIDE_AP_REGION = "Shoudu Province Dockside"
164+
SHOUDU_DOCKSIDE_AP_REGION_TELEPORT_LOCATION = "756,101,-166"
165+
SHOUDU_PROVINCE_PROPER_AP_REGION = "Shoudu Province Proper"
166+
SHOUDU_ELEVATOR_BASE_AP_REGION = "Shoudu Province Elevator Base"
167+
NORTHEAST_MIDPOINT_SCAFFOLDING_AP_REGION = "Shoudu Province Northeast Midpoint Scaffolding"
168+
NORTHEAST_UPPER_SCAFFOLDING_AP_REGION = "Shoudu Province Northeast Upper Scaffolding"
169+
SHOUDU_FIELDS_WEST_SCAFFOLDING_AP_REGION = "Shoudu Fields and Western Scaffolding"
170+
SHOUDU_GOLD_NEAR_GANYMEDE_AP_REGION = "Gold Near Ganymede"
171+
SKY_ARENA_AP_REGION = "Sky Arena"
165172
THE_UNDERCITY_AP_REGION = "The Undercity"
166173
THE_UNDERCITY_AP_REGION_TELEPORT_LOCATION = "732,97,-197"
167174
#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_PROVINCE_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]
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: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,19 +117,19 @@
117117
HOMEPOINT_SAILORS_RAFT_AP_REGION = THE_OPEN_SEA_AP_REGION
118118
#Shoudu Province
119119
HOMEPOINT_SHOUDU_FIELDS_NAME = "HomePoint - Shoudu Fields"
120-
HOMEPOINT_SHOUDU_FIELDS_AP_REGION = SHOUDU_PROVINCE_AP_REGION
120+
HOMEPOINT_SHOUDU_FIELDS_AP_REGION = SHOUDU_FIELDS_WEST_SCAFFOLDING_AP_REGION
121121
HOMEPOINT_SHOUDU_MARKET_NAME = "HomePoint - Shoudu Market"
122-
HOMEPOINT_SHOUDU_MARKET_AP_REGION = SHOUDU_PROVINCE_AP_REGION
122+
HOMEPOINT_SHOUDU_MARKET_AP_REGION = SHOUDU_PROVINCE_PROPER_AP_REGION
123123
HOMEPOINT_SHOUDU_PORT_NAME = "HomePoint - Shoudu Port"
124-
HOMEPOINT_SHOUDU_PORT_AP_REGION = SHOUDU_PROVINCE_AP_REGION
124+
HOMEPOINT_SHOUDU_PORT_AP_REGION = SHOUDU_DOCKSIDE_AP_REGION
125125
HOMEPOINT_SHANTY_INN_NAME = "HomePoint - Shanty Inn"
126-
HOMEPOINT_SHANTY_INN_AP_REGION = SHOUDU_PROVINCE_AP_REGION
126+
HOMEPOINT_SHANTY_INN_AP_REGION = SHOUDU_DOCKSIDE_AP_REGION
127127
HOMEPOINT_SKY_ARENA_NAME = "HomePoint - Sky Arena"
128-
HOMEPOINT_SKY_ARENA_AP_REGION = SHOUDU_PROVINCE_AP_REGION
128+
HOMEPOINT_SKY_ARENA_AP_REGION = SKY_ARENA_AP_REGION
129129
HOMEPOINT_PRIZE_COUNTER_NAME = "HomePoint - Prize Counter"
130-
HOMEPOINT_PRIZE_COUNTER_AP_REGION = SHOUDU_PROVINCE_AP_REGION
130+
HOMEPOINT_PRIZE_COUNTER_AP_REGION = SHOUDU_PROVINCE_PROPER_AP_REGION
131131
HOMEPOINT_SHOUDU_ELEVATOR_NAME = "HomePoint - Shoudu Elevator"
132-
HOMEPOINT_SHOUDU_ELEVATOR_AP_REGION = SHOUDU_PROVINCE_AP_REGION
132+
HOMEPOINT_SHOUDU_ELEVATOR_AP_REGION = SHOUDU_ELEVATOR_BASE_AP_REGION
133133
#The Undercity
134134
HOMEPOINT_THE_UNDERCITY_NAME = "HomePoint - The Undercity"
135135
HOMEPOINT_THE_UNDERCITY_AP_REGION = THE_UNDERCITY_AP_REGION

0 commit comments

Comments
 (0)