Merge pull request #1772 from kjbranch/beta-pbs

Beta PBs Remove Unnecessary Node

Author: osse101

region/brinstar/red/Beta Power Bomb Room.json

@@ -26,8 +26,7 @@
               "notable": false,
               "requires": [
                 {"obstaclesCleared": ["A"]}
-              ],
-              "note": "Killing the Sidehoppers requires going to 3 and back."
+              ]
             }
           ],
           "yields": ["f_ZebesAwake"]
@@ -41,12 +40,6 @@
       "nodeSubType": "visible",
       "nodeItem": "PowerBomb",
       "nodeAddress": "0x788CA"
-    },
-    {
-      "id": 3,
-      "name": "Top Left Junction",
-      "nodeType": "junction",
-      "nodeSubType": "junction"
     }
   ],
   "obstacles": [
@@ -67,7 +60,7 @@
       "groupName": "Beta Power Bomb Room Sidehoppers",
       "enemyName": "Sidehopper",
       "quantity": 3,
-      "homeNodes": [1, 3]
+      "homeNodes": [1]
     },
     {
       "id": "e2",
@@ -83,19 +76,11 @@
       "from": 1,
       "to": [
         {"id": 1},
-        {"id": 2},
-        {"id": 3}
+        {"id": 2}
       ]
     },
     {
       "from": 2,
-      "to": [
-        {"id": 2},
-        {"id": 3}
-      ]
-    },
-    {
-      "from": 3,
       "to": [
         {"id": 1},
         {"id": 2}
@@ -191,92 +176,9 @@
         "Take a hit, then start running with the i-frames."
       ]
     },
-    {
-      "id": 3,
-      "link": [1, 1],
-      "name": "Crystal Flash",
-      "requires": [
-        {"obstaclesCleared": ["A"]},
-        "h_canCrystalFlash"
-      ],
-      "clearsObstacles": ["B"],
-      "flashSuitChecked": true
-    },
-    {
-      "id": 4,
-      "link": [1, 1],
-      "name": "G-Mode Setup - Get Hit By Sidehopper",
-      "requires": [
-        {"obstaclesNotCleared": ["A"]}
-      ],
-      "exitCondition": {
-        "leaveWithGModeSetup": {}
-      },
-      "flashSuitChecked": true
-    },
-    {
-      "id": 5,
-      "link": [1, 1],
-      "name": "G-Mode Regain Mobility",
-      "requires": [
-        {"enemyDamage": {
-          "enemy": "Sidehopper",
-          "type": "contact",
-          "hits": 1
-        }}
-      ],
-      "gModeRegainMobility": {},
-      "flashSuitChecked": true
-    },
-    {
-      "id": 6,
-      "link": [1, 2],
-      "name": "Stored Moonfall Clip",
-      "entranceCondition": {
-        "comeInWithStoredFallSpeed": {
-          "fallSpeedInTiles": 1
-        }
-      },
-      "requires": [
-        "Plasma",
-        "Wave"
-      ],
-      "clearsObstacles": ["A"],
-      "devNote": [
-        "Coming in with blue speed would be an alternative way to get past the hoppers, but this may be tricky to model.",
-        "Other weapon combinations are possible, but not reliable due to movement being limited."
-      ]
-    },
-    {
-      "id": 7,
-      "link": [1, 2],
-      "name": "Stored Moonfall Clip (more speed)",
-      "entranceCondition": {
-        "comeInWithStoredFallSpeed": {
-          "fallSpeedInTiles": 2
-        }
-      },
-      "requires": [
-        "Plasma",
-        "Wave"
-      ],
-      "clearsObstacles": ["A"],
-      "devNote": [
-        "Coming in with blue speed would be an alternative way to get past the hoppers, but this may be tricky to model.",
-        "Other weapon combinations are possible, but not reliable due to movement being limited."
-      ]
-    },
-    {
-      "id": 8,
-      "link": [1, 3],
-      "name": "Already Killed",
-      "requires": [
-        {"obstaclesCleared": ["A"]}
-      ]
-    },
     {
       "id": 9,
-      "link": [1, 3],
+      "link": [1, 1],
       "name": "Power Beam Sidehopper Kill",
       "requires": [
         {"enemyDamage": {
@@ -298,7 +200,7 @@
     },
     {
       "id": 10,
-      "link": [1, 3],
+      "link": [1, 1],
       "name": "Intermediate Weapon Sidehopper Kill",
       "requires": [
         {"or": [
@@ -326,7 +228,7 @@
     },
     {
       "id": 11,
-      "link": [1, 3],
+      "link": [1, 1],
       "name": "Sidehopper Missile Kill",
       "requires": [
         {"or": [
@@ -357,7 +259,7 @@
     },
     {
       "id": 12,
-      "link": [1, 3],
+      "link": [1, 1],
       "name": "Morph Power Beam Sidehopper Kill",
       "requires": [
         "Morph",
@@ -382,7 +284,7 @@
     },
     {
       "id": 13,
-      "link": [1, 3],
+      "link": [1, 1],
       "name": "PB Sidehopper Kill",
       "requires": [
         {"enemyKill": {
@@ -394,7 +296,7 @@
     },
     {
       "id": 14,
-      "link": [1, 3],
+      "link": [1, 1],
       "name": "Safe Weapon Sidehopper Kill",
       "requires": [
         {"enemyKill": {
@@ -406,7 +308,7 @@
     },
     {
       "id": 15,
-      "link": [1, 3],
+      "link": [1, 1],
       "name": "Shinespark",
       "entranceCondition": {
         "comeInWithSpark": {
@@ -421,7 +323,7 @@
     },
     {
       "id": 16,
-      "link": [1, 3],
+      "link": [1, 1],
       "name": "G-Mode Morph Power Bomb",
       "entranceCondition": {
         "comeInWithGMode": {
@@ -437,7 +339,7 @@
     },
     {
       "id": 17,
-      "link": [1, 3],
+      "link": [1, 1],
       "name": "G-Mode Morph Sidehopper Bomb Kill",
       "entranceCondition": {
         "comeInWithGMode": {
@@ -457,17 +359,95 @@
       ]
     },
     {
-      "id": 18,
-      "link": [2, 2],
-      "name": "Break the Power Bomb Blocks",
+      "id": 3,
+      "link": [1, 1],
+      "name": "Crystal Flash",
       "requires": [
-        "h_canUsePowerBombs"
+        {"obstaclesCleared": ["A"]},
+        "h_canCrystalFlash"
+      ],
+      "clearsObstacles": ["B"],
+      "flashSuitChecked": true
+    },
+    {
+      "id": 4,
+      "link": [1, 1],
+      "name": "G-Mode Setup - Get Hit By Sidehopper",
+      "requires": [
+        {"obstaclesNotCleared": ["A"]}
+      ],
+      "exitCondition": {
+        "leaveWithGModeSetup": {}
+      },
+      "flashSuitChecked": true
+    },
+    {
+      "id": 5,
+      "link": [1, 1],
+      "name": "G-Mode Regain Mobility",
+      "requires": [
+        {"enemyDamage": {
+          "enemy": "Sidehopper",
+          "type": "contact",
+          "hits": 1
+        }}
+      ],
+      "gModeRegainMobility": {},
+      "flashSuitChecked": true
+    },
+    {
+      "id": 25,
+      "link": [1, 2],
+      "name": "Base",
+      "requires": [
+        {"or": [
+          "h_canUsePowerBombs",
+          {"obstaclesCleared": ["B"]}
+        ]}
       ],
       "clearsObstacles": ["B"]
     },
+    {
+      "id": 6,
+      "link": [1, 2],
+      "name": "Stored Moonfall Clip",
+      "entranceCondition": {
+        "comeInWithStoredFallSpeed": {
+          "fallSpeedInTiles": 1
+        }
+      },
+      "requires": [
+        "Plasma",
+        "Wave"
+      ],
+      "clearsObstacles": ["A"],
+      "devNote": [
+        "Coming in with blue speed would be an alternative way to get past the hoppers, but this may be tricky to model.",
+        "Other weapon combinations are possible, but not reliable due to movement being limited."
+      ]
+    },
+    {
+      "id": 7,
+      "link": [1, 2],
+      "name": "Stored Moonfall Clip (more speed)",
+      "entranceCondition": {
+        "comeInWithStoredFallSpeed": {
+          "fallSpeedInTiles": 2
+        }
+      },
+      "requires": [
+        "Plasma",
+        "Wave"
+      ],
+      "clearsObstacles": ["A"],
+      "devNote": [
+        "Coming in with blue speed would be an alternative way to get past the hoppers, but this may be tricky to model.",
+        "Other weapon combinations are possible, but not reliable due to movement being limited."
+      ]
+    },
     {
       "id": 19,
-      "link": [2, 3],
+      "link": [2, 1],
       "name": "Base",
       "requires": [
         {"obstaclesCleared": ["B"]},
@@ -482,7 +462,7 @@
     },
     {
       "id": 20,
-      "link": [2, 3],
+      "link": [2, 1],
       "name": "Damage Boost Escape",
       "requires": [
         {"obstaclesCleared": ["B"]},
@@ -492,7 +472,7 @@
     },
     {
       "id": 21,
-      "link": [2, 3],
+      "link": [2, 1],
       "name": "Tricky Jump Escape",
       "requires": [
         {"obstaclesCleared": ["B"]},
@@ -502,7 +482,7 @@
     },
     {
       "id": 22,
-      "link": [2, 3],
+      "link": [2, 1],
       "name": "Ceiling Clip",
       "requires": [
         "canCeilingClip",
@@ -536,7 +516,7 @@
     },
     {
       "id": 23,
-      "link": [2, 3],
+      "link": [2, 1],
       "name": "Minimalist Ceiling Clip",
       "requires": [
         "canTrickyJump",
@@ -556,20 +536,11 @@
       ]
     },
     {
-      "id": 24,
-      "link": [3, 1],
-      "name": "Base",
-      "requires": []
-    },
-    {
-      "id": 25,
-      "link": [3, 2],
-      "name": "Base",
+      "id": 18,
+      "link": [2, 2],
+      "name": "Break the Power Bomb Blocks",
       "requires": [
-        {"or": [
-          "h_canUsePowerBombs",
-          {"obstaclesCleared": ["B"]}
-        ]}
+        "h_canUsePowerBombs"
       ],
       "clearsObstacles": ["B"]
     }