Merge pull request #2051 from kjbranch/g-blue

Refine G-Mode in Blue Brinstar

Author: kjbranch

region/brinstar/blue/Blue Brinstar Energy Tank Room.json

@@ -675,25 +675,25 @@
       "name": "G-Mode Morph",
       "entranceCondition": {
         "comeInWithGMode": {
-          "mode": "any",
+          "mode": "indirect",
           "morphed": true
         }
       },
       "requires": [
         "h_ZebesIsAwake",
         {"or": [
+          "Morph",
           "h_artificialMorphSpringBall",
           "h_artificialMorphBombThings",
-          "canTrickyJump",
+          "canTrickyDodgeEnemies",
           {"enemyDamage": {"enemy": "Geemer (blue)", "type": "contact", "hits": 1}}
         ]}
       ],
       "flashSuitChecked": true,
       "note": "It is possible to roll off of the ledge and avoid the Geemers, but it is somewhat tight and the timing is likely earlier than expected.",
       "devNote": [
-        "An immobile strat only takes one hit on entry, skipping the Geemer hit, which is modeled by going 1->6->5.",
-        "It may often be possible to come in indirect and still have enough i-frames to get through the Geemers, but Samus may be coming from a doorless room like Crateria Tube.",
-        "This is not easy to model and isn't worth doing, because the player will almost certainly have canTrickyJump enabled."
+        "It may be possible to come in indirect and still have enough i-frames to get through the Geemers, but Samus may be coming from a doorless room like Crateria Tube.",
+        "This is not easy to model and isn't worth doing, because the player will almost certainly canTrickyDodgeEnemies enabled before enabling canArtificialMorph."
       ]
     },
     {
@@ -702,17 +702,18 @@
       "name": "G-Mode Morph with Flashing Lights",
       "entranceCondition": {
         "comeInWithGMode": {
-          "mode": "any",
+          "mode": "indirect",
           "morphed": true
         }
       },
       "requires": [
         {"notable": "G-Mode Flashing Lights"},
         {"or": [
           "h_ZebesNotAwake",
+          "Morph",
           "h_artificialMorphSpringBall",
           "h_artificialMorphBombThings",
-          "canTrickyJump",
+          "canTrickyDodgeEnemies",
           {"enemyDamage": {"enemy": "Geemer (blue)", "type": "contact", "hits": 1}}
         ]}
       ],
@@ -726,7 +727,7 @@
     {
       "id": 31,
       "link": [1, 6],
-      "name": "G-Mode Morph",
+      "name": "Direct G-Mode Morph",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "direct",
@@ -735,32 +736,64 @@
       },
       "requires": [
         "h_ZebesIsAwake",
-        "canUseIFrames"
+        {"or": [
+          "Morph",
+          "h_artificialMorphSpringBall",
+          "h_artificialMorphBombThings",
+          "canTrickyDodgeEnemies",
+          {"enemyDamage": {"enemy": "Geemer (blue)", "type": "contact", "hits": 1}}
+        ]}
       ],
       "flashSuitChecked": true,
-      "devNote": [
-        "It is possible to roll off of the ledge go through the Geemers before Samus' i-frames expire.",
-        "Alternatively, it is possible to roll over them, but it is somewhat tight and the timing is likely earlier than expected."
+      "note": [
+        "It is possible to roll off of the ledge over the Geemers, but it is somewhat tight and the timing is likely earlier than expected..",
+        "Alternatively, it is possible to roll of the ledge go through the Geemers before Samus' i-frames expire."
       ]
     },
     {
       "id": 33,
       "link": [1, 6],
-      "name": "G-Mode Morph with Flashing Lights",
+      "name": "Direct G-Mode Morph with Flashing Lights",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "direct",
           "morphed": true
         }
       },
       "requires": [
-        {"notable": "G-Mode Flashing Lights"}
+        {"notable": "G-Mode Flashing Lights"},
+        {"or": [
+          "h_ZebesNotAwake",
+          "Morph",
+          "h_artificialMorphSpringBall",
+          "h_artificialMorphBombThings",
+          "canTrickyDodgeEnemies",
+          {"enemyDamage": {"enemy": "Geemer (blue)", "type": "contact", "hits": 1}}
+        ]}
       ],
       "flashSuitChecked": true,
       "note": [
-        "The eye scanners are particularly annoying while in G-mode. They scan Samus with bright flashing lights which remain for a further distance.",
+        "The eye scanners are particularly annoying while in g-mode. They scan Samus with bright flashing lights which remain for a further distance.",
         "This is notable so a player can disable having to enter these flashing lights. If disabled, Samus will only require being in g-mode in this room if Zebes is awake."
-      ]
+      ],
+      "devNote": "Although there would be no enemies and the strat would be free, these options are here as a way to avoid the canRiskPermanentLossOfAccess."
+    },
+    {
+      "link": [1, 6],
+      "name": "Direct G-Mode Morph, Immobile",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": true,
+          "mobility": "immobile"
+        }
+      },
+      "requires": [
+        "h_ZebesIsAwake",
+        "canUseIFrames"
+      ],
+      "flashSuitChecked": true,
+      "note": "Regain mobility with the first Geemer then roll through the second to avoid a second hit."
     },
     {
       "id": 34,
@@ -1230,14 +1263,17 @@
     {
       "id": 57,
       "link": [5, 2],
-      "name": "G-Mode Morph IBJ",
+      "name": "G-Mode Morph Bomb the Crumble Block",
       "requires": [
         "canEnterGMode",
-        "h_artificialMorphLongIBJ",
+        "h_artificialMorphIBJ",
         {"or": [
           "canConsecutiveWalljump",
           "SpaceJump",
-          "canOffScreenMovement"
+          {"and": [
+            "h_artificialMorphLongIBJ",
+            "canOffScreenMovement"
+          ]}
         ]}
       ],
       "flashSuitChecked": true,

region/brinstar/blue/Morph Ball Room.json

@@ -911,7 +911,7 @@
     {
       "id": 29,
       "link": [1, 5],
-      "name": "G-Mode Overload PLMs Indirect",
+      "name": "Indirect G-Mode, Overload PLMs",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "indirect",
@@ -922,6 +922,7 @@
         {"or": [
           {"enemyDamage": {"enemy": "Sidehopper", "type": "contact", "hits": 2}},
           {"ammo": {"type": "PowerBomb", "count": 1}},
+          "canInsaneJump",
           {"and": [
             "Morph",
             {"or": [
@@ -937,7 +938,7 @@
       "clearsObstacles": ["D"],
       "flashSuitChecked": true,
       "note": [
-        "Either kill the Sidehoppers immediately on entry by placing a Power Bomb while rolling off the stair or tank their hits.",
+        "Either kill the Sidehoppers immediately on entry by placing a Power Bomb while rolling off the stair, dodge them multiple times, or tank their hits.",
         "If Samus has Morph Ball, it is also possible to kill the Sidehoppers upon room entry with Screw Attack or a powerful beam.",
         "Overload the PLMs by rolling through the camera scroll blocks which are 4 tiles to the right of the stair by the door.",
         "Roll under the last Sidehopper and through the bomb blocks."
@@ -946,7 +947,7 @@
     {
       "id": 30,
       "link": [1, 5],
-      "name": "G-Mode Morph Overload PLMs Direct",
+      "name": "Direct G-Mode Morph, Overload PLMs",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "direct",
@@ -955,15 +956,18 @@
       },
       "requires": [
         {"or": [
-          {"enemyDamage": {"enemy": "Sidehopper", "type": "contact", "hits": 3}},
+          "canInsaneJump",
+          {"enemyDamage": {"enemy": "Sidehopper", "type": "contact", "hits": 2}},
           {"and": [
-            {"enemyDamage": {"enemy": "Sidehopper", "type": "contact", "hits": 1}},
-            {"ammo": {"type": "PowerBomb", "count": 1}}
+            {"ammo": {"type": "PowerBomb", "count": 1}},
+            {"or": [
+              "canTrickyDodgeEnemies",
+              {"enemyDamage": {"enemy": "Sidehopper", "type": "contact", "hits": 1}}
+            ]}
           ]},
           {"and": [
             "Morph",
-            "ScrewAttack",
-            "canTrickyJump"
+            "ScrewAttack"
           ]}
         ]}
       ],