Cleanup: use canRelyOnLuck for bad drop rates

Author: aquanight

region/brinstar/blue/Morph Ball Room.json

@@ -755,18 +755,15 @@
           "h_CrystalFlashForReserveEnergy",
           {"and": [
             "h_RModeCanRefillReserves",
-            {"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
-            {"resourceMissingAtMost": [{"type": "Super", "count": 0}]},
             {"or": [
               {"and": [
-                {"partialRefill": {"type": "ReserveEnergy", "limit": 5}},
-                "canBePatient"
+                {"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
+                {"resourceMissingAtMost": [{"type": "Super", "count": 0}]}
               ]},
-              {"and": [
-                {"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
-                "canBeExtremelyPatient"
-              ]}
-            ]}
+              "canBeVeryLucky"
+            ]},
+            "canBeLucky",
+            {"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
           ]}
         ]},
         "canTrickyDodgeEnemies",
@@ -1379,19 +1376,15 @@
           {"and": [
             "h_usePowerBomb",
             "h_RModeCanRefillReserves",
-            {"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
-            {"resourceMissingAtMost": [{"type": "Super", "count": 0}]},
-            {"partialRefill": {"type": "ReserveEnergy", "limit": 1}},
             {"or": [
               {"and": [
-                {"partialRefill": {"type": "ReserveEnergy", "limit": 5}},
-                "canBePatient"
+                {"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
+                {"resourceMissingAtMost": [{"type": "Super", "count": 0}]}
               ]},
-              {"and": [
-                {"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
-                "canBeVeryPatient"
-              ]}
-            ]}
+              "canBeVeryLucky"
+            ]},
+            "canBeLucky",
+            {"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
           ]}
         ]},
         {"or": [

region/brinstar/green/Spore Spawn Kihunter Room.json

@@ -110,7 +110,7 @@
             {"or": [
               {"and": [
                 {"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
-                "canBeVeryPatient"
+                "canBeLucky"
               ]},
               {"partialRefill": {"type": "ReserveEnergy", "limit": 5}}
             ]}
@@ -375,7 +375,7 @@
             {"or": [
               {"and": [
                 {"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
-                "canBeVeryPatient"
+                "canBeLucky"
               ]},
               {"partialRefill": {"type": "ReserveEnergy", "limit": 5}}
             ]}

region/brinstar/pink/Mission Impossible Room.json

@@ -1042,11 +1042,11 @@
             {"resourceMissingAtMost": [{"type": "Super", "count": 0}]},
             {"or": [
               {"and": [
-                "canBePatient",
+                "canBeLucky",
                 {"partialRefill": {"type": "ReserveEnergy", "limit": 5}}
               ]},
               {"and": [
-                "canBeExtremelyPatient",
+                "canBeVeryLucky",
                 {"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
               ]}
             ]}

region/brinstar/pink/Pink Brinstar Wave Gate Room.json

@@ -221,11 +221,11 @@
             {"resourceMissingAtMost": [{"type": "Super", "count": 0}]},
             {"or": [
               {"and": [
-                "canBePatient",
+                "canBeLucky",
                 {"partialRefill": {"type": "ReserveEnergy", "limit": 5}}
               ]},
               {"and": [
-                "canBeExtremelyPatient",
+                "canBeVeryLucky",
                 {"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
               ]}
             ]}

region/brinstar/red/Alpha Power Bomb Room.json

@@ -137,11 +137,11 @@
             {"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
             {"or": [
               {"and": [
-                "canBePatient",
+                "canBeLucky",
                 {"partialRefill": {"type": "ReserveEnergy", "limit": 5}}
               ]},
               {"and": [
-                "canBeExtremelyPatient",
+                "canBeVeryLucky",
                 {"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
               ]}
             ]}

region/brinstar/red/Beta Power Bomb Room.json

@@ -121,7 +121,7 @@
         {"resourceMissingAtMost": [{"type": "Super", "count": 0}]},
         {"or": [
           {"and": [
-            "canBePatient",
+            "canBeLucky",
             {"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
           ]},
           {"partialRefill": {"type": "ReserveEnergy", "limit": 5}}

region/crateria/central/Bomb Torizo Room.json

@@ -158,19 +158,6 @@
         "f_ZebesSetAblaze",
         "h_CrystalFlashForReserveEnergy",
         "Gravity",
-        {"or": [
-          {"and": [
-            {"disableEquipment": "ETank"},
-            {"refill": ["ReserveEnergy"]}
-          ]},
-          {"and": [
-            "canBePatient",
-            {"or": [
-              {"resourceAtMost": [{"type": "ReserveEnergy", "count": 50}]},
-              "canRiskPermanentLossOfAccess"
-            ]}
-          ]}
-        ]},
         {"acidFrames": 90},
         {"canShineCharge": {"usedTiles": 13, "openEnd": 0}},
         {"autoReserveTrigger": {}},

region/crateria/central/Climb Supers Room.json

@@ -1158,11 +1158,11 @@
             }},
             {"or": [
               {"and": [
-                "canBePatient",
+                "canBeLucky",
                 {"partialRefill": {"type": "ReserveEnergy", "limit": 5}}
               ]},
               {"and": [
-                "canBeExtremelyPatient",
+                "canBeVeryLucky",
                 {"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
               ]}
             ]}

region/crateria/east/West Ocean.json

@@ -3278,7 +3278,7 @@
               ]},
               {"and": [
                 {"or": [
-                  "canBeExtremelyPatient",
+                  "canBeVeryLucky",
                   {"and": [
                     {"enemyKill": {
                       "enemies": [["Ripper 2 (green)"]],

region/lowernorfair/east/Main Hall.json

@@ -180,7 +180,7 @@
             {"or": [
               {"partialRefill": {"type": "ReserveEnergy", "limit": 5}},
               {"and": [
-                "canBePatient",
+                "canBeLucky",
                 {"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
               ]}
             ]}
@@ -485,7 +485,7 @@
             {"or": [
               {"partialRefill": {"type": "ReserveEnergy", "limit": 5}},
               {"and": [
-                "canBePatient",
+                "canBeLucky",
                 {"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
               ]}
             ]}