Merge pull request #2094 from kjbranch/plando-fixes

Fixes to strats in my plando

Author: kjbranch

region/brinstar/green/Spore Spawn Room.json

@@ -134,7 +134,8 @@
       "note": [
         "Use the Plasma Special Beam Attack to kill Spore Spawn from above.",
         "Stand in the middle of the second lowest platform above Spore Spawn, facing left and crouched.",
-        "Then use Xray to kill Spore Spawn in 1 cycle."
+        "Then quickly use X-Ray to kill Spore Spawn in 1 cycle.",
+        "Jumping against the ledge above then rotating to the left after landing will put Samus into a good position."
       ]
     },
     {

region/maridia/inner-green/Shaktool Room.json

@@ -273,11 +273,40 @@
       "flashSuitChecked": true,
       "note": [
         "The Snails will dig through the sand without showing any visual difference. Each block they pass through gets closer to overloading PLMs.",
-        "In order to PB the left wall before PLMs are overloaded, it is necessary to only allow one snail to dig, either by bombing one or by facing one to prevent movement until it is off screen.",
-        "If using mobile g-mode, it is easiest to get past the bottom one and prevent it from digging. If using immobile g-mode, it is easiest to have whichever one hits Samus go off screen.",
-        "In the morph tunnel, it is important to place the PB as far right as possible, while still hitting the PB blocks, otherwise the Snails will have overloaded the PLMs and the blocks won't break.",
-        "The green stone changes one tile earlier than the PB wall, and can be a good visual cue to place the PB.",
-        "After using the PB, exit the sand, leave G-Mode, and wait for Shaktool. Note that the Snails will not dig while off screen or while Samus is facing them, even while she is morphed."
+        "In order to Power Bomb the left wall before PLMs are overloaded, it is necessary to only allow one snail to dig, either by bombing one or by facing one to prevent movement until it is off screen.",
+        "If using mobile G-mode, it is easiest to get past the bottom one and prevent it from digging. If using immobile G-mode, it is easiest to have whichever one hits Samus go off screen.",
+        "It is important to place the Power Bomb while as far right as possible to ensure that PLMs have not been overloaded before breaking the wall,",
+        "or, wait until the snail has fully overloaded PLMs and dug a small place where Samus can unmorph against the wall to place the Power Bomb before quickly unmorphing and exiting G-mode.",
+        "The green stone changes one tile earlier than the wall, and can be used as a visual cue to place the Power Bomb.",
+        "Note that the Snails will not dig while off screen or while Samus is facing them, even while she is morphed."
+      ]
+    },
+    {
+      "link": [2, 1],
+      "name": "Reverse G-Mode Morph, Direct",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": true
+        }
+      },
+      "requires": [
+        {"notable": "Reverse G-Mode Morph"},
+        "h_artificialMorphIBJ",
+        "h_artificialMorphPowerBomb"
+      ],
+      "clearsObstacles": ["A", "B"],
+      "setsFlags": ["f_ShaktoolDoneDigging"],
+      "flashSuitChecked": true,
+      "note": [
+        "Enter the room in direct G-mode, and land on the doorsill while artificially morphed. Use a bomb to boost over the the left runway, or land on a snail and bomb off of it while the water is low.",
+        "If entering in immobile, it is important to avoid being pulled through the floor and into the water by the snail.",
+        "The Snails will dig through the sand without showing any visual difference. Each block they pass through gets closer to overloading PLMs.",
+        "In order to Power Bomb the left wall before PLMs are overloaded, it is necessary to only allow one snail to dig, either by bombing one or by facing one to prevent movement until it is off screen.",
+        "It is important to place the Power Bomb while as far right as possible to ensure that PLMs have not been overloaded before breaking the wall,",
+        "or, wait until the snail has fully overloaded PLMs and dug a small place where Samus can unmorph against the wall to place the Power Bomb before quickly unmorphing and exiting G-mode.",
+        "The green stone changes one tile earlier than the wall, and can be used as a visual cue to place the Power Bomb.",
+        "Note that the Snails will not dig while off screen or while Samus is facing them, even while she is morphed."
       ]
     },
     {
@@ -602,29 +631,32 @@
     {
       "id": 30,
       "link": [2, 2],
-      "name": "G-Mode Regain Mobility",
+      "name": "G-Mode Regain Mobility (Shaktool)",
+      "requires": [
+        {"enemyDamage": {"enemy": "Shaktool", "type": "contact", "hits": 1}},
+        "f_ShaktoolDoneDigging"
+      ],
+      "gModeRegainMobility": {},
+      "flashSuitChecked": true,
+      "note": "Wait for Shaktool. If Shaktool's camera is fixed it is possible without Shaktool, by using a Snail (Yard): a Super or any SBA can trigger a Yard to attack."
+    },
+    {
+      "link": [2, 2],
+      "name": "G-Mode Regain Mobility (Yard, Camera Fixed)",
       "requires": [
+        {"enemyDamage": {"enemy": "Yard", "type": "contact", "hits": 1}},
+        "h_ShaktoolCameraFix",
         {"or": [
+          {"ammo": {"type": "Super", "count": 1}},
           {"and": [
-            {"enemyDamage": {"enemy": "Shaktool", "type": "contact", "hits": 1}},
-            "f_ShaktoolDoneDigging"
-          ]},
-          {"and": [
-            {"enemyDamage": {"enemy": "Yard", "type": "contact", "hits": 1}},
-            "h_ShaktoolCameraFix",
-            {"or": [
-              {"ammo": {"type": "Super", "count": 1}},
-              {"and": [
-                "canSpecialBeamAttack",
-                {"ammo": {"type": "PowerBomb", "count": 1}}
-              ]}
-            ]}
+            "canSpecialBeamAttack",
+            {"ammo": {"type": "PowerBomb", "count": 1}}
           ]}
         ]}
       ],
       "gModeRegainMobility": {},
       "flashSuitChecked": true,
-      "note": "Wait for Shaktool. If Shaktool's camera is fixed it is possible without Shaktool, by using a Snail (Yard): a Super or any SBA can trigger a Yard to attack."
+      "note": "If Shaktool's camera is fixed it is possible to regain mobility by using a Snail (Yard): a Super or any SBA can trigger a Yard to attack."
     },
     {
       "id": 31,
@@ -654,11 +686,12 @@
       "name": "Reverse G-Mode Morph",
       "note": [
         "The Snails will dig through the sand without showing any visual difference. Each block they pass through gets closer to overloading PLMs.",
-        "In order to PB the left wall before PLMs are overloaded, it is necessary to only allow one snail to dig, either by bombing one or by facing one to prevent movement until it is off screen.",
-        "If using mobile g-mode, it is easiest to get past the bottom one and prevent it from digging. If using immobile g-mode, it is easiest to have whichever one hits Samus go off screen.",
-        "In the morph tunnel, it is important to place the PB as far right as possible, while still hitting the PB blocks, otherwise the Snails will have overloaded the PLMs and the blocks won't break.",
-        "The green stone changes one tile earlier than the PB wall, and can be a good visual cue to place the PB.",
-        "After using the PB, exit the sand, leave G-Mode, and wait for Shaktool. Note that the Snails will not dig while off screen or while Samus is facing them, even while she is morphed."
+        "In order to Power Bomb the left wall before PLMs are overloaded, it is necessary to only allow one snail to dig, either by bombing one or by facing one to prevent movement until it is off screen.",
+        "If using mobile G-mode, it is easiest to get past the bottom one and prevent it from digging. If using immobile G-mode, it is easiest to have whichever one hits Samus go off screen.",
+        "It is important to place the Power Bomb while as far right as possible to ensure that PLMs have not been overloaded before breaking the wall,",
+        "or, wait until the snail has fully overloaded PLMs and dug a small place where Samus can unmorph against the wall to place the Power Bomb before quickly unmorphing and exiting G-mode.",
+        "The green stone changes one tile earlier than the wall, and can be used as a visual cue to place the Power Bomb.",
+        "Note that the Snails will not dig while off screen or while Samus is facing them, even while she is morphed."
       ]
     },
     {

region/norfair/crocomire/Post Crocomire Missile Room.json

@@ -212,13 +212,18 @@
       "note": [
         "Wait for the acid to lower then quickly roll part way forward to trigger the Metarees and return. Then go again without any difficulty.",
         "With Power Bombs alone is particularly challenging. Use a Power Bomb to kill the Gamets to prevent them from respawning.",
-        "Place a bomb at the edge of the runway and hit it with momentum and precise timing to get a boost to skip the first and land on the next safe platform.",
+        "Place a bomb at the edge of the runway then hold forward with precise timing to get a boost to skip the first and land on the next safe platform.",
         "As quickly as possible place another and let it boost horizontally to the next platform, then another to get to the item."
       ],
+      "detailNote": [
+        "With high movement precision, it is recommended to start a bit away from the edge (fully on the runway), giving a 3-frame window, or to start on the last pixel of the runway, giving a 4 frame window plus an extra non-consecutive frame.",
+        "With slightly less precision, it may be worth starting as close to the edge as possible without falling off, as there are typically 4 non-consecutive frames that work (consisting of approximately alternating frames in a 6-frame window).",
+        "Rolling into the bomb with momentum is not recommended and gives only a 2-frame window."
+      ],
       "devNote": [
         "The requirements here are to get the item and return, as the item cannot be used during the return.",
         "It appears that there is virtually no risk in overloading PLMs - the left runway isn't close enough, and even placing two on each pillar will not overload PLMs.",
-        "FIXME: Hitting the bomb with momentum needs a tech."
+        "FIXME: Getting extra horizontal distance from the bomb needs a tech."
       ]
     },
     {

region/wreckedship/main/Basement.json

@@ -381,15 +381,15 @@
     {
       "id": 15,
       "link": [1, 3],
-      "name": "G-mode Morph Workrobot Ride",
+      "name": "G-Mode Morph Workrobot Ride",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "any",
           "morphed": true
         }
       },
       "requires": [
-        {"notable": "G-mode Morph Workrobot Ride"},
+        {"notable": "G-Mode Morph Workrobot Ride"},
         "f_DefeatedPhantoon",
         "canBePatient",
         "h_artificialMorphPowerBomb",
@@ -402,10 +402,11 @@
       "note": [
         "On room entry, place a Power Bomb to kill the Atomic and land on the Workrobot.",
         "Wait for the Workrobot to move across the room until it meets with a second robot.",
-        "Depending on where the robots meet, either roll off and quickly roll under the Atomic,",
+        "Depending on where the robots place their invisible, stationary lasers, either roll off and quickly roll under the Atomic,",
         "stay on for a second to try to lure the Atomic left a bit, or use a Power Bomb to kill it.",
-        "Be careful not to hit any of the invisible, stationary lasers,",
-        "and don't place any Power Bombs too close to the right wall or it will hit the bomb block and it will no longer be passable.",
+        "Be sure to watch and listen for where the robots are placing their lasers; they occupy a 24x24 pixel space and are typically placed with only 1-2 tiles of space between them.",
+        "Fall off the workrobots without any horizontal movement to decrease the chance of touching a laser.",
+        "Avoid placing a Power Bombs too close to the right wall or it will hit the bomb block and it will no longer be passable.",
         "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."
       ]
     },
@@ -1049,14 +1050,15 @@
   "notables": [
     {
       "id": 1,
-      "name": "G-mode Morph Workrobot Ride",
+      "name": "G-Mode Morph Workrobot Ride",
       "note": [
         "On room entry, place a Power Bomb to kill the Atomic and land on the Workrobot.",
         "Wait for the Workrobot to move across the room until it meets with a second robot.",
-        "Depending on where the robots meet, either roll off and quickly roll under the Atomic,",
+        "Depending on where the robots place their invisible, stationary lasers, either roll off and quickly roll under the Atomic,",
         "stay on for a second to try to lure the Atomic left a bit, or use a Power Bomb to kill it.",
-        "Be careful not to hit any of the invisible, stationary lasers,",
-        "and don't place any Power Bombs too close to the right wall or it will hit the bomb block and it will no longer be passable.",
+        "Be sure to watch and listen for where the robots are placing their lasers; they occupy a 24x24 pixel space and are typically placed with only 1-2 tiles of space between them.",
+        "Fall off the workrobots without any horizontal movement to decrease the chance of touching a laser.",
+        "Avoid placing a Power Bombs too close to the right wall or it will hit the bomb block and it will no longer be passable.",
         "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."
       ]
     }

region/wreckedship/main/Bowling Alley.json

@@ -213,6 +213,7 @@
     {
       "from": 6,
       "to": [
+        {"id": 1},
         {"id": 3}
       ]
     }
@@ -1156,8 +1157,8 @@
           ]},
           {"canShineCharge": {"usedTiles": 14, "openEnd": 1}}
         ]},
-        {"thornHits": 1},
-        "h_spikeSuitThornHitLeniency",
+        {"spikeHits": 1},
+        "h_spikeSuitSpikeHitLeniency",
         "canSpikeSuit",
         {"shinespark": {"frames": 6, "excessFrames": 6}}
       ],
@@ -1318,6 +1319,75 @@
       ],
       "clearsObstacles": ["A"]
     },
+    {
+      "link": [6, 1],
+      "name": "Grapple Block, Crystal Flash, X-Ray Climb",
+      "requires": [
+        {"notable": "Grapple Block Crystal Flash"},
+        "canUseGrapple",
+        "canJumpIntoRespawningBlock",
+        "canTrickyJump",
+        {"or": [
+          "HiJump",
+          "canTrickySpringBallJump",
+          {"and": [
+            "canSpringBallJumpMidAir",
+            {"not": "f_DefeatedPhantoon"},
+            "canRiskPermanentLossOfAccess"
+          ]}
+        ]},
+        "h_bombThings",
+        "h_CrystalFlash",
+        "canXRayClimb",
+        {"or": [
+          "h_fourTileJumpMorph",
+          "h_useSpringBall",
+          "canIBJ",
+          "SpeedBooster",
+          {"and": [
+            {"not": "f_DefeatedPhantoon"},
+            "canRiskPermanentLossOfAccess"
+          ]}
+        ]}
+      ],
+      "flashSuitChecked": true,
+      "note": [
+        "Jump or Spring Ball jump into a breakable Grapple block.",
+        "The timing is precise and it can help to break two Grapple blocks to use one as a cue.",
+        "Crystal Flash then X-ray climb to the region above.",
+        "There is a chance that Samus will not be able to Crystal Flash unless first placing a Bomb or Power Bomb."
+      ],
+      "devNote": "FIXME: This may be possible with a spike hit and speedy jump."
+    },
+    {
+      "link": [6, 1],
+      "name": "IBJ into Grapple Block, Crystal Flash, X-Ray Climb",
+      "requires": [
+        {"notable": "Grapple Block Crystal Flash"},
+        "canUseGrapple",
+        "canJumpIntoRespawningBlock",
+        "canInsaneJump",
+        "canJumpIntoIBJ",
+        "canDoubleBombJump",
+        {"or": [
+          {"spikeHits": 1},
+          {"and": [
+            {"not": "f_DefeatedPhantoon"},
+            "canRiskPermanentLossOfAccess"
+          ]}
+        ]},
+        "h_CrystalFlash",
+        "canXRayClimb"
+      ],
+      "flashSuitChecked": true,
+      "note": [
+        "IBJ into a breakable Grapple block.",
+        "The timing is very precise and requires a quick morph and ascent with precisely placed double bomb jumps.",
+        "Crystal Flash then X-ray climb to the region above.",
+        "There is a chance that Samus will not be able to Crystal Flash unless first placing a Bomb or Power Bomb."
+      ],
+      "devNote": "FIXME: This may be possible without a spike hit."
+    },
     {
       "id": 54,
       "link": [6, 3],
@@ -1370,8 +1440,15 @@
         "A shot from crouch will reach the bottom block by following the shot as a ball, or wave beam works from the stairs.",
         "Screw Attack is still needed to clear the bomb blocks."
       ]
+    },
+    {
+      "id": 5,
+      "name": "Grapple Block Crystal Flash",
+      "note": [
+        "Jump into a breakable Grapple block. Crystal Flash then X-ray climb to the region above."
+      ]
     }
   ],
   "nextStratId": 61,
-  "nextNotableId": 5
+  "nextNotableId": 6
 }