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/logic/time_logic.py

@@ -1,38 +1,52 @@
-from functools import cached_property
-from typing import Union
-
-from Utils import cache_self1
-from .base_logic import BaseLogic, BaseLogicMixin
-from .received_logic import ReceivedLogicMixin
-from ..stardew_rule import StardewRule, HasProgressionPercent, True_
-
-MAX_MONTHS = 12
-MONTH_COEFFICIENT = 24 // MAX_MONTHS
-
-
-class TimeLogicMixin(BaseLogicMixin):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.time = TimeLogic(*args, **kwargs)
-
-
-class TimeLogic(BaseLogic[Union[TimeLogicMixin, ReceivedLogicMixin]]):
-
-    @cache_self1
-    def has_lived_months(self, number: int) -> StardewRule:
-        if number <= 0:
-            return True_()
-        number = min(number, MAX_MONTHS)
-        return HasProgressionPercent(self.player, number * MONTH_COEFFICIENT)
-
-    @cached_property
-    def has_lived_max_months(self) -> StardewRule:
-        return self.logic.time.has_lived_months(MAX_MONTHS)
-
-    @cached_property
-    def has_year_two(self) -> StardewRule:
-        return self.logic.time.has_lived_months(4)
-
-    @cached_property
-    def has_year_three(self) -> StardewRule:
-        return self.logic.time.has_lived_months(8)
+from functools import cached_property
+from typing import Union
+
+from Utils import cache_self1
+from .base_logic import BaseLogic, BaseLogicMixin
+from .has_logic import HasLogicMixin
+from ..stardew_rule import StardewRule, HasProgressionPercent
+
+ONE_YEAR = 4
+MAX_MONTHS = 3 * ONE_YEAR
+PERCENT_REQUIRED_FOR_MAX_MONTHS = 48
+MONTH_COEFFICIENT = PERCENT_REQUIRED_FOR_MAX_MONTHS // MAX_MONTHS
+
+MIN_ITEMS = 10
+MAX_ITEMS = 999
+PERCENT_REQUIRED_FOR_MAX_ITEM = 24
+
+
+class TimeLogicMixin(BaseLogicMixin):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.time = TimeLogic(*args, **kwargs)
+
+
+class TimeLogic(BaseLogic[Union[TimeLogicMixin, HasLogicMixin]]):
+
+    @cache_self1
+    def has_lived_months(self, number: int) -> StardewRule:
+        if number <= 0:
+            return self.logic.true_
+        number = min(number, MAX_MONTHS)
+        return HasProgressionPercent(self.player, number * MONTH_COEFFICIENT)
+
+    @cached_property
+    def has_lived_max_months(self) -> StardewRule:
+        return self.logic.time.has_lived_months(MAX_MONTHS)
+
+    @cache_self1
+    def has_lived_year(self, number: int) -> StardewRule:
+        return self.logic.time.has_lived_months(number * ONE_YEAR)
+
+    @cache_self1
+    def has_year(self, number: int) -> StardewRule:
+        return self.logic.time.has_lived_year(number - 1)
+
+    @cached_property
+    def has_year_two(self) -> StardewRule:
+        return self.logic.time.has_year(2)
+
+    @cached_property
+    def has_year_three(self) -> StardewRule:
+        return self.logic.time.has_year(3)