- Use the compound source of the monster compoundium (ironic, I know)

ArchipelagoMW · Aug 5, 2024 · ca04c5b · ca04c5b
1 parent f4efa2f
commit ca04c5b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/worlds/stardew_valley/content/vanilla/pelican_town.py b/worlds/stardew_valley/content/vanilla/pelican_town.py
@@ -1,6 +1,6 @@
 from ..game_content import ContentPack
 from ...data import villagers_data, fish_data
-from ...data.game_item import GenericSource, ItemTag, Tag, CustomRuleSource
+from ...data.game_item import GenericSource, ItemTag, Tag, CustomRuleSource, CompoundSource
 from ...data.harvest import ForagingSource, SeasonalForagingSource, ArtifactSpotSource
 from ...data.requirement import ToolRequirement, BookRequirement, SkillRequirement, SeasonRequirement
 from ...data.shop import ShopSource, MysteryBoxSource, ArtifactTroveSource, PrizeMachineSource, FishingTreasureChestSource
@@ -229,8 +229,10 @@
             ShopSource(money_price=20000, shop_region=LogicRegion.bookseller_3),),
         Book.mapping_cave_systems: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_POWER),
-            GenericSource(regions=(Region.adventurer_guild_bedroom,)),
-            ShopSource(money_price=20000, shop_region=LogicRegion.bookseller_3),),
+            CompoundSource(sources=(
+                GenericSource(regions=(Region.adventurer_guild_bedroom,)),
+                ShopSource(money_price=20000, shop_region=LogicRegion.bookseller_3),
+            ))),
         Book.monster_compendium: (
             Tag(ItemTag.BOOK, ItemTag.BOOK_POWER),
             CustomRuleSource(create_rule=lambda logic: logic.monster.can_kill_many(Generic.any)),

diff --git a/worlds/stardew_valley/test/__init__.py b/worlds/stardew_valley/test/__init__.py
@@ -256,9 +256,9 @@ def run_default_tests(self) -> bool:
             return False
         return super().run_default_tests
 
-    def collect_lots_of_money(self):
+    def collect_lots_of_money(self, percent: float = 0.25):
         self.multiworld.state.collect(self.world.create_item("Shipping Bin"), event=False)
-        required_prog_items = int(round(self.multiworld.worlds[self.player].total_progression_items * 0.25))
+        required_prog_items = int(round(self.multiworld.worlds[self.player].total_progression_items * percent))
         for i in range(required_prog_items):
             self.multiworld.state.collect(self.world.create_item("Stardrop"), event=False)
 

diff --git a/worlds/stardew_valley/test/rules/TestBooks.py b/worlds/stardew_valley/test/rules/TestBooks.py
@@ -8,7 +8,7 @@ class TestBooksLogic(SVTestBase):
     }
 
     def test_need_weapon_for_mapping_cave_systems(self):
-        self.collect_all_the_money()
+        self.collect_lots_of_money(0.5)
 
         location = self.multiworld.get_location("Read Mapping Cave Systems", self.player)