Skip to content

Commit

Permalink
gun name to object
Browse files Browse the repository at this point in the history
  • Loading branch information
snipercup committed Feb 26, 2020
1 parent 241522e commit b7f0a97
Show file tree
Hide file tree
Showing 13 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion data/json/items/gun/22.json
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@
"copy-from": "pistol_base",
"looks_like": "glock_17",
"type": "GUN",
"name": "Walther P22",
"name": { "str": "Walther P22" },
"description": "The Walther P22 is a blowback operated semi-automatic pistol. It is about half the size of most Walthers. It is made mostly with plastic, with the slide and key components being made of die-cast zinc alloy",
"weight": "450 g",
"volume": "263 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/gun/223.json
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@
"copy-from": "rifle_auto",
"looks_like": "ar15",
"type": "GUN",
"name": "SIG 552",
"name": { "str": "SIG 552" },
"description": "A compact selective fire automatic rifle designed for the Swiss military. It features a three-round burst mode and an integrated folding stock.",
"weight": "3000 g",
"volume": "1750 ml",
Expand All @@ -449,7 +449,7 @@
"copy-from": "rifle_auto",
"looks_like": "ar15",
"type": "GUN",
"name": "Steyr AUG",
"name": { "str": "Steyr AUG" },
"description": "The Steyr AUG is an Austrian assault rifle that uses a bullpup design. It is used in the armed forces and police forces of many nations, and enjoys low recoil and high accuracy.",
"weight": "3500 g",
"volume": "1500 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/32.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"looks_like": "hk_mp5",
"type": "GUN",
"reload_noise_volume": 10,
"name": "Skorpion Vz. 61",
"name": { "str": "Skorpion Vz. 61" },
"//": "Total unloaded weight of gun 1301.81 grams, rounded to 1302. Current weight of folding stock 200 grams.",
"description": "The Skorpion Vz. 61 is a Czechoslovak submachine gun from the 1950s, chambered in .32 ACP.",
"weight": "1300 g",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/gun/357sig.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": "SIG P226",
"name": { "str": "SIG P226" },
"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",
Expand Down Expand Up @@ -36,7 +36,7 @@
"copy-from": "pistol_base",
"looks_like": "glock_17",
"type": "GUN",
"name": "SIG P320",
"name": { "str": "SIG P320" },
"description": "The P320 is a semi-automatic, short recoil operated pistol. This one is chambered for .357 SIG.",
"weight": "731 g",
"volume": "462 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 @@ -246,7 +246,7 @@
"copy-from": "pistol_base",
"looks_like": "glock_17",
"type": "GUN",
"name": "Walther PPQ .40 S&W",
"name": { "str": "Walther PPQ .40 S&W" },
"description": "The Walther PPQ is a semi-automatic pistol originating from the Walther P99QA, and maintains compatibility with some of its predecessor's accessories. This model is chambered in .40 S&W.",
"weight": "625 g",
"volume": "422 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/gun/410shot.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"copy-from": "shotgun_base",
"looks_like": "remington_870",
"type": "GUN",
"name": "Saiga-410",
"name": { "str": "Saiga-410" },
"description": "The Saiga-410 is a semi-automatic shotgun designed on the same Kalashnikov pattern as the AK47 rifle. It reloads with a magazine, rather than one shell at a time like most shotguns.",
"weight": "3400 g",
"volume": "2750 ml",
Expand All @@ -25,7 +25,7 @@
"copy-from": "shotgun_s",
"looks_like": "remington_870",
"type": "GUN",
"name": "Winchester M37 .410",
"name": { "str": "Winchester M37 .410" },
"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": "2721 g",
"blackpowder_tolerance": 80,
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/gun/45.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"looks_like": "hk_mp5",
"type": "GUN",
"reload_noise_volume": 10,
"name": "TDI Vector",
"name": { "str": "TDI Vector" },
"description": "The TDI Vector is a submachine gun with a unique, in-line design that makes recoil very manageable, even in the powerful .45 caliber.",
"weight": "3100 g",
"volume": "1750 ml",
Expand Down Expand Up @@ -260,7 +260,7 @@
"looks_like": "hk_mp5",
"type": "GUN",
"reload_noise_volume": 10,
"name": "Thompson submachine gun",
"name": { "str": "Thompson submachine gun" },
"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 was used during World War II before being mostly replaced with less-expensive alternatives.",
"weight": "5910 g",
"volume": "2 L",
Expand Down Expand Up @@ -322,7 +322,7 @@
"copy-from": "pistol_base",
"looks_like": "glock_17",
"type": "GUN",
"name": "Walther PPQ .45 ACP",
"name": { "str": "Walther PPQ .45 ACP" },
"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.",
"weight": "714 g",
"volume": "470 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 @@ -141,7 +141,7 @@
"copy-from": "rifle_base",
"looks_like": "ar15",
"type": "GUN",
"name": "Serbu BFG-50",
"name": { "str": "Serbu BFG-50" },
"description": "A single-shot, bolt-action rifle made by Serbu Firearms, the BFG-50 is a very affordable firearm for those wishing to shoot .50 BMG.",
"weight": "8144 g",
"volume": "1387 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 @@ -81,7 +81,7 @@
"looks_like": "ar15",
"type": "GUN",
"reload_noise_volume": 10,
"name": "SKS",
"name": { "str": "SKS" },
"description": "Developed by the Soviets in 1945, this rifle was quickly replaced by the full-auto AK47. However, due to its superb accuracy, low recoil and deployable integrated bayonet, this gun maintains immense popularity.",
"weight": "3850 g",
"volume": "2500 ml",
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/gun/9mm.json
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@
"looks_like": "hk_mp5",
"type": "GUN",
"reload_noise_volume": 10,
"name": "STEN",
"name": { "str": "STEN" },
"description": "A British submachine gun developed during World War II, to make up for shortages of supplies. Designed to be made using unskilled labor and not known for reliability, its main advantages were low cost and being able to use German 9mm ammunition.",
"weight": "3200 g",
"volume": "1750 ml",
Expand Down Expand Up @@ -672,7 +672,7 @@
"copy-from": "pistol_base",
"looks_like": "glock_17",
"type": "GUN",
"name": "Walther P38",
"name": { "str": "Walther P38" },
"description": "The Walther P38 is a semi-automatic handgun adopted shortly before the second world war. Developed due to the high production costs of its predecessor, the Luger P08, the P38 is also chambered in 9mm Parabellum. This early DA/SA locked-breech design would introduce features later seen on more modern firearms such as the Beretta 92 series, and served Germany until 2004.",
"weight": "800 g",
"volume": "547 ml",
Expand All @@ -692,7 +692,7 @@
"copy-from": "pistol_base",
"looks_like": "glock_17",
"type": "GUN",
"name": "Walther PPQ 9mm",
"name": { "str": "Walther PPQ 9mm" },
"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 9x19mm Parabellum.",
"weight": "615 g",
"volume": "413 ml",
Expand Down Expand Up @@ -751,7 +751,7 @@
"copy-from": "pistol_base",
"looks_like": "glock_17",
"type": "GUN",
"name": "Walther CCP",
"name": { "str": "Walther CCP" },
"description": "The Walther CCP is a gas-delayed blowback semi-automatic pistol intended for the concealed carry consumer market. Internally, it is nearly identical to the cult classic H&K P7. Its fixed barrel design makes it potentially more accurate than many other pistols, though this may difficult to realize with its average trigger and short sight radius.",
"weight": "570 g",
"volume": "318 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/9x18.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"copy-from": "skorpion_61",
"looks_like": "hk_mp5",
"type": "GUN",
"name": "Skorpion Vz. 82",
"name": { "str": "Skorpion Vz. 82" },
"//": "Total unloaded weight of gun 1451.496 grams, rounded to 1451. Current weight of folding stock 200 grams.",
"description": "A version of the Skorpion submachine gun chambered in 9x18mm Makarov, with a slightly longer barrel than the original design.",
"weight": "1440 g",
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/gun/shot.json
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@
"copy-from": "shotgun_base",
"looks_like": "remington_870",
"type": "GUN",
"name": "Saiga-12",
"name": { "str": "Saiga-12" },
"description": "The Saiga-12 is a semi-automatic shotgun designed on the same Kalashnikov pattern as the AK47 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.",
"weight": "3600 g",
"volume": "2750 ml",
Expand Down Expand Up @@ -562,7 +562,7 @@
"id": "tavor_12",
"copy-from": "shotgun_base",
"type": "GUN",
"name": "Tavor TS12",
"name": { "str": "Tavor TS12" },
"description": "This is 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.",
"weight": "4200 g",
"volume": "4040 ml",
Expand Down Expand Up @@ -595,7 +595,7 @@
"id": "USAS_12",
"copy-from": "shotgun_base",
"type": "GUN",
"name": "USAS 12",
"name": { "str": "USAS 12" },
"description": "The USAS 12 looks like a boxy upsized caricature of the M16A2. Like its Auto Assault-12 predecessor, it is a select-fire shotgun fed from large box or drum magazines. The in-line recoil system and sheer weight make for pleasant shooting.",
"weight": "5450 g",
"volume": "4695 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 @@ -4,7 +4,7 @@
"looks_like": "ar15",
"type": "GUN",
"reload_noise_volume": 10,
"name": "XM34 EMP projector",
"name": { "str": "XM34 EMP projector" },
"description": "A powerful electrolaser developed by the R&D outfit \"Aerial Labs\". Especially effective against electronic targets.",
"weight": "2950 g",
"volume": "3 L",
Expand Down Expand Up @@ -192,7 +192,7 @@
"looks_like": "glock_17",
"type": "GUN",
"reload_noise_volume": 10,
"name": "V29 laser pistol",
"name": { "str": "V29 laser pistol" },
"description": "This V29 laser pistol was one of the first handheld laser weapons. It is larger than most traditional handguns, but displays no recoil whatsoever.",
"weight": "680 g",
"volume": "1 L",
Expand Down

0 comments on commit b7f0a97

Please sign in to comment.