From 897818db047f96f9679ff848a16d6a3511f50beb Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Sat, 22 Feb 2020 01:02:08 +0100 Subject: [PATCH] Ammo name to object --- data/json/items/ammo/22.json | 8 ++++---- data/json/items/ammo/270win.json | 4 ++-- data/json/items/ammo/300.json | 2 +- data/json/items/ammo/3006.json | 12 ++++++------ data/json/items/ammo/300blk.json | 8 ++++---- data/json/items/ammo/308.json | 2 +- data/json/items/ammo/32.json | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/data/json/items/ammo/22.json b/data/json/items/ammo/22.json index cb7288309746d..b4ea19548bcac 100644 --- a/data/json/items/ammo/22.json +++ b/data/json/items/ammo/22.json @@ -58,7 +58,7 @@ "id": "bp_22_fmj", "copy-from": "22_fmj", "type": "AMMO", - "name": ".22 LR FMJ, black powder", + "name": { "str": ".22 LR FMJ, black powder" }, "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -67,7 +67,7 @@ "id": "bp_22_lr", "copy-from": "22_lr", "type": "AMMO", - "name": ".22 LR, black powder", + "name": { "str": ".22 LR, black powder" }, "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -76,7 +76,7 @@ "id": "reloaded_22_lr", "copy-from": "22_lr", "type": "AMMO", - "name": ".22 LR, reloaded", + "name": { "str": ".22 LR, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -85,7 +85,7 @@ "id": "reloaded_22_fmj", "copy-from": "22_fmj", "type": "AMMO", - "name": ".22 FMJ, reloaded", + "name": { "str": ".22 FMJ, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } diff --git a/data/json/items/ammo/270win.json b/data/json/items/ammo/270win.json index f2d4fe85bfbf8..adf05a69a8e04 100644 --- a/data/json/items/ammo/270win.json +++ b/data/json/items/ammo/270win.json @@ -26,7 +26,7 @@ "id": "bp_270win_jsp", "copy-from": "270win_jsp", "type": "AMMO", - "name": ".270 Winchester JSP, black powder", + "name": { "str": ".270 Winchester JSP, black powder" }, "proportional": { "price": 0.3, "damage": 0.7, "recoil": 0.7, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -35,7 +35,7 @@ "id": "reloaded_270win_jsp", "copy-from": "270win_jsp", "type": "AMMO", - "name": ".270 Winchester JSP, reloaded", + "name": { "str": ".270 Winchester JSP, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } diff --git a/data/json/items/ammo/300.json b/data/json/items/ammo/300.json index 65e9fc2430a6a..995be96809eaa 100644 --- a/data/json/items/ammo/300.json +++ b/data/json/items/ammo/300.json @@ -26,7 +26,7 @@ "id": "bp_300_winmag", "copy-from": "300_winmag", "type": "AMMO", - "name": ".300 Winchester Magnum, black powder", + "name": { "str": ".300 Winchester Magnum, black powder" }, "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } diff --git a/data/json/items/ammo/3006.json b/data/json/items/ammo/3006.json index cfbd5640fd075..2ee32b3ab2d2d 100644 --- a/data/json/items/ammo/3006.json +++ b/data/json/items/ammo/3006.json @@ -42,7 +42,7 @@ "id": "bp_3006", "copy-from": "3006", "type": "AMMO", - "name": ".30-06 Springfield, black powder", + "name": { "str": ".30-06 Springfield, black powder" }, "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -51,7 +51,7 @@ "id": "bp_3006_incendiary", "copy-from": "3006_incendiary", "type": "AMMO", - "name": ".30-06 Springfield tracer, black powder", + "name": { "str": ".30-06 Springfield tracer, black powder" }, "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -60,7 +60,7 @@ "id": "bp_3006fmj", "copy-from": "bp_3006", "type": "AMMO", - "name": ".30-06 Springfield M2 AP, black powder", + "name": { "str": ".30-06 Springfield M2 AP, black powder" }, "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -69,7 +69,7 @@ "id": "reloaded_3006", "copy-from": "3006", "type": "AMMO", - "name": ".30-06 Springfield, reloaded", + "name": { "str": ".30-06 Springfield, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -78,7 +78,7 @@ "id": "reloaded_3006_incendiary", "copy-from": "3006_incendiary", "type": "AMMO", - "name": ".30-06 incendiary, reloaded", + "name": { "str": ".30-06 incendiary, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -87,7 +87,7 @@ "id": "reloaded_3006fmj", "copy-from": "3006fmj", "type": "AMMO", - "name": ".30-06 M2 AP, reloaded", + "name": { "str": ".30-06 M2 AP, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } diff --git a/data/json/items/ammo/300blk.json b/data/json/items/ammo/300blk.json index ed60cc19debd8..0815663199227 100644 --- a/data/json/items/ammo/300blk.json +++ b/data/json/items/ammo/300blk.json @@ -2,7 +2,7 @@ { "id": "300blk", "type": "AMMO", - "name": ".300 AAC Blackout", + "name": { "str": ".300 AAC Blackout" }, "description": "A .300 AAC Blackout round with a 125gr open tip match bullet. 300 BLK is an intermediate cartridge necked up from 5.56x45mm, designed to achieve similar ballistics to 7.62x39mm. It is compatible with standard AR-15 lower receivers and will feed from STANAG magazines.", "weight": "18 g", "volume": "250 ml", @@ -26,7 +26,7 @@ "id": "300blk_ss", "copy-from": "300blk", "type": "AMMO", - "name": ".300 AAC Blackout", + "name": { "str": ".300 AAC Blackout" }, "description": "A subsonic .300 AAC Blackout round with a 220gr open tip match bullet. 300 BLK is an intermediate cartridge necked up from 5.56x45mm, designed to achieve similar ballistics to 7.62x39mm. It is compatible with standard AR-15 lower receivers and will feed from STANAG magazines.", "weight": "21 g", "range": 40, @@ -37,7 +37,7 @@ "id": "bp_300blk", "copy-from": "300blk", "type": "AMMO", - "name": ".300 AAC Blackout, black powder", + "name": { "str": ".300 AAC Blackout, black powder" }, "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -46,7 +46,7 @@ "id": "reloaded_300blk", "copy-from": "300blk", "type": "AMMO", - "name": ".300 AAC Blackout, reloaded", + "name": { "str": ".300 AAC Blackout, reloaded" }, "description": ".300 AAC Blackout is an intermediate cartridge that achieves ballistics similar to the 7.62x39 but allows use on the AR-15 platform. The round is necked-up from the 5.56mm NATO, but feeds from a STANAG magazine. It requires a specific barrel, so will not work in a standard M4 or similar carbine. This one has been hand-reloaded.", "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, diff --git a/data/json/items/ammo/308.json b/data/json/items/ammo/308.json index ed0019ac1dc7c..9347edbefe3bb 100644 --- a/data/json/items/ammo/308.json +++ b/data/json/items/ammo/308.json @@ -2,7 +2,7 @@ { "id": "308", "type": "AMMO", - "name": ".308 Winchester", + "name": { "str": ".308 Winchester" }, "description": ".308 Winchester ammunition with 168gr hollow point bullets. The .308 round is one of the most popular hunting cartridges in the world due to its accuracy and power.", "weight": "18 g", "volume": "250 ml", diff --git a/data/json/items/ammo/32.json b/data/json/items/ammo/32.json index e4c3de933d90c..97366be073062 100644 --- a/data/json/items/ammo/32.json +++ b/data/json/items/ammo/32.json @@ -2,7 +2,7 @@ { "id": "32_acp", "type": "AMMO", - "name": ".32 ACP", + "name": { "str": ".32 ACP" }, "description": "The .32 ACP was a popular handgun cartridge in the 20th century. Not so powerful as the .38 or the 9x19mm though.", "weight": "5 g", "volume": "250 ml", @@ -25,7 +25,7 @@ "id": "bp_32_acp", "copy-from": "32_acp", "type": "AMMO", - "name": ".32 ACP, black powder", + "name": { "str": ".32 ACP, black powder" }, "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] } @@ -34,7 +34,7 @@ "id": "reloaded_32_acp", "copy-from": "32_acp", "type": "AMMO", - "name": ".32 ACP, reloaded", + "name": { "str": ".32 ACP, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 }, "extend": { "effects": [ "RECYCLED" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ] }