diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json index 07b8783fcfc6d..54d4952560340 100644 --- a/data/json/items/gun/22.json +++ b/data/json/items/gun/22.json @@ -513,7 +513,7 @@ "id": "rough_rider_pistol", "copy-from": "pistol_revolver", "type": "GUN", - "name": { "str_sp": ".22 six-shooter" }, + "name": { "str": ".22 six-shooter" }, "description": "A revolver chambered in .22 LR, with 6 shots and a 6.5 inch barrel.", "ascii_picture": "redhawk", "weight": "947 g", @@ -538,7 +538,7 @@ "variants": [ { "id": "rough_rider_pistol", - "name": { "str_sp": "Heritage Rough Rider 6.5\"" }, + "name": { "str": "Heritage Rough Rider 6.5\"", "str_pl": "Heritage Rough Riders 6.5\"" }, "description": "A cheap, single action revolver chambered in .22 LR. While it makes for a handy plinking gun, the single action mechanism, size of the firearm, combined with the lack of a swing out cylinder makes for a less than ideal zombie fighting handgun." } ] @@ -547,7 +547,7 @@ "id": "rough_rider_pistol_9", "copy-from": "pistol_revolver", "type": "GUN", - "name": { "str_sp": "large .22 six-shooter" }, + "name": { "str": "large .22 six-shooter" }, "description": "A revolver chambered in .22 LR, with 6 shots and a 9 inch barrel.", "ascii_picture": "redhawk", "weight": "1046 g", @@ -574,7 +574,7 @@ "variants": [ { "id": "rough_rider_pistol", - "name": { "str_sp": "Heritage Rough Rider 9\"" }, + "name": { "str": "Heritage Rough Rider 9\"", "str_pl": "Heritage Rough Riders 9\"" }, "description": "A cheap, single action revolver chambered in .22 LR. While it makes for a handy plinking gun, the single action mechanism, size of the firearm, combined with the lack of a swing out cylinder makes for a less than ideal zombie fighting handgun, even with the slightly increased performance from the longer barrel." } ] @@ -611,7 +611,7 @@ "variants": [ { "id": "1911_22", - "name": { "str_sp": "1911-22" }, + "name": { "str": "1911-22" }, "description": "A 1911 handgun with \"1911-22\" stamped on the slide. While .22 LR 1911s were first devised as a training aid for US soldiers, it found large civilian use from concealed carry to plinking thanks to the readily available ammunition and familiar platform." } ] diff --git a/data/json/items/gun/3006.json b/data/json/items/gun/3006.json index 3be8eb2fd8f79..1341161f54a69 100644 --- a/data/json/items/gun/3006.json +++ b/data/json/items/gun/3006.json @@ -4,8 +4,16 @@ "looks_like": "modular_ar15", "type": "GUN", "reload_noise_volume": 10, - "name": { "str": "Browning BLR rifle" }, + "name": { "str": "magazine-fed lever-action hunting rifle" }, "description": "A highly accurate lever-action hunting rifle chambered for the powerful .30-06 round. Notable for using a detachable magazine instead of a traditional tube.", + "variant_type": "gun", + "variants": [ + { + "id": "browning_blr", + "name": { "str": "Browning BLR" }, + "description": "The Browning BLR is notable for being a lever-action rifle, chambered in calibers with spitzer bullets. This is unusual for lever-actions, as a spitzer bullet risks setting off other cartridges in a typical tube magazine. The BLR gets around this issue by utilizing box magazines instead, making it quite unique among other lever-action rifles. This one is chambered for 30-06." + } + ], "weight": "3290 g", "volume": "3610 ml", "longest_side": "1106 mm", @@ -45,8 +53,16 @@ "looks_like": "modular_ar15", "type": "GUN", "reload_noise_volume": 10, - "name": { "str": "M1 Garand rifle" }, + "name": { "str": "Garand battle rifle" }, "description": "A semi-automatic .30-06 battle rifle, developed to replace the M1903 Springfield. It didn't completely supplant the older bolt-action until after World War II.", + "variant_type": "gun", + "variants": [ + { + "id": "garand", + "name": { "str": "M1 Garand" }, + "description": "The M1 Garand is a widely celebrated battle rifle, being one of the most mass-produced battle rifles in the world. It saw widespread use in the US military, being used extensively in WW2 and the Korean War. While its military use has dwindled down, being out of US service for more than 50 years, some of its mechanical influence still remains through rifles such as AKs or M14s. It still sees widespread use in civilian spaces as an accurate competition or hunting rifle." + } + ], "ascii_picture": "m1_garand", "weight": "4280 g", "volume": "3160 ml", @@ -87,8 +103,16 @@ "copy-from": "rifle_manual", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str": "M1903 Springfield rifle" }, + "name": { "str": "Springfield rifle" }, "description": "A powerful military rifle chambered in .30-06, developed to replace the US Army's older Krag rifle. It served as the main American rifle in World War I, was used alongside the M1 Garand in World War II, and was used as a sniper rifle as late as the Vietnam War.", + "variant_type": "gun", + "variants": [ + { + "id": "m1903", + "name": { "str": "M1903 Springfield" }, + "description": "A powerful military rifle originally chambered in .30-03 Springfield, developed to replace the US Army's older Krag rifle. It was quickly rechambered into the .30-06 caliber with its spitzer bullet. While an American rifle produced and developed around WW1, manufacturing couldn't keep up with demand, and saw service alongside the M1917 Enfield, a British rifle rechambered for the American 30-06. It saw service as a sniper rifle up to the Vietnam War, but nowadays is mainly used by civilians, either as hunting rifles or in collections." + } + ], "weight": "3910 g", "volume": "2840 ml", "longest_side": "1102 mm", @@ -136,7 +160,7 @@ { "id": "m1918", "name": { "str": "Browning Automatic Rifle" }, - "description": "Designed near the end of World War I, the BAR provided fire support for the US Army from World War II all the way to the Vietnam War. Too much firepower to serve as a battle rifle, but not enough to be an ideal light machine gun, it still found a niche on the battlefield." + "description": "Designed near the end of World War I, the BAR provided fire support for the US Army from World War II all the way to the Vietnam War. Originally developed to fill a now outdated role as an \"automatic rifle\", it was pushed into service for use as a light machine gun. Despite being heavy and cumbersome, without filling its designed role, it saw service for over 50 years. While newer models have a slow and fast fully automatic setting, this one is an older one, with just semi and full auto." } ], "weight": "8820 g", diff --git a/data/json/items/gun/36paper.json b/data/json/items/gun/36paper.json index dce0aa0cd9061..75496681989c0 100644 --- a/data/json/items/gun/36paper.json +++ b/data/json/items/gun/36paper.json @@ -4,8 +4,16 @@ "copy-from": "pistol_revolver_cap_ball", "looks_like": "sw_619", "type": "GUN", - "name": { "str_sp": "Colt M1861 Navy" }, + "name": { "str": "civil war six-shooter" }, "description": "The Colt Model 1861 Navy cap & ball .36-caliber revolver was a six-shot, single-action percussion weapon produced by Colt's Manufacturing Company from 1861 until 1873.", + "variant_type": "gun", + "variants": [ + { + "id": "colt_navy", + "name": { "str": "Colt M1861 Navy", "str_pl": "Colt M1861 Navies" }, + "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." + } + ], "weight": "1184 g", "volume": "540 ml", "longest_side": "351 mm", diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json index daa2b07448361..ae067c340c6af 100644 --- a/data/json/items/gun/38.json +++ b/data/json/items/gun/38.json @@ -4,7 +4,7 @@ "looks_like": "glock_17", "type": "GUN", "reload_noise_volume": 10, - "name": { "str": "2 Shot Special" }, + "name": { "str": "double barrel .38 pistol" }, "//": "Volume+barrel length based off a Bond Arms derringer. with extra length in the barrel.", "description": "A crudely made double barrel pistol firing .38 Special ammo. Unfortunately, the name is less about the double barrels and more about the number of shots you'll get before it breaks down on you.", "ascii_picture": "2_shot_special", @@ -37,8 +37,16 @@ "copy-from": "pistol_revolver", "looks_like": "sw_619", "type": "GUN", - "name": { "str_sp": "S&W Model 10" }, + "name": { "str": "six-shooter" }, "description": "A six-shot revolver, produced since 1899 and known as the most popular handgun of the 20th century. It has a swing-out cylinder for ease of reloading.", + "variant_type": "gun", + "variants": [ + { + "id": "model_10_revolver", + "name": { "str": "S&W Model 10" }, + "description": "The Model 10 is one of the oldest firearm models still in production, and most produced handguns, with production dating back to 1899. Starting life as the Model 1899 Hand Ejector, it only picked up the current name of Model 10 in the 1950s. Despite .38 Special and .357 Magnum being the same caliber, Model 10s were produced to handle blackpowder loads, and while modern smokeless loads of .38 Special work fine, .357 Magnum could cause the Model 10 to catastrophically fail." + } + ], "weight": "975 g", "volume": "402 ml", "longest_side": "252 mm", @@ -100,8 +108,16 @@ "copy-from": "pistol_revolver", "looks_like": "sw_619", "type": "GUN", - "name": { "str_sp": "Ruger LCR .38" }, + "name": { "str": "conceal-carry six-shooter" }, "description": "A compact, double-action-only revolver designed for easy concealment, with a stainless steel cylinder and aluminum frame.", + "variant_type": "gun", + "variants": [ + { + "id": "ruger_lcr_38", + "name": { "str": "Ruger LCR" }, + "description": "The Ruger LCR (Lightweight Compact Revolver) is a modern revolver, starting production in just 2010. It's a lightweight, aluminum-framed revolver, designed for conceal carry with its double-action-only trigger, lightweight and compact size. Due to the double-action trigger, it is more possible to carry it in your pocket instead of a holster due to the heavy trigger, but still ill-advised." + } + ], "weight": "382 g", "volume": "321 ml", "longest_side": "192 mm", diff --git a/data/json/items/gun/44paper.json b/data/json/items/gun/44paper.json index db53b6cefc178..373c9a4cdac3b 100644 --- a/data/json/items/gun/44paper.json +++ b/data/json/items/gun/44paper.json @@ -4,8 +4,16 @@ "copy-from": "pistol_revolver_cap_ball", "looks_like": "sw_619", "type": "GUN", - "name": { "str_sp": "Colt M1860 Army" }, + "name": { "str": "civil war revolver" }, "description": "The Colt Army Model 1860 is a cap & ball .44-caliber revolver. It was used during the American Civil War, and made by Colt's Manufacturing Company.", + "variant_type": "gun", + "variants": [ + { + "id": "colt_army", + "name": { "str": "Colt M1860 Army", "str_pl": "Colt M1860 Armies" }, + "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." + } + ], "weight": "1188 g", "volume": "486 ml", "longest_side": "373 mm", diff --git a/data/json/items/gun/4570.json b/data/json/items/gun/4570.json index aa93cb4cf67c1..78bddf6658b56 100644 --- a/data/json/items/gun/4570.json +++ b/data/json/items/gun/4570.json @@ -4,8 +4,16 @@ "copy-from": "rifle_manual", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str_sp": "Marlin 1895 SBL" }, + "name": { "str": "lever-action hunting rifle" }, "description": "A handy but powerful lever-action rifle chambered for .45-70 Government. Designed for wilderness guides for defense against large predators such as grizzly bears, moose, and dinosaurs.", + "variant_type": "gun", + "variants": [ + { + "id": "1895sbl", + "name": { "str": "Marlin 1895 SBL" }, + "description": "A handy but powerful lever-action rifle chambered for .45-70 Government, the Marlin 1895 SBL was designed as a guide rifle, a rifle designed to defend against animals such as bears in the wilderness. While advertised as capable of defending against T-Rex, there has yet been any testing against actual T-Rexes, and hopefully remains that way." + } + ], "weight": "3629 g", "volume": "1829 ml", "longest_side": "943 mm", @@ -41,9 +49,17 @@ "copy-from": "pistol_revolver", "looks_like": "sw_619", "type": "GUN", - "name": { "str": "Magnum Research BFR" }, + "name": { "str": "hunting hand cannon" }, "//": "This is the 7.5in barrel model", "description": "A massive single-action revolver. While the .45-70 rifle round loses significant velocity in its short pistol barrel, it still competes with other large magnum handguns in terms of power.", + "variant_type": "gun", + "variants": [ + { + "id": "bfr", + "name": { "str": "Magnum Research BFR" }, + "description": "The Magnum Research BFR (Biggest, Finest Revolver) are a series of single action revolvers chambered in calibers from anywhere from .357 Magnum, to rifle calibers such as 45-70. While rifle caliber chamberings for pistols are no doubt uncomfortable to shoot, they do see some use in the sport of handgun hunting, or rarely as range toys. Due to its loading gate, it prevents the use of speedloaders and can make for lengthy reload times, so it's best to make every shot count." + } + ], "weight": "1950 g", "volume": "734 ml", "longest_side": "382 mm", @@ -76,9 +92,17 @@ "copy-from": "gun_base", "looks_like": "modular_ar15", "type": "GUN", - "name": { "str_sp": "1874 Sharps" }, + "name": { "str": "breech-loading reproduction rifle" }, "//": "Specs from Uberti 32in barrel Special", "description": "A reproduction of an antique single-shot .45-70 rifle once used to hunt buffalo and other large game in the late 19th Century. Highly accurate and powerful for the time, this one is made to handle modern smokeless ammunition.", + "variant_type": "gun", + "variants": [ + { + "id": "sharps", + "name": { "str": "1874 Sharps", "str_pl": "1874 Sharpses" }, + "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." + } + ], "weight": "4819 g", "volume": "2936 ml", "longest_side": "1278 mm", diff --git a/data/json/items/gun/45colt.json b/data/json/items/gun/45colt.json index c52b3567f1c95..c2bfd3f2b6370 100644 --- a/data/json/items/gun/45colt.json +++ b/data/json/items/gun/45colt.json @@ -4,8 +4,16 @@ "looks_like": "glock_17", "type": "GUN", "reload_noise_volume": 10, - "name": { "str": "Bond Arms Derringer" }, + "name": { "str": "double-barrel derringer" }, "description": "The Bond Arms Derringer is a series of multi-barrel compact pistols. Most commonly chambered for .45 Colt, with chambers long enough to accept .410 shotgun shells.", + "variant_type": "gun", + "variants": [ + { + "id": "bond_410", + "name": { "str": "Bond Arms Derringer" }, + "description": "Derringers are old-fashioned conceal carry weapons, usually sporting one or two barrels. The Bond Arms Derringer is a modern series of multi-barrel compact pistols. Most commonly chambered for .45 Colt, with chambers long enough to accept .410 shotgun shells. Though, with modern handguns, derringers have become less and less practical as a conceal carry option." + } + ], "weight": "566 g", "volume": "79 ml", "longest_side": "158 mm", @@ -40,8 +48,23 @@ "copy-from": "pistol_revolver", "looks_like": "sw_619", "type": "GUN", - "name": { "str_sp": "Uberti Cattleman" }, - "description": "This 7.5\" barreled Uberti Cattleman is a modern reproduction of the legendary Colt Single Action Army, or Colt Peacemaker, one of the first revolvers to use a modern self-contained cartridge. Made famous by Westerns, it is still in demand for Cowboy Action Shooting, reenactors, and collectors. Unlike modern revolvers, the cylinder cannot swing out for loading, and spent brass must be ejected one at a time.", + "name": { "str": "cowboy six-shooter" }, + "description": "A reproduction of an antique firearm, chambered in .45 Colt. Due to the lack of a swing-out cylinder, each cartridge must be reloaded and ejected manually.", + "variant_type": "gun", + "variants": [ + { + "id": "colt_saa", + "name": { "str": "Colt Single Action Army", "str_pl": "Colt Single Action Armies" }, + "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 + }, + { + "id": "colt_saa_repro", + "name": { "str": "Uberti 1873 Cattleman" }, + "description": "This 7.5\" barreled Uberti Cattleman is a modern reproduction of the legendary Colt Single Action Army, or Colt Peacemaker, one of the first revolvers to use a modern self-contained cartridge. Made famous by Westerns, it is still in demand for Cowboy Action Shooting, reenactors, and collectors. Unlike modern revolvers, the cylinder cannot swing out for loading, and spent brass must be ejected one at a time.", + "weight": 10 + } + ], "weight": "1048 g", "volume": "324 ml", "longest_side": "208 mm", @@ -66,7 +89,7 @@ "copy-from": "pistol_revolver", "looks_like": "sw_619", "type": "GUN", - "name": { "str_sp": ".45/.410 shotshell revolver" }, + "name": { "str": ".45/.410 shotshell revolver" }, "description": "A stainless steel 5 shot revolver, capable of firing .410 shells or 45 Colt cartridges.", "variant_type": "gun", "variants": [ diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json index ed24ea686d7ca..1fa61a411f06c 100644 --- a/data/json/items/gun/762.json +++ b/data/json/items/gun/762.json @@ -6,6 +6,14 @@ "type": "GUN", "name": { "str": "AKM rifle" }, "description": "One of the most recognizable assault rifles ever made, the AKM is renowned for its durability even under the worst conditions.", + "variant_type": "gun", + "variants": [ + { + "id": "ak47", + "name": { "str": "AKM" }, + "description": "Arguably the most mass-produced firearm ever made, the AKM has cemented itself in history, and a few country flags. Designed after WW2, it was meant to replace the PPSh-41's role, but soon became the main infantry rifle. While many believe it is a copy of the German StG-44, it more resembles an M1 Garand in operation. Despite it's age, it still sees plenty of use in conflicts today." + } + ], "weight": "3402 g", "volume": "2167 ml", "longest_side": "87 cm", @@ -93,6 +101,14 @@ "type": "GUN", "name": { "str": "SKS rifle" }, "description": "Developed by the Soviets in 1945, this rifle was quickly replaced by the full-auto AK-47. However, due to its superb accuracy, low recoil, and deployable integrated bayonet, this gun maintains immense popularity.", + "variant_type": "gun", + "variants": [ + { + "id": "sks", + "name": { "str": "SKS" }, + "description": "A very common 7.62x39 rifle, the SKS was designed to replace the Mosin Nagant bolt action rifle, while the AK-47 was meant to replace the PPSh-41. Mechanically, it resembles a much scaled down version of USSR's PTRS-41 semi automatic anti-tank rifle. However, due to the success of the AK-47, the SKS was replaced by it in the USSR's Red Army. It still saw service in other militaries, mainly other socialist states that got a surplus of SKS carbines from the USSR. Due to the amount produced, it is a commonplace rifle in many gun owning American households." + } + ], "ascii_picture": "sks", "weight": "3850 g", "volume": "2838 ml", @@ -141,7 +157,31 @@ "looks_like": "modular_ar15", "type": "GUN", "name": { "str": "AK-47 rifle" }, - "description": "Civilian-legal clones of the iconic Kalashnikov, like this one, were manufactured and imported by many different firms. Even without full-auto function, their solid firepower and reliability in harsh conditions make them valuable weapons in this new world.", + "description": "Civilian-legal clones of the AK-47, with no ability to fire full-auto. Despite lacking that ability, they're still reliable and useful rifles, even if much rarer ammo and magazine wise than the more common AR-15 platform.", + "variant_type": "gun", + "variants": [ + { + "id": "aksemi_vska", + "name": { "str": "Century Arms VSKA" }, + "description": "This one is a VSKA, manufactured in the USA by Century Arms.", + "weight": 16, + "append": true + }, + { + "id": "aksemi_wasr", + "name": { "str": "Century Arms WASR-10" }, + "description": "This one is a WASR-10, imported by Century Arms.", + "weight": 8, + "append": true + }, + { + "id": "aksemi_zpap", + "name": { "str": "Zastava ZPAP M70" }, + "description": "This one is a ZPAP M70, imported by Zastava.", + "weight": 5, + "append": true + } + ], "weight": "3402 g", "volume": "2167 ml", "longest_side": "87 cm", @@ -184,7 +224,7 @@ "variants": [ { "id": "draco", - "name": { "str": "Draco" }, + "name": { "str": "Century Arms Draco" }, "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 Draco, the largest, with a 12.5\" barrel." } ], @@ -229,7 +269,7 @@ "variants": [ { "id": "draco_mini", - "name": { "str": "Mini Draco" }, + "name": { "str": "Century Arms Mini Draco" }, "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." } ], @@ -274,7 +314,7 @@ "variants": [ { "id": "draco_mini", - "name": { "str": "Micro Draco" }, + "name": { "str": "Century Arms Micro Draco" }, "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." } ], diff --git a/data/json/items/gun/762R.json b/data/json/items/gun/762R.json index f14c83c866de3..38bb25e821c15 100644 --- a/data/json/items/gun/762R.json +++ b/data/json/items/gun/762R.json @@ -121,6 +121,14 @@ "type": "GUN", "name": { "str": "PSL rifle" }, "description": "The Romanian PSL is a designated marksman's rifle developed by Romania after political tensions with Soviet Russia forced them to develop their own alternative to the SVD.", + "variant_type": "gun", + "variants": [ + { + "id": "psl", + "name": { "str": "Century Arms PSL 54" }, + "description": "The PSL is a semi-automatic rifle chambered in 7.62x54mmR, created by Romania due to uneasy tensions arising between the USSR and Romania, which put pressure on Romania to manufacture their own firearms. While it looks much like a Soviet SVD, mechanically it's akin to a scaled up AK-47. This one has been imported from Romania by Century Arms." + } + ], "weight": "4100 g", "volume": "7339 ml", "longest_side": "1150 mm", diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json index 6cb535df59892..6402ea0fb2004 100644 --- a/data/json/items/gun/9mm.json +++ b/data/json/items/gun/9mm.json @@ -1332,7 +1332,7 @@ "variants": [ { "id": "draco_9mm", - "name": { "str": "NAK 9" }, + "name": { "str": "Century Arms NAK 9" }, "description": "The NAK 9 is a Century Arms imported gun. It is essentially a shortened AK with no stock, chambered in 9mm and accepting Glock magazines, with an 11.14\" barrel." } ], diff --git a/data/json/items/ranged/launchers.json b/data/json/items/ranged/launchers.json index 7b60e528be578..132dd18b72e71 100644 --- a/data/json/items/ranged/launchers.json +++ b/data/json/items/ranged/launchers.json @@ -5,8 +5,16 @@ "looks_like": "m79", "symbol": "(", "color": "green", - "name": { "str_sp": "M72 LAW" }, + "name": { "str": "disposable rocket launcher" }, "description": "A disposable light anti-tank rocket launcher. Once fired, it cannot be reloaded and must be disposed of.", + "variant_type": "gun", + "variants": [ + { + "id": "LAW", + "name": { "str": "M72 LAW" }, + "description": "The M72 LAW (Light Anti-armor Weapon) is a one-time use lightweight rocket launcher, meant to take out tanks and other armored vehicles. Designed to replace the earlier Bazookas, it features a shaped-charge warhead to pierce armor. Though weaker than the more modern and heavier AT4, it's still in service to this day. Due to its design, you must unpack it to use it, and it cannot be reloaded. This one is unpacked, and ready to fire." + } + ], "price": "2 kUSD", "//": "A tube with a lever. Unsurprisingly, dirt cheap (at least for a rocket launcher).", "material": [ "aluminum" ], diff --git a/data/json/items/tool/explosives.json b/data/json/items/tool/explosives.json index d057d76a8a2cd..b5f61b08732c6 100644 --- a/data/json/items/tool/explosives.json +++ b/data/json/items/tool/explosives.json @@ -601,8 +601,16 @@ "id": "LAW_Packed", "type": "GENERIC", "category": "guns", - "name": { "str": "packed M72 LAW" }, - "description": "An M72 LAW, packed in its storage form. Activate it to pop it out and make it ready to fire. Once it is activated, it cannot be repacked.", + "name": { "str": "packed disposable rocket launcher" }, + "description": "A packed, disposable light anti-tank rocket launcher. Once fired, it cannot be reloaded and must be disposed of. Activate it to pop it out and make it ready to fire.", + "variant_type": "gun", + "variants": [ + { + "id": "LAW_Packed", + "name": { "str": "M72 LAW (packed)", "str_pl": "M72 LAWs (packed)" }, + "description": "The M72 LAW (Light Anti-armor Weapon) is a one-time use lightweight rocket launcher, meant to take out tanks and other armored vehicles. Designed to replace the earlier Bazookas, it features a shaped-charge warhead to pierce armor. Though weaker than the more modern and heavier AT4, it's still in service to this day. Due to its design, you must unpack it to use it, and it cannot be reloaded. Activate to unpack." + } + ], "weight": "2500 g", "volume": "1500 ml", "longest_side": "63 cm", diff --git a/tools/json_tools/gun_variant_validator.py b/tools/json_tools/gun_variant_validator.py index dd9c8baec9741..2b6569d0d7378 100755 --- a/tools/json_tools/gun_variant_validator.py +++ b/tools/json_tools/gun_variant_validator.py @@ -102,9 +102,6 @@ } NAME_CHECK_BLACKLIST = { # FIXME: fix and remove these - "1895sbl", - "bfr", - "sharps", "fn_p90", "hk_mp7", "obrez", @@ -113,16 +110,10 @@ "m2010", "weatherby_5", "win70", - "2_shot_special", - "model_10_revolver", "mr73", - "ruger_lcr_38", - "sw_619", "acr_300blk", "iwi_tavor_x95_300blk", "sig_mcx_rattler_sbr", - "bond_410", - "colt_saa", "p226_357sig", "glock_31", "p320_357sig", @@ -134,7 +125,6 @@ "shotgun_410", "mgl", "pseudo_m203", - "colt_army", "atgm_launcher", "xedra_gun", "90two40", @@ -147,10 +137,8 @@ "AT4", "af2011a1_38super", "m1911a1_38super", - "colt_navy", "plasma_gun", "bbgun", - "LAW", } BAD_IDENTIFIERS = [ "10mm", @@ -178,6 +166,7 @@ "coilgun", # Not great, but weird can get a pass "combination gun", + "derringer", "flamethrower", "flintlock", # Special faction-specific invented weapons get a pass