Merge branch 'DoorDevUnstable' into KeyLogicAttempt1

2021-07-06 13:46:14 -07:00
parent 96e4ba3e2e f21dace6d5
commit 3cb981d6ae
9 changed files with 55 additions and 24 deletions
--- a/resources/app/cli/args.json
+++ b/resources/app/cli/args.json
@@ -340,7 +340,8 @@
    "choices": [
      "none",
      "shuffled",
-      "random"
+      "random",
+      "legacy"
    ]
  },
  "enemy_health": {
--- a/resources/app/gui/lang/en.json
+++ b/resources/app/gui/lang/en.json
@@ -87,6 +87,7 @@
    "randomizer.enemizer.enemyshuffle.none": "None",
    "randomizer.enemizer.enemyshuffle.shuffled": "Shuffled",
    "randomizer.enemizer.enemyshuffle.random": "Random",
+    "randomizer.enemizer.enemyshuffle.legacy": "Random (including Thieves)",

    "randomizer.enemizer.bossshuffle": "Boss Shuffle",
    "randomizer.enemizer.bossshuffle.none": "None",
--- a/resources/app/gui/randomize/enemizer/widgets.json
+++ b/resources/app/gui/randomize/enemizer/widgets.json
@@ -5,7 +5,8 @@
      "options": [
        "none",
        "shuffled",
-        "random"
+        "random",
+        "legacy"
      ]
    },
    "bossshuffle": {