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

worlds/stardew_valley/mods/logic/sve_logic.py

@@ -14,12 +14,11 @@ from ...logic.season_logic import SeasonLogicMixin
 from ...logic.time_logic import TimeLogicMixin
 from ...logic.tool_logic import ToolLogicMixin
 from ...strings.ap_names.mods.mod_items import SVELocation, SVERunes, SVEQuestItem
+from ...strings.quest_names import ModQuest
 from ...strings.quest_names import Quest
 from ...strings.region_names import Region
 from ...strings.tool_names import Tool, ToolMaterial
 from ...strings.wallet_item_names import Wallet
-from ...stardew_rule import Or
-from ...strings.quest_names import ModQuest
 
 
 class SVELogicMixin(BaseLogicMixin):
@@ -29,7 +28,7 @@ class SVELogicMixin(BaseLogicMixin):
 
 
 class SVELogic(BaseLogic[Union[HasLogicMixin, ReceivedLogicMixin, QuestLogicMixin, RegionLogicMixin, RelationshipLogicMixin, TimeLogicMixin, ToolLogicMixin,
-               CookingLogicMixin, MoneyLogicMixin, CombatLogicMixin, SeasonLogicMixin, QuestLogicMixin]]):
+                               CookingLogicMixin, MoneyLogicMixin, CombatLogicMixin, SeasonLogicMixin]]):
     def initialize_rules(self):
         self.registry.sve_location_rules.update({
             SVELocation.tempered_galaxy_sword: self.logic.money.can_spend_at(SVERegion.alesia_shop, 350000),
@@ -39,17 +38,31 @@ class SVELogic(BaseLogic[Union[HasLogicMixin, ReceivedLogicMixin, QuestLogicMixi
 
     def has_any_rune(self):
         rune_list = SVERunes.nexus_items
-        return Or(*(self.logic.received(rune) for rune in rune_list))
+        return self.logic.or_(*(self.logic.received(rune) for rune in rune_list))
 
     def has_iridium_bomb(self):
         if self.options.quest_locations < 0:
             return self.logic.quest.can_complete_quest(ModQuest.RailroadBoulder)
         return self.logic.received(SVEQuestItem.iridium_bomb)
 
+    def has_marlon_boat(self):
+        if self.options.quest_locations < 0:
+            return self.logic.quest.can_complete_quest(ModQuest.MarlonsBoat)
+        return self.logic.received(SVEQuestItem.marlon_boat_paddle)
+
+    def has_grandpa_shed_repaired(self):
+        if self.options.quest_locations < 0:
+            return self.logic.quest.can_complete_quest(ModQuest.GrandpasShed)
+        return self.logic.received(SVEQuestItem.grandpa_shed)
+
+    def has_bear_knowledge(self):
+        if self.options.quest_locations < 0:
+            return self.logic.quest.can_complete_quest(Quest.strange_note)
+        return self.logic.received(Wallet.bears_knowledge)
+
     def can_buy_bear_recipe(self):
         access_rule = (self.logic.quest.can_complete_quest(Quest.strange_note) & self.logic.tool.has_tool(Tool.axe, ToolMaterial.basic) &
                        self.logic.tool.has_tool(Tool.pickaxe, ToolMaterial.basic))
         forage_rule = self.logic.region.can_reach_any((Region.forest, Region.backwoods, Region.mountain))
-        knowledge_rule = self.logic.received(Wallet.bears_knowledge)
+        knowledge_rule = self.has_bear_knowledge()
         return access_rule & forage_rule & knowledge_rule
-