Merge pull request #2163 from kjbranch/g-ln

LN G-Mode: Second Pass

Author: osse101

region/lowernorfair/east/Fast Pillars Setup Room.json

@@ -989,7 +989,7 @@
             "canJumpIntoIBJ"
           ]}
         ]},
-        {"heatFrames": 80}
+        {"heatFrames": 70}
       ],
       "flashSuitChecked": true,
       "note": "After climbing the room, it is possible to shoot at the door and then use X-Ray, so the shot hits immediately afterwards.",
@@ -1012,8 +1012,11 @@
         "h_heatedGMode",
         {"ammo": {"type": "PowerBomb", "count": 3}},
         "h_artificialMorphIBJ",
-        "canInsaneJump",
-        {"heatFrames": 80}
+        {"or": [
+          "canInsaneJump",
+          {"ammo": {"type": "PowerBomb", "count": 3}}
+        ]},
+        {"heatFrames": 70}
       ],
       "clearsObstacles": ["A"],
       "flashSuitChecked": true,
@@ -1040,14 +1043,14 @@
         "h_heatedGMode",
         "h_artificialMorphIBJ",
         "canTrickyGMode",
-        {"heatFrames": 80}
+        {"heatFrames": 70}
       ],
       "flashSuitChecked": true,
       "note": [
         "IBJ up the room while avoiding any of the invisible, stationary lasers that the pirates have placed;",
         "it is possible to manipulate the bottom pirate to place several lasers, in order to overload them,",
         "and then IBJ over the pirate and IBJ again from the right corner.",
-        "OVerloading the lasers can prevent the wall pirates from placing one when they jump. Abort the IBJ and fall if necessary to avoid a pirate hit.",
+        "Overloading the lasers can prevent the wall pirates from placing one when they jump. Abort the IBJ and fall if necessary to avoid a pirate hit.",
         "It is then possible to shoot at the door and then use X-Ray, so the shot hits immediately afterwards."
       ]
     },

region/lowernorfair/east/Ridley's Room.json

@@ -472,7 +472,7 @@
         {"ammo": {"type": "Super", "count": 30}},
         {"or": [
           {"and": [
-            "canPauseAbuse",
+            "h_heatedGModePauseAbuse",
             {"resourceAtMost": [{"type": "Energy", "count": 1}]},
             {"partialRefill": {"type": "Energy", "limit": 100}}
           ]},
@@ -622,10 +622,13 @@
           "canWalljump",
           {"and": [
             "canJumpIntoIBJ",
-            "canTrickyJump",
+            "canInsaneJump",
             {"or": [
-              "canLongIBJ",
-              "HiJump"
+              "HiJump",
+              {"and": [
+                "canLongIBJ",
+                "canDoubleBombJump"
+              ]}
             ]}
           ]},
           {"and": [
@@ -776,7 +779,7 @@
         {"ammo": {"type": "Super", "count": 30}},
         {"or": [
           {"and": [
-            "canPauseAbuse",
+            "h_heatedGModePauseAbuse",
             {"resourceAtMost": [{"type": "Energy", "count": 1}]},
             {"partialRefill": {"type": "Energy", "limit": 100}}
           ]},

region/lowernorfair/east/Three Musketeers' Room.json

@@ -529,7 +529,10 @@
       },
       "requires": [
         {"or": [
-          "h_artificialMorphJumpIntoIBJ",
+          {"and": [
+            "canInsaneJump",
+            "h_artificialMorphJumpIntoIBJ"
+          ]},
           {"and": [
             "canTrickyGMode",
             "h_artificialMorphSpringFling"

region/lowernorfair/west/Golden Torizo's Room.json

@@ -1873,6 +1873,7 @@
       "link": [7, 1],
       "name": "G-Mode, Through the Crumble Blocks",
       "requires": [
+        "h_heatedGMode",
         {"or": [
           "f_DefeatedGoldenTorizo",
           "canTrickyDodgeEnemies"
@@ -1894,16 +1895,21 @@
               "f_DefeatedGoldenTorizo",
               "canInsaneJump"
             ]}
+          ]},
+          {"and": [
+            "f_DefeatedGoldenTorizo",
+            {"canShineCharge": {"usedTiles": 28, "openEnd": 0}},
+            {"shinespark": {"frames": 29, "excessFrames": 5}}
           ]}
         ]},
         "h_heatedGModeOpenDifferentDoor"
       ],
       "flashSuitChecked": true,
       "note": [
-        "Use the camera scroll blocks below the crumble blocks to overload PLMs to be able to go through the crumble blocks.",
-        "Jumping through them a single time is enough to overload them for the next jump.",
-        "It is possible to go though the crumble blocks while dodging GT.",
+        "Use the camera scroll blocks below the crumble blocks to overload PLMs and go through the crumble blocks.",
+        "A good jumping through them a single time is enough to overload them for the next jump. This can be done while dodging GT.",
         "With a speedy jump, it is possible to overload PLMs and run back to GT before it stands up, get into the safe spot location to get him to jump back, and use the runway again.",
+        "With shinesparks, diagonally spark into the crumble blocks and hold forward three times, then spark through.",
         "Note that when GT attacks, it will place stationary invisible projectiles, so it is much more difficult if not getting up quickly."
       ]
     },
@@ -1934,16 +1940,21 @@
               "f_DefeatedGoldenTorizo",
               "canInsaneJump"
             ]}
+          ]},
+          {"and": [
+            "f_DefeatedGoldenTorizo",
+            {"canShineCharge": {"usedTiles": 28, "openEnd": 0}},
+            {"shinespark": {"frames": 29, "excessFrames": 5}}
           ]}
         ]},
         {"heatFrames": 0}
       ],
       "flashSuitChecked": true,
       "note": [
-        "Use the camera scroll blocks below the crumble blocks to overload PLMs to be able to go through the crumble blocks.",
-        "Jumping through them a single time is enough to overload them for the next jump.",
-        "It is possible to go though the crumble blocks while dodging GT.",
+        "Use the camera scroll blocks below the crumble blocks to overload PLMs and go through the crumble blocks.",
+        "A good jumping through them a single time is enough to overload them for the next jump. This can be done while dodging GT.",
         "With a speedy jump, it is possible to overload PLMs and run back to GT before it stands up, get into the safe spot location to get him to jump back, and use the runway again.",
+        "With shinesparks, diagonally spark into the crumble blocks and hold forward three times, then spark through.",
         "Note that when GT attacks, it will place stationary invisible projectiles, so it is much more difficult if not getting up quickly."
       ]
     },
@@ -1974,6 +1985,11 @@
               "f_DefeatedGoldenTorizo",
               "canInsaneJump"
             ]}
+          ]},
+          {"and": [
+            "f_DefeatedGoldenTorizo",
+            {"canShineCharge": {"usedTiles": 28, "openEnd": 0}},
+            {"shinespark": {"frames": 28, "excessFrames": 5}}
           ]}
         ]},
         {"or": [
@@ -1993,9 +2009,10 @@
       ],
       "flashSuitChecked": true,
       "note": [
-        "Use the camera scroll blocks below the crumble blocks to overload PLMs to be able to go through the bomb blocks near the right item.",
-        "Jumping through them a single time is enough to overload them. It is possible to do this while dodging GT.",
-        "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.",
+        "Use the camera scroll blocks below the crumble blocks to overload PLMs and go through the bomb blocks near the right item.",
+        "A good jumping through them a single time is enough to overload PLMs. This can be done while dodging GT.",
+        "With a speedy jump, it is possible to overload PLMs and run back to GT before it stands up, get into the safe spot location to get him to jump back, and use the runway again.",
+        "With shinesparks, diagonally spark into the crumble blocks and hold forward three times, to overload PLMs as much as possible.",
         "Note that when GT attacks, it will place stationary invisible projectiles, so it is much more difficult if not getting up quickly.",
         "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."
       ]