feat(balance): use mattresses for vehicle beds and clocks for vehicle…

… clocks, balance updates to associated items and recipes (#5381)

* feat(balance): use mattresses for vehicle beds and clocks for vehicle clocks, balance updates to associated items and recipes

* Goofy ahh tests, also tweak an uncraft

* Remech

data/json/items/generic.json

@@ -1757,14 +1757,15 @@
     "symbol": ";",
     "color": "light_gray",
     "name": { "str": "clock" },
-    "description": "A small mechanical clock, it's stopped at 10:10.",
+    "description": "A small mechanical clock.  Tells the time and has an alarm clock feature.",
     "price": "10 USD",
     "price_postapoc": "10 cent",
     "material": [ "plastic", "steel" ],
     "weight": "725 g",
     "volume": "250 ml",
     "bashing": 4,
-    "to_hit": -3
+    "to_hit": -3,
+    "flags": [ "WATCH", "ALARMCLOCK" ]
   },
   {
     "type": "GENERIC",

data/json/recipes/other/other.json

@@ -23,6 +23,18 @@
     "using": [ [ "sewing_standard", 12 ] ],
     "components": [ [ [ "rag", 6 ] ], [ [ "down_feather", 40 ] ] ]
   },
+  {
+    "type": "recipe",
+    "result": "mattress",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_OTHER",
+    "skill_used": "tailor",
+    "difficulty": 6,
+    "time": "240 m",
+    "autolearn": true,
+    "using": [ [ "sewing_standard", 12 ] ],
+    "components": [ [ [ "rag", 60 ] ], [ [ "cotton_ball", 100 ] ], [ [ "spring", 5 ] ] ]
+  },
   {
     "type": "recipe",
     "result": "down_mattress",
@@ -31,7 +43,6 @@
     "skill_used": "tailor",
     "difficulty": 6,
     "time": "240 m",
-    "reversible": true,
     "autolearn": true,
     "using": [ [ "sewing_standard", 12 ] ],
     "components": [ [ [ "rag", 60 ] ], [ [ "down_feather", 1160 ] ] ]
@@ -576,7 +587,6 @@
     "skill_used": "tailor",
     "difficulty": 6,
     "time": "240 m",
-    "reversible": true,
     "autolearn": true,
     "using": [ [ "sewing_standard", 12 ] ],
     "components": [ [ [ "felt_patch", 60 ] ], [ [ "yarn", 650 ] ] ]

data/json/uncraft/generic.json

@@ -76,9 +76,27 @@
     "type": "uncraft",
     "skill_used": "tailor",
     "difficulty": 1,
-    "time": "22 s",
+    "time": "15 m",
+    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "rag", 60 ] ], [ [ "cotton_ball", 100 ] ], [ [ "spring", 5 ] ] ]
+  },
+  {
+    "result": "down_mattress",
+    "type": "uncraft",
+    "skill_used": "tailor",
+    "difficulty": 1,
+    "time": "15 m",
+    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "rag", 60 ] ], [ [ "down_feather", 1160 ] ] ]
+  },
+  {
+    "result": "wool_mattress",
+    "type": "uncraft",
+    "skill_used": "tailor",
+    "difficulty": 1,
+    "time": "15 m",
     "qualities": [ { "id": "CUT", "level": 1 } ],
-    "components": [ [ [ "rag", 60 ] ], [ [ "sheet", 4 ] ], [ [ "scrap", 20 ] ], [ [ "wire", 20 ] ] ]
+    "components": [ [ [ "felt_patch", 60 ] ], [ [ "yarn", 650 ] ] ]
   },
   {
     "result": "character_sheet",

data/json/vehicleparts/vehicle_parts.json

@@ -266,17 +266,22 @@
     "durability": 95,
     "description": "A small but comfortable bed.",
     "size": "50 L",
-    "item": "seat",
+    "item": "mattress",
     "comfort": 4,
-    "floor_bedding_warmth": 300,
+    "floor_bedding_warmth": 800,
     "location": "center",
     "requirements": {
-      "install": { "skills": [ [ "mechanics", 1 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] },
-      "removal": { "skills": [ [ "mechanics", 1 ] ], "time": "30 m", "using": [ [ "vehicle_weld_removal", 1 ] ] },
+      "install": { "skills": [ [ "mechanics", 1 ] ], "time": "60 m", "qualities": [ { "id": "WRENCH", "level": 1 } ] },
+      "removal": { "skills": [ [ "mechanics", 1 ] ], "time": "30 m", "qualities": [ { "id": "WRENCH", "level": 1 } ] },
       "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ], [ "steel_tiny", 1 ] ] }
     },
     "flags": [ "BED", "BOARDABLE", "CARGO", "MOUNTABLE" ],
-    "breaks_into": "ig_vp_seat",
+    "breaks_into": [
+      { "item": "rag", "count": [ 1, 20 ] },
+      { "item": "cotton_ball", "count": [ 5, 25 ] },
+      { "item": "spring", "count": [ 0, 3 ] },
+      { "item": "scrap", "count": [ 4, 6 ] }
+    ],
     "damage_reduction": { "all": 3 }
   },
   {
@@ -2871,7 +2876,7 @@
     "description": "A clock, so you know what time it is.",
     "epower": 0,
     "folded_volume": "250 ml",
-    "item": "wristwatch",
+    "item": "clock",
     "requirements": {
       "install": { "skills": [ [ "mechanics", 0 ] ], "time": "150 s", "using": [ [ "vehicle_screw", 1 ] ] },
       "removal": { "skills": [ [ "mechanics", 0 ] ], "time": "150 s", "using": [ [ "vehicle_screw", 1 ] ] },

tests/vehicle_drag_test.cpp

@@ -288,7 +288,7 @@ TEST_CASE( "vehicle_drag", "[vehicle] [engine]" )
     test_vehicle_drag( "cube_van_cheap", 0.512775, 3.556550, 2563.049085, 9853, 11885 );
     test_vehicle_drag( "hippie_van", 0.386033, 2.886681, 1167.694643, 10881, 13109 );
     test_vehicle_drag( "icecream_truck", 0.681673, 3.686107, 1974.662162, 10726, 12873 );
-    test_vehicle_drag( "lux_rv", 1.609183, 3.431263, 1936.754934, 8453, 9826 );
+    test_vehicle_drag( "lux_rv", 1.609183, 3.662015, 2066.995614, 8453, 9826 );
     test_vehicle_drag( "meth_lab", 0.518580, 2.948098, 2018.085106, 11800, 14147 );
     test_vehicle_drag( "rv", 0.541800, 2.926340, 2003.191489, 11648, 13961 );
     test_vehicle_drag( "schoolbus", 0.411188, 3.331642, 1491.510227, 12930, 15101 );

tests/vehicle_efficiency_test.cpp

@@ -436,35 +436,35 @@ TEST_CASE( "vehicle_efficiency", "[vehicle] [engine]" )
 {
     clear_all_state();
     test_vehicle( "beetle", 818837, 431300, 338700, 95610, 68060 );
-    test_vehicle( "car", 1124954, 617500, 386100, 52730, 25170 );
+    test_vehicle( "car", 1125629, 617500, 386100, 52730, 25170 );
     test_vehicle( "car_sports", 1157382, 352600, 267600, 36790, 22350 );
-    test_vehicle( "electric_car", 878423, 183880, 127125, 13410, 8705 );
-    test_vehicle( "suv", 1324622, 1163000, 614130, 85540, 32000 );
+    test_vehicle( "electric_car", 879098, 183880, 127125, 13410, 8705 );
+    test_vehicle( "suv", 1325297, 1163000, 614130, 85540, 32000 );
     test_vehicle( "motorcycle", 163085, 120300, 99930, 63320, 50810 );
     test_vehicle( "quad_bike", 265345, 116100, 116100, 46770, 46770 );
     test_vehicle( "scooter", 57587, 233500, 233500, 167900, 167900 );
     test_vehicle( "superbike", 244085, 109800, 65300, 41780, 24070 );
-    test_vehicle( "ambulance", 1842467, 613400, 504700, 77700, 58290 );
+    test_vehicle( "ambulance", 1854071, 613400, 504700, 77700, 57139 );
     test_vehicle( "fire_engine", 2257115, 1938615, 1819475, 394660, 363895 );
     test_vehicle( "fire_truck", 6319523, 410700, 83850, 19080, 4063 );
     test_vehicle( "truck_swat", 5966006, 682900, 131700, 29610, 7604 );
     test_vehicle( "tractor_plow", 725658, 681200, 681200, 132400, 132400 );
-    test_vehicle( "apc", 5805459, 2103310, 2124343, 110600, 110657 );
-    test_vehicle( "humvee", 5506381, 767900, 564679, 25620, 18343 );
+    test_vehicle( "apc", 5806134, 2103310, 2124343, 110600, 110657 );
+    test_vehicle( "humvee", 5507056, 767900, 564679, 25620, 18343 );
     test_vehicle( "road_roller", 8831804, 602500, 147100, 22760, 6925 );
     test_vehicle( "golf_cart", 319630, 49585, 47185, 22700, 12745 );
 
     // in reverse
     test_vehicle( "beetle", 818837, 58970, 58870, 44560, 43060, 0, 0, true );
-    test_vehicle( "car", 1124954, 76060, 76060, 44230, 24870, 0, 0, true );
+    test_vehicle( "car", 1125629, 76060, 76060, 44230, 24870, 0, 0, true );
     test_vehicle( "car_sports", 1157382, 353200, 268000, 35200, 19540, 0, 0, true );
-    test_vehicle( "electric_car", 878423, 133100, 72520, 8140, 3390, 0, 0, true );
-    test_vehicle( "suv", 1324622, 112000, 111800, 66880, 31670, 0, 0, true );
+    test_vehicle( "electric_car", 879098, 133100, 72520, 8140, 3390, 0, 0, true );
+    test_vehicle( "suv", 1325297, 112000, 111800, 66880, 31670, 0, 0, true );
     test_vehicle( "motorcycle", 163085, 19980, 19030, 15490, 14890, 0, 0, true );
     test_vehicle( "quad_bike", 265345, 19650, 19650, 15440, 15440, 0, 0, true );
     test_vehicle( "scooter", 57587, 62440, 62440, 47990, 47990, 0, 0, true );
     test_vehicle( "superbike", 244085, 18320, 10570, 13070, 8497, 0, 0, true );
-    test_vehicle( "ambulance", 1842467, 58460, 57780, 42480, 39130, 0, 0, true );
+    test_vehicle( "ambulance", 1854071, 58460, 57780, 42480, 39130, 0, 0, true );
     test_vehicle( "fire_engine", 2257115, 258000, 257800, 179800, 173300, 0, 0, true );
     test_vehicle( "fire_truck", 6319523, 58480, 58640, 18600, 4471, 0, 0, true );
     test_vehicle( "truck_swat", 5966006, 129300, 130100, 29350, 7668, 0, 0, true );