Merge pull request vg-json-data#1673 from kjbranch/misc-fixes

Misc Fixes: Warehouse Entrance Moondance, Reverse PCJR Shinecharge
kjbranch · Sep 30, 2024 · 2383221 · 2383221
2 parents 5ac41b3 + 07a6e73
commit 2383221
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 5 deletions.
diff --git a/region/brinstar/green/Green Brinstar Main Shaft.json b/region/brinstar/green/Green Brinstar Main Shaft.json
@@ -5093,8 +5093,15 @@
       "name": "Base",
       "requires": [
         {"or": [
-          "canTrivialMidAirMorph",
+          "canMidAirMorph",
           "h_canUseSpringBall",
+          {"and": [
+            "canTrivialMidAirMorph",
+            {"or": [
+              "SpaceJump",
+              "canConsecutiveWalljump"
+            ]}
+          ]},
           {"and": [
             "canIBJ",
             "canBombHorizontally"
@@ -5796,4 +5803,4 @@
     }
   ],
   "nextNotableId": 5
-}
+}
diff --git a/region/brinstar/kraid/Warehouse Entrance.json b/region/brinstar/kraid/Warehouse Entrance.json
@@ -119,6 +119,52 @@
       ],
       "flashSuitChecked": true
     },
+    {
+      "link": [1, 1],
+      "name": "Super Block Moondance (Leave with Stored Fall Speed)",
+      "requires": [
+        {"ammo": {"type": "Super", "count": 3}},
+        "h_canCrystalFlash",
+        "canMoondance"
+      ],
+      "exitCondition": {
+        "leaveWithStoredFallSpeed": {
+          "fallSpeedInTiles": 1
+        }
+      },
+      "note": [
+        "Use a Super on the top and bottom blocks. Crystal Flash below the lower block to standup and then begin Moondancing.",
+        "After Samus sinks through the bottom tile, use a Super to break the final block, then use Grapple to get out of the floor.",
+        "Without Grapple, count to 174 Moonfalls and delicately Moonfall to prevent clipping into the ground."
+      ],
+      "devNote": [
+        "Obstacle A doesnt need to be checked, because there is no reason to have destroyed more than one block, with Morph.",
+        "FIXME: This should have a pixel precise setup to prevent using another Super."
+      ]
+    },
+    {
+      "link": [1, 1],
+      "name": "Super Block Moondance (Leave with More Stored Fall Speed)",
+      "requires": [
+        {"ammo": {"type": "Super", "count": 3}},
+        "h_canCrystalFlash",
+        "canExtendedMoondance"
+      ],
+      "exitCondition": {
+        "leaveWithStoredFallSpeed": {
+          "fallSpeedInTiles": 2
+        }
+      },
+      "note": [
+        "Use a Super on the top and bottom blocks. Crystal Flash below the lower block to standup and then begin Moondancing.",
+        "After Samus sinks through the floor tiles, use Grapple to return to a standing position and count an additional 145 moonfalls.",
+        "Then use Grapple to get out of the floor."
+      ],
+      "devNote": [
+        "Obstacle A doesnt need to be checked, because there is no reason to have destroyed more than one block, with Morph.",
+        "FIXME: This should have a pixel precise setup to prevent using another Super."
+      ]
+    },
     {
       "id": 4,
       "link": [1, 2],

diff --git a/region/brinstar/pink/Big Pink.json b/region/brinstar/pink/Big Pink.json
@@ -2450,8 +2450,9 @@
       ],
       "clearsObstacles": ["F"],
       "note": [
-        "Break the bomb blocks then shoot a super into the morph tunnel to break the super block off screen.",
-        "Requires pixel precision, although there are several pixels that work. The camera must be fully scrolled to the right, which may require going far left and back."
+        "Break the bomb blocks then shoot a Super into the morph tunnel to break the Super block off screen.",
+        "Requires pixel precision, although there are several pixels that work. The camera must be fully scrolled to the right, which may require going far left and back.",
+        "One normalized setup that doesn't rely on a visual cue: perform a full-height jump and press against the overhang to the left, while holding angle up and down to lock Samus' position after landing, while continuing to hold left. This works with or without HiJump equipped."
       ],
       "devNote": "It is possible to avoid a mid-air morph by rolling off the platform above"
     },

diff --git a/region/norfair/crocomire/Post Crocomire Jump Room.json b/region/norfair/crocomire/Post Crocomire Jump Room.json
@@ -1135,6 +1135,19 @@
       "clearsObstacles": ["B"],
       "note": "Gravity makes it possible to charge a spark in the acid in order to break the speed blocks."
     },
+    {
+      "link": [5, 2],
+      "name": "Break Speed Blocks, Insane Short Charge",
+      "requires": [
+        {"getBlueSpeed": {
+          "usedTiles": 12,
+          "gentleDownTiles": 6,
+          "openEnd": 1
+        }}
+      ],
+      "clearsObstacles": ["B"],
+      "note": "Commonly known as a stutter-3, this is also doable as a 4-tap."
+    },
     {
       "id": 59,
       "link": [5, 3],

diff --git a/region/wreckedship/main/Wrecked Ship Energy Tank Room.json b/region/wreckedship/main/Wrecked Ship Energy Tank Room.json
@@ -378,7 +378,8 @@
         {"not": "f_DefeatedPhantoon"},
         {"or": [
           "canRiskPermanentLossOfAccess",
-          "canCarefulJump"
+          "canCarefulJump",
+          "Gravity"
         ]}
       ]
     },

diff --git a/region/wreckedship/roomDiagrams/main_WreckedShipMainShaft_155.png b/region/wreckedship/roomDiagrams/main_WreckedShipMainShaft_155.png