Merge branch 'KrisDavie-hmg_logic' into DoorDevVolatile

resources/app/cli/args.json

@@ -23,6 +23,7 @@
       "noglitches",
       "minorglitches",
       "owglitches",
+      "hybridglitches",
       "nologic"
     ]
   },

resources/app/cli/lang/en.json

@@ -56,7 +56,8 @@
     "building.collection.spheres": "Building up collection spheres",
     "building.calculating.spheres": "Calculated sphere %i, containing %i of %i progress items.",
     "building.final.spheres": "Calculated final sphere %i, containing %i of %i progress items.",
-    "old.python.version": "Door Rando may have issues with python versions earlier than 3.7.  Detected version: %s"
+    "old.python.version": "Door Rando may have issues with python versions earlier than 3.7.  Detected version: %s",
+    "hybridglitches.door.shuffle": "Hybrid Major Glitches is not currently compatible with Door Shuffle."
   },
   "help": {
     "lang": [ "App Language, if available, defaults to English" ],
@@ -64,11 +65,13 @@
     "bps": [ "Output BPS patches instead of ROMs"],
     "logic": [
       "Select Enforcement of Item Requirements. (default: %(default)s)",
-      "No Glitches:    No Glitch knowledge required.",
-      "Minor Glitches: May require Fake Flippers, Bunny Revival",
-      "                and Dark Room Navigation.",
-      "No Logic:       Distribute items without regard for",
-      "                item requirements."
+      "No Glitches:           No Glitch knowledge required.",
+      "Minor Glitches:        May require Fake Flippers, Bunny Revival",
+      "                       and Dark Room Navigation.",
+      "Overworld Glitches:    May require overworld clips and teleports.",
+      "Hybrid Major Glitches: May require underworld clips.",
+      "No Logic:              Distribute items without regard for",
+      "                       item requirements."
     ],
     "mode": [
       "Select game mode. (default: %(default)s)",

resources/app/gui/lang/en.json

@@ -263,6 +263,7 @@
     "randomizer.item.logiclevel.noglitches": "No Glitches",
     "randomizer.item.logiclevel.minorglitches": "Minor Glitches",
     "randomizer.item.logiclevel.owglitches": "Overworld Glitches",
+    "randomizer.item.logiclevel.hybridglitches": "Hybrid Major Glitches",
     "randomizer.item.logiclevel.nologic": "No Logic",
 
     "randomizer.item.goal": "Goal",

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

@@ -21,6 +21,7 @@
         "noglitches",
         "minorglitches",
         "owglitches",
+        "hybridglitches",
         "nologic"
       ]
     },