diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-02-02 16:43:51 -0800 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-02-02 16:43:51 -0800 |
| commit | 6bd924a6320887576ca79cd93dcb99cc674e22a9 (patch) | |
| tree | 973440c3beaea7af6870a5b7f3fadc060bfdaa26 /json/items/magazine/46.json | |
| parent | Adding the name not required for copy-from martialarts (diff) | |
| download | cataclysm-dda-mod_hk-loadout-6bd924a6320887576ca79cd93dcb99cc674e22a9.tar.xz | |
Fix 000 shot ordering so as to not place types before their copy-froms.
Convert guns to use str_sp instead of str.
Convert ammo types and materials to arrays.
Various formatting changes to recipes to ease readability.
Fix factory loaded 000shot uncraft from providing less materials than a reloaded.
Diffstat (limited to 'json/items/magazine/46.json')
| -rw-r--r-- | json/items/magazine/46.json | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/json/items/magazine/46.json b/json/items/magazine/46.json index f6f22e9..856a12f 100644 --- a/json/items/magazine/46.json +++ b/json/items/magazine/46.json @@ -1,5 +1,14 @@ [ { + "id": "hk46mag", + "looks_like": "mp5mag", + "copy-from": "hk46mag", + "type": "MAGAZINE", + "name": { "str": "H&K 4.6mm magazine" }, + "description": "A standard capacity 20-round magazine for use with H&K's proprietary 4.6x30mm round.", + "weight": "100 g" + }, + { "id": "hk46bigmag", "looks_like": "mp5mag", "copy-from": "hk46bigmag", @@ -20,14 +29,5 @@ "price": 5500, "price_postapoc": 300, "capacity": 30 - }, - { - "id": "hk46mag", - "looks_like": "mp5mag", - "copy-from": "hk46mag", - "type": "MAGAZINE", - "name": { "str": "H&K 4.6mm magazine" }, - "description": "A standard capacity 20-round magazine for use with H&K's proprietary 4.6x30mm round.", - "weight": "100 g" } ] |