Vehicle installation requirements (part 2) [RDY]

data/json/vehicleparts/frames.json

@@ -41,6 +41,19 @@
     "location": "structure",
     "durability": 400,
     "difficulty": 1,
+    "requirements": {
+      "install": {
+        "skills": [ [ "mechanics", 1 ] ],
+        "time": 120000,
+        "qualities": [ { "id": "GLARE", "level": 2 } ],
+        "tools": [ [ [ "welder", 50 ], [ "welder_crude", 75 ], [ "toolset", 75 ], [ "oxy_torch", 20 ] ] ],
+        "components": [ [ [ "frame", 1 ] ] ]
+      },
+      "removal": {
+        "skills": [ [ "mechanics", 1 ] ],
+        "qualities": [ { "id": "SAW_M", "level": 2 } ]
+      }
+    },
     "breaks_into": "ig_vp_frame",
     "flags": [ "MOUNTABLE" ]
   },
@@ -84,7 +97,20 @@
     "location": "structure",
     "color": "dark_gray",
     "durability": 1600,
-    "difficulty": 1,
+    "difficulty": 3,
+    "requirements": {
+      "install": {
+        "skills": [ [ "mechanics", 3 ] ],
+        "time": 240000,
+        "qualities": [ { "id": "GLARE", "level": 2 } ],
+        "tools": [ [ [ "welder", 200 ], [ "welder_crude", 300 ], [ "toolset", 300 ], [ "oxy_torch", 60 ] ] ],
+        "components": [ [ [ "hdframe", 1 ] ] ]
+      },
+      "removal": {
+        "skills": [ [ "mechanics", 1 ] ],
+        "qualities": [ { "id": "SAW_M", "level": 2 } ]
+      }
+    },
     "breaks_into": "ig_vp_hdframe",
     "flags": [ "MOUNTABLE" ]
   },

src/calendar.h

@@ -3,6 +3,11 @@
 
 #include <string>
 
+constexpr int MOVES( int n )
+{
+    return n * 100;
+}
+
 constexpr int SECONDS( int n )
 {
     return n / 6;

src/game.cpp

@@ -7431,13 +7431,10 @@ void game::exam_vehicle(vehicle &veh, const tripoint &p, int cx, int cy)
         return;
     }
 
-    if (vehint.sel_cmd != ' ') {
+    if (vehint.sel_cmd != ' '&& vehint.sel_vpart_info != nullptr ) {
         int time = 200;
         int skill = u.get_skill_level( skill_id( "mechanics" ) );
-        int diff = 1;
-        if (vehint.sel_vpart_info != NULL) {
-            diff = vehint.sel_vpart_info->difficulty + 3;
-        }
+        int diff = vehint.sel_vpart_info->difficulty + 3;
         int setup = (calendar::turn == veh.last_repair_turn ? 0 : 1);
         ///\EFFECT_MECHANICS reduces time spent examining vehicle
         int setuptime = std::max(setup * 3000, setup * 6000 - skill * 400);
@@ -7451,16 +7448,17 @@ void game::exam_vehicle(vehicle &veh, const tripoint &p, int cx, int cy)
         // Stored in activity.index and used in the complete_vehicle() callback to finish task.
         switch (vehint.sel_cmd) {
         case 'i':
-            time = setuptime + std::max(mintime, 5000 * diff - skill * 2500);
+            time = vehint.sel_vpart_info->install_time( u );
             break;
         case 'r':
             time = setuptime + std::max(mintime, (8 * diff - skill * 4) * dmg);
             break;
         case 'o':
-            time = setuptime + std::max(mintime, 4000 * diff - skill * 2000);
+            time = vehint.sel_vpart_info->removal_time( u );
             break;
         case 'c':
-            time = setuptime + std::max(mintime, 6000 * diff - skill * 4000);
+            time = vehint.sel_vpart_info->removal_time( u ) +
+                   vehint.sel_vpart_info->install_time( u );
             break;
         }
         u.assign_activity( ACT_VEHICLE, time, (int)vehint.sel_cmd );

src/game_constants.h

@@ -82,7 +82,13 @@
 /** Weight per level of LIFT/JACK tool quality */
 #define TOOL_LIFT_FACTOR 500000 // 500kg/level
 
+/** Cap JACK requirements to support arbritrarily large vehicles */
+#define JACK_LIMIT 6000000 // 6000kg (6 metric tonnes)
+
 /** Maximum density of a map field */
 #define MAX_FIELD_DENSITY 3
 
+/** Maximum (effective) level for a skill */
+#define MAX_SKILL 10
+
 #endif

src/newcharacter.cpp

@@ -54,7 +54,6 @@
 
 #define HIGH_STAT 14 // The point after which stats cost double
 #define MAX_STAT 20 // The point after which stats can not be increased further
-#define MAX_SKILL 20 // The maximum selectable skill level
 
 #define NEWCHAR_TAB_MAX 6 // The ID of the rightmost tab
 

src/requirements.h

@@ -127,6 +127,11 @@ struct quality_requirement {
  *   std::string get_color(bool has_one, const inventory &crafting_inv) const;
 */
 struct requirement_data {
+        // temporarily break encapsulation pending migration of legacy parts
+        // @see vpart_info::check
+        // @todo remove once all parts specify installation requirements directly
+        friend class vpart_info;
+
         typedef std::vector< std::vector<tool_comp> > alter_tool_comp_vector;
         typedef std::vector< std::vector<item_comp> > alter_item_comp_vector;
         typedef std::vector< std::vector<quality_requirement> > alter_quali_req_vector;