monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added option for MC bee traps

This commit is contained in:
espeon65536 2021-07-02 16:50:31 -05:00 committed by Fabian Dill
parent ac919f72a8
commit 576521229c
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
worlds/minecraft/Items.py
View File

@ -68,9 +68,9 @@ item_frequencies = {
"4 Lapis Lazuli": 2, "4 Lapis Lazuli": 2,
"16 Porkchops": 8, "16 Porkchops": 8,
"8 Gold Ore": 4, "8 Gold Ore": 4,
"Rotten Flesh": 2, "Rotten Flesh": 4,
"Single Arrow": 0, "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} lookup_id_to_name: typing.Dict[int, str] = {data.code: item_name for item_name, data in item_table.items() if data.code}

3
worlds/minecraft/Options.py
View File

@ -21,5 +21,6 @@ minecraft_options: typing.Dict[str, type(Option)] = {
"include_hard_advancements": Toggle, "include_hard_advancements": Toggle,
"include_insane_advancements": Toggle, "include_insane_advancements": Toggle,
"include_postgame_advancements": Toggle, "include_postgame_advancements": Toggle,
"shuffle_structures": Toggle "shuffle_structures": Toggle,
"bee_traps": Toggle
} }

5
worlds/minecraft/__init__.py
View File

@ -32,8 +32,11 @@ class MinecraftWorld(World):
link_minecraft_structures(self.world, self.player) link_minecraft_structures(self.world, self.player)
pool = [] 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 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)) pool.append(MinecraftItem(item_name, item_data.progression, item_data.code, self.player))
prefill_pool = {} prefill_pool = {}