Stardew Valley: Update Mod Content (#4416)

worlds/stardew_valley/test/TestNumberLocations.py

@@ -1,5 +1,6 @@
 from . import SVTestBase, allsanity_no_mods_6_x_x, \
-    allsanity_mods_6_x_x, minimal_locations_maximal_items, minimal_locations_maximal_items_with_island, get_minsanity_options, default_6_x_x
+    allsanity_mods_6_x_x, minimal_locations_maximal_items, minimal_locations_maximal_items_with_island, get_minsanity_options, default_6_x_x, \
+    allsanity_mods_6_x_x_exclude_disabled
 from .. import location_table
 from ..items import Group, item_table
 
@@ -70,7 +71,7 @@ class TestAllSanitySettingsHasAllExpectedLocations(SVTestBase):
     options = allsanity_no_mods_6_x_x()
 
     def test_allsanity_without_mods_has_at_least_locations(self):
-        expected_locations = 2238
+        expected_locations = 2256
         real_locations = self.get_real_locations()
         number_locations = len(real_locations)
         print(f"Stardew Valley - Allsanity Locations without mods: {number_locations}")
@@ -83,10 +84,10 @@ class TestAllSanitySettingsHasAllExpectedLocations(SVTestBase):
 
 
 class TestAllSanityWithModsSettingsHasAllExpectedLocations(SVTestBase):
-    options = allsanity_mods_6_x_x()
+    options = allsanity_mods_6_x_x_exclude_disabled()
 
     def test_allsanity_with_mods_has_at_least_locations(self):
-        expected_locations = 3096
+        expected_locations = 2908
         real_locations = self.get_real_locations()
         number_locations = len(real_locations)
         print(f"Stardew Valley - Allsanity Locations with all mods: {number_locations}")

worlds/stardew_valley/test/__init__.py

@@ -13,6 +13,7 @@ from .assertion import RuleAssertMixin
 from .options.utils import fill_namespace_with_default, parse_class_option_keys, fill_dataclass_with_default
 from .. import StardewValleyWorld, options, StardewItem
 from ..options import StardewValleyOption
+from ..options.options import enabled_mods
 
 logger = logging.getLogger(__name__)
 
@@ -98,6 +99,12 @@ def allsanity_mods_6_x_x():
     return allsanity
 
 
+def allsanity_mods_6_x_x_exclude_disabled():
+    allsanity = allsanity_no_mods_6_x_x()
+    allsanity.update({options.Mods.internal_name: frozenset(enabled_mods)})
+    return allsanity
+
+
 def get_minsanity_options():
     return {
         options.ArcadeMachineLocations.internal_name: options.ArcadeMachineLocations.option_disabled,