Merge pull request #2323 from nn357/lower_mushrooms

add r-mode knockback spark strat to lower mushrooms

Author: osse101

region/crateria/west/Lower Mushrooms.json

@@ -113,6 +113,24 @@
       },
       "flashSuitChecked": true
     },
+    {
+      "link": [1, 1],
+      "name": "Gain Flash Suit (Geemer R-Mode Knockback Spark)",
+      "entranceCondition": {
+        "comeInWithRMode": {}
+      },
+      "requires": [
+        {"or": [
+         {"and": [
+          "h_CrystalFlash",
+          "canBeVeryPatient"
+        ]},
+        {"disableEquipment": "ETank"}
+      ]},
+        "h_shinechargeMaxRunway",
+        "h_RModeKnockbackSpark"
+      ]
+    },
     {
       "id": 5,
       "link": [1, 2],
@@ -284,6 +302,24 @@
         "leaveWithGModeSetup": {}
       },
       "flashSuitChecked": true
+    },
+    {
+      "link": [2, 2],
+      "name": "Gain Flash Suit (Geemer R-Mode Knockback Spark)",
+      "entranceCondition": {
+        "comeInWithRMode": {}
+      },
+      "requires": [
+        {"or": [
+         {"and": [
+          "h_CrystalFlash",
+          "canBeVeryPatient"
+        ]},
+        {"disableEquipment": "ETank"}
+      ]},
+        "h_shinechargeMaxRunway",
+        "h_RModeKnockbackSpark"
+      ]
     }
   ],
   "notables": [],

region/wreckedship/main/Basement.json

@@ -338,7 +338,7 @@
     },
     {
       "link": [1, 1],
-      "name": "Gain Flash Suit (R-Mode Knockback Spark)",
+      "name": "Gain Flash Suit (Atomic R-Mode Knockback Spark)",
       "entranceCondition": {
         "comeInWithRMode": {}
       },
@@ -353,15 +353,7 @@
       ]},
         {"canShineCharge": {"usedTiles": 38, "openEnd": 1}},
         "h_RModeKnockbackSpark"
-      ],
-      "note": [
-        "Disable E-tanks and with a full Reserve tank enter the room in R-Mode. Farm Energy from the first and if necessary second Atomic to put Energy into reserves.",
-        "Damage down and ensure there is between 1-4 energy in reserves. Lure the third Atomic down towards Samus while shooting the robot to move it back.",
-        "Shinecharge and stop just before the Atomic, allow it to make contact with Samus while stationary, triggering the reserves and an R-Mode forced standup.",
-        "Frame perfectly press jump to shinespark and gain a flash suit. The Atomic will not move out of the way so as soon as Samus starts to turn blue",
-        "shinespark to kill it before i-frames run out and it kills Samus. Sparking too early will not gain a flashsuit."
-      ],
-      "devNote": "If E-tanks cannot be disabled, a crystalflash can be used to put energy into reserves."
+      ]
     },
     {
       "id": 13,
@@ -753,7 +745,7 @@
     },
     {
       "link": [2, 2],
-      "name": "Gain Flash Suit (R-Mode Knockback Spark)",
+      "name": "Gain Flash Suit (Atomic R-Mode Knockback Spark)",
       "entranceCondition": {
         "comeInWithRMode": {},
         "comesThroughToilet": "any"
@@ -769,15 +761,7 @@
       ]},
         {"canShineCharge": {"usedTiles": 38, "openEnd": 1}},
         "h_RModeKnockbackSpark"
-      ],
-      "note": [
-        "Disable E-tanks and with a full Reserve tank enter the room in R-Mode. Farm Energy from the first and if necessary second Atomic near the top door to put Energy into reserves.",
-        "Lure the third Atomic near the left door down toward samus and use it damage down if the first two Atomic's were used for farming, shooting the robot to move it back gives more runway.",
-        "Shinecharge and stop just before the Atomic, allow it to make contact with Samus while stationary, triggering the reserves and an R-Mode forced standup.",
-        "Frame perfectly press jump to shinespark and gain a flash suit. The Atomic will not move out of the way so as soon as Samus starts to turn blue",
-        "shinespark to kill it before i-frames run out and it kills Samus. Sparking too early will not gain a flashsuit."
-      ],
-      "devNote": "If E-tanks cannot be disabled, a crystalflash can be used to put energy into reserves."
+      ]
     },
     {
       "id": 28,
@@ -1291,7 +1275,7 @@
     },
     {
       "link": [3, 3],
-      "name": "Gain Flash Suit (R-Mode Knockback Spark)",
+      "name": "Gain Flash Suit (Atomic R-Mode Knockback Spark)",
       "entranceCondition": {
         "comeInWithRMode": {}
       },
@@ -1307,15 +1291,7 @@
 	      "h_bombThings",
         {"canShineCharge": {"usedTiles": 38, "openEnd": 1}},
         "h_RModeKnockbackSpark"
-      ],
-      "note": [
-        "Disable E-tanks and with a full Reserve tank enter the room in R-Mode. Farm Energy from the first and if necessary, second Atomic closest to the right the door to put Energy into reserves.",
-        "Lure the third Atomic near the left door down toward samus and use it damage down if the first two Atomic's were used for farming, shooting the robot to move it back gives more runway.",
-        "Shinecharge and stop just before the Atomic, allow it to make contact with Samus while stationary, triggering the reserves and an R-Mode forced standup.",
-        "Frame perfectly press jump to shinespark and gain a flash suit. The Atomic will not move out of the way so as soon as Samus starts to turn blue",
-        "shinespark to kill it before i-frames run out and it kills Samus. Sparking too early will not gain a flashsuit."
-      ],
-      "devNote": "If E-tanks cannot be disabled, a crystalflash can be used to put energy into reserves."
+      ]
     }
   ],
   "notables": [