Merge pull request #2226 from kjbranch/g-complex-setups

Add canComplexGMode to setups (B, C, T, WS)

Author: osse101

region/brinstar/green/Etecoon Energy Tank Room.json

@@ -1631,7 +1631,7 @@
       "unlocksDoors": [{"types": ["ammo"], "requires": []}],
       "flashSuitChecked": true,
       "note": "Kill or get the Beetom stuck below the platform, then lure a Zebbo to the left door. Be careful not to let the Zebbo go off camera or it will despawn.",
-      "devNote": "It is possible to do this with a Beetom, avoiding the tricky jump, but we will ignore that here."
+      "devNote": "It is possible to do this with a Beetom, avoiding the canTrickyDodgeEnemies, but we will ignore that here."
     },
     {
       "id": 92,

region/brinstar/kraid/Kraid Eye Door Room.json

@@ -639,7 +639,7 @@
       "requires": [
         {"or": [
           "canTrickyUseFrozenEnemies",
-          "canTrickyJump"
+          "canComplexGMode"
         ]}
       ],
       "exitCondition": {
@@ -950,14 +950,17 @@
       "requires": [
         {"or": [
           "canTrickyUseFrozenEnemies",
-          "canTrickyJump"
+          "canComplexGMode"
         ]}
       ],
       "exitCondition": {
         "leaveWithGModeSetup": {}
       },
       "flashSuitChecked": true,
-      "note": "Lure a Zeb by freezing it or by moving quickly while carefully preventing it from going off screen."
+      "note": [
+        "Lure a Zeb by freezing it or by moving quickly while carefully preventing it from going off screen.",
+        "It is possible to lure the Zeb from the left side of the right pillar, which can be helpful without ice."
+      ]
     }
   ],
   "notables": [],

region/brinstar/pink/Big Pink.json

@@ -1127,6 +1127,7 @@
       "link": [3, 3],
       "name": "G-Mode Setup - Get Hit By Zeb",
       "requires": [
+        "canComplexGMode",
         "canTrickyUseFrozenEnemies"
       ],
       "exitCondition": {
@@ -1425,6 +1426,7 @@
       "link": [4, 4],
       "name": "G-Mode Setup - Get Hit By Zeb",
       "requires": [
+        "canComplexGMode",
         "canTrickyUseFrozenEnemies",
         {"or": [
           "h_usePowerBomb",
@@ -2510,6 +2512,7 @@
       "link": [8, 8],
       "name": "G-Mode Setup - Get Hit By Reo",
       "requires": [
+        "canComplexGMode",
         "Morph"
       ],
       "exitCondition": {
@@ -3449,6 +3452,7 @@
       "link": [13, 5],
       "name": "G-Mode Setup - Get Hit By Reo",
       "requires": [
+        "canTrickyGMode",
         "h_preciseIceClip",
         {"notable": "Reo Ice Clip Without Morph and X-Ray"}
       ],

region/brinstar/pink/Dachora Room.json

@@ -1087,6 +1087,7 @@
       "name": "G-Mode Setup - Lure the Zeela Down Below",
       "requires": [
         {"notable": "G-Mode Setup - Lure the Zeela Down Below"},
+        "canComplexGMode",
         "canBePatient",
         "h_getBlueSpeedMaxRunway"
       ],

region/crateria/central/Parlor and Alcatraz.json

@@ -444,7 +444,7 @@
       "flashSuitChecked": true,
       "note": [
         "Destroy the bomb wall to open a path for the Geemer to hit Samus through the transition.",
-        "If using a PB be careful not to kill the Geemer. Place the PB far left, next to the door, as the Geemer is leaving the flat part of the ceiling."
+        "If using a Power Bomb be careful not to kill the Geemer. Place the Power Bomb far left, next to the door, as the Geemer is leaving the flat part of the ceiling."
       ]
     },
     {
@@ -1572,7 +1572,8 @@
       "flashSuitChecked": true,
       "note": [
         "It takes approximately 3.5 minutes for a global Geemer to reach this location,",
-        "but this can be reduced by using a Super between 19 and 33 seconds after entering the room, to make a Geemer fall and take a shorter path."
+        "but this can be reduced by using a Super between 19 and 33 seconds after entering the room, to make a Geemer fall and take a shorter path.",
+        "It is possible to climb the room and watch for the Geemer instead of timing it."
       ]
     },
     {
@@ -1584,7 +1585,10 @@
         "h_ZebesIsAwake",
         {"or": [
           "canBeVeryPatient",
-          {"ammo": {"type": "Super", "count": 1}}
+          {"and": [
+            "canComplexGMode",
+            {"ammo": {"type": "Super", "count": 1}}
+          ]}
         ]}
       ],
       "gModeRegainMobility": {},

region/crateria/east/West Ocean.json

@@ -2026,6 +2026,7 @@
       "name": "G-Mode Setup Lure Zeb from Below (to Top Right Section - Top Right Door)",
       "requires": [
         {"notable": "G-Mode Setup Lure Zeb from Below"},
+        "canComplexGMode",
         "canTrickyUseFrozenEnemies",
         {"or": [
           "h_bombThings",
@@ -2055,6 +2056,7 @@
       "name": "G-Mode Setup Lure Zeb from Below (to Top Right Section - Bottom Right Door)",
       "requires": [
         {"notable": "G-Mode Setup Lure Zeb from Below"},
+        "canComplexGMode",
         "canTrickyUseFrozenEnemies",
         {"or": [
           "h_bombThings",

region/tourian/main/Metroid Room 2.json

@@ -1272,7 +1272,8 @@
         "leaveWithGModeSetup": {}
       },
       "flashSuitChecked": true,
-      "note": ["If the Metroids are alive, lure them off screen."]
+      "note": ["If the Metroids are alive, lure them off screen."],
+      "devNote": "There could be another strat for a Metroid or Rinka, that doesn't have canMetroidAvoid or canRiskPermanentLossOfAccess, but canMetroidAvoid isn't too difficult for this level."
     },
     {
       "id": 52,

region/tourian/main/Rinka Shaft.json

@@ -205,7 +205,7 @@
       "link": [1, 1],
       "name": "G-Mode Setup - Get Hit By Rinka",
       "requires": [
-        "canTrickyJump"
+        "canComplexGMode"
       ],
       "exitCondition": {
         "leaveWithGModeSetup": {}

region/wreckedship/main/Wrecked Ship Main Shaft.json

@@ -429,6 +429,11 @@
       "note": [
         "Bring two atomics to the top of the room.",
         "Stand on one frozen Atomic to freeze a second Atomic at the correct height to use as a platform."
+      ],
+      "devNote": [
+        "It doesn't seem possible with a Covern. Samus needs to be moving upwards 1+ pixel per frame for 16 frames to spawn the Covern.",
+        "Jumping or with Spring Ball are less than 16 before going through the door. If below the platform, the Covern cannot spawn high enough (it spawns 4 tiles above Samus's middle).",
+        "A bomb boost only gives 10 satisfactory frames. Moving diagonally resets the counter in a weird way."
       ]
     },
     {