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: Fix a logic bug where the Tea Sapling would be considered available without having the recipe (#4703)

Browse Source
This commit is contained in:
Jérémie Bolduc
2025-03-07 18:14:10 -05:00
committed by GitHub
parent e00467c2a2
commit c8b7ef1016
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
worlds/stardew_valley/content/vanilla/base.py
View File

@@ -150,7 +150,8 @@ base_game = BaseGameContentPack(
Seed.coffee_starter: (CustomRuleSource(lambda logic: logic.traveling_merchant.has_days(3) & logic.monster.can_kill_many(Monster.dust_sprite)),), Seed.coffee_starter: (CustomRuleSource(lambda logic: logic.traveling_merchant.has_days(3) & logic.monster.can_kill_many(Monster.dust_sprite)),),
Seed.coffee: (HarvestCropSource(seed=Seed.coffee_starter, seasons=(Season.spring, Season.summer,)),), Seed.coffee: (HarvestCropSource(seed=Seed.coffee_starter, seasons=(Season.spring, Season.summer,)),),
Vegetable.tea_leaves: (CustomRuleSource(lambda logic: logic.has(Sapling.tea) & logic.time.has_lived_months(2) & logic.season.has_any_not_winter()),), Vegetable.tea_leaves: (
CustomRuleSource(lambda logic: logic.has(WildSeeds.tea_sapling) & logic.time.has_lived_months(2) & logic.season.has_any_not_winter()),),
}, },
artisan_good_sources={ artisan_good_sources={
Beverage.beer: (MachineSource(item=Vegetable.wheat, machine=Machine.keg),), Beverage.beer: (MachineSource(item=Vegetable.wheat, machine=Machine.keg),),

2
worlds/stardew_valley/logic/logic.py
View File

@@ -67,7 +67,6 @@ from ..strings.fish_names import Fish, Trash, WaterItem, WaterChest
from ..strings.flower_names import Flower from ..strings.flower_names import Flower
from ..strings.food_names import Meal, Beverage from ..strings.food_names import Meal, Beverage
from ..strings.forageable_names import Forageable from ..strings.forageable_names import Forageable
from ..strings.fruit_tree_names import Sapling
from ..strings.generic_names import Generic from ..strings.generic_names import Generic
from ..strings.geode_names import Geode from ..strings.geode_names import Geode
from ..strings.gift_names import Gift from ..strings.gift_names import Gift
@@ -300,7 +299,6 @@ class StardewLogic(ReceivedLogicMixin, HasLogicMixin, RegionLogicMixin, Travelin
Ore.radioactive: self.ability.can_mine_perfectly() & self.region.can_reach(Region.qi_walnut_room), Ore.radioactive: self.ability.can_mine_perfectly() & self.region.can_reach(Region.qi_walnut_room),
RetainingSoil.basic: self.money.can_spend_at(Region.pierre_store, 100), RetainingSoil.basic: self.money.can_spend_at(Region.pierre_store, 100),
RetainingSoil.quality: self.time.has_year_two & self.money.can_spend_at(Region.pierre_store, 150), RetainingSoil.quality: self.time.has_year_two & self.money.can_spend_at(Region.pierre_store, 150),
Sapling.tea: self.relationship.has_hearts(NPC.caroline, 2) & self.has(Material.fiber) & self.has(Material.wood),
SpeedGro.basic: self.money.can_spend_at(Region.pierre_store, 100), SpeedGro.basic: self.money.can_spend_at(Region.pierre_store, 100),
SpeedGro.deluxe: self.time.has_year_two & self.money.can_spend_at(Region.pierre_store, 150), SpeedGro.deluxe: self.time.has_year_two & self.money.can_spend_at(Region.pierre_store, 150),
Trash.broken_cd: self.skill.can_crab_pot, Trash.broken_cd: self.skill.can_crab_pot,

1
worlds/stardew_valley/strings/fruit_tree_names.py
View File

@@ -7,4 +7,3 @@ class Sapling:
pomegranate = "Pomegranate Sapling" pomegranate = "Pomegranate Sapling"
banana = "Banana Sapling" banana = "Banana Sapling"
mango = "Mango Sapling" mango = "Mango Sapling"
tea = "Tea Sapling"