Do not farm more than the top fireflea while still in R-Mode

Author: aquanight

region/lowernorfair/east/Lower Norfair Fireflea Room.json

@@ -388,30 +388,7 @@
         ]},
         "h_RModeCanRefillReserves",
         {"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
-        {"or": [
-          {"resourceMissingAtMost": [{"type": "PowerBomb", "count": 0}]},
-          {"and": [
-            {"or": [
-              {"resourceMissingAtMost": [{"type": "PowerBomb", "count": 1}]},
-              {"and": [
-                {"or": ["Grapple", "canPreciseWalljump"]},
-                {"resourceMissingAtMost": [{"type": "PowerBomb", "count": 2}]}
-              ]},
-              {"and": [
-                "SpaceJump",
-                {"resourceMissingAtMost": [{"type": "PowerBomb", "count": 4}]}
-              ]}
-            ]},
-            {"or": [
-              "SpaceJump",
-              {"and": ["HiJump", "canCarefulJump"]},
-              {"and": ["HiJump", "canSpringBallJumpMidAir"]},
-              {"and": ["HiJump", "canWalljump"]},
-              "canLongIBJ",
-              {"and": ["canConsecutiveWalljump", "canPreciseWalljump", "canCarefulJump", {"or": ["canTrickyJump", "canResetFallSpeed"]}]}
-            ]}
-          ]}
-        ]},
+        {"resourceMissingAtMost": [{"type": "PowerBomb", "count": 0}]},
         {"canShineCharge": {"usedTiles": 21, "gentleDownTiles": 3, "gentleUpTiles": 3, "openEnd": 1}},
         {"autoReserveTrigger": {"maxReserveEnergy": 95}},
         "canRModeSparkInterrupt"
@@ -727,13 +704,13 @@
       },
       "requires": [
         {"enemyKill": {"enemies": [["Fune"]]}},
+        "h_fullEnemyDamageReduction",
         {"or": [
           "h_CrystalFlashForReserveEnergy",
           {"and": [
             "h_RModeCanRefillReserves",
-            "SpaceJump",
-            {"partialRefill": {"type": "ReserveEnergy", "limit": 80}},
-            {"resourceMissingAtMost": [{"type": "PowerBomb", "count": 1}]}
+            {"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
+            {"resourceMissingAtMost": [{"type": "PowerBomb", "count": 0}]}
           ]}
         ]},
         {"canShineCharge": {"usedTiles": 20, "gentleDownTiles": 2, "openEnd": 1}},
@@ -745,8 +722,10 @@
       "flashSuitChecked": true,
       "blueSuitChecked": true,
       "note": [
-        "Kill the Fune. Crystal Flash or farm all five firefleas below. After the shine charge,",
-        "use the spike pit for a pause abuse interrupt."
+        "Kill the Fune. Crystal Flash or farm the top fireflea. After the shine charge,",
+        "use the spike pit for a pause abuse interrupt.",
+        "Note: farming more than the top fireflea while still in R-Mode will cause Samus to",
+        "become difficult to see."
       ]
     },
     {
@@ -789,30 +768,7 @@
           {"and": [
             "h_RModeCanRefillReserves",
             {"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
-            {"or": [
-              {"resourceMissingAtMost": [{"type": "PowerBomb", "count": 0}]},
-              {"and": [
-                {"or": [
-                  {"resourceMissingAtMost": [{"type": "PowerBomb", "count": 1}]},
-                  {"and": [
-                    {"or": ["Grapple", "canPreciseWalljump"]},
-                    {"resourceMissingAtMost": [{"type": "PowerBomb", "count": 2}]}
-                  ]},
-                  {"and": [
-                    "SpaceJump",
-                    {"resourceMissingAtMost": [{"type": "PowerBomb", "count": 4}]}
-                  ]}
-                ]},
-                {"or": [
-                  "SpaceJump",
-                  {"and": ["HiJump", "canCarefulJump"]},
-                  {"and": ["HiJump", "canSpringBallJumpMidAir"]},
-                  {"and": ["HiJump", "canWalljump"]},
-                  "canLongIBJ",
-                  {"and": ["canConsecutiveWalljump", "canPreciseWalljump", "canCarefulJump", {"or": ["canTrickyJump", "canResetFallSpeed"]}]}
-                ]}
-              ]}
-            ]}
+            {"resourceMissingAtMost": [{"type": "PowerBomb", "count": 0}]}
           ]}
         ]},
         {"canShineCharge": {"usedTiles": 21, "gentleDownTiles": 3, "gentleUpTiles": 3, "openEnd": 1}},
@@ -1334,30 +1290,7 @@
         ]},
         "h_RModeCanRefillReserves",
         {"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
-        {"or": [
-          {"resourceMissingAtMost": [{"type": "PowerBomb", "count": 0}]},
-          {"and": [
-            {"or": [
-              {"resourceMissingAtMost": [{"type": "PowerBomb", "count": 1}]},
-              {"and": [
-                {"or": ["Grapple", "canPreciseWalljump"]},
-                {"resourceMissingAtMost": [{"type": "PowerBomb", "count": 2}]}
-              ]},
-              {"and": [
-                "SpaceJump",
-                {"resourceMissingAtMost": [{"type": "PowerBomb", "count": 4}]}
-              ]}
-            ]},
-            {"or": [
-              "SpaceJump",
-              {"and": ["HiJump", "canCarefulJump"]},
-              {"and": ["HiJump", "canSpringBallJumpMidAir"]},
-              {"and": ["HiJump", "canWalljump"]},
-              "canLongIBJ",
-              {"and": ["canConsecutiveWalljump", "canPreciseWalljump", "canCarefulJump", {"or": ["canTrickyJump", "canResetFallSpeed"]}]}
-            ]}
-          ]}
-        ]},
+        {"resourceMissingAtMost": [{"type": "PowerBomb", "count": 0}]},
         {"canShineCharge": {"usedTiles": 21, "gentleDownTiles": 3, "gentleUpTiles": 3, "openEnd": 1}},
         {"autoReserveTrigger": {"maxReserveEnergy": 95}},
         "canRModeSparkInterrupt"