diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-11-09 00:19:59 -0800 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-11-09 00:19:59 -0800 |
| commit | 2b223161f30c04159647c89ab37cb40a34045a7a (patch) | |
| tree | 5a9ccec7eed3a99a1a9602a27a4e9d044bed24ec | |
| parent | Initial commit (diff) | |
| download | cataclysm-bn-mod_revert-handgun-damage-buff-2b223161f30c04159647c89ab37cb40a34045a7a.tar.xz | |
Fix mismatched 22.json
| -rw-r--r-- | json/items/ammo/22.json | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/json/items/ammo/22.json b/json/items/ammo/22.json index 1fdd9e2..0622c8e 100644 --- a/json/items/ammo/22.json +++ b/json/items/ammo/22.json @@ -23,19 +23,14 @@ "effects": [ "COOKOFF" ] }, { - "id": "22_cb", + "id": "22_cphp", "copy-from": "22_lr", "type": "AMMO", - "name": { "str_sp": ".22 CB" }, - "description": "The .22 Conical Ball is a variety of .22 ammunition that propels its bullet using a primer instead of gunpowder. The end result is a subsonic round that is so weak as to be nearly useless given your predicament.", - "price": 100, - "price_postapoc": 1000, - "flags": [ "IRREPLACEABLE_CONSUMABLE" ], - "count": 100, - "stack_size": 150, - "recoil": 39, - "proportional": { "range": 0.6, "damage": { "damage_type": "stab", "amount": 0.5 }, "dispersion": 1.2 }, - "extend": { "effects": [ "NOGIB" ] } + "name": { "str": ".22 CPHP" }, + "description": ".22 Long Rifle ammunition with 30gr copper-plated, hollow-point bullets. Has a higher velocity and slightly more stopping power than lead round-nose ammunition, but armor will have a magnified effect on its already-low penetration.", + "damage": { "damage_type": "stab", "amount": 15, "armor_penetration": 0 }, + "relative": { "range": 3 }, + "proportional": { "recoil": 1.5 } }, { "id": "22_fmj", @@ -47,7 +42,7 @@ }, { "id": "22_ratshot", - "copy-from": "22_lr", + "copy-from": "22_cphp", "type": "AMMO", "name": { "str_sp": ".22 rat-shot" }, "description": "A .22 caliber cartridge loaded with very small pieces of shot contained within a fragmenting plastic capsule. It has an extremely short range and penetration ability, but it can hit targets with greater ease.", |