Merge pull request #1933 from blkerby/draygon-microwave-fix

Fix/refine Draygon Microwave Fight strat

Author: osse101

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

@@ -302,10 +302,22 @@
       "name": "Microwave Fight",
       "requires": [
         "h_canNavigateUnderwater",
-        "h_canBreakThreeDraygonTurrets",
+        {"or": [
+          {"and": [
+            "canTrickyDodgeEnemies",
+            {"or": [
+              "Gravity",
+              "canInsaneJump",
+              {"enemyDamage": {"enemy": "Draygon", "type": "turretProjectile", "hits": 1}}
+            ]}
+          ]},
+          "h_canBreakThreeDraygonTurrets"
+        ]},
         "canXRayWaitForIFrames",
+        "Charge",
         "Plasma",
         {"or": [
+          "canTrickyDodgeEnemies",
           "Morph",
           {"and": [
             "Ice",
@@ -320,8 +332,7 @@
         "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,