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

Gunmod modern json #38509

Merged
merged 1 commit into from
Mar 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion data/json/items/gunmod/loading_port.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"id": "arredondo_chute",
"type": "GUNMOD",
"name": "speedloader chute",
"name": { "str": "speedloader chute" },
"description": "A metal ramp that is installed near a shotgun's feeding port to index speedloader tubes.",
"weight": "135 g",
"volume": "149 ml",
Expand Down
20 changes: 10 additions & 10 deletions data/json/items/gunmod/mechanism.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
{
"id": "match_trigger",
"type": "GUNMOD",
"name": "match trigger",
"name": { "str": "match trigger" },
"description": "A precision weighted trigger assembly that slightly improves a firearm's accuracy.",
"weight": "120 g",
"volume": "250 ml",
"integral_volume": 0,
"integral_weight": 0,
"integral_volume": "0 ml",
"integral_weight": "0 g",
"price": 1500,
"material": [ "steel", "superalloy" ],
"symbol": ":",
Expand All @@ -21,12 +21,12 @@
{
"id": "dias",
"type": "GUNMOD",
"name": "drop-in auto sear",
"name": { "str": "drop-in auto sear" },
"description": "This is a vaguely 'U' shaped piece of metal with a vaguely 'T' shaped flapper on a pin. Once tucked into an AR-15's lower receiver, the rifle will become selective fire-capable. The handcrafted-sear surface isn't as good as actual full-auto parts, so precision and reliability suffer slightly.",
"weight": "113 g",
"volume": "250 ml",
"integral_volume": 0,
"integral_weight": 0,
"integral_volume": "0 ml",
"integral_weight": "0 g",
"price": 65000,
"material": [ "steel" ],
"symbol": ":",
Expand All @@ -43,11 +43,11 @@
{
"id": "llink",
"type": "GUNMOD",
"name": "lightning link",
"name": { "str": "lightning link" },
"description": "Originally designed for the Colt SP-1, this 'reproduction' is intended to convert an AR-15 into a full-auto only rifle. Once the necessary modifications are made and the link is in place, semi-auto is disabled and full-auto is enabled. Reliability and precision suffer greatly due to questionable craftsmanship and lack of unobtainium SP-1 parts.",
"weight": "60 g",
"volume": "250 ml",
"integral_volume": 0,
"integral_volume": "0 ml",
"price": 24000,
"material": [ "steel" ],
"symbol": ":",
Expand All @@ -67,11 +67,11 @@
{
"id": "waterproof_gunmod",
"type": "GUNMOD",
"name": "firearm waterproofing",
"name": { "str": "firearm waterproofing" },
"description": "A set of seals and gaskets that will allow a firearm to operate reliably while submerged in water.",
"weight": "220 g",
"volume": "250 ml",
"integral_volume": 0,
"integral_volume": "0 ml",
"price": 50000,
"material": [ "plastic" ],
"symbol": ":",
Expand Down
46 changes: 23 additions & 23 deletions data/json/items/gunmod/mount.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,127 +2,127 @@
{
"id": "grip_mount",
"type": "GUNMOD",
"name": "replaceable furniture kit",
"name": { "str": "replaceable furniture kit" },
"description": "This is a kit consisting of various steel and plastic parts; when installed, it would permanently modify and partially replace some of the weapon's furniture so that it could be easily changed if needed. This allows installing any kind of more advanced grips or other furniture.",
"weight": "80 g",
"volume": "50ml",
"integral_volume": 0,
"volume": "50 ml",
"integral_volume": "0 ml",
"price": 6000,
"material": [ "steel", "plastic" ],
"symbol": ":",
"color": "light_gray",
"location": "grip mount",
"mod_targets": [ "smg", "rifle", "pistol", "shotgun", "crossbow", "launcher" ],
"install_time": 60000,
"install_time": "15 m",
"min_skills": [ [ "gun", 5 ] ],
"add_mod": [ [ "grip", 1 ] ],
"flags": [ "INSTALL_DIFFICULT", "IRREMOVABLE" ]
},
{
"id": "rail_mount",
"type": "GUNMOD",
"name": "side mount",
"name": { "str": "side mount" },
"description": "This is a plastic mount for attaching a rail accessory, designed to be permanently installed onto almost any weapon, along with some fasteners. Ideal for bringing out your inner tacticool on older guns.",
"weight": "10 g",
"volume": "8ml",
"volume": "8 ml",
"price": 6000,
"material": [ "steel", "plastic" ],
"symbol": ":",
"color": "light_gray",
"location": "rail mount",
"mod_targets": [ "smg", "rifle", "pistol", "shotgun", "crossbow", "launcher" ],
"install_time": 15000,
"install_time": "5 m",
"min_skills": [ [ "gun", 3 ] ],
"add_mod": [ [ "rail", 1 ] ],
"flags": [ "INSTALL_DIFFICULT", "IRREMOVABLE" ]
},
{
"id": "sights_mount",
"type": "GUNMOD",
"name": "sights mount",
"name": { "str": "sights mount" },
"description": "This is a plastic mount for attaching a sight, designed to be permanently installed onto almost any weapon other than launchers and pistols, along with some fasteners. Ideal for bringing out your inner tacticool on older guns.",
"weight": "10 g",
"volume": "8ml",
"volume": "8 ml",
"price": 6000,
"material": [ "steel", "plastic" ],
"symbol": ":",
"color": "light_gray",
"location": "sights mount",
"mod_targets": [ "smg", "rifle", "shotgun", "crossbow" ],
"install_time": 15000,
"install_time": "5 m",
"min_skills": [ [ "gun", 3 ] ],
"add_mod": [ [ "sights", 1 ] ],
"flags": [ "INSTALL_DIFFICULT", "IRREMOVABLE" ]
},
{
"id": "sights_mount_launcher",
"type": "GUNMOD",
"name": "launcher sights mount",
"name": { "str": "launcher sights mount" },
"description": "This is a plastic mount for attaching a sight, designed to be permanently installed onto almost any launcher, along with some fasteners. Ideal for bringing out your inner tacticool on rocket launchers.",
"weight": "60 g",
"volume": "80ml",
"volume": "80 ml",
"price": 6000,
"material": [ "steel", "plastic" ],
"symbol": ":",
"color": "light_gray",
"location": "sights mount",
"mod_targets": [ "launcher" ],
"install_time": 15000,
"install_time": "5 m",
"min_skills": [ [ "gun", 3 ] ],
"add_mod": [ [ "sights", 1 ] ],
"flags": [ "INSTALL_DIFFICULT", "IRREMOVABLE" ]
},
{
"id": "sights_mount_pistol",
"type": "GUNMOD",
"name": "pistol sights mount",
"name": { "str": "pistol sights mount" },
"description": "This is a plastic mount for attaching a sight, designed to be permanently installed onto almost any pistol, along with some fasteners. Ideal for bringing out your inner tacticool on pocket pistols.",
"weight": "60 g",
"volume": "80ml",
"volume": "80 ml",
"price": 6000,
"material": [ "steel", "plastic" ],
"symbol": ":",
"color": "light_gray",
"location": "sights mount",
"mod_targets": [ "pistol" ],
"install_time": 15000,
"install_time": "5 m",
"min_skills": [ [ "gun", 3 ] ],
"add_mod": [ [ "sights", 1 ] ],
"flags": [ "INSTALL_DIFFICULT", "IRREMOVABLE" ]
},
{
"id": "stock_mount",
"type": "GUNMOD",
"name": "replaceable stock kit",
"name": { "str": "replaceable stock kit" },
"description": "This is a kit consisting of various steel parts; when installed, it would remove the weapon's original fixed stock, install a new stock mount on its place, modify original stock to fit it and then reattach it to the gun, or simply attach a stock mount if gun had no stock to start with. This allows easy installation of any kind of more advanced stocks.",
"weight": "80 g",
"volume": "50ml",
"integral_volume": 0,
"volume": "50 ml",
"integral_volume": "0 ml",
"price": 6000,
"material": [ "steel" ],
"symbol": ":",
"color": "light_gray",
"location": "stock mount",
"mod_targets": [ "smg", "rifle", "pistol", "shotgun", "crossbow", "launcher" ],
"install_time": 60000,
"install_time": "15 m",
"min_skills": [ [ "gun", 5 ] ],
"add_mod": [ [ "stock", 1 ] ],
"flags": [ "INSTALL_DIFFICULT", "IRREMOVABLE" ]
},
{
"id": "underbarrel_mount",
"type": "GUNMOD",
"name": "bottom mount",
"name": { "str": "bottom mount" },
"description": "This is a plastic mount for attaching an underbarrel accessory, designed to be permanently installed onto almost any weapon, along with some fasteners. Ideal for bringing out your inner tacticool on older guns.",
"weight": "10 g",
"volume": "8ml",
"volume": "8 ml",
"price": 6000,
"material": [ "steel", "plastic" ],
"symbol": ":",
"color": "light_gray",
"location": "underbarrel mount",
"mod_targets": [ "smg", "rifle", "pistol", "shotgun", "crossbow", "launcher", "bow" ],
"install_time": 15000,
"install_time": "5 m",
"min_skills": [ [ "gun", 3 ] ],
"add_mod": [ [ "underbarrel", 1 ] ],
"flags": [ "INSTALL_DIFFICULT", "IRREMOVABLE" ]
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/gunmod/muzzle.json
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
{
"id": "suppressor",
"type": "GUNMOD",
"name": "suppressor",
"name": { "str": "suppressor" },
"//": "SilencerCo Hybrid 46",
"description": "A suppressor reduces the amount of noise and muzzle flash generated by the report of a firearm. Gunfire is extremely loud and can damage your hearing without protection; a suppressor will bring the loudness of a report down to generally safe levels.",
"weight": "490 g",
Expand Down Expand Up @@ -190,7 +190,7 @@
{
"id": "suppressor_compact",
"type": "GUNMOD",
"name": "compact suppressor",
"name": { "str": "compact suppressor" },
"description": "A compact suppressor designed for pistols and best used with smaller calibers.",
"weight": "303 g",
"//": "SilencerCo Omega 45K",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/gunmod/sights.json
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
{
"id": "rifle_scope",
"type": "GUNMOD",
"name": "rifle scope",
"name": { "str": "rifle scope" },
"//": "Leupold Mark 6",
"description": "A 3-18x44 rifle scope. It is adjustable for windage and elevation in 1/10th mrad increments and is remarkably small and light for its magnification.",
"weight": "669 g",
Expand Down Expand Up @@ -200,7 +200,7 @@
{
"id": "tele_sight",
"type": "GUNMOD",
"name": "telescopic sight",
"name": { "str": "telescopic sight" },
"description": "A simple hand-crafted telescopic sight, essentially a small telescope with crosshairs. Not as good as the ones made before the Cataclysm. Increases weight but improves accuracy.",
"weight": "300 g",
"volume": "250 ml",
Expand Down