Merge pull request #2209 from kjbranch/ws-complex

Add canComplexGMode to WS

Author: osse101

region/wreckedship/main/Basement.json

@@ -343,6 +343,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "f_DefeatedPhantoon",
         {"or": [
           "h_preciseIceClip",
@@ -390,6 +391,7 @@
       },
       "requires": [
         {"notable": "G-Mode Morph Workrobot Ride"},
+        "canComplexGMode",
         "f_DefeatedPhantoon",
         "canBePatient",
         "h_artificialMorphPowerBomb",
@@ -428,15 +430,15 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "f_DefeatedPhantoon",
-        "canInsaneJump",
         "canKago",
         {"enemyDamage": {"enemy": "Atomic", "type": "contact", "hits": 1}}
       ],
       "flashSuitChecked": true,
       "note": [
         "Wait for the Atomic to hit Samus, then use it to force her way through the first Workrobot.",
-        "Move partway across the room to where Samus can see approximately one full tile of the vertical doorshell, to keep the Atomic just off screen.",
+        "Move partway across the room and keep the Atomic just off screen, which is where Samus can see approximately one full tile of the vertical doorshell.",
         "Wait for the Workrobot to appear, then hold right as it enters the screen to get hit by the Atomic and kago through the Workrobot.",
         "Quickly use the camera scroll blocks just left of the bomb blocks, in order to overload PLMs and go through them before the Atomic hits Samus."
       ],
@@ -453,15 +455,15 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "f_DefeatedPhantoon",
-        "canInsaneJump",
         "canKago",
         {"enemyDamage": {"enemy": "Atomic", "type": "contact", "hits": 2}}
       ],
       "flashSuitChecked": true,
       "note": [
-        "Wait for the Atomic to hit Samus, then use it to force her way through the first Workrobot.",
-        "Move partway across the room to where Samus can see approximately one full tile of the vertical doorshell, to keep the Atomic just off screen.",
+        "Delay getting hit by the Atomic for as long as possible, then fall off the ledge and clip through the first Workrobot.",
+        "Move partway across the room and keep the Atomic just off screen, which is where Samus can see approximately one full tile of the vertical doorshell.",
         "Wait for the Workrobot to appear, then hold right as it enters the screen to get hit by the Atomic and kago through the Workrobot.",
         "Quickly use the camera scroll blocks just left of the bomb blocks, in order to overload PLMs and go through them before the Atomic hits Samus."
       ]
@@ -666,6 +668,7 @@
         "comesThroughToilet": "any"
       },
       "requires": [
+        "canComplexGMode",
         "f_DefeatedPhantoon",
         {"or": [
           "h_preciseIceClip",
@@ -793,6 +796,7 @@
         "comesThroughToilet": "any"
       },
       "requires": [
+        "canComplexGMode",
         "f_DefeatedPhantoon",
         "h_artificialMorphPowerBomb",
         {"or": [

region/wreckedship/main/Bowling Alley.json

@@ -152,7 +152,8 @@
         [1, 2, 2, 2, 2, 1],
         [0, 1, 1, 1, 1, 1]
       ],
-      "note": "Represents being in the statue's hands with G-mode and morph or artificial morph, and about to fall into the spike pit."
+      "note": "Represents being in the statue's hands with G-mode and morph or artificial morph, and about to fall into the spike pit.",
+      "devNote": "Strats that go to or from this node require canComplexGMode, because the way it behaves and how you need to move while off camera after the Chozo ride is unintuitive."
     }
   ],
   "obstacles": [
@@ -903,6 +904,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "f_DefeatedPhantoon",
         "Morph",
         {"or": [
@@ -935,6 +937,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "f_DefeatedPhantoon",
         "h_CrystalFlash",
         {"or": [
@@ -970,6 +973,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "f_DefeatedPhantoon",
         "h_artificialMorphSpringFling",
         "canInsaneJump",
@@ -992,6 +996,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "f_DefeatedPhantoon",
         {"notable": "Ceiling Bomb Jump"},
         "canLongCeilingBombJump",
@@ -1698,6 +1703,7 @@
       "link": [7, 2],
       "name": "G-Mode, Bowling Without Going Down",
       "requires": [
+        "canComplexGMode",
         {"or": [
           "h_artificialMorphBombThings",
           {"spikeHits": 1}
@@ -1719,6 +1725,7 @@
       "link": [7, 3],
       "name": "G-Mode, Bowling Then Go Down",
       "requires": [
+        "canComplexGMode",
         {"or": [
           "h_artificialMorphBombThings",
           {"spikeHits": 1}

region/wreckedship/main/Electric Death Room.json

@@ -301,6 +301,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canLongXRayClimb"
       ],
       "bypassesDoorShell": true,

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

@@ -455,6 +455,7 @@
         "comesThroughToilet": "any"
       },
       "requires": [
+        "canComplexGMode",
         {"or": [
           "h_artificialMorphPowerBomb",
           {"and": [
@@ -679,13 +680,23 @@
         }
       },
       "requires": [
-        "canOffScreenMovement"
+        {"or": [
+          {"and": [
+            "canOffScreenMovement",
+            "canTrickyGMode"
+          ]},
+          {"and": [
+            {"not": "f_DefeatedPhantoon"},
+            "canRiskPermanentLossOfAccess"
+          ]}
+        ]}
       ],
       "flashSuitChecked": true,
       "note": [
         "Use the camera scroll blocks just right of the bomb blocks, in order to overload PLMs and go through them.",
         "Exit g-mode and travel to the item and back while off screen."
-      ]
+      ],
+      "devNote": "This is only useful if the item is Morph. If Samus already has Morph, she can fix the camera, using another strat."
     },
     {
       "id": 21,
@@ -1125,13 +1136,23 @@
             "HiJump"
           ]}
         ]},
-        "canOffScreenMovement"
+        {"or": [
+          {"and": [
+            "canOffScreenMovement",
+            "canTrickyGMode"
+          ]},
+          {"and": [
+            {"not": "f_DefeatedPhantoon"},
+            "canRiskPermanentLossOfAccess"
+          ]}
+        ]}
       ],
       "flashSuitChecked": true,
       "note": [
         "Use the camera scroll blocks just right of the bomb blocks, in order to overload PLMs and go through them.",
         "Exit g-mode and travel to the item and back while off screen."
-      ]
+      ],
+      "devNote": "This is only useful if the item is Morph. If Samus already has Morph, she can fix the camera, using another strat."
     },
     {
       "id": 106,
@@ -1445,13 +1466,23 @@
         }
       },
       "requires": [
-        "canOffScreenMovement"
+        {"or": [
+          {"and": [
+            "canOffScreenMovement",
+            "canTrickyGMode"
+          ]},
+          {"and": [
+            {"not": "f_DefeatedPhantoon"},
+            "canRiskPermanentLossOfAccess"
+          ]}
+        ]}
       ],
       "flashSuitChecked": true,
       "note": [
         "Use the camera scroll blocks just right of the bomb blocks, in order to overload PLMs and go through them.",
         "Exit g-mode and travel to the item and back while off screen."
-      ]
+      ],
+      "devNote": "This is only useful if the item is Morph. If Samus already has Morph, she can fix the camera, using another strat."
     },
     {
       "id": 63,
@@ -1516,6 +1547,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canXRayClimb"
       ],
       "bypassesDoorShell": true,
@@ -1715,13 +1747,23 @@
         }
       },
       "requires": [
-        "canOffScreenMovement"
+        {"or": [
+          {"and": [
+            "canOffScreenMovement",
+            "canTrickyGMode"
+          ]},
+          {"and": [
+            {"not": "f_DefeatedPhantoon"},
+            "canRiskPermanentLossOfAccess"
+          ]}
+        ]}
       ],
       "flashSuitChecked": true,
       "note": [
         "Use the camera scroll blocks just right of the bomb blocks, in order to overload PLMs and go through them.",
         "Exit g-mode and travel to the item and back while off screen."
-      ]
+      ],
+      "devNote": "This is only useful if the item is Morph. If Samus already has Morph, she can fix the camera, using another strat."
     },
     {
       "id": 78,