Merge pull request #74667 from CleverRaven/fix-recovery-chance

Rescale recovery chance to match previous probabilities
CleverRaven · Jun 22, 2024 · 09cce88 · 09cce88
2 parents b7a356d + 8b72598
commit 09cce88
Show file tree

Hide file tree

Showing 14 changed files with 59 additions and 59 deletions.
diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json
@@ -539,7 +539,7 @@
     "dispersion": 14,
     "loudness": 0,
     "to_hit": -2,
-    "recovery_chance": 80,
+    "recovery_chance": 99,
     "effects": [ "NEVER_MISFIRES", "NON_FOULING" ],
     "melee_damage": { "cut": 9 }
   },
@@ -561,7 +561,7 @@
     "dispersion": 14,
     "loudness": 0,
     "to_hit": -1,
-    "recovery_chance": 80,
+    "recovery_chance": 99,
     "effects": [ "NEVER_MISFIRES", "NON_FOULING", "ALLOWS_BODY_BLOCK" ],
     "qualities": [ [ "HAMMER", 1 ] ],
     "melee_damage": { "bash": 7 }

diff --git a/data/json/items/generic/toys_and_sports.json b/data/json/items/generic/toys_and_sports.json
@@ -122,7 +122,7 @@
     "dispersion": 14,
     "loudness": 0,
     "to_hit": -3,
-    "recovery_chance": 60,
+    "recovery_chance": 98,
     "effects": [ "NEVER_MISFIRES", "NON_FOULING" ],
     "melee_damage": { "bash": 8 }
   },
@@ -164,7 +164,7 @@
     "dispersion": 12,
     "loudness": 0,
     "to_hit": 3,
-    "recovery_chance": 80,
+    "recovery_chance": 99,
     "effects": [ "NEVER_MISFIRES", "NON_FOULING" ],
     "melee_damage": { "bash": 6 }
   },

diff --git a/data/json/items/ranged/archery.json b/data/json/items/ranged/archery.json
@@ -12,7 +12,7 @@
     "description": "A crude pointed wooden shaft with a notch at the back.",
     "material": [ "wood" ],
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 0.75 },
-    "recovery_chance": 2
+    "recovery_chance": 50
   },
   {
     "type": "AMMO",
@@ -33,7 +33,7 @@
     "dispersion": 150,
     "loudness": 0,
     "critical_multiplier": 10,
-    "recovery_chance": 30,
+    "recovery_chance": 97,
     "melee_damage": { "bash": 3 }
   },
   {
@@ -50,7 +50,7 @@
     "material": [ { "type": "wood", "portion": 81 }, { "type": "rubber", "portion": 19 } ],
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 0.2 },
     "critical_multiplier": 1,
-    "recovery_chance": 35,
+    "recovery_chance": 97,
     "effects": [ "BEANBAG" ]
   },
   {
@@ -64,7 +64,7 @@
     "copy-from": "arrow_field_point_fletched",
     "price_postapoc": "15 cent",
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 0.5 },
-    "recovery_chance": 10,
+    "recovery_chance": 90,
     "effects": [ "NOGIB" ]
   },
   {
@@ -78,7 +78,7 @@
     "relative": { "dispersion": -40 },
     "price": "20 USD",
     "damage": { "damage_type": "stab", "armor_penetration": 1, "constant_damage_multiplier": 1.5 },
-    "recovery_chance": 25,
+    "recovery_chance": 96,
     "melee_damage": { "bash": 2, "cut": 1 }
   },
   {
@@ -92,7 +92,7 @@
     "material": [ "wood" ],
     "copy-from": "arrow_field_point_fletched",
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 0.75 },
-    "recovery_chance": 6
+    "recovery_chance": 83
   },
   {
     "type": "AMMO",
@@ -105,7 +105,7 @@
     "copy-from": "arrow_field_point_fletched",
     "price_postapoc": "25 cent",
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 0.5 },
-    "recovery_chance": 35,
+    "recovery_chance": 97,
     "effects": [ "NOGIB" ]
   },
   {
@@ -121,7 +121,7 @@
     "price_postapoc": "15 cent",
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 1.25 },
     "show_stats": true,
-    "recovery_chance": 8
+    "recovery_chance": 87
   },
   {
     "type": "AMMO",
@@ -135,7 +135,7 @@
     "price_postapoc": "20 cent",
     "damage": { "damage_type": "stab", "armor_penetration": 1 },
     "show_stats": true,
-    "recovery_chance": 20,
+    "recovery_chance": 95,
     "melee_damage": { "bash": 2 }
   },
   {
@@ -151,7 +151,7 @@
     "price_postapoc": "40 cent",
     "damage": { "damage_type": "stab", "armor_penetration": 1, "constant_damage_multiplier": 1.5 },
     "range": 2,
-    "recovery_chance": 35,
+    "recovery_chance": 97,
     "melee_damage": { "bash": 3, "cut": 2 }
   },
   {
@@ -167,7 +167,7 @@
     "price_postapoc": "40 cent",
     "damage": { "damage_type": "stab", "armor_penetration": 3 },
     "range": 2,
-    "recovery_chance": 40,
+    "recovery_chance": 97,
     "melee_damage": { "bash": 3, "cut": 2 }
   },
   {
@@ -184,7 +184,7 @@
     "relative": { "dispersion": -75 },
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 0.5 },
     "range": 2,
-    "recovery_chance": 45,
+    "recovery_chance": 98,
     "effects": [ "NOGIB" ]
   },
   {
@@ -201,7 +201,7 @@
     "price_postapoc": "50 cent",
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 1.75 },
     "range": 4,
-    "recovery_chance": 30,
+    "recovery_chance": 97,
     "melee_damage": { "bash": 1 }
   },
   {
@@ -249,7 +249,7 @@
     "count": 1,
     "stack_size": 1,
     "critical_multiplier": 10,
-    "recovery_chance": 35,
+    "recovery_chance": 97,
     "use_action": {
       "target": "arrow_flamming",
       "target_timer": "20 seconds",
@@ -270,7 +270,7 @@
     "symbol": "=",
     "color": "brown",
     "revert_to": "arrow_field_point_fletched",
-    "recovery_chance": 35,
+    "recovery_chance": 97,
     "effects": [ "IGNITE" ],
     "flags": [ "TRADER_AVOID" ]
   },

diff --git a/data/json/items/ranged/atlatl.json b/data/json/items/ranged/atlatl.json
@@ -53,7 +53,7 @@
     "dispersion": 35,
     "loudness": 0,
     "critical_multiplier": 15,
-    "recovery_chance": 30,
+    "recovery_chance": 97,
     "melee_damage": { "stab": 10 }
   },
   {
@@ -74,7 +74,7 @@
     "dispersion": 35,
     "loudness": 0,
     "critical_multiplier": 15,
-    "recovery_chance": 25,
+    "recovery_chance": 96,
     "melee_damage": { "stab": 8 }
   },
   {
@@ -95,7 +95,7 @@
     "dispersion": 50,
     "loudness": 0,
     "critical_multiplier": 8,
-    "recovery_chance": 6,
+    "recovery_chance": 83,
     "melee_damage": { "stab": 5 }
   }
 ]
diff --git a/data/json/items/ranged/ballista.json b/data/json/items/ranged/ballista.json
@@ -48,7 +48,7 @@
     "dispersion": 35,
     "loudness": 5,
     "critical_multiplier": 2,
-    "recovery_chance": 50,
+    "recovery_chance": 98,
     "melee_damage": { "stab": 12 }
   }
 ]
diff --git a/data/json/items/ranged/crossbows.json b/data/json/items/ranged/crossbows.json
@@ -11,7 +11,7 @@
     "price": "0 cent",
     "price_postapoc": "20 cent",
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 0.75 },
-    "recovery_chance": 2
+    "recovery_chance": 50
   },
   {
     "type": "AMMO",
@@ -26,7 +26,7 @@
     "price": "5 USD",
     "price_postapoc": "25 cent",
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 0.75 },
-    "recovery_chance": 6
+    "recovery_chance": 83
   },
   {
     "type": "AMMO",
@@ -41,7 +41,7 @@
     "price": "6 USD 50 cent",
     "price_postapoc": "25 cent",
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 0.5 },
-    "recovery_chance": 10,
+    "recovery_chance": 90,
     "effects": [ "NOGIB" ]
   },
   {
@@ -58,7 +58,7 @@
     "price_postapoc": "30 cent",
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 1.25 },
     "show_stats": true,
-    "recovery_chance": 8
+    "recovery_chance": 87
   },
   {
     "type": "AMMO",
@@ -70,7 +70,7 @@
     "copy-from": "bolt_wood_bodkin",
     "relative": { "dispersion": 10 },
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 1.5, "armor_penetration": 1 },
-    "recovery_chance": 25
+    "recovery_chance": 96
   },
   {
     "type": "AMMO",
@@ -90,7 +90,7 @@
     "dispersion": 100,
     "loudness": 0,
     "critical_multiplier": 10,
-    "recovery_chance": 30,
+    "recovery_chance": 97,
     "melee_damage": { "bash": 3 }
   },
   {
@@ -103,7 +103,7 @@
     "copy-from": "bolt_wood_bodkin",
     "relative": { "dispersion": 30 },
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 0.5 },
-    "recovery_chance": 35,
+    "recovery_chance": 97,
     "effects": [ "NOGIB" ]
   },
   {
@@ -117,7 +117,7 @@
     "relative": { "dispersion": 80 },
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 1.25, "armor_penetration": 1 },
     "show_stats": true,
-    "recovery_chance": 20
+    "recovery_chance": 95
   },
   {
     "type": "AMMO",
@@ -133,7 +133,7 @@
     "price_postapoc": "50 cent",
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 1.5, "armor_penetration": 2 },
     "range": 2,
-    "recovery_chance": 35
+    "recovery_chance": 97
   },
   {
     "type": "AMMO",
@@ -149,7 +149,7 @@
     "price_postapoc": "50 cent",
     "damage": { "damage_type": "stab", "armor_penetration": 4 },
     "range": 2,
-    "recovery_chance": 40
+    "recovery_chance": 97
   },
   {
     "type": "AMMO",
@@ -163,7 +163,7 @@
     "relative": { "dispersion": -30 },
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 0.5 },
     "range": 2,
-    "recovery_chance": 45,
+    "recovery_chance": 98,
     "effects": [ "NOGIB" ]
   },
   {
@@ -180,7 +180,7 @@
     "price_postapoc": "60 cent",
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 1.75 },
     "range": 4,
-    "recovery_chance": 30
+    "recovery_chance": 97
   },
   {
     "id": "bullet_crossbow",

diff --git a/data/json/items/ranged/spearguns.json b/data/json/items/ranged/spearguns.json
@@ -19,7 +19,7 @@
     "dispersion": 150,
     "loudness": 0,
     "count": 4,
-    "recovery_chance": 5,
+    "recovery_chance": 80,
     "melee_damage": { "bash": 1 }
   },
   {
@@ -42,7 +42,7 @@
     "dispersion": 90,
     "loudness": 0,
     "count": 4,
-    "recovery_chance": 3,
+    "recovery_chance": 66,
     "melee_damage": { "bash": 1 }
   },
   {
@@ -65,7 +65,7 @@
     "dispersion": 120,
     "loudness": 0,
     "count": 4,
-    "recovery_chance": 15,
+    "recovery_chance": 93,
     "melee_damage": { "bash": 1 }
   },
   {

diff --git a/data/json/items/resources/stone.json b/data/json/items/resources/stone.json
@@ -18,7 +18,7 @@
     "dispersion": 14,
     "loudness": 0,
     "to_hit": -1,
-    "recovery_chance": 60,
+    "recovery_chance": 98,
     "effects": [ "NEVER_MISFIRES", "NON_FOULING" ],
     "melee_damage": { "bash": 7 }
   },