Merge pull request #2786 from nn357/sba

spo spo wave sba.

Author: osse101

region/brinstar/green/Spore Spawn Room.json

@@ -146,6 +146,23 @@
         "Jumping against the ledge above then rotating to the left after landing will put Samus into a good position."
       ]
     },
+    {
+      "link": [1, 2],
+      "name": "Wave SBA Kill from Above",
+      "requires": [
+        {"notable": "Wave SBA Kill from Above"},
+        "Wave",
+        "canSpecialBeamAttack",
+        {"ammo": {"type": "PowerBomb", "count": 1}}
+      ],
+      "setsFlags": ["f_DefeatedSporeSpawn"],
+      "flashSuitChecked": true,
+      "note": [
+       "Stand on the right half of Spore Spawn's pit. When Spore Spawn begins it's third left rotation begin to charge the SBA attack.",
+       "Perform a full height jump just as the SBA attack is about to fire."
+      ],
+      "devNote": "1 Power Bomb total."
+    },
     {
       "id": 3,
       "link": [1, 2],
@@ -379,8 +396,16 @@
         "Spore Spawn will move out of range after the first hit and it will take 9 cycles to come back into range.",
         "Alternatively, Xray can be used to kill Spore Spawn in 1 cycle."
       ]
+    },
+    {
+      "id": 3,
+      "name": "Wave SBA Kill from Above",
+      "note": [
+        "Use the Wave Special Beam Attack to kill Spore Spawn from above.",
+        "Spore Spawn can easilly be killed on the first cycle by multiple hits from the Wave SBA."
+      ]
     }
   ],
   "nextStratId": 21,
-  "nextNotableId": 3
+  "nextNotableId": 4
 }

tech.json

@@ -2033,7 +2033,8 @@
           "note": [
             "A Special Beam Attack (SBA) is activated by equipping Charge and exactly one other beam and selecting Power Bombs.",
             "After charging the beam, a power bomb will be consumed, and a beam specific attack will occur."
-          ]
+          ],
+          "devNote": "Maybe a disableEquipment requirement should be added here at some point"
         },
         {
           "id": 126,