The Witness: Shuffle Dog (#3425)

* Town Pet the Dog

* Add shuffle dog to options presets

* I cri evritim

* I guess it's as good a time as any

* :(

* fix the soft conflict

* add all the shuffle dog options to some of the unit tests bc why not

* Laser Panels are just 'General' now, I'm pretty sure

* Could I really call it allsanity?

worlds/witness/test/test_roll_other_options.py

@@ -12,6 +12,7 @@ class TestExpertNonRandomizedEPs(WitnessTestBase):
         "victory_condition": "challenge",
         "shuffle_discarded_panels": False,
         "shuffle_boat": False,
+        "shuffle_dog": "off",
     }
 
 
@@ -24,6 +25,7 @@ class TestVanillaAutoElevatorsPanels(WitnessTestBase):
         "early_caves": True,
         "shuffle_vault_boxes": True,
         "mountain_lasers": 11,
+        "shuffle_dog": "puzzle_skip",
     }
 
 
@@ -46,6 +48,7 @@ class TestMaxEntityShuffle(WitnessTestBase):
         "obelisk_keys": True,
         "shuffle_lasers": "anywhere",
         "victory_condition": "mountain_box_long",
+        "shuffle_dog": "random_item",
     }