Springwall Leniency helpers and xray firefleas spike damage

Author: osse101

helpers.json

@@ -365,6 +365,26 @@
               ]}
             ]}
           ]
+        },
+        {
+          "name": "h_SpringwallOverSpikes",
+          "requires": [
+            "canSpringwall",
+            {"or":[
+              "canTrickyJump",
+              {"spikeHits": 2}
+            ]}
+          ]
+        },
+        {
+          "name": "h_HeatedSpringwall",
+          "requires": [
+            "canSpringwall",
+            {"or":[
+              "canTrickyJump",
+              {"heatFrames": 500}
+            ]}
+          ]
         }
       ]
     },

region/brinstar/red/Red Brinstar Fireflea Room.json

@@ -794,7 +794,7 @@
       "link": [3, 4],
       "name": "Base",
       "requires": [
-        {"spikeHits": 4}
+        {"spikeHits": 5}
       ]
     },
     {
@@ -804,7 +804,21 @@
         "canIframeSpikeJump",
         {"or": [
           {"and": [
-            "canTrickyJump",
+            "canInsaneJump",
+            {"spikeHits": 2}
+          ]},
+          {"spikeHits": 3}
+        ]}
+      ]
+    },
+    {
+      "link": [3, 4],
+      "name": "Spike Damage Boost",
+      "requires": [
+        "canHorizontalDamageBoost",
+        {"or": [
+          {"and": [
+            "canInsaneJump",
             {"spikeHits": 2}
           ]},
           {"spikeHits": 3}
@@ -832,8 +846,11 @@
       "link": [4, 1],
       "name": "X-Ray Access Springwall",
       "requires": [
-        "canSpringwall",
-        {"spikeHits": 1}
+        "h_SpringwallOverSpikes",
+        {"or": [
+          {"spikeHits": 1},
+          "canInsaneJump"
+        ]}
       ]
     },
     {
@@ -856,8 +873,18 @@
         "HiJump",
         "SpeedBooster",
         {"or": [
-          "canTrickyJump",
-          "canWalljump"
+          {"and": [
+            "canWalljump",
+            {"or": [
+              "canTrickyJump",
+              {"spikeHits": 1}
+            ]}
+          ]},
+          {"and": [
+            "canTrickyDashJump",
+            "h_canBackIntoCorner",
+            "canInsaneJump"
+          ]}
         ]}
       ]
     },
@@ -891,6 +918,7 @@
           ]},
           {"and": [
             {"spikeHits": 1},
+            "canHorizontalDamageBoost",
             "canPreciseWalljump",
             "canIframeSpikeJump"
           ]}

region/lowernorfair/east/The Worst Room In The Game.json

@@ -1211,7 +1211,7 @@
       "name": "Writg Springwall",
       "requires": [
         "h_canNavigateHeatRooms",
-        "canSpringwall",
+        "h_HeatedSpringwall",
         "canConsecutiveWalljump",
         {"heatFrames": 300},
         {"or": [

region/lowernorfair/west/Golden Torizo's Room.json

@@ -1100,8 +1100,7 @@
       "requires": [
         "h_canNavigateHeatRooms",
         "h_canUseMorphBombs",
-        "canSpringwall",
-        "canTrickySpringBallJump",
+        "h_HeatedSpringwall",
         {"heatFrames": 900}
       ],
       "note": [

region/lowernorfair/west/Screw Attack Room.json

@@ -638,8 +638,7 @@
       "requires": [
         "h_canNavigateHeatRooms",
         "h_canUseMorphBombs",
-        "canSpringwall",
-        "canTrickySpringBallJump",
+        "h_HeatedSpringwall",
         {"heatFrames": 300}
       ],
       "clearsObstacles": ["A"],
@@ -1061,8 +1060,8 @@
       "name": "Springwall",
       "requires": [
         "h_canNavigateHeatRooms",
-        "canSpringwall",
-        {"heatFrames": 400}
+        "h_HeatedSpringwall",
+        {"heatFrames": 245}
       ]
     },
     {

region/maridia/inner-pink/Draygon's Room.json

@@ -705,7 +705,6 @@
       "requires": [
         "Gravity",
         "canSpringwall",
-        "canTrickySpringBallJump",
         {"resetRoom": {
           "nodes": [1]
         }}

region/norfair/east/Lava Dive Room.json

@@ -580,7 +580,6 @@
           "canSuitlessLavaDive"
         ]},
         "canSpringwall",
-        "canTrickySpringBallJump",
         "HiJump",
         "canUseEnemies",
         {"heatFrames": 195},

tech.json

@@ -716,6 +716,18 @@
                 "Maximum height jumps primarily have underwater applications, as it enables Samus to barely make it up 7 tiles vertically."
               ],
               "extensionTechs": [
+                {
+                  "name": "canSpringwall",
+                  "techRequires": [
+                    "canTrickySpringBallJump",
+                    "canWallJumpInstantMorph"
+                  ],
+                  "otherRequires": [],
+                  "note": [
+                    "A mid-air Spring Ball jump that starts with a wall jump to gain more height.",
+                    "It often benefits from the momentum change when equipping Spring Ball while morphed and moving horizontally after a WallJump."
+                  ]
+                },
                 {
                   "name": "canDoubleSpringBallJumpMidAir",
                   "techRequires": ["canTrickySpringBallJump"],
@@ -741,33 +753,21 @@
                   "devNote": "Similar to an underwater walljump into springballjump, but that has no applications yet since double springballjump is easier for similar requirements."
                 }
               ]
-            },
-            {
-              "name": "canSpringwall",
-              "techRequires": [
-                "canSpringBallJumpMidAir",
-                "canWallJumpInstantMorph"
-              ],
-              "otherRequires": [],
-              "note": [
-                "A mid-air Spring Ball jump that starts with a wall jump to gain more height.",
-                "It often benefits from the momentum change when equipping Spring Ball while morphed and moving horizontally after a WallJump."
-              ]
-            },
-          {
-            "name": "canSpringFling",
-            "techRequires": ["canDisableEquipment"],
-            "otherRequires": [
-              "Morph",
-              "SpringBall"
-            ],
-            "note": [
-              "The ability to gain extra distance meerly by turning Springball on or off.",
-              "When equipping or unequipping Springball while Morphed, Samus' speed is reset.",
-              "If rising (and not in liquid physics), the horizontal speed is set to full roll speed.",
-              "If falling, the vertical speed is set to zero and horizontal speed is reset unless SpeedBooster is equipped."
-            ]
-          }
+            }
+          ]
+        },
+        {
+          "name": "canSpringFling",
+          "techRequires": ["canDisableEquipment"],
+          "otherRequires": [
+            "Morph",
+            "SpringBall"
+          ],
+          "note": [
+            "The ability to gain extra distance merely by turning Springball on or off.",
+            "When equipping or unequipping Springball while Morphed, Samus' speed is reset.",
+            "If rising (and not in liquid physics), the horizontal speed is set to full roll speed.",
+            "If falling, the vertical speed is set to zero and horizontal speed is reset unless SpeedBooster is equipped."
           ]
         },
         {