Skip to content

Commit 5763b6e

Browse files
dragonsbutalsorabbitsdragonsbutalsorabbits
committed
minor organization of home point locations file
1 parent 87da20a commit 5763b6e

File tree

1 file changed

+65
-57
lines changed

1 file changed

+65
-57
lines changed

‎worlds/crystal_project/home_point_locations.py‎

Lines changed: 65 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -11,90 +11,100 @@
1111
def get_home_points(player: int, options: Optional[CrystalProjectOptions]) -> List[LocationData]:
1212
logic = CrystalProjectLogic(player, options) # pyright: ignore [reportArgumentType]
1313
home_point_table: List[LocationData] = [
14+
#Beginner
15+
#Spawning Meadows
1416
LocationData(HOMEPOINT_AP_SPAWN_AP_REGION, HOMEPOINT_AP_SPAWN_NAME, 5003),
1517
LocationData(HOMEPOINT_OLD_NANS_WATERING_HOLE_AP_REGION, HOMEPOINT_OLD_NANS_WATERING_HOLE_NAME, 59),
16-
18+
#Delende
1719
LocationData(HOMEPOINT_THE_PALE_GROTTO_ENTRANCE_AP_REGION, HOMEPOINT_THE_PALE_GROTTO_ENTRANCE_NAME, 44),
1820
LocationData(HOMEPOINT_SOILED_DEN_AP_REGION, HOMEPOINT_SOILED_DEN_NAME, 66),
1921
LocationData(HOMEPOINT_FISH_HATCHERY_AP_REGION, HOMEPOINT_FISH_HATCHERY_NAME, 127),
2022
LocationData(HOMEPOINT_CABIN_ON_THE_CLIFF_AP_REGION, HOMEPOINT_CABIN_ON_THE_CLIFF_NAME, 94),
2123
LocationData(HOMEPOINT_DELENDE_FALLS_AP_REGION, HOMEPOINT_DELENDE_FALLS_NAME, 186),
2224
LocationData(HOMEPOINT_DELENDE_PEAK_AP_REGION, HOMEPOINT_DELENDE_PEAK_NAME, 160),
23-
25+
#Mercury Shrine
2426
LocationData(HOMEPOINT_MERCURY_SHRINE_AP_REGION, HOMEPOINT_MERCURY_SHRINE_NAME, 152),
25-
27+
#The Pale Grotto
2628
LocationData(HOMEPOINT_THE_PALE_GROTTO_RUINS_AP_REGION, HOMEPOINT_THE_PALE_GROTTO_RUINS_NAME, 148),
27-
29+
#Seaside Cliffs
2830
LocationData(HOMEPOINT_SEASIDE_CLIFFS_AP_REGION, HOMEPOINT_SEASIDE_CLIFFS_CAMP_NAME, 72),
29-
31+
#Yamagawa M.A.
3032
LocationData(HOMEPOINT_YAMAGAWA_MA_SUMMIT_AP_REGION, HOMEPOINT_YAMAGAWA_MA_SUMMIT_NAME, 165),
31-
33+
#Proving Meadows
3234
LocationData(HOMEPOINT_PROVING_MEADOWS_CAMP_AP_REGION, HOMEPOINT_PROVING_MEADOWS_CAMP_NAME, 119),
33-
35+
#Skumparadise
3436
LocationData(HOMEPOINT_SKUMPARADISE_ENTRANCE_AP_REGION, HOMEPOINT_SKUMPARADISE_ENTRANCE_NAME, 637),
3537
LocationData(HOMEPOINT_SKUMPARADISE_DEPTHS_AP_REGION, HOMEPOINT_SKUMPARADISE_DEPTHS_NAME, 331),
3638

39+
#Advanced
40+
#Capital Sequoia
3741
LocationData(HOMEPOINT_SKUMPARADISE_EXIT_AP_REGION, HOMEPOINT_SKUMPARADISE_EXIT_NAME, 231),
3842
LocationData(HOMEPOINT_GAEA_SHRINE_AP_REGION, HOMEPOINT_GAEA_SHRINE_NAME, 112),
3943
LocationData(HOMEPOINT_EAST_MARKET_DISTRICT_AP_REGION, HOMEPOINT_EAST_MARKET_DISTRICT_NAME, 374),
4044
LocationData(HOMEPOINT_BULLETIN_SQUARE_AP_REGION, HOMEPOINT_BULLETIN_SQUARE_NAME, 890),
4145
LocationData(HOMEPOINT_KNOW_IT_ALL_DUCKS_HOUSE_AP_REGION, HOMEPOINT_KNOW_IT_ALL_DUCKS_HOUSE_NAME, 559),
4246
LocationData(HOMEPOINT_WEST_MARKET_DISTRICT_AP_REGION, HOMEPOINT_WEST_MARKET_DISTRICT_NAME, 2026),
4347
LocationData(HOMEPOINT_TRAINING_GROUNDS_AP_REGION, HOMEPOINT_TRAINING_GROUNDS_NAME, 3057),
44-
45-
LocationData(HOMEPOINT_CAPITAL_JAIL_ENTRANCE_AP_REGION, HOMEPOINT_CAPITAL_JAIL_ENTRANCE_NAME, 643),
46-
LocationData(HOMEPOINT_CAPITAL_JAIL_DARK_WING_AP_REGION, HOMEPOINT_CAPITAL_JAIL_DARK_WING_NAME, 915),
47-
48+
#Boomer Society
49+
LocationData(HOMEPOINT_BOOMER_SOCIETY_AP_REGION, HOMEPOINT_BOOMER_SOCIETY_NAME, 170),
50+
#Rolling Quintar Fields
4851
LocationData(HOMEPOINT_QUINTAR_ENTHUSIASTS_HOUSE_AP_REGION, HOMEPOINT_QUINTAR_ENTHUSIASTS_HOUSE_NAME, 440),
4952
LocationData(HOMEPOINT_RENT_A_QUINTAR_AP_REGION, HOMEPOINT_RENT_A_QUINTAR_NAME, 462),
5053
LocationData(HOMEPOINT_QUINTAR_SANCTUM_AP_REGION, HOMEPOINT_QUINTAR_SANCTUM_NAME, 917),
51-
54+
#Quintar Sanctum
5255
LocationData(HOMEPOINT_QUINTAR_NAMEKO_AP_REGION, HOMEPOINT_QUINTAR_NAMEKO_NAME, 968),
53-
54-
LocationData(HOMEPOINT_BOOMER_SOCIETY_AP_REGION, HOMEPOINT_BOOMER_SOCIETY_NAME, 170),
55-
56+
#Capital Jail
57+
LocationData(HOMEPOINT_CAPITAL_JAIL_ENTRANCE_AP_REGION, HOMEPOINT_CAPITAL_JAIL_ENTRANCE_NAME, 643),
58+
LocationData(HOMEPOINT_CAPITAL_JAIL_DARK_WING_AP_REGION, HOMEPOINT_CAPITAL_JAIL_DARK_WING_NAME, 915),
59+
#Capital Pipeline
60+
LocationData(HOMEPOINT_CAPITAL_PIPELINE_AP_REGION, HOMEPOINT_CAPITAL_PIPELINE_NAME, 1127),
61+
LocationData(HOMEPOINT_EAST_CAPITAL_PIPELINE_AP_REGION, HOMEPOINT_EAST_CAPITAL_PIPELINE_NAME, 1420),
62+
#Okimoto N.S.
5663
LocationData(HOMEPOINT_OKIMOTO_N_S_BASE_AP_REGION, HOMEPOINT_OKIMOTO_N_S_BASE_NAME, 335),
5764
LocationData(HOMEPOINT_OKIMOTO_N_S_BASE_AP_REGION, HOMEPOINT_NINJA_YASHIKI_NAME, 366),
58-
65+
#Salmon Pass
5966
LocationData(HOMEPOINT_SALMON_PASS_ENTRANCE_AP_REGION, HOMEPOINT_SALMON_PASS_ENTRANCE_NAME, 367),
60-
67+
#Salmon River
6168
LocationData(HOMEPOINT_SALMON_SHACK_AP_REGION, HOMEPOINT_SALMON_SHACK_NAME, 1076),
62-
63-
LocationData(HOMEPOINT_CASTLE_SEQUOIA_FOYER_AP_REGION, HOMEPOINT_CASTLE_SEQUOIA_FOYER_NAME, 514),
64-
69+
#Poko Poko Desert
6570
LocationData(HOMEPOINT_LABYRINTH_ENCAMPMENT_AP_REGION, HOMEPOINT_LABYRINTH_ENCAMPMENT_NAME, 2712),
66-
71+
#Sara Sara Bazaar
6772
LocationData(HOMEPOINT_SARA_SARA_BAZAAR_PORT_AP_REGION, HOMEPOINT_SARA_SARA_BAZAAR_PORT_NAME, 941),
6873
LocationData(HOMEPOINT_POKO_POKO_WEST_GATE_AP_REGION, HOMEPOINT_POKO_POKO_WEST_GATE_NAME, 3783),
6974
LocationData(HOMEPOINT_POKO_POKO_EAST_GATE_AP_REGION, HOMEPOINT_POKO_POKO_EAST_GATE_NAME, 3784),
70-
75+
#Sara Sara Beach
7176
LocationData(HOMEPOINT_IBEKS_CAVE_AP_REGION, HOMEPOINT_IBEKS_CAVE_NAME, 2005),
7277
LocationData(HOMEPOINT_BEACH_BIRDS_NEST_AP_REGION, HOMEPOINT_BEACH_BIRDS_NEST_NAME, 2709),
73-
74-
LocationData(HOMEPOINT_BEAURIOR_ROCK_AP_REGION, HOMEPOINT_BEAURIOR_ROCK_NAME, 1792),
75-
#TODO: put volcano peak in separate ap region instead of included in Beaurior Rock (also items nearby, not just homepoint stone)
76-
LocationData(HOMEPOINT_BEAURIOR_VOLCANO_PEAK_AP_REGION, HOMEPOINT_BEAURIOR_VOLCANO_PEAK_NAME, 3037, lambda state: logic.has_key(state, SMALL_KEY, 4) and logic.has_key(state, BEAURIOR_BOSS_KEY)),
77-
78-
LocationData(HOMEPOINT_BOSS_ROOM_AP_REGION, HOMEPOINT_BOSS_ROOM_NAME, 822, lambda state: logic.has_key(state, SMALL_KEY, 4)),
79-
78+
#Ancient Reservoir
8079
LocationData(HOMEPOINT_ANCIENT_RESERVOIR_ENTRANCE_AP_REGION, HOMEPOINT_ANCIENT_RESERVOIR_ENTRANCE_NAME, 1124),
8180
LocationData(HOMEPOINT_MAIN_RESERVOIR_CHAMBER_AP_REGION, HOMEPOINT_MAIN_RESERVOIR_CHAMBER_NAME, 1660),
8281

82+
#Expert
83+
#The Open Sea
84+
LocationData(HOMEPOINT_SAILORS_RAFT_AP_REGION, HOMEPOINT_SAILORS_RAFT_NAME, 3775),
85+
#Shoudu Province
8386
LocationData(HOMEPOINT_SHOUDU_FIELDS_AP_REGION, HOMEPOINT_SHOUDU_FIELDS_NAME, 576, lambda state: logic.has_vertical_movement(state) or logic.has_glide(state) or state.can_reach(GANYMEDE_SHRINE_AP_REGION, player=player) or state.can_reach(QUINTAR_RESERVE_AP_REGION, player=player)),
8487
LocationData(HOMEPOINT_SHOUDU_MARKET_AP_REGION, HOMEPOINT_SHOUDU_MARKET_NAME, 577, lambda state: logic.has_vertical_movement(state) or logic.has_glide(state) or state.can_reach(GANYMEDE_SHRINE_AP_REGION, player=player) or state.can_reach(QUINTAR_RESERVE_AP_REGION, player=player)),
8588
LocationData(HOMEPOINT_SHOUDU_PORT_AP_REGION, HOMEPOINT_SHOUDU_PORT_NAME, 672),
8689
LocationData(HOMEPOINT_SHANTY_INN_AP_REGION, HOMEPOINT_SHANTY_INN_NAME, 1523),
8790
LocationData(HOMEPOINT_SKY_ARENA_AP_REGION, HOMEPOINT_SKY_ARENA_NAME, 1524, lambda state: logic.has_vertical_movement(state) or logic.has_glide(state) or state.can_reach(QUINTAR_RESERVE_AP_REGION, player=player)),
8891
LocationData(HOMEPOINT_PRIZE_COUNTER_AP_REGION, HOMEPOINT_PRIZE_COUNTER_NAME, 2731, lambda state: logic.has_vertical_movement(state) or logic.has_glide(state) or state.can_reach(GANYMEDE_SHRINE_AP_REGION, player=player) or state.can_reach(QUINTAR_RESERVE_AP_REGION, player=player)),
8992
LocationData(HOMEPOINT_SHOUDU_ELEVATOR_AP_REGION, HOMEPOINT_SHOUDU_ELEVATOR_NAME, 3523, lambda state: logic.has_vertical_movement(state) or logic.has_glide(state) or state.can_reach(GANYMEDE_SHRINE_AP_REGION, player=player) or state.can_reach(QUINTAR_RESERVE_AP_REGION, player=player)),
90-
91-
LocationData(HOMEPOINT_GANYMEDE_SHRINE_AP_REGION, HOMEPOINT_GANYMEDE_SHRINE_NAME, 1573),
92-
93+
#The Undercity
9394
LocationData(HOMEPOINT_THE_UNDERCITY_AP_REGION, HOMEPOINT_THE_UNDERCITY_NAME, 1266, lambda state: logic.has_swimming(state) or logic.has_horizontal_movement(state) or logic.has_vertical_movement(state) or state.can_reach(GANYMEDE_SHRINE_AP_REGION, player=player) or state.can_reach(QUINTAR_RESERVE_AP_REGION, player=player)),
94-
95-
LocationData(HOMEPOINT_CAPITAL_PIPELINE_AP_REGION, HOMEPOINT_CAPITAL_PIPELINE_NAME, 1127),
96-
LocationData(HOMEPOINT_EAST_CAPITAL_PIPELINE_AP_REGION, HOMEPOINT_EAST_CAPITAL_PIPELINE_NAME, 1420),
97-
95+
#Ganymede Shrine
96+
LocationData(HOMEPOINT_GANYMEDE_SHRINE_AP_REGION, HOMEPOINT_GANYMEDE_SHRINE_NAME, 1573),
97+
#Beaurior Volcano
98+
LocationData(HOMEPOINT_BEAURIOR_ROCK_AP_REGION, HOMEPOINT_BEAURIOR_ROCK_NAME, 1792),
99+
# TODO: put volcano peak in separate ap region instead of included in Beaurior Rock (also items nearby, not just homepoint stone)
100+
LocationData(HOMEPOINT_BEAURIOR_VOLCANO_PEAK_AP_REGION, HOMEPOINT_BEAURIOR_VOLCANO_PEAK_NAME, 3037, lambda state: logic.has_key(state, SMALL_KEY, 4) and logic.has_key(state, BEAURIOR_BOSS_KEY)),
101+
#Beaurior Rock
102+
LocationData(HOMEPOINT_BOSS_ROOM_AP_REGION, HOMEPOINT_BOSS_ROOM_NAME, 822, lambda state: logic.has_key(state, SMALL_KEY, 4)),
103+
#Quintar Reserve
104+
LocationData(HOMEPOINT_DIONE_SHRINE_AP_REGION, HOMEPOINT_DIONE_SHRINE_NAME, 1595),
105+
#Dione Shrine
106+
LocationData(HOMEPOINT_FLYERS_LOOKOUT_AP_REGION, HOMEPOINT_FLYERS_LOOKOUT_NAME, 2141),
107+
#Tall, Tall Heights
98108
LocationData(HOMEPOINT_SEQUOIA_ATHENAEUM_AP_REGION, HOMEPOINT_SEQUOIA_ATHENAEUM_NAME, 2361),
99109
LocationData(HOMEPOINT_ICE_PASS_AP_REGION, HOMEPOINT_ICE_PASS_NAME, 2413),
100110
LocationData(HOMEPOINT_TALL_TALL_SOUVENIR_SHOP_AP_REGION, HOMEPOINT_TALL_TALL_SOUVENIR_SHOP_NAME, 1260),
@@ -103,38 +113,36 @@ def get_home_points(player: int, options: Optional[CrystalProjectOptions]) -> Li
103113
LocationData(HOMEPOINT_ICE_FISHERS_HUT_AP_REGION, HOMEPOINT_ICE_FISHERS_HUT_NAME, 3014),
104114
LocationData(HOMEPOINT_TRITON_SHRINE_AP_REGION, HOMEPOINT_TRITON_SHRINE_NAME, 3018),
105115
LocationData(HOMEPOINT_TALL_TALL_HEIGHTS_AP_REGION, HOMEPOINT_TALL_TALL_HEIGHTS_NAME, 3047),
106-
116+
#Land's End
117+
LocationData(HOMEPOINT_SUMMIT_SHRINE_AP_REGION, HOMEPOINT_SUMMIT_SHRINE_NAME, 1559),
118+
#Slip Glide Ride
119+
LocationData(HOMEPOINT_SLIP_GLIDE_RIDE_ENTRANCE_AP_REGION, HOMEPOINT_SLIP_GLIDE_RIDE_ENTRANCE_NAME, 1550),
120+
#Castle Ramparts
107121
LocationData(HOMEPOINT_EAST_RAMPARTS_AP_REGION, HOMEPOINT_EAST_RAMPARTS_NAME, 1375),
108122
LocationData(HOMEPOINT_WEST_RAMPARTS_AP_REGION, HOMEPOINT_WEST_RAMPARTS_NAME, 1376),
109-
110-
LocationData(HOMEPOINT_SLIP_GLIDE_RIDE_ENTRANCE_AP_REGION, HOMEPOINT_SLIP_GLIDE_RIDE_ENTRANCE_NAME, 1550),
111-
112-
LocationData(HOMEPOINT_SUMMIT_SHRINE_AP_REGION, HOMEPOINT_SUMMIT_SHRINE_NAME, 1559),
113-
114-
LocationData(HOMEPOINT_DIONE_SHRINE_AP_REGION, HOMEPOINT_DIONE_SHRINE_NAME, 1595),
115-
123+
#The Chalice of Tar
124+
LocationData(HOMEPOINT_THE_CHALICE_OF_TAR_AP_REGION, HOMEPOINT_THE_CHALICE_OF_TAR_NAME, 3055),
125+
#Jidamba Tangle
116126
LocationData(HOMEPOINT_EUROPA_SHRINE_AP_REGION, HOMEPOINT_EUROPA_SHRINE_NAME, 1626),
117-
127+
#Jidamba Eaclaneya
118128
LocationData(HOMEPOINT_EACLANEYA_ENTRANCE_AP_REGION, HOMEPOINT_EACLANEYA_ENTRANCE_NAME, 1402),
119129
LocationData(HOMEPOINT_SALMON_ROOM_AP_REGION, HOMEPOINT_SALMON_ROOM_NAME, 2474),
130+
#Neptune Shrine
131+
LocationData(HOMEPOINT_NEPTUNE_SHRINE_AP_REGION, HOMEPOINT_NEPTUNE_SHRINE_NAME, 3781),
132+
#Continental Tram
133+
LocationData(HOMEPOINT_PLATFORM_A_AP_REGION, HOMEPOINT_PLATFORM_A_NAME, 3780),
120134

135+
#End-Game
136+
#Ancient Labyrinth
121137
LocationData(HOMEPOINT_ANCIENT_LABYRINTH_CORE_AP_REGION, HOMEPOINT_ANCIENT_LABYRINTH_CORE_NAME, 1739),
122-
123-
LocationData(HOMEPOINT_FLYERS_LOOKOUT_AP_REGION, HOMEPOINT_FLYERS_LOOKOUT_NAME, 2141),
124-
138+
#The Sequoia
125139
LocationData(HOMEPOINT_TOP_OF_THE_SEQUOIA_AP_REGION, HOMEPOINT_TOP_OF_THE_SEQUOIA_NAME, 2452),
126-
127-
LocationData(HOMEPOINT_THE_CHALICE_OF_TAR_AP_REGION, HOMEPOINT_THE_CHALICE_OF_TAR_NAME, 3055),
128-
129-
LocationData(HOMEPOINT_SAILORS_RAFT_AP_REGION, HOMEPOINT_SAILORS_RAFT_NAME, 3775),
130-
140+
#Castle Sequoia
141+
LocationData(HOMEPOINT_CASTLE_SEQUOIA_FOYER_AP_REGION, HOMEPOINT_CASTLE_SEQUOIA_FOYER_NAME, 514),
142+
#The New World
131143
LocationData(HOMEPOINT_ASTLEYS_SHRINE_AP_REGION, HOMEPOINT_ASTLEYS_SHRINE_NAME, 3776),
132144
LocationData(HOMEPOINT_ASTLEYS_KEEP_AP_REGION, HOMEPOINT_ASTLEYS_KEEP_NAME, 3777),
133145
LocationData(HOMEPOINT_DISCIPLINE_HOLLOW_AP_REGION, HOMEPOINT_DISCIPLINE_HOLLOW_NAME, 3797),
134-
135-
LocationData(HOMEPOINT_PLATFORM_A_AP_REGION, HOMEPOINT_PLATFORM_A_NAME, 3780),
136-
137-
LocationData(HOMEPOINT_NEPTUNE_SHRINE_AP_REGION, HOMEPOINT_NEPTUNE_SHRINE_NAME, 3781),
138146
]
139147

140148
return home_point_table

0 commit comments

Comments
 (0)