Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed weights for all real firearms. #34908

Merged
merged 36 commits into from
Dec 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
384e8c5
Fixed weights for real .223 firearms.
Warriorcat49 Oct 20, 2019
39c4486
Fixed weights of .22 firearms.
Warriorcat49 Oct 21, 2019
7a93d0b
Fixed weights for .270 firearms.
Warriorcat49 Oct 21, 2019
5bd12a9
Fixed weights of .300 firearms.
Warriorcat49 Oct 21, 2019
c3d6248
Fixed weights for .3006 firearms.
Warriorcat49 Oct 21, 2019
9234272
Fix weights for real .300blk firearms.
Warriorcat49 Oct 21, 2019
5a2847d
Fixed weights for real .308 firearms.
Warriorcat49 Oct 21, 2019
4cc58f3
Fixed weights for real .32 firearms.
Warriorcat49 Oct 21, 2019
cb3f8e8
Fixed weights for real .357sig firearms.
Warriorcat49 Oct 21, 2019
8aaca5e
Fixed weights for real .38 firearms.
Warriorcat49 Oct 21, 2019
6b2f017
Fixed weights for real .380 firearms.
Warriorcat49 Oct 21, 2019
c441267
Fixed weights for real .38super firearms.
Warriorcat49 Oct 21, 2019
dfc57f1
Fixed weights for real .40 firearms.
Warriorcat49 Oct 21, 2019
e5af15b
Fixed weights for real .410 firearms.
Warriorcat49 Oct 21, 2019
a7b940c
Fixed weights for real .44 firearms.
Warriorcat49 Oct 21, 2019
f1efab6
Fixed weights for real .44paper firearms.
Warriorcat49 Oct 21, 2019
8c4eedf
Fixed weights for real .45 firearms.
Warriorcat49 Oct 21, 2019
517ba53
Fixed weights for real .454 firearms.
Warriorcat49 Oct 21, 2019
e700a75
Fixed weights for real .4570 firearms.
Warriorcat49 Oct 21, 2019
a85b684
Fixed weights for real 4.6 firearms.
Warriorcat49 Oct 21, 2019
e4c3d61
Fixed weights for real .500 firearms.
Warriorcat49 Oct 21, 2019
5b5e9d0
Fixed weights for real 5.45 firearms.
Warriorcat49 Oct 21, 2019
a5e7c90
Fixed weights for real 5.7 firearms.
Warriorcat49 Oct 21, 2019
4e3f9c1
Fixed weights for real 7.62x39 firearms.
Warriorcat49 Oct 21, 2019
b872e3c
Fixed weights for real 7.62x54 firearms.
Warriorcat49 Oct 21, 2019
4f56d5a
Fixed weights for real 7.62x25 firearms.
Warriorcat49 Oct 21, 2019
04bff5b
Fixed weights for real 9x19 firearms.
Warriorcat49 Oct 21, 2019
4acf741
Fixed weights for 9x18 firearms.
Warriorcat49 Oct 21, 2019
ea998f5
Fixed weights for real .50 firearms.
Warriorcat49 Oct 21, 2019
f874eb1
Fixed weights for real 12gauge firearms.
Warriorcat49 Oct 21, 2019
ab15873
Merge branch 'master' into patch-1
Warriorcat49 Oct 23, 2019
ffe0a42
Merge branch 'master' into patch-1
ZhilkinSerg Nov 18, 2019
5ac85df
Update data/json/items/gun/22.json
Warriorcat49 Nov 24, 2019
4fae0fc
Merge branch 'master' into patch-1
ZhilkinSerg Dec 10, 2019
e45496d
Update 762R.json
ZhilkinSerg Dec 26, 2019
7638da4
Merge branch 'master' into patch-1
ZhilkinSerg Dec 26, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions data/json/items/gun/22.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"name": "American-180",
"name_plural": "American-180",
"description": "The American-180 is a submachine gun developed in the 1960's that fires .22 LR, unusual for an SMG. Though the round is low-powered, the high rate of fire and large magazine makes the 180 a formidable weapon.",
"weight": "1840 g",
"weight": "2600 g",
"volume": "1250 ml",
"price": 163000,
"to_hit": -2,
Expand Down Expand Up @@ -89,7 +89,7 @@
"name": "Mossberg Brownie",
"name_plural": "Mossberg Brownie",
"description": "The first gun produced by O.F. Mossberg & Sons. A small pocket pistol, marketed to trappers during the early 20th century. Its four barrels can accept .22 Short and .22 LR cartridges.",
"weight": "130 g",
"weight": "280 g",
"volume": "137ml",
"price": 110000,
"to_hit": -1,
Expand Down Expand Up @@ -201,7 +201,7 @@
"name": "Ruger 10/22",
"name_plural": "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.",
"weight": "2220 g",
"weight": "2270 g",
"volume": "2500 ml",
"price": 27000,
"to_hit": -1,
Expand Down Expand Up @@ -241,6 +241,7 @@
"type": "GUN",
"name": "Ruger LCR .22",
"name_plural": "Ruger LCR .22",
"weight": "420 g",
"ammo": "22",
"clip_size": 8,
"magazines": [ [ "22", [ "22_speedloader8" ] ] ]
Expand All @@ -253,7 +254,7 @@
"name": "SIG Mosquito",
"name_plural": "SIG Mosquito",
"description": "A popular, small .22 LR pistol. One of the many polymer frame pistols produced during the latter 20th-early 21st centuries; it has an underbarrel rail.",
"weight": "640 g",
"weight": "700 g",
"volume": "250 ml",
"price": 36000,
"to_hit": -2,
Expand Down Expand Up @@ -292,7 +293,7 @@
"name": "S&W 22A",
"name_plural": "S&W 22A",
"description": "A popular .22 pistol.",
"weight": "900 g",
"weight": "1000 g",
"volume": "500 ml",
"price": 35000,
"to_hit": -2,
Expand All @@ -313,7 +314,7 @@
"type": "GUN",
"name": "Jennings J-22",
"description": "One of the quintessential 'saturday night specials', the Jennings J-22 was very affordably priced with its injection molded zinc slide and frame. Intended to fill the void left after small pocket pistols were banned from import, these were more commonly used by criminals unfazed by their glaring safety issues.",
"weight": "340 g",
"weight": "370 g",
"volume": "123ml",
"price": 7000,
"to_hit": -3,
Expand All @@ -334,7 +335,7 @@
"type": "GUN",
"name": "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": "480 g",
"weight": "450 g",
"volume": "263 ml",
"price": 8500,
"to_hit": -3,
Expand Down
24 changes: 12 additions & 12 deletions data/json/items/gun/223.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"type": "GUN",
"name": "Remington ACR",
"description": "This carbine was developed for military use in the early 21st century. It is damaging and accurate, though its rate of fire is a bit slower than competing .223 carbines.",
"weight": "3495 g",
"weight": "3590 g",
"volume": "2 L",
"price": 234300,
"to_hit": -1,
Expand All @@ -31,7 +31,7 @@
"name": "AR-15",
"//": "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 M16 rifle series. It is lightweight and accurate, but will malfunction if not properly maintained. This one is a semi automatic civilian version.",
"weight": "2815 g",
"weight": "3500 g",
"volume": "2 L",
"price": 125000,
"to_hit": -1,
Expand All @@ -53,7 +53,7 @@
"name": "HK416 A5",
"//": "*Current* milspec gear is now ridiculously overpriced, as seen with the M2010 IRL.",
"description": "Designed to replace the M4A1, the Heckler and Koch 416A5 features most of the former's strengths, while being considerably more durable.",
"weight": "1920 g",
"weight": "3490 g",
"volume": "1750 ml",
"price": 540000,
"to_hit": -1,
Expand All @@ -76,7 +76,7 @@
"type": "GUN",
"name": "H&K G36",
"description": "Designed as a replacement for the early H&K G3 battle rifle, the G36 is more accurate, and uses the much-lighter .223 round, allowing for a higher ammo capacity.",
"weight": "3270 g",
"weight": "3630 g",
"volume": "2500 ml",
"price": 210000,
"to_hit": -1,
Expand Down Expand Up @@ -240,7 +240,7 @@
"type": "GUN",
"name": "M249",
"description": "The M249 is a mountable machine gun used by the US military and SWAT teams. Quite inaccurate and difficult to control, the M249 is designed to fire many rounds very quickly.",
"weight": "6400 g",
"weight": "7330 g",
"volume": "3 L",
"price": 750000,
"to_hit": -1,
Expand Down Expand Up @@ -276,7 +276,7 @@
"type": "GUN",
"name": "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.",
"weight": "3495 g",
"weight": "3710 g",
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
"magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ],
"relative": { "ranged_damage": 1, "durability": 1 }
Expand All @@ -288,7 +288,7 @@
"type": "GUN",
"name": "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.",
"weight": "2520 g",
"weight": "3160 g",
"volume": "1750 ml",
"price": 240000,
"to_hit": -1,
Expand All @@ -311,7 +311,7 @@
"type": "GUN",
"name": "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.",
"weight": "2890 g",
"weight": "3510 g",
"volume": "1750 ml",
"price": 240000,
"to_hit": -1,
Expand Down Expand Up @@ -372,7 +372,7 @@
"type": "GUN",
"name": "Ruger Mini-14",
"description": "A small, lightweight semi-auto carbine designed for civilian and police use. Its superb accuracy and low recoil makes it more suitable than full-auto rifles for some situations.",
"weight": "2800 g",
"weight": "3180 g",
"volume": "2 L",
"price": 92100,
"to_hit": -1,
Expand Down Expand Up @@ -409,7 +409,7 @@
"type": "GUN",
"name": "FN SCAR-L",
"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.",
"weight": "2960 g",
"weight": "3300 g",
"volume": "2250 ml",
"price": 280000,
"to_hit": -1,
Expand All @@ -432,7 +432,7 @@
"type": "GUN",
"name": "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": "3200 g",
"weight": "3000 g",
"volume": "1750 ml",
"price": 320000,
"to_hit": -1,
Expand All @@ -453,7 +453,7 @@
"type": "GUN",
"name": "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": "3184 g",
"weight": "3500 g",
"volume": "1500 ml",
"price": 490000,
"to_hit": -1,
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/270win.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"type": "GUN",
"name": "Remington 700",
"description": "A classic bolt action rifle chambered for .270 Winchester, very polular 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.",
"weight": "4080 g",
"weight": "3410 g",
"volume": "3 L",
"price": 112600,
"to_hit": -1,
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/gun/300.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"name_plural": "M2010 ESR",
"//": "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": "4002 g",
"weight": "5500 g",
"volume": "2750 ml",
"price": 1701000,
"to_hit": -1,
Expand All @@ -31,7 +31,7 @@
"name_plural": "Weatherby Mark V",
"//": "MSRP, believe it or not.",
"description": "The Weatherby Mark V is one of the 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": "4200 g",
"weight": "3730 g",
"volume": "3 L",
"price": 259500,
"to_hit": -1,
Expand All @@ -54,7 +54,7 @@
"name": "Winchester Model 70",
"name_plural": "Winchester Model 70",
"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": "4100 g",
"weight": "3520 g",
"volume": "3 L",
"price": 46000,
"to_hit": -1,
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/gun/3006.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"name": "Browning BLR",
"name_plural": "Browning BLR",
"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.",
"weight": "3135 g",
"weight": "3300 g",
"volume": "3 L",
"price": 85000,
"to_hit": -1,
Expand Down Expand Up @@ -85,7 +85,7 @@
"type": "GUN",
"name": "M1903 Springfield",
"description": "A powerful military rifle chambered in .30-06, developed to replace the US Army's older Krag rifle. 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.",
"weight": "4080 g",
"weight": "3910 g",
"volume": "3 L",
"price": 80000,
"to_hit": -1,
Expand Down Expand Up @@ -122,7 +122,7 @@
"reload_noise_volume": 10,
"name": "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": "7050 g",
"weight": "8820 g",
"volume": "2500 ml",
"price": 350000,
"to_hit": -1,
Expand Down Expand Up @@ -162,7 +162,7 @@
"name": "Remington 700",
"name_plural": "Remington 700",
"description": "A very popular and durable hunting or sniping rifle. Popular among SWAT and US Marine snipers. Highly damaging, but perhaps not as accurate as the competing Browning BLR.",
"weight": "4080 g",
"weight": "3410 g",
"volume": "3 L",
"price": 87000,
"to_hit": -1,
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/gun/300BLK.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"type": "GUN",
"name": "Remington ACR .300BLK",
"description": "This carbine was developed for military use in the early 21st century. It is damaging and accurate, though its rate of fire is a bit slower than competing carbines. This version is chambered for the .300 AAC Blackout round.",
"weight": "3495 g",
"weight": "3590 g",
"volume": "2 L",
"price": 234300,
"to_hit": -1,
Expand All @@ -31,7 +31,7 @@
"type": "GUN",
"name": "IWI Tavor X95 .300BLK",
"description": "The IWI Tavor X95 (also called Micro-Tavor or MTAR) is an Israeli bullpup assault rifle designed and produced by Israel Weapon Industries. This is the civilian version chambered for .300 AAC Blackout.",
"weight": "3400 g",
"weight": "3610 g",
"volume": "1500 ml",
"price": 490000,
"to_hit": -1,
Expand Down
21 changes: 11 additions & 10 deletions data/json/items/gun/308.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"name": "FN FAL",
"name_plural": "FN FAL",
"description": "Originally designed during the Cold War, the FN FAL is probably the most successful battle rifle ever designed. Even though often labeled as obsolete, its high rate of fire and powerful ammunition make it perfectly capable of holding its ground against modern competitors.",
"weight": "3840 g",
"weight": "4250 g",
"volume": "2 L",
"price": 350000,
"to_hit": -1,
Expand All @@ -32,7 +32,7 @@
"name": "H&K G3",
"name_plural": "H&K G3",
"description": "An early battle rifle developed after the end of WWII. The G3 is designed to unload large amounts of deadly ammunition, but it is less suitable over long ranges.",
"weight": "3980 g",
"weight": "4380 g",
"volume": "2 L",
"price": 205000,
"to_hit": -1,
Expand All @@ -55,7 +55,7 @@
"reload_noise_volume": 10,
"name": "M134D-H Minigun",
"description": "The M134D-H Minigun is a (relatively) lightweight heavy rotary machine gun. Its six barrels are rotated by an electric motor, powered by UPS or vehicle. If you could find enough ammo for it, it would become a devastating weapon. It must be mounted on a vehicle before use.",
"weight": "19500 g",
"weight": "19770 g",
"volume": "6 L",
"price": 5500000,
"to_hit": -4,
Expand Down Expand Up @@ -84,7 +84,7 @@
"name": "M14 EBR-RI",
"name_plural": "M14 EBR-RI",
"description": "A highly modified version of the M14 rifle designed to cover both CQB and designated marksman roles. A very powerful and versatile rifle, if somewhat heavy.",
"weight": "4820 g",
"weight": "5070 g",
"price": 195000,
"material": [ "steel", "plastic" ],
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
Expand All @@ -111,7 +111,7 @@
"name": "M1A",
"name_plural": "M1A",
"description": "The child of the M1 Garand World War 2 rifle, the M1A is a semi-automatic variant of the M14, favored for its accuracy and modular use.",
"weight": "3940 g",
"weight": "4230 g",
"volume": "2250 ml",
"price": 130000,
"to_hit": -1,
Expand Down Expand Up @@ -148,7 +148,7 @@
"type": "GUN",
"name": "M240",
"description": "The M240 is a medium machine gun used by the US military, replacing the older M60. Quite inaccurate and difficult to control, the M240 is designed to fire many rounds very quickly.",
"weight": "8800 g",
"weight": "12400 g",
"volume": "3 L",
"price": 1000000,
"to_hit": -1,
Expand Down Expand Up @@ -185,7 +185,7 @@
"type": "GUN",
"name": "M60",
"description": "The M60 is a general-purpose machine gun developed to replace the .30-caliber M1918 and M1919. Heavy and difficult to handle fired from the shoulder, as most people aren't action-movie heroes.",
"weight": "8300 g",
"weight": "10500 g",
"volume": "3 L",
"price": 1000000,
"to_hit": -1,
Expand Down Expand Up @@ -288,6 +288,7 @@
"name": "FN SCAR-H",
"name_plural": "FN SCAR-H",
"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.",
"weight": "3640 g",
"ammo": "308",
"ranged_damage": -3,
"min_cycle_recoil": 2700,
Expand All @@ -302,7 +303,7 @@
"name": "M24",
"name_plural": "M24",
"description": "The M24 Sniper is the military and police version of the Remington Model 700 rifle, M24 being the model name assigned by the United States Army after adoption as their standard sniper rifle in 1988. The M24 is referred to as a 'weapon system' because it consists of not only a rifle, but also a detachable telescopic sight and other accessories.",
"weight": "4500 g",
"weight": "5000 g",
"volume": "2750 ml",
"price": 350000,
"to_hit": -1,
Expand Down Expand Up @@ -340,7 +341,7 @@
"type": "GUN",
"name": "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.",
"weight": "3870 g",
"weight": "4220 g",
"volume": "1750 ml",
"price": 320000,
"to_hit": -1,
Expand All @@ -364,7 +365,7 @@
"type": "GUN",
"name": "M110A1",
"description": "A derivative of H&K's G28 with an aluminium upper reciever to meet US Army weight requirements. It is a gas operated, rotating bolt rifle accurate to 1.5 MOA with standard ammunition.",
"weight": "3800 g",
"weight": "4330 g",
"volume": "2 L",
"price": 320000,
"to_hit": -1,
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/gun/32.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"name": "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": "1102 g",
"weight": "1300 g",
"volume": "750 ml",
"price": 150000,
"to_hit": -2,
Expand Down Expand Up @@ -85,7 +85,7 @@
"name": "Walther PPK",
"name_plural": "Walther PPK",
"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.",
"weight": "525 g",
"weight": "540 g",
"volume": "250 ml",
"price": 45000,
"to_hit": -1,
Expand Down
Loading