Merge pull request #2055 from kjbranch/g-kraid

Refine G-Mode: Kraid Brinstar

Author: osse101

region/brinstar/kraid/Baby Kraid Room.json

@@ -502,7 +502,7 @@
           {"and": [
             "h_artificialMorphIBJ",
             "h_artificialMorphBombHorizontally",
-            "canTrickyJump"
+            "canTrickyDodgeEnemies"
           ]},
           {"enemyDamage": {"enemy": "Mini-Kraid", "type": "spike", "hits": 1}}
         ]}
@@ -526,17 +526,26 @@
         }
       },
       "requires": [
-        {"enemyDamage": {"enemy": "Mini-Kraid", "type": "contact", "hits": 1}},
+        {"or": [
+          {"enemyDamage": {"enemy": "Mini-Kraid", "type": "contact", "hits": 1}},
+          {"and": [
+            {"or": [
+              "h_artificialMorphSpringBall",
+              "h_artificialMorphPowerBomb"
+            ]},
+            {"enemyDamage": {"enemy": "Mini-Kraid", "type": "spike", "hits": 10}}
+          ]}
+        ]},
         "h_artificialMorphPowerBomb"
       ],
       "clearsObstacles": ["A"],
       "flashSuitChecked": true,
       "note": [
         "Wait on the right side of Baby Kraid for about 10 seconds so that he shoots the maximum amount of projectiles which will move to the right after exiting G-Mode.",
-        "Roll through him and kill the left pirates with a Power Bomb. Only one is necessary when placing next to the pirate when it is as far to the left as possible.",
+        "When Baby Kraid is as far left as possible, use a Power Bomb to boost up and hit the stationary, invisible spikes, then roll to the left and kill the pirates with another Power Bomb.",
+        "To save a Power Bomb and take a bit more damage, roll through Baby Kraid then kill the left pirates with a Power Bomb. Only one is necessary when placing next to the pirate when it is as far to the left as possible.",
         "Unmorph, freely kill Baby Kraid, then exit G-Mode. The his projectiles should all shoot to the right."
-      ],
-      "devNote": "FIXME: It should be possible to use a second Power Bomb or Spring Ball to hit one of Kraids invisible projectiles to save Energy."
+      ]
     },
     {
       "id": 23,

region/brinstar/kraid/Warehouse Energy Tank Room.json

@@ -415,28 +415,34 @@
       "name": "G-Mode Morph Kill the Beetoms",
       "entranceCondition": {
         "comeInWithGMode": {
-          "mode": "indirect",
+          "mode": "any",
           "morphed": true
         }
       },
       "requires": [
         {"or": [
-          "h_artificialMorphPowerBomb",
+          {"and": [
+            "h_artificialMorphPowerBomb",
+            {"or": [
+              "canTrickyDodgeEnemies",
+              {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 1}}
+            ]}
+          ]},
           {"and": [
             "h_artificialMorphBombs",
             {"or": [
-              "canTrickyJump",
+              "canTrickyGMode",
               {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 1}}
             ]}
           ]}
         ]}
       ],
       "clearsObstacles": ["A"],
       "flashSuitChecked": true,
-      "note": "Roll in while avoiding the Beetoms. It is possible to kill them all without getting hit; one of the most safe areas is the center of the lower floor.",
-      "devNote": [
-        "There is no way to avoid all damage in direct g-mode, nor a way to get out of immobile.",
-        "It is technically possible but very precise to kill them with a Power Bomb entering with 4 energy and both suits."
+      "note": [
+        "Quickly kill the Beetoms with Bombs or a Power Bomb.",
+        "In direct G-mode, Samus has a few i-frames to place a Power Bomb, in indirect G-mode, enter and immediately roll to the left to avoid the first Beetom.",
+        "With Bombs and without taking any damage, everything is harder. It is recommended to roll in the lower section, placing Bombs, while avoiding touching a Beetom or getting Bomb boosted."
       ]
     },
     {

region/brinstar/kraid/Warehouse Kihunter Room.json

@@ -282,12 +282,17 @@
       "requires": [
         {"or": [
           "h_artificialMorphPowerBomb",
+          "canTrickyGMode",
           {"enemyDamage": {"enemy": "Kihunter (green)", "type": "contact", "hits": 1}}
         ]}
       ],
       "flashSuitChecked": true,
-      "note": "Overload the PLMs by rolling through the camera scroll blocks which are just above the shot blocks.",
-      "devNote": "In immobile, the Kihunters are in a worse location, but Samus starts with i-frames."
+      "note": [
+        "Overload the PLMs by rolling through the camera scroll blocks which are just above the shot blocks.",
+        "It is possible but tricky to do this damageless without a Power Bomb. Get the first Kihunter to swoop left twice,",
+        "then quickly move back and forth getting each other Kihunter to swoop without touching Samus.",
+        "In immobile, the Kihunters are in a worse location, but Samus starts with i-frames, so it is a similar difficulty."
+      ]
     },
     {
       "id": 9,