Overhaul vehicle part installation [RDY]

data/json/itemgroups/tools.json

@@ -108,6 +108,7 @@
     "items": [
       [ "forge", 100 ],
       [ "jack", 100 ],
+      [ "jack_small", 100 ],
       [ "oxy_torch", 100 ],
       [ "polisher", 100 ],
       [ "welder", 100 ]

data/json/items/tool/workshop.json

@@ -1,4 +1,49 @@
 [
+  {
+    "id": "jack",
+    "type": "TOOL",
+    "name": "bottle jack",
+    "description": "A portable hydraulic bottle jack rated to lift 3 metric tonnes.",
+    "material": "steel",
+    "symbol": ";",
+    "color": "light_gray",
+    "weight": 11974,
+    "volume": 6,
+    "price": 18000,
+    "bashing": 8,
+    "to_hit": -2,
+    "qualities": [ ["JACK", 6 ] ]
+  },
+  {
+    "id": "jack_makeshift",
+    "type": "TOOL",
+    "name": "makeshift jack",
+    "description": "A poorly constructed improvised scissor jack rated to lift 500kg if you're brave enough to use it.",
+    "material": "steel",
+    "symbol": ";",
+    "color": "light_gray",
+    "weight": 1800,
+    "volume": 4,
+    "price": 800,
+    "bashing": 4,
+    "to_hit": -2,
+    "qualities": [ ["JACK", 1 ] ]
+  },
+  {
+    "id": "jack_small",
+    "type": "TOOL",
+    "name": "scissor jack",
+    "description": "A small scissor jack rated to lift one metric tonne.",
+    "material": "steel",
+    "symbol": ";",
+    "color": "light_gray",
+    "weight": 1200,
+    "volume": 3,
+    "price": 5000,
+    "bashing": 4,
+    "to_hit": -2,
+    "qualities": [ ["JACK", 2 ] ]
+  },
   {
     "id": "oxy_torch",
     "type": "TOOL",

data/json/items/tools.json

@@ -7229,19 +7229,6 @@
     "use_action": { "type": "knife" },
     "qualities": [["CUT", 1], ["BUTCHER", 19]]
   },
-  {
-    "id": "jack",
-    "type": "TOOL",
-    "symbol": ";",
-    "color": "light_gray",
-    "name": "jack",
-    "description": "This is a common hydraulic jack, used when changing tires.",
-    "price": 5000,
-    "material": "steel",
-    "weight": 11974,
-    "volume": 5,
-    "bashing": 8
-  },
   {
     "id": "scythe",
     "type": "TOOL",

data/json/items/vehicle/engineering.json

@@ -0,0 +1,28 @@
+[
+  {
+    "id": "cantilever_medium",
+    "type": "GENERIC",
+    "category": "veh_parts",
+    "name": "steel boom",
+    "description": "A large rigid steel boom. If attached to a frame it could be used for lifting.",
+    "price": 23400,
+    "weight": 31600,
+    "volume": 50,
+    "material": "steel",
+    "symbol": "&",
+    "color": "dark_gray"
+  },
+  {
+    "id": "cantilever_small",
+    "type": "GENERIC",
+    "category": "veh_parts",
+    "name": "telescopic cantilever",
+    "description": "A small steel telescoping cantilever. If attached to a frame it could be used for lifting.",
+    "price": 7900,
+    "weight": 12000,
+    "volume": 12,
+    "material": "steel",
+    "symbol": "&",
+    "color": "dark_gray"
+  }
+]

data/json/items/vehicle/rigs.json

@@ -0,0 +1,50 @@
+[
+  {
+    "abstract": "vehicle_rig",
+    "type": "GENERIC",
+    "category": "veh_parts",  
+    "name": "vehicle crafting rig",
+    "weight": 40000,
+    "volume": 80,
+    "price": 40000,
+    "material": "steel",
+    "symbol": "&",
+    "color": "light_cyan"
+  },
+  {
+    "id": "chemlab",
+    "copy-from": "vehicle_rig",
+    "type": "GENERIC",
+    "name": "onboard chemistry lab",
+    "description": "Assembled from a chemistry set attached to a complex wiring harness, it is well suited to most any chemistry project you could imagine.  Unable to utilize standard batteries, it requires an external supply of electricity to operate."
+  },
+  {
+    "id" : "craftrig",
+    "copy-from": "vehicle_rig",
+    "type": "GENERIC",
+    "name": "FOODCO kitchen buddy",
+    "name_plural": "FOODCO kitchen buddies",
+    "description": "Assembled from a set of instructions you found in an old book of DIY projects, the *FOODCO kitchen buddy* claims to be *the perfect solution to all your home-cooking needs!*.  While it is surprisingly handy for vacuum-sealing as well as dehydrating food, the cheery sales pitch neglected to mention A - how awkward the damn thing is, B - That you still need a normal kitchen and C - how it doesn't take batteries.  You're going to have to weld it to a vehicle, or something else with a supply of electricity, if you want to use it.  In addition to the food preservation features, it also has a water-purification system, a drawer for holding extra tools, and for some insane reason, a press and die set for hand-loading ammunition."
+  },
+  {
+    "id": "forgerig",
+    "copy-from": "vehicle_rig",
+    "type": "GENERIC",
+    "name": "vehicle forge rig",
+    "description": "A forge rig made to run off a vehicle's storage battery with integrated tool storage for metalworking equipment."
+  },
+  {
+    "id": "kitchen_unit",
+    "copy-from": "vehicle_rig",
+    "type": "GENERIC",
+    "name": "RV kitchen unit",
+    "description": "A vehicle mountable electric range and sink unit with integrated tool storage for cooking utensils."
+  },
+  {
+    "id": "weldrig",
+    "copy-from": "vehicle_rig",
+    "type": "GENERIC",
+    "name": "vehicle welding rig",
+    "description": "A welding rig made to run off a vehicle's storage battery.  It has a soldering iron attachment for delicate work, and a compartment to store your extra tools in."
+  }
+]

data/json/items/vehicle_parts.json

@@ -137,7 +137,7 @@
         "id" : "hdframe",
         "name" : "heavy duty frame",
         "description" : "A large, reinforced steel frame, used in military vehicle construction.",
-        "weight" : 60000,
+        "weight" : 100000,
         "to_hit" : -6,
         "color" : "green",
         "symbol" : "]",
@@ -808,78 +808,6 @@
         "category" : "veh_parts",
         "price" : 3000
     },
-    {
-        "type":"GENERIC",
-        "id" : "kitchen_unit",
-        "name" : "RV kitchen unit",
-        "description" : "A vehicle mountable electric range and sink unit with integrated tool storage for cooking utensils.",
-        "weight" : 102058,
-        "to_hit" : -2,
-        "color" : "light_cyan",
-        "symbol" : "&",
-        "material" : ["steel"],
-        "volume" : 80,
-        "category" : "veh_parts",
-        "price" : 40000
-    },
-    {
-        "type":"GENERIC",
-        "id" : "weldrig",
-        "name" : "vehicle welding rig",
-        "description" : "A welding rig made to run off a vehicle's storage battery.  It has a soldering iron attachment for delicate work, and a compartment to store your extra tools in.",
-        "weight" : 16789,
-        "to_hit" : -2,
-        "color" : "light_red",
-        "symbol" : "&",
-        "material" : ["steel"],
-        "volume" : 80,
-        "category" : "veh_parts",
-        "price" : 40000
-    },
-    {
-        "type":"GENERIC",
-        "id" : "forgerig",
-        "name" : "vehicle forge rig",
-        "description" : "A forge rig made to run off a vehicle's storage battery.  Used for forging tools in a vehicle.",
-        "weight" : 10000,
-        "to_hit" : -2,
-        "color" : "light_gray",
-        "symbol" : "&",
-        "material" : ["steel"],
-        "volume" : 24,
-        "bashing" : 8,
-        "category" : "veh_parts",
-        "price" : 40000
-    },
-    {
-        "type":"GENERIC",
-        "id" : "craftrig",
-        "name" : "FOODCO kitchen buddy",
-        "name_plural" : "FOODCO kitchen buddies",
-        "description" : "Assembled from a set of instructions you found in an old book of DIY projects, the *FOODCO kitchen buddy* claims to be *the perfect solution to all your home-cooking needs!*.  While it is surprisingly handy for vacuum-sealing as well as dehydrating food, the cheery sales pitch neglected to mention A - how awkward the damn thing is, B - That you still need a normal kitchen and C - how it doesn't take batteries.  You're going to have to weld it to a vehicle, or something else with a supply of electricity, if you want to use it.  In addition to the food preservation features, it also has a water-purification system, a drawer for holding extra tools, and for some insane reason, a press and die set for hand-loading ammunition.",
-        "weight" : 27976,
-        "to_hit" : -2,
-        "color" : "light_green",
-        "symbol" : "&",
-        "material" : ["steel", "plastic"],
-        "volume" : 111,
-        "category" : "veh_parts",
-        "price" : 40000
-    },
-    {
-        "type":"GENERIC",
-        "id" : "chemlab",
-        "name" : "onboard chemistry lab",
-        "description" : "Assembled from a chemistry set attached to a complex wiring harness, it is well suited to most any chemistry project you could imagine.  Unable to utilize standard batteries, it requires an external supply of electricity to operate.",
-        "weight" : 19124,
-        "to_hit" : -2,
-        "color" : "yellow",
-        "symbol" : "&",
-        "material" : ["iron", "glass"],
-        "volume" : 92,
-        "category" : "veh_parts",
-        "price" : 40000
-    },
     {
         "type":"GENERIC",
         "id": "veh_tracker",

data/json/recipes/other/tool.json

@@ -1,4 +1,68 @@
 [
+  {
+    "result": "jack",
+    "type": "recipe",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "fabrication",
+    "difficulty": 5,
+    "skills_required": [ "mechanics", 3 ],
+    "time": 300000,
+    "book_learn": [ [ "manual_mechanics", 3 ] , [ "manual_fabrication", 5 ] , [ "textbook_fabrication", 5 ] ],
+    "qualities": [
+      { "id":"HAMMER", "level": 3 }
+    ],
+    "tools": [
+      [ ["tongs", -1 ] ],
+      [ ["chisel", -1 ] ],
+      [ ["anvil", -1 ] ],
+      [ ["crucible", -1 ], ["crucible_clay", -1] ],
+      [ ["swage", -1 ] ],
+      [ ["forge", 200 ], [ "oxy_torch", 40 ] ]
+    ],
+    "components": [ [ [ "steel_lump", 1 ], [ "steel_chunk", 4 ], [ "scrap", 12 ] ] ]
+  },
+  {
+  "result": "jack_makeshift",
+  "type": "recipe",
+  "category": "CC_OTHER",
+  "subcategory": "CSC_OTHER_TOOLS",
+  "skill_used": "fabrication",
+  "difficulty": 2,
+  "skills_required": [ "mechanics", 1 ],
+  "time": 100000,
+  "book_learn": [ [ "manual_mechanics", 1 ] , [ "manual_fabrication", 2 ] , [ "textbook_fabrication", 2 ] ],
+  "qualities":[
+    { "id": "SAW_M", "level": 1 },
+    { "id": "SCREW", "level": 1 },
+    { "id": "WRENCH", "level": 1 }
+  ],
+  "components": [
+      [ [ "pipe", 4 ] ],
+      [ [ "scrap", 2 ] ]
+    ]
+  },
+  {
+  "result": "jack_small",
+  "type": "recipe",
+  "category": "CC_OTHER",
+  "subcategory": "CSC_OTHER_TOOLS",
+  "skill_used": "fabrication",
+  "difficulty": 3,
+  "skills_required": [ "mechanics", 2 ],
+  "time": 200000,
+  "book_learn": [ [ "manual_mechanics", 2 ] , [ "manual_fabrication", 3 ] , [ "textbook_fabrication", 3 ] ],
+  "qualities":[
+    { "id": "SAW_M_FINE", "level": 1 },
+    { "id": "SCREW", "level": 1 },
+    { "id": "WRENCH", "level": 1 }
+  ],
+  "tools": [ [ [ "welder", 50 ], [ "welder_crude", 75 ], [ "toolset", 75 ], [ "oxy_torch", 20 ] ] ],
+  "components": [
+      [ [ "pipe", 4 ] ],
+      [ [ "scrap", 2 ] ]
+    ]
+  },
   {
     "result": "still",
     "type": "recipe",

data/json/recipes/other/vehicle.json

@@ -0,0 +1,52 @@
+[
+  {
+    "result": "cantilever_medium",
+    "type" : "recipe",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_VEHICLE",
+    "skill_used": "mechanics",
+    "skills_required": [ "fabrication", 3 ],
+    "difficulty": 5,
+    "time": 360000,
+    "book_learn": [ [ "textbook_fabrication", 6 ] , [ "textbook_mechanics", 5 ] ],
+    "qualities": [
+      { "id": "HAMMER", "level": 2 },
+      { "id": "SAW_M", "level": 1 },
+      { "id": "WRENCH", "level": 2 }
+    ],
+    "tools": [
+      [ [ "goggles_welding", -1 ] ],
+      [ [ "welder", 100 ], [ "welder_crude", 150 ], [ "toolset", 150 ] ]
+    ],
+    "components": [
+      [ [ "pipe", 32 ] ],
+      [ [ "steel_chunk", 8 ], [ "scrap", 24 ] ],
+      [ [ "chain", 1 ] ]
+    ]
+  },
+  {
+    "result": "cantilever_small",
+    "type" : "recipe",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_VEHICLE",
+    "skill_used": "mechanics",
+    "skills_required": [ "fabrication", 2 ],
+    "difficulty": 2,
+    "time": 60000,
+    "book_learn": [ [ "textbook_fabrication", 4 ] , [ "textbook_mechanics", 2 ] , [ "manual_mechanics", 2 ] ],
+    "qualities": [
+      { "id": "HAMMER", "level": 2 },
+      { "id": "SAW_M", "level": 1 },
+      { "id": "WRENCH", "level": 2 }
+    ],
+    "tools": [
+      [ [ "goggles_welding", -1 ] ],
+      [ [ "welder", 50 ], [ "welder_crude", 75 ], [ "toolset", 75 ] ]
+    ],
+    "components": [
+      [ [ "pipe", 8 ] ],
+      [ [ "steel_chunk", 2 ], [ "scrap", 6 ] ],
+      [ [ "wire", 8 ] ]
+    ]
+  }
+]