Merge pull request #2678 from blkerby/more-lenience

Migrate more lenience to numerics

Author: osse101

helpers.json

@@ -385,34 +385,37 @@
           "name": "h_blueGateGlitchLeniency",
           "requires": [
             {"or": [
-              {"ammo": {"type": "Missile", "count": 1}},
-              {"ammo": {"type": "Super", "count": 1}}
+              {"ammo": {"type": "Missile", "count": "n_gateGlitchLenience"}},
+              {"ammo": {"type": "Super", "count": "n_gateGlitchLenience"}}
             ]}
           ],
-          "devNote": "Ammo for a second shot for leniency."
+          "devNote": [
+            "Ammo for a extra shots for leniency.",
+            "FIXME: A mixture of Missiles and Supers could be used for leniency."
+          ]
         },
         {
           "name": "h_greenGateGlitchLeniency",
           "requires": [
-            {"ammo": {"type": "Super", "count": 1}}
+            {"ammo": {"type": "Super", "count": "n_gateGlitchLenience"}}
           ],
-          "devNote": "Ammo for a second shot for leniency."
+          "devNote": "Ammo for extra shots for leniency."
         },
         {
           "name": "h_heatedBlueGateGlitchLeniency",
           "requires": [
             "h_blueGateGlitchLeniency",
-            {"heatFrames": 60}
+            {"heatFrames": {"mul": [60, "n_gateGlitchLenience"]}}
           ],
-          "devNote": "One ammo and 60 heatFrames for a second shot for leniency."
+          "devNote": "This includes 60 heatFrames per leniency attempt."
         },
         {
           "name": "h_heatedGreenGateGlitchLeniency",
           "requires": [
             "h_greenGateGlitchLeniency",
-            {"heatFrames": 60}
+            {"heatFrames": {"mul": [60, "n_gateGlitchLenience"]}}
           ],
-          "devNote": "One ammo and 60 heatFrames for a second shot for leniency."
+          "devNote": "This includes 60 heatFrames per leniency attempt."
         },
         {
           "name": "h_openZebetitesLeniency",
@@ -424,34 +427,6 @@
             ]}
           ]
         },
-        {
-          "name": "h_bombIntoCrystalFlashClipLeniency",
-          "requires": [
-            {"ammo": {"type": "PowerBomb", "count": 5}}
-          ],
-          "devNote": "1 Power bomb leniency per attempt, 5 leniency attempts."
-        },
-        {
-          "name": "h_jumpIntoCrystalFlashClipLeniency",
-          "requires": [
-            {"ammo": {"type": "PowerBomb", "count": 9}}
-          ],
-          "devNote": "1 Power bomb leniency per attempt, 9 leniency attempts."
-        },
-        {
-          "name": "h_CrystalSparkLeniency",
-          "requires": [
-            {"ammo": {"type": "PowerBomb", "count": 8}}
-          ],
-          "devNote": "1 Power Bomb leniency per attempt, 8 leniency attempts."
-        },
-        {
-          "name": "h_ElevatorCrystalFlashLeniency",
-          "requires": [
-            {"ammo": {"type": "PowerBomb", "count": 8}}
-          ],
-          "devNote": "1 Power Bomb leniency per attempt, 8 leniency attempts."
-        },
         {
           "name": "h_extendedMoondanceBeetomLeniency",
           "requires": [
@@ -877,7 +852,7 @@
             {"tech": "canBombIntoCrystalFlashClip"},
             "Bombs",
             "h_artificialMorphCrystalFlash",
-            "h_bombIntoCrystalFlashClipLeniency"
+            {"ammo": {"type": "PowerBomb", "count": "n_bombIntoCrystalFlashLenience"}}
           ]
         },
         {
@@ -1422,7 +1397,7 @@
             {"tech": "canBombIntoCrystalFlashClip"},
             "Bombs",
             "h_CrystalFlash",
-            "h_bombIntoCrystalFlashClipLeniency"
+            {"ammo": {"type": "PowerBomb", "count": "n_bombIntoCrystalFlashLenience"}}
           ]
         },
         {
@@ -1449,7 +1424,7 @@
               "canMidAirMorph"
             ]},
             "h_CrystalFlash",
-            "h_jumpIntoCrystalFlashClipLeniency"
+            {"ammo": {"type": "PowerBomb", "count": "n_jumpIntoCrystalFlashLenience"}}
           ]
         },
         {
@@ -1465,7 +1440,7 @@
             {"tech": "canCrystalSpark"},
             "canMidAirMorph",
             "h_CrystalFlash",
-            "h_CrystalSparkLeniency",
+            {"ammo": {"type": "PowerBomb", "count": "n_CrystalSparkLenience"}},
             {"gainBlueSuit": {}}
           ]
         },
@@ -1484,7 +1459,7 @@
             {"tech": "canUnderwaterCrystalSpark"},
             "canMidAirMorph",
             "h_CrystalFlash",
-            "h_CrystalSparkLeniency",
+            {"ammo": {"type": "PowerBomb", "count": "n_CrystalSparkLenience"}},
             {"gainBlueSuit": {}}
           ]
         },
@@ -1508,7 +1483,7 @@
           "name": "h_elevatorCrystalFlash",
           "requires": [
             "canElevatorCrystalFlash",
-            "h_ElevatorCrystalFlashLeniency",
+            {"ammo": {"type": "PowerBomb", "count": "n_elevatorCrystalFlashLenience"}},
             "h_usePowerBomb",
             {"resourceAtMost": [
               {"type": "RegularEnergy", "count": 50},

numerics.json

@@ -5,6 +5,13 @@
       "name": "Base Parameters",
       "description": "Parameters that may commonly be changed, e.g. based on a randomizer implementation or settings.",
       "numerics": [
+        {
+          "name": "n_gateGlitchLenience",
+          "minimum": 0,
+          "value": 14,
+          "note": "Number of failed attempts expected before a successful gate glitch attempt.",
+          "devNote": "This applies to all types of gate glitches, green and blue, underwater and not."
+        },
         {
           "name": "n_speedKeepLenience",
           "value": 5,
@@ -27,6 +34,30 @@
           "minimum": 0,
           "note": "Number of failed attempts expected before a successful spike suit attempt.",
           "devNote": "This applies to spike suits with any applicable damage source, include spikes and thorns."
+        },
+        {
+          "name": "n_bombIntoCrystalFlashLenience",
+          "minimum": 0,
+          "value": 5,
+          "note": "Number of failed attempts expected before a successful bomb into Crystal Flash attempt."
+        },
+        {
+          "name": "n_jumpIntoCrystalFlashLenience",
+          "minimum": 0,
+          "value": 9,
+          "note": "Number of failed attempts expected before a successful jump mid-air morph into Crystal Flash attempt."
+        },
+        {
+          "name": "n_CrystalSparkLenience",
+          "minimum": 0,
+          "value": 8,
+          "note": "Number of failed attempts expected before a successful Crystal Spark attempt."
+        },
+        {
+          "name": "n_elevatorCrystalFlashLenience",
+          "minimum": 0,
+          "value": 8,
+          "note": "Number of failed attempts expected before a successful elevator Crystal Flash attempt."
         }
       ]
     },

schema/m3-numeric-parameters.schema.json

@@ -4,9 +4,14 @@
   "$id": "https://raw.githubusercontent.com/vg-json-data/sm-json-data/master/schema/m3-numeric-parameters.schema.json",
   "type": "string",
   "enum": [
+    "n_gateGlitchLenience",
     "n_speedKeepLenience",
     "n_spikeXModeLenience",
     "n_spikeSuitLenience",
+    "n_bombIntoCrystalFlashLenience",
+    "n_jumpIntoCrystalFlashLenience",
+    "n_CrystalSparkLenience",
+    "n_elevatorCrystalFlashLenience",
     "n_speedKeepAttempts",
     "n_spikeXModeAttempts",
     "n_thornXModeLenience",

schema/m3-string-requirements.schema.json

@@ -339,10 +339,6 @@
     "h_heatedBlueGateGlitchLeniency",
     "h_heatedGreenGateGlitchLeniency",
     "h_openZebetitesLeniency",
-    "h_bombIntoCrystalFlashClipLeniency",
-    "h_jumpIntoCrystalFlashClipLeniency",
-    "h_CrystalSparkLeniency",
-    "h_ElevatorCrystalFlashLeniency",
     "h_extendedMoondanceBeetomLeniency",
     "h_IBJFromThorns",
     "h_IBJFromSpikes",