From ca2e327367866c9e839fec3a56fe8f1f26efcc86 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Tue, 18 Feb 2020 21:51:25 +0100 Subject: [PATCH] Gunmod modern json (#38137) --- data/json/items/gunmod/grip.json | 10 +++++----- data/json/items/gunmod/laser_gunmods.json | 12 ++++++------ data/json/items/gunmod/muzzle.json | 2 +- data/json/items/gunmod/rail.json | 2 +- data/json/items/gunmod/sights.json | 8 ++++---- data/json/items/gunmod/stock.json | 12 ++++++------ data/json/items/gunmod/underbarrel.json | 16 ++++++++-------- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/data/json/items/gunmod/grip.json b/data/json/items/gunmod/grip.json index 665945f3cde26..9a48f6d11a132 100644 --- a/data/json/items/gunmod/grip.json +++ b/data/json/items/gunmod/grip.json @@ -2,11 +2,11 @@ { "id": "light_grip", "type": "GUNMOD", - "name": "lightweight replacement furniture", + "name": { "str": "lightweight replacement furniture" }, "description": "A set of lightweight composite grips and furniture that reduces a firearm's weight, and as a consequence, its handling and melee damage.", "weight": "140 g", "volume": "250 ml", - "integral_volume": 0, + "integral_volume": "0 ml", "price": 48000, "material": [ "plastic" ], "symbol": ":", @@ -21,12 +21,12 @@ { "id": "pistol_grip", "type": "GUNMOD", - "name": "ergonomic grip", + "name": { "str": "ergonomic grip" }, "description": "A set of ergonomic replacement furniture for a firearm improving handling.", "weight": "125 g", "volume": "250 ml", - "integral_volume": 0, - "integral_weight": 0, + "integral_volume": "0 ml", + "integral_weight": "0 g", "price": 38000, "material": [ "steel" ], "symbol": ":", diff --git a/data/json/items/gunmod/laser_gunmods.json b/data/json/items/gunmod/laser_gunmods.json index 7d006d0d36c78..f1aca26e0474c 100644 --- a/data/json/items/gunmod/laser_gunmods.json +++ b/data/json/items/gunmod/laser_gunmods.json @@ -38,7 +38,7 @@ { "id": "electrolaser_conversion", "type": "GUNMOD", - "name": "electrolaser conversion", + "name": { "str": "electrolaser conversion" }, "description": "A set of high-tech electronics and optics. These converts a laser pistol into a less-lethal electrolaser capable of stunning targets, at the cost of a decreased damage output and increased power consumption.", "weight": "380 g", "volume": "1 L", @@ -57,11 +57,11 @@ { "id": "effective_emitter", "type": "GUNMOD", - "name": "effective emitter", + "name": { "str": "effective emitter" }, "description": "A set of electronics to optimize emitter workcycle and increase overall energy efficiency. Decreases power consumption.", "weight": "380 g", "volume": "250 ml", - "integral_volume": 0, + "integral_volume": "0 ml", "price": 84000, "material": [ "steel" ], "symbol": ":", @@ -74,11 +74,11 @@ { "id": "high_density_capacitor", "type": "GUNMOD", - "name": "high density capacitor", + "name": { "str": "high density capacitor" }, "description": "A capacitor with a higher energy density increases range and damage; at the cost of a markedly increased power consumption.", "weight": "380 g", "volume": "250 ml", - "integral_volume": 0, + "integral_volume": "0 ml", "price": 84000, "material": [ "steel" ], "symbol": ":", @@ -87,7 +87,7 @@ "mod_targets": [ "pistol", "rifle" ], "range_modifier": 5, "damage_modifier": 10, - "ups_charges_multiplier": 2, + "ups_charges_multiplier": 2.0, "min_skills": [ [ "weapon", 4 ], [ "electronics", 5 ] ] } ] diff --git a/data/json/items/gunmod/muzzle.json b/data/json/items/gunmod/muzzle.json index e2106800a026c..311d7cd3e1874 100644 --- a/data/json/items/gunmod/muzzle.json +++ b/data/json/items/gunmod/muzzle.json @@ -47,7 +47,7 @@ { "id": "crafted_suppressor", "type": "GUNMOD", - "name": "homemade suppressor", + "name": { "str": "homemade suppressor" }, "description": "A homemade suppressor made from a pipe and improvised wipe media. For as long as the wipes hold up, it will reduce 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, as well as slightly reducing recoil and muzzle velocity. This simple suppressor is large and, when attached, will interfere with your ability to aim down the base sights of the gun.", "weight": "880 g", "volume": "750 ml", diff --git a/data/json/items/gunmod/rail.json b/data/json/items/gunmod/rail.json index d9fbca1e818f7..9ff9bcf4f26cd 100644 --- a/data/json/items/gunmod/rail.json +++ b/data/json/items/gunmod/rail.json @@ -98,7 +98,7 @@ { "id": "stabilizer", "type": "GUNMOD", - "name": "gyroscopic stabilizer", + "name": { "str": "gyroscopic stabilizer" }, "description": "An advanced unit that straps onto the side of your firearm and reduces vibration, greatly reducing recoil and slightly increasing accuracy.", "weight": "286 g", "volume": "750 ml", diff --git a/data/json/items/gunmod/sights.json b/data/json/items/gunmod/sights.json index 0f31830fd2089..dac909f816aea 100644 --- a/data/json/items/gunmod/sights.json +++ b/data/json/items/gunmod/sights.json @@ -2,11 +2,11 @@ { "id": "bow_sight", "type": "GUNMOD", - "name": "five pin bow sight", + "name": { "str": "five pin bow sight" }, "description": "A set of adjustable optic fiber aiming pins with a bracket to mount on modern bows. Improves accuracy substantially, but takes a bit longer to line up.", "weight": "120 g", "volume": "250 ml", - "integral_volume": 0, + "integral_volume": "0 ml", "price": 5000, "material": [ "aluminum", "plastic" ], "symbol": ":", @@ -56,7 +56,7 @@ { "id": "holo_sight", "type": "GUNMOD", - "name": "holographic sight", + "name": { "str": "holographic sight" }, "//": "EOTech XPS3", "description": "Used extensively by military forces, it increases accuracy and weight. This is a step up from a red dot sight.", "weight": "255 g", @@ -180,7 +180,7 @@ "id": "acog_scope_mod", "copy-from": "acog_scope", "type": "GUNMOD", - "name": "modified ACOG scope", + "name": { "str": "modified ACOG scope" }, "description": "A 4x32 TA01 Advanced Combat Optical Gunsight with a tritium illuminated crosshair. This one was modified and customized to mount on pretty much any weapon other than pistols, if you so want.", "mod_targets": [ "smg", "rifle", "shotgun", "launcher", "crossbow" ] }, diff --git a/data/json/items/gunmod/stock.json b/data/json/items/gunmod/stock.json index 758bcb22169e8..77b3f966aecc2 100644 --- a/data/json/items/gunmod/stock.json +++ b/data/json/items/gunmod/stock.json @@ -22,12 +22,12 @@ { "id": "folding_stock", "type": "GUNMOD", - "name": "folding stock", + "name": { "str": "folding stock" }, "description": "A folding stock which reduces volume but needs unfolding before use. Increases the time needed to wield the weapon.", "weight": "200 g", "volume": "500 ml", - "integral_volume": 0, - "integral_weight": 0, + "integral_volume": "0 ml", + "integral_weight": "0 g", "price": 42000, "material": [ "plastic", "steel" ], "symbol": ":", @@ -40,12 +40,12 @@ { "id": "wire_stock", "type": "GUNMOD", - "name": "folding wire stock", + "name": { "str": "folding wire stock" }, "description": "A folding wire stock which folds up very compactly but needs unfolding before use. It's somewhat wobbly but is better than nothing at all. Increases the time needed to wield the weapon.", "weight": "170 g", "volume": "250 ml", - "integral_volume": 0, - "integral_weight": 0, + "integral_volume": "0 ml", + "integral_weight": "0 g", "price": 30000, "material": [ "steel" ], "symbol": ":", diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json index 9ae1ae299fb64..718da1b0584bb 100644 --- a/data/json/items/gunmod/underbarrel.json +++ b/data/json/items/gunmod/underbarrel.json @@ -49,10 +49,10 @@ { "id": "combination_gun_shotgun", "type": "GUNMOD", - "name": "combination gun shotgun", + "name": { "str": "combination gun shotgun" }, "description": "The integrated underbarrel shotgun of a combination gun which holds two shots. It's irremovable.", "weight": "2600 g", - "volume": 0, + "volume": "0 ml", "price": 95000, "to_hit": -1, "material": [ "steel" ], @@ -83,7 +83,7 @@ { "id": "grip", "type": "GUNMOD", - "name": "forward grip", + "name": { "str": "forward grip" }, "//": "Daniel Defense Tornado", "description": "A grip placed forward on the barrel allows for greater control. Not as effective as a bipod but usable under all conditions.", "weight": "68 g", @@ -109,7 +109,7 @@ { "id": "inter_bayonet", "type": "GUNMOD", - "name": "integrated bayonet", + "name": { "str": "integrated bayonet" }, "description": "This is the bayonet integrated in the firearm.", "weight": "1 g", "volume": "250 ml", @@ -263,7 +263,7 @@ "id": "m203_mod", "copy-from": "m203", "type": "GUNMOD", - "name": "modified M203", + "name": { "str": "modified M203" }, "description": "The M203 was originally designed for use with M16 variants but today can be attached to almost any rifle. It allows a single 40mm grenade to be loaded and fired. This one was modified and customized to mount on pretty much any weapon other than pistols and pump-action guns, if you so want.", "mod_targets": [ "smg", "rifle", "shotgun", "launcher", "crossbow" ] }, @@ -288,7 +288,7 @@ "id": "m320_mod_mod", "copy-from": "m320_mod", "type": "GUNMOD", - "name": "modified M320 GLM", + "name": { "str": "modified M320 GLM" }, "description": "The M320 Grenade Launcher Module offers the functionality of larger launchers in a very small package at the cost of decreased accuracy. It can be either attached to a rifle or combined with a buttstock for standalone use. This one was modified and customized to mount on pretty much any weapon other than pistols and pump-action guns, if you so want.", "mod_targets": [ "smg", "rifle", "shotgun", "launcher", "crossbow" ] }, @@ -323,7 +323,7 @@ { "id": "masterkey", "type": "GUNMOD", - "name": "masterkey shotgun", + "name": { "str": "masterkey shotgun" }, "description": "A minimalist pump action shotgun, which can be mounted under the barrel of many rifles. It allows a total of four shotgun shells to be loaded and fired.", "weight": "2600 g", "volume": "500 ml", @@ -403,7 +403,7 @@ "id": "rm121aux_mod", "copy-from": "rm121aux", "type": "GUNMOD", - "name": "modified RM121 aux shotgun", + "name": { "str": "modified RM121 aux shotgun" }, "description": "The Rivtech RM121 auxiliary weapon system is a magazine-fed semi-automatic caseless shotgun, which can be mounted under the barrel of many rifles. Accepts RMSA10 box magazines. This one was modified and customized to mount on pretty much any weapon other than pistols, if you so want.", "mod_targets": [ "smg", "rifle", "shotgun", "launcher", "crossbow" ] },