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

OoT: reenable MQ dungeon support

This commit is contained in:
espeon65536 2021-10-02 11:28:07 -05:00 committed by Fabian Dill
parent fa1b93252c
commit 0c59ad7e22
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
worlds/oot/Options.py
View File

@ -128,6 +128,14 @@ class LogicalChus(Toggle):
displayname = "Bombchus Considered in Logic" displayname = "Bombchus Considered in Logic"
class MQDungeons(Range):
"""Number of MQ dungeons. The dungeons to replace are randomly selected."""
displayname = "Number of MQ Dungeons"
range_start = 0
range_end = 12
default = 0
world_options: typing.Dict[str, type(Option)] = { world_options: typing.Dict[str, type(Option)] = {
"starting_age": StartingAge, "starting_age": StartingAge,
# "shuffle_interior_entrances": InteriorEntrances, # "shuffle_interior_entrances": InteriorEntrances,
@ -141,7 +149,7 @@ world_options: typing.Dict[str, type(Option)] = {
"triforce_goal": TriforceGoal, "triforce_goal": TriforceGoal,
"extra_triforce_percentage": ExtraTriforces, "extra_triforce_percentage": ExtraTriforces,
"bombchus_in_logic": LogicalChus, "bombchus_in_logic": LogicalChus,
# "mq_dungeons": make_range(0, 12), "mq_dungeons": MQDungeons,
} }

1
worlds/oot/__init__.py
View File

@ -155,7 +155,6 @@ class OOTWorld(World):
# Determine which dungeons are MQ # Determine which dungeons are MQ
# Possible future plan: allow user to pick which dungeons are MQ # Possible future plan: allow user to pick which dungeons are MQ
self.mq_dungeons = 0 # temporary disable for client-side issues
mq_dungeons = self.world.random.sample(dungeon_table, self.mq_dungeons) mq_dungeons = self.world.random.sample(dungeon_table, self.mq_dungeons)
self.dungeon_mq = {item['name']: (item in mq_dungeons) for item in dungeon_table} self.dungeon_mq = {item['name']: (item in mq_dungeons) for item in dungeon_table}