Merge branch 'DoorDevUnstable' into Synthesis

# Conflicts: # CLI.py # Main.py # Rom.py # data/base2current.bps
2022-09-08 13:47:38 -06:00
parent e2b9735600 3227ffee14
commit 9caea3fc85
3 changed files with 10 additions and 7 deletions
--- a/CLI.py
+++ b/CLI.py
@@ -205,14 +205,14 @@ def parse_settings():
        'keyshuffle': 'none',
        'bigkeyshuffle': False,
        'keysanity': False,
-        "door_shuffle": "basic",
-        "intensity": 2,
+        'door_shuffle': 'vanilla',
+        'intensity': 2,
        'door_type_mode': 'original',
        'decoupledoors': False,
-        "experimental": False,
-        "dungeon_counters": "default",
-        "mixed_travel": "prevent",
-        "standardize_palettes": "standardize",
+        'experimental': False,
+        'dungeon_counters': 'default',
+        'mixed_travel': 'prevent',
+        'standardize_palettes': 'standardize',
        
        "triforce_pool": 0,
        "triforce_goal": 0,