morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Stardew Valley: Make Bus and Boat Require Money (#4833)

Browse Source
This commit is contained in:
Jérémie Bolduc
2025-04-20 08:21:02 -04:00
committed by GitHub
parent eb1fef1f92
commit a76ee010eb
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
worlds/stardew_valley/logic/money_logic.py
View File

@@ -35,8 +35,8 @@ GrindLogicMixin, ShippingLogicMixin]]):
@cache_self1 @cache_self1
def can_have_earned_total(self, amount: int) -> StardewRule: def can_have_earned_total(self, amount: int) -> StardewRule:
if amount < 1000: if amount <= 1000:
return True_() return self.logic.true_
pierre_rule = self.logic.region.can_reach_all((Region.pierre_store, Region.forest)) 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)) 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)) robin_rule = self.logic.region.can_reach_all((Region.carpenter, Region.secret_woods))
shipping_rule = self.logic.shipping.can_use_shipping_bin 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 selling_any_rule = pierre_rule | willy_rule | clint_rule | robin_rule | shipping_rule
return selling_any_rule return selling_any_rule
if amount < 5000: if amount <= 5000:
selling_all_rule = (pierre_rule & willy_rule & clint_rule & robin_rule) | shipping_rule selling_all_rule = (pierre_rule & willy_rule & clint_rule & robin_rule) | shipping_rule
return selling_all_rule return selling_all_rule
if amount < 10000: if amount <= 10000:
return shipping_rule return shipping_rule
seed_rules = self.logic.region.can_reach(Region.pierre_store) seed_rules = self.logic.region.can_reach(Region.pierre_store)
if amount < 40000: if amount <= 40000:
return shipping_rule & seed_rules return shipping_rule & seed_rules
percent_progression_items_needed = min(90, amount // 20000) percent_progression_items_needed = min(90, amount // 20000)

4
worlds/stardew_valley/rules.py
View File

@@ -201,7 +201,7 @@ def set_entrance_rules(logic: StardewLogic, multiworld, player, world_options: S
movie_theater_rule = logic.has_movie_theater() 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.enter_movie_theater, movie_theater_rule)
set_entrance_rule(multiworld, player, Entrance.purchase_movie_ticket, 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, Entrance.enter_skull_cavern, logic.received(Wallet.skull_key))
set_entrance_rule(multiworld, player, LogicEntrance.talk_to_mines_dwarf, set_entrance_rule(multiworld, player, LogicEntrance.talk_to_mines_dwarf,
logic.wallet.can_speak_dwarf() & logic.tool.has_tool(Tool.pickaxe, ToolMaterial.iron)) 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_island_obelisk: logic.can_use_obelisk(Transportation.island_obelisk),
Entrance.use_farm_obelisk: logic.can_use_obelisk(Transportation.farm_obelisk), Entrance.use_farm_obelisk: logic.can_use_obelisk(Transportation.farm_obelisk),
Entrance.fish_shop_to_boat_tunnel: boat_repaired, 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_west: logic.received("Island West Turtle"),
Entrance.island_south_to_north: logic.received("Island North Turtle"), Entrance.island_south_to_north: logic.received("Island North Turtle"),
Entrance.island_west_to_islandfarmhouse: logic.received("Island Farmhouse"), Entrance.island_west_to_islandfarmhouse: logic.received("Island Farmhouse"),