Merge branch 'vg-json-data:master' into rsi-ln-wasteland

Author: aquanight

helpers.json

@@ -1050,6 +1050,25 @@
             {"gainBlueSuit": {}}
           ]
         },
+        {
+          "name": "h_underwaterCrystalSpark",
+          "requires": [
+            {"tech": "canUnderwaterCrystalSpark"},
+            "canMidAirMorph",
+            "h_CrystalFlash",
+            "h_CrystalSparkLeniency",
+            {"gainBlueSuit": {}}
+          ]
+        },
+        {
+          "name": "h_underwaterCrystalSparkWithoutLenience",
+          "requires": [
+            {"tech": "canUnderwaterCrystalSpark"},
+            "canMidAirMorph",
+            "h_CrystalFlash",
+            {"gainBlueSuit": {}}
+          ]
+        },
         {
           "name": "h_heatedCrystalSpark",
           "requires": [
@@ -1430,6 +1449,18 @@
               {"blueSuitShinecharge": {}}
             ]}
           ]
+        },
+        {
+          "name": "h_stationaryNeutralDamageBoost",
+          "requires": [
+            {"tech": "canNeutralDamageBoost"}
+          ],
+          "note": [
+            "This is for neutral damage boosts that are compatible with carrying a blue suit,",
+            "because of not needing to be moving when hit.",
+            "Note that even if pressing against a wall, holding a direction input can cause a blue suit to kill the enemy before the boost would occur;",
+            "therefore, if carrying a blue suit, no direction inputs should be pressed until after taking the hit."
+          ]
         }
       ]
     },
@@ -1605,6 +1636,32 @@
             "h_bombIntoCrystalFlashClipLeniency"
           ]
         },
+        {
+          "name": "h_artificialMorphRModeCrystalFlashInterrupt",
+          "requires": [
+            {"tech": "canRModeCrystalFlashInterrupt"},
+            {"resourceAtMost": [{"type": "RegularEnergy", "count": 50}]},
+            {"resourceAtMost": [{"type": "ReserveEnergy", "count": 0}]},
+            {"or": [
+              {"disableEquipment": "ETank"},
+              {"resourceMaxCapacity": [{"type": "RegularEnergy", "count": 99}]}
+            ]},
+            "h_artificialMorphPowerBomb",
+            {"resourceAvailable": [{"type": "Missile", "count": 10}]},
+            {"resourceAvailable": [{"type": "Super", "count": 10}]},
+            {"resourceAvailable": [{"type": "PowerBomb", "count": 10}]},
+            {"disableEquipment": "Varia"},
+            {"disableEquipment": "Gravity"},
+            {"gainFlashSuit": {}}
+          ]
+        },
+        {
+          "name": "h_artificialMorphTrickyRModeCrystalFlashInterrupt",
+          "requires": [
+            {"tech": "canTrickyRModeCrystalFlashInterrupt"},
+            "h_artificialMorphRModeCrystalFlashInterrupt"
+          ]
+        },
         {
           "name": "h_artificialMorphMovement",
           "requires": [
@@ -1623,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": [
@@ -1638,6 +1722,67 @@
             ]}
           ]
         },
+        {
+          "name": "h_CrystalFlashForReserveEnergy",
+          "requires": [
+            "canCrystalFlash",
+            {"or": [
+              {"and": [
+                {"or": [
+                  {"disableEquipment": "ETank"},
+                  {"resourceMaxCapacity": [{"type": "RegularEnergy", "count": 1099}]}
+                ]},
+                {"partialRefill": {"type": "RegularEnergy", "limit": 1099}},
+                {"refill": ["ReserveEnergy"]}
+              ]},
+              {"and": [
+                {"refill": ["RegularEnergy"]},
+                {"partialRefill": {"type": "ReserveEnergy", "limit": 51}}
+              ]}
+            ]},
+            {"resourceAvailable": [{"type": "ReserveEnergy", "count": 1}]}
+          ],
+          "note": [
+            "This helper represents using a Crystal Flash with the specific goal of getting reserves, which is",
+            "particularly important in R-Mode due to needing reserves for R-Mode standup.",
+            "If Energy Tanks can be disabled, regular energy will be capped at 10 E-Tanks to provide up to 400 Reserves.",
+            "Without this, reserve energy will be capped at 51: the maximum possible when the player has all 14 E-Tanks."
+          ]
+        },
+        {
+          "name": "h_heatedCrystalFlashForReserveEnergy",
+          "requires": [
+            {"or": [
+              {"and": [
+                "h_heatProof",
+                "h_CrystalFlashForReserveEnergy"
+              ]},
+              {"and": [
+                {"simpleHeatFrames": 185},
+                "canHeatedCrystalFlash",
+                {"and": [
+                  {"or": [
+                    {"disableEquipment": "ETank"},
+                    {"resourceMaxCapacity": [{"type": "RegularEnergy", "count": 999}]}
+                  ]},
+                  {"partialRefill": {"type": "RegularEnergy", "limit": 999}},
+                  {"refill": ["ReserveEnergy"]}
+                ]},
+                {"simpleHeatFrames": 20}
+              ]}
+            ]},
+            {"resourceAvailable": [{"type": "ReserveEnergy", "count": 1}]}
+          ],
+          "note": [
+            "This helper represents using a Crystal Flash in heat with the specific goal of getting reserves, which is",
+            "particularly important in R-Mode due to needing reserves for R-Mode standup.",
+            "In unprotected heat, at 14 E-Tanks, a Crystal Flash would normally fail to reach the energy maximum and",
+            "provide reserves.",
+            "If Energy Tanks can be disabled, regular energy will be capped at 9 E-Tanks (10 if heat protection is available)",
+            "to provide up to 400 Reserves. Without this, heat protection is mandatory, and Reserve energy will be capped at 51:",
+            "the maximum possible when the player has all 14 E-Tanks."
+          ]
+        },
         {
           "name": "h_RModeKnockbackSpark",
           "requires": [
@@ -1713,17 +1858,15 @@
           "requires":[
             "canDoubleXModeBlueSuit",
             "h_spikeXModeShinecharge",
-            "h_spikeXModeBlueSuit",
-            {"shinespark": {"frames": 4, "excessFrames": 4}}
+            "h_spikeXModeBlueSuit"
           ]
         },
         {
           "name": "h_thornDoubleXModeBlueSuit",
           "requires":[
             "canDoubleXModeBlueSuit",
             "h_thornXModeShinecharge",
-            "h_thornXModeBlueSuit",
-            {"shinespark": {"frames": 4, "excessFrames": 4}}
+            "h_thornXModeBlueSuit"
           ]
         }
       ]

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
@@ -236,6 +237,10 @@ Much like the other logical elements that represent environmental frame damage,
 
 A `simpleHeatFrames` object represents the need for Samus to spend time (measured in frames) in a heated room. It is identical to `heatFrames` except that the time spent in `simpleHeatFrames` is intended to be invariant, not affected by leniency. This can be useful in cases that involve doing something simple for a significant amount of time, such as standing in place or running through a long hallway.
 
+#### suitlessHeatFrames object
+
+A `suitlessHeatFrames` object represents the need for Samus to spend time (measured in frames) in a heated room, while having heat-protection turned off (normally, both Varia and Gravity Suit must be turned off for this apply). This can occur, for example, when using heat to drain energy.
+
 #### heatFramesWithEnergyDrops object
 
 A `heatFramesWithEnergyDrops` object represents the need for Samus to spend time in a heated room, but with the possibility of offsetting some of the heat damage using energy drops from enemies. Any heat damage is logically applied before the energy gain, so Samus must be able to survive the heat before picking up the drops. Any energy gain is logically capped to not exceed the heat damage, so this logical requirement cannot result in a net energy gain. A `heatFramesWithEnergyDrops` object implicitly includes a requirement `{"or": ["h_heatProof", "canHeatRun"]}`.

region/brinstar/blue/Blue Brinstar Energy Tank Room.json

@@ -1423,7 +1423,7 @@
     {
       "id": 70,
       "link": [5, 2],
-      "name": "G-Mode Morph Shoot the Ceiling Block Item",
+      "name": "G-Mode Shoot the Ceiling Block Item",
       "requires": [
         "canGMode",
         "Morph",

region/brinstar/green/Etecoon Energy Tank Room.json

@@ -971,6 +971,36 @@
       ],
       "devNote": "Morph is required to lure a Beetom. Morphless tunnel crawl should not be required."
     },
+    {
+      "id": 101,
+      "link": [3, 2],
+      "name": "Come in Shinecharged - Gain Blue Suit (X-Mode Super Jump)",
+      "entranceCondition": {
+        "comeInShinecharged": {}
+      },
+      "requires": [
+        {"shineChargeFrames": 135},
+        "h_XModeThornHit",
+        "canSuperJump",
+        {"shinespark": {"frames": 7}},
+        "canXModeBlueSuit"
+      ],
+      "flashSuitChecked": true
+    },
+    {
+      "id": 102,
+      "link": [3, 2],
+      "name": "Gain Blue Suit (Double X-Mode Super Jump)",
+      "requires": [
+        "h_XModeThornHit",
+        "h_thornXModeShinecharge",
+        "h_XModeThornHit",
+        "canSuperJump",
+        {"shinespark": {"frames": 7}},
+        "canXModeBlueSuit"
+      ],
+      "flashSuitChecked": true
+    },
     {
       "id": 30,
       "link": [3, 2],
@@ -1032,6 +1062,38 @@
         "Freezing the lower one may be made easier or damageless by scrolling the camera when the Beetom is in the correct position and freezing it with a hero shot from the right."
       ]
     },
+    {
+      "id": 103,
+      "link": [3, 3],
+      "name": "Gain Flash Suit (X-Mode Spikesuit)",
+      "requires": [
+        "h_ThornXModeSpikeSuit",
+        {"shinespark": {"frames": 12, "excessFrames": 12}}
+      ],
+      "flashSuitChecked": true
+    },
+    {
+      "id": 104,
+      "link": [3, 3],
+      "name": "Come in Shinecharged - Gain Blue Suit (X-Mode)",
+      "entranceCondition": {
+        "comeInShinecharged": {}
+      },
+      "requires": [
+        {"shineChargeFrames": 135},
+        "h_thornXModeBlueSuit"
+      ],
+      "flashSuitChecked": true
+    },
+    {
+      "id": 105,
+      "link": [3, 3],
+      "name": "Gain Blue Suit (Double X-Mode)",
+      "requires": [
+        "h_thornDoubleXModeBlueSuit"
+      ],
+      "flashSuitChecked": true
+    },
     {
       "id": 90,
       "link": [3, 3],
@@ -1756,6 +1818,19 @@
         "a second thorn hit can be avoided."
       ]
     },
+    {
+      "id": 106,
+      "link": [4, 4],
+      "name": "Come in Shinecharged - Gain Blue Suit (X-Mode)",
+      "entranceCondition": {
+        "comeInShinecharged": {}
+      },
+      "requires": [
+        {"shineChargeFrames": 125},
+        "h_thornXModeBlueSuit"
+      ],
+      "flashSuitChecked": true
+    },
     {
       "id": 88,
       "link": [4, 5],
@@ -2262,7 +2337,7 @@
       ]
     }
   ],
-  "nextStratId": 101,
+  "nextStratId": 107,
   "nextNotableId": 8,
   "devNote": ["FIXME: add a strat to take temporary blue from the top to the bottom-right."]
 }

region/brinstar/green/Green Brinstar Fireflea Room.json

@@ -357,6 +357,7 @@
       ]
     },
     {
+      "id": 17,
       "link": [2, 2],
       "name": "Gain Blue Suit (X-Mode)",
       "requires": [
@@ -389,6 +390,6 @@
     }
   ],
   "notables": [],
-  "nextStratId": 17,
+  "nextStratId": 18,
   "nextNotableId": 1
 }

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

@@ -94,6 +94,7 @@
   ],
   "strats": [
     {
+      "id": 24,
       "link": [1, 1],
       "name": "R-Mode Spark Interrupt (Gain Blue Suit)",
       "entranceCondition": {
@@ -358,6 +359,7 @@
       "flashSuitChecked": true
     },
     {
+      "id": 25,
       "link": [2, 2],
       "name": "R-Mode Spark Interrupt (Gain Blue Suit)",
       "entranceCondition": {
@@ -582,6 +584,6 @@
       ]
     }
   ],
-  "nextStratId": 24,
+  "nextStratId": 26,
   "nextNotableId": 2
 }