Merge pull request #2408 from kjbranch/r-more-than-e

Add h_MoreRTanksThanETanks

Author: osse101

helpers.json

@@ -1642,7 +1642,10 @@
             {"tech": "canRModeCrystalFlashInterrupt"},
             {"resourceAtMost": [{"type": "RegularEnergy", "count": 50}]},
             {"resourceAtMost": [{"type": "ReserveEnergy", "count": 0}]},
-            {"disableEquipment": "ETank"},
+            {"or": [
+              {"disableEquipment": "ETank"},
+              {"resourceMaxCapacity": [{"type": "RegularEnergy", "count": 99}]}
+            ]},
             "h_artificialMorphPowerBomb",
             {"resourceAvailable": [{"type": "Missile", "count": 10}]},
             {"resourceAvailable": [{"type": "Super", "count": 10}]},
@@ -1677,6 +1680,33 @@
             "IBJ is not usable for underwater rooms without Gravity."
           ]
         },
+        {
+          "name": "h_MoreRTanksThanETanks",
+          "requires": [
+            {"or": [
+              {"and": [
+                {"disableEquipment": "ETank"},
+                {"resourceCapacity": [{"type": "ReserveEnergy", "count": 100}]}
+              ]},
+              {"and": [
+                {"resourceMaxCapacity": [{"type": "RegularEnergy", "count": 99}]},
+                {"resourceCapacity": [{"type": "ReserveEnergy", "count": 100}]}
+              ]},
+              {"and": [
+                {"resourceMaxCapacity": [{"type": "RegularEnergy", "count": 199}]},
+                {"resourceCapacity": [{"type": "ReserveEnergy", "count": 200}]}
+              ]},
+              {"and": [
+                {"resourceMaxCapacity": [{"type": "RegularEnergy", "count": 299}]},
+                {"resourceCapacity": [{"type": "ReserveEnergy", "count": 300}]}
+              ]},
+              {"and": [
+                {"resourceMaxCapacity": [{"type": "RegularEnergy", "count": 399}]},
+                {"resourceCapacity": [{"type": "ReserveEnergy", "count": 400}]}
+              ]}
+            ]}
+          ]
+        },
         {
           "name": "h_RModeCanRefillReserves",
           "requires": [

tech.json

@@ -2399,7 +2399,10 @@
               "otherRequires": [
                 {"resourceAtMost": [{"type": "RegularEnergy", "count": 50}]},
                 {"resourceAtMost": [{"type": "ReserveEnergy", "count": 0}]},
-                {"disableEquipment": "ETank"},
+                {"or": [
+                  {"disableEquipment": "ETank"},
+                  {"resourceMaxCapacity": [{"type": "RegularEnergy", "count": 99}]}
+                ]},
                 "Morph",
                 {"ammo": {"type": "PowerBomb", "count": 1}},
                 {"resourceAvailable": [{"type": "Missile", "count": 10}]},
@@ -2420,8 +2423,8 @@
                 "so a second hit may be difficult to avoid or may trigger automatically, if the enemy stays nearby."
               ],
               "devNote": [
-                "Strats are primarily tested with zero E-Tanks, unless otherwise documented.",
-                "There could also be a no E-Tank option with canRiskPermanentLossOfAccess, instead of being able to disable them, but there is not a good way to represent that yet.",
+                "Strats are only tested with zero E-Tanks, unless otherwise documented.",
+                "FIXME: Some strats can be done with more than one E-Tank, which needs to be represented without requiring disabling E-Tanks.",
                 "The amount of resources consumed depends upon when during the Crystal Flash the reserves trigger, which will be strat dependent.",
                 "The amount of Energy remaining after the strat is complex and depends on the number of Reserve Tanks, when Samus gets hit, and by which enemy;",
                 "for simplicity, it is just assumed that Samus retains the small amount of Energy she had before the Crystal Flash (50 or less) and doesn't gain any refill.",