Merge pull request #2210 from kjbranch/tourian-complex

Add canComplexGMode to Tourian

Author: osse101

region/tourian/main/Metroid Room 1.json

@@ -420,6 +420,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "h_artificialMorphCrystalFlash",
         {"autoReserveTrigger": {}}
       ],
@@ -1704,6 +1705,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "h_artificialMorphCrystalFlash",
         {"autoReserveTrigger": {}}
       ],

region/tourian/main/Metroid Room 2.json

@@ -578,6 +578,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "f_KilledMetroidRoom2",
         {"enemyDamage": {"enemy": "Rinka", "type": "contact", "hits": 1}},
         "canXRayClimb"
@@ -609,6 +610,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "Ice",
         "canXRayClimb"
       ],
@@ -632,6 +634,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "h_CrystalFlash",
         {"autoReserveTrigger": {}},
         "canXRayClimb",

region/tourian/main/Metroid Room 3.json

@@ -390,6 +390,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canMetroidAvoid",
         "canInsaneJump",
         {"ammo": {"type": "PowerBomb", "count": 4}}
@@ -416,6 +417,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "h_artificialMorphCrystalFlash",
         {"autoReserveTrigger": {}}
       ],
@@ -1036,6 +1038,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "h_artificialMorphCrystalFlash",
         {"autoReserveTrigger": {}}
       ],

region/tourian/main/Metroid Room 4.json

@@ -210,6 +210,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canMetroidAvoid",
         "h_artificialMorphCrystalFlash",
         {"autoReserveTrigger": {}}

region/tourian/main/Mother Brain Room.json

@@ -376,6 +376,7 @@
       "requires": [
         {"notable": "Moondance Clip"},
         {"not": "f_MotherBrainGlassBroken"},
+        "canTrickyGMode",
         "h_artificialMorphMovement",
         "h_artificialMorphCrystalFlash",
         "h_fullEnemyDamageReduction",
@@ -409,6 +410,7 @@
       "requires": [
         {"notable": "Moondance Clip"},
         {"not": "f_MotherBrainGlassBroken"},
+        "canTrickyGMode",
         "h_artificialMorphMovement",
         "h_artificialMorphCrystalFlash",
         {"resourceMaxCapacity": [{"type": "RegularEnergy", "count": 299}]},

region/tourian/main/Rinka Shaft.json

@@ -279,6 +279,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canXRayClimb"
       ],
       "bypassesDoorShell": true,
@@ -642,6 +643,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         {"enemyDamage": {"enemy": "Rinka", "type": "contact", "hits": 1}},
         "canLongXRayClimb"
       ],
@@ -671,6 +673,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "Ice",
         "canLongXRayClimb"
       ],
@@ -694,6 +697,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "h_CrystalFlash",
         {"autoReserveTrigger": {}},
         "canLongXRayClimb",
@@ -794,6 +798,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         {"enemyDamage": {"enemy": "Rinka", "type": "contact", "hits": 1}},
         "canXRayClimb"
       ],
@@ -823,6 +828,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "Ice",
         "canXRayClimb"
       ],
@@ -846,6 +852,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "h_CrystalFlash",
         {"autoReserveTrigger": {}},
         "canXRayClimb",

region/tourian/main/Tourian Escape Room 2.json

@@ -194,6 +194,7 @@
         "comesThroughToilet": "any"
       },
       "requires": [
+        "canComplexGMode",
         "h_preciseIceClip"
       ],
       "exitCondition": {
@@ -321,6 +322,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "h_preciseIceClip"
       ],
       "exitCondition": {

region/tourian/main/Tourian Escape Room 3.json

@@ -386,7 +386,7 @@
     {
       "id": 14,
       "link": [1, 2],
-      "name": "G-Mode Morph PB Pirate Kill",
+      "name": "G-Mode Morph Power Bomb Pirate Kill",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "any",
@@ -402,12 +402,15 @@
       ],
       "clearsObstacles": ["A"],
       "flashSuitChecked": true,
-      "note": "IBJ or spring ball bomb jump to avoid the wall jump. The first pirate takes 2 PBs, the next 3 can be killed with 3 total PBs if they are placed under the middle pirate."
+      "note": [
+        "IBJ or spring ball bomb jump to avoid the wall jump.",
+        "Killing the first pirate takes 2 Power Bombs, the next three can be killed with 3 total Power Bombs if they are placed under the middle pirate."
+      ]
     },
     {
       "id": 15,
       "link": [1, 2],
-      "name": "G-Mode Morph PB Pirate Hitbox",
+      "name": "G-Mode Morph Power Bomb Pirate Hitbox",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "any",
@@ -425,7 +428,10 @@
         "canHitbox"
       ],
       "flashSuitChecked": true,
-      "note": "IBJ or spring ball bomb jump to avoid the wall jump. Using a total of 3 PBs will allow Samus to roll through the bottom 4 pirates."
+      "note": [
+        "IBJ or spring ball bomb jump to avoid the wall jump.",
+        "Using a total of 3 Power Bombs will allow Samus to roll through the bottom four pirates."
+      ]
     },
     {
       "id": 16,

region/tourian/main/Tourian Escape Room 4.json

@@ -416,7 +416,7 @@
       ],
       "flashSuitChecked": true,
       "note": [
-        "IBJ and use 10 PBs to kill the pirates and get to the top. Exit G-mode and fall to the bottom.",
+        "IBJ and use 10 Power Bombs to kill the pirates and get to the top. Exit G-mode and fall to the bottom.",
         "Note that there is a path up to the right that doesn't need wall jumps, but a crouch jump down grab is needed to get to the final platform."
       ]
     },
@@ -445,7 +445,7 @@
         "It is recommended to stay near the right wall with the camera positioned so that the left wall pirates are off camera.",
         "Avoid touching any of the pirates' stationary, invisible lasers, which they place when they jump to the opposite wall."
       ],
-      "devNote": "FIXME: This is likely possible with just Bombs, but seems very difficult, a diagonal bomb jump around th overhangs might make it feasible."
+      "devNote": "FIXME: This is likely possible with just Bombs, but seems very difficult, a diagonal bomb jump around the overhangs might make it feasible."
     },
     {
       "id": 10,