Merge remote-tracking branch 'upstream/DoorDevUnstable' into OverworldShuffle

resources/app/cli/args.json

@@ -59,6 +59,10 @@
       "expert"
     ]
   },
+  "shopsanity" : {
+    "action": "store_true",
+    "type": "bool"
+  },
   "keydropshuffle" : {
     "action": "store_true",
     "type": "bool"
@@ -363,5 +367,6 @@
       "never"
     ]
   },
-  "outputname": {}
+  "outputname": {},
+  "code": {}
 }

resources/app/cli/lang/en.json

@@ -256,6 +256,7 @@
     "compassshuffle": [ "Compasses are no longer restricted to their dungeons, but can be anywhere. (default: %(default)s)" ],
     "keyshuffle": [ "Small Keys are no longer restricted to their dungeons, but can be anywhere. (default: %(default)s)" ],
     "bigkeyshuffle": [ "Big Keys are no longer restricted to their dungeons, but can be anywhere. (default: %(default)s)" ],
+    "shopsanity": ["Shop contents are shuffle in the main item pool and other items can take their place. (default: %(default)s)"],
     "keydropshuffle": [ "Key Drops (Pots and Enemies) are shuffled and other items can take their place (default: %(default)s)" ],
     "mixed_travel": [
       "How to handle potential traversal between dungeon in Crossed door shuffle",