Merge pull request #2479 from aquanight/rsi-mp-draygon

Draygon R-Mode Spark Interrupt

Author: osse101

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

@@ -109,6 +109,64 @@
       },
       "flashSuitChecked": true
     },
+    {
+      "link": [1, 1],
+      "name": "Draygon Goop Grab Spark Interrupt (Gain Blue Suit)",
+      "requires": [
+        {"not": "f_DefeatedDraygon"},
+        "canRiskPermanentLossOfAccess",
+        "Gravity",
+        "h_breakThreeDraygonTurrets",
+        {"canShineCharge": {"usedTiles": 22, "openEnd": 0}},
+        "canRModeSparkInterrupt"
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Shinecharge during a goop phase and then allow a goop to hit Samus.",
+        "Begin shinespark windup just before Draygon grabs Samus.",
+        "Rapidly press directions on the D-Pad to escape Draygon with less damage",
+        "taken."
+      ]
+    },
+    {
+      "link": [1, 1],
+      "name": "R-Mode Pause Abuse Spark Interrupt (Gain Blue Suit)",
+      "entranceCondition": {
+        "comeInWithRMode": {}
+      },
+      "requires": [
+        {"or": [
+          {"and": [
+            "f_DefeatedDraygon",
+            {"or": [
+              "canWalljump",
+              "SpaceJump",
+              "h_breakOneDraygonTurret"
+            ]}
+          ]},
+          "h_breakThreeDraygonTurrets"
+        ]},
+        "Gravity",
+        "h_CrystalFlashForReserveEnergy",
+        {"canShineCharge": {"usedTiles": 22, "openEnd": 0}},
+        "canOffScreenMovement",
+        "canHorizontalDamageBoost",
+        {"autoReserveTrigger": {}},
+        "canRModePauseAbuseSparkInterrupt"
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Crystal Flash after entering. Shinecharge on the ground and jump to the top left broken turret",
+        "and gain a flash suit. Continue to damage down ready to interrupt. Wall/Space jump into the corner",
+        "above the turret. Pause and set reserves to manual. At this point, visibility will be completely",
+        "obscured. Hold left, and re-pause as soon as able. When the energy counter hits 0, immediately press",
+        "Right+Jump to damage boost, then release jump early to begin shinespark windup. Set reserves to auto",
+        "then pause and unpause again - visibility will return to normal.",
+        "If Draygon is alive, the Shinespark windup may be interrupt by the goop phase grab instead of through triggering Reserves."
+      ]
+    },
     {
       "id": 57,
       "link": [1, 1],
@@ -291,7 +349,16 @@
           {"enemyDamage": {"enemy": "Draygon", "type": "contact", "hits": 1}}
         ]},
         {"enemyDamage": {"enemy": "Draygon", "type": "contact", "hits": 2}},
-        {"shinespark": {"frames": 150}}
+        {"shinespark": {"frames": 150}},
+        {"or": [
+          "free",
+          {"and": [
+            {"not": "f_DefeatedDraygon"},
+            "canRiskPermanentLossOfAccess",
+            "canShinechargeMovementTricky",
+            {"gainBlueSuit": {}}
+          ]}
+        ]}
       ],
       "setsFlags": ["f_DefeatedDraygon"],
       "flashSuitChecked": true,
@@ -1163,6 +1230,44 @@
       "requires": [],
       "flashSuitChecked": true
     },
+    {
+      "link": [2, 1],
+      "name": "R-Mode Pause Abuse Spark Interrupt (Gain Blue Suit)",
+      "entranceCondition": {
+        "comeInWithRMode": {}
+      },
+      "requires": [
+        {"or": [
+          {"and": [
+            "f_DefeatedDraygon",
+            {"or": [
+              "canWalljump",
+              "SpaceJump",
+              "h_breakOneDraygonTurret"
+            ]}
+          ]},
+          "h_breakThreeDraygonTurrets"
+        ]},
+        "Gravity",
+        "h_CrystalFlashForReserveEnergy",
+        {"canShineCharge": {"usedTiles": 22, "openEnd": 0}},
+        "canOffScreenMovement",
+        "canHorizontalDamageBoost",
+        {"autoReserveTrigger": {}},
+        "canRModePauseAbuseSparkInterrupt"
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Crystal Flash after entering. Damage down until ready to interrupt.",
+        "Shinecharge, and start jumping toward the turret. As you jump, pause and set reserves to manual.",
+        "At this point, visibility will be completely obscured. Re pause as soon as possible while jumping up into the turret.",
+        "When the energy counter changes to 00, immediately press Right+Jump to damage boost, then release jump early to begin shinespark windup.",
+        "Set reserves to auto, then as soon as possible, pause and unpause again - visibility will return to normal.",
+        "Using the turret to gain a flash suit (spikesuit) can help reduce the amount of blind execution, or when using the top turret.",
+        "If Draygon is alive, the Shinespark windup may be interrupt by the goop phase grab instead of through triggering Reserves."
+      ]
+    },
     {
       "id": 24,
       "link": [2, 1],
@@ -1333,4 +1438,4 @@
   ],
   "nextStratId": 62,
   "nextNotableId": 7
-}
+}