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

2021-02-18 22:44:17 -06:00
parent 2235aab579 4ee60db31a
commit 87381e495c
34 changed files with 1432 additions and 403 deletions
--- a/resources/app/gui/lang/en.json
+++ b/resources/app/gui/lang/en.json
@@ -243,6 +243,8 @@
    "randomizer.item.itempool.hard": "Hard",
    "randomizer.item.itempool.expert": "Expert",

+    "randomizer.item.shopsanity": "Shopsanity",
+
    "randomizer.item.itemfunction": "Item Functionality",
    "randomizer.item.itemfunction.normal": "Normal",
    "randomizer.item.itemfunction.hard": "Hard",
--- a/resources/app/gui/randomize/item/widgets.json
+++ b/resources/app/gui/randomize/item/widgets.json
@@ -1,6 +1,7 @@
 {
  "checkboxes": {
-    "retro": { "type": "checkbox" }
+    "retro": { "type": "checkbox" },
+    "shopsanity": { "type": "checkbox" }
  },
  "leftItemFrame": {
    "worldstate": {