diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json index ac03fcaa9ccb4..ca389f7181097 100644 --- a/data/json/items/gun/223.json +++ b/data/json/items/gun/223.json @@ -237,7 +237,7 @@ "copy-from": "rifle_auto", "looks_like": "ar15", "type": "GUN", - "name": "M249", + "name": { "str": "M249" }, "description": "The M249 is a mountable machine gun used by the US military and SWAT teams. Quite inaccurate and difficult to control, the M249 is designed to fire many rounds very quickly.", "weight": "7330 g", "volume": "3 L", @@ -285,7 +285,7 @@ "copy-from": "rifle_auto", "looks_like": "ar15", "type": "GUN", - "name": "M4A1", + "name": { "str": "M4A1" }, "description": "A popular carbine, long used by the US military. Though accurate, small, and lightweight, it is infamous for its unreliability when not properly maintained.", "weight": "3160 g", "volume": "1750 ml", @@ -308,7 +308,7 @@ "copy-from": "rifle_semi", "looks_like": "ar15", "type": "GUN", - "name": "M16A4", + "name": { "str": "M16A4" }, "description": "The M16 is a very common assault rifle descended from the AR-15, used by militaries across the world for over 50 years. It is a gas operated, rotating bolt rifle known for its accuracy and controllable recoil.", "weight": "3510 g", "volume": "1750 ml", @@ -322,7 +322,7 @@ "dispersion": 150, "durability": 7, "min_cycle_recoil": 1350, - "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3rd burst", 3 ] ], + "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ] ], "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ] }, { diff --git a/data/json/items/gun/3006.json b/data/json/items/gun/3006.json index 7ae956ca07a51..0ffaa9df8f34d 100644 --- a/data/json/items/gun/3006.json +++ b/data/json/items/gun/3006.json @@ -82,7 +82,7 @@ "copy-from": "rifle_manual", "looks_like": "ar15", "type": "GUN", - "name": "M1903 Springfield", + "name": { "str": "M1903 Springfield" }, "description": "A powerful military rifle chambered in .30-06, developed to replace the US Army's older Krag rifle. Served as the main American rifle in World War I, was used alongside the M1 Garand in World War II, and was used as a sniper rifle as late as the Vietnam War.", "weight": "3910 g", "volume": "3 L", diff --git a/data/json/items/gun/308.json b/data/json/items/gun/308.json index 02712684ef547..381616703b197 100644 --- a/data/json/items/gun/308.json +++ b/data/json/items/gun/308.json @@ -142,7 +142,7 @@ "copy-from": "rifle_auto", "looks_like": "ar15", "type": "GUN", - "name": "M240", + "name": { "str": "M240" }, "description": "The M240 is a medium machine gun used by the US military, replacing the older M60. Quite inaccurate and difficult to control, the M240 is designed to fire many rounds very quickly.", "weight": "12400 g", "volume": "3 L", @@ -179,7 +179,7 @@ "copy-from": "rifle_auto", "looks_like": "ar15", "type": "GUN", - "name": "M60", + "name": { "str": "M60" }, "description": "The M60 is a general-purpose machine gun developed to replace the .30-caliber M1918 and M1919. Heavy and difficult to handle fired from the shoulder, as most people aren't action-movie heroes.", "weight": "10500 g", "volume": "3 L", diff --git a/data/json/items/gun/380.json b/data/json/items/gun/380.json index 84b32c3d780eb..83f337a936004 100644 --- a/data/json/items/gun/380.json +++ b/data/json/items/gun/380.json @@ -4,7 +4,7 @@ "copy-from": "mac_10", "looks_like": "hk_mp5", "type": "GUN", - "name": "MAC-11", + "name": { "str": "MAC-11" }, "description": "A lesser known variant of the MAC-10, this machine pistol is chambered in .380 ACP for a smaller overall size while remaining inherently subsonic. Smaller in almost every dimension, this inexpensive automatic weapon was declared 'fit only for combat in a phone booth' due to its low weight and absurd fire rate ranging from 1200 to 1400 rounds per minute.", "weight": "1590 g", "volume": "754 ml", diff --git a/data/json/items/gun/38super.json b/data/json/items/gun/38super.json index f32ad21c20dbf..1e55edf1d4632 100644 --- a/data/json/items/gun/38super.json +++ b/data/json/items/gun/38super.json @@ -41,7 +41,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": "M1911A1", + "name": { "str": "M1911A1" }, "description": "The M1911A1 is an extremely popular pistol known for its reliability. This one is chambered for .38 Super.", "weight": "1157 g", "volume": "462 ml", diff --git a/data/json/items/gun/40x46mm.json b/data/json/items/gun/40x46mm.json index 86fbfe134af00..692aab7c45e3a 100644 --- a/data/json/items/gun/40x46mm.json +++ b/data/json/items/gun/40x46mm.json @@ -33,7 +33,7 @@ "copy-from": "launcher_base", "looks_like": "m79", "type": "GUN", - "name": "M320 standalone launcher", + "name": { "str": "M320 standalone launcher" }, "description": "Heckler & Koch's M320 grenade launcher offers the functionality of larger launchers in a very small package at the cost of decreased accuracy. This one is combined with a buttstock for standalone operation.", "weight": "2100 g", "volume": "750 ml", @@ -153,7 +153,7 @@ "copy-from": "launcher_base", "looks_like": "m203", "type": "GUN", - "name": "M203 array", + "name": { "str": "M203 array" }, "description": "An array of six M203 grenade launchers for use on the TALON UGV platform.", "weight": "8200 g", "volume": "4 L", diff --git a/data/json/items/gun/40x53mm.json b/data/json/items/gun/40x53mm.json index 2aae3f15a2218..a6d81713d95dd 100644 --- a/data/json/items/gun/40x53mm.json +++ b/data/json/items/gun/40x53mm.json @@ -4,7 +4,7 @@ "copy-from": "launcher_base", "looks_like": "m79", "type": "GUN", - "name": "Mark 19 grenade launcher", + "name": { "str": "Mark 19 grenade launcher" }, "description": "A heavy, tripod-mounted belt-fed grenade launcher used by the US Military since the start of the Cold War all the way to the cataclysm, and if you can find some 40mm grenades, maybe even beyond.", "weight": "35200 g", "volume": "4 L", diff --git a/data/json/items/gun/45.json b/data/json/items/gun/45.json index 5ceb7e432bfda..a87f1a7ee7066 100644 --- a/data/json/items/gun/45.json +++ b/data/json/items/gun/45.json @@ -82,7 +82,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": "M1911", + "name": { "str": "M1911" }, "//": "You can get 'em for over US$1K if you want. This is a fairly cheap remake.", "description": "The M1911 was the US Military standard-issue sidearm for most of the 20th Century. It remains one of the most popular .45 pistols today.", "weight": "1120 g", @@ -106,7 +106,7 @@ "copy-from": "m1911", "looks_like": "glock_17", "type": "GUN", - "name": "M45A1", + "name": { "str": "M45A1" }, "description": "The M45A1 supplanted earlier M45 MEUSOC pistols in use by Force Recon elements of Marine Expeditionary Units. Where the original M45 pistols were gutted M1911A1's hand-fitted by USMC armorers, the updated M45A1's are hardly different from any other commercial 1911 design save for their dual recoil springs. Most were replaced in 2016 with Glock 19's due to logistics issues.", "weight": "1105 g", "price": 169900, @@ -119,7 +119,7 @@ "looks_like": "hk_mp5", "type": "GUN", "reload_noise_volume": 10, - "name": "MAC-10", + "name": { "str": "MAC-10" }, "description": "The MAC-10 is a popular machine pistol originally designed for military use. For many years they were the most inexpensive automatic weapon in the US, and enjoyed great popularity among criminals less concerned with quality firearms.", "weight": "2840 g", "volume": "750 ml", diff --git a/data/json/items/gun/4570.json b/data/json/items/gun/4570.json index ca39057f7e38f..33728b7817365 100644 --- a/data/json/items/gun/4570.json +++ b/data/json/items/gun/4570.json @@ -4,7 +4,7 @@ "copy-from": "rifle_manual", "looks_like": "ar15", "type": "GUN", - "name": "Marlin 1895 SBL", + "name": { "str": "Marlin 1895 SBL" }, "description": "A handy but powerful lever-action rifle chambered for .45-70 Government. Designed for wilderness guides for defense against large predators such as grizzly bears, moose, and dinosaurs.", "weight": "3650 g", "volume": "2250 ml", @@ -37,7 +37,7 @@ "copy-from": "pistol_revolver", "looks_like": "sw_619", "type": "GUN", - "name": "Magnum Research BFR", + "name": { "str": "Magnum Research BFR" }, "description": "A massive single-action revolver. While the .45-70 rifle round loses significant velocity in its short pistol barrel, it still competes with other large magnum handguns in terms of power.", "weight": "1950 g", "volume": "1 L", diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json index c05a9b6b3637c..4e2ee9f494f84 100644 --- a/data/json/items/gun/50.json +++ b/data/json/items/gun/50.json @@ -116,7 +116,7 @@ "copy-from": "rifle_base", "looks_like": "ar15", "type": "GUN", - "name": "McMillan TAC-50", + "name": { "str": "McMillan TAC-50" }, "description": "A long-range anti-materiel and anti-personnel sniper rifle made by McMillan Firearms, serving the Canadian Army since 2000 as the C15, and the Navy Seals as the Mk 15 Mod 0. This .50 caliber bolt-action rifle is capable of defeating light vehicles, radar installations and crew served weapons at extreme distances. It notably holds the longest range confirmed sniper kill, as well as the 4th and 5th longest.", "weight": "11020 g", "volume": "3127 ml", diff --git a/data/json/items/gun/762x25.json b/data/json/items/gun/762x25.json index 2fa6a6b7f031a..ef72d99a112be 100644 --- a/data/json/items/gun/762x25.json +++ b/data/json/items/gun/762x25.json @@ -4,7 +4,7 @@ "looks_like": "hk_mp5", "type": "GUN", "reload_noise_volume": 10, - "name": "PPSh-41", + "name": { "str": "PPSh-41" }, "description": "The Soviet-made PPSh-41 is a mass-produced selective-fire submachine gun. It has a relatively high rate of fire.", "weight": "3630 g", "volume": "1750 ml", diff --git a/data/json/items/gun/84x246mm.json b/data/json/items/gun/84x246mm.json index 37231a8645060..8f809d29466f3 100644 --- a/data/json/items/gun/84x246mm.json +++ b/data/json/items/gun/84x246mm.json @@ -6,7 +6,7 @@ "reload_noise_volume": 10, "symbol": "(", "color": "green", - "name": "M3 recoilless rifle", + "name": { "str": "M3 recoilless rifle" }, "description": "Manufactured in Sweden, the Carl Gustav M3 is a breech-loading 84 millimeter man-portable, reusable, multi-role recoilless rifle commonly used by the US military.", "price": 1300000, "material": "steel", diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json index 0901a84db0bcb..e41172a94a1ad 100644 --- a/data/json/items/gun/9mm.json +++ b/data/json/items/gun/9mm.json @@ -631,7 +631,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": "M17", + "name": { "str": "M17" }, "description": "The M17 is a semi-automatic, short recoil operated pistol derived from the SIG Sauer P320.", "weight": "840 g", "volume": "500 ml", diff --git a/data/json/items/gun/9x18.json b/data/json/items/gun/9x18.json index 7a23a072d4faa..5841fae44a748 100644 --- a/data/json/items/gun/9x18.json +++ b/data/json/items/gun/9x18.json @@ -4,7 +4,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": "Makarov PM", + "name": { "str": "Makarov PM" }, "//": "10 and 12-round magazines exist, but were made for the newer PMM, and are not compatible with the old PM.", "description": "The Pistolet Makarova was developed by the Soviet Union to replace the WWII-era TT-33 pistol. It uses the 9x18mm cartridge, which remains in use among various former Soviet countries.", "weight": "730 g", diff --git a/data/json/items/gun/paintball.json b/data/json/items/gun/paintball.json index 013e18a6a7282..3a750e742b7bf 100644 --- a/data/json/items/gun/paintball.json +++ b/data/json/items/gun/paintball.json @@ -6,7 +6,7 @@ "reload_noise_volume": 6, "symbol": "(", "color": "light_gray", - "name": "Paintball gun", + "name": { "str": "Paintball gun" }, "description": "A fairly harmless gun that shoots small paintballs.", "price": 8000, "material": [ "aluminum", "plastic" ], diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json index 33664ae49c2df..536c21dae62ae 100644 --- a/data/json/items/gun/shot.json +++ b/data/json/items/gun/shot.json @@ -188,7 +188,7 @@ "id": "mossberg_930", "copy-from": "shotgun_base", "type": "GUN", - "name": "Mossberg 930 SPX", + "name": { "str": "Mossberg 930 SPX" }, "description": "This semi-automatic offering from Mossberg features a recoil reducing gas system, rifle style sights and a factory-installed picatinny rail. Affordable pricing and decent ergonomics make this a popular entry-level 3-gun shotgun.", "weight": "3402 g", "volume": "2942 ml", @@ -659,7 +659,7 @@ "id": "winchester_1897", "copy-from": "shotgun_base", "type": "GUN", - "name": "M1897 Trench Gun", + "name": { "str": "M1897 Trench Gun" }, "description": "The Winchester 1897 was one of the first commercially successful pump action shotguns. In its 'trench' configuraton it has become a heavily romanticized American icon of World War 1. With its barrel shroud, bayonet lug and 17 inch bayonet, this shotgun is undeniably fearsome in appearance. There aren't any more trenches to clear, so the next zombie infested town will have to suffice.", "weight": "3629 g", "volume": "2564 ml", @@ -671,7 +671,7 @@ "dispersion": 360, "durability": 8, "clip_size": 6, - "modes": [ [ "DEFAULT", "single", 1 ], [ "AUTO", "2-round", 2 ] ], + "modes": [ [ "DEFAULT", "single", 1 ], [ "AUTO", "2 rd.", 2 ] ], "valid_mod_locations": [ [ "accessories", 2 ], [ "stock mount", 1 ], diff --git a/data/json/items/ranged/energy.json b/data/json/items/ranged/energy.json index fcc4f4fd1bb6f..3cf32d6da5f7d 100644 --- a/data/json/items/ranged/energy.json +++ b/data/json/items/ranged/energy.json @@ -6,7 +6,7 @@ "reload_noise_volume": 10, "symbol": "(", "color": "light_gray", - "name": "PPA-5", + "name": { "str": "PPA-5" }, "description": "Portable Plasma Accelerator Model Five, developed by Lockheed Martin Corporation. This device uses highly advanced capacitor banks to create a torus of superheated hydrogen plasma and accelerate it to incredible speed. It was designed to take down heavy vehicles, and was expected to fully enter US Army service not long before the Cataclysm.", "price": 980000, "material": [ "steel", "plastic" ],