summaryrefslogtreecommitdiff
path: root/json/items/ammo/357mag.json
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2022-09-10 12:42:21 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2022-09-10 12:42:21 -0700
commit7b9fe6e4ea523a5e8ee37d12208b25e87cfb8b12 (patch)
tree66aab10a0b2146ee904a883bb47c91c7737ac0ff /json/items/ammo/357mag.json
parentFix ammo ordering for 44 magnum. (diff)
downloadcataclysm-bn-mod_revert-handgun-damage-buff-7b9fe6e4ea523a5e8ee37d12208b25e87cfb8b12.tar.xz
Sort black powder variants to after reloaded variants.
Diffstat (limited to 'json/items/ammo/357mag.json')
-rw-r--r--json/items/ammo/357mag.json28
1 files changed, 14 insertions, 14 deletions
diff --git a/json/items/ammo/357mag.json b/json/items/ammo/357mag.json
index 6fde5db..f8a3380 100644
--- a/json/items/ammo/357mag.json
+++ b/json/items/ammo/357mag.json
@@ -31,6 +31,20 @@
"relative": { "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": -2 } }
},
{
+ "id": "reloaded_357mag_fmj",
+ "copy-from": "357mag_fmj",
+ "type": "AMMO",
+ "name": { "str_sp": ".357 Magnum FMJ, reloaded" },
+ "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1, "recoil": 0.9 }
+ },
+ {
+ "id": "reloaded_357mag_jhp",
+ "copy-from": "357mag_jhp",
+ "type": "AMMO",
+ "name": { "str_sp": ".357 Magnum JHP, reloaded" },
+ "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1, "recoil": 0.9 }
+ },
+ {
"id": "bp_357mag_fmj",
"copy-from": "357mag_fmj",
"type": "AMMO",
@@ -57,19 +71,5 @@
},
"extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
"delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
- },
- {
- "id": "reloaded_357mag_fmj",
- "copy-from": "357mag_fmj",
- "type": "AMMO",
- "name": { "str_sp": ".357 Magnum FMJ, reloaded" },
- "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1, "recoil": 0.9 }
- },
- {
- "id": "reloaded_357mag_jhp",
- "copy-from": "357mag_jhp",
- "type": "AMMO",
- "name": { "str_sp": ".357 Magnum JHP, reloaded" },
- "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1, "recoil": 0.9 }
}
]