Use ammo_effect_str_id instead of std::string (#73931)

* Use ammo_effect_str_id instead of std::string * replace RECOVER_ flag with a new field * Update json * Update doc * remove unused ammo_effect * update mods * fix ids for clang --------- Co-authored-by: Fris0uman <[email protected]>
CleverRaven · Jun 15, 2024 · 0c7dd6a · 0c7dd6a
1 parent fd7656a
commit 0c7dd6a
Show file tree

Hide file tree

Showing 40 changed files with 320 additions and 220 deletions.
diff --git a/data/json/ammo_effects.json b/data/json/ammo_effects.json
@@ -170,11 +170,6 @@
     "type": "ammo_effect",
     "//": "Applies sensor-stunning effect to robots. Hardcoded"
   },
-  {
-    "id": "RECOVER_X",
-    "type": "ammo_effect",
-    "//": " Has a [(X-1)/X] probability to create a single charge of the used ammo at the point of impact. Change the X with any number, like 'RECOVER_2' means [(2-1)/2]=50% chance. Hardcoded"
-  },
   {
     "id": "RECYCLED",
     "type": "ammo_effect",

diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json
@@ -539,7 +539,8 @@
     "dispersion": 14,
     "loudness": 0,
     "to_hit": -2,
-    "effects": [ "NEVER_MISFIRES", "NON_FOULING", "RECOVER_80" ],
+    "recovery_chance": 80,
+    "effects": [ "NEVER_MISFIRES", "NON_FOULING" ],
     "melee_damage": { "cut": 9 }
   },
   {
@@ -560,7 +561,8 @@
     "dispersion": 14,
     "loudness": 0,
     "to_hit": -1,
-    "effects": [ "NEVER_MISFIRES", "NON_FOULING", "RECOVER_80", "ALLOWS_BODY_BLOCK" ],
+    "recovery_chance": 80,
+    "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,8 @@
     "dispersion": 14,
     "loudness": 0,
     "to_hit": -3,
-    "effects": [ "NEVER_MISFIRES", "NON_FOULING", "RECOVER_60" ],
+    "recovery_chance": 60,
+    "effects": [ "NEVER_MISFIRES", "NON_FOULING" ],
     "melee_damage": { "bash": 8 }
   },
   {
@@ -163,7 +164,8 @@
     "dispersion": 12,
     "loudness": 0,
     "to_hit": 3,
-    "effects": [ "NEVER_MISFIRES", "NON_FOULING", "RECOVER_80" ],
+    "recovery_chance": 80,
+    "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 },
-    "effects": [ "RECOVER_2" ]
+    "recovery_chance": 2
   },
   {
     "type": "AMMO",
@@ -33,7 +33,7 @@
     "dispersion": 150,
     "loudness": 0,
     "critical_multiplier": 10,
-    "effects": [ "RECOVER_30" ],
+    "recovery_chance": 30,
     "melee_damage": { "bash": 3 }
   },
   {
@@ -50,7 +50,8 @@
     "material": [ { "type": "wood", "portion": 81 }, { "type": "rubber", "portion": 19 } ],
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 0.2 },
     "critical_multiplier": 1,
-    "effects": [ "RECOVER_35", "BEANBAG" ]
+    "recovery_chance": 35,
+    "effects": [ "BEANBAG" ]
   },
   {
     "type": "AMMO",
@@ -63,7 +64,8 @@
     "copy-from": "arrow_field_point_fletched",
     "price_postapoc": "15 cent",
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 0.5 },
-    "effects": [ "RECOVER_10", "NOGIB" ]
+    "recovery_chance": 10,
+    "effects": [ "NOGIB" ]
   },
   {
     "type": "AMMO",
@@ -76,7 +78,7 @@
     "relative": { "dispersion": -40 },
     "price": "20 USD",
     "damage": { "damage_type": "stab", "armor_penetration": 1, "constant_damage_multiplier": 1.5 },
-    "effects": [ "RECOVER_25" ],
+    "recovery_chance": 25,
     "melee_damage": { "bash": 2, "cut": 1 }
   },
   {
@@ -90,7 +92,7 @@
     "material": [ "wood" ],
     "copy-from": "arrow_field_point_fletched",
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 0.75 },
-    "effects": [ "RECOVER_6" ]
+    "recovery_chance": 6
   },
   {
     "type": "AMMO",
@@ -103,7 +105,8 @@
     "copy-from": "arrow_field_point_fletched",
     "price_postapoc": "25 cent",
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 0.5 },
-    "effects": [ "RECOVER_35", "NOGIB" ]
+    "recovery_chance": 35,
+    "effects": [ "NOGIB" ]
   },
   {
     "type": "AMMO",
@@ -118,7 +121,7 @@
     "price_postapoc": "15 cent",
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 1.25 },
     "show_stats": true,
-    "effects": [ "RECOVER_8" ]
+    "recovery_chance": 8
   },
   {
     "type": "AMMO",
@@ -132,7 +135,7 @@
     "price_postapoc": "20 cent",
     "damage": { "damage_type": "stab", "armor_penetration": 1 },
     "show_stats": true,
-    "effects": [ "RECOVER_20" ],
+    "recovery_chance": 20,
     "melee_damage": { "bash": 2 }
   },
   {
@@ -148,7 +151,7 @@
     "price_postapoc": "40 cent",
     "damage": { "damage_type": "stab", "armor_penetration": 1, "constant_damage_multiplier": 1.5 },
     "range": 2,
-    "effects": [ "RECOVER_35" ],
+    "recovery_chance": 35,
     "melee_damage": { "bash": 3, "cut": 2 }
   },
   {
@@ -164,7 +167,7 @@
     "price_postapoc": "40 cent",
     "damage": { "damage_type": "stab", "armor_penetration": 3 },
     "range": 2,
-    "effects": [ "RECOVER_40" ],
+    "recovery_chance": 40,
     "melee_damage": { "bash": 3, "cut": 2 }
   },
   {
@@ -181,7 +184,8 @@
     "relative": { "dispersion": -75 },
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 0.5 },
     "range": 2,
-    "effects": [ "RECOVER_45", "NOGIB" ]
+    "recovery_chance": 45,
+    "effects": [ "NOGIB" ]
   },
   {
     "type": "AMMO",
@@ -197,7 +201,7 @@
     "price_postapoc": "50 cent",
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 1.75 },
     "range": 4,
-    "effects": [ "RECOVER_30" ],
+    "recovery_chance": 30,
     "melee_damage": { "bash": 1 }
   },
   {
@@ -220,7 +224,7 @@
     "dispersion": 120,
     "loudness": 0,
     "critical_multiplier": 6,
-    "effects": [ "RECOVER_1000000" ],
+    "recovery_chance": 100,
     "to_hit": { "grip": "solid", "length": "long", "surface": "point", "balance": "good" },
     "flags": [ "UNBREAKABLE_MELEE", "NONCONDUCTIVE" ],
     "melee_damage": { "bash": 10, "stab": 26 }
@@ -245,7 +249,7 @@
     "count": 1,
     "stack_size": 1,
     "critical_multiplier": 10,
-    "effects": [ "RECOVER_35" ],
+    "recovery_chance": 35,
     "use_action": {
       "target": "arrow_flamming",
       "target_timer": "20 seconds",
@@ -266,7 +270,8 @@
     "symbol": "=",
     "color": "brown",
     "revert_to": "arrow_field_point_fletched",
-    "effects": [ "IGNITE", "RECOVER_35" ],
+    "recovery_chance": 35,
+    "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,
-    "effects": [ "RECOVER_30" ],
+    "recovery_chance": 30,
     "melee_damage": { "stab": 10 }
   },
   {
@@ -74,7 +74,7 @@
     "dispersion": 35,
     "loudness": 0,
     "critical_multiplier": 15,
-    "effects": [ "RECOVER_25" ],
+    "recovery_chance": 25,
     "melee_damage": { "stab": 8 }
   },
   {
@@ -95,7 +95,7 @@
     "dispersion": 50,
     "loudness": 0,
     "critical_multiplier": 8,
-    "effects": [ "RECOVER_6" ],
+    "recovery_chance": 6,
     "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,
-    "effects": [ "RECOVER_50" ],
+    "recovery_chance": 50,
     "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 },
-    "effects": [ "RECOVER_2" ]
+    "recovery_chance": 2
   },
   {
     "type": "AMMO",
@@ -26,7 +26,7 @@
     "price": "5 USD",
     "price_postapoc": "25 cent",
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 0.75 },
-    "effects": [ "RECOVER_6" ]
+    "recovery_chance": 6
   },
   {
     "type": "AMMO",
@@ -41,7 +41,8 @@
     "price": "6 USD 50 cent",
     "price_postapoc": "25 cent",
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 0.5 },
-    "effects": [ "RECOVER_10", "NOGIB" ]
+    "recovery_chance": 10,
+    "effects": [ "NOGIB" ]
   },
   {
     "type": "AMMO",
@@ -57,7 +58,7 @@
     "price_postapoc": "30 cent",
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 1.25 },
     "show_stats": true,
-    "effects": [ "RECOVER_8" ]
+    "recovery_chance": 8
   },
   {
     "type": "AMMO",
@@ -69,7 +70,7 @@
     "copy-from": "bolt_wood_bodkin",
     "relative": { "dispersion": 10 },
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 1.5, "armor_penetration": 1 },
-    "effects": [ "RECOVER_25" ]
+    "recovery_chance": 25
   },
   {
     "type": "AMMO",
@@ -89,7 +90,7 @@
     "dispersion": 100,
     "loudness": 0,
     "critical_multiplier": 10,
-    "effects": [ "RECOVER_30" ],
+    "recovery_chance": 30,
     "melee_damage": { "bash": 3 }
   },
   {
@@ -102,7 +103,8 @@
     "copy-from": "bolt_wood_bodkin",
     "relative": { "dispersion": 30 },
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 0.5 },
-    "effects": [ "RECOVER_35", "NOGIB" ]
+    "recovery_chance": 35,
+    "effects": [ "NOGIB" ]
   },
   {
     "type": "AMMO",
@@ -115,7 +117,7 @@
     "relative": { "dispersion": 80 },
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 1.25, "armor_penetration": 1 },
     "show_stats": true,
-    "effects": [ "RECOVER_20" ]
+    "recovery_chance": 20
   },
   {
     "type": "AMMO",
@@ -131,7 +133,7 @@
     "price_postapoc": "50 cent",
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 1.5, "armor_penetration": 2 },
     "range": 2,
-    "effects": [ "RECOVER_35" ]
+    "recovery_chance": 35
   },
   {
     "type": "AMMO",
@@ -147,7 +149,7 @@
     "price_postapoc": "50 cent",
     "damage": { "damage_type": "stab", "armor_penetration": 4 },
     "range": 2,
-    "effects": [ "RECOVER_40" ]
+    "recovery_chance": 40
   },
   {
     "type": "AMMO",
@@ -161,7 +163,8 @@
     "relative": { "dispersion": -30 },
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 0.5 },
     "range": 2,
-    "effects": [ "RECOVER_45", "NOGIB" ]
+    "recovery_chance": 45,
+    "effects": [ "NOGIB" ]
   },
   {
     "type": "AMMO",
@@ -177,7 +180,7 @@
     "price_postapoc": "60 cent",
     "damage": { "damage_type": "stab", "constant_damage_multiplier": 1.75 },
     "range": 4,
-    "effects": [ "RECOVER_30" ]
+    "recovery_chance": 30
   },
   {
     "id": "bullet_crossbow",

diff --git a/data/json/items/ranged/launchers.json b/data/json/items/ranged/launchers.json
@@ -65,7 +65,7 @@
     "price": "500 USD",
     "material": [ "steel" ],
     "flags": [ "NEVER_JAMS", "MOUNTED_GUN", "NO_RELOAD", "NON_FOULING", "WONT_TRAIN_MARKSMANSHIP" ],
-    "ammo_effects": [ "JET", "BEANBAG", "NEVER_MISFIRES", "RECOVER_10" ],
+    "ammo_effects": [ "JET", "BEANBAG", "NEVER_MISFIRES" ],
     "skill": "launcher",
     "ammo": [ "water" ],
     "weight": "24500 g",

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,
-    "effects": [ "RECOVER_5" ],
+    "recovery_chance": 5,
     "melee_damage": { "bash": 1 }
   },
   {
@@ -42,7 +42,7 @@
     "dispersion": 90,
     "loudness": 0,
     "count": 4,
-    "effects": [ "RECOVER_3" ],
+    "recovery_chance": 3,
     "melee_damage": { "bash": 1 }
   },
   {
@@ -65,7 +65,7 @@
     "dispersion": 120,
     "loudness": 0,
     "count": 4,
-    "effects": [ "RECOVER_15" ],
+    "recovery_chance": 15,
     "melee_damage": { "bash": 1 }
   },
   {

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