From 1bd44e1e35bc45af61370323d79997369e49e007 Mon Sep 17 00:00:00 2001 From: agilbert1412 Date: Sun, 21 Sep 2025 12:58:15 -0400 Subject: [PATCH] Stardew Valley: Fixed Traveling merchant flaky test (#5434) * - Made the traveling cart test not be flaky due to worlds caching # Conflicts: # worlds/stardew_valley/rules.py * - Made the traveling merchant test less flaky # Conflicts: # worlds/stardew_valley/test/rules/TestTravelingMerchant.py --- worlds/stardew_valley/rules.py | 2 +- worlds/stardew_valley/test/rules/TestTravelingMerchant.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/worlds/stardew_valley/rules.py b/worlds/stardew_valley/rules.py index 2fb95a98..7351871a 100644 --- a/worlds/stardew_valley/rules.py +++ b/worlds/stardew_valley/rules.py @@ -206,7 +206,7 @@ def set_entrance_rules(logic: StardewLogic, multiworld, player, world_options: S set_entrance_rule(multiworld, player, Entrance.enter_skull_cavern, logic.received(Wallet.skull_key)) set_entrance_rule(multiworld, player, LogicEntrance.talk_to_mines_dwarf, logic.wallet.can_speak_dwarf() & logic.tool.has_tool(Tool.pickaxe, ToolMaterial.iron)) - set_entrance_rule(multiworld, player, LogicEntrance.buy_from_traveling_merchant, logic.traveling_merchant.has_days() & logic.money.can_spend(1000)) + set_entrance_rule(multiworld, player, LogicEntrance.buy_from_traveling_merchant, logic.traveling_merchant.has_days() & logic.money.can_spend(1200)) set_entrance_rule(multiworld, player, LogicEntrance.buy_from_raccoon, logic.quest.has_raccoon_shop()) set_entrance_rule(multiworld, player, LogicEntrance.fish_in_waterfall, logic.skill.has_level(Skill.fishing, 5) & logic.tool.has_fishing_rod(2)) diff --git a/worlds/stardew_valley/test/rules/TestTravelingMerchant.py b/worlds/stardew_valley/test/rules/TestTravelingMerchant.py index 57b88747..aa7f46d0 100644 --- a/worlds/stardew_valley/test/rules/TestTravelingMerchant.py +++ b/worlds/stardew_valley/test/rules/TestTravelingMerchant.py @@ -1,8 +1,13 @@ from ..bases import SVTestBase +from ... import SeasonRandomization, EntranceRandomization from ...locations import location_table, LocationTags class TestTravelingMerchant(SVTestBase): + options = { + SeasonRandomization: SeasonRandomization.option_randomized_not_winter, + EntranceRandomization: EntranceRandomization.option_disabled, + } def test_purchase_from_traveling_merchant_requires_money(self): traveling_merchant_location_names = [l for l in self.get_real_location_names() if LocationTags.TRAVELING_MERCHANT in location_table[l].tags]