From 6bd924a6320887576ca79cd93dcb99cc674e22a9 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Wed, 2 Feb 2022 16:43:51 -0800 Subject: 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. --- json/items/gun/000shot.json | 4 ++-- json/items/gun/223.json | 6 +++--- json/items/gun/308.json | 6 +++--- json/items/gun/40.json | 2 +- json/items/gun/45.json | 4 ++-- json/items/gun/46.json | 6 +++--- json/items/gun/473.json | 4 ++-- json/items/gun/9mm.json | 6 +++--- 8 files changed, 19 insertions(+), 19 deletions(-) (limited to 'json/items/gun') diff --git a/json/items/gun/000shot.json b/json/items/gun/000shot.json index cb0a6bd..25a96bb 100644 --- a/json/items/gun/000shot.json +++ b/json/items/gun/000shot.json @@ -3,7 +3,7 @@ "id": "hk_caws", "copy-from": "shotgun_base", "type": "GUN", - "name": { "str": "H&K CAWS" }, + "name": { "str_sp": "H&K CAWS" }, "description": "The Heckler & Koch CAWS is a bullpup combat shotgun designed to fill the need for a high accuracy, short-range weapon with low recoil.", "weight": "3700 g", "volume": "2000 ml", @@ -16,7 +16,7 @@ "ranged_damage": 5, "dispersion": 300, "durability": 8, - "ammo": "000shot", + "ammo": [ "000shot" ], "barrel_length": "81 ml", "valid_mod_locations": [ [ "accessories", 2 ], diff --git a/json/items/gun/223.json b/json/items/gun/223.json index 9f4af57..45369b1 100644 --- a/json/items/gun/223.json +++ b/json/items/gun/223.json @@ -3,21 +3,21 @@ "id": "h&k416a5", "copy-from": "h&k416a5", "type": "GUN", - "name": { "str": "H&K HK416A5" }, + "name": { "str_sp": "H&K HK416A5" }, "description": "Designed to replace the M4A1, the Heckler & Koch HK416A5 features most of the former's strengths, while being considerably more durable." }, { "id": "m27iar", "copy-from": "m27iar", "type": "GUN", - "name": { "str": "M27 IAR" }, + "name": { "str_sp": "M27 IAR" }, "default_mods": [ "grip", "acog_scope" ] }, { "id": "hk_g36", "copy-from": "hk_g36", "type": "GUN", - "name": { "str": "H&K G36" }, + "name": { "str_sp": "H&K G36" }, "description": "Designed as a replacement for the early Heckler & Koch G3 battle rifle, the G36 is more accurate, and uses the much-lighter .223 round, allowing for a higher ammo capacity. It was later found to have problems overheating during prolonged firefights, and was phased out of active service in 2016.", "built_in_mods": [ "folding_stock" ] } diff --git a/json/items/gun/308.json b/json/items/gun/308.json index 020bf52..600e81c 100644 --- a/json/items/gun/308.json +++ b/json/items/gun/308.json @@ -3,14 +3,14 @@ "id": "hk417_13", "copy-from": "hk417_13", "type": "GUN", - "name": { "str": "H&K HK417A2" } + "name": { "str_sp": "H&K HK417A2" } }, { "id": "hk_psg1a1", "copy-from": "rifle_semi", "looks_like": "ar15", "type": "GUN", - "name": { "str": "H&K PSG1A1", "str_pl": "H&K PSG1A1" }, + "name": { "str_sp": "H&K PSG1A1" }, "description": "The Heckler & Koch PSG1A1 is a semi-automatic sniper rifle based the G3 rifle. It is exceptionally accurate for a semi-automatic rifle.", "weight": "6670 g", "volume": "2250 ml", @@ -34,7 +34,7 @@ "copy-from": "hk_psg1a1", "looks_like": "hk_psg1a1", "type": "GUN", - "name": { "str": "H&K MSG90A2", "str_pl": "H&K MSG90A2" }, + "name": { "str_sp": "H&K MSG90A2" }, "description": "The Heckler & Koch MSG90A2 is a semi-automatic sniper rifle based the G3 rifle. It is exceptionally accurate for a semi-automatic rifle. This is the military version.", "weight": "5280 g", "volume": "2250 ml", diff --git a/json/items/gun/40.json b/json/items/gun/40.json index ac04b12..f6a6947 100644 --- a/json/items/gun/40.json +++ b/json/items/gun/40.json @@ -3,7 +3,7 @@ "id": "usp_40", "copy-from": "usp_9mm", "type": "GUN", - "name": { "str": "H&K USP .40", "str_pl": "H&K USP .40" }, + "name": { "str_sp": "H&K USP .40" }, "weight": "748 g", "ammo": "40", "magazines": [ [ "40", [ "usp40mag" ] ] ] diff --git a/json/items/gun/45.json b/json/items/gun/45.json index 2b32d68..25b2dbc 100644 --- a/json/items/gun/45.json +++ b/json/items/gun/45.json @@ -3,14 +3,14 @@ "id": "usp_45", "copy-from": "usp_45", "type": "GUN", - "name": { "str": "H&K USP .45", "str_pl": "H&K USP .45" }, + "name": { "str_sp": "H&K USP .45" }, "weight": "789 g" }, { "id": "hk_ump45", "copy-from": "hk_ump45", "type": "GUN", - "name": { "str": "H&K UMP45", "str_pl": "H&K UMP45" }, + "name": { "str_sp": "H&K UMP45" }, "modes": [ [ "DEFAULT", "semi", 1 ], [ "BURST", "burst", 2 ], [ "AUTO", "auto", 4 ] ] } ] diff --git a/json/items/gun/46.json b/json/items/gun/46.json index 64f4a38..cf0a3f6 100644 --- a/json/items/gun/46.json +++ b/json/items/gun/46.json @@ -3,7 +3,7 @@ "id": "hk_ucp", "type": "GUN", "reload_noise_volume": 10, - "name": { "str": "H&K UCP" }, + "name": { "str_sp": "H&K UCP" }, "description": "The Heckler & Koch UCP is a small, very high capacity pistol designed to counter most common body armors.", "weight": "730 g", "volume": "500 ml", @@ -14,7 +14,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "light_gray", - "ammo": "46", + "ammo": [ "46" ], "skill": "pistol", "dispersion": 410, "durability": 9, @@ -39,7 +39,7 @@ "id": "hk_mp7", "copy-from": "hk_mp7", "type": "GUN", - "name": { "str": "H&K MP7A2" }, + "name": { "str_sp": "H&K MP7A2" }, "weight": "1960 g", "volume": "1000 ml", "bashing": 10, diff --git a/json/items/gun/473.json b/json/items/gun/473.json index 4ceddc1..307f8cf 100644 --- a/json/items/gun/473.json +++ b/json/items/gun/473.json @@ -3,7 +3,7 @@ "id": "hk_g11", "type": "GUN", "reload_noise_volume": 10, - "name": { "str": "H&K G11K2 Assault Rifle" }, + "name": { "str_sp": "H&K G11K2 Assault Rifle" }, "description": "The Heckler & Koch G11 is a bullpup assault rifle that was designed to replace the G3 rifle. It utilizes the caseless 4.73x33mm round from an internal magazine bay and has a very high rate of burst fire.", "weight": "3650 g", "volume": "1500 ml", @@ -15,7 +15,7 @@ "material": [ "steel", "plastic" ], "symbol": "(", "color": "dark_gray", - "ammo": "473", + "ammo": [ "473" ], "skill": "rifle", "dispersion": 120, "durability": 9, diff --git a/json/items/gun/9mm.json b/json/items/gun/9mm.json index fb37fa6..679e9e5 100644 --- a/json/items/gun/9mm.json +++ b/json/items/gun/9mm.json @@ -3,14 +3,14 @@ "id": "usp_9mm", "copy-from": "usp_9mm", "type": "GUN", - "name": { "str": "H&K USP 9mm", "str_pl": "H&K USP 9mm" }, + "name": { "str_sp": "H&K USP 9mm" }, "weight": "748 g" }, { "id": "hk_mp5", "copy-from": "hk_mp5", "type": "GUN", - "name": { "str": "H&K MP5A4", "str_pl": "H&K MP5A4" }, + "name": { "str_sp": "H&K MP5A4" }, "weight": "2540 g", "volume": "1750 ml" }, @@ -18,7 +18,7 @@ "id": "hk_mp5k", "copy-from": "hk_mp5k", "type": "GUN", - "name": { "str": "H&K MP5K-PDW", "str_pl": "H&K MP5K-PDW" }, + "name": { "str_sp": "H&K MP5K-PDW" }, "weight": "2530 g", "volume": "1250 ml" } -- cgit v1.2.1