feedback updates

Author: blkerby

logicalRequirements.md

@@ -242,6 +242,22 @@ __Example:__
 }}
 ```
 
+#### lavaFramesWithEnergyDrops object
+
+A `lavaFramesWithEnergyDrops` object represents the need for Samus to spend time in lava, but with the possibility of offsetting some of the lava damage using energy drops from enemies. Any lava 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.
+
+The actual amount of energy gained typically depends on RNG and also on which ammo types are completely full. The drop probabilities for each enemy type is given in the [enemies](enemies/main.json) file. Because of the randomness involved, the logical amount of energy gain is open to various interpretations. For example, the mean, the median, or a lower confidence limit could be used.
+
+__Example:__
+```json
+{"lavaFramesWithEnergyDrops": {
+  "frames": 200,
+  "drops": [
+    {"enemy": "Fune", "count": 1}
+  ]
+}}
+```
+
 #### gravitylessHeatFrames object
 A `gravitylessHeatFrames` object represents Samus in a heated environment with Gravity Suit turned off, even if it is available. The number of frames here needs to be represented as `heatFrames` without the reduction effects given by Gravity Suit.
 

region/norfair/east/Volcano Room.json

@@ -162,6 +162,10 @@
         {"types": ["missiles"], "requires": [{"lavaFrames": 80}]},
         {"types": ["super"], "requires": []},
         {"types": ["powerbomb"], "requires": [{"lavaFrames": 60}]}
+      ],
+      "devNote": [
+        "FIXME: A leaveWithRunway variation could be added, but it would require Speed Booster to be disabled,",
+        "which would need new schema support in order to properly match entrance conditions in the next room."
       ]
     },
     {
@@ -175,14 +179,20 @@
           {"and": [
             "canCarefulJump",
             "canMockball",
-            {"lavaFrames": 160}
+            {"lavaFrames": 155}
           ]},
           {"lavaFrames": 200}
         ]},
         {"or": [
           {"and": [
             "canSpaceJumpWaterBounce",
-            {"lavaFrames": 60}
+            {"or": [
+              {"and": [
+                "canPreciseSpaceJump",
+                {"lavaFrames": 35}
+              ]},
+              {"lavaFrames": 60}
+            ]}
           ]},
           {"lavaFrames": 150}
         ]}
@@ -196,6 +206,43 @@
         {"types": ["powerbomb"], "requires": [{"lavaFrames": 150}]}
       ]
     },
+    {
+      "link": [1, 2],
+      "name": "Farm Funes and Suitless Lava Dive",
+      "requires": [
+        "canSuitlessLavaDive",
+        "canFarmWhileShooting",
+        {"enemyKill": {"enemies": [["Fune", "Fune"]], "explicitWeapons": ["PowerBomb"]}},
+        "canMockball",
+        {"lavaFramesWithEnergyDrops": {
+          "frames": 120,
+          "drops": [{"enemy": "Fune", "count": 1}]
+        }},
+        {"lavaFrames": 35},
+        {"or": [
+          {"and": [
+            "canSpaceJumpWaterBounce",
+            {"or": [
+              {"and": [
+                "canPreciseSpaceJump",
+                {"lavaFrames": 35}
+              ]},
+              {"lavaFrames": 60}
+            ]}
+          ]},
+          {"lavaFrames": 150}
+        ]}
+      ],
+      "exitCondition": {
+        "leaveNormally": {}
+      },
+      "unlocksDoors": [
+        {"types": ["missiles"], "requires": [{"lavaFrames": 80}]},
+        {"types": ["super"], "requires": []},
+        {"types": ["powerbomb"], "requires": [{"lavaFrames": 150}]}
+      ],
+      "devNote": "FIXME: a Gravity version of this could be added."
+    },
     {
       "id": 5,
       "link": [2, 1],

schema/m3-requirements.schema.json

@@ -309,6 +309,37 @@
             "title": "Gravityless Lava Frames",
             "description": "Fulfilled by spending an amount of energy that corresponds to spending a number of frames in lava, with Gravity Suit turned off, even if available."
           },
+          "lavaFramesWithEnergyDrops": {
+            "type": "object",
+            "title": "Lava Frames With Energy Drops",
+            "description": "Fulfilled by spending an amount of energy that corresponds to spending a number of frames in a lava, with some or all damage offset by collecting energy drops.",
+            "additionalProperties": false,
+            "properties": {
+              "frames": {
+                "type": "integer",
+                "minimum": 1
+              },
+              "drops": {
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "additionalProperties": false,
+                  "properties": {
+                    "enemy": {
+                      "type": "string",
+                      "title": "Enemy Name",
+                      "description": "The name of an enemy that drops can be collected from, as found in the enemies file."
+                    },
+                    "count": {
+                      "type": "integer",
+                      "title": "Count",
+                      "description": "The number of drops that can be collected from this enemy by executing this strat."
+                    }
+                  }
+                }
+              }
+            }
+          },
           "samusEaterFrames": {
             "type": "integer",
             "minimum": 1,