Skip to content

Commit

Permalink
Logic Changes
Browse files Browse the repository at this point in the history
  • Loading branch information
gaithern committed Jan 3, 2024
1 parent 424df26 commit 9130be2
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 68 deletions.
50 changes: 25 additions & 25 deletions worlds/kh1/Locations.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def get_locations_by_category(category: str) -> Dict[str, KH1LocationData]:
"Traverse Town Secret Waterway Near Stairs Chest": KH1LocationData("Chests", 265_0894),
"Wonderland Rabbit Hole Green Trinity Chest": KH1LocationData("Chests", 265_0931),
#"Wonderland Rabbit Hole Defeat Heartless After Trial Chest": KH1LocationData("Chests", 265_0933), missable
"Wonderland Rabbit Hole Defeat Heartless After Hollow Bastion Chest": KH1LocationData("Chests", 265_0934),
#"Wonderland Rabbit Hole Defeat Heartless After Hollow Bastion Chest": KH1LocationData("Chests", 265_0934), Go mode, just remove
"Wonderland Bizarre Room Green Trinity Chest": KH1LocationData("Chests", 265_0971),
"Wonderland Queen's Castle Hedge Left Red Chest": KH1LocationData("Chests", 265_1011),
"Wonderland Queen's Castle Hedge Right Blue Chest": KH1LocationData("Chests", 265_1012),
Expand Down Expand Up @@ -220,36 +220,36 @@ def get_locations_by_category(category: str) -> Dict[str, KH1LocationData]:
"Hollow Bastion Grand Hall Steps Right Side Chest": KH1LocationData("Chests", 265_4454),
"Hollow Bastion Grand Hall Oblivion Chest": KH1LocationData("Chests", 265_4491),
"Hollow Bastion Grand Hall Left of Gate Chest": KH1LocationData("Chests", 265_4492),
"Hollow Bastion Entrance Hall Push the Statue Chest": KH1LocationData("Chests", 265_4493),
#"Hollow Bastion Entrance Hall Push the Statue Chest": KH1LocationData("Chests", 265_4493),
"Hollow Bastion Rising Falls White Trinity Chest": KH1LocationData("Chests", 265_4494),
"End of the World Final Dimension 1st Chest": KH1LocationData("Chests", 265_4531),
"End of the World Final Dimension 2nd Chest": KH1LocationData("Chests", 265_4532),
"End of the World Final Dimension 3rd Chest": KH1LocationData("Chests", 265_4533),
"End of the World Final Dimension 4th Chest": KH1LocationData("Chests", 265_4534),
"End of the World Final Dimension 5th Chest": KH1LocationData("Chests", 265_4571),
"End of the World Final Dimension 6th Chest": KH1LocationData("Chests", 265_4572),
"End of the World Final Dimension 10th Chest": KH1LocationData("Chests", 265_4573),
"End of the World Final Dimension 9th Chest": KH1LocationData("Chests", 265_4574),
"End of the World Final Dimension 8th Chest": KH1LocationData("Chests", 265_4611),
"End of the World Final Dimension 7th Chest": KH1LocationData("Chests", 265_4612),
"End of the World Giant Crevasse 3rd Chest": KH1LocationData("Chests", 265_4613),
"End of the World Giant Crevasse 1st Chest": KH1LocationData("Chests", 265_4651),
"End of the World Giant Crevasse 4th Chest": KH1LocationData("Chests", 265_4652),
"End of the World Giant Crevasse 2nd Chest": KH1LocationData("Chests", 265_4653),
"End of the World World Terminus Traverse Town Chest": KH1LocationData("Chests", 265_4654),
"End of the World World Terminus Wonderland Chest": KH1LocationData("Chests", 265_4691),
"End of the World World Terminus Olympus Coliseum Chest": KH1LocationData("Chests", 265_4692),
"End of the World World Terminus Deep Jungle Chest": KH1LocationData("Chests", 265_4693),
"End of the World World Terminus Agrabah Chest": KH1LocationData("Chests", 265_4694),
"End of the World World Terminus Atlantica Chest": KH1LocationData("Chests", 265_4731),
"End of the World World Terminus Halloween Town Chest": KH1LocationData("Chests", 265_4732),
"End of the World World Terminus Neverland Chest": KH1LocationData("Chests", 265_4733),
#"End of the World Final Dimension 1st Chest": KH1LocationData("Chests", 265_4531),
#"End of the World Final Dimension 2nd Chest": KH1LocationData("Chests", 265_4532),
#"End of the World Final Dimension 3rd Chest": KH1LocationData("Chests", 265_4533),
#"End of the World Final Dimension 4th Chest": KH1LocationData("Chests", 265_4534),
#"End of the World Final Dimension 5th Chest": KH1LocationData("Chests", 265_4571),
#"End of the World Final Dimension 6th Chest": KH1LocationData("Chests", 265_4572),
#"End of the World Final Dimension 10th Chest": KH1LocationData("Chests", 265_4573),
#"End of the World Final Dimension 9th Chest": KH1LocationData("Chests", 265_4574),
#"End of the World Final Dimension 8th Chest": KH1LocationData("Chests", 265_4611),
#"End of the World Final Dimension 7th Chest": KH1LocationData("Chests", 265_4612),
#"End of the World Giant Crevasse 3rd Chest": KH1LocationData("Chests", 265_4613),
#"End of the World Giant Crevasse 1st Chest": KH1LocationData("Chests", 265_4651),
#"End of the World Giant Crevasse 4th Chest": KH1LocationData("Chests", 265_4652),
#"End of the World Giant Crevasse 2nd Chest": KH1LocationData("Chests", 265_4653),
#"End of the World World Terminus Traverse Town Chest": KH1LocationData("Chests", 265_4654),
#"End of the World World Terminus Wonderland Chest": KH1LocationData("Chests", 265_4691),
#"End of the World World Terminus Olympus Coliseum Chest": KH1LocationData("Chests", 265_4692),
#"End of the World World Terminus Deep Jungle Chest": KH1LocationData("Chests", 265_4693),
#"End of the World World Terminus Agrabah Chest": KH1LocationData("Chests", 265_4694),
#"End of the World World Terminus Atlantica Chest": KH1LocationData("Chests", 265_4731),
#"End of the World World Terminus Halloween Town Chest": KH1LocationData("Chests", 265_4732),
#"End of the World World Terminus Neverland Chest": KH1LocationData("Chests", 265_4733),
"End of the World World Terminus 100 Acre Wood Chest": KH1LocationData("Chests", 265_4734),
"End of the World World Terminus Hollow Bastion Chest": KH1LocationData("Chests", 265_4771),
"End of the World Final Rest Chest": KH1LocationData("Chests", 265_4772),
"Monstro Chamber 6 White Trinity Chest": KH1LocationData("Chests", 265_5092),
#"Awakening Chest": KH1LocationData("Chests", 265_5093), missable
"Chronicles Sora's Story": KH1LocationData("Chronicles", 265_6014),
#"Chronicles Sora's Story": KH1LocationData("Chronicles", 265_6014),
"Chronicles Wonderland": KH1LocationData("Chronicles", 265_6056),
"Chronicles Olympus Coliseum": KH1LocationData("Chronicles", 265_6097),
"Chronicles Deep Jungle": KH1LocationData("Chronicles", 265_6136),
Expand Down
52 changes: 26 additions & 26 deletions worlds/kh1/Regions.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def create_regions(multiworld: MultiWorld, player: int):
regions["Traverse Town"].locations.append("Traverse Town Secret Waterway Near Stairs Chest"),
regions["Wonderland"].locations.append("Wonderland Rabbit Hole Green Trinity Chest"),
#regions["Wonderland"].locations.append("Wonderland Rabbit Hole Defeat Heartless After Trial Chest"),
regions["Wonderland"].locations.append("Wonderland Rabbit Hole Defeat Heartless After Hollow Bastion Chest"),
#regions["Wonderland"].locations.append("Wonderland Rabbit Hole Defeat Heartless After Hollow Bastion Chest"),
regions["Wonderland"].locations.append("Wonderland Bizarre Room Green Trinity Chest"),
regions["Wonderland"].locations.append("Wonderland Queen's Castle Hedge Left Red Chest"),
regions["Wonderland"].locations.append("Wonderland Queen's Castle Hedge Right Blue Chest"),
Expand Down Expand Up @@ -229,37 +229,37 @@ def create_regions(multiworld: MultiWorld, player: int):
regions["Hollow Bastion"].locations.append("Hollow Bastion Grand Hall Steps Right Side Chest"),
regions["Hollow Bastion"].locations.append("Hollow Bastion Grand Hall Oblivion Chest"),
regions["Hollow Bastion"].locations.append("Hollow Bastion Grand Hall Left of Gate Chest"),
regions["Hollow Bastion"].locations.append("Hollow Bastion Entrance Hall Push the Statue Chest"),
#regions["Hollow Bastion"].locations.append("Hollow Bastion Entrance Hall Push the Statue Chest"),
regions["Hollow Bastion"].locations.append("Hollow Bastion Rising Falls White Trinity Chest"),
regions["End of the World"].locations.append("End of the World Final Dimension 1st Chest"),
regions["End of the World"].locations.append("End of the World Final Dimension 2nd Chest"),
regions["End of the World"].locations.append("End of the World Final Dimension 3rd Chest"),
regions["End of the World"].locations.append("End of the World Final Dimension 4th Chest"),
regions["End of the World"].locations.append("End of the World Final Dimension 5th Chest"),
regions["End of the World"].locations.append("End of the World Final Dimension 6th Chest"),
regions["End of the World"].locations.append("End of the World Final Dimension 10th Chest"),
regions["End of the World"].locations.append("End of the World Final Dimension 9th Chest"),
regions["End of the World"].locations.append("End of the World Final Dimension 8th Chest"),
regions["End of the World"].locations.append("End of the World Final Dimension 7th Chest"),
regions["End of the World"].locations.append("End of the World Giant Crevasse 3rd Chest"),
regions["End of the World"].locations.append("End of the World Giant Crevasse 1st Chest"),
regions["End of the World"].locations.append("End of the World Giant Crevasse 4th Chest"),
regions["End of the World"].locations.append("End of the World Giant Crevasse 2nd Chest"),
regions["End of the World"].locations.append("End of the World World Terminus Traverse Town Chest"),
regions["End of the World"].locations.append("End of the World World Terminus Wonderland Chest"),
regions["End of the World"].locations.append("End of the World World Terminus Olympus Coliseum Chest"),
regions["End of the World"].locations.append("End of the World World Terminus Deep Jungle Chest"),
regions["End of the World"].locations.append("End of the World World Terminus Agrabah Chest"),
regions["End of the World"].locations.append("End of the World World Terminus Atlantica Chest"),
regions["End of the World"].locations.append("End of the World World Terminus Halloween Town Chest"),
regions["End of the World"].locations.append("End of the World World Terminus Neverland Chest"),
#regions["End of the World"].locations.append("End of the World Final Dimension 1st Chest"),
#regions["End of the World"].locations.append("End of the World Final Dimension 2nd Chest"),
#regions["End of the World"].locations.append("End of the World Final Dimension 3rd Chest"),
#regions["End of the World"].locations.append("End of the World Final Dimension 4th Chest"),
#regions["End of the World"].locations.append("End of the World Final Dimension 5th Chest"),
#regions["End of the World"].locations.append("End of the World Final Dimension 6th Chest"),
#regions["End of the World"].locations.append("End of the World Final Dimension 10th Chest"),
#regions["End of the World"].locations.append("End of the World Final Dimension 9th Chest"),
#regions["End of the World"].locations.append("End of the World Final Dimension 8th Chest"),
#regions["End of the World"].locations.append("End of the World Final Dimension 7th Chest"),
#regions["End of the World"].locations.append("End of the World Giant Crevasse 3rd Chest"),
#regions["End of the World"].locations.append("End of the World Giant Crevasse 1st Chest"),
#regions["End of the World"].locations.append("End of the World Giant Crevasse 4th Chest"),
#regions["End of the World"].locations.append("End of the World Giant Crevasse 2nd Chest"),
#regions["End of the World"].locations.append("End of the World World Terminus Traverse Town Chest"),
#regions["End of the World"].locations.append("End of the World World Terminus Wonderland Chest"),
#regions["End of the World"].locations.append("End of the World World Terminus Olympus Coliseum Chest"),
#regions["End of the World"].locations.append("End of the World World Terminus Deep Jungle Chest"),
#regions["End of the World"].locations.append("End of the World World Terminus Agrabah Chest"),
#regions["End of the World"].locations.append("End of the World World Terminus Atlantica Chest"),
#regions["End of the World"].locations.append("End of the World World Terminus Halloween Town Chest"),
#regions["End of the World"].locations.append("End of the World World Terminus Neverland Chest"),
regions["End of the World"].locations.append("End of the World World Terminus 100 Acre Wood Chest"),
regions["End of the World"].locations.append("End of the World World Terminus Hollow Bastion Chest"),
regions["End of the World"].locations.append("End of the World Final Rest Chest"),
regions["Monstro"].locations.append("Monstro Chamber 6 White Trinity Chest"),
#regions["Awakening"].locations.append("Awakening Chest"), missable

regions["End of the World"].locations.append("Chronicles Sora's Story")
#regions["End of the World"].locations.append("Chronicles Sora's Story")
regions["Wonderland"].locations.append("Chronicles Wonderland")
regions["Olympus Coliseum"].locations.append("Chronicles Olympus Coliseum")
regions["Deep Jungle"].locations.append("Chronicles Deep Jungle")
Expand All @@ -268,7 +268,7 @@ def create_regions(multiworld: MultiWorld, player: int):
#regions["100 Acre Wood"].locations.append("Chronicles 100 Acre Wood")
regions["Atlantica"].locations.append("Chronicles Atlantica")
regions["Halloween Town"].locations.append("Chronicles Halloween Town")
regions["Neverland"].locations.append("Chronicles Neverland")
#regions["Neverland"].locations.append("Chronicles Neverland")

regions["Agrabah"].locations.append("Ansem's Secret Report 1")
regions["Hollow Bastion"].locations.append("Ansem's Secret Report 2")
Expand Down
Loading

0 comments on commit 9130be2

Please sign in to comment.