Stardew Valley: 7.x.x - The Jojapocalypse Update (ArchipelagoMW#5432)

Major Content update for Stardew Valley

### Features
- New BundleRandomization Value: Meme Bundles - Over 100 custom bundles, designed to be jokes, references, trolls, etc
- New Setting: Bundles Per Room modifier
- New Setting: Backpack Size
- New Setting: Secretsanity - Checks for triggering easter eggs and secrets
- New Setting: Moviesanity - Checks for watching movies and sharing snacks with Villagers
- New Setting: Eatsanity - Checks for eating items
- New Setting: Hatsanity - Checks for wearing Hats
- New Setting: Start Without - Allows you to select any combination of various "starting" items, that you will actually not start with. Notably, tools, backpack slots, Day5 unlocks, etc.
- New Setting: Allowed Filler Items - Allows you to customize the filler items you'll get
- New Setting: Endgame Locations - Checks for various expensive endgame tasks and purchases
- New Shipsanity value: Crops and Fish
- New Settings: Jojapocalypse and settings to customize it
- Bundle Plando: Replaced with BundleWhitelist and BundleBlacklist, for more customization freedom
- Added a couple of Host.yaml settings to help hosts allow or ban specific difficult settings that could cause problems if the people don't know what they are signing up for.

Plus a truckload of improvements on the mod side, not seen in this PR.

### Removed features
- Integration for Stardew Valley Expanded. It is simply disabled, the code is all still there, but I'm extremely tired of providing tech support for it, plus Stardew Valley 1.7 was announced and that will break it again, so I'm done. When a maintainer steps up, it can be re-enabled.

Author: agilbert1412

worlds/stardew_valley/__init__.py

@@ -1,6 +1,6 @@
 {
   "game": "Stardew Valley",
-  "authors": ["KaitoKid", "Jouramie", "Witchybun (Mod Support)", "Exempt-Medic (Proofreading)"],
+  "authors": ["Kaito Kid", "Jouramie", "Witchybun (Mod Support)", "Exempt-Medic (Proofreading)"],
   "minimum_ap_version": "0.6.4",
-  "world_version": "6.0.0"
+  "world_version": "7.4.0"
 }

worlds/stardew_valley/archipelago.json

@@ -3,10 +3,13 @@
 from random import Random
 from typing import List, Tuple
 
+from Options import DeathLink
 from .bundle_item import BundleItem
 from ..content import StardewContent
-from ..options import BundlePrice, StardewValleyOptions, ExcludeGingerIsland, FestivalLocations
-from ..strings.currency_names import Currency
+from ..options import BundlePrice, StardewValleyOptions, ExcludeGingerIsland, FestivalLocations, TrapDifficulty, \
+    MultipleDaySleepEnabled, Gifting, EntranceRandomization
+from ..strings.bundle_names import MemeBundleName
+from ..strings.currency_names import Currency, MemeCurrency
 
 
 @dataclass
@@ -19,6 +22,10 @@ class Bundle:
     def __repr__(self):
         return f"{self.name} -> {self.number_required} from {repr(self.items)}"
 
+    def special_behavior(self, world):
+        if self.name == MemeBundleName.clickbait:
+            world.options.exclude_locations.value.add(MemeBundleName.clickbait)
+
 
 @dataclass
 class BundleTemplate:
@@ -42,7 +49,42 @@ def extend_from(template, items: List[BundleItem]):
                               template.number_required_items)
 
     def create_bundle(self, random: Random, content: StardewContent, options: StardewValleyOptions) -> Bundle:
-        number_required, price_multiplier = get_bundle_final_prices(options.bundle_price, self.number_required_items, False)
+        try:
+            number_required, price_multiplier = get_bundle_final_prices(options.bundle_price, self.number_required_items, False)
+            filtered_items = [item for item in self.items if item.can_appear(content, options)]
+            number_items = len(filtered_items)
+            number_chosen_items = self.number_possible_items
+            if number_chosen_items < number_required:
+                number_chosen_items = number_required
+
+            if number_chosen_items > number_items:
+                chosen_items = filtered_items + random.choices(filtered_items, k=number_chosen_items - number_items)
+            else:
+                chosen_items = random.sample(filtered_items, number_chosen_items)
+            chosen_items = [item.as_amount(min(999, max(1, math.floor(item.amount * price_multiplier)))) for item in chosen_items]
+            return Bundle(self.room, self.name, chosen_items, number_required)
+        except Exception as e:
+            raise Exception(f"Failed at creating bundle '{self.name}'. Error: {e}")
+
+
+    def can_appear(self, options: StardewValleyOptions) -> bool:
+        if self.name == MemeBundleName.trap and options.trap_items.value == TrapDifficulty.option_no_traps:
+            return False
+        if self.name == MemeBundleName.hibernation and options.multiple_day_sleep_enabled == MultipleDaySleepEnabled.option_false:
+            return False
+        if self.name == MemeBundleName.cooperation and options.gifting == Gifting.option_false:
+            return False
+        return True
+
+
+class FixedMultiplierBundleTemplate(BundleTemplate):
+
+    def __init__(self, room: str, name: str, items: List[BundleItem], number_possible_items: int,
+                 number_required_items: int):
+        super().__init__(room, name, items, number_possible_items, number_required_items)
+
+    def create_bundle(self, random: Random, content: StardewContent, options: StardewValleyOptions) -> Bundle:
+        number_required = get_number_required_items(options.bundle_price, self.number_required_items)
         filtered_items = [item for item in self.items if item.can_appear(content, options)]
         number_items = len(filtered_items)
         number_chosen_items = self.number_possible_items
@@ -53,11 +95,53 @@ def create_bundle(self, random: Random, content: StardewContent, options: Starde
             chosen_items = filtered_items + random.choices(filtered_items, k=number_chosen_items - number_items)
         else:
             chosen_items = random.sample(filtered_items, number_chosen_items)
-        chosen_items = [item.as_amount(max(1, math.floor(item.amount * price_multiplier))) for item in chosen_items]
+        chosen_items = [item.as_amount(min(999, max(1, item.amount))) for item in chosen_items]
         return Bundle(self.room, self.name, chosen_items, number_required)
 
-    def can_appear(self, options: StardewValleyOptions) -> bool:
-        return True
+
+class FixedPriceBundleTemplate(BundleTemplate):
+
+    def __init__(self, room: str, name: str, items: List[BundleItem], number_possible_items: int,
+                 number_required_items: int):
+        super().__init__(room, name, items, number_possible_items, number_required_items)
+
+    def create_bundle(self, random: Random, content: StardewContent, options: StardewValleyOptions) -> Bundle:
+        filtered_items = [item for item in self.items if item.can_appear(content, options)]
+        number_items = len(filtered_items)
+        number_chosen_items = self.number_possible_items
+        if number_chosen_items < self.number_required_items:
+            number_chosen_items = self.number_required_items
+
+        if number_chosen_items > number_items:
+            chosen_items = filtered_items + random.choices(filtered_items, k=number_chosen_items - number_items)
+        else:
+            chosen_items = random.sample(filtered_items, number_chosen_items)
+        chosen_items = [item.as_amount(max(1, math.floor(item.amount))) for item in chosen_items]
+        return Bundle(self.room, self.name, chosen_items, self.number_required_items)
+
+
+# This type of bundle will always match the number of slots and the number of items
+class FixedSlotsBundleTemplate(BundleTemplate):
+
+    def __init__(self, room: str, name: str, items: List[BundleItem], number_possible_items: int,
+                 number_required_items: int):
+        super().__init__(room, name, items, number_possible_items, number_required_items)
+
+    def create_bundle(self, random: Random, content: StardewContent, options: StardewValleyOptions) -> Bundle:
+        try:
+            number_required, price_multiplier = get_bundle_final_prices(options.bundle_price, self.number_required_items, False)
+            filtered_items = [item for item in self.items if item.can_appear(content, options)]
+            number_items = len(filtered_items)
+            number_chosen_items = number_required
+            if number_chosen_items > number_items:
+                chosen_items = filtered_items + random.choices(filtered_items, k=number_chosen_items - number_items)
+            else:
+                chosen_items = random.sample(filtered_items, number_chosen_items)
+            chosen_items = [item.as_amount(min(999, max(1, math.floor(item.amount * price_multiplier)))) for item in chosen_items]
+            return Bundle(self.room, self.name, chosen_items, number_required)
+        except Exception as e:
+            raise Exception(f"Failed at creating bundle '{self.name}'. Error: {e}")
+
 
 
 class CurrencyBundleTemplate(BundleTemplate):
@@ -77,15 +161,33 @@ def get_currency_amount(self, bundle_price_option: BundlePrice):
         return currency_amount
 
     def can_appear(self, options: StardewValleyOptions) -> bool:
+        if not super().can_appear(options):
+            return False
         if options.exclude_ginger_island == ExcludeGingerIsland.option_true:
             if self.item.item_name == Currency.qi_gem or self.item.item_name == Currency.golden_walnut or self.item.item_name == Currency.cinder_shard:
                 return False
         if options.festival_locations == FestivalLocations.option_disabled:
             if self.item.item_name == Currency.star_token:
                 return False
+        if options.entrance_randomization != EntranceRandomization.option_disabled:
+            if self.item.item_name == MemeCurrency.time_elapsed:
+                return False
+        if options.death_link != DeathLink.option_true:
+            if self.item.item_name == MemeCurrency.deathlinks:
+                return False
         return True
 
 
+class FixedPriceCurrencyBundleTemplate(CurrencyBundleTemplate):
+
+    def __init__(self, room: str, name: str, item: BundleItem):
+        super().__init__(room, name, item)
+
+    def create_bundle(self, random: Random, content: StardewContent, options: StardewValleyOptions) -> Bundle:
+        currency_amount = self.item.amount
+        return Bundle(self.room, self.name, [BundleItem(self.item.item_name, currency_amount)], 1)
+
+
 class MoneyBundleTemplate(CurrencyBundleTemplate):
 
     def __init__(self, room: str, default_name: str, item: BundleItem):
@@ -111,11 +213,15 @@ def get_currency_amount(self, bundle_price_option: BundlePrice):
 
 class IslandBundleTemplate(BundleTemplate):
     def can_appear(self, options: StardewValleyOptions) -> bool:
+        if not super().can_appear(options):
+            return False
         return options.exclude_ginger_island == ExcludeGingerIsland.option_false
 
 
 class FestivalBundleTemplate(BundleTemplate):
     def can_appear(self, options: StardewValleyOptions) -> bool:
+        if not super().can_appear(options):
+            return False
         return options.festival_locations != FestivalLocations.option_disabled
 
 
@@ -149,6 +255,96 @@ def create_bundle(self, random: Random, content: StardewContent, options: Starde
         return Bundle(self.room, self.name, chosen_items, number_required)
 
 
+class FixedPriceDeepBundleTemplate(DeepBundleTemplate):
+
+    def __init__(self, room: str, name: str, categories: List[List[BundleItem]], number_possible_items: int,
+                 number_required_items: int):
+        super().__init__(room, name, categories, number_possible_items, number_required_items)
+
+    def create_bundle(self, random: Random, content: StardewContent, options: StardewValleyOptions) -> Bundle:
+        number_required = self.number_required_items
+        number_categories = len(self.categories)
+        number_chosen_categories = self.number_possible_items
+        if number_chosen_categories < number_required:
+            number_chosen_categories = number_required
+
+        if number_chosen_categories > number_categories:
+            chosen_categories = self.categories + random.choices(self.categories,
+                                                                 k=number_chosen_categories - number_categories)
+        else:
+            chosen_categories = random.sample(self.categories, number_chosen_categories)
+
+        chosen_items = []
+        for category in chosen_categories:
+            filtered_items = [item for item in category if item.can_appear(content, options)]
+            chosen_items.append(random.choice(filtered_items))
+
+        chosen_items = [item.as_amount(max(1, math.floor(item.amount))) for item in chosen_items]
+        return Bundle(self.room, self.name, chosen_items, number_required)
+
+
+@dataclass
+class BureaucracyBundleTemplate(BundleTemplate):
+
+    def __init__(self, room: str, name: str, items: List[BundleItem], number_possible_items: int,
+                 number_required_items: int):
+        super(BureaucracyBundleTemplate, self).__init__(room, name, items, number_possible_items, number_required_items)
+
+    def create_bundle(self, random: Random, content: StardewContent, options: StardewValleyOptions) -> Bundle:
+        number_required = self.number_required_items + options.bundle_price.value
+        number_required = min(12, max(4, number_required))
+        if options.bundle_price == BundlePrice.option_minimum:
+            number_required = 4
+        if options.bundle_price == BundlePrice.option_maximum:
+            number_required = 12
+        price_multiplier = 1
+
+        filtered_items = [item for item in self.items if item.can_appear(content, options)]
+        number_items = len(filtered_items)
+        number_chosen_items = self.number_possible_items
+        if number_chosen_items < number_required:
+            number_chosen_items = number_required
+
+        if number_chosen_items > number_items:
+            chosen_items = filtered_items + random.choices(filtered_items, k=number_chosen_items - number_items)
+        else:
+            chosen_items = random.sample(filtered_items, number_chosen_items)
+        chosen_items = [item.as_amount(max(1, math.floor(item.amount * price_multiplier))) for item in chosen_items]
+        return Bundle(self.room, self.name, chosen_items, number_required)
+
+
+@dataclass
+class RecursiveBundleTemplate(BundleTemplate):
+    number_sub_bundles: int
+
+    def __init__(self, room: str, name: str, items: List[BundleItem], number_possible_items: int,
+                 number_required_items: int, number_sub_bundles: int):
+        super(RecursiveBundleTemplate, self).__init__(room, name, items, number_possible_items, number_required_items)
+        self.number_sub_bundles = number_sub_bundles
+
+    def create_bundle(self, random: Random, content: StardewContent, options: StardewValleyOptions) -> Bundle:
+        number_required = self.number_required_items + (options.bundle_price.value * self.number_sub_bundles)
+        if options.bundle_price == BundlePrice.option_minimum:
+            number_required = self.number_sub_bundles
+        if options.bundle_price == BundlePrice.option_maximum:
+            number_required = self.number_sub_bundles * 8
+        number_required = min(self.number_sub_bundles * 8, max(self.number_sub_bundles, number_required))
+        price_multiplier = get_price_multiplier(options.bundle_price, False)
+
+        filtered_items = [item for item in self.items if item.can_appear(content, options)]
+        number_items = len(filtered_items)
+        number_chosen_items = self.number_possible_items
+        if number_chosen_items < number_required:
+            number_chosen_items = number_required
+
+        if number_chosen_items > number_items:
+            chosen_items = filtered_items + random.choices(filtered_items, k=number_chosen_items - number_items)
+        else:
+            chosen_items = random.sample(filtered_items, number_chosen_items)
+        chosen_items = [item.as_amount(max(1, math.floor(item.amount * price_multiplier))) for item in chosen_items]
+        return Bundle(self.room, self.name, chosen_items, number_required)
+
+
 def get_bundle_final_prices(bundle_price_option: BundlePrice, default_required_items: int, is_currency: bool) -> Tuple[int, float]:
     number_required_items = get_number_required_items(bundle_price_option, default_required_items)
     price_multiplier = get_price_multiplier(bundle_price_option, is_currency)

worlds/stardew_valley/bundles/bundle.py

@@ -37,6 +37,11 @@ def can_appear(self, content: StardewContent, options: StardewValleyOptions) ->
         return content.features.skill_progression.are_masteries_shuffled
 
 
+class QiBoardItemSource(BundleItemSource):
+    def can_appear(self, content: StardewContent, options: StardewValleyOptions) -> bool:
+        return content_packs.qi_board_content_pack.name in content.registered_packs
+
+
 class ContentItemSource(BundleItemSource):
     """This is meant to be used for items that are managed by the content packs."""
 
@@ -51,6 +56,7 @@ class Sources:
         island = IslandItemSource()
         festival = FestivalItemSource()
         masteries = MasteryItemSource()
+        qi_board = QiBoardItemSource()
         content = ContentItemSource()
 
     item_name: str

worlds/stardew_valley/bundles/bundle_item.py

@@ -5,39 +5,73 @@
 from .bundle import Bundle, BundleTemplate
 from ..content import StardewContent
 from ..options import StardewValleyOptions
+from ..strings.bundle_names import CCRoom
 
 
 @dataclass
 class BundleRoom:
     name: str
     bundles: List[Bundle]
 
+    def special_behavior(self, world):
+        for bundle in self.bundles:
+            bundle.special_behavior(world)
+
+
+def simplify_name(name: str) -> str:
+    return name.lower().replace(" ", "").replace("-", "").replace("_", "").replace(".", "")
+
+
+# In the context of meme bundles, some of the bundles are directly references to specific people, mostly content creators.
+# This ensures that they roll their own bundle as part of their community center.
+def is_bundle_related_to_player(bundle: BundleTemplate, player_name: str) -> bool:
+    if player_name == "":
+        return False
+    simple_bundle = simplify_name(bundle.name)
+    simple_player = simplify_name(player_name)
+    return simple_player in simple_bundle or simple_bundle in simple_player
+
 
 @dataclass
 class BundleRoomTemplate:
     name: str
     bundles: List[BundleTemplate]
     number_bundles: int
 
-    def create_bundle_room(self, random: Random, content: StardewContent, options: StardewValleyOptions):
+    def create_bundle_room(self, random: Random, content: StardewContent, options: StardewValleyOptions, player_name: str = "", is_entire_cc: bool = False):
         filtered_bundles = [bundle for bundle in self.bundles if bundle.can_appear(options)]
 
-        priority_bundles = []
+        whitelist_bundles = []
         unpriority_bundles = []
+        blacklist_bundles = []
         for bundle in filtered_bundles:
-            if bundle.name in options.bundle_plando:
-                priority_bundles.append(bundle)
-            else:
+            if options.bundle_whitelist.prioritizes(bundle.name) or is_bundle_related_to_player(bundle, player_name):
+                whitelist_bundles.append(bundle)
+            elif options.bundle_blacklist.allows(bundle.name):
                 unpriority_bundles.append(bundle)
+            else:
+                blacklist_bundles.append(bundle)
 
-        if self.number_bundles <= len(priority_bundles):
-            chosen_bundles = random.sample(priority_bundles, self.number_bundles)
+        modifier = options.bundle_per_room.value
+        if is_entire_cc:
+            modifier *= 6
+        number_bundles = self.number_bundles + modifier
+        bundles_cap = max(len(filtered_bundles), self.number_bundles)
+        number_bundles = max(1, min(bundles_cap, number_bundles))
+        if number_bundles < len(whitelist_bundles):
+            chosen_bundles = random.sample(whitelist_bundles, number_bundles)
         else:
-            chosen_bundles = priority_bundles
-            num_remaining_bundles = self.number_bundles - len(priority_bundles)
-            if num_remaining_bundles > len(unpriority_bundles):
-                chosen_bundles.extend(random.choices(unpriority_bundles, k=num_remaining_bundles))
-            else:
+            chosen_bundles = whitelist_bundles
+            num_remaining_bundles = number_bundles - len(whitelist_bundles)
+            if num_remaining_bundles < len(unpriority_bundles):
                 chosen_bundles.extend(random.sample(unpriority_bundles, num_remaining_bundles))
+            else:
+                chosen_bundles.extend(unpriority_bundles)
+                num_remaining_bundles = num_remaining_bundles - len(unpriority_bundles)
+                if num_remaining_bundles > 0:
+                    if self.name == CCRoom.raccoon_requests:
+                        chosen_bundles.extend(random.choices(unpriority_bundles, k=num_remaining_bundles))
+                    else:
+                        chosen_bundles.extend(random.sample(blacklist_bundles, num_remaining_bundles))
 
         return BundleRoom(self.name, [bundle.create_bundle(random, content, options) for bundle in chosen_bundles])