Merge pull request #17 from CleverRaven/master

Update

data/json/effects.json

@@ -689,8 +689,8 @@
         "max_duration": 57600,
         "base_mods": {
             "healing_rate": [2],
-            "healing_head_mult": [50],
-            "healing_torso_mult": [150]
+            "healing_head": [50],
+            "healing_torso": [150]
         },
         "scaling_mods": {
             "healing_rate": [2]

data/json/flags.json

@@ -48,7 +48,7 @@
     "id": "CBM",
     "type": "json_flag",
     "context": [ "BIONIC_ITEM" ],
-    "info": "This item is a Compact Bionic Module.  You can <info>use an autodoc</info> to safely install it into your body, or you may attempt to perform a <info>self-installation</info> with a higher risk of damaging yourself."
+    "info": "This item is a Compact Bionic Module.  You can <info>use an autodoc</info> or <info>ask a surgeon</info> to install it into your body."
   },
   {
     "id": "COLLAR",

data/json/items/bionics.json

@@ -10,7 +10,6 @@
     "material": [ "steel", "plastic" ],
     "symbol": ":",
     "color": "yellow",
-    "use_action": "install_bionic",
     "flags": [ "CBM" ]
   },
   {

data/json/items/gun/223.json

@@ -107,7 +107,7 @@
     "name": "L2037 Backup",
     "name_plural": "L2037 Backups",
     "//": "Most real-life autorevolvers use 6-7.5 inch barrel, but this one's mentioned to be particularly massive.",
-    "description": "Developed by Leadworks as a companion sidearm to the L523 modular system, this massive autorevolver fires the powerful .223 round, but suffers high recoil as a result.  It has a weighted barrel to make recoil more manageable and a 5-chamber cylinder.",
+    "description": "Developed by Leadworks as a companion sidearm to the L523 modular system, this massive autorevolver fires the powerful .223 round, but suffers high recoil as a result.  It has a weighted barrel to make recoil more manageable and a 5-chamber cylinder. Holographics and laser sights built in for additonal accuracy. Similar to other Leadworks products it doesn't accept third-party modifications.",
     "weight": 2370,
     "volume": 3,
     "price": 267000,
@@ -122,7 +122,8 @@
     "dispersion": 380,
     "durability": 8,
     "clip_size": 5,
-    "valid_mod_locations": [ [ "accessories", 2 ], [ "barrel", 1 ], [ "bore", 1 ], [ "grip", 1 ], [ "sights", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ]
+    "built_in_mods": [ "lead_holo_sight", "lead_laser_sight"],
+    "valid_mod_locations": [ [ "accessories", 2 ], [ "sights", 1 ], [ "underbarrel", 1 ] ]
   },
   {
     "id": "l_base_223",
@@ -139,31 +140,33 @@
     "color": "dark_gray",
     "ammo": "223",
     "ranged_damage": "-1",
-    "dispersion": 90,
+    "dispersion": 140,
     "durability": 3,
     "modes": [
       [ "DEFAULT", "semi-auto", 1 ],
       [ "AUTO", "auto", 3 ]
     ],
     "valid_mod_locations": [ [ "accessories", 2 ] ],
-    "magazines": [ [ "223", [ "lw223mag", "lw223bigmag" ] ] ]
+    "magazines": [ [ "223", [ "lw223mag", "lw223bigmag" ] ] ],
+    "flags": [ "DISABLE_SIGHTS" ]
   },
   {
     "id": "l_car_223",
     "copy-from": "l_base_223",
     "type": "GUN",
     "name": "L523-CAR carbine",
-    "description": "Leadworks LLC's bullpup L523 platform utilizes the ubiquitous 5.56 round in multiple applications, and is designed to part-swap quickly, safely, and effectively from one to the next.  The carbine model incorporates Leadworks' proprietary gyro-stabilization technology and includes an integral laser sight, but like the rest of the family, doesn't accept third-party modifications.",
+    "description": "Leadworks LLC's bullpup L523 platform utilizes the ubiquitous 5.56 round in multiple applications, and is designed to part-swap quickly, safely, and effectively from one to the next.  The carbine model incorporates Leadworks' proprietary gyro-stabilization technology and includes a read-dot sight and an integral laser sight.  Additionally it comes with underslung shotgun for close range encounters.  Like the rest of the family, doesn't accept third-party modifications.",
     "price": 520000,
     "durability": 9,
     "modes": [
       [ "DEFAULT", "semi-auto", 1 ],
       [ "AUTO", "auto", 5 ]
     ],
     "relative": {
-      "weight": 400,
-      "range": -6
-    }
+      "weight": 400
+    },
+    "built_in_mods": [ "lead_red_dot_sight", "lead_barrel_small", "lead_laser_sight", "lead_u_shotgun", "lead_stabilizer" ],
+    "valid_mod_locations": [ [ "accessories", 2 ], [ "sights", 1 ], [ "barrel", 1 ], [ "underbarrel", 2 ], [ "rail", 1 ] ]
   },
   {
     "id": "l_dsr_223",
@@ -172,53 +175,55 @@
     "name": "L523-DSR rifle",
     "description": "Leadworks LLC's bullpup L523 platform utilizes the ubiquitous 5.56 round in multiple applications, and is designed to part-swap quickly, safely, and effectively from one to the next.  The designated-shootist rifle incorporates a specially-designed extended barrel with integral bipod and foregrip, along with an integral 8x optic, and trades selective-fire for the Leadworks gyro-stabilization system.  Like the rest of the family, though, it doesn't accept third-party modifications.",
     "price": 580000,
-    "sight_dispersion": 0,
     "durability": 9,
     "barrel_length": 3,
     "modes": [
       [ "DEFAULT", "semi-auto", 1 ]
     ],
-    "delete": { "modes": [ [ "AUTO", "auto", 3 ] ] },
     "relative": {
       "//": "Volume, range, and bullpup all point to a very large barrel on this one.",
       "weight": 1200,
-      "volume": 4,
-      "range": 3,
-      "ranged_damage": 3
-    }
+      "volume": 4
+    },
+    "delete": { "modes": [ [ "AUTO", "auto", 3 ] ] },
+    "built_in_mods": [ "lead_rifle_scope", "lead_barrel_big", "lead_bipod", "lead_grip",  "lead_stabilizer" ],
+    "valid_mod_locations": [ [ "accessories", 2 ], [ "sights", 1 ], [ "barrel", 1 ] , [ "underbarrel", 2 ], [ "rail", 1 ] ]
   },
   {
     "id": "l_lmg_223",
     "copy-from": "l_base_223",
     "type": "GUN",
     "name": "L523-LMG",
-    "description": "Leadworks LLC's bullpup L523 platform utilizes the ubiquitous 5.56 round in multiple applications, and is designed to part-swap quickly, safely, and effectively from one to the next.  The rather ambitious light machine gun variant incorporates a heavy-duty barrel & foregrip as well as the Leadworks gyro system.  Unlike the other configurations, the L523 LMG can be loaded with ammo belts.",
+    "description": "Leadworks LLC's bullpup L523 platform utilizes the ubiquitous 5.56 round in multiple applications, and is designed to part-swap quickly, safely, and effectively from one to the next.  The rather ambitious light machine gun variant incorporates ACOG scope, a heavy-duty barrel, foregrip, bipod and as well as the Leadworks gyro system.  Unlike the other configurations, the L523 LMG can be loaded with ammo belts.",
     "price": 620000,
     "durability": 9,
     "modes": [
       [ "DEFAULT", "low auto", 3 ],
       [ "AUTO", "high auto", 14 ]
     ],
-    "magazines": [ [ "223", [ "lw223mag", "lw223bigmag", "belt223" ] ] ],
     "relative": {
       "weight": 2000,
       "volume": 7,
-      "ranged_damage": 2,
-      "dispersion": 60
-    }
+      "dispersion": 50
+    },
+    "magazines": [ [ "223", [ "lw223mag", "lw223bigmag", "belt223" ] ] ],
+    "built_in_mods": [ "lead_acog_scope", "lead_barrel_heavy_duty", "lead_bipod", "lead_grip", "lead_stabilizer" ],
+    "valid_mod_locations": [ [ "accessories", 2 ], [ "sights", 1 ], [ "barrel", 1 ] , [ "underbarrel", 2 ], [ "rail", 1 ] ]
   },
   {
     "id": "l_mbr_223",
     "copy-from": "l_base_223",
     "type": "GUN",
     "name": "L523-MBR rifle",
-    "description": "Leadworks LLC's bullpup L523 platform utilizes the ubiquitous 5.56 round in multiple applications, and is designed to part-swap quickly, safely, and effectively from one to the next.  The battle rifle's (proprietary) combination optic & red-dot sights provide quick and accurate targeting, with a foregrip available for greater control.  Like the rest of the family, though, it doesn't accept third-party modifications.",
+    "description": "Leadworks LLC's bullpup L523 platform utilizes the ubiquitous 5.56 round in multiple applications, and is designed to part-swap quickly, safely, and effectively from one to the next.  The battle rifle's (proprietary) combination optic & red-dot sights provide quick and accurate targeting, with Leadworks gyro-stabilization system system and foregrip available for greater control.  Additionally it comes with grenade launcher module for dealing with hard targets.  Like the rest of the family, though, it doesn't accept third-party modifications.",
     "price": 520000,
     "durability": 9,
     "relative": {
       "weight": 1200,
       "volume": 2
-    }
+    },
+    "built_in_mods": [ "lead_acog_scope", "lead_red_dot_sight", "lead_grip", "lead_glm", "lead_stabilizer" ],
+    "valid_mod_locations": [ [ "accessories", 2 ], [ "sights", 2 ], [ "underbarrel", 2 ], [ "rail", 1 ] ]
   },
   {
     "id": "m249",

data/json/items/gun/45.json

@@ -58,7 +58,7 @@
     "name": "L2031 Enforcer",
     "name_plural": "L2031 Enforcer",
     "//": "Real-life Autorevolvers tended to vary between 6-7.5 inch barrels, so we'll err on the side of a +1 here.",
-    "description": "An \"autorevolver\", this Leadworks LLC six-shooter combines the ease-of-action of a semi-auto with the ease-of-reloading and style of a revolver.  It achieved overnight stardom when it appeared in \"Treasure Trail\", a popular space-Western series running from 2030 through 2037.",
+    "description": "An \"autorevolver\", this Leadworks LLC six-shooter combines the ease-of-action of a semi-auto with the ease-of-reloading and style of a revolver.  It achieved overnight stardom when it appeared in \"Treasure Trail\", a popular space-Western series.  Comes with built in holographic and laser sights.  Similar to other Leadworks products it doesn't accept third-party modifications.",
     "weight": 1370,
     "volume": 2,
     "price": 83000,
@@ -71,7 +71,9 @@
     "ranged_damage": 1,
     "dispersion": 360,
     "durability": 8,
-    "clip_size": 6
+    "clip_size": 6,
+    "built_in_mods": [ "lead_holo_sight", "lead_laser_sight"],
+    "valid_mod_locations": [ [ "accessories", 2 ], [ "sights", 1 ], [ "underbarrel", 1 ] ]
   },
   {
     "id": "l_long_45",
@@ -80,7 +82,7 @@
     "name": "L1820 Long Ranger",
     "name_plural": "L1820 Long Ranger",
     "//": "If it's based off the Winchester 94, it's likely got a 20 inch barrel. For sanity's sake though, let's cap it at +4.",
-    "description": "Numbered to bridge the gap between the USian Frontier and modern Civil Defense needs, the Long Ranger was designed to give Enforcer users (or anyone using .45 caliber cartridges) a little extra reach while using the same ammunition.  Synthetic furniture cost it some charm points from the legendary Winchester rifles it was based upon, but users agree that the forty-five's punch with the reach of a rifle is worth it.",
+    "description": "Numbered to bridge the gap between the USian Frontier and modern Civil Defense needs, the Leadworks Long Ranger was designed to give Enforcer users (or anyone using .45 caliber cartridges) a little extra reach while using the same ammunition.  Synthetic furniture cost it some charm points from the legendary Winchester rifles it was based upon, but users agree that the forty-five's punch with the reach of a rifle is worth it.  Comes with built in holographic and laser sights.  Similar to other Leadworks products it doesn't accept third-party modifications.",
     "weight": 4175,
     "volume": 13,
     "price": 90000,
@@ -97,23 +99,24 @@
     "durability": 9,
     "clip_size": 7,
     "barrel_length": 2,
-    "valid_mod_locations": [ [ "accessories", 4 ], [ "barrel", 1 ], [ "bore", 1 ], [ "grip", 1 ], [ "mechanism", 4 ], [ "muzzle", 1 ], [ "rail", 1 ], [ "sights", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ],
+    "built_in_mods": [ "lead_holo_sight", "lead_laser_sight"],
+    "valid_mod_locations": [ [ "accessories", 2 ], [ "sights", 1 ], [ "underbarrel", 1 ] ],
     "flags": [ "RELOAD_ONE" ]
   },
   {
     "id": "l_mp_45",
     "copy-from": "l_mp_9mm",
     "type": "GUN",
     "name": "L39B-45",
-    "description": "After the success of the 9x19mm model, Leadworks LLC released an L39B chambered in .45.  It soon earned a reputation as one of the most intimidating guns on the market, for firer and target alike.  Similar to other Leadworks products it doesn't accept third-party modifications.",
+    "description": "After the success of the 9x19mm model, Leadworks LLC released an L39B chambered in .45.  It soon earned a reputation as one of the most intimidating guns on the market, for firer and target alike.  Come with built in red dot and laser sights.  Similar to other Leadworks products it doesn't accept third-party modifications.",
     "ammo": "45"
   },
   {
     "id": "l_sp_45",
     "copy-from": "l_sp_9mm",
     "type": "GUN",
     "name": "L39-45",
-    "description": "Capitalizing on the L39B-45's reputation as one of the most intimidating pistols on the market, Leadworks LLC manufactured a semiautomatic model as well.  Locking it semi-auto reduced cost and improved performance.  Similar to other Leadworks products it doesn't accept third-party modifications.",
+    "description": "Capitalizing on the L39B-45's reputation as one of the most intimidating pistols on the market, Leadworks LLC manufactured a semiautomatic model as well.  Locking it semi-auto reduced cost and improved performance.  Comes with built in red dot and laser sights.  Similar to other Leadworks products it doesn't accept third-party modifications.",
     "ammo": "45"
   },
   {

data/json/items/gun/9mm.json

@@ -197,7 +197,7 @@
     "type": "GUN",
     "name": "L2032 Lookout",
     "name_plural": "L2032 Lookout",
-    "description": "After the Enforcer's success, Leadworks LLC reworked their autorevolver design to cater to the 9x19mm market.  The Lookout, released in 2032, takes advantage of the smaller 9x19mm to hold a seventh round, without sacrificing the ease of handling or reloading the Enforcer made legendary.",
+    "description": "After the Enforcer's success, Leadworks LLC reworked their autorevolver design to cater to the 9x19mm market.  The Lookout takes advantage of the smaller 9x19mm to hold a seventh round, without sacrificing the ease of handling or reloading the Enforcer made legendary.  Comes with built in holographic and laser sights.  Similar to other Leadworks products it doesn't accept third-party modifications.",
     "ammo": "9mm",
     "clip_size": 7
   },
@@ -207,7 +207,7 @@
     "type": "GUN",
     "name": "L39B",
     "//": "The M93R can go through up to 110 rounds in six seconds, FWIW.",
-    "description": "A selective-firing 9x19mm handgun introduced in 2039, Leadworks LLC's L39B provides accurate single-shot placement as well as controllable short-range firepower with its three-round burst mode.  Users praised its accuracy and fearsome appearance.  Similar to other Leadworks products it doesn't accept third-party modifications.",
+    "description": "A selective-firing 9x19mm handgun introduced by Leadworks LLC's, L39B provides accurate single-shot placement as well as controllable short-range firepower with its three-round burst mode.  Users praised its accuracy and fearsome appearance.  Comes with built in red dot and laser sights.  Similar to other Leadworks products it doesn't accept third-party modifications.",
     "price": 95000,
     "burst": 3,
     "relative": {
@@ -221,7 +221,7 @@
     "type": "GUN",
     "name": "L39",
     "//": "L39s are based off the Robocop Auto-9, in turn a dolled-up Beretta 93R.",
-    "description": "A semiautomatic 9x19mm handgun introduced in 2039, Leadworks LLC's L39 provides accurate single-shot placement in a very robust frame.  Several urban legends describe using it in ways that would have destroyed a lesser weapon.  Similar to other Leadworks products it doesn't accept third-party modifications.",
+    "description": "A semiautomatic 9x19mm handgun introduced by Leadworks LLC's, L39 provides accurate single-shot placement in a very robust frame with built in red dot and laser sights. Several urban legends describe using it in ways that would have destroyed a lesser weapon. Similar to other Leadworks products it doesn't accept third-party modifications.",
     "weight": 935,
     "volume": 2,
     "price": 70000,
@@ -234,7 +234,8 @@
     "range": 1,
     "dispersion": 340,
     "durability": 9,
-    "valid_mod_locations": [ [ "accessories", 2 ] ],
+    "built_in_mods": [ "lead_red_dot_sight", "lead_laser_sight"],
+    "valid_mod_locations": [ [ "accessories", 2 ],  [ "sights", 1 ], [ "underbarrel", 1 ] ],
     "magazine_well": 1,
     "magazines": [
       [ "9mm", [ "lw21mag" ] ],

data/json/items/gun/shot.json

@@ -71,7 +71,7 @@
     "name": "L12 Defender",
     "name_plural": "L12 Defender",
     "//": "Similar stats to the NeoStead 2000 which has a similar operating mechanism",
-    "description": "Leadworks LLC's sole shotgun offering to date is surprisingly compact thanks to its moving barrel and forward-back pump mechanism.  Like most other Leadworks products it doesn't accept third-party modifications.",
+    "description": "Leadworks LLC's sole shotgun offering to date is surprisingly compact thanks to its moving barrel and forward-back pump mechanism. Additionaly it has built in red dot and laser sights. Like most other Leadworks products it doesn't accept third-party modifications.",
     "weight": 3850,
     "volume": 6,
     "price": 92000,
@@ -81,7 +81,8 @@
     "dispersion": 375,
     "durability": 8,
     "clip_size": 8,
-    "valid_mod_locations": [ [ "accessories", 2 ] ]
+    "built_in_mods": [ "lead_red_dot_sight", "lead_laser_sight"],
+    "valid_mod_locations": [ [ "accessories", 2 ],  [ "sights", 1 ], [ "underbarrel", 1 ] ]
   },
   {
     "id": "m1014",

data/json/items/gunmod/barrel.json

@@ -72,5 +72,45 @@
     "dispersion_modifier": 500,
     "ups_charges": 50,
     "min_skills": [ [ "gun", 1 ] ]
+  },
+  {
+    "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,
+    "damage_modifier": 3,
+    "dispersion_modifier": -45,
+    "range_modifier": 3,
+    "flags": [ "IRREMOVABLE" ]
+  },
+  {
+    "id": "lead_barrel_small",
+    "copy-from": "barrel_small",
+    "type": "GUNMOD",
+    "name": "LW shortened barrel",
+    "description": "A Leadworks built in shortened barrel results in reduced weapon range, and a minor increase in noise, but also greatly improves the ease with which the weapon can be carried and wielded.",
+    "price": 0,
+    "volume": 0,
+    "dispersion_modifier": 0,
+    "range_modifier": -6,
+    "flags": [ "IRREMOVABLE" ]
+  },
+  {
+    "id": "lead_barrel_heavy_duty",
+    "copy-from": "barrel_big",
+    "type": "GUNMOD",
+    "name": "LW heavy duty barrel",
+    "description": "A Leadworks built in heavy duty barrel especially designed for prolonged shooting.  Reduce 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" ]
   }
 ]

data/json/items/gunmod/rail.json

@@ -44,7 +44,7 @@
     "color": "dark_gray",
     "location": "rail",
     "mod_targets": [ "smg", "rifle", "pistol", "shotgun", "crossbow", "launcher" ],
-    "sight_dispersion": 360,
+    "sight_dispersion": 30,
     "aim_speed": 8,
     "min_skills": [ [ "weapon", 2 ], [ "gun", 1 ] ]
   },
@@ -65,5 +65,16 @@
     "dispersion_modifier": -30,
     "handling_modifier": 6,
     "min_skills": [ [ "weapon", 6 ] ]
+  },
+  {
+    "id": "lead_stabilizer",
+    "copy-from": "stabilizer",
+    "type": "GUNMOD",
+    "name": "LW gyroscopic stabilizer",
+    "description": "An advanced Leadworks built in gyroscopic stabilizer.",
+    "weight": 0,
+    "volume": 0,
+    "price": 0,
+    "flags": [ "IRREMOVABLE" ]
   }
 ]