diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2020-06-27 13:08:13 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2020-06-27 13:08:13 -0700 |
| commit | 06450f674ac158a4dc7824ea7548d9bad223f909 (patch) | |
| tree | bcaf5c69ee2794eee43a4ab4778687e1196cd510 | |
| parent | Reduce duplication of item references (diff) | |
| download | cataclysm-dda-mod_hk-loadout-06450f674ac158a4dc7824ea7548d9bad223f909.tar.xz | |
Fix typos in 9mm and 45 magazines
| -rw-r--r-- | json/items/gun/40.json | 2 | ||||
| -rw-r--r-- | json/items/magazine/45.json | 6 | ||||
| -rw-r--r-- | json/items/magazine/9mm.json | 14 |
3 files changed, 8 insertions, 14 deletions
diff --git a/json/items/gun/40.json b/json/items/gun/40.json index ac4bd96..ac04b12 100644 --- a/json/items/gun/40.json +++ b/json/items/gun/40.json @@ -7,5 +7,5 @@ "weight": "748 g", "ammo": "40", "magazines": [ [ "40", [ "usp40mag" ] ] ] -} + } ] diff --git a/json/items/magazine/45.json b/json/items/magazine/45.json index 3988982..a753757 100644 --- a/json/items/magazine/45.json +++ b/json/items/magazine/45.json @@ -1,12 +1,10 @@ [ { "id": "ump45mag", - "looks_like": "ump45mag", + "copy-from": "ump45mag", "type": "MAGAZINE", "name": { "str": "H&K UMP45 magazine" }, - "description": "A standard 25-round box magazine for use with the H&K UMP45 SMG.", - "symbol": "#", - "ammo_type": "45" + "description": "A standard 25-round box magazine for use with the H&K UMP45 SMG." }, { "id": "ump45_makeshiftmag", diff --git a/json/items/magazine/9mm.json b/json/items/magazine/9mm.json index 89a401c..b338aeb 100644 --- a/json/items/magazine/9mm.json +++ b/json/items/magazine/9mm.json @@ -3,22 +3,18 @@ "id": "usp9mag", "copy-from": "usp9mag", "type": "MAGAZINE", - "name": { "str": "H&K USP 9mm magazine" }, - "ammo_type": "9mm" + "name": { "str": "H&K USP 9mm magazine" } }, { "id": "mp5mag", - "copy-from": "usp9mag", - "//": "Tileset whitelist for SMG magazines", + "copy-from": "mp5mag", "type": "MAGAZINE", - "name": { "str": "H&K MP5 magazine" }, - "ammo_type": "9mm" + "name": { "str": "H&K MP5 magazine" } }, { "id": "mp5bigmag", - "copy-from": "usp9mag", + "copy-from": "mp5bigmag", "type": "MAGAZINE", - "name": { "str": "H&K MP5 extended magazine" }, - "ammo_type": "9mm" + "name": { "str": "H&K MP5 extended magazine" } } ] |