Merged in DR v0.5.0.1

2021-07-28 17:09:31 -05:00
parent 14079b373f d70f2ee355
commit c04cb27aa9
18 changed files with 140 additions and 168 deletions
--- a/CLI.py
+++ b/CLI.py
@@ -97,6 +97,7 @@ def parse_cli(argv, no_defaults=False):
                         'ow_shuffle', 'ow_swap', 'ow_keepsimilar', 'ow_fluteshuffle',
                         'shuffle', 'door_shuffle', 'intensity', 'crystals_ganon', 'crystals_gt', 'openpyramid',
                         'mapshuffle', 'compassshuffle', 'keyshuffle', 'bigkeyshuffle', 'startinventory',
+                         'bomblogic',
                         'triforce_pool_min', 'triforce_pool_max', 'triforce_goal_min', 'triforce_goal_max',
                         'triforce_min_difference', 'triforce_goal', 'triforce_pool', 'shufflelinks', 'pseudoboots',
                         'retro', 'accessibility', 'hints', 'beemizer', 'experimental', 'dungeon_counters',
@@ -127,6 +128,7 @@ def parse_settings():
    settings = {
        "lang": "en",
        "retro": False,
+        "bomblogic": False,
        "mode": "open",
        "logic": "noglitches",
        "goal": "ganon",