Clean up archaeology and fix sve

Jouramie · Jul 8, 2024 · f9de5c6 · f9de5c6
1 parent d98ecf0
commit f9de5c6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 24 deletions.
diff --git a/worlds/stardew_valley/content/mods/archeology.py b/worlds/stardew_valley/content/mods/archeology.py
@@ -16,25 +16,19 @@
 class ArchaeologyContentPack(ContentPack):
     def artisan_good_hook(self, content: StardewContent):
         # Done as honestly there are too many display items to put into the initial registration traditionally.
-        display_types = [ModCraftable.wooden_display, ModCraftable.hardwood_display]
         display_items = all_artifacts + all_fossils
-        rusty_scrap_machine_rules = []
         for item in display_items:
-            if item in all_artifacts:
-                rusty_scrap_machine_rules.append(MachineSource(item=str(item), machine=ModMachine.grinder))
-            for display_type in display_types:
-                if item == "Trilobite":
-                    product_name = f"{display_type}: Trilobite Fossil"
-                else:
-                    product_name = f"{display_type}: {item}"
+            self.source_display_items(item, content)
+        content.source_item(ModTrash.rusty_scrap, *(MachineSource(item=artifact, machine=ModMachine.grinder) for artifact in all_artifacts))
 
-                if "Wooden" in display_type:
-                    content.source_item(product_name, MachineSource(item=str(item), machine=ModMachine.preservation_chamber))
-                else:
-                    content.source_item(product_name, MachineSource(item=str(item), machine=ModMachine.hardwood_preservation_chamber))
-        # Done as there are too many artifacts that suffice for this rule, and realistically a machine will always be bijective in use save
-        # this, so it's hard to argue a change.
-        content.source_item(ModTrash.rusty_scrap, *tuple(rusty_scrap_machine_rules))
+    def source_display_items(self, item: str, content: StardewContent):
+        wood_display = f"Wooden Display: {item}"
+        hardwood_display = f"Hardwood Display: {item}"
+        if item == "Trilobite":
+            wood_display = f"Wooden Display: Trilobite Fossil"
+            hardwood_display = f"Hardwood Display: Trilobite Fossil"
+        content.source_item(wood_display, MachineSource(item=str(item), machine=ModMachine.preservation_chamber))
+        content.source_item(hardwood_display, MachineSource(item=str(item), machine=ModMachine.hardwood_preservation_chamber))
 
 
 register_mod_content_pack(ArchaeologyContentPack(

diff --git a/worlds/stardew_valley/content/mods/sve.py b/worlds/stardew_valley/content/mods/sve.py
@@ -59,14 +59,14 @@ def harvest_source_hook(self, content: StardewContent):
         content.untag_item(SVESeed.ancient_fern, tag=ItemTag.CROPSANITY_SEED)
         if ginger_island_content_pack.name not in content.registered_packs:
             # Remove Highlands seeds as these are behind Lance existing.
-            content.source_item(SVESeed.void)
-            content.source_item(SVEVegetable.void_root)
-            content.source_item(SVESeed.stalk)
-            content.source_item(SVEFruit.monster_fruit)
-            content.source_item(SVESeed.fungus)
-            content.source_item(SVEVegetable.monster_mushroom)
-            content.source_item(SVESeed.slime)
-            content.source_item(SVEFruit.slime_berry)
+            content.game_items.pop(SVESeed.void)
+            content.game_items.pop(SVEVegetable.void_root)
+            content.game_items.pop(SVESeed.stalk)
+            content.game_items.pop(SVEFruit.monster_fruit)
+            content.game_items.pop(SVESeed.fungus)
+            content.game_items.pop(SVEVegetable.monster_mushroom)
+            content.game_items.pop(SVESeed.slime)
+            content.game_items.pop(SVEFruit.slime_berry)
 
 
 register_mod_content_pack(SVEContentPack(