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

resources/app/cli/args.json

@@ -260,6 +260,10 @@
     "action": "store_true",
     "type": "bool"
   },
+  "reduce_flashing": {
+    "action": "store_true",
+    "type": "bool"
+  },
   "mapshuffle": {
     "action": "store_true",
     "type": "bool"

resources/app/cli/lang/en.json

@@ -318,7 +318,7 @@
       "Include the Ganon's Tower and Pyramid Hole in the",
       "entrance shuffle pool. (default: %(default)s)"
     ],
-    "shufflelink": [
+    "shufflelinks": [
       "Include Link's House in the entrance shuffle pool. (default: %(default)s)"
     ],
     "heartbeep": [
@@ -333,6 +333,7 @@
       "Alternatively, can be a ALttP Rom patched with a Link",
       "sprite that will be extracted."
     ],
+    "reduce_flashing": [ "Reduce some in-game flashing (default: %(default)s)" ],
     "create_rom": [ "Create an output rom file. (default: %(default)s)" ],
     "gui": [ "Launch the GUI. (default: %(default)s)" ],
     "jsonout": [

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": {

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",

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": {

resources/ci/common/install.py

@@ -6,7 +6,9 @@ import subprocess # do stuff at the shell level
 
 env = common.prepare_env()
 
-pip_requirements = os.path.join(".","resources","app","meta","manifests","pip_requirements.txt")
+pip_requirements = os.path.join("..","resources","app","meta","manifests","pip_requirements.txt")
+if not os.path.isfile(pip_requirements):
+  pip_requirements = os.path.join("..","..","..","resources","app","meta","manifests","pip_requirements.txt")
 
 def run_install(PY_VERSION,USER):
   # get executables