From 5365dd83a31e33fb3403e2e5dee2af6b5800cd8a Mon Sep 17 00:00:00 2001 From: gaithern Date: Wed, 3 Jan 2024 15:50:32 -0600 Subject: [PATCH] Adding new logic for Hades Cup --- worlds/kh1/Items.py | 2 +- worlds/kh1/Rules.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/worlds/kh1/Items.py b/worlds/kh1/Items.py index 256946523f52..33def323e28e 100644 --- a/worlds/kh1/Items.py +++ b/worlds/kh1/Items.py @@ -386,7 +386,7 @@ def get_items_by_category(category: str, disclude: list) -> Dict[str, KH1ItemDat "Phil Cup": KH1ItemData("Cups", code = 264_9001, classification = ItemClassification.progression, max_quantity = 1, weight = 10), "Pegasus Cup": KH1ItemData("Cups", code = 264_9002, classification = ItemClassification.progression, max_quantity = 1, weight = 10), "Hercules Cup": KH1ItemData("Cups", code = 264_9003, classification = ItemClassification.progression, max_quantity = 1, weight = 10), - "Hades Cup": KH1ItemData("Cups", code = 264_9004, classification = ItemClassification.progression, max_quantity = 1, weight = 10), + #"Hades Cup": KH1ItemData("Cups", code = 264_9004, classification = ItemClassification.progression, max_quantity = 1, weight = 10), } event_item_table: Dict[str, KH1ItemData] = { diff --git a/worlds/kh1/Rules.py b/worlds/kh1/Rules.py index 43cd13869575..7c96ed71ba3e 100644 --- a/worlds/kh1/Rules.py +++ b/worlds/kh1/Rules.py @@ -301,10 +301,10 @@ def set_rules(multiworld: MultiWorld, player: int): #multiworld.get_location("Ansem's Secret Report 12" , player).access_rule = lambda state: has_item(state, player, "") #multiworld.get_location("Ansem's Secret Report 13" , player).access_rule = lambda state: has_item(state, player, "") - multiworld.get_location("Complete Phil Cup" , player).access_rule = lambda state: has_item(state, player, "Phil Cup") and has_item(state, player, "Entry Pass") - multiworld.get_location("Complete Pegasus Cup" , player).access_rule = lambda state: has_item(state, player, "Pegasus Cup") and has_item(state, player, "Entry Pass") - multiworld.get_location("Complete Hercules Cup" , player).access_rule = lambda state: has_item(state, player, "Hercules Cup") and has_item(state, player, "Entry Pass") - multiworld.get_location("Complete Hades Cup" , player).access_rule = lambda state: has_item(state, player, "Hades Cup") and has_item(state, player, "Entry Pass") + multiworld.get_location("Complete Phil Cup" , 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 Hercules Cup" , 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") # Region rules. multiworld.get_entrance("Wonderland" , player).access_rule = lambda state: has_item(state, player,"Wonderland")