More vehicle part descriptions

data/json/vehicleparts/engineering.json

@@ -11,7 +11,7 @@
     "broken_color": "light_blue",
     "difficulty": 5,
     "durability": 200,
-    "description": "A rigid steel boom crane.  Can be used to jack up another vehicle to change the other vehicle's wheels, or lift a heavy component like an engine from another vehicle.",
+    "description": "A rigid steel boom crane.  If it is in your line of sight and within two tiles of another vehicle, you will automatically use it when you want jack up the other vehicle to change the its wheels, or lift a heavy component like an engine that you are installing in or removing from the other vehicle.",
     "breaks_into": [ { "item": "pipe", "count": [ 8, 32 ] }, { "item": "scrap", "count": [ 8, 24 ] } ],
     "qualities": [ [ "LIFT", 4 ], [ "JACK", 40 ] ],
     "flags": [ "TOOL_WRENCH", "PROTRUSION" ]
@@ -28,7 +28,7 @@
     "broken_color": "light_blue",
     "difficulty": 2,
     "durability": 100,
-    "description": "An extendable cantilever crane.  Can be used to jack up another vehicle to change the other vehicle's wheels, or lift a heavy component like an engine from another vehicle.",
+    "description": "An extendable cantilever crane.  If it is in your line of sight and within two tiles of another vehicle, you will automatically use it when you want jack up the other vehicle to change the its wheels, or lift a heavy component like an engine that you are installing in or removing from the other vehicle.",
     "folded_volume": 12,
     "breaks_into": [ { "item": "pipe", "count": [ 2, 8 ] }, { "item": "scrap", "count": [ 2, 6 ] } ],
     "qualities": [ [ "LIFT", 1 ], [ "JACK", 7 ] ],
@@ -46,7 +46,7 @@
     "broken_color": "light_blue",
     "difficulty": 2,
     "durability": 100,
-    "description": "A small pallet lifter.  Can be used to jack up another vehicle to change the other vehicle's wheels, or lift a heavy component like an engine from another vehicle.",
+    "description": "A small pallet lifter.  If it is in your line of sight and within two tiles of another vehicle, you will automatically use it when you want jack up the other vehicle to change the its wheels, or lift a heavy component like an engine that you are installing in or removing from the other vehicle.",
     "folded_volume": 12,
     "breaks_into": [ { "item": "pipe", "count": [ 1, 4 ] }, { "item": "scrap", "count": [ 2, 6 ] } ],
     "qualities": [ [ "LIFT", 1 ], [ "JACK", 1 ] ],
@@ -65,7 +65,7 @@
     "difficulty": 2,
     "damage_modifier": 200,
     "durability": 300,
-    "description": "A pair of forklift arms.  Can be used to jack up another vehicle to change the other vehicle's wheels, or lift a heavy component like an engine from another vehicle.",
+    "description": "A pair of forklift arms.  If it is in your line of sight and within two tiles of another vehicle, you will automatically use it when you want jack up the other vehicle to change the its wheels, or lift a heavy component like an engine that you are installing in or removing from the other vehicle.",
     "size": 50,
     "breaks_into": [
       { "item": "steel_lump", "count": [ 4, 6 ] },
@@ -88,7 +88,7 @@
     "difficulty": 5,
     "damage_modifier": 100,
     "durability": 300,
-    "description": "A large metal disc, powered by the vehicle's engines.  It can be turned on, and it will stop the vehicle unless it has a strong engine.  When turned on, it will dig a shallow pit in dirt. Mount it on the edge of your vehicle.",
+    "description": "A large metal disc, powered by the vehicle's engines.  Use the vehicle controls to turn it on or off.  When turned on, it will stop the vehicle unless it has a strong engine.  When turned on, it will dig a shallow pit in dirt. Mount it on the edge of your vehicle.",
     "folded_volume": 12,
     "power": -200,
     "breaks_into": [

data/json/vehicleparts/manual.json

@@ -12,7 +12,7 @@
     "broken_color": "red",
     "difficulty": 1,
     "durability": 50,
-    "description": "A set of bicycle style foot pedals.  If mounted on the same tile as seat, they allow you to move the vehicle at the cost of your stamina, if the vehicle has sufficient wheels.  They also act as controls.",
+    "description": "A set of bicycle style foot pedals.  If mounted on the same tile as seat, they allow you to move the vehicle at the cost of your stamina, if the vehicle has sufficient wheels.  They also act as controls.  You can 'e'xamine the tile or attempt to pick-up items (default ',') to access the controls, or use the vehicle control key (default '^').",
     "power": 64,
     "damage_modifier": 50,
     "folded_volume": 2,
@@ -32,7 +32,7 @@
     "broken_color": "red",
     "difficulty": 1,
     "durability": 50,
-    "description": "A set of wheelchair style wheels.  If mounted on the same tile as seat, they allow you to move the vehicle at the cost of your stamina, if the vehicle has sufficient wheels.  They also act as controls.",
+    "description": "A set of wheelchair style wheels.  If mounted on the same tile as seat, they allow you to move the vehicle at the cost of your stamina, if the vehicle has sufficient wheels.  They also act as controls.  You can 'e'xamine the tile or attempt to pick-up items (default ',') to access the controls, or use the vehicle control key (default '^').",
     "power": 32,
     "damage_modifier": 50,
     "folded_volume": 2,

data/raw/keybindings.json

@@ -1879,6 +1879,42 @@
             { "input_method":"keyboard", "key":"a" }
         ]
     },
+    {
+        "type" : "keybinding",
+        "id": "FUEL_LIST_UP",
+        "category": "VEH_INTERACT",
+        "name": "Scroll up through fuel list",
+        "bindings":[
+            { "input_method":"keyboard", "key":"BACKTAB" }
+        ]
+    },
+    {
+        "type" : "keybinding",
+        "id": "FUEL_LIST_DOWN",
+        "category": "VEH_INTERACT",
+        "name": "Scroll down through fuel list",
+        "bindings":[
+            { "input_method":"keyboard", "key":"TAB" }
+        ]
+    },
+    {
+        "type" : "keybinding",
+        "id": "DESC_LIST_UP",
+        "category": "VEH_INTERACT",
+        "name": "Scroll up through vehicle part descriptions",
+        "bindings":[
+            { "input_method":"keyboard", "key":"<" }
+        ]
+    },
+    {
+        "type" : "keybinding",
+        "id": "DESC_LIST_DOWN",
+        "category": "VEH_INTERACT",
+        "name": "Scroll down through vehicle part descriptions",
+        "bindings":[
+            { "input_method":"keyboard", "key":">" }
+        ]
+    },
     {
         "type" : "keybinding",
         "id": "TOGGLE_UNAVAILABLE_CONSTRUCTIONS",

src/editmap.cpp

@@ -658,7 +658,7 @@ void editmap::update_view( bool update_info )
         } else if( vp ) {
             mvwprintw( w_info, off, 1, _( "There is a %s there. Parts:" ), vp->vehicle().name );
             off++;
-            vp->vehicle().print_part_desc( w_info, off, getmaxy( w_info ) - 1, width, vp->part_index() );
+            vp->vehicle().print_part_list( w_info, off, getmaxy( w_info ) - 1, width, vp->part_index() );
             off += 6;
         }
 

src/game.cpp

@@ -7587,9 +7587,9 @@ void game::print_creature_info( const Creature *creature, const catacurses::wind
 void game::print_vehicle_info( const vehicle *veh, int veh_part, const catacurses::window &w_look,
                                const int column, int &line, const int last_line )
 {
-    if (veh) {
-        mvwprintw(w_look, ++line, column, _("There is a %s there. Parts:"), veh->name.c_str());
-        line = veh->print_part_desc(w_look, ++line, last_line, getmaxx(w_look), veh_part);
+    if( veh ) {
+        mvwprintw( w_look, ++line, column, _( "There is a %s there. Parts:" ), veh->name.c_str() );
+        line = veh->print_part_list( w_look, ++line, last_line, getmaxx( w_look ), veh_part );
     }
 }