Merge pull request #2219 from kjbranch/y-g-maridia-complex

Add canComplexGMode to Green and Yellow Maridia

Author: osse101

region/maridia/inner-green/Shaktool Room.json

@@ -259,6 +259,7 @@
       },
       "requires": [
         {"notable": "Reverse G-Mode Morph"},
+        "canComplexGMode",
         {"or": [
           {"and": [
             "Gravity",
@@ -293,6 +294,7 @@
       },
       "requires": [
         {"notable": "Reverse G-Mode Morph"},
+        "canComplexGMode",
         "h_artificialMorphIBJ",
         "h_artificialMorphPowerBomb"
       ],

region/maridia/inner-yellow/Kassiuz Room.json

@@ -388,6 +388,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canLongXRayClimb",
         "canBePatient",
         "canOffScreenMovement"

region/maridia/inner-yellow/Maridia Elevator Room.json

@@ -792,7 +792,7 @@
     {
       "id": 17,
       "link": [1, 4],
-      "name": "G-Mode Morph IBJ, PB, Spring Ball",
+      "name": "G-Mode Morph IBJ, Power Bomb, Spring Ball",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "any",
@@ -820,7 +820,7 @@
     {
       "id": 18,
       "link": [1, 4],
-      "name": "G-Mode Morph IBJ, PB",
+      "name": "G-Mode Morph IBJ, Power Bomb",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "any",
@@ -1275,7 +1275,7 @@
     {
       "id": 36,
       "link": [2, 4],
-      "name": "G-Mode Morph IBJ, PB",
+      "name": "G-Mode Morph IBJ, Power Bomb",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "any",

region/maridia/inner-yellow/Plasma Spark Room.json

@@ -1019,6 +1019,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canLongXRayClimb"
       ],
       "flashSuitChecked": true,
@@ -1051,6 +1052,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canLongXRayClimb"
       ],
       "bypassesDoorShell": true,

region/maridia/inner-yellow/The Beach.json

@@ -343,6 +343,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         {"or": [
           {"and": [
             "Gravity",
@@ -604,7 +605,7 @@
     {
       "id": 69,
       "link": [2, 1],
-      "name": "G-Mode Morph",
+      "name": "G-Mode Morph, Remote Acquire",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "any",
@@ -613,6 +614,7 @@
         "comesThroughToilet": "any"
       },
       "requires": [
+        "canComplexGMode",
         {"or": [
           {"and": [
             "Gravity",