diff --git a/worlds/kh1/Locations.py b/worlds/kh1/Locations.py index 524f6f281e7e..fa0b2c6901cc 100644 --- a/worlds/kh1/Locations.py +++ b/worlds/kh1/Locations.py @@ -397,7 +397,7 @@ def get_locations_by_category(category: str) -> Dict[str, KH1LocationData]: "Deep Jungle Camp Save Gorillas": KH1LocationData("Misc", 265_6366), "Deep Jungle Bamboo Thicket Save Gorillas": KH1LocationData("Misc", 265_6367), "Deep Jungle Climbing Trees Save Gorillas": KH1LocationData("Misc", 265_6368), - "Olympus Coliseum Olympia Chest": KH1LocationData("Misc", 265_6369), + "Olympus Coliseum Olympia Chest": KH1LocationData("Cups", 265_6369), "Deep Jungle Jungle Slider 10 Fruits": KH1LocationData("Misc", 265_6370), "Deep Jungle Jungle Slider 20 Fruits": KH1LocationData("Misc", 265_6371), "Deep Jungle Jungle Slider 30 Fruits": KH1LocationData("Misc", 265_6372), @@ -423,7 +423,7 @@ def get_locations_by_category(category: str) -> Dict[str, KH1LocationData]: "Hollow Bastion Defeat Maleficent Ansem's Report 5": KH1LocationData("Reports", 265_7014), #"Hollow Bastion Speak with Aerith Ansem's Report 6": KH1LocationData("Reports", 265_7013), "Halloween Town Defeat Oogie Boogie Ansem's Report 7": KH1LocationData("Reports", 265_7012), - "Olympus Coliseum Defeat Hades Ansem's Report 8": KH1LocationData("Reports", 265_7011), + "Olympus Coliseum Defeat Hades Ansem's Report 8": KH1LocationData("Cups", 265_7011), "Neverland Defeat Hook Ansem's Report 9": KH1LocationData("Reports", 265_7028), #"Hollow Bastion Speak with Aerith Ansem's Report 10": KH1LocationData("Reports", 265_7027), "Agrabah Defeat Kurt Zisa Ansem's Report 11": KH1LocationData("Reports", 265_7026), diff --git a/worlds/kh1/Rules.py b/worlds/kh1/Rules.py index ef9ebcb28753..a96de8c5fc1a 100644 --- a/worlds/kh1/Rules.py +++ b/worlds/kh1/Rules.py @@ -171,7 +171,7 @@ def set_rules(multiworld: MultiWorld, player: int, options, required_reports): #multiworld.get_location("Agrabah Cave of Wonders Hall High Left Chest" , player).access_rule = lambda state: has_item(state, player, "") #multiworld.get_location("Agrabah Cave of Wonders Hall Near Bottomless Hall Chest" , player).access_rule = lambda state: has_item(state, player, "") #multiworld.get_location("Agrabah Cave of Wonders Bottomless Hall Raised Platform Chest" , player).access_rule = lambda state: has_item(state, player, "") - multiworld.get_location("Agrabah Cave of Wonders Bottomless Hall Pillar Chest" , player).access_rule = lambda state: has_item(state, player, "High Jump") and can_glide(state, player) + multiworld.get_location("Agrabah Cave of Wonders Bottomless Hall Pillar Chest" , player).access_rule = lambda state: has_item(state, player, "High Jump") or can_glide(state, player) #multiworld.get_location("Agrabah Cave of Wonders Bottomless Hall Across Chasm Chest" , player).access_rule = lambda state: has_item(state, player, "") #multiworld.get_location("Agrabah Cave of Wonders Treasure Room Across Platforms Chest" , player).access_rule = lambda state: has_item(state, player, "") #multiworld.get_location("Agrabah Cave of Wonders Treasure Room Small Treasure Pile Chest" , player).access_rule = lambda state: has_item(state, player, "") @@ -448,7 +448,7 @@ def set_rules(multiworld: MultiWorld, player: int, options, required_reports): multiworld.get_location("Traverse Town Geppetto's House Geppetto Reward 5" , player).access_rule = lambda state: has_item(state, player, "Monstro") and has_item(state, player, "High Jump") multiworld.get_location("Traverse Town Geppetto's House Geppetto All Summons Reward" , player).access_rule = lambda state: has_item(state, player, "Monstro") and has_item(state, player, "High Jump") and has_all_summons(state, player) multiworld.get_location("Traverse Town Geppetto's House Talk to Pinocchio" , player).access_rule = lambda state: has_item(state, player, "Monstro") and has_item(state, player, "High Jump") - multiworld.get_location("Traverse Town Magician's Study Obtained All Arts Items" , player).access_rule = lambda state: has_item(state, player, "Progressive Fire") and has_all_arts(state, player) + multiworld.get_location("Traverse Town Magician's Study Obtained All Arts Items" , player).access_rule = lambda state: has_all_magic_lvx(state, player, 1) and has_all_arts(state, player) and has_x_worlds(state, player, 7) multiworld.get_location("Traverse Town Magician's Study Obtained All LV1 Magic" , player).access_rule = lambda state: has_all_magic_lvx(state, player, 1) multiworld.get_location("Traverse Town Magician's Study Obtained All LV3 Magic" , player).access_rule = lambda state: has_all_magic_lvx(state, player, 3) multiworld.get_location("Traverse Town Piano Room Return 10 Puppies" , player).access_rule = lambda state: has_puppies(state, player, 10)