From 0c59ad7e22bc919467740ea013b242d0b2c0462e Mon Sep 17 00:00:00 2001 From: espeon65536 Date: Sat, 2 Oct 2021 11:28:07 -0500 Subject: [PATCH] OoT: reenable MQ dungeon support --- worlds/oot/Options.py | 10 +++++++++- worlds/oot/__init__.py | 1 - 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/worlds/oot/Options.py b/worlds/oot/Options.py index eec8f506..88b6a68c 100644 --- a/worlds/oot/Options.py +++ b/worlds/oot/Options.py @@ -128,6 +128,14 @@ class LogicalChus(Toggle): 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)] = { "starting_age": StartingAge, # "shuffle_interior_entrances": InteriorEntrances, @@ -141,7 +149,7 @@ world_options: typing.Dict[str, type(Option)] = { "triforce_goal": TriforceGoal, "extra_triforce_percentage": ExtraTriforces, "bombchus_in_logic": LogicalChus, - # "mq_dungeons": make_range(0, 12), + "mq_dungeons": MQDungeons, } diff --git a/worlds/oot/__init__.py b/worlds/oot/__init__.py index 309913f8..dcf7a1d9 100644 --- a/worlds/oot/__init__.py +++ b/worlds/oot/__init__.py @@ -155,7 +155,6 @@ class OOTWorld(World): # Determine 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) self.dungeon_mq = {item['name']: (item in mq_dungeons) for item in dungeon_table}