Merge remote-tracking branch 'origin' into OverworldShuffle

2021-07-08 20:22:05 -07:00
parent 8ccf3db3c8 322f70a979
commit 2f836ff47c
20 changed files with 282 additions and 46 deletions
--- a/resources/app/cli/args.json
+++ b/resources/app/cli/args.json
@@ -375,6 +375,10 @@
    "action": "store_true",
    "type": "bool"
  },
+  "fakeboots": {
+    "action": "store_true",
+    "type": "bool"
+  },
  "calc_playthrough": {
    "action": "store_false",
    "type": "bool"
@@ -405,7 +409,8 @@
    "choices": [
      "none",
      "shuffled",
-      "random"
+      "random",
+      "legacy"
    ]
  },
  "enemy_health": {