feat(balance): Phase out some redundant bionics, add bionic infolink

data/json/bionics.json

@@ -323,14 +323,6 @@
     "flags": [ "BIONIC_TOGGLED" ],
     "included_bionics": [ "bio_earplugs" ]
   },
-  {
-    "id": "bio_emp",
-    "type": "bionic",
-    "name": { "str": "Directional EMP" },
-    "description": "Surgically mounted in the palm of your hand are small parabolic EMP field generators.  You may use power to fire a wide, but short-ranged blast which will disable electronics and robots.",
-    "occupied_bodyparts": [ [ "arm_r", 1 ], [ "hand_r", 2 ] ],
-    "act_cost": "50 kJ"
-  },
   {
     "type": "bionic",
     "id": "bio_emp_armgun",
@@ -431,16 +423,17 @@
     "name": { "str": "Cranial Flashlight" },
     "description": "Surgically mounted between your eyes is a small but powerful LED flashlight.",
     "occupied_bodyparts": [ [ "eyes", 1 ] ],
-    "act_cost": "3 J",
-    "react_cost": "3 J",
+    "//": "Slightly more efficient than a standard flashlight.",
+    "act_cost": "8 J",
+    "react_cost": "8 J",
     "time": 1,
     "flags": [ "BIONIC_TOGGLED" ]
   },
   {
     "id": "bio_tattoo_led",
     "type": "bionic",
     "name": { "str": "LED Tattoo" },
-    "description": "A small LED display just beneath your dermal layer can be illuminated on command to show patterns of your choice at dim or bright luminosity.  It doesn't provide enough light to comfortably read or craft, but it can suffice if you have nothing else.",
+    "description": "A small LED display just beneath your dermal layer can be illuminated on command to show patterns of your choice at dim or bright luminosity.  It doesn't provide enough light, but it can suffice for reading or crafting if you have nothing else.",
     "act_cost": "1 J",
     "react_cost": "1 J",
     "time": 1,
@@ -535,6 +528,14 @@
     "react_cost": "10 kJ",
     "time": 1
   },
+  {
+    "id": "bio_infolink",
+    "type": "bionic",
+    "name": { "str": "Bionic Infolink" },
+    "description": "A state of the art communications and information package has been installed in your body.  While the cell phone network may be down, it can still double as a two-way radio.  Additionally tells you the time and local air temperature, provides a silent alarm clock function, and if activated will give a more detailed readout on local weather conditions.",
+    "occupied_bodyparts": [ [ "torso", 1 ], [ "head", 1 ] ],
+    "act_cost": "10 J"
+  },
   {
     "id": "bio_infrared",
     "type": "bionic",
@@ -649,14 +650,6 @@
     "time": 1,
     "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
   },
-  {
-    "id": "bio_meteorologist",
-    "type": "bionic",
-    "name": { "str": "Weather Reader" },
-    "description": "A multitude of scientific instruments and sensors collect environmental data.  The data is compiled and presented as a simple readout of the current weather.  It also passively tells you the local air temperature.",
-    "occupied_bodyparts": [ [ "torso", 1 ], [ "head", 1 ] ],
-    "act_cost": "10 J"
-  },
   {
     "id": "bio_nanobots",
     "type": "bionic",
@@ -1113,13 +1106,6 @@
     "occupied_bodyparts": [ [ "torso", 2 ], [ "mouth", 1 ] ],
     "flags": [ "BIONIC_FAULTY" ]
   },
-  {
-    "id": "bio_watch",
-    "type": "bionic",
-    "name": { "str": "Internal Chronometer" },
-    "description": "You have been equipped with an internal atomic clock, ensuring that you will always know the current time.  Additionally, it includes a silent alarm clock function.",
-    "occupied_bodyparts": [ [ "head", 1 ] ]
-  },
   {
     "id": "bio_water_extractor",
     "type": "bionic",

data/json/itemgroups/Locations_MapExtras/locations.json

@@ -1186,7 +1186,7 @@
       [ "grapnel", 1 ],
       [ "toolbox", 5 ],
       [ "apron_leather", 10 ],
-      [ "bio_meteorologist", 10 ],
+      [ "bio_infolink", 10 ],
       [ "chem_aluminium_sulphate", 20 ]
     ]
   },
@@ -1639,7 +1639,7 @@
       [ "misc_repairkit", 5 ],
       [ "toolbox", 2 ],
       [ "apron_leather", 10 ],
-      [ "bio_meteorologist", 3 ],
+      [ "bio_infolink", 3 ],
       [ "thermometer", 3 ],
       [ "hygrometer", 3 ],
       [ "barometer", 3 ],

data/json/itemgroups/bionics.json

@@ -70,14 +70,13 @@
       [ "bio_teleport", 10 ],
       [ "bio_probability_travel", 10 ],
       [ "bio_laser", 10 ],
-      [ "bio_emp", 10 ],
       [ "bio_emp_armgun", 10 ],
       [ "bio_railgun", 10 ],
       [ "bio_flashbang", 10 ],
       [ "bio_chain_lightning", 10 ],
       [ "bio_power_armor_interface", 10 ],
       [ "bio_adrenaline", 10 ],
-      [ "bio_watch", 10 ],
+      [ "bio_infolink", 10 ],
       [ "bio_leukocyte", 10 ],
       [ "bio_speed", 5 ],
       [ "bio_faraday", 10 ],
@@ -106,15 +105,15 @@
     "items": [
       [ "bio_tools", 10 ],
       [ "bio_flashlight", 10 ],
-      [ "bio_fuel_cell_gasoline", 10 ],
       [ "bio_tattoo_led", 10 ],
+      [ "bio_fuel_cell_gasoline", 10 ],
       [ "bio_lighter", 10 ],
       [ "bio_magnet", 10 ],
       [ "bio_alarm", 10 ],
       [ "bio_batteries", 10 ],
       [ "bio_metabolics", 10 ],
       [ "bio_ethanol", 10 ],
-      [ "bio_watch", 10 ],
+      [ "bio_infolink", 10 ],
       [ "bio_torsionratchet", 10 ],
       [ "bio_cable", 10 ],
       [ "bn_bio_solar", 10 ],
@@ -193,7 +192,6 @@
       [ "bio_ods", 10 ],
       [ "bio_uncanny_dodge", 10 ],
       [ "bio_laser", 10 ],
-      [ "bio_emp", 10 ],
       [ "bio_emp_armgun", 10 ],
       [ "bio_railgun", 10 ],
       [ "bio_flashbang", 10 ],
@@ -206,9 +204,8 @@
       [ "bio_blade", 2 ],
       [ "bio_speed", 2 ],
       [ "bio_adrenaline", 10 ],
-      [ "bio_watch", 10 ],
+      [ "bio_infolink", 20 ],
       [ "bio_power_armor_interface_mkII", 5 ],
-      [ "bio_meteorologist", 10 ],
       [ "bio_cable", 10 ],
       [ "bio_weight", 10 ],
       [ "bio_jointservo", 10 ],
@@ -286,7 +283,6 @@
       [ "bio_ods", 10 ],
       [ "bio_uncanny_dodge", 10 ],
       [ "bio_laser", 15 ],
-      [ "bio_emp", 10 ],
       [ "bio_emp_armgun", 10 ],
       [ "bio_railgun", 10 ],
       [ "bio_flashbang", 15 ],
@@ -299,9 +295,8 @@
       [ "bio_blade", 5 ],
       [ "bio_speed", 5 ],
       [ "bio_adrenaline", 15 ],
-      [ "bio_watch", 10 ],
+      [ "bio_infolink", 20 ],
       [ "bio_power_armor_interface_mkII", 5 ],
-      [ "bio_meteorologist", 10 ],
       [ "bio_cable", 10 ],
       [ "bio_jointservo", 20 ],
       [ "bio_shotgun", 10 ],
@@ -320,7 +315,6 @@
       [ "bio_chain_lightning", 10 ],
       [ "bio_claws", 10 ],
       [ "bio_cqb", 10 ],
-      [ "bio_emp", 10 ],
       [ "bio_emp_armgun", 10 ],
       [ "bio_flashbang", 10 ],
       [ "bio_heat_absorb", 10 ],
@@ -386,7 +380,7 @@
       [ "bio_memory", 20 ],
       [ "bio_sunglasses", 20 ],
       [ "bio_heatsink", 20 ],
-      [ "bio_watch", 20 ],
+      [ "bio_infolink", 20 ],
       [ "bio_faraday", 20 ],
       [ "bio_weight", 20 ],
       [ "bio_shock_absorber", 20 ],
@@ -429,7 +423,7 @@
       [ "bio_blood_anal", 10 ],
       [ "bio_geiger", 15 ],
       [ "bio_radscrubber", 10 ],
-      [ "bio_watch", 40 ],
+      [ "bio_infolink", 40 ],
       [ "bio_leukocyte", 15 ],
       [ "bio_syringe", 2 ],
       [ "bio_jointservo", 10 ],
@@ -450,7 +444,7 @@
       [ "bio_str_enhancer", 12 ],
       [ "bio_infrared", 25 ],
       [ "bio_targeting", 20 ],
-      [ "bio_emp", 20 ],
+      [ "bio_emp_armgun", 20 ],
       [ "bio_chain_lightning", 15 ],
       [ "bio_adrenaline", 20 ],
       [ "bio_ods", 10 ],
@@ -472,7 +466,7 @@
       [ "bio_evap", 10 ],
       [ "bio_flashlight", 10 ],
       [ "bio_geiger", 10 ],
-      [ "bio_meteorologist", 10 ],
+      [ "bio_infolink", 10 ],
       [ "bio_purifier", 10 ]
     ]
   },

data/json/itemgroups/electronics.json

@@ -124,7 +124,7 @@
       { "item": "AID_bio_power_armor_interface" },
       { "item": "AID_bio_power_storage" },
       { "item": "AID_bio_power_storage_mkII" },
-      { "item": "AID_bio_watch" },
+      { "item": "AID_bio_infolink" },
       { "item": "AID_bio_syringe" },
       { "item": "AID_bio_blood_anal" },
       { "item": "AID_bio_flashlight" },
@@ -137,7 +137,6 @@
       { "item": "AID_bio_climate" },
       { "item": "AID_bio_geiger" },
       { "item": "AID_bio_heatsink" },
-      { "item": "AID_bio_meteorologist" },
       { "item": "AID_bio_railgun" },
       { "item": "AID_bio_ups" },
       { "item": "AID_bio_weight" }

data/json/itemgroups/science_and_tech.json

@@ -95,7 +95,7 @@
       [ "bio_climate", 10 ],
       [ "bio_heatsink", 10 ],
       [ "bio_blood_filter", 10 ],
-      [ "bio_watch", 10 ],
+      [ "bio_infolink", 20 ],
       [ "bio_leukocyte", 10 ],
       [ "bio_faraday", 10 ],
       [ "bio_remote", 10 ],
@@ -120,7 +120,6 @@
       [ "diazepam", 1 ],
       [ "magnifying_glass", 1 ],
       [ "material_quicklime", 10 ],
-      [ "bio_meteorologist", 10 ],
       [ "tin", 5 ],
       [ "chem_nitric_acid", 1 ],
       [ "chem_sulphuric_acid", 1 ],

data/json/items/bionics.json

@@ -286,16 +286,6 @@
     "weight": "500 g",
     "difficulty": 6
   },
-  {
-    "id": "bio_emp",
-    "copy-from": "bionic_general",
-    "type": "BIONIC_ITEM",
-    "name": { "str": "Directional EMP CBM" },
-    "looks_like": "bio_int_enhancer",
-    "description": "Small parabolic EMP field generators that are mounted in the palm of the user's right hand.  These can be used to instantly fire a wide, but short-ranged blast which will disable electronics and robots.",
-    "price": "7200 USD",
-    "difficulty": 5
-  },
   {
     "id": "bio_emp_armgun",
     "copy-from": "bionic_general",
@@ -482,6 +472,18 @@
     "price": "4 kUSD",
     "difficulty": 6
   },
+  {
+    "id": "bio_infolink",
+    "copy-from": "bionic_general_npc_usable",
+    "type": "BIONIC_ITEM",
+    "name": { "str": "Infolink CBM" },
+    "looks_like": "bio_int_enhancer",
+    "description": "Before the Cataclysm this was a state-of-the-art communications package.  Even without cell service, it can still double as a two-way radio if installed.  Also comes with an internal chronometer with silent alarm clock feature, an air temperature sensor, and more detailed weather readouts when activated.",
+    "price": "3500 USD",
+    "weight": "700 g",
+    "difficulty": 3,
+    "installation_data": "AID_bio_infolink"
+  },
   {
     "id": "bio_infrared",
     "copy-from": "bionic_general",
@@ -592,18 +594,6 @@
     "weight": "700 g",
     "difficulty": 4
   },
-  {
-    "id": "bio_meteorologist",
-    "copy-from": "bionic_general",
-    "type": "BIONIC_ITEM",
-    "name": { "str": "Weather Reader CBM" },
-    "looks_like": "bio_int_enhancer",
-    "description": "A multitude of scientific instruments and sensors collect environmental data.  The data is compiled and presented as a simple readout of the current weather.  It also passively tells the user their external temperature.",
-    "price": "3500 USD",
-    "weight": "700 g",
-    "difficulty": 3,
-    "installation_data": "AID_bio_meteorologist"
-  },
   {
     "id": "bio_nanobots",
     "copy-from": "bionic_general_npc_usable",
@@ -1004,18 +994,6 @@
     "difficulty": 3,
     "installation_data": "AID_bio_ups"
   },
-  {
-    "id": "bio_watch",
-    "copy-from": "bionic_general",
-    "type": "BIONIC_ITEM",
-    "name": { "str": "Internal Chronometer CBM" },
-    "looks_like": "bio_int_enhancer",
-    "description": "This bionic module contains an atomic clock, complete with silent alarm clock function.",
-    "price": "10 USD",
-    "weight": "10 g",
-    "difficulty": 1,
-    "installation_data": "AID_bio_watch"
-  },
   {
     "id": "bio_water_extractor",
     "copy-from": "bionic_general",

data/json/items/software.json

@@ -47,11 +47,11 @@
     "description": "Precise step-by-step instructions and other required data for installation of Power Storage CBM Mk. II, stored on a data card of proprietary form-factor, designed to be used extensively by an Autodoc, and allowing bionic installation with minimal failure chance.  Integrated security subroutine renders it unusable after installation."
   },
   {
-    "id": "AID_bio_watch",
+    "id": "AID_bio_infolink",
     "type": "GENERIC",
     "copy-from": "AID_abstract",
-    "name": { "str_sp": "Internal Chronometer CBM installation data" },
-    "description": "Precise step-by-step instructions and other required data for installation of Internal Chronometer CBM, stored on a data card of proprietary form-factor, designed to be used extensively by an Autodoc, and allowing bionic installation with minimal failure chance.  Integrated security subroutine renders it unusable after installation."
+    "name": { "str_sp": "Infolink CBM installation data" },
+    "description": "Precise step-by-step instructions and other required data for installation of Infolink CBM, stored on a data card of proprietary form-factor, designed to be used extensively by an Autodoc, and allowing bionic installation with minimal failure chance.  Integrated security subroutine renders it unusable after installation."
   },
   {
     "id": "AID_bio_syringe",
@@ -137,13 +137,6 @@
     "name": { "str_sp": "Thermal Dissipation CBM installation data" },
     "description": "Precise step-by-step instructions and other required data for installation of Thermal Dissipation CBM, stored on a data card of proprietary form-factor, designed to be used extensively by an Autodoc, and allowing bionic installation with minimal failure chance.  Integrated security subroutine renders it unusable after installation."
   },
-  {
-    "id": "AID_bio_meteorologist",
-    "type": "GENERIC",
-    "copy-from": "AID_abstract",
-    "name": { "str_sp": "Weather Reader CBM installation data" },
-    "description": "Precise step-by-step instructions and other required data for installation of Weather Reader CBM, stored on a data card of proprietary form-factor, designed to be used extensively by an Autodoc, and allowing bionic installation with minimal failure chance.  Integrated security subroutine renders it unusable after installation."
-  },
   {
     "id": "AID_bio_railgun",
     "type": "GENERIC",

data/json/obsoletion/bionics.json

@@ -0,0 +1,22 @@
+[
+  {
+    "id": "bio_emp",
+    "type": "bionic",
+    "name": { "str": "Directional EMP" },
+    "description": "Surgically mounted in the palm of your hand are small parabolic EMP field generators.  You may use power to fire a wide, but short-ranged blast which will disable electronics and robots.",
+    "occupied_bodyparts": [ [ "arm_r", 1 ], [ "hand_r", 2 ] ],
+    "act_cost": "50 kJ"
+  },
+  {
+    "id": "bio_watch",
+    "type": "bionic",
+    "name": { "str": "Obsolete Bionic" },
+    "description": "The effects of this bionic in the code have been replaced with Bionic Infolink.  It can be uninstalled at minimum difficulty."
+  },
+  {
+    "id": "bio_meteorologist",
+    "type": "bionic",
+    "name": { "str": "Obsolete Bionic" },
+    "description": "The effects of this bionic in the code have been replaced with Bionic Infolink.  It can be uninstalled at minimum difficulty."
+  }
+]