Obsolete impossible gunmods.

CleverRaven · Oct 30, 2018 · 3874aed · 3874aed
1 parent 375f7f9
commit 3874aed
Show file tree

Hide file tree

Showing 14 changed files with 84 additions and 118 deletions.
diff --git a/data/json/item_groups.json b/data/json/item_groups.json
@@ -4493,7 +4493,6 @@
       ["lemat_revolver", 1],
       ["m1911", 5],
       ["mn_ebr_kit", 1],
-      ["tuned_mechanism", 2],
       ["match_trigger", 3],
       ["geiger_off", 8],
       ["rad_monitor", 1],
@@ -7338,7 +7337,6 @@
       ["halligan", 10],
       ["fire_ax", 5],
       ["antiparasitic", 2],
-      ["tuned_mechanism", 1],
       ["match_trigger", 2],
       ["grapnel", 1],
       ["bucket", 4],
@@ -7657,7 +7655,6 @@
       ["pocketwatch", 2],
       ["gold_dental_grill", 2],
       ["diamond_dental_grill", 1],
-      ["tuned_mechanism", 2],
       ["match_trigger", 3],
       ["pocketwatch", 2],
       ["wakizashi", 1],

diff --git a/data/json/itemgroups/gunmod.json b/data/json/itemgroups/gunmod.json
@@ -38,7 +38,6 @@
       [ "red_dot_sight", 70 ],
       [ "recoil_stock", 60 ],
       [ "shot_suppressor", 10 ],
-      [ "tuned_mechanism", 20 ],
       [ "u_shotgun", 60 ],
       [ "waterproof_gunmod", 40 ]
     ]

diff --git a/data/json/items/gunmod/barrel.json b/data/json/items/gunmod/barrel.json
@@ -36,16 +36,20 @@
   },
   {
     "id": "lead_barrel_big",
-    "copy-from": "barrel_big",
     "type": "GUNMOD",
     "name": "LW barrel extension",
     "description": "A Leadworks built in longer barrel increases the muzzle velocity of a firearm, contributing to both accuracy and damage, but slows aiming.",
-    "weight": 0,
-    "volume": 0,
-    "price": 0,
+    "to_hit": 2,
+    "bashing": 5,
+    "material": [ "steel" ],
+    "symbol": ":",
+    "color": "light_gray",
+    "location": "barrel",
+    "mod_targets": [ "smg", "rifle", "shotgun", "pistol" ],
     "damage_modifier": 3,
     "dispersion_modifier": -45,
     "range_modifier": 3,
+    "min_skills": [ [ "weapon", 4 ] ],
     "flags": [ "IRREMOVABLE" ]
   },
   {
@@ -62,16 +66,11 @@
   },
   {
     "id": "lead_barrel_heavy_duty",
-    "copy-from": "barrel_big",
+    "copy-from": "lead_barrel_big",
     "type": "GUNMOD",
     "name": "LW heavy duty barrel",
     "description": "A Leadworks built in heavy duty barrel especially designed for prolonged shooting.  Reduced accuracy but increase damage output and weapon range.",
-    "weight": 0,
-    "volume": 0,
-    "price": 0,
-    "damage_modifier": 3,
     "dispersion_modifier": 0,
-    "range_modifier": 3,
     "flags": [ "IRREMOVABLE" ]
   }
 ]
diff --git a/data/json/items/gunmod/grip.json b/data/json/items/gunmod/grip.json
@@ -21,7 +21,7 @@
     "id": "pistol_grip",
     "type": "GUNMOD",
     "name": "ergonomic grip",
-    "description": "A set of ergonomic replacement furniture for a firearm improving handling and accuracy.",
+    "description": "A set of ergonomic replacement furniture for a firearm improving handling.",
     "weight": 125,
     "volume": 1,
     "integral_volume": 0,
@@ -31,7 +31,6 @@
     "color": "dark_gray",
     "location": "grip",
     "mod_targets": [ "smg", "rifle", "pistol", "shotgun", "crossbow", "launcher" ],
-    "dispersion_modifier": -15,
     "handling_modifier": 2,
     "min_skills": [ [ "weapon", 2 ] ]
   }

diff --git a/data/json/items/gunmod/magazine.json b/data/json/items/gunmod/magazine.json
@@ -1,28 +1,4 @@
 [
-  {
-    "id": "beltfeed",
-    "type": "GUNMOD",
-    "name": "belt feed adapter",
-    "description": "A kit providing the necessary parts for permanently converting a firearm from magazine to belt-feed.  Guaranteed to void your warranty.",
-    "weight": 950,
-    "volume": 3,
-    "integral_volume": 1,
-    "price": 32000,
-    "material": "steel",
-    "symbol": ":",
-    "color": "green",
-    "location": "magazine",
-    "mod_targets": [ "rifle" ],
-    "acceptable_ammo": [ "223", "308", "50" ],
-    "install_time": 60000,
-    "magazine_adaptor": [
-      [ "223", [ "belt223" ] ],
-      [ "308", [ "belt308" ] ],
-      [ "50", [ "belt50" ] ]
-    ],
-    "min_skills": [ [ "weapon", 4 ], [ "mechanics", 3 ] ],
-    "flags": [ "INSTALL_DIFFICULT", "IRREMOVABLE" ]
-  },
   {
     "id": "lwfeed",
     "type": "GUNMOD",

diff --git a/data/json/items/gunmod/mechanism.json b/data/json/items/gunmod/mechanism.json
@@ -3,7 +3,7 @@
     "id": "match_trigger",
     "type": "GUNMOD",
     "name": "match trigger",
-    "description": "A precision weighted trigger assembly that improves a firearm's accuracy.",
+    "description": "A precision weighted trigger assembly that slightly improves a firearm's accuracy.",
     "weight": 120,
     "volume": 1,
     "integral_volume": 0,
@@ -14,29 +14,9 @@
     "location": "mechanism",
     "mod_targets": [ "smg", "rifle", "pistol", "shotgun", "launcher" ],
     "install_time": 30000,
-    "dispersion_modifier": -60,
+    "dispersion_modifier": -1,
     "min_skills": [ [ "weapon", 4 ], [ "mechanics", 3 ], [ "gun", 2 ] ]
   },
-  {
-    "id": "tuned_mechanism",
-    "type": "GUNMOD",
-    "name": "tuned mechanism",
-    "description": "A set of finely tuned internal components which increase the precision and reliably of a firearm.",
-    "weight": 120,
-    "volume": 1,
-    "integral_volume": 0,
-    "price": 2500,
-    "material": [ "steel", "superalloy" ],
-    "symbol": ":",
-    "color": "dark_gray",
-    "location": "mechanism",
-    "mod_targets": [ "smg", "rifle", "pistol", "shotgun", "launcher" ],
-    "install_time": 60000,
-    "dispersion_modifier": -15,
-    "loudness_modifier": -1,
-    "min_skills": [ [ "weapon", 4 ], [ "mechanics", 3 ], [ "gun", 2 ] ],
-    "flags": [ "NEVER_JAMS", "INSTALL_DIFFICULT", "IRREMOVABLE" ]
-  },
   {
     "id": "waterproof_gunmod",
     "type": "GUNMOD",

diff --git a/data/json/items/gunmod/rail.json b/data/json/items/gunmod/rail.json
@@ -52,7 +52,7 @@
     "id": "stabilizer",
     "type": "GUNMOD",
     "name": "gyroscopic stabilizer",
-    "description": "An advanced unit that straps onto the side of your firearm and reduces vibration, greatly reducing recoil and increasing accuracy.",
+    "description": "An advanced unit that straps onto the side of your firearm and reduces vibration, greatly reducing recoil and slightly increasing accuracy.",
     "weight": 286,
     "volume": 3,
     "integral_volume": 2,
@@ -62,7 +62,7 @@
     "color": "blue",
     "location": "rail",
     "mod_targets": [ "smg", "rifle", "crossbow" ],
-    "dispersion_modifier": -30,
+    "dispersion_modifier": -1,
     "handling_modifier": 6,
     "min_skills": [ [ "weapon", 6 ] ]
   },

diff --git a/data/json/items/gunmod/stock.json b/data/json/items/gunmod/stock.json
@@ -15,7 +15,7 @@
     "color": "dark_gray",
     "location": "stock",
     "mod_targets": [ "smg", "rifle", "shotgun", "crossbow", "launcher" ],
-    "dispersion_modifier": -30,
+    "dispersion_modifier": -1,
     "handling_modifier": 1
   },
   {
@@ -86,7 +86,7 @@
     "color": "dark_gray",
     "location": "stock",
     "mod_targets": [ "rifle" ],
-    "dispersion_modifier": -10,
+    "dispersion_modifier": -1,
     "handling_modifier": 2,
     "min_skills": [ [ "weapon", 2 ] ]
   }

diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json
@@ -18,6 +18,19 @@
     "dispersion_modifier": -90,
     "min_skills": [ [ "weapon", 4 ] ]
   },
+  {
+    "type": "recipe",
+    "result": "barrel_big",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_MODS",
+    "skill_used": "mechanics",
+    "skills_required": [ "gun", 1 ],
+    "difficulty": 6,
+    "time": 30000,
+    "autolearn": false,
+    "tools": [ [ [ "large_repairkit", 100 ], [ "small_repairkit", 300 ] ] ],
+    "components": [ [ [ "pipe", 2 ] ] ]
+  },
   {
     "id": "barrel_rifled",
     "type": "GUNMOD",
@@ -255,5 +268,58 @@
     "description": "You have a few solar panels installed.  While in direct sunlight, your power level will slowly recharge.",
     "price": 350000,
     "difficulty": 4
+  },
+  {
+    "id": "beltfeed",
+    "type": "GUNMOD",
+    "name": "belt feed adapter",
+    "description": "A kit providing the necessary parts for permanently converting a firearm from magazine to belt-feed.  Guaranteed to void your warranty.",
+    "weight": 950,
+    "volume": 3,
+    "integral_volume": 1,
+    "price": 32000,
+    "material": "steel",
+    "symbol": ":",
+    "color": "green",
+    "location": "magazine",
+    "mod_targets": [ "rifle" ],
+    "acceptable_ammo": [ "223", "308", "50" ],
+    "install_time": 60000,
+    "magazine_adaptor": [ [ "223", [ "belt223" ] ], [ "308", [ "belt308" ] ], [ "50", [ "belt50" ] ] ],
+    "min_skills": [ [ "weapon", 4 ], [ "mechanics", 3 ] ],
+    "flags": [ "INSTALL_DIFFICULT", "IRREMOVABLE" ]
+  },
+  {
+    "result": "beltfeed",
+    "type": "recipe",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_MODS",
+    "skill_used": "fabrication",
+    "difficulty": 5,
+    "skills_required": [ "rifle", 2 ],
+    "time": 200000,
+    "using": [ [ "welding_standard", 5 ], [ "steel_tiny", 2 ] ],
+    "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ],
+    "components": [ [ [ "pipe", 2 ] ], [ [ "spring", 4 ] ] ]
+  },
+  {
+    "id": "tuned_mechanism",
+    "type": "GUNMOD",
+    "name": "tuned mechanism",
+    "description": "A set of finely tuned internal components which increase the precision and reliably of a firearm.",
+    "weight": 120,
+    "volume": 1,
+    "integral_volume": 0,
+    "price": 2500,
+    "material": [ "steel", "superalloy" ],
+    "symbol": ":",
+    "color": "dark_gray",
+    "location": "mechanism",
+    "mod_targets": [ "smg", "rifle", "pistol", "shotgun", "launcher" ],
+    "install_time": 60000,
+    "dispersion_modifier": -15,
+    "loudness_modifier": -1,
+    "min_skills": [ [ "weapon", 4 ], [ "mechanics", 3 ], [ "gun", 2 ] ],
+    "flags": [ "NEVER_JAMS", "INSTALL_DIFFICULT", "IRREMOVABLE" ]
   }
 ]
diff --git a/data/json/npcs/items_generic.json b/data/json/npcs/items_generic.json
@@ -868,7 +868,6 @@
       [ "transponder", 2 ],
       [ "trappers_companion", 2 ],
       [ "triple_sec", 2 ],
-      [ "tuned_mechanism", 1 ],
       [ "two_way_radio", 10 ],
       [ "UPS_off", 3 ],
       [ "umbrella", 3 ],

diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json
@@ -1237,19 +1237,6 @@
     "tools": [ [ [ "large_repairkit", 250 ] ] ],
     "components": [ [ [ "scrap", 1 ] ], [ [ "pipe", 2 ] ] ]
   },
-  {
-    "type": "recipe",
-    "result": "barrel_big",
-    "category": "CC_WEAPON",
-    "subcategory": "CSC_WEAPON_MODS",
-    "skill_used": "mechanics",
-    "skills_required": [ "gun", 1 ],
-    "difficulty": 6,
-    "time": 30000,
-    "autolearn": true,
-    "tools": [ [ [ "large_repairkit", 100 ], [ "small_repairkit", 300 ] ] ],
-    "components": [ [ [ "pipe", 2 ] ] ]
-  },
   {
     "type": "recipe",
     "result": "brass_catcher",

diff --git a/data/json/recipes/weapon/mods.json b/data/json/recipes/weapon/mods.json
@@ -1,25 +1,4 @@
 [
-  {
-    "result": "beltfeed",
-    "type": "recipe",
-    "category": "CC_WEAPON",
-    "subcategory": "CSC_WEAPON_MODS",
-    "skill_used": "fabrication",
-    "difficulty": 5,
-    "skills_required": [ "rifle", 2 ],
-    "time": 200000,
-    "book_learn": [ [ "manual_rifle", 3 ], [ "manual_fabrication", 5 ], [ "textbook_fabrication", 5 ] ],
-    "using": [ [ "welding_standard", 5 ], [ "steel_tiny", 2 ] ],
-    "qualities": [
-      { "id": "HAMMER", "level": 2 },
-      { "id": "SAW_M", "level": 1 },
-      { "id": "WRENCH_FINE", "level": 1 }
-    ],
-    "components": [
-      [ [ "pipe", 2 ] ],
-      [ [ "spring", 4 ] ]
-    ]
-  },
   {
     "result": "improve_sights",
     "type": "recipe",