From 48c3d1fa4a9d8d14b5574592d96eba5c1edca9ad Mon Sep 17 00:00:00 2001 From: espeon65536 Date: Thu, 27 May 2021 16:51:11 -0500 Subject: [PATCH] Added campfire for Sticky Situation, by popular demand --- test/minecraft/TestAdvancements.py | 3 ++- worlds/minecraft/Rules.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/minecraft/TestAdvancements.py b/test/minecraft/TestAdvancements.py index 21c3ba57..96c8db01 100644 --- a/test/minecraft/TestAdvancements.py +++ b/test/minecraft/TestAdvancements.py @@ -974,7 +974,8 @@ class TestAdvancements(TestMinecraft): ["Sticky Situation", False, []], ["Sticky Situation", False, [], ['Bottles']], ["Sticky Situation", False, [], ['Ingot Crafting']], - ["Sticky Situation", True, ['Bottles', 'Ingot Crafting']], + ["Sticky Situation", False, [], ['Campfire']], + ["Sticky Situation", True, ['Bottles', 'Ingot Crafting', 'Campfire']], ]) def test_42075(self): diff --git a/worlds/minecraft/Rules.py b/worlds/minecraft/Rules.py index d097f169..b4a58476 100644 --- a/worlds/minecraft/Rules.py +++ b/worlds/minecraft/Rules.py @@ -126,7 +126,7 @@ def set_rules(world: MultiWorld, player: int): set_rule(world.get_location("A Terrible Fortress", player), lambda state: True) # since you don't have to fight anything set_rule(world.get_location("A Throwaway Joke", player), lambda state: True) # kill drowned set_rule(world.get_location("Minecraft", player), lambda state: True) - set_rule(world.get_location("Sticky Situation", player), lambda state: state.has_bottle_mc(player)) + set_rule(world.get_location("Sticky Situation", player), lambda state: state.has("Campfire", player) and state.has_bottle_mc(player)) set_rule(world.get_location("Ol' Betsy", player), lambda state: state.craft_crossbow(player)) set_rule(world.get_location("Cover Me in Debris", player), lambda state: state.has("Progressive Armor", player, 2) and state.has("8 Netherite Scrap", player, 2) and state.has("Ingot Crafting", player) and