diff --git a/worlds/minecraft/Items.py b/worlds/minecraft/Items.py index d6f5e2f0..72217b68 100644 --- a/worlds/minecraft/Items.py +++ b/worlds/minecraft/Items.py @@ -68,9 +68,9 @@ item_frequencies = { "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} diff --git a/worlds/minecraft/Options.py b/worlds/minecraft/Options.py index a61e11a5..efa4625f 100644 --- a/worlds/minecraft/Options.py +++ b/worlds/minecraft/Options.py @@ -21,5 +21,6 @@ minecraft_options: typing.Dict[str, type(Option)] = { "include_hard_advancements": Toggle, "include_insane_advancements": Toggle, "include_postgame_advancements": Toggle, - "shuffle_structures": Toggle + "shuffle_structures": Toggle, + "bee_traps": Toggle } \ No newline at end of file diff --git a/worlds/minecraft/__init__.py b/worlds/minecraft/__init__.py index 6cb12ad8..1dba29f5 100644 --- a/worlds/minecraft/__init__.py +++ b/worlds/minecraft/__init__.py @@ -32,8 +32,11 @@ class MinecraftWorld(World): 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 = {}