From db7e72be2c63350d727ee39a450593b75cfb8684 Mon Sep 17 00:00:00 2001 From: sadenar Date: Sat, 15 Jun 2024 01:02:17 +0200 Subject: [PATCH 1/7] First standardization pass --- data/json/items/gun/22.json | 14 +++++++------- data/json/items/gun/223.json | 12 ++++++------ data/json/items/gun/300.json | 6 +++--- data/json/items/gun/300BLK.json | 6 +++--- data/json/items/gun/338lapua.json | 4 ++-- data/json/items/gun/357sig.json | 6 +++--- data/json/items/gun/36paper.json | 2 +- data/json/items/gun/38.json | 12 ++++++------ data/json/items/gun/38super.json | 4 ++-- data/json/items/gun/40.json | 16 ++++++++-------- data/json/items/gun/40x46mm.json | 2 +- data/json/items/gun/410shot.json | 4 ++-- data/json/items/gun/44paper.json | 2 +- data/json/items/gun/454.json | 4 ++-- data/json/items/gun/4570.json | 6 +++--- data/json/items/gun/45colt.json | 2 +- data/json/items/gun/46.json | 2 +- data/json/items/gun/460.json | 2 +- data/json/items/gun/50.json | 10 +++++----- data/json/items/gun/545x39.json | 4 ++-- data/json/items/gun/66mm.json | 2 +- data/json/items/gun/84x246mm.json | 2 +- data/json/items/gun/atgm.json | 2 +- data/json/items/gun/flintlock.json | 2 +- data/json/items/gun/shot.json | 2 +- data/mods/Aftershock/items/gun/10mm.json | 10 +++++----- data/mods/Aftershock/items/gun/25mm.json | 6 +++--- data/mods/Aftershock/items/gun/5x50.json | 2 +- data/mods/Aftershock/items/gun/7.50mm.json | 12 ++++++------ data/mods/Aftershock/items/gun/laser.json | 6 +++--- data/mods/Aftershock/items/gun/plasma.json | 6 +++--- data/mods/Aftershock/items/gun/shot.json | 8 ++++---- data/mods/Magiclysm/items/enchanted_ranged.json | 6 +++--- data/mods/Xedra_Evolved/items/guns.json | 6 +++--- 34 files changed, 96 insertions(+), 96 deletions(-) diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json index fbd07b0d6d7d6..2bc4ed5d8f587 100644 --- a/data/json/items/gun/22.json +++ b/data/json/items/gun/22.json @@ -260,14 +260,14 @@ "type": "GUN", "reload_noise_volume": 10, "name": { "str": "firefly training pistol" }, - "//": "Was the sig mosquito, has been renamed to the more common GSG firefly", + "//": "Was the SIG Mosquito, has been renamed to the more common GSG Firefly", "description": "A medium sized, .22 caliber semi-automatic pistol, for training with a pistol similar to more powerful pistols. Built from aluminum and polymer components, the weapon is lightweight and concealable, but its chambering is not very powerful.", "variant_type": "gun", "variants": [ { "id": "sig_mosquito", - "name": { "str": "GSG Firefly", "str_pl": "GSG Fireflies" }, - "description": "The GSG firefly is a .22 semi-automatic handgun. While the GSG Firefly started off as the SIG Mosquito, after the Mosquito ceased production, German Sport Guns picked it up and renamed it to the Firefly." + "name": { "str": "GSG Firefly pistol" }, + "description": "The GSG Firefly is a .22 semi-automatic handgun. While the GSG Firefly started off as the SIG Mosquito, after the Mosquito ceased production, German Sport Guns picked it up and renamed it to the Firefly." } ], "ascii_picture": "sig_mosquito", @@ -395,13 +395,13 @@ }, { "id": "ruger_mk3", - "name": { "str": "Ruger Mark III" }, + "name": { "str": "Ruger Mark III pistol" }, "description": "The 3rd version of the Ruger Standard, which replaced production of the Mark II in 2005 and continued until 2016. Features a 5.5 inch barrel and feeds from a 10 round magazine.", "weight": 19 }, { "id": "ruger_mk4", - "name": { "str": "Ruger Mark IV" }, + "name": { "str": "Ruger Mark IV pistol" }, "description": "The 4th, and most modern version of the Ruger Standard. Still in production since 2016, and has a simplified disassembly feature. Has a 5.5 inch barrel and feeds from a 10 round magazine.", "weight": 135 } @@ -439,7 +439,7 @@ "variants": [ { "id": "ruger_charger", - "name": { "str": "Ruger 22 Charger" }, + "name": { "str": "Ruger 22 Charger pistol" }, "description": "This gun is essentially a shortened 10/22, feeding from the same magazines. While it does feature a shorter barrel and a lack of a stock, it is a fair bit lighter, and comes included with a bipod to more steadily plink away at the undead." } ], @@ -491,7 +491,7 @@ "variants": [ { "id": "ruger_charger_auto", - "name": { "str": "full-auto Ruger 22 Charger" }, + "name": { "str": "full-auto Ruger 22 Charger pistol" }, "description": "A Ruger 22 Charger modified post-Cataclysm to selective fire. While the .22 round isn't very powerful, full auto makes it a lot more effective, and still easily controllable in full auto even with the lack of a stock." } ], diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json index f6a9d1b33ec27..37575051cc07a 100644 --- a/data/json/items/gun/223.json +++ b/data/json/items/gun/223.json @@ -2,7 +2,7 @@ { "id": "modular_ar15", "type": "GUN", - "name": { "str": "AR-15" }, + "name": { "str": "AR-15 rifle" }, "copy-from": "rifle_auto", "//": "This is assumed to be the standard model matching the (currently not in-game) M16. Tileset whitelist for rifles", "description": "This ubiquitous rifle is the forefather of the M16 rifle series. It is lightweight and accurate, but will malfunction if not properly maintained. This one is a semi-automatic civilian version.", @@ -93,7 +93,7 @@ "copy-from": "rifle_semi", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str": "FS2000" }, + "name": { "str": "FS2000 carbine" }, "description": "A sleek bullpup carbine designed by FN Herstal, complete with an integrated sight accessory rail. The forward ejecting action and ambidextrous controls make firing comfortable for both left and right-handed shooting. The whole rifle is well sealed from mud and dust for reliability, but this makes it incompatible with many aftermarket magazines.", "weight": "3319 g", "volume": "7986 ml", @@ -182,7 +182,7 @@ "id": "scar_l", "copy-from": "rifle_semi", "type": "GUN", - "name": { "str": "FN SCAR-L" }, + "name": { "str": "FN SCAR-L assault rifle" }, "description": "A highly accurate and modular assault rifle specially designed for the United States Special Operations Command. The 'L' in its name stands for light, as it uses the lightweight .223 round.", "ascii_picture": "scar-L", "weight": "3490 g", @@ -439,7 +439,7 @@ "variants": [ { "id": "modular_m16a3", - "name": { "str": "M16A3 rifle" }, + "name": { "str": "M16A3 assault rifle" }, "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. This one is a relatively rare M16A3, with full auto capability." }, { @@ -514,7 +514,7 @@ "variants": [ { "id": "sig553", - "name": { "str": "SIG SG 556" }, + "name": { "str": "SIG SG 556 rifle" }, "description": "The SG 556 is a civilian model of the Swiss SIG SG 550 series, manufactured in New Hampshire. It lacks any automatic fire capability and has a 16 inch barrel, but still retains a folding stock, with the feature of feeding from STANAG magazines instead of the SG 550 series magazines." } ], @@ -612,7 +612,7 @@ "variants": [ { "id": "zpapm90", - "name": { "str": "ZPAP M90" }, + "name": { "str": "ZPAP M90 rifle" }, "description": "A Serbian-made AK pattern rifle made by Zastava in 5.56x45mm NATO. To avoid import restrictions, Zastava USA has added a number of American-made parts." } ], diff --git a/data/json/items/gun/300.json b/data/json/items/gun/300.json index 94104bec6ad98..6e5fa883004b2 100644 --- a/data/json/items/gun/300.json +++ b/data/json/items/gun/300.json @@ -4,7 +4,7 @@ "copy-from": "rifle_base", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str_sp": "M2010 ESR" }, + "name": { "str": "M2010 ESR sniper rifle" }, "//": "http://www.guns.com/2012/05/17/remington-xm2010-army-sniper-system-esr-now-in-stores/.", "description": "A bolt-action, box-magazine-fed sniper rifle chambered in the powerful .300 Winchester Magnum round. The M2010 had completely replaced the M24 rifle series by 2017.", "weight": "5443 g", @@ -28,7 +28,7 @@ "copy-from": "rifle_manual", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str_sp": "Weatherby Mark V" }, + "name": { "str": "Weatherby Mark V rifle" }, "//": "MSRP, believe it or not.", "description": "The Weatherby Mark V is one of the world's finest bolt-action rifles. Designed in 1955 by Roy Weatherby and Fred Jennie, it has a strong action designed to safely fire high-pressure cartridges. These rifles were presented to celebrities as part of a marketing campaign.", "weight": "3730 g", @@ -67,7 +67,7 @@ "copy-from": "rifle_manual", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str_sp": "Winchester Model 70" }, + "name": { "str": "Winchester Model 70 rifle" }, "description": "The Winchester Model 70 is a bolt-action sporting rifle. It has an iconic place in American sporting culture and has been held in high regard by shooters since it was introduced in 1936.", "weight": "3520 g", "volume": "3205 ml", diff --git a/data/json/items/gun/300BLK.json b/data/json/items/gun/300BLK.json index 86d4c45add301..617ce05da285b 100644 --- a/data/json/items/gun/300BLK.json +++ b/data/json/items/gun/300BLK.json @@ -4,7 +4,7 @@ "copy-from": "rifle_auto", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str": "Remington ACR .300BLK" }, + "name": { "str": "Remington ACR .300BLK carbine" }, "description": "This carbine was developed for military use in the early 21st century. It is damaging and accurate, though its rate of fire is a bit slower than competing carbines. This version is chambered for the .300 AAC Blackout round.", "weight": "3419 g", "volume": "3310 ml", @@ -55,7 +55,7 @@ "copy-from": "rifle_semi", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str": "IWI Tavor X95 .300BLK" }, + "name": { "str": "IWI Tavor X95 .300BLK assault rifle" }, "description": "The IWI Tavor X95 (also called Micro-Tavor or MTAR) is an Israeli bullpup assault rifle designed and produced by Israel Weapon Industries. This is the civilian version chambered for .300 AAC Blackout.", "weight": "3610 g", "volume": "2400 ml", @@ -116,7 +116,7 @@ "copy-from": "rifle_semi", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str": "SIG MCX Rattler SBR" }, + "name": { "str": "SIG MCX Rattler SBR rifle" }, "description": "A gas-operated rifle, with a short 5.5 inch barrel, built-in thin folding stock, and full rail mount on the upper receiver. This particular one is a select-fire military version.", "weight": "2590 g", "volume": "2850 ml", diff --git a/data/json/items/gun/338lapua.json b/data/json/items/gun/338lapua.json index 670fb05545be4..26d531912548c 100644 --- a/data/json/items/gun/338lapua.json +++ b/data/json/items/gun/338lapua.json @@ -10,7 +10,7 @@ "variants": [ { "id": "tac338", - "name": { "str": "McMillan Tac-338 rifle" }, + "name": { "str": "McMillan Tac-338 sniper rifle" }, "description": "Chambering the .338 Lapua cartridge, the Tac-338 is a high-precision, bolt-action sniper rifle that, before the Cataclysm, complemented the arsenal of the US Navy Special Warfare unit. Providing Navy SEAL marksmen with the capability to land effective shots on targets at a typical range of 1600 meters, a valuable capability for the long-distance engagements prevalent during the US army's war on terror, the rifle comes kitted with an adjustable cheek pad, butt hook, and muzzle break." } ], @@ -136,7 +136,7 @@ "variants": [ { "id": "axmc", - "name": { "str": "Accuracy International AXMC rifle" }, + "name": { "str": "Accuracy International AXMC sniper rifle" }, "description": "Produced by the British precision rifle company Accuracy International, the AX Modular Caliber Weapon System is a highly-accurate combat sniper rifle offered to military, law enforcement, and civilian precision marksmen. The rifle is compatible with a wide range of aftermarket components, including caliber conversion kits, and is built upon a base aluminum chassis, into which the weapon's parts may be installed or removed at the user's discretion." } ], diff --git a/data/json/items/gun/357sig.json b/data/json/items/gun/357sig.json index 546221f93d1fa..1d16a0482cd2e 100644 --- a/data/json/items/gun/357sig.json +++ b/data/json/items/gun/357sig.json @@ -4,7 +4,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": { "str": "SIG P226" }, + "name": { "str": "SIG P226 pistol" }, "description": "A SIG Sauer P226 chambered for .357 SIG. The P226 is a DA/SA, short-recoil operated semi-automatic pistol.", "weight": "964 g", "volume": "549 ml", @@ -29,7 +29,7 @@ "id": "glock_31", "copy-from": "glock_22", "type": "GUN", - "name": { "str": "Glock 31" }, + "name": { "str": "Glock 31 pistol" }, "description": "A full size .357 SIG Glock pistol. It is extremely similar to the Glock 22, and could be converted to fire .40 S&W by switching the barrel.", "ascii_picture": "glock_20", "weight": "660 g", @@ -46,7 +46,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": { "str": "SIG P320 Compact" }, + "name": { "str": "SIG P320 Compact pistol" }, "description": "The P320 Compact is a semi-automatic, short recoil operated pistol. This one is chambered for .357 SIG.", "ascii_picture": "sig_p320", "weight": "731 g", diff --git a/data/json/items/gun/36paper.json b/data/json/items/gun/36paper.json index dce0aa0cd9061..75ff266669430 100644 --- a/data/json/items/gun/36paper.json +++ b/data/json/items/gun/36paper.json @@ -4,7 +4,7 @@ "copy-from": "pistol_revolver_cap_ball", "looks_like": "sw_619", "type": "GUN", - "name": { "str_sp": "Colt M1861 Navy" }, + "name": { "str": "Colt M1861 Navy revolver" }, "description": "The Colt Model 1861 Navy cap & ball .36-caliber revolver was a six-shot, single-action percussion weapon produced by Colt's Manufacturing Company from 1861 until 1873.", "weight": "1184 g", "volume": "540 ml", diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json index 68e762e6d4082..0912256126da5 100644 --- a/data/json/items/gun/38.json +++ b/data/json/items/gun/38.json @@ -4,7 +4,7 @@ "looks_like": "glock_17", "type": "GUN", "reload_noise_volume": 10, - "name": { "str": "2 Shot Special" }, + "name": { "str": "2 Shot Special pistol" }, "//": "Volume+barrel length based off a Bond Arms derringer. with extra length in the barrel.", "description": "A crudely made double barrel pistol firing .38 Special ammo. Unfortunately, the name is less about the double barrels and more about the number of shots you'll get before it breaks down on you.", "ascii_picture": "2_shot_special", @@ -37,7 +37,7 @@ "copy-from": "pistol_revolver", "looks_like": "sw_619", "type": "GUN", - "name": { "str_sp": "S&W Model 10" }, + "name": { "str": "S&W Model 10 revolver" }, "description": "A six-shot revolver, produced since 1899 and known as the most popular handgun of the 20th century. It has a swing-out cylinder for ease of reloading.", "weight": "975 g", "volume": "402 ml", @@ -69,7 +69,7 @@ "copy-from": "pistol_revolver", "looks_like": "sw_619", "type": "GUN", - "name": { "str_sp": "Manurhin MR 73" }, + "name": { "str": "Manurhin MR 73 revolver" }, "description": "A finely made .357 Magnum revolver with a 4 inch barrel. It has adjustable sights, big plastic grips and a very smooth trigger.", "weight": "970 g", "volume": "600 ml", @@ -112,7 +112,7 @@ "copy-from": "gun_base", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str": "pipe rifle: .38 Special", "str_pl": "pipe rifles: .38 Special" }, + "name": { "str": ".38 Special pipe rifle" }, "description": "A home-made rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.", "ascii_picture": "ps_pipe_gun", "weight": "2114 g", @@ -152,7 +152,7 @@ "copy-from": "pistol_revolver", "looks_like": "sw_619", "type": "GUN", - "name": { "str_sp": "Ruger LCR .38" }, + "name": { "str": "Ruger LCR .38 revolver" }, "description": "A compact, double-action-only revolver designed for easy concealment, with a stainless steel cylinder and aluminum frame.", "weight": "382 g", "volume": "321 ml", @@ -194,7 +194,7 @@ "copy-from": "pistol_revolver", "//": "Tileset whitelist for revolvers.", "type": "GUN", - "name": { "str_sp": "S&W 619" }, + "name": { "str": "S&W 619 revolver" }, "description": "A seven-round .357 revolver sold by Smith & Wesson. Can also fire .38 Special. It features a fixed rear sight and a reinforced frame.", "ascii_picture": "sw_610", "weight": "1074 g", diff --git a/data/json/items/gun/38super.json b/data/json/items/gun/38super.json index 46b63b41fee46..ab06304d4917e 100644 --- a/data/json/items/gun/38super.json +++ b/data/json/items/gun/38super.json @@ -4,7 +4,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": { "str_sp": "AF2011A1 .38 Super" }, + "name": { "str": "AF2011A1 .38 Super pistol" }, "description": "A double-barrel semi-automatic pistol of Italian origin, firing two bullets per shot, a derivative of the M1911 pistol.", "weight": "2041 g", "volume": "716 ml", @@ -42,7 +42,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": { "str": "M1911A1" }, + "name": { "str": "M1911A1 pistol" }, "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/40.json b/data/json/items/gun/40.json index 683636ce30a00..726097ee8c810 100644 --- a/data/json/items/gun/40.json +++ b/data/json/items/gun/40.json @@ -4,7 +4,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": { "str": "Beretta 90-two .40 S&W" }, + "name": { "str": "Beretta 90-two .40 S&W pistol" }, "description": "A more modern version of Beretta's popular 92 series of handguns, the 90-two performs largely the same. The main difference is a sleeker, almost futuristic-looking design owed in large part to the polymer underbarrel rail cover. This one is chambered in .40 S&W.", "weight": "905 g", "volume": "554 ml", @@ -28,7 +28,7 @@ "looks_like": "glock_17", "type": "GUN", "reload_noise_volume": 10, - "name": { "str_sp": "Glock 22" }, + "name": { "str": "Glock 22 pistol" }, "description": "A .40 S&W variant of the popular Glock 17 pistol. The standard-issue firearm of the FBI and of countless other law enforcement agencies worldwide.", "ascii_picture": "glock_17", "weight": "645 g", @@ -69,7 +69,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": { "str": "Beretta Px4 Storm .40 S&W" }, + "name": { "str": "Beretta Px4 Storm .40 S&W pistol" }, "description": "Lighter than Beretta's iconic 92 series of guns, the Px4 Storm was built by utilizing light-weight polymer construction with steel inserts. Its shape was also optimized for concealed carry. This one is chambered in .40 S&W.", "weight": "785 g", "volume": "520 ml", @@ -94,7 +94,7 @@ "looks_like": "glock_17", "type": "GUN", "reload_noise_volume": 10, - "name": { "str_sp": "SIG Pro .40" }, + "name": { "str": "SIG Pro .40 pistol" }, "description": "Originally marketed as a lightweight and compact alternative to older SIG handguns, the Pro .40 is popular among European police forces.", "ascii_picture": "sig_pro_40", "weight": "822 g", @@ -134,7 +134,7 @@ "copy-from": "smg_base", "looks_like": "hk_mp5", "type": "GUN", - "name": { "str": "Luty SMG: .40 S&W", "str_pl": "Luty SMGs: .40 S&W" }, + "name": { "str": ".40 S&W Luty SMG" }, "description": "A Luty pattern makeshift smoothbore SMG crudely constructed out of various steel parts using advanced powered hand tools; likely one of the most complex guns that is feasible to make outside of a machine shop, but still very unreliable. This one is chambered for .40 S&W cartridges and accepts custom-made makeshift magazines.", "//": "Crafting recipe must make use of angle grinder, bench grinder, set square and vise, which don't yet exist in game. No factory mags until UMP40, mp5/40, or other straight .40 mags are implemented.", "weight": "3520 g", @@ -174,7 +174,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": { "str": "Browning Hi-Power .40 S&W" }, + "name": { "str": "Browning Hi-Power .40 S&W pistol" }, "description": "The Browning Hi-Power is a semi-automatic handgun developed shortly before the Second World War. Widely issued since then, it remains in use by India, Canada, and Australia. This is a commercial variant produced by Browning Arms in .40 S&W.", "weight": "907 g", "volume": "274 ml", @@ -199,7 +199,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": { "str": "Walther PPQ .40 S&W" }, + "name": { "str": "Walther PPQ .40 S&W pistol" }, "description": "The Walther PPQ is a semi-automatic pistol originating from the Walther P99QA, and maintains compatibility with some of its predecessor's accessories. This model is chambered in .40 S&W.", "weight": "625 g", "volume": "440 ml", @@ -229,7 +229,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": { "str_sp": "Hi-Point Model JCP" }, + "name": { "str": "Hi-Point Model JCP pistol" }, "description": "The Hi-Point Model JCP is a blowback operated semi-automatic pistol designed by Hi-Point Firearms, which is known for making inexpensive firearms, and for making said firearms bulky and uncomfortable. Hi-Points have slides made with a zinc pot-metal which is relatively fragile compared to steel slides.", "weight": "990 g", "volume": "546 ml", diff --git a/data/json/items/gun/40x46mm.json b/data/json/items/gun/40x46mm.json index ed42bf4cb03f7..b4d8702d6a9ac 100644 --- a/data/json/items/gun/40x46mm.json +++ b/data/json/items/gun/40x46mm.json @@ -99,7 +99,7 @@ "copy-from": "launcher_base", "looks_like": "m79", "type": "GUN", - "name": { "str_sp": "Milkor MGL" }, + "name": { "str": "Milkor MGL" }, "description": "The Milkor Multi-Grenade Launcher is designed to compensate for the drawback of single-shot grenade launchers by allowing sustained heavy firepower. However, it is still slow to reload and must be used with careful planning.", "weight": "5300 g", "volume": "4230 ml", diff --git a/data/json/items/gun/410shot.json b/data/json/items/gun/410shot.json index 38f46cd7b5738..400ce3a6bca3e 100644 --- a/data/json/items/gun/410shot.json +++ b/data/json/items/gun/410shot.json @@ -4,7 +4,7 @@ "copy-from": "shotgun_base", "looks_like": "remington_870", "type": "GUN", - "name": { "str": "Saiga-410" }, + "name": { "str": "Saiga-410 shotgun" }, "description": "The Saiga-410 is a semi-automatic shotgun designed on the same Kalashnikov pattern as the AK-47 rifle. It reloads with a magazine, rather than one shell at a time like most shotguns.", "weight": "3400 g", "volume": "5762 ml", @@ -27,7 +27,7 @@ "copy-from": "shotgun_s", "looks_like": "remington_870", "type": "GUN", - "name": { "str": "Winchester M37 .410" }, + "name": { "str": "Winchester M37 .410 shotgun" }, "description": "A single-shot break-action shotgun, chambered in .410 bore. Designed as a lower-recoil alternative to 12 gauge shotguns, it is light and easy to manufacture.", "weight": "2948 g", "volume": "1748 ml", diff --git a/data/json/items/gun/44paper.json b/data/json/items/gun/44paper.json index db53b6cefc178..7d33e6655b817 100644 --- a/data/json/items/gun/44paper.json +++ b/data/json/items/gun/44paper.json @@ -4,7 +4,7 @@ "copy-from": "pistol_revolver_cap_ball", "looks_like": "sw_619", "type": "GUN", - "name": { "str_sp": "Colt M1860 Army" }, + "name": { "str": "Colt M1860 Army revolver" }, "description": "The Colt Army Model 1860 is a cap & ball .44-caliber revolver. It was used during the American Civil War, and made by Colt's Manufacturing Company.", "weight": "1188 g", "volume": "486 ml", diff --git a/data/json/items/gun/454.json b/data/json/items/gun/454.json index 17325ff882cdd..c0c7bf1b9477f 100644 --- a/data/json/items/gun/454.json +++ b/data/json/items/gun/454.json @@ -4,7 +4,7 @@ "copy-from": "pistol_revolver", "looks_like": "sw_619", "type": "GUN", - "name": { "str_sp": "Taurus Raging Bull" }, + "name": { "str": "Taurus Raging Bull revolver" }, "description": "The Taurus Raging Bull is a 5-shot revolver chambered in .454 Casull. It has impressive stopping power.", "weight": "1502 g", "volume": "565 ml", @@ -37,7 +37,7 @@ "copy-from": "raging_bull", "looks_like": "sw_619", "type": "GUN", - "name": { "str_sp": "Taurus Raging Judge Magnum" }, + "name": { "str": "Taurus Raging Judge Magnum revolver" }, "description": "The Taurus Raging Judge Magnum is a 6-shot revolver chambered in .454 Casull. It can fire .410 shotshells and .45 Colt cartridges as well.", "weight": "2070 g", "volume": "1175 ml", diff --git a/data/json/items/gun/4570.json b/data/json/items/gun/4570.json index 1c8c9dc379b02..9db1e64f6a0c3 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": "modular_ar15", "type": "GUN", - "name": { "str_sp": "Marlin 1895 SBL" }, + "name": { "str": "Marlin 1895 SBL rifle" }, "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": "3629 g", "volume": "1829 ml", @@ -41,7 +41,7 @@ "copy-from": "pistol_revolver", "looks_like": "sw_619", "type": "GUN", - "name": { "str": "Magnum Research BFR" }, + "name": { "str": "Magnum Research BFR revolver" }, "//": "This is the 7.5in barrel model", "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", @@ -77,7 +77,7 @@ "copy-from": "gun_base", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str_sp": "1874 Sharps" }, + "name": { "str": "1874 Sharps rifle" }, "//": "Specs from Uberti 32in barrel Special", "description": "A reproduction of an antique single-shot .45-70 rifle once used to hunt buffalo and other large game in the late 19th Century. Highly accurate and powerful for the time, this one is made to handle modern smokeless ammunition.", "weight": "4819 g", diff --git a/data/json/items/gun/45colt.json b/data/json/items/gun/45colt.json index 34edd8f55f953..45d00550825b3 100644 --- a/data/json/items/gun/45colt.json +++ b/data/json/items/gun/45colt.json @@ -79,7 +79,7 @@ "copy-from": "pistol_revolver", "looks_like": "sw_619", "type": "GUN", - "name": { "str_sp": "Uberti Cattleman" }, + "name": { "str": "Uberti Cattleman revolver" }, "description": "This 7.5\" barreled Uberti Cattleman is a modern reproduction of the legendary Colt Single Action Army, or Colt Peacemaker, one of the first revolvers to use a modern self-contained cartridge. Made famous by Westerns, it is still in demand for Cowboy Action Shooting, reenactors, and collectors. Unlike modern revolvers, the cylinder cannot swing out for loading, and spent brass must be ejected one at a time.", "weight": "1048 g", "volume": "324 ml", diff --git a/data/json/items/gun/46.json b/data/json/items/gun/46.json index 2090db0d0e9f5..415f143b61f14 100644 --- a/data/json/items/gun/46.json +++ b/data/json/items/gun/46.json @@ -4,7 +4,7 @@ "looks_like": "hk_mp5", "type": "GUN", "reload_noise_volume": 10, - "name": { "str": "H&K MP7A2" }, + "name": { "str": "H&K MP7A2 submachine gun" }, "description": "Designed as a personal defense weapon, the MP7 fires the high-powered 4.6x30mm round while being lightweight, compact in size, and practically recoil-free.", "weight": "1960 g", "volume": "2083 ml", diff --git a/data/json/items/gun/460.json b/data/json/items/gun/460.json index 03e6ce400c281..76e8b1d7a6bb0 100644 --- a/data/json/items/gun/460.json +++ b/data/json/items/gun/460.json @@ -4,7 +4,7 @@ "copy-from": "m1911", "looks_like": "m1911", "type": "GUN", - "name": { "str": "1911-460" }, + "name": { "str": "1911-460 pistol" }, "description": "This 1911 has been customized to chamber powerful .460 Rowland ammunition. It now sports a large, integral compensator to aid in taming recoil and reducing slide velocity. Notably, normal .45 ACP can also be fired through the weapon.", "price": "1 kUSD 668 USD", "price_postapoc": "32 USD 50 cent", diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json index 3aacf97f984cf..809bfae7f292d 100644 --- a/data/json/items/gun/50.json +++ b/data/json/items/gun/50.json @@ -4,7 +4,7 @@ "copy-from": "rifle_semi", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str_sp": "Barrett M107A1" }, + "name": { "str_sp": "Barrett M107A1 rifle" }, "//": "Price based on unit cost quote for fiscal year 2005 listed at inetres.com, with gunmod modifiers to be added later.", "description": "A large, shoulder-fired, .50 caliber anti-materiel rifle. Its large size, recoil, and noise is offset by its damage and range.", "weight": "12950 g", @@ -31,7 +31,7 @@ "copy-from": "rifle_auto", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str_sp": "M2HB Browning HMG" }, + "name": { "str": "M2HB Browning HMG" }, "description": "A heavy machine gun used by the US Military from its inception to the Cataclysm, and even rarely by Cataclysm survivors. Its massive size and design make it impossible to use unless deployed or mounted to a vehicle.", "weight": "38000 g", "volume": "9020 ml", @@ -67,7 +67,7 @@ "copy-from": "rifle_semi", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str": "AI AS50" }, + "name": { "str": "AI AS50 rifle" }, "description": "Developed by the British firearms producer Accuracy International, the AI AS50 is a semi-automatic .50 caliber anti-materiel rifle produced for the British armed forces and the United States Navy SEALs. With a free-floated barrel, titanium frame, and an accessory rail integrated into the weapon's machined-steel receiver with two others mounted on each side of the barrel shroud, the rifle features commendable ergonomics and a notable level of modularity. Providing operators with the capability to engage targets at a maximum estimated range of around 1500 meters, the firearm feeds from detachable 10-round box magazines.", "weight": "12200 g", "volume": "8900 ml", @@ -95,7 +95,7 @@ "copy-from": "rifle_manual", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str": "McMillan TAC-50" }, + "name": { "str": "McMillan TAC-50 rifle" }, "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": "11790 g", "volume": "6500 ml", @@ -123,7 +123,7 @@ "copy-from": "rifle_manual", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str": "Serbu BFG-50" }, + "name": { "str": "Serbu BFG-50 rifle" }, "description": "A single-shot, bolt-action rifle made by Serbu Firearms, the BFG-50 is a very affordable firearm for those wishing to shoot .50 BMG.", "weight": "8500 g", "volume": "4000 ml", diff --git a/data/json/items/gun/545x39.json b/data/json/items/gun/545x39.json index 6575ca141715e..bf96855f038f6 100644 --- a/data/json/items/gun/545x39.json +++ b/data/json/items/gun/545x39.json @@ -10,12 +10,12 @@ "variants": [ { "id": "ak74_fixed", - "name": { "str": "Kalashnikov AK-74", "str_pl": "Kalashnikov AK-74 rifles" }, + "name": { "str": "Kalashnikov AK-74 rifle" }, "description": "A rifle of the Cold War, or at least a dead ringer for it, this weapon is a semi-automatic clone of the Soviet Union's standard assault rifle following 1974. Either a locally-built replica or produced from an imported, foreign parts kit, fitted with a fixed wooden buttstock, a side-mounted optics rail, and a barrel threaded for suppressors, the rifle's chambered for the Russian 5.45x39mm cartridge and feeds from AK-74 magazines. A Communist gun built in Capitalist America; bar hoofing it to eastern Europe, the weapon's likely the closest you'll ever get to laying your palms on a Russian Kalashnikov." }, { "id": "ak74_folding", - "name": { "str": "Kalashnikov AKS-74", "str_pl": "Kalashnikov AKS-74 rifles" }, + "name": { "str": "Kalashnikov AKS-74 rifle" }, "description": "An American copy of a Soviet assault rifle, a strange piece of ordinance using some weird proprietary Russian ammunition—all these terms and more can describe this rifle: a semi-automatic clone of the Kalashnikov AKS-74, the descendent of the iconic AKM. Either a locally-built replica or produced from an imported, foreign parts kit, the firearm possesses a triangular, folding buttstock, a side-mounted optics rail, and a threaded barrel for attaching muzzle devices. The weapon fires the Soviet 5.45x39mm cartridge—a unicorn even in the American gun wilderness—and feeds said unicorn ammunition from AK-74 magazines." } ], diff --git a/data/json/items/gun/66mm.json b/data/json/items/gun/66mm.json index 75df49d276cea..40c458869bfc7 100644 --- a/data/json/items/gun/66mm.json +++ b/data/json/items/gun/66mm.json @@ -11,7 +11,7 @@ "variants": [ { "id": "m202_flash", - "name": { "str_sp": "M202A1 FLASH" }, + "name": { "str": "M202A1 FLASH launcher" }, "description": "An American rocket launcher designed in the 1970s to replace WWII-era flamethrowers still in use in Vietnam. It has four barrels sharing the 66mm caliber of the M72 LAW." } ], diff --git a/data/json/items/gun/84x246mm.json b/data/json/items/gun/84x246mm.json index 2d115b5ee4fa1..98bd57ebb87ce 100644 --- a/data/json/items/gun/84x246mm.json +++ b/data/json/items/gun/84x246mm.json @@ -47,7 +47,7 @@ "id": "AT4", "type": "GUN", "copy-from": "m3_carlgustav", - "name": { "str": "AT4" }, + "name": { "str": "AT4 recoilless rifle" }, "description": "A milspec recoilless rifle - an 84mm unguided, portable, single-shot recoilless smoothbore weapon used primarily by the US military.", "extend": { "flags": [ "FIRE_TWOHAND", "NO_REPAIR", "NO_RELOAD", "NO_UNLOAD" ] }, "delete": { "flags": [ "RELOAD_ONE" ] }, diff --git a/data/json/items/gun/atgm.json b/data/json/items/gun/atgm.json index 317230df6b74f..8c5847149e243 100644 --- a/data/json/items/gun/atgm.json +++ b/data/json/items/gun/atgm.json @@ -4,7 +4,7 @@ "copy-from": "gun_base", "looks_like": "m79", "type": "GUN", - "name": { "str_sp": "BGM-71F TOW" }, + "name": { "str_sp": "BGM-71F TOW launcher" }, "description": "A launcher for anti-tank guided missiles, capable of being deployed as a crew-served weapon or mounted on vehicles. While fairly accurate, it isn't fire-and-forget.", "weight": "93000 g", "volume": "25 L", diff --git a/data/json/items/gun/flintlock.json b/data/json/items/gun/flintlock.json index 4b836fb5bf414..c8ec9ee6b51fd 100644 --- a/data/json/items/gun/flintlock.json +++ b/data/json/items/gun/flintlock.json @@ -28,7 +28,7 @@ "id": "carbine_flintlock_double", "copy-from": "carbine_flintlock", "type": "GUN", - "name": { "str": "handmade double-barrel flintlock" }, + "name": { "str": "handmade double-barrel flintlock carbine" }, "description": "A compact muzzle-loading rifle combining a pair of rudimentary flintlock actions and two barrels. Whereas an antique multiple-barrel flintlock is an intricate work of gunsmithing, this weapon is simpler yet still serviceable.", "clip_size": 2, "price": "430 USD", diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json index 59320fdd4fe20..45257e5e5eabe 100644 --- a/data/json/items/gun/shot.json +++ b/data/json/items/gun/shot.json @@ -606,7 +606,7 @@ "variants": [ { "id": "streetsweeper", - "name": { "str": "Cobray Streetsweeper" }, + "name": { "str": "Cobray Streetsweeper revolver shotgun" }, "description": "Less shotgun and more comically oversized revolver, the Cobray Streetsweeper sold poorly before it was deemed a destructive device. The cylinder is driven by a clockspring, cannot be indexed by hand, and must be ejected with an ejector rod. Its unique design allows for all 12 shells to be fired in under 3 seconds, as demonstrated by the ATF technical branch." } ], diff --git a/data/mods/Aftershock/items/gun/10mm.json b/data/mods/Aftershock/items/gun/10mm.json index 8f473063fe320..7932984699ed6 100644 --- a/data/mods/Aftershock/items/gun/10mm.json +++ b/data/mods/Aftershock/items/gun/10mm.json @@ -15,7 +15,7 @@ }, { "id": "branded", - "name": { "str": "Seyfert 84K" }, + "name": { "str": "Seyfert 84K pistol" }, "description": "Commonly carried by shipping crews that can afford it, Seyfert Armistice's 84K pistol doesn't particularly shine or show anything special but it keeps you safe on long journeys in the vast dark of Orion's Arm.", "weight": 3 } @@ -52,7 +52,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": { "str": "MarSec. 4" }, + "name": { "str": "MarSec. 4 pistol" }, "description": { "//NOLINT(cata-text-style)": "not a period after 'MarSec'", "str": "Dependable, reliable, classic. The MarSec. 4 is the combat pistol made for those who can differentiate real quality from glued-on tech." @@ -90,7 +90,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": { "str": "W1011 Silvergram" }, + "name": { "str": "W1011 Silvergram pistol" }, "description": "A finely sculpted white and silver pistol entrusted to Wraitheon's corporate elite. It employs advanced targeting and precision guiding capabilities to deliver devastating bursts of guided 10mm microjet darts. Firing is as expensive as it looks.", "weight": "780 g", "volume": "480 ml", @@ -109,12 +109,12 @@ "variants": [ { "id": "silverhawk", - "name": { "str": "W1011 Silverhawk" }, + "name": { "str": "W1011 Silverhawk pistol" }, "description": "A Silvergram smart pistol given a far less conspicuous \"military carbon\" black finish. Its performance and smart targeting capacities are otherwise identical." }, { "id": "lx", - "name": { "str": "W1011 Silvergram" }, + "name": { "str": "W1011 Silvergram pistol" }, "description": "A finely sculpted white and silver pistol entrusted to Wraitheon's corporate elite. It employs advanced targeting and precision guiding capabilities to deliver devastating bursts of guided 10mm microjet darts. Firing is as expensive as it looks." } ], diff --git a/data/mods/Aftershock/items/gun/25mm.json b/data/mods/Aftershock/items/gun/25mm.json index a787e3b5dcccd..98a3ade75adc8 100644 --- a/data/mods/Aftershock/items/gun/25mm.json +++ b/data/mods/Aftershock/items/gun/25mm.json @@ -4,7 +4,7 @@ "looks_like": "m79", "type": "GUN", "reload_noise_volume": 10, - "name": { "str": "Gibson S86" }, + "name": { "str": "Gibson S86 launcher" }, "description": "Manufactured by Gibson Armory, the S86 is a light-weight grenade launcher designed to take care of moderately armored opponents. While the S86 firepower is nothing to truly gawk at, it still packs quite a punch both for the target and user and is usually mounted as it is impossible to fire with average strength.", "weight": "2700 g", "volume": "2800 ml", @@ -48,7 +48,7 @@ "looks_like": "m79", "type": "GUN", "reload_noise_volume": 10, - "name": { "str_sp": "1025 Goa" }, + "name": { "str": "1025 Goa rifle" }, "description": "A powerful, single shot 25mm rifle, heavy under the weight of several recoil dampening mechanisms. Designed by the now defunct Goa Firearms, it was originally conceived as a luxury rifle for sport hunting alien megafauna.", "weight": "3500 g", "volume": "450 ml", @@ -85,7 +85,7 @@ "looks_like": "m79", "type": "GUN", "reload_noise_volume": 10, - "name": { "str": "Wraitheon Armory 2519" }, + "name": { "str": "Wraitheon Armory 2519 smart sniper platform" }, "description": "The much feared 2519 smart sniper platform leverages advanced ballistic targeting and guidance computers to deliver heavy munitions with unerring precision. Its undisputed lethality makes it a rare sight outside of the company's max security divisions.", "weight": "3500 g", "volume": "450 ml", diff --git a/data/mods/Aftershock/items/gun/5x50.json b/data/mods/Aftershock/items/gun/5x50.json index a5ceb6484a8c4..609e5ed23c26c 100644 --- a/data/mods/Aftershock/items/gun/5x50.json +++ b/data/mods/Aftershock/items/gun/5x50.json @@ -19,7 +19,7 @@ "looks_like": "hk_mp5", "type": "GUN", "reload_noise_volume": 10, - "name": { "str": "RM216 SPIW" }, + "name": { "str": "RM216 SPIW carbine" }, "description": "This light carbine fires 5x50mm armor-piercing flechette cartridges. Classified as a special purpose individual weapon, this advanced firearm was developed by Rivtech for the US military shortly before the end of the world. Designed to be fired in bursts, it excels in close combat.", "weight": "1302 g", "volume": "1250 ml", diff --git a/data/mods/Aftershock/items/gun/7.50mm.json b/data/mods/Aftershock/items/gun/7.50mm.json index c3ff62001e175..3f89fe18e4d10 100644 --- a/data/mods/Aftershock/items/gun/7.50mm.json +++ b/data/mods/Aftershock/items/gun/7.50mm.json @@ -3,7 +3,7 @@ "id": "afs_marsec_t72", "type": "GUN", "copy-from": "sw629", - "name": { "str": "MarSec. T72" }, + "name": { "str": "MarSec. T72 revolver" }, "description": "A massive, unwieldy revolver, using combined magnetic and chemical propulsion to fire 7.50mm rounds at energies that rival a sniping platform. It additionally features a secondary barrel for a single 00 shot shell.\n\nThe T72 remains a relic of the early hyperspace era, meant to be used by and against the posthuman. Its perhaps most notable for its use by fictional rebel figures than for any sort of actual combat effectiveness.", "weight": "2204 g", "volume": "1750 ml", @@ -53,7 +53,7 @@ "copy-from": "rifle_auto", "looks_like": "ar15", "type": "GUN", - "name": { "str": "Accipiter Hawk-00" }, + "name": { "str": "Accipiter Hawk-00 LMG" }, "description": "A light machine gun manufactured by Accipiter Firearms and distributed by Wraitheon. The Hawk-00's high rate of fire makes it ideally suited to lay down suppressive fire; but also makes it exceedingly hard to control while unmounted.", "weight": "7500 g", "volume": "10610 ml", @@ -98,7 +98,7 @@ "copy-from": "rifle_semi", "looks_like": "ar15", "type": "GUN", - "name": { "str": "G&W SR-P9" }, + "name": { "str": "G&W SR-P9 bullpup rifle" }, "description": "An eminently sturdy and reliable bullpup rifle issued by UICA's military during early reclamation expeditions. Although it's been out of service for nearly two decades, many a private military and contractor has found a use for the SR-P9, and it remains common long past its initial introduction into service.", "weight": "3170 g", "volume": "3100 ml", @@ -131,19 +131,19 @@ "copy-from": "fn_p90", "type": "GUN", "reload_noise_volume": 10, - "name": { "str": "G&W SR-P77" }, + "name": { "str": "G&W SR-P77 bullpup carbine" }, "description": "Compact and powerful, the SR-77 serves as the current main firearm of UICA assault teams, having replaced the SR-P9 in the very last decade of the reclamation wars. Designed for combat withing the tight confines of spacecraft and habitats, the SR-77 is a bullpup carbine with a top-mounted magazine and a high rate of fire. Performance in open terrain is subpar.", "variant_type": "gun", "variants": [ { "id": "military", - "name": { "str": "G&W SR-P77" }, + "name": { "str": "G&W SR-P77 bullpup carbine" }, "description": "Compact and powerful, the SR-77 serves as the current main firearm of UICA assault teams, having replaced the SR-P9 in the very last decade of the reclamation wars. Designed for combat withing the tight confines of spacecraft and habitats, the SR-77 is a bullpup carbine with a top-mounted magazine and a high rate of fire. Performance in open terrain is subpar.", "weight": 3 }, { "id": "branded", - "name": { "str": "Gibson-77 Sentinel" }, + "name": { "str": "Gibson-77 Sentinel bullpup carbine" }, "description": "A rare version of the m90-UASTA PDW built to its original private market specifications, featuring an ergonomic bullpup design and a large magazine capacity underneath a sleek white and chromed finish. Actual combat performance is slightly improved over the more common military model, due to the use of higher-quality materials within the barrel and ETC ignition system.", "weight": 0 } diff --git a/data/mods/Aftershock/items/gun/laser.json b/data/mods/Aftershock/items/gun/laser.json index ed0399ad789d7..e6861899576c6 100644 --- a/data/mods/Aftershock/items/gun/laser.json +++ b/data/mods/Aftershock/items/gun/laser.json @@ -125,7 +125,7 @@ { "id": "afs_av22", "type": "GUN", - "name": { "str": "av-22" }, + "name": { "str": "av-22 laser pistol" }, "copy-from": "v29", "description": "A common pulse-laser pistol cleared for civilian use. Recoilless, energy-efficient, and easy to use, the av-22 is often carried as a defense weapon by those who lack the practice required to effectively use ballistic weaponry. Due to its low power, it must be fired in sequence mode to stand a chance against hardened foes.", "price": "500 USD", @@ -155,7 +155,7 @@ { "id": "afs_archeotech_laspistol", "type": "GUN", - "name": { "str": "E-150b" }, + "name": { "str": "E-150b laser pistol" }, "copy-from": "v29", "description": "A silver, elegantly-wrought laser pistol that fires armor-piercing bolts of golden light. A now-irreplaceable historical artifact built by the engineering AIs of the late Hyperspace Era, it is as precious as it is deadly.", "price": "500 kUSD", @@ -192,7 +192,7 @@ "reload_noise_volume": 10, "symbol": "(", "color": "green", - "name": { "str": "Izhevsk PLC-75" }, + "name": { "str": "Izhevsk PLC-75 heavy laser rifle" }, "description": "Straight from the bureaus of the old Soviet Union the PLC-75 is the crude and brutal answer to the constraints posed by the design of heavy laser ordnance. Its use of antiquated flashtube pumped laser technology makes it unwieldy and wholly incompatible with modern equipment, whether this offers any consolation to downrange targets remains a matter of contentious dispute.", "material": [ "steel" ], "flags": [ "RELOAD_ONE", "BACKBLAST", "NEVER_JAMS" ], diff --git a/data/mods/Aftershock/items/gun/plasma.json b/data/mods/Aftershock/items/gun/plasma.json index eec17fb7b57d5..ad1112d9acaa2 100644 --- a/data/mods/Aftershock/items/gun/plasma.json +++ b/data/mods/Aftershock/items/gun/plasma.json @@ -29,7 +29,7 @@ { "id": "afs_magnadrive_230k", "type": "GUN", - "name": { "str_sp": "Magnadrive 230K" }, + "name": { "str_sp": "Magnadrive 230K railgun" }, "copy-from": "afs_plasma_base", "looks_like": "plasma_gun", "description": "A heavy plasma railgun that easily defeats most forms of conventional armor and flash-incinerates anything behind it. Its large size and liability to overheat make it unsuitable for infantry use, but it is a common sight on military vehicles and in the hands of power-armored troops, especially when heavy armor is expected.", @@ -67,7 +67,7 @@ { "id": "afs_pam-41", "type": "GUN", - "name": { "str": "PAM-41 2g" }, + "name": { "str": "PAM-41 2g railgun" }, "copy-from": "afs_plasma_base", "description": "A short and stubby 2 gram plasma railgun occasionally used by espatiers as a hull breaching tool. Like larger plasma weapons, it propels toroids of plasma that detonate on contact, but its reduced size heavily hampers its range and damage output. Fired within an atmosphere, its very low range makes it dangerous to shooter and target alike.", "weight": "2500 g", @@ -101,7 +101,7 @@ { "id": "afs_plasma_torch_gun", "type": "TOOL", - "name": { "str_sp": "377-UASTA (weaponized)" }, + "name": { "str_sp": "377-UASTA torch (weaponized)" }, "copy-from": "afs_plasma_base", "description": "A common modification for directed plasma torches that involves the installation of oversize capacitor banks and judiciously bypassed safety mechanisms, allowing them to function as a deadly if decidedly short-ranged weapons. In most cases, the resulting \"gun\" can still perform its original metalworking functions, albeit at a much lower efficiency.\n\nUnlike purposefully made plasma weapons, the propelled plasma bottle won't cause a considerable explosion upon contact, allowing for relatively safe operation within enclosed spaces.", "weight": "4200 g", diff --git a/data/mods/Aftershock/items/gun/shot.json b/data/mods/Aftershock/items/gun/shot.json index 9356854327e8d..61c840230a1cf 100644 --- a/data/mods/Aftershock/items/gun/shot.json +++ b/data/mods/Aftershock/items/gun/shot.json @@ -3,7 +3,7 @@ "id": "afs_shotgun", "copy-from": "mossberg_590", "type": "GUN", - "name": { "str": "Benelli 315" }, + "name": { "str": "Benelli 315 shotgun" }, "description": "A widely popular combat shotgun featuring minor iterative refinements to a base design nearly three centuries old. Whether the design is outdated or unsurpassable remains a matter of personal opinion.", "variants": [ { @@ -20,7 +20,7 @@ }, { "id": "branded", - "name": { "str": "Benelli 315" }, + "name": { "str": "Benelli 315 shotgun" }, "description": "A widely popular combat shotgun featuring minor iterative refinements to a base design nearly three centuries old. Whether the design is outdated or unsurpassable remains a matter of personal opinion.", "weight": 2 } @@ -30,7 +30,7 @@ "id": "afs_shotgun_magnastorm", "copy-from": "mossberg_590", "type": "GUN", - "name": { "str_sp": "Accipiter Magnastorm-12" }, + "name": { "str": "Accipiter Magnastorm-12 shotgun" }, "description": "An advanced shotgun that combines chemical and electromagnetic propulsion systems to accelerate and focus a cloud of steel flechettes. Resulting in a longer effective range and greater penetration than whats conventionally possible. Most often deployed during low-intensity corporate conflicts.", "built_in_mods": [ "afs_magnetic_choke", "afs_shotgun_gauss" ] }, @@ -39,7 +39,7 @@ "copy-from": "shotgun_base", "looks_like": "remington_870", "type": "GUN", - "name": { "str": "Raketa" }, + "name": { "str": "Raketa shotgun" }, "description": "A massive TSKBEM-design shotgun intended for exosuit forces, the Raketa aka 'Rocket' is a magazine-fed bullpup shotgun featuring twin barrels. This design remains popular for extra-atmospheric operations as the 12ga rounds are less likely to pierce a ship or station's delicate hull.", "weight": "8 kg", "volume": "3064 ml", diff --git a/data/mods/Magiclysm/items/enchanted_ranged.json b/data/mods/Magiclysm/items/enchanted_ranged.json index 3da6bc9b026b0..16427b008b887 100644 --- a/data/mods/Magiclysm/items/enchanted_ranged.json +++ b/data/mods/Magiclysm/items/enchanted_ranged.json @@ -44,7 +44,7 @@ "id": "m47a1", "copy-from": "pistol_revolver", "type": "GUN", - "name": { "str": "M47A1 Techno-Medusa", "str_pl": "M47A1 Techno-Medusae" }, + "name": { "str": "M47A1 Techno-Medusa revolver" }, "description": "A magically-enhanced update to the Phillips & Rodgers' M47 Medusa, a multi-caliber revolver aimed at survivalists. While Technomancy improves the reliability with smaller cartridges, it is not as accurate as dedicated caliber revolvers due to freebore.", "weight": "1333 g", "volume": "450 ml", @@ -78,7 +78,7 @@ "id": "enchanted_blackpowder_pistol", "copy-from": "pistol_flintlock", "type": "GUN", - "name": { "str": "Pistolet modèle Gardes de la Marine", "str_pl": "several Pistolet modèle Gardes de la Marine" }, + "name": { "str": "Pistolet modèle Gardes de la Marine flintlock pistols" }, "description": "These beautifully-made enchanted flintlock pistols were specially made for young noble scions in the Gardes de la Marine. They still exist today as unspeakably-rare heirlooms that remain combat-worthy due to their magical nature.", "price": "740 USD", "price_postapoc": "257 USD 50 cent", @@ -137,7 +137,7 @@ "id": "boreal_mosin", "copy-from": "mosin91_30", "type": "GUN", - "name": { "str_sp": "Mosin-Nagant 1891/30 Boreal" }, + "name": { "str": "Mosin-Nagant 1891/30 Boreal rifle" }, "description": "A modernized version of the Mosin-Nagant 1891/30 by Cannith Industries, chambered in 7.62x51 NATO. The barrel is enchanted to give bullets a minor freezing property.", "ammo": [ "308" ], "ranged_damage": { "damage_type": "cold", "amount": 3 }, diff --git a/data/mods/Xedra_Evolved/items/guns.json b/data/mods/Xedra_Evolved/items/guns.json index 99085a7ad3586..463922b17c4f5 100644 --- a/data/mods/Xedra_Evolved/items/guns.json +++ b/data/mods/Xedra_Evolved/items/guns.json @@ -4,7 +4,7 @@ "copy-from": "fn57", "type": "GUN", "reload_noise_volume": 6, - "name": { "str": "FN Five-seveN suppressor" }, + "name": { "str": "FN Five-seveN suppressor pistol" }, "longest_side": "194 mm", "min_cycle_recoil": 40, "ranged_damage": { "damage_type": "bullet", "amount": 0 }, @@ -16,7 +16,7 @@ "id": "sr1vektor_9x21mm", "copy-from": "pistol_base", "type": "GUN", - "name": { "str_sp": "SR-1 Vektor Gyurza" }, + "name": { "str": "SR-1 Vektor Gyurza pistol" }, "description": "The SR-1 Vektor also known as the Gyurza (Гюрза, Russian for 'blunt-nosed viper') or Serdyukov SPS is a 9×21mm Gyurza semi-automatic pistol designed for the Russian military. It fires 9x21mm ammunition, which is rare in the States.", "weight": "950 g", "volume": "505 ml", @@ -38,7 +38,7 @@ "copy-from": "shotgun_base", "looks_like": "remington_870", "type": "GUN", - "name": { "str": "Auto Assault-12" }, + "name": { "str": "Auto Assault-12 combat shotgun" }, "description": "The Atchisson Assault Shotgun, is an automatic combat shotgun developed in 1972 by Maxwell Atchisson. The most prominent feature is reduced recoil.", "weight": "5200 g", "volume": "3064 ml", From 9486c69130996619a3db1ea54ec4da10efc1e67e Mon Sep 17 00:00:00 2001 From: sadenar Date: Sat, 15 Jun 2024 14:43:13 +0200 Subject: [PATCH 2/7] Applied suggested changes by Boomstick --- data/json/items/gun/22.json | 2 +- data/json/items/gun/300BLK.json | 4 ++-- data/json/items/gun/38super.json | 2 +- data/json/items/gun/40.json | 2 +- data/json/items/gun/40x46mm.json | 12 ++++++------ data/json/items/gun/410shot.json | 2 +- data/json/items/gun/50.json | 8 ++++---- data/json/items/gun/shot.json | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json index 2bc4ed5d8f587..ca4cc7410f5f7 100644 --- a/data/json/items/gun/22.json +++ b/data/json/items/gun/22.json @@ -439,7 +439,7 @@ "variants": [ { "id": "ruger_charger", - "name": { "str": "Ruger 22 Charger pistol" }, + "name": { "str": "Ruger 22 machine pistol" }, "description": "This gun is essentially a shortened 10/22, feeding from the same magazines. While it does feature a shorter barrel and a lack of a stock, it is a fair bit lighter, and comes included with a bipod to more steadily plink away at the undead." } ], diff --git a/data/json/items/gun/300BLK.json b/data/json/items/gun/300BLK.json index 617ce05da285b..75eacb5dc2398 100644 --- a/data/json/items/gun/300BLK.json +++ b/data/json/items/gun/300BLK.json @@ -55,7 +55,7 @@ "copy-from": "rifle_semi", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str": "IWI Tavor X95 .300BLK assault rifle" }, + "name": { "str": "IWI Tavor X95 rifle" }, "description": "The IWI Tavor X95 (also called Micro-Tavor or MTAR) is an Israeli bullpup assault rifle designed and produced by Israel Weapon Industries. This is the civilian version chambered for .300 AAC Blackout.", "weight": "3610 g", "volume": "2400 ml", @@ -116,7 +116,7 @@ "copy-from": "rifle_semi", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str": "SIG MCX Rattler SBR rifle" }, + "name": { "str": "SIG MCX Rattler assault carbine" }, "description": "A gas-operated rifle, with a short 5.5 inch barrel, built-in thin folding stock, and full rail mount on the upper receiver. This particular one is a select-fire military version.", "weight": "2590 g", "volume": "2850 ml", diff --git a/data/json/items/gun/38super.json b/data/json/items/gun/38super.json index ab06304d4917e..b757aff5bbf28 100644 --- a/data/json/items/gun/38super.json +++ b/data/json/items/gun/38super.json @@ -4,7 +4,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": { "str": "AF2011A1 .38 Super pistol" }, + "name": { "str": "AF2011A1 pistol" }, "description": "A double-barrel semi-automatic pistol of Italian origin, firing two bullets per shot, a derivative of the M1911 pistol.", "weight": "2041 g", "volume": "716 ml", diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json index 726097ee8c810..09101adc25148 100644 --- a/data/json/items/gun/40.json +++ b/data/json/items/gun/40.json @@ -94,7 +94,7 @@ "looks_like": "glock_17", "type": "GUN", "reload_noise_volume": 10, - "name": { "str": "SIG Pro .40 pistol" }, + "name": { "str": "SIG Pro pistol" }, "description": "Originally marketed as a lightweight and compact alternative to older SIG handguns, the Pro .40 is popular among European police forces.", "ascii_picture": "sig_pro_40", "weight": "822 g", diff --git a/data/json/items/gun/40x46mm.json b/data/json/items/gun/40x46mm.json index b4d8702d6a9ac..2c79ef2964621 100644 --- a/data/json/items/gun/40x46mm.json +++ b/data/json/items/gun/40x46mm.json @@ -4,7 +4,7 @@ "copy-from": "launcher_base", "looks_like": "m79", "type": "GUN", - "name": { "str": "tube 40mm launcher" }, + "name": { "str": "tube 40mm grenade launcher" }, "description": "A simple, home-made grenade launcher. Basically a tube with a pin firing mechanism to activate the grenade.", "weight": "2267 g", "volume": "1250 ml", @@ -38,7 +38,7 @@ "copy-from": "launcher_base", "looks_like": "m79", "type": "GUN", - "name": { "str": "M320 standalone launcher" }, + "name": { "str": "M320 standalone grenade 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": "2200 g", "volume": "1750 ml", @@ -64,7 +64,7 @@ "copy-from": "launcher_base", "//": "Tileset whitelist for launchers.", "type": "GUN", - "name": { "str": "M79 launcher" }, + "name": { "str": "M79 grenade launcher" }, "description": "A widely-used grenade launcher that first saw use by American forces in the Vietnam War. Though mostly replaced by more modern launchers, the M79 still sees use with many units worldwide.", "weight": "2700 g", "volume": "2800 ml", @@ -99,7 +99,7 @@ "copy-from": "launcher_base", "looks_like": "m79", "type": "GUN", - "name": { "str": "Milkor MGL" }, + "name": { "str": "Milkor MGL grenade launcher" }, "description": "The Milkor Multi-Grenade Launcher is designed to compensate for the drawback of single-shot grenade launchers by allowing sustained heavy firepower. However, it is still slow to reload and must be used with careful planning.", "weight": "5300 g", "volume": "4230 ml", @@ -132,7 +132,7 @@ "id": "triple_launcher_simple", "copy-from": "launcher_simple", "type": "GUN", - "name": { "str": "triple-barrel 40mm launcher" }, + "name": { "str": "triple-barrel 40mm grenade launcher" }, "description": "A homemade triple-barrel 40mm grenade launcher. Capable of launching all three grenades at once, it is extremely powerful for a homemade weapon.", "clip_size": 3, "price_postapoc": "17 USD 50 cent", @@ -145,7 +145,7 @@ "copy-from": "launcher_base", "looks_like": "m203", "type": "GUN", - "name": { "str": "M203 array" }, + "name": { "str": "M203 grenade launcher 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/410shot.json b/data/json/items/gun/410shot.json index 400ce3a6bca3e..c48014ef723fb 100644 --- a/data/json/items/gun/410shot.json +++ b/data/json/items/gun/410shot.json @@ -27,7 +27,7 @@ "copy-from": "shotgun_s", "looks_like": "remington_870", "type": "GUN", - "name": { "str": "Winchester M37 .410 shotgun" }, + "name": { "str": "Winchester M37 shotgun" }, "description": "A single-shot break-action shotgun, chambered in .410 bore. Designed as a lower-recoil alternative to 12 gauge shotguns, it is light and easy to manufacture.", "weight": "2948 g", "volume": "1748 ml", diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json index 809bfae7f292d..8bfcb4a882218 100644 --- a/data/json/items/gun/50.json +++ b/data/json/items/gun/50.json @@ -4,7 +4,7 @@ "copy-from": "rifle_semi", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str_sp": "Barrett M107A1 rifle" }, + "name": { "str_sp": "Barrett M107A1 anti-material rifle" }, "//": "Price based on unit cost quote for fiscal year 2005 listed at inetres.com, with gunmod modifiers to be added later.", "description": "A large, shoulder-fired, .50 caliber anti-materiel rifle. Its large size, recoil, and noise is offset by its damage and range.", "weight": "12950 g", @@ -31,7 +31,7 @@ "copy-from": "rifle_auto", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str": "M2HB Browning HMG" }, + "name": { "str": "M2HB Browning heavy machine gun" }, "description": "A heavy machine gun used by the US Military from its inception to the Cataclysm, and even rarely by Cataclysm survivors. Its massive size and design make it impossible to use unless deployed or mounted to a vehicle.", "weight": "38000 g", "volume": "9020 ml", @@ -67,7 +67,7 @@ "copy-from": "rifle_semi", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str": "AI AS50 rifle" }, + "name": { "str": "AI AS50 anti-material rifle" }, "description": "Developed by the British firearms producer Accuracy International, the AI AS50 is a semi-automatic .50 caliber anti-materiel rifle produced for the British armed forces and the United States Navy SEALs. With a free-floated barrel, titanium frame, and an accessory rail integrated into the weapon's machined-steel receiver with two others mounted on each side of the barrel shroud, the rifle features commendable ergonomics and a notable level of modularity. Providing operators with the capability to engage targets at a maximum estimated range of around 1500 meters, the firearm feeds from detachable 10-round box magazines.", "weight": "12200 g", "volume": "8900 ml", @@ -95,7 +95,7 @@ "copy-from": "rifle_manual", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str": "McMillan TAC-50 rifle" }, + "name": { "str": "McMillan TAC-50 anti-material rifle" }, "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": "11790 g", "volume": "6500 ml", diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json index 45257e5e5eabe..05868673bdb2d 100644 --- a/data/json/items/gun/shot.json +++ b/data/json/items/gun/shot.json @@ -606,7 +606,7 @@ "variants": [ { "id": "streetsweeper", - "name": { "str": "Cobray Streetsweeper revolver shotgun" }, + "name": { "str": "Cobray Streetsweeper shotgun" }, "description": "Less shotgun and more comically oversized revolver, the Cobray Streetsweeper sold poorly before it was deemed a destructive device. The cylinder is driven by a clockspring, cannot be indexed by hand, and must be ejected with an ejector rod. Its unique design allows for all 12 shells to be fired in under 3 seconds, as demonstrated by the ATF technical branch." } ], From d68c6b2c4aa8e8cb55ff19769372668b2f9c1d19 Mon Sep 17 00:00:00 2001 From: sadenar Date: Sat, 15 Jun 2024 14:49:10 +0200 Subject: [PATCH 3/7] Reverted changes to Aftershock guns --- data/mods/Aftershock/items/gun/10mm.json | 10 +++++----- data/mods/Aftershock/items/gun/25mm.json | 6 +++--- data/mods/Aftershock/items/gun/5x50.json | 2 +- data/mods/Aftershock/items/gun/7.50mm.json | 12 ++++++------ data/mods/Aftershock/items/gun/laser.json | 6 +++--- data/mods/Aftershock/items/gun/plasma.json | 6 +++--- data/mods/Aftershock/items/gun/shot.json | 8 ++++---- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/data/mods/Aftershock/items/gun/10mm.json b/data/mods/Aftershock/items/gun/10mm.json index 7932984699ed6..8f473063fe320 100644 --- a/data/mods/Aftershock/items/gun/10mm.json +++ b/data/mods/Aftershock/items/gun/10mm.json @@ -15,7 +15,7 @@ }, { "id": "branded", - "name": { "str": "Seyfert 84K pistol" }, + "name": { "str": "Seyfert 84K" }, "description": "Commonly carried by shipping crews that can afford it, Seyfert Armistice's 84K pistol doesn't particularly shine or show anything special but it keeps you safe on long journeys in the vast dark of Orion's Arm.", "weight": 3 } @@ -52,7 +52,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": { "str": "MarSec. 4 pistol" }, + "name": { "str": "MarSec. 4" }, "description": { "//NOLINT(cata-text-style)": "not a period after 'MarSec'", "str": "Dependable, reliable, classic. The MarSec. 4 is the combat pistol made for those who can differentiate real quality from glued-on tech." @@ -90,7 +90,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": { "str": "W1011 Silvergram pistol" }, + "name": { "str": "W1011 Silvergram" }, "description": "A finely sculpted white and silver pistol entrusted to Wraitheon's corporate elite. It employs advanced targeting and precision guiding capabilities to deliver devastating bursts of guided 10mm microjet darts. Firing is as expensive as it looks.", "weight": "780 g", "volume": "480 ml", @@ -109,12 +109,12 @@ "variants": [ { "id": "silverhawk", - "name": { "str": "W1011 Silverhawk pistol" }, + "name": { "str": "W1011 Silverhawk" }, "description": "A Silvergram smart pistol given a far less conspicuous \"military carbon\" black finish. Its performance and smart targeting capacities are otherwise identical." }, { "id": "lx", - "name": { "str": "W1011 Silvergram pistol" }, + "name": { "str": "W1011 Silvergram" }, "description": "A finely sculpted white and silver pistol entrusted to Wraitheon's corporate elite. It employs advanced targeting and precision guiding capabilities to deliver devastating bursts of guided 10mm microjet darts. Firing is as expensive as it looks." } ], diff --git a/data/mods/Aftershock/items/gun/25mm.json b/data/mods/Aftershock/items/gun/25mm.json index 98a3ade75adc8..a787e3b5dcccd 100644 --- a/data/mods/Aftershock/items/gun/25mm.json +++ b/data/mods/Aftershock/items/gun/25mm.json @@ -4,7 +4,7 @@ "looks_like": "m79", "type": "GUN", "reload_noise_volume": 10, - "name": { "str": "Gibson S86 launcher" }, + "name": { "str": "Gibson S86" }, "description": "Manufactured by Gibson Armory, the S86 is a light-weight grenade launcher designed to take care of moderately armored opponents. While the S86 firepower is nothing to truly gawk at, it still packs quite a punch both for the target and user and is usually mounted as it is impossible to fire with average strength.", "weight": "2700 g", "volume": "2800 ml", @@ -48,7 +48,7 @@ "looks_like": "m79", "type": "GUN", "reload_noise_volume": 10, - "name": { "str": "1025 Goa rifle" }, + "name": { "str_sp": "1025 Goa" }, "description": "A powerful, single shot 25mm rifle, heavy under the weight of several recoil dampening mechanisms. Designed by the now defunct Goa Firearms, it was originally conceived as a luxury rifle for sport hunting alien megafauna.", "weight": "3500 g", "volume": "450 ml", @@ -85,7 +85,7 @@ "looks_like": "m79", "type": "GUN", "reload_noise_volume": 10, - "name": { "str": "Wraitheon Armory 2519 smart sniper platform" }, + "name": { "str": "Wraitheon Armory 2519" }, "description": "The much feared 2519 smart sniper platform leverages advanced ballistic targeting and guidance computers to deliver heavy munitions with unerring precision. Its undisputed lethality makes it a rare sight outside of the company's max security divisions.", "weight": "3500 g", "volume": "450 ml", diff --git a/data/mods/Aftershock/items/gun/5x50.json b/data/mods/Aftershock/items/gun/5x50.json index 609e5ed23c26c..a5ceb6484a8c4 100644 --- a/data/mods/Aftershock/items/gun/5x50.json +++ b/data/mods/Aftershock/items/gun/5x50.json @@ -19,7 +19,7 @@ "looks_like": "hk_mp5", "type": "GUN", "reload_noise_volume": 10, - "name": { "str": "RM216 SPIW carbine" }, + "name": { "str": "RM216 SPIW" }, "description": "This light carbine fires 5x50mm armor-piercing flechette cartridges. Classified as a special purpose individual weapon, this advanced firearm was developed by Rivtech for the US military shortly before the end of the world. Designed to be fired in bursts, it excels in close combat.", "weight": "1302 g", "volume": "1250 ml", diff --git a/data/mods/Aftershock/items/gun/7.50mm.json b/data/mods/Aftershock/items/gun/7.50mm.json index 3f89fe18e4d10..c3ff62001e175 100644 --- a/data/mods/Aftershock/items/gun/7.50mm.json +++ b/data/mods/Aftershock/items/gun/7.50mm.json @@ -3,7 +3,7 @@ "id": "afs_marsec_t72", "type": "GUN", "copy-from": "sw629", - "name": { "str": "MarSec. T72 revolver" }, + "name": { "str": "MarSec. T72" }, "description": "A massive, unwieldy revolver, using combined magnetic and chemical propulsion to fire 7.50mm rounds at energies that rival a sniping platform. It additionally features a secondary barrel for a single 00 shot shell.\n\nThe T72 remains a relic of the early hyperspace era, meant to be used by and against the posthuman. Its perhaps most notable for its use by fictional rebel figures than for any sort of actual combat effectiveness.", "weight": "2204 g", "volume": "1750 ml", @@ -53,7 +53,7 @@ "copy-from": "rifle_auto", "looks_like": "ar15", "type": "GUN", - "name": { "str": "Accipiter Hawk-00 LMG" }, + "name": { "str": "Accipiter Hawk-00" }, "description": "A light machine gun manufactured by Accipiter Firearms and distributed by Wraitheon. The Hawk-00's high rate of fire makes it ideally suited to lay down suppressive fire; but also makes it exceedingly hard to control while unmounted.", "weight": "7500 g", "volume": "10610 ml", @@ -98,7 +98,7 @@ "copy-from": "rifle_semi", "looks_like": "ar15", "type": "GUN", - "name": { "str": "G&W SR-P9 bullpup rifle" }, + "name": { "str": "G&W SR-P9" }, "description": "An eminently sturdy and reliable bullpup rifle issued by UICA's military during early reclamation expeditions. Although it's been out of service for nearly two decades, many a private military and contractor has found a use for the SR-P9, and it remains common long past its initial introduction into service.", "weight": "3170 g", "volume": "3100 ml", @@ -131,19 +131,19 @@ "copy-from": "fn_p90", "type": "GUN", "reload_noise_volume": 10, - "name": { "str": "G&W SR-P77 bullpup carbine" }, + "name": { "str": "G&W SR-P77" }, "description": "Compact and powerful, the SR-77 serves as the current main firearm of UICA assault teams, having replaced the SR-P9 in the very last decade of the reclamation wars. Designed for combat withing the tight confines of spacecraft and habitats, the SR-77 is a bullpup carbine with a top-mounted magazine and a high rate of fire. Performance in open terrain is subpar.", "variant_type": "gun", "variants": [ { "id": "military", - "name": { "str": "G&W SR-P77 bullpup carbine" }, + "name": { "str": "G&W SR-P77" }, "description": "Compact and powerful, the SR-77 serves as the current main firearm of UICA assault teams, having replaced the SR-P9 in the very last decade of the reclamation wars. Designed for combat withing the tight confines of spacecraft and habitats, the SR-77 is a bullpup carbine with a top-mounted magazine and a high rate of fire. Performance in open terrain is subpar.", "weight": 3 }, { "id": "branded", - "name": { "str": "Gibson-77 Sentinel bullpup carbine" }, + "name": { "str": "Gibson-77 Sentinel" }, "description": "A rare version of the m90-UASTA PDW built to its original private market specifications, featuring an ergonomic bullpup design and a large magazine capacity underneath a sleek white and chromed finish. Actual combat performance is slightly improved over the more common military model, due to the use of higher-quality materials within the barrel and ETC ignition system.", "weight": 0 } diff --git a/data/mods/Aftershock/items/gun/laser.json b/data/mods/Aftershock/items/gun/laser.json index e6861899576c6..ed0399ad789d7 100644 --- a/data/mods/Aftershock/items/gun/laser.json +++ b/data/mods/Aftershock/items/gun/laser.json @@ -125,7 +125,7 @@ { "id": "afs_av22", "type": "GUN", - "name": { "str": "av-22 laser pistol" }, + "name": { "str": "av-22" }, "copy-from": "v29", "description": "A common pulse-laser pistol cleared for civilian use. Recoilless, energy-efficient, and easy to use, the av-22 is often carried as a defense weapon by those who lack the practice required to effectively use ballistic weaponry. Due to its low power, it must be fired in sequence mode to stand a chance against hardened foes.", "price": "500 USD", @@ -155,7 +155,7 @@ { "id": "afs_archeotech_laspistol", "type": "GUN", - "name": { "str": "E-150b laser pistol" }, + "name": { "str": "E-150b" }, "copy-from": "v29", "description": "A silver, elegantly-wrought laser pistol that fires armor-piercing bolts of golden light. A now-irreplaceable historical artifact built by the engineering AIs of the late Hyperspace Era, it is as precious as it is deadly.", "price": "500 kUSD", @@ -192,7 +192,7 @@ "reload_noise_volume": 10, "symbol": "(", "color": "green", - "name": { "str": "Izhevsk PLC-75 heavy laser rifle" }, + "name": { "str": "Izhevsk PLC-75" }, "description": "Straight from the bureaus of the old Soviet Union the PLC-75 is the crude and brutal answer to the constraints posed by the design of heavy laser ordnance. Its use of antiquated flashtube pumped laser technology makes it unwieldy and wholly incompatible with modern equipment, whether this offers any consolation to downrange targets remains a matter of contentious dispute.", "material": [ "steel" ], "flags": [ "RELOAD_ONE", "BACKBLAST", "NEVER_JAMS" ], diff --git a/data/mods/Aftershock/items/gun/plasma.json b/data/mods/Aftershock/items/gun/plasma.json index ad1112d9acaa2..eec17fb7b57d5 100644 --- a/data/mods/Aftershock/items/gun/plasma.json +++ b/data/mods/Aftershock/items/gun/plasma.json @@ -29,7 +29,7 @@ { "id": "afs_magnadrive_230k", "type": "GUN", - "name": { "str_sp": "Magnadrive 230K railgun" }, + "name": { "str_sp": "Magnadrive 230K" }, "copy-from": "afs_plasma_base", "looks_like": "plasma_gun", "description": "A heavy plasma railgun that easily defeats most forms of conventional armor and flash-incinerates anything behind it. Its large size and liability to overheat make it unsuitable for infantry use, but it is a common sight on military vehicles and in the hands of power-armored troops, especially when heavy armor is expected.", @@ -67,7 +67,7 @@ { "id": "afs_pam-41", "type": "GUN", - "name": { "str": "PAM-41 2g railgun" }, + "name": { "str": "PAM-41 2g" }, "copy-from": "afs_plasma_base", "description": "A short and stubby 2 gram plasma railgun occasionally used by espatiers as a hull breaching tool. Like larger plasma weapons, it propels toroids of plasma that detonate on contact, but its reduced size heavily hampers its range and damage output. Fired within an atmosphere, its very low range makes it dangerous to shooter and target alike.", "weight": "2500 g", @@ -101,7 +101,7 @@ { "id": "afs_plasma_torch_gun", "type": "TOOL", - "name": { "str_sp": "377-UASTA torch (weaponized)" }, + "name": { "str_sp": "377-UASTA (weaponized)" }, "copy-from": "afs_plasma_base", "description": "A common modification for directed plasma torches that involves the installation of oversize capacitor banks and judiciously bypassed safety mechanisms, allowing them to function as a deadly if decidedly short-ranged weapons. In most cases, the resulting \"gun\" can still perform its original metalworking functions, albeit at a much lower efficiency.\n\nUnlike purposefully made plasma weapons, the propelled plasma bottle won't cause a considerable explosion upon contact, allowing for relatively safe operation within enclosed spaces.", "weight": "4200 g", diff --git a/data/mods/Aftershock/items/gun/shot.json b/data/mods/Aftershock/items/gun/shot.json index 61c840230a1cf..4bec9c68653c6 100644 --- a/data/mods/Aftershock/items/gun/shot.json +++ b/data/mods/Aftershock/items/gun/shot.json @@ -3,7 +3,7 @@ "id": "afs_shotgun", "copy-from": "mossberg_590", "type": "GUN", - "name": { "str": "Benelli 315 shotgun" }, + "name": { "str": "Benelli 315" }, "description": "A widely popular combat shotgun featuring minor iterative refinements to a base design nearly three centuries old. Whether the design is outdated or unsurpassable remains a matter of personal opinion.", "variants": [ { @@ -20,7 +20,7 @@ }, { "id": "branded", - "name": { "str": "Benelli 315 shotgun" }, + "name": { "str": "Benelli 315" }, "description": "A widely popular combat shotgun featuring minor iterative refinements to a base design nearly three centuries old. Whether the design is outdated or unsurpassable remains a matter of personal opinion.", "weight": 2 } @@ -30,7 +30,7 @@ "id": "afs_shotgun_magnastorm", "copy-from": "mossberg_590", "type": "GUN", - "name": { "str": "Accipiter Magnastorm-12 shotgun" }, + "name": { "str": "Accipiter Magnastorm-12" }, "description": "An advanced shotgun that combines chemical and electromagnetic propulsion systems to accelerate and focus a cloud of steel flechettes. Resulting in a longer effective range and greater penetration than whats conventionally possible. Most often deployed during low-intensity corporate conflicts.", "built_in_mods": [ "afs_magnetic_choke", "afs_shotgun_gauss" ] }, @@ -39,7 +39,7 @@ "copy-from": "shotgun_base", "looks_like": "remington_870", "type": "GUN", - "name": { "str": "Raketa shotgun" }, + "name": { "str": "Raketa" }, "description": "A massive TSKBEM-design shotgun intended for exosuit forces, the Raketa aka 'Rocket' is a magazine-fed bullpup shotgun featuring twin barrels. This design remains popular for extra-atmospheric operations as the 12ga rounds are less likely to pierce a ship or station's delicate hull.", "weight": "8 kg", "volume": "3064 ml", From e3060180b06118620925205f64b4ae550c182aa2 Mon Sep 17 00:00:00 2001 From: sadenar Date: Sat, 15 Jun 2024 14:53:22 +0200 Subject: [PATCH 4/7] Added back an Aftershock str_sp I missed --- data/mods/Aftershock/items/gun/shot.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/items/gun/shot.json b/data/mods/Aftershock/items/gun/shot.json index 4bec9c68653c6..9356854327e8d 100644 --- a/data/mods/Aftershock/items/gun/shot.json +++ b/data/mods/Aftershock/items/gun/shot.json @@ -30,7 +30,7 @@ "id": "afs_shotgun_magnastorm", "copy-from": "mossberg_590", "type": "GUN", - "name": { "str": "Accipiter Magnastorm-12" }, + "name": { "str_sp": "Accipiter Magnastorm-12" }, "description": "An advanced shotgun that combines chemical and electromagnetic propulsion systems to accelerate and focus a cloud of steel flechettes. Resulting in a longer effective range and greater penetration than whats conventionally possible. Most often deployed during low-intensity corporate conflicts.", "built_in_mods": [ "afs_magnetic_choke", "afs_shotgun_gauss" ] }, From cf1c4f564932edb803e46e0f666e034a3dc3db38 Mon Sep 17 00:00:00 2001 From: sadenar Date: Sat, 15 Jun 2024 23:45:19 +0200 Subject: [PATCH 5/7] Removed IDs of fixed guns from variant validator + removed one missed str_sp --- data/json/items/gun/50.json | 2 +- tools/json_tools/gun_variant_validator.py | 46 ----------------------- 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json index 8bfcb4a882218..a139f10d95a7d 100644 --- a/data/json/items/gun/50.json +++ b/data/json/items/gun/50.json @@ -4,7 +4,7 @@ "copy-from": "rifle_semi", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str_sp": "Barrett M107A1 anti-material rifle" }, + "name": { "str": "Barrett M107A1 anti-material rifle" }, "//": "Price based on unit cost quote for fiscal year 2005 listed at inetres.com, with gunmod modifiers to be added later.", "description": "A large, shoulder-fired, .50 caliber anti-materiel rifle. Its large size, recoil, and noise is offset by its damage and range.", "weight": "12950 g", diff --git a/tools/json_tools/gun_variant_validator.py b/tools/json_tools/gun_variant_validator.py index e9f3b2572aeb9..14ee2fd33c736 100755 --- a/tools/json_tools/gun_variant_validator.py +++ b/tools/json_tools/gun_variant_validator.py @@ -100,7 +100,6 @@ "ak308", "rfb_308", "steyr_scout", - "tac338", "smg_45", "hptjhp", "cx4", @@ -121,62 +120,17 @@ "STI_DS_10", "hpt3895", "m2carbine", - "smg_40", } NAME_CHECK_BLACKLIST = { # FIXME: fix and remove these - "1895sbl", - "bfr", - "sharps", - "m107a1", - "as50", - "tac50", - "bfg50", "fn_p90", - "hk_mp7", "obrez", "pressin", - "m1911-460", - "m2010", - "weatherby_5", - "win70", - "2_shot_special", "cop_38", - "model_10_revolver", - "mr73", - "ruger_lcr_38", - "sw_619", - "acr_300blk", - "iwi_tavor_x95_300blk", - "sig_mcx_rattler_sbr", "bond_410", - "colt_saa", - "p226_357sig", - "glock_31", - "p320_357sig", - "fs2000", - "scar_l", "brogyaga", - "raging_bull", - "raging_judge", - "saiga_410", - "shotgun_410", - "mgl", "pseudo_m203", - "colt_army", - "atgm_launcher", "xedra_gun", - "90two40", - "glock_22", - "px4_40", - "sig_40", - "hi_power_40", - "walther_ppq_40", - "hptjcp", - "AT4", - "af2011a1_38super", - "m1911a1_38super", - "colt_navy", "plasma_gun", "bbgun", "LAW", From 15bc23e74a01a7726e6ed8593268c5b374dc06d4 Mon Sep 17 00:00:00 2001 From: sadenar Date: Sun, 16 Jun 2024 12:47:55 +0200 Subject: [PATCH 6/7] Harmonizes the Luty submachine guns Co-authored-by: Uwuewsky <99945024+Uwuewsky@users.noreply.github.com> --- data/json/items/gun/40.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json index 09101adc25148..e602dcd343f0b 100644 --- a/data/json/items/gun/40.json +++ b/data/json/items/gun/40.json @@ -134,7 +134,7 @@ "copy-from": "smg_base", "looks_like": "hk_mp5", "type": "GUN", - "name": { "str": ".40 S&W Luty SMG" }, + "name": { "str": ".40 S&W Luty submachine gun" }, "description": "A Luty pattern makeshift smoothbore SMG crudely constructed out of various steel parts using advanced powered hand tools; likely one of the most complex guns that is feasible to make outside of a machine shop, but still very unreliable. This one is chambered for .40 S&W cartridges and accepts custom-made makeshift magazines.", "//": "Crafting recipe must make use of angle grinder, bench grinder, set square and vise, which don't yet exist in game. No factory mags until UMP40, mp5/40, or other straight .40 mags are implemented.", "weight": "3520 g", From 285b95e7ef9af198859e7694f6ec929d9e4069e3 Mon Sep 17 00:00:00 2001 From: sadenar Date: Sun, 16 Jun 2024 13:04:34 +0200 Subject: [PATCH 7/7] Changed the plural of one of the magiclysm magic guns --- data/mods/Magiclysm/items/enchanted_ranged.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/items/enchanted_ranged.json b/data/mods/Magiclysm/items/enchanted_ranged.json index 16427b008b887..6db5dd3667589 100644 --- a/data/mods/Magiclysm/items/enchanted_ranged.json +++ b/data/mods/Magiclysm/items/enchanted_ranged.json @@ -78,7 +78,7 @@ "id": "enchanted_blackpowder_pistol", "copy-from": "pistol_flintlock", "type": "GUN", - "name": { "str": "Pistolet modèle Gardes de la Marine flintlock pistols" }, + "name": { "str": "Pistolet modèle Gardes de la Marine", "str_pl": "Pistolets modèle Gardes de la Marine" }, "description": "These beautifully-made enchanted flintlock pistols were specially made for young noble scions in the Gardes de la Marine. They still exist today as unspeakably-rare heirlooms that remain combat-worthy due to their magical nature.", "price": "740 USD", "price_postapoc": "257 USD 50 cent",