diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-05-11 03:02:03 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-05-11 03:02:03 -0700 |
| commit | 1e1f8d7d5fcc173c85684cc440de7fbae8b9b086 (patch) | |
| tree | 27e7eeb254a25d378cf9946036605d13c62ca7f2 | |
| parent | Fix G36 drum mag name (diff) | |
| download | cataclysm-dda-mod_hk-loadout-1e1f8d7d5fcc173c85684cc440de7fbae8b9b086.tar.xz | |
Convert damage to new format
| -rw-r--r-- | json/items/ammo/000shot.json | 12 | ||||
| -rw-r--r-- | json/items/ammo/12mm.json | 2 | ||||
| -rw-r--r-- | json/items/ammo/473.json | 5 |
3 files changed, 9 insertions, 10 deletions
diff --git a/json/items/ammo/000shot.json b/json/items/ammo/000shot.json index 5f74725..e28eff6 100644 --- a/json/items/ammo/000shot.json +++ b/json/items/ammo/000shot.json @@ -4,7 +4,7 @@ "copy-from": "shot_000", "type": "AMMO", "name": { "str": "000 shot, reloaded" }, - "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } }, @@ -13,7 +13,7 @@ "copy-from": "shot_000_flechette", "type": "AMMO", "name": { "str": "000 flechette shell, reloaded" }, - "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } }, @@ -22,7 +22,7 @@ "copy-from": "shot_000_slug", "type": "AMMO", "name": { "str": "000 shotgun slug, reloaded" }, - "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } }, @@ -45,7 +45,7 @@ "ammo_type": "000shot", "casing": "000shot_hull", "range": 12, - "damage": 60, + "damage": { "damage_type": "stab", "amount": 60 }, "recoil": 3500, "loudness": 160, "effects": [ "COOKOFF", "SHOT" ] @@ -60,7 +60,7 @@ "price": 2000, "price_postapoc": 10000, "count": 10, - "relative": { "damage": -5, "pierce": 15 } + "relative": { "damage": { "damage_type": "stab", "amount": -5 } } }, { "id": "shot_000_slug", @@ -72,7 +72,7 @@ "price": 400, "price_postapoc": 4500, "dispersion": 100, - "relative": { "range": 12, "pierce": 8 }, + "relative": { "range": 12, "armor_penetration": 8 }, "proportional": { "recoil": 1.4 }, "delete": { "effects": [ "SHOT" ] } } diff --git a/json/items/ammo/12mm.json b/json/items/ammo/12mm.json index eb641ce..6f0541e 100644 --- a/json/items/ammo/12mm.json +++ b/json/items/ammo/12mm.json @@ -6,7 +6,7 @@ "looks_like": "12mm", "name": { "str": "H&K 12mm, handmade" }, "description": "Handcrafted bootleg duplicates of the 12mm projectiles used in H&K railguns. Normally made of cobalt, these knockoffs are made of more readily available steel instead.", - "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } } diff --git a/json/items/ammo/473.json b/json/items/ammo/473.json index ced42dd..8d6c295 100644 --- a/json/items/ammo/473.json +++ b/json/items/ammo/473.json @@ -17,8 +17,7 @@ "stack_size": 100, "ammo_type": "473", "range": 35, - "damage": 35, - "pierce": 12, + "damage": { "damage_type": "stab", "amount": 35, "armor_penetration": 12 }, "dispersion": 95, "recoil": 2500, "effects": [ "NEVER_MISFIRES" ] @@ -29,7 +28,7 @@ "type": "AMMO", "name": { "str": "4.73x33mm, handmade" }, "description": "Handcrafted bootleg duplicates of 4.73x33mm caseless rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than stock rounds. Being caseless rounds, these cannot be disassembled or reloaded.", - "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, + "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } } |