diff --git a/worlds/kh1/Locations.py b/worlds/kh1/Locations.py index b7d9fd7cc914..84caf2987a74 100644 --- a/worlds/kh1/Locations.py +++ b/worlds/kh1/Locations.py @@ -419,9 +419,24 @@ def get_locations_by_category(category: str) -> Dict[str, KH1LocationData]: "Level 099": KH1LocationData("Levels", 265_8099), "Level 100": KH1LocationData("Levels", 265_8100), "Complete Phil Cup": KH1LocationData("Cups", 265_9001), - "Complete Pegasus Cup": KH1LocationData("Cups", 265_9002), - "Complete Hercules Cup": KH1LocationData("Cups", 265_9003), - "Complete Hades Cup": KH1LocationData("Cups", 265_9004), + "Complete Phil Cup Solo": KH1LocationData("Cups", 265_9002), + "Complete Phil Cup Time Trial": KH1LocationData("Cups", 265_9003), + "Complete Pegasus Cup": KH1LocationData("Cups", 265_9004), + "Complete Pegasus Cup Solo": KH1LocationData("Cups", 265_9005), + "Complete Pegasus Cup Time Trial": KH1LocationData("Cups", 265_9006), + "Complete Hercules Cup": KH1LocationData("Cups", 265_9007), + "Complete Hercules Cup Solo": KH1LocationData("Cups", 265_9008), + "Complete Hercules Cup Time Trial": KH1LocationData("Cups", 265_9009), + "Complete Hades Cup": KH1LocationData("Cups", 265_9010), + "Complete Hades Cup Solo": KH1LocationData("Cups", 265_9011), + "Complete Hades Cup Time Trial": KH1LocationData("Cups", 265_9012), + "Hades Cup Defeat Cloud and Leon Event": KH1LocationData("Cups", 265_9013), + "Hades Cup Defeat Yuffie Event": KH1LocationData("Cups", 265_9014), + "Hades Cup Defeat Cerberus Event": KH1LocationData("Cups", 265_9015), + "Hades Cup Defeat Behemoth Event": KH1LocationData("Cups", 265_9016), + "Hades Cup Defeat Hades Event": KH1LocationData("Cups", 265_9017), + "Pegasus Cup Defeat Cloud Event": KH1LocationData("Cups", 265_9018), + "Pegasus Cup Yellow Trinity Event": KH1LocationData("Cups", 265_9019) } event_location_table: Dict[str, KH1LocationData] = { diff --git a/worlds/kh1/Regions.py b/worlds/kh1/Regions.py index 92649b5d127f..b71dc1b9095f 100644 --- a/worlds/kh1/Regions.py +++ b/worlds/kh1/Regions.py @@ -338,9 +338,24 @@ def create_regions(multiworld: MultiWorld, player: int, goal: str, atlantica: bo regions["Olympus Coliseum"].locations.append("Complete Phil Cup") + regions["Olympus Coliseum"].locations.append("Complete Phil Cup Solo") + regions["Olympus Coliseum"].locations.append("Complete Phil Cup Time Trial") regions["Olympus Coliseum"].locations.append("Complete Pegasus Cup") + regions["Olympus Coliseum"].locations.append("Complete Pegasus Cup Solo") + regions["Olympus Coliseum"].locations.append("Complete Pegasus Cup Time Trial") regions["Olympus Coliseum"].locations.append("Complete Hercules Cup") + regions["Olympus Coliseum"].locations.append("Complete Hercules Cup Solo") + regions["Olympus Coliseum"].locations.append("Complete Hercules Cup Time Trial") regions["Olympus Coliseum"].locations.append("Complete Hades Cup") + regions["Olympus Coliseum"].locations.append("Complete Hades Cup Solo") + regions["Olympus Coliseum"].locations.append("Complete Hades Cup Time Trial") + regions["Olympus Coliseum"].locations.append("Hades Cup Defeat Cloud and Leon Event") + regions["Olympus Coliseum"].locations.append("Hades Cup Defeat Yuffie Event") + regions["Olympus Coliseum"].locations.append("Hades Cup Defeat Cerberus Event") + regions["Olympus Coliseum"].locations.append("Hades Cup Defeat Behemoth Event") + regions["Olympus Coliseum"].locations.append("Hades Cup Defeat Hades Event") + regions["Olympus Coliseum"].locations.append("Pegasus Cup Defeat Cloud Event") + regions["Olympus Coliseum"].locations.append("Pegasus Cup Yellow Trinity Event") # Set up the regions correctly. for name, data in regions.items(): diff --git a/worlds/kh1/Rules.py b/worlds/kh1/Rules.py index 99a33a01ed12..7bc366febe39 100644 --- a/worlds/kh1/Rules.py +++ b/worlds/kh1/Rules.py @@ -341,9 +341,24 @@ def set_rules(multiworld: MultiWorld, player: int, goal: str, atlantica: bool): multiworld.get_location("Ansem's Secret Report 13" , player).access_rule = lambda state: has_emblems(state, player) multiworld.get_location("Complete Phil Cup" , player).access_rule = lambda state: has_item(state, player, "Phil Cup") + multiworld.get_location("Complete Phil Cup Solo" , player).access_rule = lambda state: has_item(state, player, "Phil Cup") + multiworld.get_location("Complete Phil Cup Time Trial" , player).access_rule = lambda state: has_item(state, player, "Phil Cup") multiworld.get_location("Complete Pegasus Cup" , player).access_rule = lambda state: has_item(state, player, "Pegasus Cup") + multiworld.get_location("Complete Pegasus Cup Solo" , player).access_rule = lambda state: has_item(state, player, "Pegasus Cup") + multiworld.get_location("Complete Pegasus Cup Time Trial" , player).access_rule = lambda state: has_item(state, player, "Pegasus Cup") multiworld.get_location("Complete Hercules Cup" , player).access_rule = lambda state: has_item(state, player, "Hercules Cup") + multiworld.get_location("Complete Hercules Cup Solo" , player).access_rule = lambda state: has_item(state, player, "Hercules Cup") + multiworld.get_location("Complete Hercules Cup Time Trial" , player).access_rule = lambda state: has_item(state, player, "Hercules Cup") multiworld.get_location("Complete Hades Cup" , player).access_rule = lambda state: has_item(state, player, "Phil Cup") and has_item(state, player, "Pegasus Cup") and has_item(state, player, "Hercules Cup") + multiworld.get_location("Complete Hades Cup Solo" , player).access_rule = lambda state: has_item(state, player, "Phil Cup") and has_item(state, player, "Pegasus Cup") and has_item(state, player, "Hercules Cup") + multiworld.get_location("Complete Hades Cup Time Trial" , player).access_rule = lambda state: has_item(state, player, "Phil Cup") and has_item(state, player, "Pegasus Cup") and has_item(state, player, "Hercules Cup") + multiworld.get_location("Hades Cup Defeat Cloud and Leon Event" , player).access_rule = lambda state: has_item(state, player, "Phil Cup") and has_item(state, player, "Pegasus Cup") and has_item(state, player, "Hercules Cup") + multiworld.get_location("Hades Cup Defeat Yuffie Event" , player).access_rule = lambda state: has_item(state, player, "Phil Cup") and has_item(state, player, "Pegasus Cup") and has_item(state, player, "Hercules Cup") + multiworld.get_location("Hades Cup Defeat Cerberus Event" , player).access_rule = lambda state: has_item(state, player, "Phil Cup") and has_item(state, player, "Pegasus Cup") and has_item(state, player, "Hercules Cup") + multiworld.get_location("Hades Cup Defeat Behemoth Event" , player).access_rule = lambda state: has_item(state, player, "Phil Cup") and has_item(state, player, "Pegasus Cup") and has_item(state, player, "Hercules Cup") + multiworld.get_location("Hades Cup Defeat Hades Event" , player).access_rule = lambda state: has_item(state, player, "Phil Cup") and has_item(state, player, "Pegasus Cup") and has_item(state, player, "Hercules Cup") + multiworld.get_location("Pegasus Cup Defeat Cloud Event" , player).access_rule = lambda state: has_item(state, player, "Pegasus Cup") + multiworld.get_location("Pegasus Cup Yellow Trinity Event" , player).access_rule = lambda state: has_item(state, player, "Pegasus Cup") # Region rules. multiworld.get_entrance("Wonderland" , player).access_rule = lambda state: has_item(state, player,"Wonderland")