Merge pull request #2214 from kjbranch/ln-complex

kjbranch · web-flow · commit e2692703ba38 · 2025-08-14T08:23:19.000-06:00
Add canComplexGMode to LN
diff --git a/helpers.json b/helpers.json
@@ -1138,8 +1138,15 @@
         {
           "name": "h_heatedGModePauseAbuse",
           "requires": [
-            "h_heatedGMode",
-            "canPauseAbuse"
+            "canEnterGMode",
+            "canPauseAbuse",
+            {"or": [
+              "h_heatProof",
+              {"and": [
+                "canComplexGMode",
+                "canHeatedGMode"
+              ]}
+            ]}
           ]
         },
         {
diff --git a/region/lowernorfair/east/Fast Pillars Setup Room.json b/region/lowernorfair/east/Fast Pillars Setup Room.json
@@ -1235,6 +1235,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canXRayClimb",
         {"heatFrames": 1600}
       ],
@@ -1269,6 +1270,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "h_heatProof",
         "canXRayClimb"
       ],
@@ -1479,6 +1481,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canXRayClimb",
         {"heatFrames": 1650}
       ],
@@ -1751,6 +1754,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "h_heatProof",
         "canLongXRayClimb"
       ],
diff --git a/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json b/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json
@@ -310,6 +310,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "h_heatedDirectGModeLeaveSameDoor"
       ],
       "collectsItems": [4],
diff --git a/region/lowernorfair/east/Main Hall.json b/region/lowernorfair/east/Main Hall.json
@@ -523,6 +523,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "SpaceJump",
         "h_heatedGModeOffCameraDoor"
       ],
diff --git a/region/lowernorfair/east/Plowerhouse Room.json b/region/lowernorfair/east/Plowerhouse Room.json
@@ -362,24 +362,12 @@
       "requires": [
         {"or": [
           "ScrewAttack",
-          "canTrickyGMode",
+          "canInsaneJump",
           {"and": [
             "canTrickyDodgeEnemies",
-            "Plasma",
-            {"or": [
-              "Wave",
-              "Ice"
-            ]}
-          ]},
-          {"and": [
-            "canInsaneJump",
             "Plasma"
           ]},
-          {"enemyDamage": {"enemy": "Holtz", "type": "contact", "hits": 1}},
-          {"and": [
-            "canInsaneJump",
-            {"enemyDamage": {"enemy": "Zebbo", "type": "contact", "hits": 1}}
-          ]}
+          {"enemyDamage": {"enemy": "Holtz", "type": "contact", "hits": 1}}
         ]},
         {"or": [
           "h_heatedGModePauseAbuse",
@@ -389,7 +377,8 @@
       "flashSuitChecked": true,
       "note": [
         "Kill or dodge the Holtz while crossing the room. With Plasma and Wave or Ice, it is possible to quickly kill the Holtz while at the left door.",
-        "Otherwise, jump immediately on entry while Samus still has i-frames to get to the left of the first Zebbo and kill it.",
+        "Otherwise, in direct G-mode, jump immediately on entry while Samus still has i-frames to get to the left of the first Zebbo and kill it,",
+        "and in indirect G-mode, move to the left then run under the Holtzes.",
         "Carefully cross the room while killing the Holtz without luring them, or dodge them.",
         "It is possible to kill a Zebbo by the door and pause abuse to grab its Energy drop on G-mode exit, which requires not killing the right Zebbo until it is in location."
       ]
diff --git a/region/lowernorfair/east/Ridley's Room.json b/region/lowernorfair/east/Ridley's Room.json
@@ -423,6 +423,7 @@
       },
       "requires": [
         {"notable": "G-Mode Crystal Flash Stuck Ridley"},
+        "canComplexGMode",
         "h_heatedGMode",
         "h_CrystalFlash",
         "h_usePowerBomb",
@@ -467,6 +468,7 @@
       },
       "requires": [
         {"notable": "G-Mode Ridley with 30 Supers"},
+        "canTrickyGMode",
         "h_heatedGMode",
         {"heatFrames": 0},
         {"ammo": {"type": "Super", "count": 30}},
@@ -580,7 +582,7 @@
           "canTrickyGMode",
           {"heatFrames": 180}
         ]},
-        "canInsaneJump",
+        "canComplexGMode",
         {"or": [
           "SpaceJump",
           "canWalljump",
@@ -726,6 +728,7 @@
       },
       "requires": [
         {"notable": "G-Mode Crystal Flash Stuck Ridley"},
+        "canComplexGMode",
         "h_heatedGMode",
         "h_CrystalFlash",
         "h_usePowerBomb",
@@ -774,6 +777,7 @@
       },
       "requires": [
         {"notable": "G-Mode Ridley with 30 Supers"},
+        "canTrickyGMode",
         "h_heatedGMode",
         {"heatFrames": 0},
         {"ammo": {"type": "Super", "count": 30}},
diff --git a/region/lowernorfair/east/The Jail.json b/region/lowernorfair/east/The Jail.json
@@ -106,6 +106,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "h_heatedGMode",
         "canPowerBombItemOverloadPLMs",
         {"ammo": {"type": "PowerBomb", "count": 18}},
@@ -291,6 +292,7 @@
         "comesThroughToilet": "any"
       },
       "requires": [
+        "canComplexGMode",
         "h_heatedGMode",
         "canPowerBombItemOverloadPLMs",
         {"itemNotCollectedAtNode": 3},
diff --git a/region/lowernorfair/east/The Worst Room In The Game.json b/region/lowernorfair/east/The Worst Room In The Game.json
@@ -443,6 +443,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "h_heatProof",
         "canLongXRayClimb",
         "canBeVeryPatient"
@@ -601,7 +602,8 @@
           "h_heatedGModeOpenDifferentDoor",
           {"and": [
             "h_heatedGModePauseAbuse",
-            "canInsaneJump"
+            "canInsaneJump",
+            "canComplexGMode"
           ]}
         ]}
       ],
diff --git a/region/lowernorfair/east/Three Musketeers' Room.json b/region/lowernorfair/east/Three Musketeers' Room.json
@@ -541,11 +541,9 @@
         }
       },
       "requires": [
+        "canInsaneJump",
         {"or": [
-          {"and": [
-            "canInsaneJump",
-            "h_artificialMorphJumpIntoIBJ"
-          ]},
+          "h_artificialMorphJumpIntoIBJ",
           {"and": [
             "canTrickyGMode",
             "h_artificialMorphSpringFling"
diff --git a/region/lowernorfair/east/Wasteland.json b/region/lowernorfair/east/Wasteland.json
@@ -561,7 +561,10 @@
       },
       "requires": [
         "Morph",
-        "canTrickyJump",
+        {"or": [
+          "canComplexGMode",
+          "Wave"
+        ]},
         {"or": [
           "canInsaneJump",
           {"ammo": {"type": "Super", "count": 1}},
diff --git a/region/lowernorfair/west/Golden Torizo's Room.json b/region/lowernorfair/west/Golden Torizo's Room.json
@@ -268,6 +268,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "h_heatedDirectGModeLeaveSameDoor"
       ],
       "collectsItems": [3],
@@ -284,6 +285,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "Charge",
         "h_useMorphBombs",
         "h_heatedGModeOffCameraDoor"
@@ -324,6 +326,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         {"or": [
           {"and": [
             {"itemNotCollectedAtNode": 3},
@@ -736,7 +739,7 @@
         {"notable": "Safe Spot Kill"},
         {"or": [
           {"resourceAtMost": [{"type": "Missile", "count": 31}]},
-          "canInsaneJump"
+          "canComplexGMode"
         ]},
         {"or": [
           {"ammo": {"type": "Super", "count": 30}},
@@ -836,7 +839,7 @@
       },
       "requires": [
         {"notable": "Safe Spot Kill"},
-        "canInsaneJump",
+        "canComplexGMode",
         {"or": [
           {"ammo": {"type": "Super", "count": 30}},
           {"and": [
@@ -1046,7 +1049,6 @@
         "Starting from a jump or with a double bomb jump can help speed this up and make it much easier,",
         "but Samus needs to bomb slowly near the top to prevent hitting the crumble blocks before PLMs are overloaded.",
         "Get GT to jump away then again jump into IBJ and climb to the right item.",
-        "With a speedy jump, it is possible to overload PLMs with one jump, then wait for it to get close and run under it and jump to the top right.",
         "Note that Samus can roll under GT, but when it attacks, it places stationary invisible projectiles, which may block Samus' path.",
         "Place a Power Bomb then quickly exit G-mode to quickly clear all of the bomb blocks, otherwise it is possible to get out with a few Bombs or Screw Attack."
       ]
@@ -1090,7 +1092,7 @@
         {"notable": "Safe Spot Kill"},
         {"or": [
           {"resourceAtMost": [{"type": "Missile", "count": 31}]},
-          "canInsaneJump"
+          "canComplexGMode"
         ]},
         {"or": [
           {"ammo": {"type": "Super", "count": 30}},
diff --git a/region/lowernorfair/west/Screw Attack Room.json b/region/lowernorfair/west/Screw Attack Room.json
@@ -1668,6 +1668,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "h_heatProof",
         {"or": [
           "canWalljump",

Original file line number	Diff line number	Diff line change
`@@ -1138,8 +1138,15 @@`
`1138`	`1138`	`{`
`1139`	`1139`	`"name": "h_heatedGModePauseAbuse",`
`1140`	`1140`	`"requires": [`
`1141`		`- "h_heatedGMode",`
`1142`		`- "canPauseAbuse"`
	`1141`	`+ "canEnterGMode",`
	`1142`	`+ "canPauseAbuse",`
	`1143`	`+ {"or": [`
	`1144`	`+ "h_heatProof",`
	`1145`	`+ {"and": [`
	`1146`	`+ "canComplexGMode",`
	`1147`	`+ "canHeatedGMode"`
	`1148`	`+ ]}`
	`1149`	`+ ]}`
`1143`	`1150`	`]`
`1144`	`1151`	`},`
`1145`	`1152`	`{`
Original file line number	Diff line number	Diff line change
`@@ -310,6 +310,7 @@`
`310`	`310`	`}`
`311`	`311`	`},`
`312`	`312`	`"requires": [`
	`313`	`+ "canComplexGMode",`
`313`	`314`	`"h_heatedDirectGModeLeaveSameDoor"`
`314`	`315`	`],`
`315`	`316`	`"collectsItems": [4],`
Original file line number	Diff line number	Diff line change
`@@ -523,6 +523,7 @@`
`523`	`523`	`}`
`524`	`524`	`},`
`525`	`525`	`"requires": [`
	`526`	`+ "canComplexGMode",`
`526`	`527`	`"SpaceJump",`
`527`	`528`	`"h_heatedGModeOffCameraDoor"`
`528`	`529`	`],`