Merge remote-tracking branch 'origin/OverworldShuffle' into GwaaKiwi

resources/app/cli/args.json

@@ -89,6 +89,10 @@
       "expert"
     ]
   },
+  "shuffle_followers": {
+    "action": "store_true",
+    "type": "bool"
+  },
   "shopsanity": {
     "action": "store_true",
     "type": "bool"

resources/app/cli/lang/en.json

@@ -264,6 +264,9 @@
     "ow_whirlpool": [
       "Whirlpools will be shuffled and paired together."
     ],
+    "shuffle_followers": [
+      "Followers like Purple Chest and Old Man are shuffled."
+    ],
     "bonk_drops": [
       "Bonk drops from trees, rocks, and statues are shuffled with the item pool."
     ],

resources/app/gui/lang/en.json

@@ -283,8 +283,7 @@
     "randomizer.generation.rom.dialog.allfiles": "All Files",
 
     "randomizer.item.hints": "Hints",
-    "randomizer.item.race": "Generate \"Race\" ROM",
-    "randomizer.item.retro": "Retro mode",
+    "randomizer.item.race": "Race",
     "randomizer.item.pseudoboots": "Pseudoboots",
     "randomizer.item.collection_rate": "Display Collection Rate",
     "randomizer.item.mirrorscroll": "Mirror Scroll",
@@ -294,7 +293,7 @@
     "randomizer.item.worldstate.open": "Open",
     "randomizer.item.worldstate.inverted": "Inverted",
     "randomizer.item.worldstate.retro": "Retro",
-    "randomizer.item.retro": "Enable Retro",
+    "randomizer.item.retro": "Retro",
 
     "randomizer.item.logiclevel": "Logic Level",
     "randomizer.item.logiclevel.noglitches": "No Glitches",
@@ -371,6 +370,8 @@
     "randomizer.item.timer.ohko": "OHKO",
     "randomizer.item.timer.timed-countdown": "Timed Countdown",
 
+    "randomizer.item.followers": "Followers",
+
     "randomizer.item.shopsanity": "Shopsanity",
 
     "randomizer.item.bonk_drops": "Bonk Drops",

resources/app/gui/randomize/item/widgets.json

@@ -6,7 +6,7 @@
     "collection_rate": {"type":  "checkbox"},
     "race": { "type": "checkbox" }
   },
-  "leftItemFrame": {
+  "worldstateFrame": {
     "worldstate": {
       "type": "selectbox",
       "default": "open",
@@ -14,8 +14,13 @@
         "standard",
         "open",
         "inverted"
-      ]
-    },
+      ],
+      "config": {
+        "width": 13
+      }
+    }
+  },
+  "leftItemFrame": {
     "logiclevel": {
       "type": "selectbox",
       "options": [
@@ -64,12 +69,6 @@
     }
   },
   "rightItemFrame": {
-    "retro": {
-      "type": "button",
-      "config": {
-        "command": "retro"
-      }
-    },
     "sortingalgo": {
       "type": "selectbox",
       "default": "balanced",
@@ -125,6 +124,10 @@
     "bonk_drops": {
       "type": "checkbox",
       "default": false
+    },
+    "followers": {
+      "type": "checkbox",
+      "default": false
     }
   },
   "leftPoolFrame": {