From 1e1f8d7d5fcc173c85684cc440de7fbae8b9b086 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Tue, 11 May 2021 03:02:03 -0700 Subject: Convert damage to new format --- json/items/ammo/000shot.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'json/items/ammo/000shot.json') 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" ] } } -- cgit v1.2.1