Merge pull request #2415 from aquanight/autoreserve-implicit-heat-frames

Add implicitHeatFrames property to autoReserveTrigger

Author: osse101

logicalRequirements.md

@@ -197,10 +197,11 @@ __Example:__
 
 #### autoReserveTrigger object
 
-An `autoReserveTrigger` object represents a logical requirement for "auto" reserves to be triggered, which results in Samus' energy becoming equal to the amount of energy in reserves (capped to energy capacity), and reserve energy becoming zero. If the `autoReserveTrigger` takes place in a heated room, there is an implicit `heatFrames` requirement with the number of frames being equal to the amount of health recovered by the Reserve refill.  An `autoReserveTrigger` object has two optional properties:
+An `autoReserveTrigger` object represents a logical requirement for "auto" reserves to be triggered, which results in Samus' energy becoming equal to the amount of energy in reserves (capped to energy capacity), and reserve energy becoming zero. An `autoReserveTrigger` object has three optional properties:
 
 * _minReserveEnergy_: The minimum amount of energy in reserves which will satisfy this requirement (default: 1).
 * _maxReserveEnergy_: The maximum amount of energy in reserves which will satisfy this requirement (default: 400).
+* _implicitHeatFrames_: This takes one of three possible values, "yes", "no", or "suitless". The default is "yes", which applies `heatFrames` equal to the amount of reserve transferred if the room is heated. This application is prevented by the value "no", while the value "suitless" applies `suitlessHeatFrames` instead.
 
 __Example:__
 ```json

schema/m3-requirements.schema.json

@@ -420,6 +420,16 @@
                 "type": "integer",
                 "description": "Maximum energy in reserves which will satisfy this requirement",
                 "default": 400
+              },
+              "implicitHeatFrames": {
+                "type": "string",
+                "description": "Controls whether or not to apply implicit heatFrames in a heated room.",
+                "default": "yes",
+                "enum": [
+                  "yes",
+                  "no",
+                  "suitless"
+                ]
               }
             }
           },

tech.json

@@ -2896,6 +2896,20 @@
             "If used while inside an enemy projectile or thorns, i-frames will be restarted but no damage will be taken."
           ]
         },
+        {
+          "name": "canReserverTriggerBufferXRay",
+          "techRequires": [],
+          "otherRequires": [
+            "XRayScope",
+            {"noFlashSuit": {}}
+          ],
+          "note": [
+            "Starting an automatic reserve transfer while having X-Ray already selected allows the player to buffer",
+            "the dash button to instantly start X-Ray Scope and pause time as soon as the reserve transfer finishes.",
+            "One side effect of this is that the normal application of heat damage accumulated during a reserve trigger",
+            "is prevented."
+          ]
+        },
         {
           "id": 153,
           "name": "canXRayTurnaround",