diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-05-15 18:09:11 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2023-05-15 18:09:11 -0700 |
| commit | 8a1116aed6662378f2a5508c3ebea3180c67d0c6 (patch) | |
| tree | 3e6e0b7a0de1dac5107a48f5d5c56b98d08e8dc7 /ammo-10_ammo-order-fix.patch | |
| parent | Updated to 2023-05-13-1228 (diff) | |
| download | cataclysm-bn-8a1116aed6662378f2a5508c3ebea3180c67d0c6.tar.xz | |
Updated to 2023-05-13-1541
Diffstat (limited to 'ammo-10_ammo-order-fix.patch')
| -rw-r--r-- | ammo-10_ammo-order-fix.patch | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/ammo-10_ammo-order-fix.patch b/ammo-10_ammo-order-fix.patch index 5ca1d91..fdface4 100644 --- a/ammo-10_ammo-order-fix.patch +++ b/ammo-10_ammo-order-fix.patch @@ -1,6 +1,6 @@ --- a/data/json/items/ammo/20x66mm.json +++ b/data/json/items/ammo/20x66mm.json -@@ -1,7 +1,40 @@ +@@ -1,7 +1,38 @@ [ { + "abstract": "20x66_shot_abstract", @@ -31,9 +31,7 @@ + "type": "AMMO", + "name": { "str": "20x66mm buckshot" }, + "//": "2.5x the Generic Rate of $1/shot", -+ "description": "20x66mm caseless shotgun rounds, buckshot type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.", -+ "range": 0, -+ "shape": [ "cone", { "half_angle": 15, "length": 12 } ] ++ "description": "20x66mm caseless shotgun rounds, buckshot type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded." + }, + { "id": "20x66_beanbag", @@ -101,7 +99,7 @@ "id": "20x66_frag", "copy-from": "20x66_slug", "type": "AMMO", -@@ -110,52 +156,5 @@ +@@ -110,50 +156,5 @@ "flags": [ "IRREPLACEABLE_CONSUMABLE" ], "count": 10, "extend": { "effects": [ "INCENDIARY" ] } @@ -135,9 +133,7 @@ - "type": "AMMO", - "name": { "str": "20x66mm buckshot" }, - "//": "2.5x the Generic Rate of $1/shot", -- "description": "20x66mm caseless shotgun rounds, buckshot type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.", -- "range": 0, -- "shape": [ "cone", { "half_angle": 15, "length": 12 } ] +- "description": "20x66mm caseless shotgun rounds, buckshot type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded." - }, - { - "id": "20x66_slug", @@ -449,8 +445,7 @@ "abstract": "shot_abstract", "type": "AMMO", "name": { "str": "00 shot" }, -@@ -76,20 +32,6 @@ - "shape": [ "cone", { "half_angle": 10, "length": 12 } ] +@@ -76,19 +32,5 @@ }, { - "id": "shot_beanbag", |