Tweak glass recipes (#35592)

* Lower weight of glass sheet.

* Lower weight of glass pipe

* Tweak glass recipes.

* Fix syntax

* Lint

* Tweak vehicle drag tests.

* Tweak weights in vehicle efficiency test

* Tweak target_distance values at vehicle_efficiency test

* Update vehicle_efficiency.cpp

data/json/items/resources/glass.json

@@ -32,7 +32,7 @@
     "category": "spare_parts",
     "price": 5000,
     "material": "glass",
-    "weight": "24176 g",
+    "weight": "13608 g",
     "volume": "12500 ml",
     "bashing": 4,
     "to_hit": -5,

data/json/items/tools.json

@@ -4516,7 +4516,7 @@
     "type": "TOOL",
     "name": "glass pipe",
     "description": "This is a hand-blown glass pipe.  It's of the type most commonly used to smoke recreational substances.",
-    "weight": "442 g",
+    "weight": "163 g",
     "volume": "250 ml",
     "price": 2000,
     "to_hit": -10,

data/json/recipes/recipe_others.json

@@ -24,7 +24,7 @@
     "time": "25 m",
     "autolearn": true,
     "qualities": [ { "id": "HAMMER", "level": 1 } ],
-    "components": [ [ [ "glass_shard", 322 ], [ "glass_sheet", 1 ] ], [ [ "superglue", 1 ], [ "bone_glue", 1 ] ] ]
+    "components": [ [ [ "glass_shard", 17 ] ], [ [ "superglue", 1 ], [ "bone_glue", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -2948,7 +2948,7 @@
     "book_learn": [ [ "glassblowing_book", 5 ] ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "pipe", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 150 ] ] ],
-    "components": [ [ [ "glass_shard", 5 ], [ "flask_glass", 6 ], [ "jar_glass", 4 ] ] ]
+    "components": [ [ [ "glass_shard", 27 ], [ "flask_glass", 6 ], [ "jar_glass", 4 ] ] ]
   },
   {
     "type": "recipe",
@@ -2961,7 +2961,7 @@
     "book_learn": [ [ "glassblowing_book", 5 ] ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "pipe", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 75 ] ] ],
-    "components": [ [ [ "glass_shard", 3 ], [ "flask_glass", 3 ], [ "jar_glass", 2 ] ] ]
+    "components": [ [ [ "glass_shard", 15 ], [ "flask_glass", 3 ], [ "jar_glass", 2 ] ] ]
   },
   {
     "type": "recipe",
@@ -2974,7 +2974,7 @@
     "book_learn": [ [ "glassblowing_book", 4 ] ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "pipe", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 50 ] ] ],
-    "components": [ [ [ "glass_shard", 8 ], [ "flask_glass", 2 ] ] ]
+    "components": [ [ [ "glass_shard", 11 ], [ "flask_glass", 2 ] ] ]
   },
   {
     "type": "recipe",
@@ -3039,7 +3039,7 @@
     "book_learn": [ [ "glassblowing_book", 6 ] ],
     "qualities": [ { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "pipe", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "forge", 25 ] ] ],
-    "components": [ [ [ "glass_shard", 2 ] ] ]
+    "components": [ [ [ "glass_shard", 4 ] ] ]
   },
   {
     "type": "recipe",
@@ -3051,7 +3051,7 @@
     "time": "1 h",
     "autolearn": true,
     "tools": [ [ [ "tongs", -1 ] ], [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ], [ [ "sheet_metal", -1 ] ], [ [ "forge", 75 ] ] ],
-    "components": [ [ [ "glass_shard", 322 ], [ "flask_glass", 80 ], [ "jar_glass", 40 ] ] ]
+    "components": [ [ [ "glass_shard", 250 ], [ "flask_glass", 63 ], [ "jar_glass", 21 ] ] ]
   },
   {
     "type": "recipe",

tests/vehicle_drag.cpp

@@ -254,19 +254,19 @@ TEST_CASE( "vehicle_drag", "[vehicle] [engine]" )
     test_vehicle_drag( "tandem", 0.609525, 0.021344, 40.290625, 2353, 3076 );
     test_vehicle_drag( "unicycle", 0.690795, 0.002400, 24.162500, 2266, 2958 );
     test_vehicle_drag( "beetle", 0.785610, 1.693784, 1199.020312, 8902, 10668 );
-    test_vehicle_drag( "bubble_car", 0.823988, 1.670566, 1126.270833, 9434, 9785 );
+    test_vehicle_drag( "bubble_car", 0.823988, 1.373576, 926.044643, 9365, 9711 );
     test_vehicle_drag( "car", 0.294604, 2.366883, 1117.002083, 11837, 14304 );
     test_vehicle_drag( "car_mini", 0.294604, 1.709414, 1210.084375, 12080, 14536 );
     test_vehicle_drag( "car_sports", 0.294604, 2.424461, 1373.010000, 20847, 24914 );
     test_vehicle_drag( "car_sports_atomic", 0.294604, 3.552642, 1676.596875, 24664, 25593 );
     test_vehicle_drag( "car_sports_electric", 0.294604, 3.192600, 1808.018750, 24774, 25702 );
     test_vehicle_drag( "electric_car", 0.304763, 2.407649, 1136.240625, 16203, 16819 );
-    test_vehicle_drag( "rara_x", 0.880425, 2.099200, 1093.158405, 8484, 8803 );
+    test_vehicle_drag( "rara_x", 0.880425, 1.902452, 990.701509, 8408, 8724 );
     test_vehicle_drag( "suv", 0.294604, 2.807600, 1135.705357, 13939, 16801 );
     test_vehicle_drag( "suv_electric", 0.304763, 2.589389, 1047.436607, 16144, 16760 );
     test_vehicle_drag( "golf_cart", 0.943313, 1.479398, 930.895833, 7126, 7393 );
     test_vehicle_drag( "golf_cart_4seat", 0.943313, 1.446760, 910.358333, 7131, 7398 );
-    test_vehicle_drag( "hearse", 0.355556, 3.016494, 1220.205357, 10995, 13320 );
+    test_vehicle_drag( "hearse", 0.355556, 2.827377, 1143.705357, 11164, 13453 );
     test_vehicle_drag( "pickup_technical", 0.838097, 2.820320, 1140.850893, 10136, 12149 );
     test_vehicle_drag( "ambulance", 1.049323, 2.264056, 1858.217708, 11256, 13438 );
     test_vehicle_drag( "car_fbi", 0.457144, 2.635064, 1243.564583, 14570, 17458 );
@@ -303,7 +303,7 @@ TEST_CASE( "vehicle_drag", "[vehicle] [engine]" )
     test_vehicle_drag( "lux_rv", 1.609183, 3.571591, 2015.961623, 8400, 9790 );
     test_vehicle_drag( "meth_lab", 0.518580, 3.025322, 2070.948138, 11677, 14056 );
     test_vehicle_drag( "rv", 0.541800, 3.000739, 2054.120213, 11528, 13872 );
-    test_vehicle_drag( "schoolbus", 0.411188, 3.060324, 1370.046591, 12891, 15087 );
+    test_vehicle_drag( "schoolbus", 0.411187, 2.794265, 1250.937500, 13069, 15234 );
     test_vehicle_drag( "security_van", 0.541800, 7.592192, 6231.269792, 10977, 13009 );
     test_vehicle_drag( "wienermobile", 1.063697, 2.315334, 1900.304167, 11201, 13374 );
     test_vehicle_drag( "canoe", 0.609525, 6.948203, 1.967437, 331, 691 );

tests/vehicle_efficiency.cpp

@@ -430,22 +430,22 @@ TEST_CASE( "vehicle_make_efficiency_case", "[.]" )
 // Fix test for electric vehicles
 TEST_CASE( "vehicle_efficiency", "[vehicle] [engine]" )
 {
-    test_vehicle( "beetle", 787373, 292300, 228600, 75730, 56370 );
-    test_vehicle( "car", 1092322, 520800, 302500, 47060, 26470 );
-    test_vehicle( "car_sports", 1125918, 456200, 312000, 38140, 22390 );
-    test_vehicle( "electric_car", 1097791, 215469, 120379, 17211, 8898 );
-    test_vehicle( "suv", 1291990, 987100, 483000, 69560, 33260 );
+    test_vehicle( "beetle", 745101, 294587, 242197, 79708, 60855 );
+    test_vehicle( "car", 1050050, 522175, 313125, 48143, 29452 );
+    test_vehicle( "car_sports", 1083646, 456200, 320929, 39494, 24378 );
+    test_vehicle( "electric_car", 1055519, 215663, 125341, 18172, 9614 );
+    test_vehicle( "suv", 1249718, 988969, 499869, 73538, 35070 );
     test_vehicle( "motorcycle", 163085, 77300, 63120, 47530, 39030 );
     test_vehicle( "quad_bike", 265345, 75950, 75950, 35190, 35190 );
     test_vehicle( "scooter", 62587, 266900, 258300, 195200, 184400 );
     test_vehicle( "superbike", 242085, 72120, 46820, 34580, 21610 );
-    test_vehicle( "ambulance", 1803929, 432000, 345500, 64010, 47220 );
-    test_vehicle( "fire_engine", 2593241, 1169000, 960700, 244700, 215300 );
-    test_vehicle( "fire_truck", 6279233, 308500, 199100, 19950, 4747 );
+    test_vehicle( "ambulance", 1751089, 432000, 356896, 65848, 50876 );
+    test_vehicle( "fire_engine", 2540401, 1169000, 972534, 246049, 216909 );
+    test_vehicle( "fire_truck", 6226393, 308500, 199989, 19950, 4747 );
     test_vehicle( "truck_swat", 5959334, 505800, 348000, 30060, 7719 );
     test_vehicle( "tractor_plow", 723658, 528000, 528000, 117000, 117000 );
     test_vehicle( "apc", 5801619, 1100000, 948300, 132800, 86880 );
     test_vehicle( "humvee", 5499145, 607600, 341100, 25880, 9263 );
-    test_vehicle( "road_roller", 8779702, 369800, 412000, 22990, 6996 );
+    test_vehicle( "road_roller", 8705726, 359830, 414037, 22990, 6996 );
     test_vehicle( "golf_cart", 444630, 52800, 105591, 27250, 14207 );
 }