Skip to content

Commit 139c9f0

Browse files
committed
level rules to sky arena
1 parent 5a25884 commit 139c9f0

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

worlds/crystal_project/Locations.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -800,16 +800,16 @@ def get_locations(player: Optional[int], options: Optional[CrystalProjectOptions
800800
LocationData("Shoudu Province", "Shoudu Province Chest - 5 Sky Arena Wins room 2", 2723 + treasure_index_offset, logic.has_vertical_movement), #Gaia Axe chest
801801
LocationData("Shoudu Province", "Shoudu Province Chest - 5 Sky Arena Wins room 3", 2813 + treasure_index_offset, logic.has_vertical_movement), #Money chest
802802
LocationData("Shoudu Province", "Shoudu Province Chest - 5 Sky Arena Wins room 4", 2753 + treasure_index_offset, logic.has_vertical_movement), #Gaia Vest chest
803-
LocationData("Shoudu Province", "Shoudu Province Chest - 8 Sky Arena Wins room 1", 2665 + treasure_index_offset, logic.has_vertical_movement), #Gravedigger chest
804-
LocationData("Shoudu Province", "Shoudu Province Chest - 8 Sky Arena Wins room 2", 2805 + treasure_index_offset, logic.has_vertical_movement), #Malifice chest
805-
LocationData("Shoudu Province", "Shoudu Province Chest - 8 Sky Arena Wins room 3", 2800 + treasure_index_offset, logic.has_vertical_movement), #Wizards Wall chest
803+
LocationData("Shoudu Province", "Shoudu Province Chest - 8 Sky Arena Wins room 1", 2665 + treasure_index_offset, lambda state: logic.is_area_in_level_range(state, 4) and logic.has_vertical_movement), #Gravedigger chest
804+
LocationData("Shoudu Province", "Shoudu Province Chest - 8 Sky Arena Wins room 2", 2805 + treasure_index_offset, lambda state: logic.is_area_in_level_range(state, 4) and logic.has_vertical_movement), #Malifice chest
805+
LocationData("Shoudu Province", "Shoudu Province Chest - 8 Sky Arena Wins room 3", 2800 + treasure_index_offset, lambda state: logic.is_area_in_level_range(state, 4) and logic.has_vertical_movement), #Wizards Wall chest
806806
LocationData("Shoudu Province", "Shoudu Province Chest - Fall through broken grate below Sky Arena building", 2951 + treasure_index_offset, logic.has_vertical_movement), #Potion chest
807807
LocationData("Shoudu Province", "Shoudu Province Chest - Lurking above spike ball pit by goldsmith", 2984 + treasure_index_offset, logic.has_vertical_movement), #(753, 105, -176) Tincture Pouch chest
808-
LocationData("Shoudu Province", "Shoudu Province Chest - 10 Sky Arena Wins room 1", 2756 + treasure_index_offset, logic.has_vertical_movement), #(753, 134, -263) Yasha chest
809-
LocationData("Shoudu Province", "Shoudu Province Chest - 10 Sky Arena Wins room 2", 2928 + treasure_index_offset, logic.has_vertical_movement), #(754, 134, -264) Muramasa chest
810-
LocationData("Shoudu Province", "Shoudu Province Chest - 10 Sky Arena Wins room 3", 2929 + treasure_index_offset, logic.has_vertical_movement), #(755, 134, -263) Shadow Gi chest
811-
LocationData("Shoudu Province", "Shoudu Province Chest - Fall through floorboards of 10 Sky Arena Wins room 1", 3763 + treasure_index_offset, logic.has_vertical_movement), #(754, 130, -264) Zether chest
812-
LocationData("Shoudu Province", "Shoudu Province Chest - Fall through floorboards of 10 Sky Arena Wins room 2", 3764 + treasure_index_offset, logic.has_vertical_movement), #(755, 130, -263) Z-Potion chest
808+
LocationData("Shoudu Province", "Shoudu Province Chest - 10 Sky Arena Wins room 1", 2756 + treasure_index_offset, lambda state: logic.is_area_in_level_range(state, 5) and logic.has_vertical_movement), #(753, 134, -263) Yasha chest
809+
LocationData("Shoudu Province", "Shoudu Province Chest - 10 Sky Arena Wins room 2", 2928 + treasure_index_offset, lambda state: logic.is_area_in_level_range(state, 5) and logic.has_vertical_movement), #(754, 134, -264) Muramasa chest
810+
LocationData("Shoudu Province", "Shoudu Province Chest - 10 Sky Arena Wins room 3", 2929 + treasure_index_offset, lambda state: logic.is_area_in_level_range(state, 5) and logic.has_vertical_movement), #(755, 134, -263) Shadow Gi chest
811+
LocationData("Shoudu Province", "Shoudu Province Chest - Fall through floorboards of 10 Sky Arena Wins room 1", 3763 + treasure_index_offset, lambda state: logic.is_area_in_level_range(state, 5) and logic.has_vertical_movement), #(754, 130, -264) Zether chest
812+
LocationData("Shoudu Province", "Shoudu Province Chest - Fall through floorboards of 10 Sky Arena Wins room 2", 3764 + treasure_index_offset, lambda state: logic.is_area_in_level_range(state, 5) and logic.has_vertical_movement), #(755, 130, -263) Z-Potion chest
813813

814814
#NPCs
815815
#Todo NPCs Job Masters: Master Assassin ID 3605 (769, 123, -201); gives you Assassin Seal in exchange for job mastery
@@ -820,19 +820,19 @@ def get_locations(player: Optional[int], options: Optional[CrystalProjectOptions
820820
LocationData("Shoudu Province", "Shoudu Province NPC - Sky Arena 4 Wins Prize", 51922 + npc_index_offset, logic.has_vertical_movement), #(765, 125, -248)
821821
LocationData("Shoudu Province", "Shoudu Province NPC - Sky Arena 6 Wins Prize", 51923 + npc_index_offset, logic.has_vertical_movement), #(765, 125, -248)
822822
LocationData("Shoudu Province", "Shoudu Province NPC - Sky Arena 7 Wins Prize", 51924 + npc_index_offset, logic.has_vertical_movement), #(765, 125, -248)
823-
LocationData("Shoudu Province", "Shoudu Province NPC - Sky Arena 9 Wins Prize", 1921 + npc_index_offset, logic.has_vertical_movement), #(765, 125, -248)
824-
LocationData("Shoudu Province", "Shoudu Province NPC - 10 Sky Arena Wins room Diamond 1", 2833 + npc_index_offset, logic.has_vertical_movement), #(752, 133, -262) Dust
825-
LocationData("Shoudu Province", "Shoudu Province NPC - 10 Sky Arena Wins room Diamond 2", 2811 + npc_index_offset, logic.has_vertical_movement), #(756, 133, -261) Ingot
826-
LocationData("Shoudu Province", "Shoudu Province NPC - Diamond through a hole in the 10 Sky Arena Wins room floor", 2832 + npc_index_offset, logic.has_vertical_movement), #(753, 130, -264) Ore
823+
LocationData("Shoudu Province", "Shoudu Province NPC - Sky Arena 9 Wins Prize", 1921 + npc_index_offset, lambda state: logic.is_area_in_level_range(state, 5) and logic.has_vertical_movement), #(765, 125, -248)
824+
LocationData("Shoudu Province", "Shoudu Province NPC - 10 Sky Arena Wins room Diamond 1", 2833 + npc_index_offset, lambda state: logic.is_area_in_level_range(state, 5) and logic.has_vertical_movement), #(752, 133, -262) Dust
825+
LocationData("Shoudu Province", "Shoudu Province NPC - 10 Sky Arena Wins room Diamond 2", 2811 + npc_index_offset, lambda state: logic.is_area_in_level_range(state, 5) and logic.has_vertical_movement), #(756, 133, -261) Ingot
826+
LocationData("Shoudu Province", "Shoudu Province NPC - Diamond through a hole in the 10 Sky Arena Wins room floor", 2832 + npc_index_offset, lambda state: logic.is_area_in_level_range(state, 5) and logic.has_vertical_movement), #(753, 130, -264) Ore
827827
LocationData("Shoudu Province", "Shoudu Province NPC - Gold at back reservoir wall", 2827 + npc_index_offset, logic.has_vertical_movement and logic.has_swimming), #Ingot
828828
LocationData("Shoudu Province", "Shoudu Province NPC - Gold in farmland on way to shrine", 2821 + npc_index_offset, logic.has_vertical_movement), #Ingot
829829
LocationData("Shoudu Province", "Shoudu Province NPC - Gold near sky fishing", 2834 + npc_index_offset, logic.has_vertical_movement), #Ore
830830
LocationData("Shoudu Province", "Shoudu Province NPC - Gold in 2 Sky Arena Wins room", 2829 + npc_index_offset, logic.has_vertical_movement), #Dust
831831
LocationData("Shoudu Province", "Shoudu Province NPC - Gold in 5 Sky Arena Wins room 1", 2720 + npc_index_offset, logic.has_vertical_movement), #Ore
832832
LocationData("Shoudu Province", "Shoudu Province NPC - Gold in 5 Sky Arena Wins room 2", 2722 + npc_index_offset, logic.has_vertical_movement), #Ingot
833833
LocationData("Shoudu Province", "Shoudu Province NPC - Gold in 5 Sky Arena Wins room 3", 2721 + npc_index_offset, logic.has_vertical_movement), #Dust
834-
LocationData("Shoudu Province", "Shoudu Province NPC - Gold in 8 Sky Arena Wins room 1", 2830 + npc_index_offset, logic.has_vertical_movement), #Ingot
835-
LocationData("Shoudu Province", "Shoudu Province NPC - Gold in 8 Sky Arena Wins room 2", 2831 + npc_index_offset, logic.has_vertical_movement), #Ore
834+
LocationData("Shoudu Province", "Shoudu Province NPC - Gold in 8 Sky Arena Wins room 1", 2830 + npc_index_offset, lambda state: logic.is_area_in_level_range(state, 4) and logic.has_vertical_movement), #Ingot
835+
LocationData("Shoudu Province", "Shoudu Province NPC - Gold in 8 Sky Arena Wins room 2", 2831 + npc_index_offset, lambda state: logic.is_area_in_level_range(state, 4) and logic.has_vertical_movement), #Ore
836836

837837
#Crystals
838838
LocationData("Shoudu Province", "Shoudu Province Crystal - Samurai for 3 Sky Arena wins", 1206 + crystal_index_offset, logic.has_vertical_movement),

0 commit comments

Comments
 (0)