feat(content): add a larger size of sail, adjust recipes, show sails on top of vehicles

data/json/items/vehicle/boat.json

@@ -66,7 +66,7 @@
     "type": "GENERIC",
     "id": "sail",
     "name": { "str": "sail" },
-    "description": "Sails for a boat.",
+    "description": "A small sail and makeshift rigging for a raft.",
     "weight": "7904 g",
     "to_hit": -1,
     "color": "light_gray",
@@ -78,6 +78,20 @@
     "price": "90 USD",
     "price_postapoc": "1250 cent"
   },
+  {
+    "type": "GENERIC",
+    "id": "sail_large_item",
+    "copy-from": "sail",
+    "name": { "str": "large sail" },
+    "description": "A wooden mast with sails fit for a yacht or sloop, and about as much rigging as a single sailor can handle.",
+    "//": "About half the weight and volume of the wooden beam, assumes a good amount is lost in the recipe",
+    "weight": "18 kg",
+    "to_hit": -4,
+    "volume": "30 L",
+    "bashing": 12,
+    "price": "300 USD",
+    "price_postapoc": "20 USD"
+  },
   {
     "type": "GENERIC",
     "id": "inflatable_section",

data/json/recipes/other/vehicles.json

@@ -608,7 +608,32 @@
     "autolearn": true,
     "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 1 } ],
     "using": [ [ "sewing_standard", 100 ] ],
-    "components": [ [ [ "sheet", 2 ] ], [ [ "2x4", 4 ], [ "stick", 4 ] ], [ [ "nail_glue", 20, "LIST" ] ] ]
+    "components": [
+      [ [ "sheet", 2 ] ],
+      [ [ "wood_structural", 2, "LIST" ] ],
+      [ [ "rope_natural_short", 1, "LIST" ] ],
+      [ [ "nail_glue", 20, "LIST" ] ]
+    ]
+  },
+  {
+    "type": "recipe",
+    "result": "sail_large_item",
+    "byproducts": [ [ "splinter", 15 ] ],
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_VEHICLE",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "50 m",
+    "autolearn": true,
+    "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 1 } ],
+    "using": [ [ "sewing_standard", 250 ] ],
+    "components": [
+      [ [ "sheet", 8 ] ],
+      [ [ "wood_beam", 1 ] ],
+      [ [ "wood_structural", 2, "LIST" ] ],
+      [ [ "rope_natural", 1, "LIST" ] ],
+      [ [ "nail_glue", 50, "LIST" ] ]
+    ]
   },
   {
     "type": "recipe",

data/json/vehicleparts/vehicle_parts.json

@@ -1311,7 +1311,8 @@
   {
     "type": "vehicle_part",
     "id": "sail",
-    "name": { "str": "sail" },
+    "name": { "str": "small sail" },
+    "description": "A sail for a raft, small enough to be foldable.",
     "symbol": "M",
     "color": "light_gray",
     "broken_symbol": "#",
@@ -1324,12 +1325,12 @@
     "m2c": 90,
     "exclusions": [ "wind" ],
     "item": "sail",
-    "location": "engine_block",
+    "location": "on_roof",
     "folded_volume": "500 ml",
     "requirements": {
-      "install": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_nail_install", 1 ] ] },
-      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "vehicle_nail_removal", 1 ] ] },
-      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "adhesive", 2 ], [ "wood_structural_small", 1 ] ] }
+      "install": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_nail_install", 1 ] ] },
+      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_nail_removal", 1 ] ] },
+      "repair": { "skills": [ [ "mechanics", 3 ] ], "time": "30 m", "using": [ [ "adhesive", 2 ], [ "wood_structural_small", 1 ] ] }
     },
     "flags": [
       "ENGINE",
@@ -1344,6 +1345,28 @@
     ],
     "breaks_into": [ { "item": "splinter", "count": [ 2, 4 ] }, { "item": "rag", "count": [ 5, 10 ] } ]
   },
+  {
+    "type": "vehicle_part",
+    "id": "sail_large",
+    "copy-from": "sail",
+    "name": { "str": "large sail" },
+    "description": "Sails and rigging fit for a yacht or sloop, about as large as a single person can reasonably crew.",
+    "durability": 150,
+    "power": 4000,
+    "item": "sail_large_item",
+    "requirements": {
+      "install": { "skills": [ [ "mechanics", 4 ] ], "time": "60 m", "using": [ [ "vehicle_nail_install", 2 ] ] },
+      "removal": { "skills": [ [ "mechanics", 4 ] ], "time": "60 m", "using": [ [ "vehicle_nail_removal", 2 ] ] },
+      "repair": { "skills": [ [ "mechanics", 5 ] ], "time": "60 m", "using": [ [ "adhesive", 2 ], [ "wood_structural_small", 1 ] ] }
+    },
+    "breaks_into": [
+      { "item": "log", "count": [ 1, 2 ] },
+      { "item": "splinter", "count": [ 10, 20 ] },
+      { "item": "sheet", "count": [ 0, 1 ] },
+      { "item": "rag", "count": [ 25, 50 ] }
+    ],
+    "delete": { "flags": [ "UNMOUNT_ON_DAMAGE" ] }
+  },
   {
     "type": "vehicle_part",
     "id": "hand_paddles",