Skip to content

Commit

Permalink
More Rule fixes, removing wrong items
Browse files Browse the repository at this point in the history
  • Loading branch information
@gaithern
gaithern committed Jan 1, 2024
1 parent dda4e0c commit ef48088
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
20 changes: 10 additions & 10 deletions worlds/kh1/Items.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,14 +204,14 @@ def get_items_by_category(category: str, disclude: list) -> Dict[str, KH1ItemDat
#"Ansem's Report 8": KH1ItemData("Key", code = 264_1175, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
#"Ansem's Report 9": KH1ItemData("Key", code = 264_1176, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
#"Ansem's Report 10": KH1ItemData("Key", code = 264_1177, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
"Khama Vol. 8": KH1ItemData("Key", code = 264_1178, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
"Salegg Vol. 6": KH1ItemData("Key", code = 264_1179, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
"Azal Vol. 3": KH1ItemData("Key", code = 264_1180, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
"Mava Vol. 3": KH1ItemData("Key", code = 264_1181, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
"Mava Vol. 6": KH1ItemData("Key", code = 264_1182, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
"Theon Vol. 6": KH1ItemData("Key", code = 264_1183, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
"Nahara Vol. 5": KH1ItemData("Key", code = 264_1184, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
"Hafet Vol. 4": KH1ItemData("Key", code = 264_1185, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
#"Khama Vol. 8": KH1ItemData("Key", code = 264_1178, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
#"Salegg Vol. 6": KH1ItemData("Key", code = 264_1179, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
#"Azal Vol. 3": KH1ItemData("Key", code = 264_1180, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
#"Mava Vol. 3": KH1ItemData("Key", code = 264_1181, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
#"Mava Vol. 6": KH1ItemData("Key", code = 264_1182, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
#"Theon Vol. 6": KH1ItemData("Key", code = 264_1183, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
#"Nahara Vol. 5": KH1ItemData("Key", code = 264_1184, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
#"Hafet Vol. 4": KH1ItemData("Key", code = 264_1185, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
#"Empty Bottle": KH1ItemData("Key", code = 264_1186, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
#"Old Book": KH1ItemData("Key", code = 264_1187, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
"Emblem Piece (Flame)": KH1ItemData("Key", code = 264_1188, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
Expand Down Expand Up @@ -255,7 +255,7 @@ def get_items_by_category(category: str, disclude: list) -> Dict[str, KH1ItemDat
"Antenna": KH1ItemData("Key", code = 264_1226, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
#"Forget-Me-Not": KH1ItemData("Key", code = 264_1227, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
"Jack-In-The-Box": KH1ItemData("Key", code = 264_1228, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
"Entry Pass": KH1ItemData("Key", code = 264_1229, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
#"Entry Pass": KH1ItemData("Key", code = 264_1229, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
"Hero License": KH1ItemData("Key", code = 264_1230, classification = ItemClassification.progression, max_quantity = 1, weight = 10),
#"Pretty Stone": KH1ItemData("Synthesis", code = 264_1231, classification = ItemClassification.filler, max_quantity = 1, weight = 10),
#"N41": KH1ItemData("Synthesis", code = 264_1232, classification = ItemClassification.filler, max_quantity = 1, weight = 10),
Expand Down Expand Up @@ -344,7 +344,7 @@ def get_items_by_category(category: str, disclude: list) -> Dict[str, KH1ItemDat
"Tech Boost": KH1ItemData("Abilities", code = 264_3060, classification = ItemClassification.useful, max_quantity = 1, weight = 10),
"Encounter Plus": KH1ItemData("Abilities", code = 264_3061, classification = ItemClassification.useful, max_quantity = 1, weight = 10),
"Leaf Bracer": KH1ItemData("Abilities", code = 264_3062, classification = ItemClassification.useful, max_quantity = 1, weight = 10),
"Evolution": KH1ItemData("Abilities", code = 264_3063, classification = ItemClassification.useful, max_quantity = 1, weight = 10),
#"Evolution": KH1ItemData("Abilities", code = 264_3063, classification = ItemClassification.useful, max_quantity = 1, weight = 10),
#"EXP Zero": KH1ItemData("Abilities", code = 264_3064, classification = ItemClassification.useful, max_quantity = 1, weight = 10),
"Combo Master": KH1ItemData("Abilities", code = 264_3065, classification = ItemClassification.useful, max_quantity = 1, weight = 10),
"Max HP Increase": KH1ItemData("Level Up", code = 264_4001, classification = ItemClassification.useful, max_quantity = 15, weight = 10),
Expand Down
6 changes: 3 additions & 3 deletions worlds/kh1/Rules.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ def set_rules(multiworld: MultiWorld, player: int):

#multiworld.get_location("Chronicles Sora's Story" , player).access_rule = lambda state: has_item(state, player, "")
multiworld.get_location("Chronicles Wonderland" , player).access_rule = lambda state: has_evidence(state, player)
multiworld.get_location("Chronicles Olympus Coliseum" , player).access_rule = lambda state: has_item(state, player, "Hades Cup") and has_x_worlds(state, player, 7)
#multiworld.get_location("Chronicles Olympus Coliseum" , player).access_rule = lambda state: has_item(state, player, "")
multiworld.get_location("Chronicles Deep Jungle" , player).access_rule = lambda state: has_slides(state, player)
multiworld.get_location("Chronicles Agrabah" , player).access_rule = lambda state: has_item(state, player, "")
multiworld.get_location("Chronicles Monstro" , player).access_rule = lambda state: has_item(state, player, "High Jump")
Expand Down Expand Up @@ -312,8 +312,8 @@ def set_rules(multiworld: MultiWorld, player: int):
multiworld.get_entrance("Atlantica" , player).access_rule = lambda state: has_item(state, player,"Atlantica") and has_x_worlds(state, player, 2)
multiworld.get_entrance("Halloween Town" , player).access_rule = lambda state: has_item(state, player,"Halloween Town") and has_x_worlds(state, player, 2)
multiworld.get_entrance("Neverland" , player).access_rule = lambda state: has_item(state, player,"Neverland") and has_x_worlds(state, player, 4)
multiworld.get_entrance("Hollow Bastion" , player).access_rule = lambda state: has_item(state, player,"Hollow Bastion") and has_x_worlds(state, player, 5) and has_item(state, player, "High Jump")
multiworld.get_entrance("End of the World" , player).access_rule = lambda state: has_item(state, player,"Hollow Bastion") and has_x_worlds(state, player, 7) and has_item(state, player, "High Jump") and has_item(state, player, "Glide") and has_emblems(state, player)
multiworld.get_entrance("Hollow Bastion" , player).access_rule = lambda state: has_item(state, player,"Hollow Bastion") and has_x_worlds(state, player, 5) and has_item(state, player, "High Jump") and has_item(state, player, "Green Trinity")
multiworld.get_entrance("End of the World" , player).access_rule = lambda state: has_item(state, player,"Hollow Bastion") and has_x_worlds(state, player, 7) and has_item(state, player, "High Jump") and has_item(state, player, "Glide") and has_emblems(state, player) and has_item(state, player, "Green Trinity")

# Win condition.
multiworld.completion_condition[player] = lambda state: state.has_all({"Victory"}, player)

0 comments on commit ef48088

Please sign in to comment.