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 generation issue with Master Angler goal and vanilla tools (#1498)

Browse Source 
* - Can Catch every fish doesn't need fishing rods if they are not shuffled

* add has_max_fishing_rod

* add test for master angler + vanilla tools

---------

Co-authored-by: Alex Gilbert <alexgilbert@yahoo.com>
This commit is contained in:
Jérémie Bolduc
2023-03-04 12:34:51 -05:00
committed by GitHub
parent 30b70b2055
commit 96d7a3a64c
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
worlds/stardew_valley/logic.py
View File

@@ -946,11 +946,16 @@ class StardewLogic:
return region_rule & season_rule & difficulty_rule
def can_catch_every_fish(self) -> StardewRule:
rules = [self.has_skill_level("Fishing", 10), self.received("Progressive Fishing Rod", 4)]
rules = [self.has_skill_level("Fishing", 10), self.has_max_fishing_rod()]
for fish in all_fish_items:
rules.append(self.can_catch_fish(fish))
return _And(rules)
def has_max_fishing_rod(self) -> StardewRule:
if self.options[options.ToolProgression] == options.ToolProgression.option_progressive:
return self.received("Progressive Fishing Rod", 4)
return self.can_get_fishing_xp()
def can_cook(self) -> StardewRule:
return self.has_house(1) or self.has_skill_level("Foraging", 9)