Adding new logic for Hades Cup

gaithernOrg · Jan 3, 2024 · 5365dd8 · 5365dd8
1 parent 7aebfbc
commit 5365dd8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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")