diff --git a/data/json/items/gun/10mm.json b/data/json/items/gun/10mm.json index 2fd02e7f7e9e6..9cbc36ba46b07 100644 --- a/data/json/items/gun/10mm.json +++ b/data/json/items/gun/10mm.json @@ -10,7 +10,7 @@ "variants": [ { "id": "sw_610", - "name": { "str": "S&W 610 revolver" }, + "name": { "str": "S&W 610" }, "description": "The Smith and Wesson 610 is a classic six-shooter revolver chambered for 10mm rounds, or for S&W's own .40 round." } ], @@ -45,13 +45,13 @@ "copy-from": "pistol_base", "looks_like": "glock_19", "type": "GUN", - "name": { "str": "compact Glock pistol" }, + "name": { "str": "Glock compact pistol" }, "description": "A small pistol accepting Glock magazines and chambered in 10mm. Because of its size, it is easy to carry, but it has rather fierce recoil.", "variant_type": "gun", "variants": [ { "id": "glock_29", - "name": { "str": "Glock 29 pistol" }, + "name": { "str": "Glock 29" }, "description": "A modestly sized version of the highly successful Glock, chambered in hard-hitting 10mm Auto. It is easy to carry because of its small size, but also recoils fiercely." } ], @@ -90,7 +90,7 @@ "variants": [ { "id": "glock_20", - "name": { "str": "Glock 20 pistol" }, + "name": { "str": "Glock 20" }, "description": "A full-sized version of the highly successful Glock, chambered in hard-hitting 10mm Auto. The third model of Glock designed, all other full-sized, large framed Glocks are adaptations of this one." } ], @@ -117,13 +117,13 @@ "copy-from": "glock_20", "looks_like": "glock_20", "type": "GUN", - "name": { "str": "hunter Glock pistol" }, + "name": { "str": "Glock hunter pistol" }, "description": "A full-sized, long-slide version of the highly successful Glock, chambered in hard-hitting 10mm Auto. The extra barrel length makes for slightly more accurate and powerful shots, and the extra slide length means the sights are a little easier to use. It also features Glock's Modular Optic System, making aftermarket optics much easier to mount.", "variant_type": "gun", "variants": [ { "id": "glock_40", - "name": { "str": "Glock 40 pistol" }, + "name": { "str": "Glock 40" }, "description": "A full-sized, long-slide version of the highly successful Glock, chambered in hard-hitting 10mm Auto. The extra barrel length makes for slightly more accurate and powerful shots, and the extra slide length means the sights are a little easier to use." } ], @@ -147,7 +147,7 @@ "variants": [ { "id": "hk_mp5_10_semi", - "name": { "str": "BA10 rifle" }, + "name": { "str": "BA10" }, "description": "The MP5/10 served the FBI briefly alongside their 10mm Auto pistols, adding to the caliber's overall mystique. Though the gun's usage was short-lived, a handful of clones were made and sold occasionally. This semi-automatic clone manufactured by Brethren Arms features a welded-on M1913 rail and a collapsible arm brace." } ], @@ -176,7 +176,7 @@ "variants": [ { "id": "m1911_10", - "name": { "str": "Colt Delta Elite pistol" }, + "name": { "str": "Colt Delta Elite" }, "description": "A modernized, match-grade variant of the venerable M1911 chambered in hard-hitting 10mm Auto. Early variants were known to crack frames; modern 1911s, like this one, are slotted to prevent such crack formation." } ], @@ -209,7 +209,7 @@ "variants": [ { "id": "witness_10", - "name": { "str": "EAA Witness 10mm pistol" }, + "name": { "str": "EAA Witness", "str_pl": "EAA Witnesses" }, "description": "The EAA Witness is a modified variant of the CZ-75, produced in Italy by Tanfoglio. This is the standard steel framed version chambered in 10mm Auto." } ], @@ -239,7 +239,7 @@ "variants": [ { "id": "p220_10", - "name": { "str": "SIG P220 10mm pistol" }, + "name": { "str": "SIG P220" }, "description": "The SIG Sauer P220 was developed for the Swiss military in 1975, and its simplified action was later used in most other SIG Sauer designs, including the P226. The all-steel construction adds heft to this model, which is chambered in hard-hitting 10mm Auto." } ], @@ -271,7 +271,7 @@ "variants": [ { "id": "xd_10", - "name": { "str": "XD-M Competition 10mm pistol" }, + "name": { "str": "XD-M Competition" }, "description": "Designed by HS Produkt in Croatia, the HS2000 has become a commercial success for Springfield Armory, who imports and markets it as the eXtreme Duty. The XD has since been offered in a variety of chamberings and sizes, including this full-sized match grade variant in 10mm Auto." } ], @@ -308,7 +308,7 @@ "variants": [ { "id": "TDI_10", - "name": { "str": "Vector SDP 10mm pistol" }, + "name": { "str": "Vector SDP" }, "description": "The Vector SDP is a delayed blowback \"pistol\" with a unique, downward reciprocating bolt that helps combat muzzle climb. This one is chambered in 10mm Auto." } ], diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json index 0cafaad3b7e11..ed42e2a608880 100644 --- a/data/json/items/gun/22.json +++ b/data/json/items/gun/22.json @@ -10,7 +10,7 @@ "variants": [ { "id": "marlin_9a", - "name": { "str": "Marlin 39A rifle" }, + "name": { "str": "Marlin 39A" }, "description": "The oldest and longest-produced shoulder firearm in the world. Though it fires the weak .22 round, it is highly accurate and damaging, and has essentially no recoil." } ], @@ -103,7 +103,7 @@ "variants": [ { "id": "ruger_1022", - "name": { "str": "Ruger 10/22 rifle" }, + "name": { "str": "Ruger 10/22" }, "description": "A combination of negligible recoil, high customization, and inexpensive ammunition made the Ruger 10/22 a popular choice among enthusiasts and small game hunters. Even though it fires the weak .22 round, it's perfectly capable of killing." } ], @@ -176,7 +176,7 @@ "variants": [ { "id": "ruger_1022_auto", - "name": { "str": "full-auto Ruger 10/22 rifle" }, + "name": { "str": "full-auto Ruger 10/22" }, "description": "A Ruger 10/22 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." } ], @@ -194,7 +194,7 @@ "variants": [ { "id": "ruger_lcr_22", - "name": { "str": "Ruger LCR .22 revolver" }, + "name": { "str": "Ruger LCR .22" }, "description": "A compact, double-action-only revolver designed for easy concealment, with a stainless steel cylinder and aluminum frame." } ], @@ -218,7 +218,7 @@ "looks_like": "glock_17", "type": "GUN", "reload_noise_volume": 10, - "name": { "str": "firefly training pistol" }, + "name": { "str": "Firefly training pistol" }, "//": "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", @@ -280,7 +280,7 @@ "variants": [ { "id": "walther_p22", - "name": { "str": "Walther P22 pistol" }, + "name": { "str": "Walther P22" }, "description": "The Walther P22 is a blowback operated semi-automatic pistol intended for training with a platform very similar to more defensive handguns. It is about half the size of most Walthers. It is made mostly with plastic, with the slide and key components (other than the barrel) being made of die-cast zinc alloy." } ], @@ -313,7 +313,7 @@ { "id": "cp33", "name": { "str": "CP33" }, - "description": "The Kel-Tec CP33, standing for Competition Pistol 33, is a .22 semi automatic pistol targeted towards competition shooters and recreational shooters alike, with the ability to feed from 33 round quad stack magazines, or even 50 with an extension. While in a fairly weak cartridge, the capacity makes it quite a formidable weapon in the right hands." + "description": "The Kel-Tec CP33, standing for Competition Pistol 33, is a .22 semi-automatic pistol targeted towards competition shooters and recreational shooters alike, with the ability to feed from 33 round quad stack magazines, or even 50 with an extension. While in a fairly weak cartridge, the capacity makes it quite a formidable weapon in the right hands." } ], "weight": "669 g", @@ -353,19 +353,19 @@ "variants": [ { "id": "ruger_mk2", - "name": { "str": "Ruger Mark II" }, + "name": { "str": "Ruger Mark II", "str_pl": "Rugers Mark II" }, "description": "The 2nd version of the Ruger Standard, which replaced production of the Standard in 1982 and continued until 2005 with the main feature of having adjustable sights. Features a 5.5 inch barrel and feeds from a 10 round magazine.", "weight": 17 }, { "id": "ruger_mk3", - "name": { "str": "Ruger Mark III" }, + "name": { "str": "Ruger Mark III", "str_pl": "Rugers Mark III" }, "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", "str_pl": "Rugers Mark IV" }, "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 } diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json index 5381642df9034..62599eb719319 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.", @@ -69,18 +69,18 @@ "variants": [ { "id": "modular_h&k416a5", - "name": { "str": "H&K416 A5 rifle" }, + "name": { "str": "H&K416 A5" }, "description": "Designed to replace the M4A1, the Heckler and Koch 416A5 features most of the former's strengths, while being considerably more durable." }, { "id": "modular_m27iar", - "name": { "str": "M27 IAR carbine" }, + "name": { "str": "M27 IAR" }, "description": "A H&K416 carbine outfitted with a heavier barrel to enable higher amounts of suppressive fire while retaining a good degree of mobility.", "ascii_picture": "m27_iar" }, { "id": "modular_m38dmr", - "name": { "str": "M38 DMR rifle" }, + "name": { "str": "M38 DMR" }, "description": "The M38 Designated Marksman Rifle is an M27 IAR, itself derived from a H&K416, selected for accuracy, and outfitted with a variable power scope and a QDSS suppressor." } ], @@ -111,7 +111,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", @@ -177,7 +177,7 @@ "looks_like": "modular_ar15", "type": "GUN", "name": { "str": "SL8 civilian rifle" }, - "description": "A semi-automatic clone of an older German assault rifle. Due to importation bans, it is semi-auto and can only feed from 10 round magazines.", + "description": "The SL8 is an importation-legal gun similar to the German G36, made to be semi-auto only, and to only feed from 10 round single stack magazines. It also features a distinctive thumbhole stock, a polymer handguard, and a top rail for mounting optics.", "weight": "3901 g", "volume": "3919 ml", "longest_side": "987 mm", @@ -304,13 +304,13 @@ "variants": [ { "id": "modular_m4a1", - "name": { "str": "M4A1 carbine" }, + "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.", "ascii_picture": "modular_m4a1" }, { "id": "m4_cqbr", - "name": { "str": "Mk 18 CQBR carbine" }, + "name": { "str": "Mk 18 CQBR", "str_pl": "Mk 18s CQBR" }, "description": "This is a shorter M4 carbine with a 10.3 inch barrel, intended for confined spaces and close quarters battle situations.", "weight": 0 } @@ -347,7 +347,7 @@ "variants": [ { "id": "modular_m16a4", - "name": { "str": "M16A4 rifle" }, + "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." } ], @@ -375,7 +375,7 @@ "variants": [ { "id": "modular_m16a3", - "name": { "str": "M16A3 rifle" }, + "name": { "str": "M16A3" }, "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." } ], @@ -588,7 +588,7 @@ "variants": [ { "id": "mdrx", - "name": { "str": "Desert Tech MDRX carbine" }, + "name": { "str": "Desert Tech MDRX" }, "description": "Bringing a compact, highly modular, and soft-recoiling weapon system to the table, the Desert Tech Micro Dynamic Rifle Extreme (MDRX) is a gas-operated bullpup carbine originally unveiled in 2014, with this updated model of the weapon having been released in 2019. One of the rifle's most notable features is the utter simplicity of swapping the carbine's chambering, with an easy change of the barrel, bolt, and a handful of other components being all the steps required to chamber the MDRX for either .223 Remington, .308 Winchester, or .300 AAC Blackout." } ], @@ -661,7 +661,7 @@ "variants": [ { "id": "bren2_556", - "name": { "str": "CZ Bren 2 carbine" }, + "name": { "str": "CZ Bren 2" }, "description": "Hailing from the Czech Republic, this modular carbine supplanted the older CZ 805 rifle within Czech military use, improving upon the former's features and bringing fully ambidextrous controls, a streamlined design, and an easily adjustable gas system to the table. Chambered for the 5.56x45mm NATO cartridge, this particular weapon possesses a 16.5-inch barrel and is a civilian MS, 'modular semi-automatic,' model. Incorporating a number of US-made parts, the weapon features a removable muzzle break rather than the flash hider that comes standard with military rifles." } ], @@ -730,7 +730,7 @@ "variants": [ { "id": "cz600", - "name": { "str": "CZ 600 TRAIL rifle" }, + "name": { "str": "CZ 600 TRAIL" }, "description": "A handy bolt-action offering from CZ, the 600 Trail is a box magazine-fed ranch rifle that utilizes an aluminum chassis to keep its overall heft to a minimum. Possessing an extendable buttstock, extensive modularity, and a quick-swap barrel assembly switchable to accommodate the firing of either .223 or 7.62x39mm ammunition, the rifle was intended for use by backpackers, trail hikers, and preppers." } ], @@ -773,7 +773,7 @@ "variants": [ { "id": "rdb_223", - "name": { "str": "Kel-Tec RDB rifle" }, + "name": { "str": "Kel-Tec RDB" }, "description": "This is a semi-automatic bullpup rifle with a lightened body due to the use of polymers and aluminum, using standard magazines from the AR-15 platform and the 5.56 NATO cartridge. The name stands for rifle, downward-ejection, bullpup, and its design was intended to incorporate some technical solutions, such as downward case ejection and convenience for left-handers, to solve some problems with bullpup guns. However, the good idea's execution is not as perfect as the manufacturer (and user) would like. No good idea from Kel-Tec is immune to Kel-Tec manufacturing issues, sadly." } ], diff --git a/data/json/items/gun/270win.json b/data/json/items/gun/270win.json index ddb623f063f70..87ee5fce4db38 100644 --- a/data/json/items/gun/270win.json +++ b/data/json/items/gun/270win.json @@ -10,7 +10,7 @@ "variants": [ { "id": "remington700_270", - "name": { "str": "Remington 700 .270 Win rifle" }, + "name": { "str": "Remington 700 .270 Win", "str_pl": "Remington 700s .270 Win" }, "description": "A classic bolt-action rifle chambered for .270 Winchester, very popular among hunters. This is a CDL SF model with a forged, fluted, 416 stainless steel barrel threaded into the receiver and a recessed bolt face. It has checkered walnut furniture and a recoil pad to reduce perceived recoil." } ], diff --git a/data/json/items/gun/300.json b/data/json/items/gun/300.json index 6d547f757247f..00560dc05c4bd 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 bolt-action 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 bolt-action 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/3006.json b/data/json/items/gun/3006.json index c570526028940..f0c6d12bf0df7 100644 --- a/data/json/items/gun/3006.json +++ b/data/json/items/gun/3006.json @@ -243,7 +243,7 @@ "variants": [ { "id": "ruger_m77", - "name": { "str": "Ruger M77 Hawkeye rifle" }, + "name": { "str": "Ruger M77 Hawkeye" }, "description": "A popular bolt-action hunting rifle first introduced in 2006, the Ruger M77 was originally intended to be a modernized Mauser 98-style long gun. To this end, the weapon features a Mauser-type fixed blade extractor and an angled large screw that tightly beds the action into the stock. This particular rifle is a variant with additional features, a smoother trigger, and a recontoured buttstock." } ], diff --git a/data/json/items/gun/300BLK.json b/data/json/items/gun/300BLK.json index e86540c34eaa5..d012ebaa73b57 100644 --- a/data/json/items/gun/300BLK.json +++ b/data/json/items/gun/300BLK.json @@ -4,7 +4,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/303.json b/data/json/items/gun/303.json index 97d6334770d7a..e437b6f3438e4 100644 --- a/data/json/items/gun/303.json +++ b/data/json/items/gun/303.json @@ -10,7 +10,7 @@ "variants": [ { "id": "smle_mk3", - "name": { "str": "SMLE No. 1 Mk III rifle" }, + "name": { "str": "SMLE No. 1 Mk III", "str_pl": "SMLEs No. 1 Mk III" }, "description": "An English darling and icon of the First World War, the Short Magazine Lee-Enfield Mk III was the standard issue battle rifle of the British commonwealth from 1907. Chambered for .303 ammunition, the rifle makes use of ten-round detachable magazines. With its full-length wooden handguard, brass buttplate, and smooth action, the Lee-Enfield cuts a recognizable profile in either the trenches of the Great War or the zombie-strewn wastelands." } ], @@ -56,7 +56,7 @@ "variants": [ { "id": "number4_mki", - "name": { "str": "Lee-Enfield No. 4 Mk I rifle" }, + "name": { "str": "Lee-Enfield No. 4 Mk I", "str_pl": "Lee-Enfields No. 4 Mk I" }, "description": "A Second World War progression of the British Commonwealth's Lee-Enfield battle rifle, the No. 4 began its decades-long service life in 1939. Externally similar to its forefather, the rifle possesses a reinforced receiver, an adjusted nose cap, and a heavier barrel. Still chambered for the same .303-caliber cartridge, the No. 4 represents one of the most populous firearm imports in U.S. history." } ], diff --git a/data/json/items/gun/308.json b/data/json/items/gun/308.json index 6b644e79dc928..20180c76fbc2f 100644 --- a/data/json/items/gun/308.json +++ b/data/json/items/gun/308.json @@ -10,7 +10,7 @@ "variants": [ { "id": "fal_dsa", - "name": { "str": "DSA SA-58 rifle" }, + "name": { "str": "DSA SA-58" }, "description": "Originally designed during the Cold War, the FAL is probably the most successful battle rifle ever designed. Despite being labeled as obsolete, its tunable gas system ensures both reliability and low recoil, allowing the FAL to keep up even among modern competitors. This is a semi-automatic clone of the SA-58 pattern built by DSA." } ], @@ -46,12 +46,12 @@ "variants": [ { "id": "g3_ptr", - "name": { "str": "PTR 91 rifle" }, - "description": "A semi-automatic, domestically produced clone of an early battle rifle developed after the end of WWII. The PTR 91 is a fantastically reliable, cheap to produce rifle that continues to serve in conflict regions. Though the action is legendary, its handling characteristics and harsher recoil leave something to be desired." + "name": { "str": "PTR 91" }, + "description": "A semi-automatic, domestically produced clone of an early battle rifle developed after the end of WWII. Known as the PTR 91, it is a fantastically reliable, cheap to produce rifle that continues to serve in conflict regions. Though the action is legendary, its handling characteristics and harsher recoil leave something to be desired." }, { "id": "g3_cetme", - "name": { "str": "Century C308 rifle" }, + "name": { "str": "Century C308" }, "description": "A semi-automatic, domestically produced clone of the CETME Model C, the progenitor of the famous H&K G3 battle rifle. The CETME is a fantastically reliable, cheap to produce rifle that continues to serve in conflict regions. Though the action is legendary, its handling characteristics and harsher recoil leave something to be desired." } ], @@ -145,7 +145,7 @@ "variants": [ { "id": "m1a", - "name": { "str": "M1A rifle" }, + "name": { "str": "M1A" }, "description": "This civilian variant of the M14 is essentially the M1 Garand from World War 2 with a detachable magazine stuck in it that was sold to the military as a cheap, do-all rifle that could replace many other weapon systems. While it delivered none of those things, it was an acceptable rifle, if marginally inferior to its contemporaries." } ], @@ -262,7 +262,7 @@ "id": "m60_semi", "type": "GUN", "copy-from": "m60", - "name": { "str": "M60 semi auto machine gun" }, + "name": { "str": "M60 semi-auto machine gun" }, "description": "A semi-automatic civilian variant of the M60 machine gun, retaining the ability to be belt fed, an uncommon feature in civilian firearms.", "modes": [ [ "DEFAULT", "semi-auto", 1 ] ] }, @@ -298,7 +298,7 @@ "copy-from": "scar_l", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str": "FN SCAR-H rifle" }, + "name": { "str": "FN SCAR-H assault rifle" }, "description": "A highly accurate and modular battle rifle specially designed for the United States Special Operations Command. The 'H' in its name stands for heavy, as it uses the powerful .308 round.", "ascii_picture": "scar-H", "weight": "3630 g", @@ -366,7 +366,7 @@ "variants": [ { "id": "hk417_13", - "name": { "str": "HK417 A2 rifle" }, + "name": { "str": "HK417 A2" }, "description": "A German battle rifle with a 13\" barrel and telescopic stock. It is a gas-operated, rotating bolt rifle with a short-stroke piston design similar to that of the G36." } ], @@ -400,7 +400,7 @@ "variants": [ { "id": "m110a1", - "name": { "str": "M110A1 rifle" }, + "name": { "str": "M110A1" }, "description": "A derivative of H&K's G28 with an aluminum upper receiver to meet US Army weight requirements. It is a gas-operated, rotating bolt rifle accurate to 1.5 MOA with standard ammunition." } ], @@ -433,7 +433,7 @@ "variants": [ { "id": "papm77", - "name": { "str": "PAP M77 rifle" }, + "name": { "str": "PAP M77" }, "description": "A Serbian-made AK pattern rifle made by Zastava in 7.62x51mm NATO. To avoid import restrictions, Zastava USA has added a number of American-made parts." } ], @@ -506,7 +506,7 @@ "variants": [ { "id": "rfb_308", - "name": { "str": "Kel-Tec RFB rifle" }, + "name": { "str": "Kel-Tec RFB" }, "description": "This is a semi-automatic bullpup rifle with a lightweight, polymer frame, using magazines from the FN FAL and the .308 Winchester cartridge. The rifle, forward-ejection, bullpup (abbreviated as RFB) features forward case ejection, ambidextrous controls, and structural use of the barrel, uncommon in modern designs." } ], @@ -547,7 +547,7 @@ "variants": [ { "id": "steyr_scout", - "name": { "str": "Steyr Scout rifle" }, + "name": { "str": "Steyr Scout" }, "description": "The Steyr Scout is Steyr's interpretation of Jeff Cooper's concept of a 'scout rifle', a versatile, all-purpose hunting rifle. To this end, it is exceedingly lightweight, and contains a built-in polymer bipod, and fits a spare magazine inside the stock for fast reloading. While these features made for a hunting rifle too universal for widespread adoption, they might yet fulfill a vital scouting niche for survivors in the post-Cataclysm world." } ], diff --git a/data/json/items/gun/32.json b/data/json/items/gun/32.json index 3766db9ec84d7..ebf3fcf65915a 100644 --- a/data/json/items/gun/32.json +++ b/data/json/items/gun/32.json @@ -4,7 +4,7 @@ "looks_like": "glock_17", "type": "GUN", "reload_noise_volume": 10, - "name": { "str_sp": "Walther PPK pistol" }, + "name": { "str": "Walther PPK pistol" }, "description": "One of the most famous handguns of the 20th century. Your name is not Bond, but you might find this little gun still useful.", "ascii_picture": "ppk", "weight": "540 g", diff --git a/data/json/items/gun/338lapua.json b/data/json/items/gun/338lapua.json index 8ee58edb0d774..3977abd23698b 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" }, "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." } ], @@ -43,7 +43,7 @@ "variants": [ { "id": "savage112", - "name": { "str": "Savage 112 Magnum Target rifle" }, + "name": { "str": "Savage 112 Magnum Target", "str_pl": "Savage 112s Magnum Target" }, "description": "A highly-accurate precision rifle chambered for the powerful .338 Lapua cartridge, the Savage 112 Magnum Target is a classically designed bolt-action rifle in both its fit and finish, with a heavy barrel, a hardwood stock, and an attached muzzle brake. Unfortunately for the weapon and its users, a traditional veneer, no matter how admittedly swanky, isn't conducive to tactical effectiveness, as demonstrated by the 112 Magnum Target's mighty magazine size of one entire cartridge and lack of any factory-attached sights." } ], @@ -90,7 +90,7 @@ "variants": [ { "id": "mrad_smr", - "name": { "str": "Barrett MRAD SMR rifle" }, + "name": { "str": "Barrett MRAD SMR" }, "description": "Chambered for the .338 Lapua cartridge, the Barrett MRAD SMR is a civilian variant of the MK22 MRAD sniper rifle, which was in service with elements of the US army and is often regarded as one of the finest bolt-action sniper rifles ever developed. The primary differences that set this weapon apart from its Marshal sibling are the removal of the MRAD's caliber conversion capabilities and the installation of a fixed buttstock. These changes have resulted in a lighter and slimmer rifle that, most importantly for the discerning pre-Cataclysmic precision shooter, didn't require a second mortgage to purchase." } ], @@ -136,7 +136,7 @@ "variants": [ { "id": "axmc", - "name": { "str": "Accuracy International AXMC rifle" }, + "name": { "str": "Accuracy International AXMC" }, "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 2b2768f4be64d..8dadda9a8e04c 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 75496681989c0..b50d8e845a160 100644 --- a/data/json/items/gun/36paper.json +++ b/data/json/items/gun/36paper.json @@ -10,7 +10,7 @@ "variants": [ { "id": "colt_navy", - "name": { "str": "Colt M1861 Navy", "str_pl": "Colt M1861 Navies" }, + "name": { "str": "Colt M1861 Navy", "str_pl": "Colt M1861s Navy" }, "description": "The Colt M1861 is a black powder, cap & ball revolver dating back to the Civil War. While reloading it takes quite a while due to having to put a primer on each chamber manually, instead of having the primer in one unit with the casing, like metallic cartridges. However, for the time 6 shots in quick succession was a great thing for cavalry and officers to have on the field, though this version was much rarer than the more popular Colt M1860. Nowadays, this firearm is completely outdated, and only sees use in collections, reenactment, or special shooting competitions. However, black powder guns such as this are less regulated than more modern firearms, so it is sometimes the first gun a youth may buy. This one is chambered in .36, weaker than the M1860's .44." } ], diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json index 06da38cd7e58f..1640fb9adf140 100644 --- a/data/json/items/gun/38.json +++ b/data/json/items/gun/38.json @@ -76,7 +76,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", @@ -157,7 +157,7 @@ "copy-from": "pistol_revolver", "looks_like": "sw_619", "type": "GUN", - "name": { "str_sp": ".357 revolver" }, + "name": { "str": ".357 revolver" }, "//": "This is the Colt Python 2020 6-inch version.", "description": "A six inch revolver chambered in .357 Magnum/.38 Special. Favorite of sheriffs and post-Cataclysm survivor group leaders.", "//s": "omg twd reference :O", @@ -198,7 +198,7 @@ "variants": [ { "id": "colt_python", - "name": { "str_sp": "Colt Python" }, + "name": { "str": "Colt Python" }, "description": "Made by Colt, this six inch six-shooter is one of the most lauded revolvers ever produced. Can fire .38 Special and .357 Magnum." } ], @@ -208,7 +208,7 @@ "id": "sw_619", "copy-from": "pistol_revolver", "type": "GUN", - "name": { "str_sp": "7-shots .357 revolver" }, + "name": { "str": ".357 seven-shooter" }, "description": "A revolver chambered in .357, with a 6 inch barrel and 7 shots.", "ascii_picture": "sw_610", "weight": "1280 g", @@ -248,7 +248,7 @@ "variants": [ { "id": "sw_619", - "name": { "str_sp": "S&W 686 Plus" }, + "name": { "str": "S&W 686 Plus", "str_pl": "S&W 686s Plus" }, "description": "Introduced in the 90's, Smith & Wesson's model 686 'Plus' features a robust stainless steel frame, an adjustable front sight and a seventh shot that's sure to save your life." } ] @@ -257,8 +257,8 @@ "id": "chiappa_rhino", "copy-from": "pistol_revolver", "type": "GUN", - "name": { "str_sp": ".357 revolver" }, - "description": "A revolver chambered in .357, with a 6 inch barrel and 6 shots.", + "name": { "str": ".357 bottom barrel revolver" }, + "description": "A revolver chambered in .357 Magnum/.38 Special, with a 6 inch barrel and 6 shots.", "symbol": "(", "color": "light_gray", "looks_like": "sw_619", @@ -305,13 +305,13 @@ "copy-from": "pistol_revolver", "looks_like": "sw_619", "type": "GUN", - "name": { "str_sp": ".357-caliber snub-nosed revolver" }, + "name": { "str": ".357 snub-nosed revolver" }, "description": "Short, stout, and compact, this stainless steel revolver is a handy dispenser of .357-magnum, or lower-power .38-caliber, cartridges. Six rounds fit within the weapon, though its small stature and short barrel ensure that each pull of the trigger is all but a pyrotechnic spectacle: flashy, loud, and jumpy.", "variant_type": "gun", "variants": [ { "id": "rp63", - "name": { "str": "Rossi RP63 revolver" }, + "name": { "str": "Rossi RP63" }, "description": "A small frame, stainless-steel Brazilian wheel gun with rubberized grips, a serrated front sight, and a satin finish, boasting a 6-round cylinder of .357-magnum persuasion. Affordable, before the world collapsed, and confidently asserted by Rossi themselves to be the ideal carry gun for its rounded butt and 3-inch barrel, you aren't wholly sure that such assertions accounted for zombies." } ], diff --git a/data/json/items/gun/380.json b/data/json/items/gun/380.json index d8d3df0b08458..9b9e318c38a6b 100644 --- a/data/json/items/gun/380.json +++ b/data/json/items/gun/380.json @@ -75,12 +75,12 @@ "looks_like": "modular_ar15", "type": "GUN", "name": { "str": ".380 ACP pistol-caliber carbine" }, - "description": "A pistol-caliber carbine chambered in .380 ACP. It is more powerful and accurate than an equivalent pistol but the .380 ACP round is nonetheless fairly weak. Accepts 10-round magazines, which are not shared with any .380 ACP pistol unlike many other similar pistol-caliber carbines.", + "description": "A pistol-caliber carbine chambered in .380 ACP, designed by Hi-Point Firearms. Its 16.5\" barrel provides extra stopping power over an equivalent pistol, but .380 is still a relatively weak caliber. Accepts 10-round magazines, which are notably not interchangeable with those of CF380 pistols.", "variant_type": "gun", "variants": [ { "id": "hpt3895", - "name": { "str": "Hi-Point 3895 carbine" }, + "name": { "str": "Hi-Point 3895" }, "description": "A pistol-caliber carbine chambered in .380 ACP, designed by Hi-Point Firearms. Its 16.5\" barrel provides extra stopping power over an equivalent pistol, but .380 is still a relatively weak caliber. Accepts 10-round magazines, which are notably not interchangeable with those of CF380 pistols." } ], diff --git a/data/json/items/gun/38super.json b/data/json/items/gun/38super.json index f388cfee5df35..45ceffefcd32b 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": "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 61c606dc58fa0..dcdaa3fac0979 100644 --- a/data/json/items/gun/40.json +++ b/data/json/items/gun/40.json @@ -4,7 +4,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 from 1997-2016, and of countless other law enforcement agencies worldwide.", "ascii_picture": "glock_17", "weight": "645 g", @@ -51,7 +51,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", @@ -75,7 +75,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", @@ -121,7 +121,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 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", @@ -161,7 +161,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", @@ -185,7 +185,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 aa56ed9132606..b8b0ae0c7f209 100644 --- a/data/json/items/gun/40x46mm.json +++ b/data/json/items/gun/40x46mm.json @@ -65,7 +65,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 7aa425acf11f5..519bb360fabbd 100644 --- a/data/json/items/gun/410shot.json +++ b/data/json/items/gun/410shot.json @@ -4,7 +4,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/44.json b/data/json/items/gun/44.json index ee5663c1af976..35017b8819454 100644 --- a/data/json/items/gun/44.json +++ b/data/json/items/gun/44.json @@ -4,7 +4,7 @@ "looks_like": "glock_17", "type": "GUN", "reload_noise_volume": 10, - "name": { "str_sp": "Desert Eagle pistol" }, + "name": { "str": "Desert Eagle pistol" }, "description": "An icon of popular culture more than a practical weapon, this massive pistol can shoot a variety of magnum handgun rounds depending on the conversion kit and magazine used.", "weight": "1407 g", "volume": "671 ml", @@ -16,13 +16,13 @@ "variants": [ { "id": "modular_deagle", - "name": { "str": "Desert Eagle Mark XIX pistol" }, + "name": { "str": "Desert Eagle Mark XIX", "str_pl": "Desert Eagles Mark XIX" }, "description": "Needing little introduction, the Desert Eagle's impact on popular culture is almost as massive as the pistol itself. The newest Mark XIX model introduced a more modern optics rail. It was sold in multiple hard-hitting magnum calibers and can swap between them using conversion kits and the appropriate magazine.", "weight": 10000 }, { "id": "modular_deagle_gold", - "name": { "str": "golden Desert Eagle Mark XIX pistol" }, + "name": { "str": "golden Desert Eagle Mark XIX", "str_pl": "golden Desert Eagles Mark XIX" }, "description": "Needing little introduction, the Desert Eagle's impact on popular culture is almost as massive as the pistol itself. The newest Mark XIX model introduced a more modern optics rail. It was sold in multiple hard-hitting magnum calibers and can swap between them using conversion kits and the appropriate magazine. For maximum style points (or tackiness, depending on taste), this one is plated in what appears to be 24-karat gold." } ], @@ -132,12 +132,12 @@ "variants": [ { "id": "ruger_redhawk", - "name": { "str": "Ruger Redhawk revolver" }, + "name": { "str": "Ruger Redhawk" }, "description": "One of the most powerful handguns in the world when it was released in 1979, the Redhawk offers very sturdy construction, with an appearance that is reminiscent of \"Wild West\" revolvers." }, { "id": "sw629", - "name": { "str": "S&W 629 revolver" }, + "name": { "str": "S&W 629" }, "description": "A stainless steel, six-shot, double-action revolver with a matte black plastic handle manufactured by Smith & Wesson. Though hardly the most powerful handgun in the world any more, it could still blow a zombie's head clean off." } ], diff --git a/data/json/items/gun/44paper.json b/data/json/items/gun/44paper.json index 373c9a4cdac3b..f4ba29fe7b113 100644 --- a/data/json/items/gun/44paper.json +++ b/data/json/items/gun/44paper.json @@ -10,7 +10,7 @@ "variants": [ { "id": "colt_army", - "name": { "str": "Colt M1860 Army", "str_pl": "Colt M1860 Armies" }, + "name": { "str": "Colt M1860 Army", "str_pl": "Colt M1860s Army" }, "description": "The Colt M1860 is a black powder, cap & ball revolver dating back to the Civil War. While reloading it takes quite a while due to having to put a primer on each chamber manually, instead of having the primer in one unit with the casing, like metallic cartridges. However, for the time 6 shots in quick succession was a great thing for cavalry and officers to have on the field. Nowadays, this firearm is completely outdated, and only sees use in collections, reenactment, or special shooting competitions. However, black powder guns such as this are less regulated than more modern firearms, so it is sometimes the first gun a youth may buy. This one is chambered in .44, and while the number may remind some of .44 Magnum, it has nowhere near the ballistic effectiveness of .44 Magnum." } ], diff --git a/data/json/items/gun/45.json b/data/json/items/gun/45.json index ed90e8faca04a..9fa0ab2445e6e 100644 --- a/data/json/items/gun/45.json +++ b/data/json/items/gun/45.json @@ -15,7 +15,7 @@ "variants": [ { "id": "TDI", - "name": { "str": ".45 Vector submachine gun" }, + "name": { "str": ".45 Vector" }, "description": "The Vector SMG is a delayed blowback submachine gun with a unique, in-line design that places both the shooter's hand and shoulder in line with the bore axis, reducing muzzle climb during bursts. This one is chambered in .45 ACP." } ], @@ -65,12 +65,12 @@ "looks_like": "hk_mp5", "type": "GUN", "name": { "str": "UMP submachine gun" }, - "description": "A modern polymer-body sub-machine gun, once quite popular with police departments until recently. Can be configured in 9x19mm, .40 S&W, or .45 ACP using conversion kits and the appropriate UMP magazine.", + "description": "Developed as a lower-cost successor to H&K's own MP5, the Universal Machine Pistol is a closed-bolt, simple blowback sub-machine gun constructed of lightweight polymer. In order to make it more attractive to American police departments, it was offered in .40 S&W and .45 ACP as well as the ubiquitous 9x19mm, all using the same receiver. This was meant to simplify manufacturing, but it also means the user can change the caliber with the right parts and magazine.", "variant_type": "gun", "variants": [ { "id": "modular_ump", - "name": { "str": "H&K UMP submachine gun" }, + "name": { "str": "H&K UMP" }, "description": "Developed as a lower-cost successor to H&K's own MP5, the Universal Machine Pistol is a closed-bolt, simple blowback sub-machine gun constructed of lightweight polymer. In order to make it more attractive to American police departments, it was offered in .40 S&W and .45 ACP as well as the ubiquitous 9x19mm, all using the same receiver. This was meant to simplify manufacturing, but it also means the user can change the caliber with the right parts and magazine." } ], @@ -123,18 +123,18 @@ "looks_like": "glock_17", "type": "GUN", "name": { "str": "M1911 pistol" }, - "description": "A semi-automatic pistol chambered in .45 ACP and accepting M1911 magazines.", + "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.", "variant_type": "gun", "variants": [ { "id": "m1911", - "name": { "str": "M1911 pistol" }, + "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." }, { "id": "m1911_MEU", - "name": { "str": "M45A1 pistol" }, + "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 M1911A1s hand-fitted by USMC armorers, the updated M45A1s are hardly different from any other commercial 1911 design, save for their dual recoil springs. Most were replaced in 2016 with Glock 19s due to logistics issues." } ], @@ -164,12 +164,12 @@ "type": "GUN", "reload_noise_volume": 10, "name": { "str": "MAC-10 submachine gun" }, - "description": "A submachine gun chambered in .45 ACP and accepting MAC-10 magazines.", + "description": "The MAC-10 is a popular machine pistol originally designed for military use. For many years it was the most inexpensive automatic weapon in the US, and enjoyed great popularity among criminals less concerned with quality firearms.", "variant_type": "gun", "variants": [ { "id": "mac_10", - "name": { "str": "MAC-10 machine pistol" }, + "name": { "str": "MAC-10" }, "description": "The MAC-10 is a popular machine pistol originally designed for military use. For many years it was the most inexpensive automatic weapon in the US, and enjoyed great popularity among criminals less concerned with quality firearms." } ], @@ -248,14 +248,6 @@ "type": "GUN", "name": { "str": "MAC-10 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 .45 ACP cartridges and accepts MAC-10 compatible magazines.", - "variant_type": "gun", - "variants": [ - { - "id": "smg_45", - "name": { "str": ".45 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 .45 ACP cartridges and accepts MAC-10 compatible magazines." - } - ], "//": "Crafting recipe must make use of angle grinder, bench grinder, set square and vise, which don't yet exist in game.", "weight": "3520 g", "volume": "1110 ml", @@ -295,12 +287,12 @@ "type": "GUN", "reload_noise_volume": 10, "name": { "str": "Thompson submachine gun" }, - "description": "A submachine gun chambered in .45 ACP and accepting Thompson magazines.", + "description": "An American-made submachine gun developed during the very end of World War I, too late to see action. Infamous during the 1920s for its use by gangsters, and used during World War II before being mostly replaced with less-expensive alternatives.", "variant_type": "gun", "variants": [ { "id": "tommygun", - "name": { "str": "Thompson M1928A1 submachine gun" }, + "name": { "str": "Thompson M1928A1" }, "description": "An American-made submachine gun developed during the very end of World War I, too late to see action. Infamous during the 1920s for its use by gangsters, and used during World War II before being mostly replaced with less-expensive alternatives." } ], @@ -349,17 +341,17 @@ "copy-from": "usp_9mm", "type": "GUN", "name": { "str": "USP pistol" }, - "description": "A semi-automatic pistol chambered in .45 ACP and accepting USP magazines.", + "description": "A popular pistol, widely used among law enforcement. Extensively tested for durability, it has been found to stay accurate even after being subjected to extreme abuse.", "variant_type": "gun", "variants": [ { "id": "usp_45", - "name": { "str": ".45 USP pistol" }, + "name": { "str": ".45 USP" }, "description": "A popular pistol, widely used among law enforcement. Extensively tested for durability, it has been found to stay accurate even after being subjected to extreme abuse." }, { "id": "mk23", - "name": { "str": "MK 23 MOD 0 pistol" }, + "name": { "str": "MK 23 MOD 0", "str_pl": "MK 23s MOD 0" }, "description": "Jokingly referred to as \"The World's Only Crew-Served Pistol\", this massive pistol was designed as a primary weapon for select \"special operators\". Its cumbersome nature, the introduction of the derivative HK USP series, and the logistics of getting .45 ACP ammunition in theater doomed this behemoth to US SOCOM armories. Like the USP, the MK 23 is a remarkably reliable gun; someone could probably take out a nuclear-equipped walking tank with this in their holster." } ], @@ -380,12 +372,12 @@ "looks_like": "glock_17", "type": "GUN", "name": { "str": "PPQ pistol" }, - "description": "A semi-automatic pistol chambered in .45 ACP and accepting PPQ magazines.", + "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 .45 ACP.", "variant_type": "gun", "variants": [ { "id": "walther_ppq_45", - "name": { "str": "Walther PPQ 45 pistol" }, + "name": { "str": "Walther PPQ 45" }, "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 .45 ACP." } ], @@ -412,12 +404,12 @@ "looks_like": "glock_17", "type": "GUN", "name": { "str": "Model JHP pistol" }, - "description": "A semi-automatic pistol chambered in .45 ACP and accepting Hi-Point magazines.", + "description": "The Hi-Point Model JHP 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.", "variant_type": "gun", "variants": [ { "id": "hptjhp", - "name": { "str": "Hi-Point Model JHP pistol" }, + "name": { "str": "Hi-Point Model JHP" }, "description": "The Hi-Point Model JHP 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." } ], @@ -444,12 +436,12 @@ "looks_like": "glock_17", "type": "GUN", "name": { "str": "Glock pistol" }, - "description": "A semi-automatic pistol chambered in .45 ACP and accepting Glock magazines.", + "description": "A full-sized version of the highly successful Glock. This model is chambered in .45 ACP.", "variant_type": "gun", "variants": [ { "id": "glock_21", - "name": { "str": "Glock 21 pistol" }, + "name": { "str": "Glock 21" }, "description": "A full-sized version of the highly successful Glock. This model is chambered in .45 ACP." } ], @@ -479,12 +471,12 @@ "type": "GUN", "reload_noise_volume": 10, "name": { "str": ".45 WWII submachine gun" }, - "description": "A WWII submachine gun, lacking semi-auto fire selector and chambered in .45 ACP.", + "description": "An American-made submachine gun developed during WWII as an alternative to Thompson M1928A1 and used at least till early 1990s. Simple, cheap, and somewhat crude, the M3 was still quite an effective weapon, mostly made from sheet metal to reduce costs and speed up production. In times of active use, it was considered as a disposable weapon, which is more expedient to replace than to repair. Unfortunately, you cannot afford such wastefulness, unlike this submachine gun, which is devoid of even a fire selector for semi-auto fire.", "variant_type": "gun", "variants": [ { "id": "greasegun", - "name": { "str": "M3 submachine gun" }, + "name": { "str": "M3" }, "description": "An American-made submachine gun developed during WWII as an alternative to Thompson M1928A1 and used at least till early 1990s. Simple, cheap, and somewhat crude, the M3 was still quite an effective weapon, mostly made from sheet metal to reduce costs and speed up production. In times of active use, it was considered as a disposable weapon, which is more expedient to replace than to repair. Unfortunately, you cannot afford such wastefulness, unlike this submachine gun, which is devoid of even a fire selector for semi-auto fire." } ], diff --git a/data/json/items/gun/454.json b/data/json/items/gun/454.json index e5317dad24aa8..0558fab935bfb 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", diff --git a/data/json/items/gun/4570.json b/data/json/items/gun/4570.json index 78bddf6658b56..7385aa2470247 100644 --- a/data/json/items/gun/4570.json +++ b/data/json/items/gun/4570.json @@ -99,7 +99,7 @@ "variants": [ { "id": "sharps", - "name": { "str": "1874 Sharps", "str_pl": "1874 Sharpses" }, + "name": { "str": "1874 Sharps", "str_pl": "1874s Sharps" }, "description": "The Sharps rifle series are antique, falling block rifles that saw service far back as the American Civil War. The 1874 Sharps is one of the first rifles to utilize metallic cartridges, a revolutionary technology back in those days. While they were chambered in 45-70, modern day smokeless loads would blow up older versions. Thankfully, this reproduction from Uberti can handle modern day 45-70 loads." } ], diff --git a/data/json/items/gun/458wm.json b/data/json/items/gun/458wm.json index b16fc4a75e62a..d6c0070644301 100644 --- a/data/json/items/gun/458wm.json +++ b/data/json/items/gun/458wm.json @@ -10,7 +10,7 @@ "variants": [ { "id": "win70_458_safari", - "name": { "str": "Winchester Model 70 Safari rifle" }, + "name": { "str": "Winchester Model 70 Safari", "str_pl": "Winchester Model 70s Safari" }, "description": "This is a Winchester Model 70 Safari Express chambered in .458 Winchester Magnum, a fine bolt-action rifle for hunting dangerous game. A fixture of American gun culture, the Model 70 has been held in high regard by shooters since it was introduced in 1936." } ], diff --git a/data/json/items/gun/45colt.json b/data/json/items/gun/45colt.json index 9ce1e919fa8f2..b478e31381556 100644 --- a/data/json/items/gun/45colt.json +++ b/data/json/items/gun/45colt.json @@ -54,7 +54,7 @@ "variants": [ { "id": "colt_saa", - "name": { "str": "Colt Single Action Army", "str_pl": "Colt Single Action Armies" }, + "name": { "str": "Colt Single Action Army", "str_pl": "Colts Single Action Army" }, "description": "A famous revolver for many westerns, the Colt Single Action Army has seen plenty of military service, production ends, and production restarts. While originally in a large amount of chamberings, it is mostly found in .45 Colt chamberings today. While reloading is slow due to the lack of a swing-out cylinder, it was still much faster than earlier revolvers of the time thanks to using metallic cartridges. It's also sometimes referred to as the Peacemaker, Model P, M1873 or shortened to SAA.", "weight": 1 }, diff --git a/data/json/items/gun/46.json b/data/json/items/gun/46.json index ce660fe6d9beb..ce40f8b7e01cc 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..b27ba5aba96f4 100644 --- a/data/json/items/gun/460.json +++ b/data/json/items/gun/460.json @@ -2,9 +2,8 @@ { "id": "m1911-460", "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 7ccf9d2bb2fd4..2995ed9939640 100644 --- a/data/json/items/gun/50.json +++ b/data/json/items/gun/50.json @@ -10,9 +10,9 @@ "variants": [ { "id": "m107a1", - "name": { "str_sp": "Barrett M107A1" }, + "name": { "str": "Barrett M107A1" }, "//": "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." + "description": "A mahoosive rifle of military pedigree, fitted with a telescopic gun scope peeking over its giant cocking mechanism and resting upon a bipod to control recoil from the equally big .50-calibre munitions it is designed for. Originally employed for detonating unexploded ordnance in combat conditions and defeating light vehicular and structural targets, in the post-Cataclysm it serves as an admirable conduit of kinetic energy to the biggest and baddest of the new world's critters." } ], "weight": "12950 g", @@ -39,14 +39,14 @@ "copy-from": "rifle_auto", "looks_like": "m107a1", "type": "GUN", - "name": { "str_sp": ".50-caliber heavy machine gun" }, + "name": { "str": ".50-caliber heavy machine gun" }, "description": "Essentially a giant steel box with a long barrel peering from one end and dual spade grips mounted upon the other, this venerable machine gun design served the United States military since the First World War, mounted on everything from tanks to patrol boats to aircraft, and even tripod-mounted for stand-alone use. Part and parcel with its size and munition payload of .50-caliber ammo belts, however, is the fact that, to operate it, one must mount it upon suitable furniture, terrain features, or vehicles.", "variant_type": "gun", "variants": [ { "id": "m2browning", - "name": { "str_sp": "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." + "name": { "str": "M2HB Browning" }, + "description": "Essentially a giant steel box with a long barrel peering from one end and dual spade grips mounted upon the other, this venerable machine gun design served the United States military since the First World War, mounted on everything from tanks to patrol boats to aircraft, and even tripod-mounted for stand-alone use. Part and parcel with its size and munition payload of .50-calibre ammo belts, however, is the fact that, to operate it, one must mount it upon suitable furniture, terrain features, or vehicles." } ], "weight": "38000 g", @@ -89,7 +89,7 @@ "variants": [ { "id": "as50", - "name": { "str_sp": "AI AS50" }, + "name": { "str": "AI AS50" }, "description": "Developed by 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 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 an estimated max range of 1500 meters, the firearm feeds from 10-round box magazines." } ], @@ -125,7 +125,7 @@ "variants": [ { "id": "tac50", - "name": { "str_sp": "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 held the longest-range confirmed sniper kill, as well as the 4th and 5th longest." } ], @@ -161,7 +161,7 @@ "variants": [ { "id": "bfg50", - "name": { "str_sp": "Serbu BFG-50" }, + "name": { "str": "Serbu BFG-50" }, "description": "A single-shot, bolt-action rifle made by Serbu Firearms, the BFG-50 was a very affordable firearm for those wishing to shoot .50 BMG." } ], diff --git a/data/json/items/gun/500.json b/data/json/items/gun/500.json index d05d3d1b41533..4ee846b796637 100644 --- a/data/json/items/gun/500.json +++ b/data/json/items/gun/500.json @@ -10,8 +10,8 @@ "variants": [ { "id": "sw_500", - "name": { "str": "S&W 500 revolver" }, - "description": "The 5-shot Smith and Wesson 500 revolver fires the comparably-named .500 S&W Magnum. It's an impressive weapon." + "name": { "str": "S&W 500" }, + "description": "The definition of 'overkill', this behemoth handgun puts large .44 caliber revolvers to shame with its sheer size, power, and immense chambering. Firing the appropriately named .500 Magnum cartridge, the most powerful handgun round in the world, the weapon has seen work in both sport shooting and hunting roles. A pistol for those of the 'bigger is better' mentality, a high recoil junky's personal dream, and an all-around useless military sidearm, should the urge to assault the Cataclysm in fine style grip you, this giant provides you with 5 rounds with which to reduce a zombie into an afterthought." } ], "weight": "1960 g", diff --git a/data/json/items/gun/545x39.json b/data/json/items/gun/545x39.json index b05a123cced4b..87dede00b07f7 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": "AK-74" }, "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": "AKS-74" }, "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 descendant 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." } ], @@ -63,7 +63,7 @@ "variants": [ { "id": "kord", - "name": { "str": "Kord 6P67 rifle" }, + "name": { "str": "Kord 6P67" }, "description": "A special forces Russian rifle chambered in 5.45. This version uses standard Picatinny rails, has modern lightweight furniture and a unique complex recoil balance system for high fire rate with minimal recoil. It combines the reliability of the AK series with the high-velocity, lightweight 5.45x39mm cartridge and accepts standard AK-74M magazines." } ], diff --git a/data/json/items/gun/57.json b/data/json/items/gun/57.json index f5f952b587d07..74b01d4379c37 100644 --- a/data/json/items/gun/57.json +++ b/data/json/items/gun/57.json @@ -10,7 +10,7 @@ "variants": [ { "id": "fn57", - "name": { "str": "FN Five-seveN pistol" }, + "name": { "str": "FN Five-seveN" }, "description": "Designed to work with FN's proprietary 5.7x28mm round, the Five-seveN is a lightweight pistol with a very high capacity, best used against armored opponents." } ], @@ -65,7 +65,7 @@ "variants": [ { "id": "fn_p90", - "name": { "str": "FN P90 submachine gun" }, + "name": { "str": "FN P90" }, "description": "The first in a new genre of guns, termed \"personal defense weapons.\" FN designed the P90 to use their proprietary high-velocity 5.7x28mm ammunition. Made to fulfill NATO requests for a weapon chambered in a more suitable cartridge for defeating body armor than standard 9x19mm submachine guns, the FN P90 is excellent at firing short and controllable bursts manageably. The PDW's small and high-speed 5.7mm ammunition, of which 50 rounds fit in the P90's top mounted magazine, packs quite the lethal payload for any armored opponent, whilst the firearm's bullpup design makes it commendably compact to boot." } ], @@ -111,13 +111,13 @@ "looks_like": "glock_17", "type": "GUN", "reload_noise_volume": 10, - "name": { "str": "high-capacity P90 handgun" }, + "name": { "str": "P90 high-capacity handgun" }, "description": "A large and retro-looking semi-automatic pistol firing the high-velocity 5.7x28mm cartridge, mainly constructed out of polymer-based materials. Making use of standard P90 50-round magazines which are inserted horizontally over the grip, the top of the gun swings forwards and away from the frame to facilitate reloading. If you were looking to add a touch of retro-futuristic spice to your new life in the ruins of New England, this firearm just might become your best friend.", "variant_type": "gun", "variants": [ { "id": "p50", - "name": { "str": "Kel-Tec P50 pistol" }, + "name": { "str": "Kel-Tec P50" }, "description": "Unique, adaptable, and extremely retro, the Kel-Tec P50 is a truly bizarre semi-automatic pistol. Having been regarded as possibly one of the most innovative firearms from Kel-Tec's entire line-up of guns, the P50 makes use of the high velocity 5.7x28mm cartridge, and feeds from standard FN P90 magazines. Boasting ambidextrous controls, an AR-15-like T-shaped charging handle, and a reload which involves swinging the receiver and barrel assemblies up and away from the frame to insert the magazine horizontally over the grip, this weapon lends a decidedly retro-futuristic touch to almost any situation." } ], @@ -167,12 +167,12 @@ "type": "GUN", "reload_noise_volume": 10, "name": { "str": "Ruger-57 handgun" }, - "description": "Produced by the Ruger gun company, this full-sized pistol makes use of the 5.7x28mm cartridge. One of the first pistols to both make use of the unusual round and achieve market success within the civilian world, it opened the door for accessible 5.7mm shooting due to its low price and reliable design.", + "description": "A full-sized polymer framed handgun chambered in the unusual 5.7x28mm cartridge, the Ruger-57 was one of the first commercially available 5.7mm pistols on the market, with its main competitor being FN's decades-old, and far pricier, Five-seveN pistol. Featuring a lightweight ergonomic design, 1911-style thumb-safety, a high visibility green front-sight with adjustable black rear iron-sights, and a price point which hovered a good 500 dollars below its competition, the Ruger-57 made the comparatively niche 5.7x28mm round far more accessible to a wider margin of potential shooters.", "variant_type": "gun", "variants": [ { "id": "ruger_57", - "name": { "str": "Ruger-57 handgun" }, + "name": { "str": "Ruger-57" }, "description": "A full-sized polymer framed handgun chambered in the unusual 5.7x28mm cartridge, the Ruger-57 was one of the first commercially available 5.7mm pistols on the market, with its main competitor being FN's decades-old, and far pricier, Five-seveN pistol. Featuring a lightweight ergonomic design, 1911-style thumb-safety, a high visibility green front-sight with adjustable black rear iron-sights, and a price point which hovered a good 500 dollars below its competition, the Ruger-57 made the comparatively niche 5.7x28mm round far more accessible to a wider margin of potential shooters." } ], @@ -225,13 +225,13 @@ "id": "fn_ps90", "copy-from": "fn_p90", "type": "GUN", - "name": { "str": "semi-automatic P90 carbine" }, + "name": { "str": "P90 semi-auto carbine" }, "description": "The civilian version of the older 5.7mm PDW, this carbine features a 16 inch long barrel, feeds from the same 50-round magazines as its predecessor, and is only capable of semi-automatic fire in order to keep it in line with American firearm restrictions.", "variant_type": "gun", "variants": [ { "id": "fn_ps90", - "name": { "str": "FN PS90 carbine" }, + "name": { "str": "FN PS90" }, "description": "Originally introduced in 2005, the PS90 is the civilian clone of the venerable FN P90, sharing much of the same characteristics and features as its fully-automatic older brother. Chambering the same 5.7x28mm cartridge as its predecessor, in order to make it a legally distributable carbine in the eyes of the law the PS90 was manufactured to only be capable of semi-automatic fire, with a fitted-on 16-inch long barrel to sidestep NFA regulations on short-barreled rifles." } ], diff --git a/data/json/items/gun/66mm.json b/data/json/items/gun/66mm.json index 75df49d276cea..c5ec9c3733394 100644 --- a/data/json/items/gun/66mm.json +++ b/data/json/items/gun/66mm.json @@ -5,13 +5,13 @@ "type": "GUN", "symbol": "(", "color": "dark_gray", - "name": { "str_sp": "M74 rocket launcher" }, + "name": { "str": "M74 rocket 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.", "variant_type": "gun", "variants": [ { "id": "m202_flash", - "name": { "str_sp": "M202A1 FLASH" }, + "name": { "str": "M202A1 FLASH", "str_pl": "M202A1s FLASH" }, "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/762.json b/data/json/items/gun/762.json index 150585a2ee270..3745e7b5e9a95 100644 --- a/data/json/items/gun/762.json +++ b/data/json/items/gun/762.json @@ -214,7 +214,7 @@ "copy-from": "pistol_base", "looks_like": "draco", "type": "GUN", - "name": { "str": "Small AK pistol" }, + "name": { "str": "small AK pistol" }, "description": "The Draco series of guns are guns imported by Century Arms. They're essentially semi-auto AKs, but with shorter barrels and no stock. While advertised as compact guns, they're more often than not range toys. This one is a Mini Draco, with a 7.75\" barrel, short enough that the handguard had to be modified.", "variant_type": "gun", "variants": [ @@ -259,7 +259,7 @@ "copy-from": "pistol_base", "looks_like": "draco", "type": "GUN", - "name": { "str": "Tiny AK pistol" }, + "name": { "str": "tiny AK pistol" }, "description": "The Draco series of guns are guns imported by Century Arms. They're essentially semi-auto AKs, but with shorter barrels and no stock. While advertised as compact guns, they're more often than not range toys. This one is a Micro Draco, the smallest, with a 6.25\" barrel. It has a distinctive, oddly curvy handguard.", "variant_type": "gun", "variants": [ @@ -308,7 +308,7 @@ "variants": [ { "id": "mk47", - "name": { "str": "Mk47 Mutant rifle" }, + "name": { "str": "Mk47 Mutant" }, "description": "The CMMG Mk47 Mutant is an American rifle, natively chambered for 7.62x39mm ammo. Features a characteristic free-floating handguard, with a similar action mechanism to the AR-15, repurposed for the bigger, more potent ammo." } ], @@ -352,12 +352,12 @@ "variants": [ { "id": "bren2_762", - "name": { "str": "CZ Bren 2 carbine" }, + "name": { "str": "CZ Bren 2" }, "description": "Hailing from the Czech Republic, this modular carbine supplanted the older CZ 805 rifle within Czech military use, improving upon the former's features and bringing fully ambidextrous controls, a streamlined design, and an easily adjustable gas system to the table. Chambered for the 7.62x39mm Soviet cartridge, this particular weapon possesses a compact 11-inch barrel and is a civilian MS, 'modular semi-automatic,' model. Incorporating a number of US-made parts, the weapon features a removable muzzle break rather than the flash hider that comes standard with military rifles." }, { "id": "805_bren", - "name": { "str": "CZ 805 Bren rifle" }, + "name": { "str": "CZ 805 Bren" }, "description": "Strongly resembling the FN SCAR, with features and ergonomics inspired by the AR-18, this semi-automatic rifle is a civilian clone of the Czech Republic's formerly standard infantry carbine and was produced by the same company. Discontinued in 2018, the rifle features an included muzzle break and adjustable folding buttstock, with this particular version being chambered in 7.62x39mm." } ], diff --git a/data/json/items/gun/762R.json b/data/json/items/gun/762R.json index 47f6ca8896712..19fcaf3ca95c9 100644 --- a/data/json/items/gun/762R.json +++ b/data/json/items/gun/762R.json @@ -16,12 +16,12 @@ "variants": [ { "id": "mosin44", - "name": { "str": "Mosin-Nagant M44 carbine" }, + "name": { "str": "Mosin-Nagant M44" }, "description": "The Model 44 is the carbine-sized variant of the standard 1891/30. It has a shorter barrel, making it weaker than the 1891/30, but easier to carry. This weapon also comes with an integrated side-folding bayonet." }, { "id": "mosin44_ebr", - "name": { "str": "Mosin-Nagant M44-EBR carbine" }, + "name": { "str": "Mosin-Nagant M44-EBR" }, "description": "This carbine packs the classic Mosin-Nagant Model 44 action in a modern-day stock capable of accepting modifications." } ], @@ -74,12 +74,12 @@ "variants": [ { "id": "mosin91_30", - "name": { "str": "Mosin-Nagant 1891/30 rifle" }, + "name": { "str": "Mosin-Nagant 1891/30" }, "description": "The Mosin-Nagant 1891/30 is a bolt-action, internal magazine-fed military rifle, developed by the Russian Empire and later used and perfected by the Soviet Union." }, { "id": "mosin91_30_ebr", - "name": { "str": "Mosin-Nagant 1891/30-EBR rifle" }, + "name": { "str": "Mosin-Nagant 1891/30-EBR" }, "description": "This Mosin-Nagant has exchanged the classic wooden stock for a modern synthetic model, carefully balanced to the same weight and handling, to allow support for modern accessories." } ], diff --git a/data/json/items/gun/762x25.json b/data/json/items/gun/762x25.json index 0c47b3e6f3e8c..8b163dd41e169 100644 --- a/data/json/items/gun/762x25.json +++ b/data/json/items/gun/762x25.json @@ -5,12 +5,12 @@ "looks_like": "glock_17", "type": "GUN", "name": { "str": "Tokarev handgun" }, - "description": "A symbol of Soviet pride and favored sidearm of Red Army officers, this is a compact pistol firing the punchy 7.62x25mm cartridge. featuring an uncomfortable grip angle reminiscent of brandishing an unusually irate capital L at one's opponents, it is nevertheless a commendably accurate and durable handgun.", + "description": "The Tokarev TT-33 is an antique Russian semiautomatic pistol, famous for its durability, accuracy, and uncomfortable grip angle. It was chambered for the 7.62x25mm due to the popularity of the C96 pistol among Russian revolutionaries.", "variant_type": "gun", "variants": [ { "id": "tokarev", - "name": { "str": "Tokarev TT-33 pistol" }, + "name": { "str": "Tokarev TT-33" }, "//": "And it's therefore expensive.", "description": "The Tokarev TT-33 is an antique Russian semiautomatic pistol, famous for its durability, accuracy, and uncomfortable grip angle. It was chambered for the 7.62x25mm due to the popularity of the C96 pistol among Russian revolutionaries." } diff --git a/data/json/items/gun/77mm_arisaka.json b/data/json/items/gun/77mm_arisaka.json index e57dcff42ffee..e441773bde113 100644 --- a/data/json/items/gun/77mm_arisaka.json +++ b/data/json/items/gun/77mm_arisaka.json @@ -10,13 +10,13 @@ "variants": [ { "id": "type99", - "name": { "str": "Arisaka Type 99 rifle" }, + "name": { "str": "Arisaka Type 99" }, "description": "The standard service arm of the imperial Japanese army during the Second World War, chambered for the powerful 7.7x58mm cartridge and built to replace the weaker Type 38, the Type 99 is a sturdy and formidable bolt-action rifle with a Mauser-inspired action renowned for its strength. Though the rifle was historically sneered at in the US due to extensive anti-Japanese propaganda and the lower quality of later-production guns, the weapon is, by most metrics, a finely produced and effective shoulder arm. This particular Arisaka is an early-war example with anti-aircraft sights and an intact 6-petal chrysanthemum seal.", "weight": 1 }, { "id": "type99ld", - "name": { "str": "Arisaka Type 99 rifle" }, + "name": { "str": "Arisaka Type 99" }, "description": "Standing as a clear example of what happens when a country losing a war realizes that it's running out of resources and its rifles are ripe for corner-cutting, this Type 99 Arisaka, the standard service arm of imperial Japan from 1939, is a crewed end-of-war example. Coated in machining marks, lacking an upper handguard, and with the early production anti-aircraft sights long since done away with, where early production Arisaka rifles are a feat in elegant engineering, this one is a last-ditch bang stick hammered together in a mostly bombed-out factory. Aesthetics not withstanding, this weapon is still an effective and powerful shoulder arm, just… not the prettiest." } ], @@ -69,7 +69,7 @@ "variants": [ { "id": "type99_sniper", - "name": { "str": "Arisaka Type 99 sniper rifle" }, + "name": { "str": "sniper Arisaka Type 99" }, "description": "The standard sniper's weapon of Imperial Japan, this rifle is essentially an early production Type 99 Arisaka fitted with an offset optical sight and a bent bolt handle to facilitate stripper clip loading and easy manipulation despite the scope's presence. While its 7.7x58mm chambering resulted in a muzzle flash and report that were significantly greater than those of the Type 97, which it sought to replace, the rifle's man-stopping potential is nothing to be trifled with.", "weight": 1 } 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/8x40mm.json b/data/json/items/gun/8x40mm.json index 68d4dfa531842..463b2042d3cb8 100644 --- a/data/json/items/gun/8x40mm.json +++ b/data/json/items/gun/8x40mm.json @@ -11,7 +11,7 @@ "variants": [ { "id": "rm103a_pistol", - "name": { "str": "RM103A automagnum" }, + "name": { "str": "RM103A" }, "description": "Designed for style rather than practicality, the Rivtech RM103A is an impressive-looking pistol with less-than-impressive results. Too short to properly utilize Rivtech's proprietary 8mm caseless ammunition, this status symbol is still a capable sidearm. Accepts stick magazines." } ], @@ -52,7 +52,7 @@ "variants": [ { "id": "rm11b_sniper_rifle", - "name": { "str": "RM11B scout rifle" }, + "name": { "str": "RM11B" }, "description": "Intended to function as a long-range sharpshooter support weapon for the military, the Rivtech RM11B scout rifle was designed for durability and accuracy under less than ideal circumstances. Its bullpup layout, digital scope, and two round burst mode allow it to deliver precise long-range takedowns, utilizing the proprietary Rivtech 8mm caseless round. Accepts stick magazines." } ], @@ -99,7 +99,7 @@ "variants": [ { "id": "rm2000_smg", - "name": { "str": "RM2000 submachine gun" }, + "name": { "str": "RM2000" }, "description": "Utilizing a powerful and unusual caliber, the Rivtech RM2000 submachine gun was designed for durability and ease of carrying under less than ideal circumstances. Accepts stick magazines." } ], @@ -141,7 +141,7 @@ "variants": [ { "id": "rm51_assault_rifle", - "name": { "str": "RM51 assault rifle" }, + "name": { "str": "RM51" }, "description": "Originally produced for military use, the Rivtech RM51 assault rifle was designed for durability and ease of use under less than ideal circumstances, with its considerable bulk minimized by a compact and ergonomic layout. Accepts box magazines." } ], diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json index 7648073c68bf7..4e53251b4ec6b 100644 --- a/data/json/items/gun/9mm.json +++ b/data/json/items/gun/9mm.json @@ -10,7 +10,7 @@ "variants": [ { "id": "calico", - "name": { "str": "Calico M960 carbine" }, + "name": { "str": "Calico M960" }, "//": "Automatic variant. Cyclic fire rate: 750 rpm", "description": "A compact submachine gun designed evidently under the 'spray and pray' mentality, this Calico M960 automatic carbine is not notably powerful, or dependable, or even particularly accurate to shoot. Intended for military and law enforcement use, it never saw any noteworthy service due to its poor reliability and overall performance, and would be an unremarkable weapon in all respects, save for its enormous magazine capacity. Making use of uniquely designed 50 or 100 round circular magazines, the Calico might not be a particularly good gun, but will throw an overwhelming amount of lead down range for a long time providing that it doesn't choke, jam, and die." } @@ -66,12 +66,12 @@ "variants": [ { "id": "glock_19", - "name": { "str": "Glock 19 pistol" }, + "name": { "str": "Glock 19" }, "description": "Possibly the most popular pistol in existence, the Glock 19 can be summed up as being fundamentally a more compact brother to the full-sized Glock 17 pistol. Sporting a mainly polymer-based design, the Glock 19 is often derided for its plastic construction which lends the handgun a deceptively flimsy feel. Even so, the Glock 19 remains both a remarkably reliable firearm and a quite shootable gun in its own right." }, { "id": "glock_19_cop", - "name": { "str": "Glock 19M MOS" }, + "name": { "str": "Glock 19M MOS", "str_pl": "Glock 19Ms MOS" }, "description": "A close relative to the stock Glock 19, this all-black pistol features a specialized mount for a red dot sight, extended mag release, and a 4.02-inch Marksman barrel. It is most commonly used by law enforcement, and is the current standard-issue sidearm of the FBI.", "weight": 0 } @@ -215,7 +215,7 @@ "variants": [ { "id": "ptr_603", - "name": { "str": "PTR 603 submachine gun" }, + "name": { "str": "PTR 603" }, "description": "The PTR 603 is a semi-automatic copy of the famous MP5 series, domestically produced for the US market on original Heckler & Koch tooling by PTR Industries. Like the MP5, its roller delayed blowback action offers smooth shooting and precision, setting it apart from other submachine guns and pistol caliber carbines. This model is configured as a pistol to avoid inconvenient and costly NFA regulations. A welded-on section of M1913 rail offers convenient mounting for aftermarket optics, but precludes the use of claw mounts." } ], @@ -336,7 +336,7 @@ "variants": [ { "id": "mauser_c96", - "name": { "str": "Mauser C96 Broomhandle pistol" }, + "name": { "str": "Mauser C96 Broomhandle", "str_pl": "Mauser C96s Broomhandle" }, "description": "A late 19th century semi-automatic German pistol with an integral magazine loaded from the top via stripper clips, and quite possibly the most steampunk gun one could ever possibly lay their hands on. A red number '9' burned and painted into the weapon's broom handle-shaped grip marks it as a variant chambered for 9x19mm rounds. Both exported for commercial use and produced for the German military during the First World War to make up for production shortages of the standard Luger, this example likely entered the US as a holdover from the Great War. You suppose that it's only fitting that one of the globe's first produced and oldest semi-automatic handguns gets reinstated into service now that the planet's facing its end." } ], @@ -387,7 +387,7 @@ "variants": [ { "id": "mp40", - "name": { "str": "Vollmer MP 40 submachine gun" }, + "name": { "str": "Vollmer MP 40" }, "description": "A simple and renowned 9x19mm submachine gun developed by Heinrich Vollmer for the German army. Adopted in 1940, it saw extensive service on both fronts of the Second World War and was much regarded by soldiers who fielded the weapon in combat, being praised for its reliability and relatively modern design. Featuring an integral folding wire butt stock, this weapon more than likely entered the United States as a war trophy by a returning veteran. It was often called \"Schmeisser\" by the Allies, after Hugo Schmeisser, who designed the MP 18, although he was not involved in the design or production of the MP 40." } ], @@ -426,7 +426,7 @@ "id": "mp40semi", "copy-from": "pistol_base", "type": "GUN", - "name": { "str": "Semi Automatic MP 40 submachine gun" }, + "name": { "str": "MP 40 semi-auto submachine gun" }, "description": "A modern semi-automatic replica of the MP 40 submachine gun, which lacks a butt stock to make it legally be considered a pistol. It actually bears only a visual resemblance to the original, differing substantially from originally manufactured MP 40 submachine guns in its internal operations.", "weight": "3722 g", "volume": "2020 ml", @@ -459,7 +459,7 @@ "variants": [ { "id": "ksub2000", - "name": { "str": "Kel-Tec SUB-2000 carbine" }, + "name": { "str": "Kel-Tec SUB-2000" }, "description": "With its claim to fame being its ease of portability when compared to other conventional rifles and carbines, the Kel-Tec SUB-2000 is a uniquely-designed pistol caliber carbine sporting an integral folding mechanism and chambered for 9x19mm cartridges, making use of regular Glock compatible magazines. With its mechanism engaged, the barrel assembly swings rearwards and causes the firearm to fold to half its regular length, packing up into a very compact package with ergonomics unfortunately having to take a backseat to allow for the weapon's extreme portability. With a mainly polymer constructed receiver, the carbine is relatively light and incredibly transportable when fully folded." } ], @@ -527,12 +527,12 @@ "variants": [ { "id": "m9", - "name": { "str": "Beretta M9A1 pistol" }, + "name": { "str": "Beretta M9A1" }, "description": "An iconic 9x19mm pistol, the M9 was the standard issue sidearm of the US armed forces from 1985 until only recently. It was formerly popular among law enforcement before the advent of commercially available polymer-framed handguns and the FBI's adoption of .40 S&W." }, { "id": "90two", - "name": { "str": "Beretta 90-two pistol" }, + "name": { "str": "Beretta 90-two", "str_pl": "Berettas 90-two" }, "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." } ], @@ -796,7 +796,7 @@ "variants": [ { "id": "glock_17", - "name": { "str": "Glock 17 pistol" }, + "name": { "str": "Glock 17" }, "description": "Commonly seen tucked away in the holsters of police officers, certain military professionals, and civilian shooters, this is a larger, older, service-oriented version of the popular Glock 19. Similarly firing the 9x19mm cartridge and using higher capacity magazines, it performs largely the same, but due to the longer magazine well, it can't fit magazines shorter than the standard 17-round ones." } ], @@ -837,7 +837,7 @@ "variants": [ { "id": "glock_18c", - "name": { "str": "Glock 18C pistol" }, + "name": { "str": "Glock 18C" }, "description": "A selective-fire variation on the Glock 17, originally designed for Austria's EKO Cobra unit. It has compensator cuts along its barrel to make recoil more manageable." } ], @@ -880,7 +880,7 @@ "variants": [ { "id": "m17", - "name": { "str": "M17 pistol" }, + "name": { "str": "M17" }, "description": "The M17 is an army issued semi-automatic, short recoil operated pistol derived from the SIG Sauer P320." } ], @@ -917,7 +917,7 @@ "variants": [ { "id": "m18", - "name": { "str": "M18 pistol" }, + "name": { "str": "M18" }, "description": "The M18 is a compact, semi-automatic, short recoil operated pistol derived from the SIG Sauer P320 Carry, used by US Armed Forces. Practically the same as its big brother, the M17, in every respect, the M18 features a moderately shorter slide and barrel which terminates at the end of the frame rather than extending partway beyond it like the M17." } ], @@ -1153,7 +1153,7 @@ "variants": [ { "id": "colt_ro635", - "name": { "str": "Colt Model 635 submachine gun" }, + "name": { "str": "Colt Model 635" }, "description": "A 9x19mm submachine gun based on the M16 rifle design, it is a closed bolt, blowback operated firearm. There is a large plastic brass deflector mounted by the ejection port, and no forward assist. It looks very similar to an M4 carbine, except for the magazine well that accepts Uzi-style magazines." } ], diff --git a/data/json/items/gun/9x18.json b/data/json/items/gun/9x18.json index 8756220e3d6c9..72ed5467311a9 100644 --- a/data/json/items/gun/9x18.json +++ b/data/json/items/gun/9x18.json @@ -10,7 +10,7 @@ "variants": [ { "id": "makarov", - "name": { "str": "Makarov PM pistol" }, + "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": "A svelte, Cold War era handgun of Russian heritage, this former military pistol fires the Soviet 9x18mm cartridge. Constructed completely out of steel components and experiencing relative popularity throughout eastern European countries, it was a favored backup weapon among USSR security forces, soldiers, and covert units." } diff --git a/data/json/items/gun/atgm.json b/data/json/items/gun/atgm.json index 317230df6b74f..a0d2fb98eba3e 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": "BGM-71F TOW" }, "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/bio.json b/data/json/items/gun/bio.json index 8f7937920f2eb..f07bc94b3ff4c 100644 --- a/data/json/items/gun/bio.json +++ b/data/json/items/gun/bio.json @@ -70,7 +70,7 @@ { "id": "bio_lightning", "type": "GUN", - "name": { "str": "Chain Lightning" }, + "name": { "str_sp": "chain lightning" }, "description": { "str": "this a pseudo item", "//~": "NO_I18N" }, "volume": "3 L", "price": "0 cent", @@ -91,7 +91,7 @@ { "id": "mut_quills", "type": "GUN", - "name": { "str_sp": "Assault barbs" }, + "name": { "str_sp": "assault barbs" }, "description": { "str": "this a pseudo item", "//~": "NO_I18N" }, "volume": "3 L", "price": "0 cent", @@ -110,7 +110,7 @@ { "id": "mut_longpull", "type": "GUN", - "name": { "str": "Ranged pulling implement" }, + "name": { "str": "ranged pulling implement" }, "description": { "str": "this a pseudo item", "//~": "NO_I18N" }, "volume": "100 ml", "price": "0 cent", diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json index a2fa89e27fb18..394d24e03793d 100644 --- a/data/json/items/gun/exodii.json +++ b/data/json/items/gun/exodii.json @@ -17,7 +17,7 @@ "variants": [ { "id": "Brogyeki", - "name": { "str": "Brogyeki '23 hand mortar" }, + "name": { "str": "Brogyeki '23", "str_pl": "Brogyekis '23" }, "description": "Originating from big game express smoothbores and heavy fowling pieces adapted for wallguns, the Brogyeki '23 is an over/under break action 'pistol' that is (unfortunately?) capable of launching its original 27.3x110 Diyua express slug and shot loads as well as the wide array of payloads in 27.3x44 Diyua. A simple wire stock collapses neatly along its octagonal barrels, which feature a combination of sighting devices necessary for launching its numerous loads, in addition to the usual Exodii retrofits. Unless you are a quadrupedal cyborg with this gun in a shock absorbing mount, recoil with the 27.3x110 Diyua shells will be *stout*.", "weight": 1 } @@ -60,7 +60,7 @@ "variants": [ { "id": "Brogyaga", - "name": { "str": "Brogyaga express gun" }, + "name": { "str": "Brogyaga" }, "description": "An over/under fowling piece with a long barrel, Brogyaga were favored for their versatility in taking large game and fowl with their 27.3x110 Diyua shells. They would be pressed into combat during two global conflicts, initially as 'light' wall guns, and later as the downsized and down-loaded Brogyeki '23, before being brought along by the Exodii to dimensions unknown. Though unwieldy in combat as either a primary or secondary, Brogyaga serve as useful parts donors for Brogyeki counterparts, fantastic pieces for the occasional hunting party, and popular trade goods for the locals.", "weight": 1 } @@ -85,7 +85,7 @@ "id": "sapra", "looks_like": "smle_mk3", "type": "GUN", - "name": { "str": "Exodii Sapra grenade launcher" }, + "name": { "str": "Exodii grenade launcher" }, "description": "The Sapra '36 is a short smoothbore bolt-action grenade launcher, fitted with a 5-round box magazine and a large, efficient muzzle brake. Designed in the interwar period following the proliferation of Brogyeki '23, the Sapra was intended to assist in riots, ambushes and assaulting in urban operations, where explosives applied in quick succession could make short work of targets. To further assist in riot operations, the Sapra can be fitted with a bayonet, a frivolity that the Exodii almost immediately discarded. Unlike the Brogyeki, the Sapra is incapable of chambering the longer 27.3 x 110 Diyua shells. The Exodii have replaced the stock with an aluminum alloy chassis, leaving behind the original wood ones as they became damaged.", "//": "Based on the Truvelo CMS. No rifle grenades since it has a magazine.", "weight": "5900 g", @@ -97,7 +97,7 @@ "variants": [ { "id": "sapra", - "name": { "str": "Sapra '36 grenade launcher" }, + "name": { "str": "Sapra '36", "str_pl": "Sapras '36" }, "description": "The Sapra '36 is a short smoothbore bolt-action grenade launcher, fitted with a 5-round box magazine and a large, efficient muzzle brake. Designed in the interwar period following the proliferation of Brogyeki '23, the Sapra was intended to assist in riots, ambushes and assaulting in urban operations, where explosives applied in quick succession could make short work of targets. To further assist in riot operations, the Sapra can be fitted with a bayonet, a frivolity that the Exodii almost immediately discarded. Unlike the Brogyeki, the Sapra is incapable of chambering the longer 27.3x110 Diyua shells. The Exodii have replaced the stock with an aluminum alloy chassis, leaving behind the original wood ones as they became damaged.", "weight": 1 } @@ -144,7 +144,7 @@ "variants": [ { "id": "pamd68", - "name": { "str": "PA md. 68 rifle" }, + "name": { "str": "PA md. 68", "str_pl": "PAs md. 68" }, "description": "The most popular gun to use the 12.3ln cartridge was, of course, the PA md. 71. Its predecessor, the md. 68, was viewed by many as a sort of failure: although it was reliable and powerful, it was too heavy to be used as a good infantry weapon, and not really heavy enough to be a good support gun. Enough were made, though, that during the zombie apocalypse, it gained a great deal of resurgent popularity as a light emplacement gun that used readily available ammunition. It perfectly served the purposes of the Exodii, who had far less concern about its unwieldiness." } ], @@ -193,7 +193,7 @@ "variants": [ { "id": "pamd71z", - "name": { "str": "PS md. 71z rifle" }, + "name": { "str": "PA md. 71z", "str_pl": "PAs md. 71z" }, "description": "This extremely popular Romanian rifle, made famous in the third Carpathian War, has been redesigned slightly by the Exodii for precision shots against high-priority targets. In a pinch this modified design can fire a 2-shot burst, with the goal of shredding the target and preventing revivification. However, the recoil is much greater for a human than it would be for a cyborg or giant quadruped, causing the burst to more often miss than hit." } ], @@ -221,7 +221,7 @@ "variants": [ { "id": "pamd68mountable", - "name": { "str": "mountable PA md. 68 rifle" }, + "name": { "str": "mountable PA md. 68", "str_pl": "mountable PAs md. 68" }, "description": "The most popular gun to use the 12.3ln cartridge was, of course, the PA md. 71. Its predecessor, the md. 68, was viewed by many as a sort of failure: although it was reliable and powerful, it was too heavy to be used as a good infantry weapon, and not really heavy enough to be a good support gun. Enough were made, though, that during the zombie apocalypse, it gained a great deal of resurgent popularity as a light emplacement gun that used readily available ammunition. It perfectly served the purposes of the Exodii, who had far less concern about its unwieldiness. This one has been modified for use in vehicle turrets on Earth." } ] @@ -239,7 +239,7 @@ { "id": "ree_33", "name": { - "str_sp": "Ree 3.3 exodii rifle", + "str_sp": "Ree 3.3", "ctxt": "`Ree` in this case is butchered `Roe`, to carry some sort of nautical vibe" }, "description": "Originally designed for naval defense of a small island country, this gun served Exodii as long as they existed, being one of its reliable tools in later stages of world decay. Cheap ammunition, a simple mechanism, and immense power output would make it a great weapon for any survivor who is able to carry nearly a hundred kilo of its weight and is in need to penetrate a small bunker. Unless your body is compatible with Exodii Standard Combat Bodyframe, you can only use it with a heavy-duty tripod, and only while prone. Due to the size of a top-mounted magazine, the user needs to use a scope mounted on the side of a gun." diff --git a/data/json/items/gun/robofac_gun.json b/data/json/items/gun/robofac_gun.json index 3d769b6d42841..c09992df05d10 100644 --- a/data/json/items/gun/robofac_gun.json +++ b/data/json/items/gun/robofac_gun.json @@ -314,7 +314,7 @@ "id": "robofac_gun_40mm", "copy-from": "launcher_base", "looks_like": "mark19", - "name": { "str_sp": "Hub 01 FSP" }, + "name": { "str": "Hub 01 FSP" }, "description": "The Hub 01 Fire Support Platform, or just the FSP. Like the Hybrid Weapons Platform, it combines black-finished aluminum, blue polymer furniture, and a number of proprietary bolts and fasteners for a sci-fi aesthetic. The barrel is stamped with \"40x46mm LV\", and the magwell looks like it accepts some truly MASSIVE magazines, which the gun appears to be capable of emptying in semi-automatic or fully-automatic fashion.", "//": "This is just a Rheinmetall Hydra.", "weight": "4082 g", diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json index 869240cac4f80..dc5d740f7a29f 100644 --- a/data/json/items/gun/shot.json +++ b/data/json/items/gun/shot.json @@ -33,7 +33,7 @@ "copy-from": "shotgun_base", "looks_like": "remington_870", "type": "GUN", - "name": { "str": "12-gauge Gatling gun" }, + "name": { "str": "12 gauge Gatling gun" }, "description": "An electrically driven six barrel Gatling shotgun, fed from handmade cloth belts. Even properly mounted, this seems like an unwieldy beast, and the six separate barrels make for difficult zeroing. The externally driven action means this is much less likely to jam.", "weight": "4980 g", "volume": "4500 ml", @@ -63,8 +63,8 @@ "variants": [ { "id": "ksg", - "name": { "str": "Kel-Tec KSG shotgun" }, - "description": "A bullpup pump-action shotgun, the Kel-Tec KSG uses a pair of magazine tubes to increase its capacity." + "name": { "str": "Kel-Tec KSG" }, + "description": "This pump-action shotgun uses a system of twin magazines to carry 14 total rounds of 12-gauge shotgun shells. As the weapon's trigger is situated forwards of the chamber in what is termed as a 'bullpup' design, the firearm's notably more compact than its peers despite having a higher capacity when compared against more classically designed shotguns." } ], "ascii_picture": "ksg", @@ -106,7 +106,7 @@ "variants": [ { "id": "mossberg_500", - "name": { "str": "Mossberg 500 Field shotgun" }, + "name": { "str": "Mossberg 500 Field", "str_pl": "Mossberg 500s Field" }, "description": "The Mossberg 500 is a popular series of pump-action shotguns, often acquired for military use. It is noted for its high durability and low recoil. This one is fitted with a 28 inch barrel with sight rib." } ], @@ -138,12 +138,12 @@ "variants": [ { "id": "mossberg_590", - "name": { "str": "Mossberg 590A1 shotgun" }, + "name": { "str": "Mossberg 590A1" }, "description": "The Mossberg 590A1 is a military and police oriented version of the Mossberg 500. It features a heavier barrel, a bayonet lug, and a different magazine tube for easier cleaning and maintenance." }, { "id": "slp", - "name": { "str": "FN SLP MK I shotgun" }, + "name": { "str": "FN SLP MK I", "str_pl": "FN SLPs MK I" }, "description": "An eminently practical semi-automatic shotgun, Fabrique Nationale's Mk I iteration of their Self-Loading Police brings together an 8-round magazine tube, accessory-ready Picatinny rail, and comfortably rubber-padded grip surfaces. Per the company's claims, it can dispense 8 servings of 12-gauge-diameter medicine in under a second, and, while you're not sure if that's true or even a good thing, the gun's certain to serve as a good educational tool for disciplining the dead." } ], @@ -186,8 +186,8 @@ "variants": [ { "id": "mossberg_590", - "name": { "str": "Mossberg 590M shotgun" }, - "description": "A classic Mossberg 590 pump-action shotgun, modified by the manufacturer to utilize box magazines." + "name": { "str": "Mossberg 590M" }, + "description": "A classic pump-action shotgun, all save for the fact that the manufacturer has modified it to use detachable box magazines instead of a standard shotgun tube." } ], "weight": "3628 g", @@ -227,12 +227,12 @@ "variants": [ { "id": "mossberg_930", - "name": { "str": "Mossberg 930 SPX shotgun" }, + "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." }, { "id": "m1014", - "name": { "str": "M1014 shotgun" }, + "name": { "str": "M1014" }, "description": "Benelli's first gas-operated shotgun, featuring dual pistons for enhanced reliability with various loads and a collapsible buttstock that reduces length by almost 8 inches. Adopted in 1999 as the M1014 Joint Service Combat Shotgun, the Benelli M4 is one of the finest combat shotguns available." } ], @@ -319,23 +319,23 @@ "variants": [ { "id": "remington_870", - "name": { "str": "Remington 870 Wingmaster shotgun" }, + "name": { "str": "Remington 870 Wingmaster", "str_pl": "Remington 870s Wingmaster" }, "description": "With over 10 million made, the Remington 870 is one of the most popular shotguns on the market, and finds use with hunters and law enforcement agencies alike thanks to its high accuracy and muzzle velocity. This one is a 28 inch barreled model for hunting fowl and game." }, { "id": "remington_1100", - "name": { "str": "Remington 1100 competition shotgun" }, + "name": { "str": "Remington 1100" }, "description": "This semi-automatic shotgun features a self compensating gas system that will feed a wide array of shells while also reducing recoil. Introduced in 1963, it is favored by law enforcement, hunters and competition shooters, and has been the best-selling autoloading shotgun in U.S. history. This is the nickel finished, teflon coated competition model, with a full length magazine tube and 30 inch barrel.", "ascii_picture": "remington1100" }, { "id": "browning_a5", - "name": { "str": "Browning Auto 5 shotgun" }, + "name": { "str": "Browning Auto 5" }, "description": "This humble looking shotgun was the earliest successful semi-automatic shotgun, and the second most successful in U.S. history, with over 2.7 million made between 1902 and 1998. The recoil tuning mechanism under the handguard and long dwell time of the action make for pleasant shooting." }, { "id": "ithaca37", - "name": { "str": "Ithaca M37 Featherlight shotgun" }, + "name": { "str": "Ithaca M37 Featherlight", "str_pl": "Ithaca M37s Featherlight" }, "description": "A seasoned veteran of America's sporting culture, the Ithaca M37 is the oldest pump-action shotgun still in active production. The M37 has served hunters and officers for over eight decades, featuring a bottom-feeding and ejecting design that keeps the action sealed from the elements. An heirloom that retains its utility all the way from pre-Cataclysm hunting expeditions up into the depths of alien environments, it would be wise to keep it handy, for close encounters." } ], @@ -366,7 +366,7 @@ "variants": [ { "id": "remington_870_breacher", - "name": { "str": "Remington 870 MCS shotgun" }, + "name": { "str": "Remington 870 MCS", "str_pl": "Remington 870s MCS" }, "description": "This Remington 870 Modular Combat System shotgun is currently set up for breaching operations, with a 10 inch barrel and no stock. It is small enough to carry as a secondary weapon, specifically to pop open any pesky doors you might come across. The grip's design makes for controllable yet unpleasant recoil, and the barrel lacks any sights." } ], @@ -410,7 +410,7 @@ "variants": [ { "id": "remington_870_express", - "name": { "str": "Remington 870 Express shotgun" }, + "name": { "str": "Remington 870 Express", "str_pl": "Remington 870s Express" }, "description": "With over 10 million made, the Remington 870 is one of the most popular shotguns on the market, and finds use with hunters and law enforcement agencies alike thanks to its high accuracy and muzzle velocity. This one is an 18.5 inch barreled defensive model." } ], @@ -464,7 +464,7 @@ "variants": [ { "id": "saiga_12", - "name": { "str": "Saiga-12 shotgun" }, + "name": { "str": "Saiga-12" }, "description": "The Saiga-12 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. It is one of the last designs of Mikhail Kalashnikov, and was popular in open division shotgun competitions prior to its ban from import via executive order." } ], @@ -604,7 +604,7 @@ "variants": [ { "id": "tavor_12", - "name": { "str": "Tavor TS12 shotgun" }, + "name": { "str": "Tavor TS12" }, "description": "A triple tube magazine fed, gas-operated bullpup shotgun of Israeli Weapon Industries make. It is capable of loading 15 shells, all in a relatively small package. Like many other modern IWI designs, this looks more like a sci-fi prop gun than a firearm. An integral top rail is provided for mounting sights." } ], @@ -686,7 +686,7 @@ "variants": [ { "id": "winchester_1887", - "name": { "str": "1887 bootleg shotgun" }, + "name": { "str": "bootleg Winchester 1887" }, "description": "One of the first commercially successful repeating shotguns, the Winchester 1887 was specifically made lever-action at Winchester's request. Though later overshadowed in success by pump designs, the 1887 remains popular today. This one has a very short barrel, no stock, and would pair nicely with a motorcycle jacket and a Harley Davidson." } ], @@ -773,12 +773,12 @@ "variants": [ { "id": "m2", - "name": { "str": "Benelli M2 shotgun" }, + "name": { "str": "Benelli M2" }, "description": "Workhorse, companion, and Italian hole-puncher: the M2 forms the backbone of the Benelli's venerable line of Super 90 shotguns, utilizing the company's signature inertia-driven system to snap out 12-gauge shells with alacrity. Though possessing a 3-round magazine tube, the shotgun's dimpled, synthetic furniture, cryogenically treated barrel, and robust action capable of withstanding magnum loads make it a hardy option, even for the post-Cataclysm survivor." }, { "id": "sbe", - "name": { "str": "Benelli SBE 3 shotgun" }, + "name": { "str": "Benelli SBE 3" }, "description": "A relatively light, semi-automatic fowling peace finished in black furniture with trim lines and a slender forend, the Super Black Eagle (SBE) shotgun operates off of Benelli's inertia-driven recoil system. Synonymous with versatility and reliability, it's a decades-beloved design incorporating one of the earliest actions rated to chamber 3-inch magnum shotgun shells, with this 2023 updated version coming fitted with a recoil pad." } ], @@ -825,12 +825,12 @@ "variants": [ { "id": "m2_tac", - "name": { "str": "Benelli M2 Tactical shotgun" }, + "name": { "str": "Benelli M2 Tactical", "str_pl": "Benelli M2s Tactical" }, "description": "Where the full-sized Benelli M2 shotgun is a hefty stallion, this mission-oriented tactical iteration is a trim race horse, with an 18.5-inch barrel, dimpled grip surfaces, and an underslung pistol grip. Ghost-ring aperture-sights, a recoil-padded buttstock, and a cryogenically-treated barrel all join hands to ensure that you can carry out your post-Cataclysm farming duties: seeding lead shot into fields of zombies." }, { "id": "mossberg_500_security", - "name": { "str": "Mossberg 500 Security shotgun" }, + "name": { "str": "Mossberg 500 Security", "str_pl": "Mossberg 500s Security" }, "description": "The Mossberg 500 is a popular series of pump-action shotguns, often acquired for military use. It is noted for its high durability and low recoil. This one is fitted with an 18.5 inch barrel.", "ascii_picture": "mossberg500_sec" } diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json index 529569b0fb953..c092b13d0cdc9 100644 --- a/data/json/items/magazine/exodii.json +++ b/data/json/items/magazine/exodii.json @@ -3,8 +3,16 @@ "id": "exodiiminimag", "looks_like": "garandclip", "type": "MAGAZINE", - "name": { "str": "PA md. 71 Exodii 10-round magazine" }, + "name": { "str": "Exodii zombie hunting rifle 10-round magazine" }, "description": "A small, sleek magazine based on a classic PA md. 71 clip, with some redesigns by the Exodii for better use in lighter-than-air drones. Its small size is less appropriate for ground-fighting of hordes of zombies, as it is a bit inconvenient to reload.", + "variant_type": "gun", + "variants": [ + { + "id": "exodiiminimag", + "name": { "str": "PA md. 71 10-round magazine" }, + "description": "A small, sleek magazine based on a classic PA md. 71 clip, with some redesigns by the Exodii for better use in lighter-than-air drones. Its small size is less appropriate for ground-fighting of hordes of zombies, as it is a bit inconvenient to reload." + } + ], "weight": "30 g", "volume": "250 ml", "//": "just 10 shots stacked on top of one another as a clip", @@ -23,8 +31,16 @@ "id": "exodiiBRmag", "looks_like": "stanag30", "type": "MAGAZINE", - "name": { "str": "PA md. 68 Exodii 60-round magazine" }, + "name": { "str": "Exodii battle rifle 60-round magazine" }, "description": "An unreasonably large pan magazine for the already heavy PA md. 68 battle rifle. While the original magazines were double stack box magazines, the PA md. 68 started being pushed into aircraft and vehicle support roles, necessitating a larger pan magazine.", + "variant_type": "gun", + "variants": [ + { + "id": "exodiiBRmag", + "name": { "str": "PA md. 68 60-round magazine" }, + "description": "An unreasonably large pan magazine for the already heavy PA md. 68 battle rifle. While the original magazines were double stack box magazines, the PA md. 68 started being pushed into aircraft and vehicle support roles, necessitating a larger pan magazine." + } + ], "weight": "600 g", "volume": "1250 ml", "longest_side": "255 mm", @@ -42,8 +58,16 @@ "id": "exodiisapramag5", "looks_like": "exodiiminimag", "type": "MAGAZINE", - "name": { "str": "Sapra '36 magazine" }, + "name": { "str": "Exodii grenade launcher 5-round magazine" }, "description": "A large, five round single stack magazine for the Sapra '36.", + "variant_type": "gun", + "variants": [ + { + "id": "exodiisapramag5", + "name": { "str": "Sapra 5-round magazine" }, + "description": "A large, five round single stack magazine for the Sapra '36." + } + ], "weight": "710 g", "volume": "449 ml", "longest_side": "132 mm",