Merged in Volatile work

mystery_testsuite.yml

@@ -1,11 +1,10 @@
 description: A test suite for testing various combinations
-# Not yet in this branch
-#algorithm:
-#  major_only: 1
-#  dungeon_only: 1
-#  vanilla_fill: 1
-#  balanced: 10
-#  district: 1
+algorithm:
+  major_only: 1
+  dungeon_only: 1
+  vanilla_fill: 1
+  balanced: 10
+  district: 1
 door_shuffle:
   vanilla: 1
   basic: 2
@@ -13,10 +12,19 @@ door_shuffle:
 intensity:
   1: 1
   2: 1
-  3: 2  # intensity 3 usuall yield more errors
-keydropshuffle:
+  3: 2  # intensity 3 usually yield more errors
+dropshuffle:
   on: 1
   off: 1
+pottery:
+  none: 10 # fewer locations
+  keys: 1
+  cave: 1
+  cavekeys: 1
+  dungeon: 1
+  reduced: 1
+  clustered: 1
+  lottery: 1
 shopsanity:
   on: 1
   off: 1
@@ -46,9 +54,10 @@ retro:
 goals:
   ganon: 1
   fast_ganon: 1
-  dungeons: 2  # this yields more errors so is preferred
+  dungeons: 3  # this yields more errors so is preferred
   pedestal: 1
   triforce-hunt: 1
+  trinity: 1
 triforce_goal_min: 20
 triforce_goal_max: 30
 triforce_pool_min: 30
@@ -83,7 +92,7 @@ accessibility:
   none: 0  # i'm not really interested in this yet
 restrict_boss_items:
   none: 1
-  mapcompass: 1
+#  mapcompass: 1 has confirmed issues
   dungeon: 1
 tower_open:
   "0": 1
@@ -108,6 +117,7 @@ ganon_open:
 boss_shuffle:
   none: 1
   simple: 1
+  unique: 1
   full: 1
   random: 1
 enemy_shuffle:  # shouldn't affect generation