Merge branch 'OverworldShuffle' of github.com:codemann8/ALttPDoorRandomizer into OverworldShuffle

2021-07-04 10:47:05 -07:00
parent f5708a575c e789531e36
commit 1beef2e0ce
23 changed files with 175 additions and 49 deletions
--- a/resources/app/gui/adjust/overview/widgets.json
+++ b/resources/app/gui/adjust/overview/widgets.json
@@ -1,7 +1,8 @@
 {
  "checkboxes": {
    "nobgm":      { "type": "checkbox" },
-    "quickswap":  { "type": "checkbox" }
+    "quickswap":  { "type": "checkbox" },
+    "reduce_flashing": {"type":  "checkbox"}
  },
  "leftAdjustFrame": {
    "heartcolor": {
--- a/resources/app/gui/lang/en.json
+++ b/resources/app/gui/lang/en.json
@@ -148,6 +148,7 @@

    "randomizer.gameoptions.nobgm": "Disable Music & MSU-1",
    "randomizer.gameoptions.quickswap": "L/R Quickswapping",
+    "randomizer.gameoptions.reduce_flashing": "Reduce Flashing",

    "randomizer.gameoptions.heartcolor": "Heart Color",
    "randomizer.gameoptions.heartcolor.red": "Red",
--- a/resources/app/gui/randomize/gameoptions/widgets.json
+++ b/resources/app/gui/randomize/gameoptions/widgets.json
@@ -1,7 +1,8 @@
 {
  "checkboxes":   {
    "nobgm":      { "type": "checkbox" },
-    "quickswap":  { "type": "checkbox" }
+    "quickswap":  { "type": "checkbox" },
+    "reduce_flashing": { "type": "checkbox" }
  },
  "leftRomOptionsFrame": {
    "heartcolor": {