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: Remove Crab Pot Requirement for Help Wanted Fishing (#4985)

Browse Source 
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
This commit is contained in:
Jérémie Bolduc
2025-05-17 09:20:53 -04:00
committed by GitHub
parent 15e6383aad
commit 90ee9ffe36
4 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,7 +117,7 @@ class FishingLogic(BaseLogic):
@cached_property
def can_crab_pot_anywhere(self) -> StardewRule:
return self.logic.fishing.can_fish() & self.logic.region.can_reach_any(fishing_regions)
return self.logic.fishing.can_crab_pot & self.logic.region.can_reach_any(fishing_regions)
@cache_self1
def can_crab_pot_at(self, region: str) -> StardewRule:
@@ -125,12 +125,4 @@ class FishingLogic(BaseLogic):
@cached_property
def can_crab_pot(self) -> StardewRule:
crab_pot_rule = self.logic.has(Fishing.bait)
# We can't use the same rule if skills are vanilla, because fishing levels are required to crab pot, which is required to get fishing levels...
if self.content.features.skill_progression.is_progressive:
crab_pot_rule = crab_pot_rule & self.logic.has(Machine.crab_pot)
else:
crab_pot_rule = crab_pot_rule & self.logic.skill.can_get_fishing_xp
return crab_pot_rule
return self.logic.has(Machine.crab_pot) & self.logic.has(Fishing.bait)

5
worlds/stardew_valley/logic/skill_logic.py
View File

@@ -34,7 +34,8 @@ class SkillLogic(BaseLogic):
previous_level_rule = self.logic.skill.has_previous_level(skill, level)
if skill == Skill.fishing:
xp_rule = self.logic.tool.has_fishing_rod(max(tool_level, 3))
# Not checking crab pot as this is used for not randomized skills logic, for which players need a fishing rod to start gaining xp.
xp_rule = self.logic.tool.has_fishing_rod(max(tool_level, 3)) & self.logic.fishing.can_fish_anywhere()
elif skill == Skill.farming:
xp_rule = self.can_get_farming_xp & self.logic.tool.has_tool(Tool.hoe, tool_material) & self.logic.tool.can_water(tool_level)
elif skill == Skill.foraging:
@@ -134,7 +135,7 @@ class SkillLogic(BaseLogic):
@cached_property
def can_get_fishing_xp(self) -> StardewRule:
if self.content.features.skill_progression.is_progressive:
return self.logic.fishing.can_fish_anywhere() | self.logic.fishing.can_crab_pot
return self.logic.fishing.can_fish_anywhere() | self.logic.fishing.can_crab_pot_anywhere
return self.logic.fishing.can_fish_anywhere()