Merged DR v1.2.0.0

source/classes/constants.py

@@ -68,8 +68,9 @@ SETTINGSTOPROCESS = {
       "weapons": "swords",
       "itempool": "difficulty",
       "itemfunction": "item_functionality",
+      "flute_mode": "flute_mode",
+      "bow_mode": "bow_mode",
       "timer": "timer",
-      "progressives": "progressive",
       "accessibility": "accessibility",
       "sortingalgo": "algorithm",
       "beemizer": "beemizer",
@@ -89,8 +90,10 @@ SETTINGSTOPROCESS = {
       "openpyramid": "openpyramid",
       "shuffleganon": "shuffleganon",
       "shufflelinks": "shufflelinks",
+      "shuffletavern": "shuffletavern",
       "entranceshuffle": "shuffle",
       "overworld_map": "overworld_map",
+      "take_any": "take_any",
     },
     "enemizer": {
       "enemyshuffle": "shuffleenemies",
@@ -105,6 +108,8 @@ SETTINGSTOPROCESS = {
       "bigkeyshuffle": "bigkeyshuffle",
       "dungeondoorshuffle": "door_shuffle",
       "dungeonintensity": "intensity",
+      "door_type_mode": "door_type_mode",
+      "decoupledoors": "decoupledoors",
       "keydropshuffle": "keydropshuffle",
       "dropshuffle": "dropshuffle",
       "pottery": "pottery",
@@ -133,6 +138,7 @@ SETTINGSTOPROCESS = {
       "createspoiler": "create_spoiler",
       "createrom": "create_rom",
       "calcplaythrough": "calc_playthrough",
+      "print_custom_yaml": "print_custom_yaml",
       "usestartinventory": "usestartinventory",
       "usecustompool": "custom",
       "saveonexit": "saveonexit"