Stardew Valley 6.x.x: The Content Update (#3478)

Focus of the Update: Compatibility with Stardew Valley 1.6 Released on March 19th 2024 This includes randomization for pretty much all of the new content, including but not limited to - Raccoon Bundles - Booksanity - Skill Masteries - New Recipes, Craftables, Fish, Maps, Farm Type, Festivals and Quests This also includes a significant reorganisation of the code into "Content Packs", to allow for easier modularity of various game mechanics between the settings and the supported mods. This improves maintainability quite a bit. In addition to that, a few **very** requested new features have been introduced, although they weren't the focus of this update - Walnutsanity - Player Buffs - More customizability in settings, such as shorter special orders, ER without farmhouse - New Remixed Bundles
2025-10-21 20:21:32 -06:00 · 2024-07-07 16:04:25 +03:00
parent f99ee77325
commit 9b22458f44
210 changed files with 10298 additions and 4540 deletions
--- a/worlds/stardew_valley/logic/skill_logic.py
+++ b/worlds/stardew_valley/logic/skill_logic.py
@@ -4,7 +4,7 @@ from typing import Union, Tuple
 from Utils import cache_self1
 from .base_logic import BaseLogicMixin, BaseLogic
 from .combat_logic import CombatLogicMixin
-from .crop_logic import CropLogicMixin
+from .harvesting_logic import HarvestingLogicMixin
 from .has_logic import HasLogicMixin
 from .received_logic import ReceivedLogicMixin
 from .region_logic import RegionLogicMixin
@@ -12,10 +12,10 @@ from .season_logic import SeasonLogicMixin
 from .time_logic import TimeLogicMixin
 from .tool_logic import ToolLogicMixin
 from .. import options
-from ..data import all_crops
+from ..data.harvest import HarvestCropSource
 from ..mods.logic.magic_logic import MagicLogicMixin
 from ..mods.logic.mod_skills_levels import get_mod_skill_levels
-from ..stardew_rule import StardewRule, True_, Or, False_
+from ..stardew_rule import StardewRule, True_, False_, true_, And
 from ..strings.craftable_names import Fishing
 from ..strings.machine_names import Machine
 from ..strings.performance_names import Performance
@@ -23,8 +23,10 @@ from ..strings.quality_names import ForageQuality
 from ..strings.region_names import Region
 from ..strings.skill_names import Skill, all_mod_skills
 from ..strings.tool_names import ToolMaterial, Tool
+from ..strings.wallet_item_names import Wallet

 fishing_regions = (Region.beach, Region.town, Region.forest, Region.mountain, Region.island_south, Region.island_west)
+vanilla_skill_items = ("Farming Level", "Mining Level", "Foraging Level", "Fishing Level", "Combat Level")


 class SkillLogicMixin(BaseLogicMixin):
@@ -34,7 +36,8 @@ class SkillLogicMixin(BaseLogicMixin):


 class SkillLogic(BaseLogic[Union[HasLogicMixin, ReceivedLogicMixin, RegionLogicMixin, SeasonLogicMixin, TimeLogicMixin, ToolLogicMixin, SkillLogicMixin,
-CombatLogicMixin, CropLogicMixin, MagicLogicMixin]]):
+CombatLogicMixin, MagicLogicMixin, HarvestingLogicMixin]]):
+
    # Should be cached
    def can_earn_level(self, skill: str, level: int) -> StardewRule:
        if level <= 0:
@@ -48,14 +51,15 @@ CombatLogicMixin, CropLogicMixin, MagicLogicMixin]]):
        if self.options.skill_progression != options.SkillProgression.option_vanilla:
            previous_level_rule = self.logic.skill.has_level(skill, level - 1)
        else:
-            previous_level_rule = True_()
+            previous_level_rule = true_

        if skill == Skill.fishing:
-            xp_rule = self.logic.tool.has_fishing_rod(max(tool_level, 1))
+            xp_rule = self.logic.tool.has_fishing_rod(max(tool_level, 3))
        elif skill == Skill.farming:
-            xp_rule = self.logic.tool.has_tool(Tool.hoe, tool_material) & self.logic.tool.can_water(tool_level)
+            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:
-            xp_rule = self.logic.tool.has_tool(Tool.axe, tool_material) | self.logic.magic.can_use_clear_debris_instead_of_tool_level(tool_level)
+            xp_rule = (self.can_get_foraging_xp & self.logic.tool.has_tool(Tool.axe, tool_material)) |\
+                      self.logic.magic.can_use_clear_debris_instead_of_tool_level(tool_level)
        elif skill == Skill.mining:
            xp_rule = self.logic.tool.has_tool(Tool.pickaxe, tool_material) | \
                      self.logic.magic.can_use_clear_debris_instead_of_tool_level(tool_level)
@@ -66,7 +70,7 @@ CombatLogicMixin, CropLogicMixin, MagicLogicMixin]]):
            xp_rule = xp_rule & self.logic.region.can_reach(Region.mines_floor_5)
        elif skill in all_mod_skills:
            # Ideal solution would be to add a logic registry, but I'm too lazy.
-            return self.logic.mod.skill.can_earn_mod_skill_level(skill, level)
+            return previous_level_rule & months_rule & self.logic.mod.skill.can_earn_mod_skill_level(skill, level)
        else:
            raise Exception(f"Unknown skill: {skill}")

@@ -77,10 +81,10 @@ CombatLogicMixin, CropLogicMixin, MagicLogicMixin]]):
        if level <= 0:
            return True_()

-        if self.options.skill_progression == options.SkillProgression.option_progressive:
-            return self.logic.received(f"{skill} Level", level)
+        if self.options.skill_progression == options.SkillProgression.option_vanilla:
+            return self.logic.skill.can_earn_level(skill, level)

-        return self.logic.skill.can_earn_level(skill, level)
+        return self.logic.received(f"{skill} Level", level)

    @cache_self1
    def has_farming_level(self, level: int) -> StardewRule:
@@ -91,8 +95,8 @@ CombatLogicMixin, CropLogicMixin, MagicLogicMixin]]):
        if level <= 0:
            return True_()

-        if self.options.skill_progression == options.SkillProgression.option_progressive:
-            skills_items = ("Farming Level", "Mining Level", "Foraging Level", "Fishing Level", "Combat Level")
+        if self.options.skill_progression >= options.SkillProgression.option_progressive:
+            skills_items = vanilla_skill_items
            if allow_modded_skills:
                skills_items += get_mod_skill_levels(self.options.mods)
            return self.logic.received_n(*skills_items, count=level)
@@ -104,12 +108,26 @@ CombatLogicMixin, CropLogicMixin, MagicLogicMixin]]):
            return rule_with_fishing
        return self.logic.time.has_lived_months(months_with_4_skills) | rule_with_fishing

+    def has_all_skills_maxed(self, included_modded_skills: bool = True) -> StardewRule:
+        if self.options.skill_progression == options.SkillProgression.option_vanilla:
+            return self.has_total_level(50)
+        skills_items = vanilla_skill_items
+        if included_modded_skills:
+            skills_items += get_mod_skill_levels(self.options.mods)
+        return And(*[self.logic.received(skill, 10) for skill in skills_items])
+
+    def can_enter_mastery_cave(self) -> StardewRule:
+        if self.options.skill_progression == options.SkillProgression.option_progressive_with_masteries:
+            return self.logic.received(Wallet.mastery_of_the_five_ways)
+        return self.has_all_skills_maxed()
+
    @cached_property
    def can_get_farming_xp(self) -> StardewRule:
+        sources = self.content.find_sources_of_type(HarvestCropSource)
        crop_rules = []
-        for crop in all_crops:
-            crop_rules.append(self.logic.crop.can_grow(crop))
-        return Or(*crop_rules)
+        for crop_source in sources:
+            crop_rules.append(self.logic.harvesting.can_harvest_crop_from(crop_source))
+        return self.logic.or_(*crop_rules)

    @cached_property
    def can_get_foraging_xp(self) -> StardewRule:
@@ -132,7 +150,7 @@ CombatLogicMixin, CropLogicMixin, MagicLogicMixin]]):

    @cached_property
    def can_get_fishing_xp(self) -> StardewRule:
-        if self.options.skill_progression == options.SkillProgression.option_progressive:
+        if self.options.skill_progression >= options.SkillProgression.option_progressive:
            return self.logic.skill.can_fish() | self.logic.skill.can_crab_pot

        return self.logic.skill.can_fish()
@@ -162,7 +180,7 @@ CombatLogicMixin, CropLogicMixin, MagicLogicMixin]]):
    @cached_property
    def can_crab_pot(self) -> StardewRule:
        crab_pot_rule = self.logic.has(Fishing.bait)
-        if self.options.skill_progression == options.SkillProgression.option_progressive:
+        if self.options.skill_progression >= options.SkillProgression.option_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
@@ -178,3 +196,14 @@ CombatLogicMixin, CropLogicMixin, MagicLogicMixin]]):
        if quality == ForageQuality.gold:
            return self.has_level(Skill.foraging, 9)
        return False_()
+
+    @cached_property
+    def can_earn_mastery_experience(self) -> StardewRule:
+        if self.options.skill_progression != options.SkillProgression.option_progressive_with_masteries:
+            return self.has_all_skills_maxed() & self.logic.time.has_lived_max_months
+        return self.logic.time.has_lived_max_months
+
+    def has_mastery(self, skill: str) -> StardewRule:
+        if self.options.skill_progression != options.SkillProgression.option_progressive_with_masteries:
+            return self.can_earn_mastery_experience and self.logic.region.can_reach(Region.mastery_cave)
+        return self.logic.received(f"{skill} Mastery")