diff --git a/worlds/stardew_valley/logic/money_logic.py b/worlds/stardew_valley/logic/money_logic.py index e272436f..f5ca991e 100644 --- a/worlds/stardew_valley/logic/money_logic.py +++ b/worlds/stardew_valley/logic/money_logic.py @@ -35,8 +35,8 @@ GrindLogicMixin, ShippingLogicMixin]]): @cache_self1 def can_have_earned_total(self, amount: int) -> StardewRule: - if amount < 1000: - return True_() + if amount <= 1000: + return self.logic.true_ pierre_rule = self.logic.region.can_reach_all((Region.pierre_store, Region.forest)) willy_rule = self.logic.region.can_reach_all((Region.fish_shop, LogicRegion.fishing)) @@ -44,19 +44,19 @@ GrindLogicMixin, ShippingLogicMixin]]): robin_rule = self.logic.region.can_reach_all((Region.carpenter, Region.secret_woods)) shipping_rule = self.logic.shipping.can_use_shipping_bin - if amount < 2000: + if amount <= 2500: selling_any_rule = pierre_rule | willy_rule | clint_rule | robin_rule | shipping_rule return selling_any_rule - if amount < 5000: + if amount <= 5000: selling_all_rule = (pierre_rule & willy_rule & clint_rule & robin_rule) | shipping_rule return selling_all_rule - if amount < 10000: + if amount <= 10000: return shipping_rule seed_rules = self.logic.region.can_reach(Region.pierre_store) - if amount < 40000: + if amount <= 40000: return shipping_rule & seed_rules percent_progression_items_needed = min(90, amount // 20000) diff --git a/worlds/stardew_valley/rules.py b/worlds/stardew_valley/rules.py index bdfbc204..4b1ff2ad 100644 --- a/worlds/stardew_valley/rules.py +++ b/worlds/stardew_valley/rules.py @@ -201,7 +201,7 @@ def set_entrance_rules(logic: StardewLogic, multiworld, player, world_options: S movie_theater_rule = logic.has_movie_theater() set_entrance_rule(multiworld, player, Entrance.enter_movie_theater, movie_theater_rule) set_entrance_rule(multiworld, player, Entrance.purchase_movie_ticket, movie_theater_rule) - set_entrance_rule(multiworld, player, Entrance.take_bus_to_desert, logic.received("Bus Repair")) + set_entrance_rule(multiworld, player, Entrance.take_bus_to_desert, logic.received("Bus Repair") & logic.money.can_spend(500)) 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)) @@ -362,7 +362,7 @@ def set_island_entrances_rules(logic: StardewLogic, multiworld, player, world_op Entrance.use_island_obelisk: logic.can_use_obelisk(Transportation.island_obelisk), Entrance.use_farm_obelisk: logic.can_use_obelisk(Transportation.farm_obelisk), Entrance.fish_shop_to_boat_tunnel: boat_repaired, - Entrance.boat_to_ginger_island: boat_repaired, + Entrance.boat_to_ginger_island: boat_repaired & logic.money.can_spend(1000), Entrance.island_south_to_west: logic.received("Island West Turtle"), Entrance.island_south_to_north: logic.received("Island North Turtle"), Entrance.island_west_to_islandfarmhouse: logic.received("Island Farmhouse"),