new bionics menu

data/json/bionics.json

@@ -5,7 +5,8 @@
     "name": "Adrenaline Pump",
     "description": "A stimulator system has been surgically implanted alongside your adrenal glands, allowing you to trigger your body's adrenaline response at the cost of some bionic power.",
     "occupied_bodyparts": [ [ "TORSO", 6 ] ],
-    "act_cost": 50
+    "act_cost": 50,
+    "display_type": "display_internal"
   },
   {
     "id": "bio_ads",
@@ -114,23 +115,26 @@
     "name": "Optical Dampers",
     "description": "The lenses surgically installed over your eyes can be tinted to block out incoming light.",
     "included": true,
-    "flags": [ "BIONIC_TOGGLED" ]
+    "flags": [ "BIONIC_TOGGLED" ],
+    "display_type": "display_sensory"
   },
   {
     "id": "bio_blood_anal",
     "type": "bionic",
     "name": "Blood Analysis",
     "description": "Small sensors have been surgically implanted in your heart, allowing you to analyze your blood.  This will detect many illnesses, drugs, and other conditions.",
     "occupied_bodyparts": [ [ "TORSO", 5 ] ],
-    "act_cost": 25
+    "act_cost": 25,
+    "display_type": "display_internal"
   },
   {
     "id": "bio_blood_filter",
     "type": "bionic",
     "name": "Blood Filter",
     "description": "A filtration system in your heart allows you to actively filter out chemical impurities, primarily drugs.  It will have limited impact on viruses.  Note that it is not a targeted filter; ALL drugs in your system will be affected.",
     "occupied_bodyparts": [ [ "TORSO", 10 ] ],
-    "act_cost": 75
+    "act_cost": 75,
+    "display_type": "display_internal"
   },
   {
     "id": "bio_cable",
@@ -200,7 +204,8 @@
     "act_cost": 1,
     "react_cost": 1,
     "time": 24,
-    "flags": [ "BIONIC_TOGGLED" ]
+    "flags": [ "BIONIC_TOGGLED" ],
+    "display_type": "display_internal"
   },
   {
     "id": "bio_cloak",
@@ -289,7 +294,8 @@
     "name": "Sound Dampeners",
     "description": "When this bionic is active, you can block hearing completely (with Enhanced Hearing deactivated) or dampen sound slightly (with Enhanced Hearing activated).",
     "included": true,
-    "flags": [ "BIONIC_TOGGLED" ]
+    "flags": [ "BIONIC_TOGGLED" ],
+    "display_type": "display_sensory"
   },
   {
     "id": "bio_ears",
@@ -298,15 +304,17 @@
     "description": "When this bionic is active, your hearing will be drastically improved, allowing you to hear ten times better than the average person.  Additionally, high-intensity sounds will be automatically dampened before they can damage your hearing.",
     "occupied_bodyparts": [ [ "HEAD", 3 ] ],
     "flags": [ "BIONIC_TOGGLED" ],
-    "included_bionics": [ "bio_earplugs" ]
+    "included_bionics": [ "bio_earplugs" ],
+    "display_type": "display_sensory"
   },
   {
     "id": "bio_emp",
     "type": "bionic",
     "name": "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": 100
+    "act_cost": 100,
+    "display_type": "display_weapon"
   },
   {
     "type": "bionic",
@@ -403,7 +411,8 @@
     "act_cost": 1,
     "react_cost": 1,
     "time": 150,
-    "flags": [ "BIONIC_TOGGLED" ]
+    "flags": [ "BIONIC_TOGGLED" ],
+    "display_type": "display_sensory"
   },
   {
     "id": "bio_tattoo_led",
@@ -436,7 +445,8 @@
     "name": "Respirator",
     "description": "A complex respiration augmentation system.  Improves respiration ability in air and allows breathing water.  Will automatically turn on when drowning.  Turn on to recharge stamina faster, at moderate power cost.  Asthmatics may also use it to stop asthma attacks.",
     "occupied_bodyparts": [ [ "TORSO", 8 ], [ "HEAD", 2 ], [ "MOUTH", 2 ] ],
-    "flags": [ "BIONIC_TOGGLED" ]
+    "flags": [ "BIONIC_TOGGLED" ],
+    "display_type": "display_internal"
   },
   {
     "id": "bio_ground_sonar",
@@ -447,7 +457,8 @@
     "flags": [ "BIONIC_TOGGLED" ],
     "act_cost": 5,
     "react_cost": 1,
-    "time": 1
+    "time": 1,
+    "display_type": "display_sensory"
   },
   {
     "id": "bio_heat_absorb",
@@ -466,7 +477,8 @@
       [ "FOOT_L", 2 ],
       [ "FOOT_R", 2 ]
     ],
-    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
+    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
+    "display_type": "display_weapon"
   },
   {
     "id": "bio_heatsink",
@@ -488,7 +500,8 @@
     "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
     "act_cost": 4,
     "react_cost": 4,
-    "time": 1
+    "time": 1,
+    "display_type": "display_internal"
   },
   {
     "id": "bio_hydraulics",
@@ -499,7 +512,8 @@
     "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
     "act_cost": 17,
     "react_cost": 17,
-    "time": 1
+    "time": 1,
+    "display_type": "display_internal"
   },
   {
     "id": "bio_infrared",
@@ -510,7 +524,8 @@
     "flags": [ "BIONIC_TOGGLED" ],
     "act_cost": 5,
     "react_cost": 1,
-    "time": 1
+    "time": 1,
+    "display_type": "display_sensory"
   },
   {
     "id": "bio_int_enhancer",
@@ -555,7 +570,8 @@
     "flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY", "BIONIC_NPC_USABLE" ],
     "act_cost": 10,
     "react_cost": 1,
-    "time": 3600
+    "time": 3600,
+    "display_type": "display_internal"
   },
   {
     "id": "bio_lighter",
@@ -599,7 +615,8 @@
     "flags": [ "BIONIC_TOGGLED", "BIONIC_SLEEP_FRIENDLY" ],
     "act_cost": 10,
     "react_cost": 1,
-    "time": 600
+    "time": 600,
+    "display_type": "display_internal"
   },
   {
     "id": "bio_metabolics",
@@ -623,7 +640,8 @@
     "name": "Repair Nanobots",
     "description": "Inside your body is a fleet of tiny dormant robots.  While activated they will flit about your body, repairing damage at 1 HP/s and stopping bleeding at the cost of power.",
     "occupied_bodyparts": [ [ "TORSO", 10 ] ],
-    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
+    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
+    "display_type": "display_internal"
   },
   {
     "id": "bio_night",
@@ -645,7 +663,8 @@
     "flags": [ "BIONIC_TOGGLED" ],
     "act_cost": 1,
     "react_cost": 1,
-    "time": 10000
+    "time": 10000,
+    "display_type": "display_sensory"
   },
   {
     "id": "bio_noise",
@@ -681,7 +700,8 @@
     "name": "Sensory Dulling",
     "description": "Your nervous system is wired to allow you to inhibit the signals of pain, allowing you to dull your senses at will.  However, the use of this system may cause delayed reaction time and drowsiness.",
     "occupied_bodyparts": [ [ "HEAD", 2 ] ],
-    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
+    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
+    "display_type": "display_sensory"
   },
   {
     "id": "bio_pokedeye",
@@ -774,7 +794,8 @@
     "flags": [ "BIONIC_TOGGLED" ],
     "act_cost": 1,
     "react_cost": 1,
-    "time": 1
+    "time": 1,
+    "display_type": "display_weapon"
   },
   {
     "id": "bio_razors",
@@ -831,7 +852,8 @@
     "flags": [ "BIONIC_TOGGLED" ],
     "act_cost": 1,
     "react_cost": 1,
-    "time": 6
+    "time": 6,
+    "display_type": "display_sensory"
   },
   {
     "id": "bio_shakes",
@@ -847,7 +869,8 @@
     "name": "Electroshock Unit",
     "description": "While fighting unarmed, or with a weapon that conducts electricity, there is a chance that a successful hit will shock your opponent, inflicting extra damage and disabling them temporarily at the cost of some energy.",
     "occupied_bodyparts": [ [ "TORSO", 8 ], [ "ARM_L", 3 ], [ "ARM_R", 3 ], [ "HAND_L", 1 ], [ "HAND_R", 1 ] ],
-    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
+    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
+    "display_type": "display_weapon"
   },
   {
     "id": "bio_shockwave",
@@ -1020,7 +1043,8 @@
     "name": "Joint Servo",
     "description": "Your leg joints have been equipped with servomotors that provide power-assisted movement.  They are optimized for running, but walking also requires less effort when this bionic is online.  However, when it's offline it will hamper your movement, as you struggle against its moving parts.",
     "occupied_bodyparts": [ [ "LEG_L", 12 ], [ "LEG_R", 12 ] ],
-    "flags": [ "BIONIC_TOGGLED" ]
+    "flags": [ "BIONIC_TOGGLED" ],
+    "display_type": "display_internal"
   },
   {
     "id": "bio_trip",
@@ -1115,14 +1139,16 @@
     "name": "Taste Modifier",
     "description": "A set of highly sensitive sensors is installed in your mouth, and a small yet sophisticated analyzer is installed in the cavity of your skull. The active bionic will nullify the taste of all comestibles with negative enjoyment value at the cost of draining bionic power.",
     "occupied_bodyparts": [ [ "HEAD", 1 ], [ "MOUTH", 1 ] ],
-    "flags": [ "BIONIC_TOGGLED" ]
+    "flags": [ "BIONIC_TOGGLED" ],
+    "display_type": "display_sensory"
   },
   {
     "id": "bio_soporific",
     "type": "bionic",
     "name": "Soporific Induction",
     "description": "An electrode has been implanted into your brain's ventrolateral preoptic nucleus.  It turns on whenever you're trying to fall asleep, creating an artificial but effective sensation of fatigue.",
     "occupied_bodyparts": [ [ "HEAD", 1 ] ],
-    "flags": [ "BIONIC_TOGGLED" ]
+    "flags": [ "BIONIC_TOGGLED" ],
+    "display_type": "display_internal"
   }
 ]

data/json/bionicsDisplayType.json

@@ -0,0 +1,37 @@
+[
+  {
+    "type": "bionics_display_type",
+    "ident": "display_weapon",
+    "display_string": "Weapons"
+  },
+  {
+    "type": "bionics_display_type",
+    "ident": "display_power",
+    "display_string": "Power"
+  },
+  {
+    "type": "bionics_display_type",
+    "ident": "display_sensory",
+    "display_string": "Sensory"
+  },
+  {
+    "type": "bionics_display_type",
+    "ident": "display_internal",
+    "display_string": "Internal"
+  },
+  {
+    "type": "bionics_display_type",
+    "ident": "display_other",
+    "display_string": "Other"
+  },
+  {
+    "type": "bionics_display_type",
+    "ident": "display_passive",
+    "display_string": "Passive"
+  },
+  {
+    "type": "bionics_display_type",
+    "ident": "display_faulty",
+    "display_string": "Faulty"
+  }
+]

data/raw/keybindings.json

@@ -1396,13 +1396,6 @@
     "name": "Toggle item as favorite",
     "bindings": [ { "input_method": "keyboard", "key": "*" } ]
   },
-  {
-    "type": "keybinding",
-    "id": "TOGGLE_EXAMINE",
-    "category": "BIONICS",
-    "name": "Toggle activate/examine",
-    "bindings": [ { "input_method": "keyboard", "key": "!" } ]
-  },
   {
     "type": "keybinding",
     "id": "TOGGLE_EXAMINE",
@@ -2263,6 +2256,13 @@
       { "input_method": "gamepad", "key": "JOY_DOWN" }
     ]
   },
+  {
+    "type": "keybinding",
+    "id": "TOGGLE_EXAMINE",
+    "category": "BIONICS",
+    "name": "Display Columns Info",
+    "bindings": [ { "input_method": "keyboard", "key": "F1" } ]
+  },
   {
     "type": "keybinding",
     "id": "REASSIGN",