Added option for MC bee traps

test/minecraft/TestMinecraft.py

@@ -5,6 +5,7 @@
 from worlds.minecraft import MinecraftWorld
 from worlds.minecraft.Items import MinecraftItem, item_table
 from worlds.minecraft.Options import AdvancementGoal, CombatDifficulty
+from Options import Toggle
 
 # Converts the name of an item into an item object
 def MCItemFactory(items, player: int):
@@ -33,8 +34,9 @@ def setUp(self):
         for pool in exclusion_pools:
             setattr(self.world, f"include_{pool}_advancements", [False, False])
         setattr(self.world, "advancement_goal", {1: AdvancementGoal(30)})
-        setattr(self.world, "shuffle_structures", {1: False})
+        setattr(self.world, "shuffle_structures", {1: Toggle(False)})
         setattr(self.world, "combat_difficulty", {1: CombatDifficulty(1)}) # normal
+        setattr(self.world, "bee_traps", {1: Toggle(False)})
         AutoWorld.call_single(self.world, "create_regions", 1)
         AutoWorld.call_single(self.world, "generate_basic", 1)
         AutoWorld.call_single(self.world, "set_rules", 1)

worlds/minecraft/Items.py

@@ -68,9 +68,9 @@ def __init__(self, name: str, progression: bool, code: int, player: int):
     "4 Lapis Lazuli": 2, 
     "16 Porkchops": 8, 
     "8 Gold Ore": 4, 
-    "Rotten Flesh": 2, 
+    "Rotten Flesh": 4, 
     "Single Arrow": 0, 
-    "Bee Trap (Minecraft)": 2
+    "Bee Trap (Minecraft)": 0
 }
 
 lookup_id_to_name: typing.Dict[int, str] = {data.code: item_name for item_name, data in item_table.items() if data.code}

worlds/minecraft/Options.py

@@ -21,5 +21,6 @@ class CombatDifficulty(Choice):
     "include_hard_advancements": Toggle,
     "include_insane_advancements": Toggle,
     "include_postgame_advancements": Toggle,
-    "shuffle_structures": Toggle
+    "shuffle_structures": Toggle, 
+    "bee_traps": Toggle
 }

worlds/minecraft/__init__.py

@@ -32,8 +32,11 @@ def generate_basic(self):
         link_minecraft_structures(self.world, self.player)
 
         pool = []
+        pool_counts = item_frequencies.copy()
+        if getattr(self.world, "bee_traps")[self.player]: 
+            pool_counts.update({"Rotten Flesh": 0, "Bee Trap (Minecraft)": 4})
         for item_name, item_data in item_table.items():
-            for count in range(item_frequencies.get(item_name, 1)):
+            for count in range(pool_counts.get(item_name, 1)):
                 pool.append(MinecraftItem(item_name, item_data.progression, item_data.code, self.player))
 
         prefill_pool = {}