fix strats with correct RNG

Author: kjbranch

region/brinstar/blue/Morph Ball Room.json

@@ -368,26 +368,53 @@
         {"or": [
           {"and": [
             "Plasma",
+            "Charge"
+          ]},
+          {"and": [
+            "Plasma",
+            "canTrickyDodgeEnemies",
             {"or": [
-              "Charge",
               "Ice",
               "Wave"
             ]}
           ]},
-          "ScrewAttack",
+          "ScrewAttack"
+        ]}
+      ],
+      "clearsObstacles": ["C"],
+      "note": [
+        "Enter the room ready to kill the hoppers before they can hit Samus.",
+        "Enter with a Charged Plasma shot ready, in a Screw Attack spin jump, or prepated to rapidly kill the hopper with Plasma and another beam."
+      ]
+    },
+    {
+      "link": [1, 1],
+      "name": "Prepared Kill on Entry, Morph Entry",
+      "entranceCondition": {
+        "comeInNormally": {}
+      },
+      "requires": [
+        "canPrepareForNextRoom",
+        "Morph",
+        "canTrickyJump",
+        {"or": [
+          "Plasma",
           {"and": [
             "h_canUsePowerBombs",
-            {"enemyKill": {
-              "enemies": [["Sidehopper"]],
-              "explicitWeapons": ["Missile", "Super", "PowerBomb"]
-            }}
+            {"or": [
+              "canTrickyDodgeEnemies",
+              {"enemyKill": {
+                "enemies": [["Sidehopper"]],
+                "explicitWeapons": ["Missile", "Super", "PowerBomb"]
+              }}
+            ]}
           ]}
         ]}
       ],
       "clearsObstacles": ["C"],
       "note": [
-        "Enter the room ready to kill the hoppers before they can hit Samus.",
-        "with a charge plasma shot ready, or in a screw attack spin jump, or a morph, ready to lay a power bomb."
+        "Roll into the room, fall off the step and roll into the corner.",
+        "Either use a Power Bomb on entry, or unmorph at the bottom of the step and quickly kill the hoppers with Plasma."
       ]
     },
     {
@@ -399,7 +426,7 @@
       },
       "requires": [
         "canPrepareForNextRoom",
-        "canFarmWhileShooting",
+        "canTrickyDodgeEnemies",
         {"ammo": {"type": "Missile", "count": 1}},
         {"ammo": {"type": "Super", "count": 1}},
         {"or": [
@@ -425,7 +452,7 @@
       },
       "requires": [
         "canPrepareForNextRoom",
-        "canFarmWhileShooting",
+        "canTrickyDodgeEnemies",
         {"ammo": {"type": "Missile", "count": 1}},
         {"ammo": {"type": "Super", "count": 1}}
       ],
@@ -521,13 +548,7 @@
       "requires": [
         "canPrepareForNextRoom",
         {"or": [
-          {"and": [
-            "Plasma",
-            {"or": [
-              "Ice",
-              "Wave"
-            ]}
-          ]},
+          "Plasma",
           "ScrewAttack",
           {"and": [
             "h_canUsePowerBombs",
@@ -785,14 +806,15 @@
         "comeInNormally": {}
       },
       "requires": [
+        "canPrepareForNextRoom",
         "canTrickyDodgeEnemies",
         "canCameraManip",
         "h_canBombThings"
       ],
       "clearsObstacles": ["A"],
       "note": [
         "Roll into the room, fall off the step and roll into the corner.",
-        "Roll to the right immediately as the floor hopper is going to take its fourth jump to get it off camera.",
+        "Roll to the right immediately as the floor hopper is going to take its second jump to get it off camera.",
         "Once it is off camera, stop and wait for the next hopper to jump towards Samus, then roll under it as it jumps again."
       ]
     },
@@ -807,14 +829,15 @@
         }
       },
       "requires": [
+        "canPrepareForNextRoom",
         "canTrickyDodgeEnemies",
         "canCameraManip",
         "h_canBombThings"
       ],
       "clearsObstacles": ["A"],
       "note": [
         "Roll into the room, fall off the step and roll into the corner.",
-        "Roll to the right immediately as the floor hopper is going to take its fourth jump to get it off camera.",
+        "Roll to the right immediately as the floor hopper is going to take its second jump to get it off camera.",
         "Once it is off camera, stop and wait for the next hopper to jump towards Samus, then roll under it as it jumps again."
       ]
     },