Merge branch 'vg-json-data:master' into g-gt

Author: kjbranch

region/brinstar/green/Spore Spawn Kihunter Room.json

@@ -244,6 +244,40 @@
       "requires": [],
       "flashSuitChecked": true
     },
+    {
+      "id": 21,
+      "link": [1, 2],
+      "name": "G-Mode Ice Clip, Door Lock Skip",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "any",
+          "morphed": false
+        }
+      },
+      "requires": [
+        {"notable": "Ice Clip Door Lock Skip Without Morph and X-Ray"},
+        "canTrickyGMode",
+        "h_canPreciseIceClip",
+        {"or": [
+          "Morph",
+          "canInsaneJump",
+          {"enemyDamage": {"enemy": "Kihunter (green)", "type": "contact", "hits": 1}}
+        ]}
+      ],
+      "exitCondition": {
+        "leaveWithGMode": {
+          "morphed": false
+        }
+      },
+      "bypassesDoorShell": true,
+      "flashSuitChecked": true,
+      "note": [
+        "Lure a Kihunter over to the right near the door. Damage it so that it falls to the ground.",
+        "There is a 2 frame window at the beginning of its hop where Samus can use it to clip through the door",
+        "Be careful to avoid touching the invisible, stationary projectiles that it spits out.",
+        "Without Morph, jump onto the right side of it in order to have a chance to wiggle off quickly in case it is frozen at the wrong height."
+      ]
+    },
     {
       "id": 12,
       "link": [2, 1],
@@ -394,6 +428,42 @@
         "Alternatively, place a Power Bomb and roll to the left on entry to kill the Kihunter, then quickly IBJ through the door before more arrive."
       ],
       "devNote": "It is possible to do this with Bombs alone, but it is pretty chaotic."
+    },
+    {
+      "id": 22,
+      "link": [2, 2],
+      "name": "G-Mode Ice Clip, Door Lock Skip",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "indirect",
+          "morphed": false
+        },
+        "comesThroughToilet": "any"
+      },
+      "requires": [
+        {"notable": "Ice Clip Door Lock Skip Without Morph and X-Ray"},
+        "canTrickyGMode",
+        "h_canPreciseIceClip",
+        {"or": [
+          "Morph",
+          "canInsaneJump",
+          {"enemyDamage": {"enemy": "Kihunter (green)", "type": "contact", "hits": 1}}
+        ]}
+      ],
+      "exitCondition": {
+        "leaveWithGMode": {
+          "morphed": false
+        }
+      },
+      "bypassesDoorShell": true,
+      "flashSuitChecked": true,
+      "note": [
+        "Lure a Kihunter over to the right near the door (it may be easiest not to use the one that starts near the door). Damage it so that it falls to the ground.",
+        "There is a 2 frame window at the beginning of its hop where Samus can use it to clip through the door",
+        "Be careful to avoid touching the invisible, stationary projectiles that it spits out.",
+        "Without Morph, jump onto the right side of it in order to have a chance to wiggle off quickly in case it is frozen at the wrong height."
+      ],
+      "devNote": "This is only for indirect G-Mode, because it is trivial while in direct, and would use a different strat."
     }
   ],
   "notables": [
@@ -406,6 +476,6 @@
       ]
     }
   ],
-  "nextStratId": 21,
+  "nextStratId": 23,
   "nextNotableId": 2
 }

region/brinstar/green/Spore Spawn Room.json

@@ -266,6 +266,19 @@
       ],
       "setsFlags": ["f_DefeatedSporeSpawn"],
       "note": "Spore Spawn's pollen does not drop Supers. The fight requires 4 Supers, where many misses could lead to a softlock."
+    },
+    {
+      "id": 16,
+      "link": [2, 2],
+      "name": "G-Mode Regain Mobility",
+      "requires": [
+        {"enemyDamage": {"enemy": "Spore Spawn", "type": "contact", "hits": 1}},
+        {"not": "f_DefeatedSporeSpawn"},
+        "canRiskPermanentLossOfAccess"
+      ],
+      "gModeRegainMobility": {},
+      "flashSuitChecked": true,
+      "devNote": "This would only be useful to leave in g-mode."
     }
   ],
   "notables": [
@@ -287,6 +300,6 @@
       ]
     }
   ],
-  "nextStratId": 16,
+  "nextStratId": 17,
   "nextNotableId": 3
 }

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

@@ -267,6 +267,47 @@
         }
       }
     },
+    {
+      "id": 22,
+      "link": [1, 1],
+      "name": "Leave with Moondance",
+      "requires": [
+        "canMoondance",
+        "canTrickyUseFrozenEnemies",
+        {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 1}}
+      ],
+      "exitCondition": {
+        "leaveWithStoredFallSpeed": {
+          "fallSpeedInTiles": 1
+        }
+      },
+      "note": [
+        "Freeze the Beetom while Samus is as far left as possible on the door ledge.",
+        "Moonwalk carefully and start moondancing under the Beetom.",
+        "As long as Samus is near the door, the other Beetoms won't come near."
+      ]
+    },
+    {
+      "id": 23,
+      "link": [1, 1],
+      "name": "Leave with Extended Moondance",
+      "requires": [
+        "canExtendedMoondance",
+        "canTrickyUseFrozenEnemies",
+        {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 1}},
+        "h_ExtendedMoondanceBeetomLeniency"
+      ],
+      "exitCondition": {
+        "leaveWithStoredFallSpeed": {
+          "fallSpeedInTiles": 2
+        }
+      },
+      "note": [
+        "Freeze the Beetom while Samus is as far left as possible on the door ledge.",
+        "Moonwalk carefully and start moondancing under the Beetom.",
+        "As long as Samus is near the door, the other Beetoms won't come near."
+      ]
+    },
     {
       "id": 9,
       "link": [1, 1],
@@ -439,6 +480,6 @@
       ]
     }
   ],
-  "nextStratId": 22,
+  "nextStratId": 24,
   "nextNotableId": 2
 }

region/brinstar/kraid/Warehouse Kihunter Room.json

@@ -220,6 +220,7 @@
       }
     },
     {
+      "id": 46,
       "link": [1, 1],
       "name": "Kihunter Ice Moonfall Door Lock Skip",
       "requires": [
@@ -882,7 +883,7 @@
       ]
     }
   ],
-  "nextStratId": 46,
+  "nextStratId": 47,
   "nextNotableId": 5,
   "devNote": [
     "FIXME: An ice moonfall might be possible to clip past the bottom left door shell?",

region/brinstar/red/Red Tower.json

@@ -418,7 +418,6 @@
       "link": [1, 1],
       "name": "Door Frame Extended Moondance",
       "requires": [
-        {"notable": "Door Frame Extended Moondance"},
         {"obstaclesNotCleared": ["A"]},
         "canExtendedMoondance",
         "canTrickyUseFrozenEnemies",
@@ -2690,15 +2689,6 @@
       "name": "IBJ Between the Bottom Rippers",
       "note": "Requires switching between single and double IBJs. While Doubles are not techincally necessary, they make the strat more bearable."
     },
-    {
-      "id": 4,
-      "name": "Door Frame Extended Moondance",
-      "note": [
-        "Bring the Beetom close to the door and begin Moondancing.",
-        "Stop after exactly 175 moonfalls, so as not to fall through the floor.",
-        "Freeze the Beetom inside the door frame and Moondance such that Samus does not fall through the floor and does not touch the door transition."
-      ]
-    },
     {
       "id": 5,
       "name": "Frozen Beetom Ice Climb",

region/crateria/east/Crab Maze.json

@@ -111,9 +111,26 @@
       "flashSuitChecked": true,
       "note": [
         "Shoot a Super as a Sciser crawls near the top door, then freeze it mid-air and use it to clip up past the door shell.",
-        "If you don't have Morph and X-Ray, you must shoot the Super while the Sciser is on the slope near the door, not on the door itself."
+        "If you don't have Morph and X-Ray, you must shoot the Super while the Sciser is on the slope near the door, not on the door itself.",
+        "Because of the shot firing rate, it can help to crouch and shoot the Super to the side to give it a bit more time to knock the crab off."
+      ]
+    },
+    {
+      "id": 22,
+      "link": [1, 1],
+      "name": "Sciser High Pixel Ice Clip Door Lock Skip",
+      "requires": [
+        {"ammo": {"type": "Super", "count": 1}},
+        "h_canHighPixelIceClip"
       ],
-      "devNote": "This doesn't seem possible to get the crab frozen at the high pixel position."
+      "bypassesDoorShell": true,
+      "flashSuitChecked": true,
+      "note": [
+        "Shoot a Super as a Sciser crawls near the top door, then freeze it mid-air and use it to clip up past the door shell.",
+        "This requires knocking off the Sciser frame-pefrectly, then freezing it frame-perfectly in position.",
+        "The Super should knock off the crab when it is barely centered on the slope, 2 pixels away from the edge of the doorframe.",
+        "Because of the shot firing rate, it can help to crouch and shoot the Super to the side to give it a bit more time to knock the crab off."
+      ]
     },
     {
       "id": 2,
@@ -242,6 +259,36 @@
       "bypassesDoorShell": "free",
       "flashSuitChecked": true
     },
+    {
+      "id": 23,
+      "link": [1, 1],
+      "name": "G-Mode Ice Clip, Door Lock Skip",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "indirect",
+          "morphed": false
+        },
+        "comesThroughToilet": "any"
+      },
+      "requires": [
+        "canTrickyGMode",
+        "h_canPreciseIceClip",
+        {"ammo": {"type": "Super", "count": 1}}
+      ],
+      "exitCondition": {
+        "leaveWithGMode": {
+          "morphed": false
+        }
+      },
+      "bypassesDoorShell": true,
+      "flashSuitChecked": true,
+      "note": [
+        "Wait for a crab to come to this door and shoot a Super to knock it off, then quickly freeze it at the right height and use it to clip up past the door shell.",
+        "Knock the crab while it is on the sloped tiles near the top door, not on the door itself, otherwise it will never be in the correct height.",
+        "Because of the shot firing rate, it can help to crouch and shoot the Super to the side to give it a bit more time to knock the crab off."
+      ],
+      "devNote": "This is only for indirect G-Mode, because it is trivial while in direct, and would use a different strat."
+    },
     {
       "id": 10,
       "link": [1, 3],
@@ -302,8 +349,59 @@
       ],
       "flashSuitChecked": true,
       "note": [
-        "Place bombs at the far right, next to the low underwater ceiling.",
-        "To safely bomb the fast crab, wait just left of the crack on the floor where it falls."
+        "Overload PLMs by placing Bombs at the far right, against the bottom of the crumble block, at the right of the low underwater ceiling.",
+        "To safely bomb the fast crab, wait just left of where it falls."
+      ]
+    },
+    {
+      "id": 24,
+      "link": [2, 1],
+      "name": "G-Mode Morph Ice Clip, Door Lock Skip",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "any",
+          "morphed": true
+        }
+      },
+      "requires": [
+        "canBeVeryPatient",
+        "canTrickyGMode",
+        "h_canArtificialMorphBombs",
+        {"or": [
+          {"and": [
+            "Morph",
+            {"or": [
+              "HiJump",
+              "canSpringBallJumpMidAir",
+              "canSunkenTileWideWallClimb"
+            ]}
+          ]},
+          {"and": [
+            "Gravity",
+            "h_canArtificialMorphIBJ"
+          ]},
+          {"and": [
+            "h_canArtificialMorphSpringBall",
+            "HiJump"
+          ]}
+        ]},
+        "h_canPreciseIceClip",
+        {"ammo": {"type": "Super", "count": 1}}
+      ],
+      "exitCondition": {
+        "leaveWithGMode": {
+          "morphed": false
+        }
+      },
+      "bypassesDoorShell": true,
+      "flashSuitChecked": true,
+      "note": [
+        "Overload PLMs by placing Bombs at the far right, against the bottom of the crumble block, at the right of the low underwater ceiling.",
+        "With artificial morph, safely bomb the fast crab by waiting just left of where it falls.",
+        "Lure a crab to the top door or wait for the global crab to come back around, which can take up to 2.5 minutes.",
+        "Shoot a Super to knock the crab off, then quickly freeze it at the right height and use it to clip up past the door shell.",
+        "Knock it off while it is on the sloped tiles near the top door, not on the door itself, otherwise it will never be in the correct height.",
+        "Because of the shot firing rate, it can help to crouch and shoot the Super to the side to give it a bit more time to knock the crab off."
       ]
     },
     {
@@ -447,6 +545,6 @@
     }
   ],
   "notables": [],
-  "nextStratId": 22,
+  "nextStratId": 25,
   "nextNotableId": 1
 }

region/crateria/east/Forgotten Highway Elbow.json

@@ -140,6 +140,7 @@
       "flashSuitChecked": true
     },
     {
+      "id": 12,
       "link": [1, 2],
       "name": "Stored Moonfall Clip",
       "entranceCondition": {
@@ -237,6 +238,6 @@
     }
   ],
   "notables": [],
-  "nextStratId": 12,
+  "nextStratId": 13,
   "nextNotableId": 1
 }