Merge pull request #1903 from kjbranch/insane-walljump

Misc: Microwave Dray, Main St Ice Super, Hi E-Tank Screw, etc.

Author: osse101

region/maridia/inner-pink/Draygon's Room.json

@@ -296,6 +296,32 @@
       "note": "Fight Draygon without gravity, but with morph.",
       "devNote": "This will require coming into the fight with ammo to kill the turrets. Although that ammo could instead be farmed in the fight."
     },
+    {
+      "link": [1, 1],
+      "name": "Microwave Fight",
+      "requires": [
+        "h_canNavigateUnderwater",
+        "h_canBreakThreeDraygonTurrets",
+        "canXRayWaitForIFrames",
+        "Plasma",
+        {"or": [
+          "Morph",
+          {"and": [
+            "Ice",
+            "Wave"
+          ]},
+          {"enemyDamage": {"enemy": "Draygon", "type": "contact", "hits": 1}}
+        ]}
+      ],
+      "setsFlags": ["f_DefeatedDraygon"],
+      "flashSuitChecked": true,
+      "note": [
+        "Fire a charged Plasma shot, then use X-Ray repeatedly while the shot is in contact with Draygon, to wait out Draygon's i-frames.",
+        "It is possible to one-cycle, which is easiest with a full beam, alternatively, it is possible to Morph under the swoop and two-cycle it.",
+        "Note that if Samus is crouched when Draygon dies, she will stand up; this can be used to see when the fight has ended."
+      ],
+      "devNote": "FIXME: Add strats that don't break the turrets."
+    },
     {
       "id": 7,
       "link": [1, 1],

region/maridia/inner-pink/Halfie Climb Room.json

@@ -1873,7 +1873,8 @@
         ]}
       ],
       "flashSuitChecked": true,
-      "note": "Roll through the camera scroll blocks in the morph tunnel to overload PLMs then the speed blocks can be walked through."
+      "note": "Roll through the camera scroll blocks in the morph tunnel to overload PLMs then the speed blocks can be walked through.",
+      "devNote": "FIXME: There is a blind foosball strat that could be added here."
     },
     {
       "id": 62,

region/maridia/outer/Main Street.json

@@ -3320,20 +3320,62 @@
     {
       "id": 130,
       "link": [8, 3],
-      "name": "Suitless Frozen Fish with Jump Assist",
+      "name": "Suitless Frozen Fish, HiJump",
       "requires": [
         "canSuitlessMaridia",
-        {"or": [
-          "HiJump",
-          "canTrickySpringBallJump"
-        ]},
+        "HiJump",
         "canTrickyUseFrozenEnemies"
       ],
       "note": [
-        "Freeze the crab on the corner of the ledge and the fish near the wall but with enough space for Samus to fit through and jump up using HiJump or a midair spring ball jump.",
-        "Possible backups include: knocking the Sciser off the wall and freezing it midair, ",
-        "or with HiJump: freezing the Skultera near a wall and walljumping into it repeatedly, ",
-        "or freezing the Sciser on the ground and crouch jumping up to the Skultera, rubbing into the frozen enemy to gain extra height before downgrabbing."
+        "Freeze the crab on the corner of the ledge and the fish near the wall but with enough space for Samus to fit through and jump up.",
+        "Alternatively, freeze the Sciser on the ground and the Skultera low, then crouch jump and down grab on the fish while rubbing into it to gain extra height.",
+        "With Supers, Samus can knock the Sciser off the wall and freeze it midair. Or freeze the Skultera near a wall and walljumping into it repeatedly."
+      ]
+    },
+    {
+      "link": [8, 3],
+      "name": "Suitless Frozen Fish with Spring Ball",
+      "requires": [
+        "canSuitlessMaridia",
+        "canTrickySpringBallJump",
+        "canTrickyUseFrozenEnemies",
+        {"ammo": {"type": "Super", "count": 1}}
+      ],
+      "note": [
+        "Use a Super to knock the crab off the wall and freeze it midair. It can help to jump before firing the beam to freeze it a bit higher.",
+        "Quickly freeze the fish and Spring Ball jump to get onto it.",
+        "Note that the fish does not move while off camera, so this may be used to help get the fish cycle in a good position."
+      ]
+    },
+    {
+      "link": [8, 3],
+      "name": "Suitless Frozen Fish with Spring Ball",
+      "requires": [
+        "canSuitlessMaridia",
+        "h_canMaxHeightSpringBallJump",
+        "canStationaryLateralMidAirMorph",
+        "canTrickyUseFrozenEnemies"
+      ],
+      "note": [
+        "Freeze the crab on the corner of the ledge and the fish near the wall but with enough space for Samus to fit through and jump up.",
+        "Perform a stationary lateral midair morph and press against the fish to get enough height to get onto it."
+      ]
+    },
+    {
+      "link": [8, 3],
+      "name": "Suitless Bootless Ice and Super",
+      "requires": [
+        "canSuitlessMaridia",
+        "canTrickyUseFrozenEnemies",
+        "canTrickyJump",
+        {"ammo": {"type": "Super", "count": 1}}
+      ],
+      "note": [
+        "Freeze the crab and Skulltera, then position Samus on the ledge near the bottom right door.",
+        "Fire a Super on the ground then jump and shoot the crab a bit higher than eye level.",
+        "Get on the crab then on the Skulltera. Press against the Skulltera on the ascent to gain more height; a crouch jump and down grab can help.",
+        "The easiest way to get up from here is to wait for the Skulltera to thaw and refreeze it.",
+        "Now the crab will be in position to freeze and stand on, then freeze the Skulltera one more time a bit to the left and use it to get to the left."
       ]
     },
     {

region/norfair/east/Bubble Mountain.json

@@ -3645,16 +3645,17 @@
         "HiJump",
         "canPreciseWalljump"
       ],
-      "note": "This is the same size of ledge as writg, so it should be equally possible."
+      "note": "This is the same size of ledge as WRITG."
     },
     {
       "id": 145,
       "link": [9, 1],
       "name": "HiJumpless Walljump (Left)",
       "requires": [
+        "canConsecutiveWalljump",
         "canInsaneWalljump"
       ],
-      "note": "This is the same size of ledge as writg, so it should be equally possible."
+      "note": "This is the same size of ledge as WRITG."
     },
     {
       "id": 146,

region/norfair/east/Lava Dive Room.json

@@ -428,6 +428,7 @@
         "HiJump",
         "canBounceBall",
         "canMidairWiggle",
+        "canConsecutiveWalljump",
         "canInsaneWalljump",
         {"lavaFrames": 392},
         {"heatFrames": 515}

region/norfair/west/Hi Jump Energy Tank Room.json

@@ -724,6 +724,17 @@
         "canCeilingClip"
       ],
       "flashSuitChecked": true
+    },
+    {
+      "link": [5, 3],
+      "name": "Screw X-Ray Standup",
+      "requires": [
+        "Morph",
+        "canXRayStandUp",
+        "ScrewAttack"
+      ],
+      "flashSuitChecked": true,
+      "note": "Roll under the right-most single tile ceiling, X-Ray standup, then turnaround spin jump to break the Bomb block."
     }
   ],
   "notables": [

region/wreckedship/main/Phantoon's Room.json

@@ -182,14 +182,28 @@
       "requires": [
         "Charge",
         "Plasma",
-        {"ammo": {"type": "Missile", "count": 1}},
+        {"or": [
+          {"ammo": {"type": "Missile", "count": 1}},
+          {"and": [
+            {"resourceCapacity": [{"type": "Missile", "count": 1}]},
+            {"or": [
+              "canTrickyJump",
+              {"enemyDamage": {"enemy": "Phantoon", "type": "flame", "hits": 1}}
+            ]}
+          ]}
+        ]},
         "canXRayWaitForIFrames",
         {"or": [
           "canTrickyDodgeEnemies",
           {"and": [
             "canDodgeWhileShooting",
             {"enemyDamage": {"enemy": "Phantoon", "type": "flame", "hits": 2}},
             {"enemyDamage": {"enemy": "Phantoon", "type": "contact", "hits": 2}}
+          ]},
+          {"and": [
+            "canTrickyJump",
+            {"enemyDamage": {"enemy": "Phantoon", "type": "flame", "hits": 1}},
+            {"enemyDamage": {"enemy": "Phantoon", "type": "contact", "hits": 1}}
           ]}
         ]}
       ],