Skip to content

Commit

Permalink
gun name to object (#38306)
Browse files Browse the repository at this point in the history
  • Loading branch information
snipercup authored Feb 24, 2020
1 parent 58d1d9f commit 66e62f9
Show file tree
Hide file tree
Showing 14 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion data/json/items/gun/3006.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
"looks_like": "ar15",
"type": "GUN",
"reload_noise_volume": 10,
"name": "Browning Automatic Rifle",
"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.",
"weight": "8820 g",
"volume": "2500 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/308.json
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@
"copy-from": "rifle_semi",
"looks_like": "ar15",
"type": "GUN",
"name": "AR-10",
"name": { "str": "AR-10" },
"description": "Somewhat similar to the later AR-15, the AR-10 is a gas operated, rotating bolt rifle chambered for 7.62x51mm rounds.",
"weight": "3290 g",
"volume": "2 L",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/gun/38.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"looks_like": "glock_17",
"type": "GUN",
"reload_noise_volume": 10,
"name": "2 Shot Special",
"name": { "str": "2 Shot Special" },
"//": "It's hard to say just how big this is, although it's (very large) pistol sized. But it is a handmade weapon.",
"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.",
"weight": "750 g",
Expand Down Expand Up @@ -39,7 +39,7 @@
"copy-from": "pistol_base",
"looks_like": "glock_17",
"type": "GUN",
"name": "COP .357 Derringer",
"name": { "str": "COP .357 Derringer" },
"description": "A small, chubby derringer pistol bearing a slight resemblance to the Mossberg Brownie. It uses a rotating firing pin to fire the individual hammers of the four barrels arranged in a square formation.",
"weight": "800 g",
"volume": "399 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/40.json
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
"copy-from": "pistol_base",
"looks_like": "glock_17",
"type": "GUN",
"name": "Browning Hi-Power .40 S&W",
"name": { "str": "Browning Hi-Power .40 S&W" },
"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": "900 g",
"volume": "418 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/gun/45colt.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"looks_like": "glock_17",
"type": "GUN",
"reload_noise_volume": 10,
"name": "Bond Arms Derringer",
"name": { "str": "Bond Arms 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.",
"weight": "595 g",
"volume": "132 ml",
Expand Down Expand Up @@ -38,7 +38,7 @@
"copy-from": "rifle_manual",
"looks_like": "ar15",
"type": "GUN",
"name": "Colt Lightning .45 Carbine",
"name": { "str": "Colt Lightning .45 Carbine" },
"description": "A modern reproduction of a Colt pump-action rifle. Originally chambered in .44-40, modern versions most commonly use .45 Colt, complementing the Single Action Army as a Cowboy Action Shooting firearm.",
"weight": "2722 g",
"volume": "1601 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/50.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
"copy-from": "rifle_base",
"looks_like": "ar15",
"type": "GUN",
"name": "AI AS50",
"name": { "str": "AI AS50" },
"description": ".50 caliber anti-materiel rifle made by Accuracy International. With high accuracy for long range target and high fire rate, this weapon is still being used by Greek national guard.",
"weight": "13330 g",
"volume": "3500 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/gun/545x39.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"looks_like": "ar15",
"type": "GUN",
"reload_noise_volume": 10,
"name": "AK-74M",
"name": { "str": "AK-74M" },
"//": "AKs likewise aren't commercially traded in the US, plus this is newer.",
"description": "The successor to the well-known AK-47 rifle. It combines the reliability of the AK series with the high-velocity, lightweight 5.45x39mm cartridge.",
"weight": "3400 g",
Expand Down Expand Up @@ -43,7 +43,7 @@
"looks_like": "ar15",
"type": "GUN",
"reload_noise_volume": 10,
"name": "AN-94",
"name": { "str": "AN-94" },
"description": "Intended to replace the AK-74, this rifle uses a sophisticated mechanism to delay felt recoil, along with a very fast two-round burst mode. While its increased complexity prevented it from being adopted by the Russian military, it has seen service among their special forces.",
"weight": "3850 g",
"volume": "1750 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/762.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"looks_like": "ar15",
"type": "GUN",
"reload_noise_volume": 10,
"name": "AKM",
"name": { "str": "AKM" },
"description": "One of the most recognizable assault rifles ever made, the AKM is renowned for its durability even under the worst conditions.",
"weight": "3300 g",
"volume": "1750 ml",
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/gun/9mm.json
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@
"copy-from": "pistol_base",
"looks_like": "glock_17",
"type": "GUN",
"name": "Beretta M9A1",
"name": { "str": "Beretta M9A1" },
"description": "An iconic 9x19mm pistol, the M9 was the standard issue sidearm of US armed force from 1985 only until recently. It was formerly popular amongst law enforcement before the advent of commercially available polymer-framed handguns and the FBI's adoption of .40S&W.",
"weight": "961 g",
"volume": "528 ml",
Expand Down Expand Up @@ -652,7 +652,7 @@
"copy-from": "pistol_base",
"looks_like": "glock_17",
"type": "GUN",
"name": "Browning Hi-Power 9x19mm",
"name": { "str": "Browning Hi-Power 9x19mm" },
"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 9x19mm Parabellum.",
"weight": "900 g",
"volume": "418 ml",
Expand Down Expand Up @@ -731,7 +731,7 @@
"copy-from": "pistol_base",
"looks_like": "glock_17",
"type": "GUN",
"name": "CZ-75",
"name": { "str": "CZ-75" },
"description": "The CZ-75 is a semi-automatic pistol developed in Czechoslovakia, and is one of the original wonder nines. Though designed for export to western countries, it was declared a state secret; lack of international patent protection meant that many clones and variants were produced and distributed around the world, with Česká zbrojovka only joining in the 90's. This pistol remains wildly popular among competition shooters.",
"weight": "1000 g",
"volume": "526 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/bio.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
{
"id": "bio_lightning",
"type": "GUN",
"name": "Chain Lightning",
"name": { "str": "Chain Lightning" },
"description": "this a pseudo item",
"volume": "3 L",
"price": 0,
Expand Down
12 changes: 6 additions & 6 deletions data/json/items/gun/shot.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"copy-from": "pistol_base",
"looks_like": "glock_17",
"type": "GUN",
"name": "12 gauge pistol",
"name": { "str": "12 gauge pistol" },
"description": "A single shot pistol that loads 12 gauge shotgun shells, handcrafted from scrap.",
"weight": "828 g",
"volume": "500 ml",
Expand Down Expand Up @@ -37,7 +37,7 @@
"copy-from": "shotgun_base",
"looks_like": "remington_870",
"type": "GUN",
"name": "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",
Expand All @@ -58,7 +58,7 @@
"id": "browning_a5",
"copy-from": "shotgun_base",
"type": "GUN",
"name": "Browning Auto 5",
"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.",
"weight": "4100 g",
"volume": "3525 ml",
Expand Down Expand Up @@ -493,7 +493,7 @@
"id": "streetsweeper",
"copy-from": "shotgun_base",
"type": "GUN",
"name": "Cobray Streetsweeper",
"name": { "str": "Cobray Streetsweeper" },
"description": "Less shotgun and more comically oversized revolver, the Cobray Streetsweeper sold poorly before it was deemed a destructive device. The cylinder is driven by a clockspring, cannot be indexed by hand, and must be ejected with an ejector rod. Its unique design allows for all 12 shells to be fired in under 3 seconds, as demonstrated by the ATF technical branch.",
"weight": "419 g",
"volume": "3193 ml",
Expand All @@ -509,7 +509,7 @@
"barrel_length": "36 ml",
"default_mods": [ "grip" ],
"built_in_mods": [ "wire_stock" ],
"modes": [ [ "DEFAULT", "single", 1 ], [ "AUTO", "3-round", 3 ] ],
"modes": [ [ "DEFAULT", "single", 1 ], [ "AUTO", "3 rd.", 3 ] ],
"valid_mod_locations": [
[ "accessories", 4 ],
[ "barrel", 1 ],
Expand Down Expand Up @@ -626,7 +626,7 @@
"id": "winchester_1887",
"copy-from": "shotgun_base",
"type": "GUN",
"name": "1887 bootleg shotgun",
"name": { "str": "1887 bootleg shotgun" },
"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.",
"weight": "2994 g",
"volume": "1127 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/gun/ups.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"looks_like": "ar15",
"type": "GUN",
"reload_noise_volume": 20,
"name": "CMES laser cannon",
"name": { "str": "CMES laser cannon" },
"description": "This is the integral weapon system for the CMES exoskeleton mech-suit, a rotating-barrel active-cooled rapid-fire laser system, can spray death downrange with ease.",
"weight": "39500 g",
"volume": "11 L",
Expand Down Expand Up @@ -153,7 +153,7 @@
"looks_like": "ar15",
"type": "GUN",
"reload_noise_volume": 10,
"name": "A7 laser rifle",
"name": { "str": "A7 laser rifle" },
"description": "A state-of-the-art laser rifle developed by the R&D outfit \"Aerial Labs\". Initial performance rivaled Rivtech's finest, with rumors flying about corporate skulduggery. Though the Cataclysm put that on the ash heap of history, this weapon can still do the same to your foes.",
"weight": "2950 g",
"volume": "3 L",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/ranged/energy.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"reload_noise_volume": 10,
"symbol": "(",
"color": "light_blue",
"name": "Boeing XM-P plasma rifle",
"name": { "str": "Boeing XM-P plasma rifle" },
"description": "Boeing developed the focused plasma weaponry together with DARPA. It heats solid hydrogen to create plasma and envelops it with polymers to reduce blooming. While powerful, it suffers from short range. Powered by UPS.",
"price": 1750000,
"material": "steel",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/ranged/pneumatic.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"reload_noise_volume": 10,
"symbol": "(",
"color": "brown",
"name": "BB gun",
"name": { "str": "BB gun" },
"description": "Popular among children. It's fairly accurate, but BBs deal nearly no damage.",
"price": 8000,
"//": "You could get a Red Ryder at walmart for $32, but you'd shoot your eye out x_-",
Expand Down

0 comments on commit 66e62f9

Please sign in to comment.