Add canComplexGMode to setups (Maridia)

Author: kjbranch

region/maridia/inner-green/East Sand Hall.json

@@ -138,7 +138,11 @@
       "link": [1, 1],
       "name": "G-Mode Setup - Get Hit By Evir Projectile",
       "requires": [
-        "h_navigateUnderwater"
+        "h_navigateUnderwater",
+        {"or": [
+          "Gravity",
+          "canComplexGMode"
+        ]}
       ],
       "exitCondition": {
         "leaveWithGModeSetup": {}
@@ -1000,7 +1004,7 @@
       "name": "G-Mode Setup - Get Hit By Evir Projectile",
       "requires": [
         "Gravity",
-        "canTrickyJump"
+        "canComplexGMode"
       ],
       "exitCondition": {
         "leaveWithGModeSetup": {}
@@ -1017,19 +1021,19 @@
       "name": "Right Door G-Mode Setup Suitless HiJump",
       "requires": [
         {"notable": "Right Door G-Mode Setup Suitless HiJump"},
+        "canTrickyGMode",
         "canSuitlessMaridia",
         "canPlayInSand",
         "canMidairWiggle",
-        "HiJump",
-        "canInsaneJump"
+        "HiJump"
       ],
       "exitCondition": {
         "leaveWithGModeSetup": {}
       },
       "flashSuitChecked": true,
       "note": [
         "The Evir won't shoot unless Samus enters the sand falls. Getting to the transition tiles while standing before the projectile while suitless is very precise.",
-        "From the sand, turnaround spinjump towards the right. Turn towards the sandfall about when you're level with the platform. Turn right and shoot as soon as you enter the sandfall. And try to land right next to the transition."
+        "From the sand, turnaround spinjump towards the right. Turn towards the sandfall about when you're just above the platform. Turn right and shoot as soon as you enter the sandfall. And try to land right next to the transition."
       ]
     },
     {

region/maridia/inner-green/West Sand Hall.json

@@ -612,9 +612,9 @@
       "link": [2, 2],
       "name": "G-Mode Setup - Get Hit By Evir Projectile Suitless",
       "requires": [
+        "canComplexGMode",
         "canSuitlessMaridia",
-        "canTurnaroundSpinJump",
-        "canTrickyJump"
+        "canTurnaroundSpinJump"
       ],
       "exitCondition": {
         "leaveWithGModeSetup": {}

region/maridia/inner-yellow/Maridia Swiss Cheese Room.json

@@ -207,15 +207,15 @@
       "link": [1, 1],
       "name": "G-Mode Setup - Get Hit By Menu",
       "requires": [
-        "canBeVeryPatient",
         "canManipulateMellas"
       ],
       "exitCondition": {
         "leaveWithGModeSetup": {}
       },
       "flashSuitChecked": true,
-      "devNote": [
-        "FIXME Add details on how this works and check if it actually requires canBeVeryPatient."
+      "note": [
+        "Open the door and get into position, jump and aim down then walk through the door.",
+        "If Samus is not able to reset the room, get close to the door with a vertically swooping Menu. Move forwards slowly luring it to the doorway."
       ]
     },
     {

region/maridia/outer/Main Street.json

@@ -4329,6 +4329,7 @@
       "link": [5, 5],
       "name": "G-Mode Setup - Get Hit By Sciser",
       "requires": [
+        "canComplexGMode",
         "h_EverestMorphTunnelExpanded",
         "Morph",
         {"ammo": {"type": "Super", "count": 1}}
@@ -4339,7 +4340,7 @@
       "flashSuitChecked": true,
       "note": [
         "Get to the item while avoiding the crab, note that it doesn't go all the way through the tunnel.",
-        "Use a super to knock it off, while it is on the right wall, in order to knock it off so it will go down the morph tunnel."
+        "Use a Super to knock it off, while it is on the right wall, in order to knock it off so it will go down the morph tunnel."
       ]
     },
     {