diff --git a/worlds/ahit/Items.py b/worlds/ahit/Items.py index b4636a1d28..f877f9c372 100644 --- a/worlds/ahit/Items.py +++ b/worlds/ahit/Items.py @@ -262,7 +262,7 @@ relic_groups = { "Train": {"Relic (Mountain Set)", "Relic (Train)"}, "UFO": {"Relic (UFO)", "Relic (Cow)", "Relic (Cool Cow)", "Relic (Tin-foil Hat Cow)"}, "Crayon": {"Relic (Crayon Box)", "Relic (Red Crayon)", "Relic (Blue Crayon)", "Relic (Green Crayon)"}, - "Cake": {"Relic (Cake Stand)", "Relic (Cake)", "Relic (Cake Slice)", "Relic (Shortcake)"}, + "Cake": {"Relic (Cake Stand)", "Relic (Chocolate Cake)", "Relic (Chocolate Cake Slice)", "Relic (Shortcake)"}, "Necklace": {"Relic (Necklace Bust)", "Relic (Necklace)"}, } diff --git a/worlds/ahit/Options.py b/worlds/ahit/Options.py index 6353269a98..96c35c5fc7 100644 --- a/worlds/ahit/Options.py +++ b/worlds/ahit/Options.py @@ -306,8 +306,8 @@ class YarnAvailable(Range): """How much yarn is available to collect in the item pool.""" display_name = "Yarn Available" range_start = 30 - range_end = 75 - default = 45 + range_end = 80 + default = 50 class MinExtraYarn(Range): diff --git a/worlds/ahit/Rules.py b/worlds/ahit/Rules.py index d08c1411a0..3e7700ccf0 100644 --- a/worlds/ahit/Rules.py +++ b/worlds/ahit/Rules.py @@ -642,9 +642,12 @@ def set_mafia_town_rules(world: World): def set_botb_rules(world: World): if world.multiworld.UmbrellaLogic[world.player].value == 0 and get_difficulty(world) < Difficulty.MODERATE: - for loc in world.multiworld.get_region("Dead Bird Studio - Post Elevator Area", world.player).locations: - set_rule(loc, lambda state: state.has("Umbrella", world.player) or can_use_hat(state, world, HatType.BREWING)) - + set_rule(world.multiworld.get_location("Dead Bird Studio - DJ Grooves Sign Chest", world.player), + lambda state: state.has("Umbrella", world.player) or can_use_hat(state, world, HatType.BREWING)) + set_rule(world.multiworld.get_location("Dead Bird Studio - Tepee Chest", world.player), + lambda state: state.has("Umbrella", world.player) or can_use_hat(state, world, HatType.BREWING)) + set_rule(world.multiworld.get_location("Dead Bird Studio - Conductor Chest", world.player), + lambda state: state.has("Umbrella", world.player) or can_use_hat(state, world, HatType.BREWING)) set_rule(world.multiworld.get_location("Act Completion (Dead Bird Studio)", world.player), lambda state: state.has("Umbrella", world.player) or can_use_hat(state, world, HatType.BREWING)) diff --git a/worlds/ahit/test/TestActs.py b/worlds/ahit/test/TestActs.py index 3c5918c0db..7c2b9783e6 100644 --- a/worlds/ahit/test/TestActs.py +++ b/worlds/ahit/test/TestActs.py @@ -3,6 +3,12 @@ from worlds.ahit.test.TestBase import HatInTimeTestBase class TestActs(HatInTimeTestBase): + def run_default_tests(self) -> bool: + return False + + def testAllStateCanReachEverything(self): + pass + options = { "ActRandomizer": 2, "EnableDLC1": 1,