Skip to content

Commit

Permalink
Merge pull request ArchipelagoMW#21 from gaithernOrg/dev
Browse files Browse the repository at this point in the history 
Added clam locations
  • Loading branch information
@gaithern
gaithern authored Jan 22, 2024
2 parents 437c0a5 + e42fce6 commit 6d53a7c
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 1 deletion.
17 changes: 17 additions & 0 deletions worlds/kh1/Locations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,23 @@ def get_locations_by_category(category: str) -> Dict[str, KH1LocationData]:

"Traverse Town Aero Event": KH1LocationData("Events", 265_6131),

"Atlantica Undersea Gorge Blizzard Clam": KH1LocationData("Clam", 265_6201),
"Atlantica Undersea Gorge Ocean Floor Clam": KH1LocationData("Clam", 265_6202),
"Atlantica Undersea Valley Higher Cave Clam": KH1LocationData("Clam", 265_6203),
"Atlantica Undersea Valley Lower Cave Clam": KH1LocationData("Clam", 265_6204),
"Atlantica Undersea Valley Fire Clam": KH1LocationData("Clam", 265_6205),
"Atlantica Undersea Valley Wall Clam": KH1LocationData("Clam", 265_6206),
"Atlantica Undersea Valley Pillar Clam": KH1LocationData("Clam", 265_6207),
"Atlantica Undersea Valley Ocean Floor Clam": KH1LocationData("Clam", 265_6208),
"Atlantica Triton's Palace Thunder Clam": KH1LocationData("Clam", 265_6209),
"Atlantica Triton's Palace Wall Right Clam": KH1LocationData("Clam", 265_6210),
"Atlantica Triton's Palace Near Path Clam": KH1LocationData("Clam", 265_6211),
"Atlantica Triton's Palace Wall Left Clam": KH1LocationData("Clam", 265_6212),
"Atlantica Cavern Nook Clam": KH1LocationData("Clam", 265_6213),
"Atlantica Below Deck Clam": KH1LocationData("Clam", 265_6214),
"Atlantica Undersea Garden Clam": KH1LocationData("Clam", 265_6215),
"Atlantica Undersea Cave Clam": KH1LocationData("Clam", 265_6216),

"Ansem's Secret Report 1": KH1LocationData("Reports", 265_7018),
"Ansem's Secret Report 2": KH1LocationData("Reports", 265_7017),
"Ansem's Secret Report 3": KH1LocationData("Reports", 265_7016),
Expand Down
18 changes: 18 additions & 0 deletions worlds/kh1/Regions.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,24 @@ def create_regions(multiworld: MultiWorld, player: int, goal: str, atlantica: bo

regions["Traverse Town"].locations.append("Traverse Town Aero Event")

if atlantica or goal == "atlantica":
regions["Atlantica"].locations.append("Atlantica Undersea Gorge Blizzard Clam")
regions["Atlantica"].locations.append("Atlantica Undersea Gorge Ocean Floor Clam")
regions["Atlantica"].locations.append("Atlantica Undersea Valley Higher Cave Clam")
regions["Atlantica"].locations.append("Atlantica Undersea Valley Lower Cave Clam")
regions["Atlantica"].locations.append("Atlantica Undersea Valley Fire Clam")
regions["Atlantica"].locations.append("Atlantica Undersea Valley Wall Clam")
regions["Atlantica"].locations.append("Atlantica Undersea Valley Pillar Clam")
regions["Atlantica"].locations.append("Atlantica Undersea Valley Ocean Floor Clam")
regions["Atlantica"].locations.append("Atlantica Triton's Palace Thunder Clam")
regions["Atlantica"].locations.append("Atlantica Triton's Palace Wall Right Clam")
regions["Atlantica"].locations.append("Atlantica Triton's Palace Near Path Clam")
regions["Atlantica"].locations.append("Atlantica Triton's Palace Wall Left Clam")
regions["Atlantica"].locations.append("Atlantica Cavern Nook Clam")
regions["Atlantica"].locations.append("Atlantica Below Deck Clam")
regions["Atlantica"].locations.append("Atlantica Undersea Garden Clam")
regions["Atlantica"].locations.append("Atlantica Undersea Cave Clam")

regions["Agrabah"].locations.append("Ansem's Secret Report 1")
regions["Hollow Bastion"].locations.append("Ansem's Secret Report 2")
if atlantica or goal == "atlantica":
Expand Down
20 changes: 19 additions & 1 deletion worlds/kh1/Rules.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def has_evidence(state: CollectionState, player: int) -> bool:
return state.has("Footprints", player) #or state.has("Stench", player) or state.has("Claw Marks", player) or state.has("Antenna", player)

def can_glide(state: CollectionState, player: int) -> bool:
return state.has("Glide", player) or state.has("Super Glide", player)
return state.has("Glide", player) or state.has("Superglide", player)

def has_emblems(state: CollectionState, player: int) -> bool:
return state.has("Emblem Piece (Flame)", player) and state.has("Emblem Piece (Chest)", player) and state.has("Emblem Piece (Statue)", player) and state.has("Emblem Piece (Fountain)", player)
Expand Down Expand Up @@ -322,6 +322,24 @@ def set_rules(multiworld: MultiWorld, player: int, goal: str, atlantica: bool):
multiworld.get_location("Traverse Town Mail Postcard 10 Event" , player).access_rule = lambda state: has_postcards(state, player, 10)

multiworld.get_location("Traverse Town Aero Event" , player).access_rule = lambda state: has_item(state, player, "Red Trinity")

if atlantica or goal == "atlantica":
multiworld.get_location("Atlantica Undersea Gorge Blizzard Clam" , player).access_rule = lambda state: has_item(state, player, "Progressive Blizzard")
#multiworld.get_location("Atlantica Undersea Gorge Ocean Floor Clam" , player).access_rule = lambda state: has_item(state, player, "")
#multiworld.get_location("Atlantica Undersea Valley Higher Cave Clam" , player).access_rule = lambda state: has_item(state, player, "")
#multiworld.get_location("Atlantica Undersea Valley Lower Cave Clam" , player).access_rule = lambda state: has_item(state, player, "")
multiworld.get_location("Atlantica Undersea Valley Fire Clam" , player).access_rule = lambda state: has_item(state, player, "Progressive Fire")
#multiworld.get_location("Atlantica Undersea Valley Wall Clam" , player).access_rule = lambda state: has_item(state, player, "")
#multiworld.get_location("Atlantica Undersea Valley Pillar Clam" , player).access_rule = lambda state: has_item(state, player, "")
#multiworld.get_location("Atlantica Undersea Valley Ocean Floor Clam" , player).access_rule = lambda state: has_item(state, player, "")
multiworld.get_location("Atlantica Triton's Palace Thunder Clam" , player).access_rule = lambda state: has_item(state, player, "Progressive Thunder")
#multiworld.get_location("Atlantica Triton's Palace Wall Right Clam" , player).access_rule = lambda state: has_item(state, player, "")
#multiworld.get_location("Atlantica Triton's Palace Near Path Clam" , player).access_rule = lambda state: has_item(state, player, "")
#multiworld.get_location("Atlantica Triton's Palace Wall Left Clam" , player).access_rule = lambda state: has_item(state, player, "")
#multiworld.get_location("Atlantica Cavern Nook Clam" , player).access_rule = lambda state: has_item(state, player, "")
#multiworld.get_location("Atlantica Below Deck Clam" , player).access_rule = lambda state: has_item(state, player, "")
#multiworld.get_location("Atlantica Undersea Garden Clam" , player).access_rule = lambda state: has_item(state, player, "")
#multiworld.get_location("Atlantica Undersea Cave Clam" , player).access_rule = lambda state: has_item(state, player, "")

#multiworld.get_location("Ansem's Secret Report 1" , player).access_rule = lambda state: has_item(state, player, "")
multiworld.get_location("Ansem's Secret Report 2" , player).access_rule = lambda state: has_emblems(state, player)
Expand Down

0 comments on commit 6d53a7c

Please sign in to comment.