Small tweaks (#68393)

* lorica segmentata is armor * tweak rad badge description * Update data/json/items/armor/jewelry.json Co-authored-by: Karol1223 <[email protected]> * calf zombifies into small cocoon * make t_bulk_tank work like tank, update disassembly recipe for 55gal_drum * no keg_capacity because it's terrain * fix vehicle heaters prevent full deconstruction * fixing vehicle tests because additional vehicle weigh * and again * alcohol wipes are countable --------- Co-authored-by: Karol1223 <[email protected]>
CleverRaven · Oct 2, 2023 · e3edded · e3edded
1 parent 842d15f
commit e3edded
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 30 deletions.
diff --git a/data/json/furniture_and_terrain/terrain-manufactured.json b/data/json/furniture_and_terrain/terrain-manufactured.json
@@ -1223,25 +1223,14 @@
       "sound": "crunch!",
       "sound_fail": "whump!",
       "items": [
-        { "item": "wire", "count": [ 1, 2 ] },
         { "item": "pipe", "count": [ 1, 2 ] },
         { "item": "steel_lump", "count": [ 1, 5 ] },
-        { "item": "sheet_metal", "count": [ 1, 3 ] },
-        { "item": "steel_chunk", "count": [ 1, 5 ] }
-      ]
-    },
-    "deconstruct": {
-      "ter_set": "t_floor",
-      "items": [
-        { "item": "wire", "count": [ 2, 8 ] },
-        { "item": "pipe", "count": [ 1, 3 ] },
-        { "item": "pipe_fittings", "count": [ 1, 2 ] },
-        { "item": "steel_lump", "count": [ 1, 8 ] },
-        { "item": "sheet_metal", "count": [ 1, 6 ] },
-        { "item": "steel_chunk", "count": [ 1, 10 ] }
+        { "item": "sheet_metal", "count": [ 1, 2 ] },
+        { "item": "steel_chunk", "count": [ 0, 2 ] }
       ]
     },
-    "flags": [ "CONTAINER", "SEALED", "PLACE_ITEM", "WALL", "MINEABLE" ]
+    "deconstruct": { "ter_set": "t_floor", "items": [ { "item": "55gal_drum" }, { "item": "water_faucet" } ] },
+    "flags": [ "CONTAINER", "LIQUIDCONT", "NOITEM", "WALL" ]
   },
   {
     "id": "t_rockyobstacle",

diff --git a/data/json/items/armor/jewelry.json b/data/json/items/armor/jewelry.json
@@ -1872,7 +1872,7 @@
     "type": "ARMOR",
     "name": { "str": "radiation badge" },
     "//": "These seem to be sold via subscription; makes a certain amount of sense, but low-bid seems a Bad Idea.",
-    "description": "A plastic badge with an embedded filmstrip.  The filmstrip changes color as it is exposed to radiation.  Wear on your lapel so you can notice if it changes.",
+    "description": "A plastic badge with an embedded filmstrip.  The text on the badge says the filmstrip changes color as it is exposed to radiation, and never goes back to how it initially looked.  Wear on your lapel so you can notice if it changes.",
     "weight": "25 g",
     "volume": "25 ml",
     "price": 8000,

diff --git a/data/json/items/armor/torso_armor.json b/data/json/items/armor/torso_armor.json
@@ -294,6 +294,7 @@
     "symbol": "[",
     "longest_side": "60 cm",
     "looks_like": "armor_lamellar",
+    "category": "armor",
     "color": "light_gray",
     "warmth": 15,
     "material_thickness": 4,

diff --git a/data/json/items/tool/med.json b/data/json/items/tool/med.json
@@ -19,7 +19,7 @@
     "id": "alcohol_wipes",
     "type": "GENERIC",
     "category": "drugs",
-    "name": { "str_sp": "alcohol wipe" },
+    "name": { "str": "alcohol wipe" },
     "description": "A wet wipe saturated with alcohol and stored in a sterile package.  Used for personal hygiene or disinfecting small wounds.",
     "weight": "5 g",
     "volume": "1 ml",

diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json
@@ -729,6 +729,7 @@
     "fear_triggers": [ "PLAYER_CLOSE" ],
     "placate_triggers": [ "PLAYER_WEAK" ],
     "death_drops": { "subtype": "collection", "groups": [ [ "cow", 25 ] ], "//": "25% chance of an item from group cow" },
+    "zombify_into": "mon_meat_cocoon_small",
     "harvest": "mammal_large_leather",
     "dissect": "dissect_cattle_sample_single",
     "families": [ "prof_intro_biology" ],

diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json
@@ -7285,7 +7285,7 @@
     "activity_level": "MODERATE_EXERCISE",
     "time": "2 h",
     "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 2 } ],
-    "components": [ [ [ "sheet_metal", 3 ] ], [ [ "steel_lump", 2 ] ] ]
+    "components": [ [ [ "sheet_metal", 2 ] ], [ [ "sheet_metal_small", 12 ] ], [ [ "scrap", 20 ] ] ]
   },
   {
     "result": "manhole_cover",

diff --git a/data/json/vehicleparts/vehicle_parts.json b/data/json/vehicleparts/vehicle_parts.json
@@ -1362,11 +1362,12 @@
     "id": "integrated_heater_small",
     "copy-from": "mountable_heater_small",
     "description": "Set of tubes, that move heat from the engine into the vehicle cabin, heating it up.",
+    "item": "pipe",
     "type": "vehicle_part",
     "location": "",
     "name": { "str": "small integrated heater" },
-    "//": "can't be installed or unistalled, can only be bashed away",
-    "requirements": { "install": { "skills": [ [ "mechanics", 99 ] ] }, "removal": { "skills": [ [ "mechanics", 99 ] ] } }
+    "extend": { "flags": [ "NO_INSTALL_HIDDEN" ] },
+    "requirements": { "removal": { "skills": [ [ "mechanics", 1 ] ], "time": "5 m", "qualities": [ { "id": "SAW_M", "level": 2 } ] } }
   },
   {
     "id": "mountable_cooler",

diff --git a/data/mods/TEST_DATA/vehicle_efficiency_test.json b/data/mods/TEST_DATA/vehicle_efficiency_test.json
@@ -3,21 +3,21 @@
     "type": "test_data",
     "//": "Array values: mass, pavement, dirt, pavement with stops, dirt with stops",
     "efficiency_data": {
-      "suv": { "forward": [ 1260980, 1393115, 729950, 93030, 34309 ], "reverse": [ 1260980, 114400, 114300, 69740, 34169 ] },
-      "car": { "forward": [ 1022312, 758800, 487000, 61570, 30734 ], "reverse": [ 1022312, 78220, 78220, 49540, 31028 ] },
-      "humvee": { "forward": [ 5529616, 804000, 295300, 27760, 9274 ], "reverse": [ 5529616, 88340, 88430, 27700, 9329 ] },
+      "suv": { "forward": [ 1255580, 1393115, 729950, 93030, 35420 ], "reverse": [ 1255580, 114400, 114300, 69740, 35037 ] },
+      "car": { "forward": [ 1016912, 758800, 487000, 61570, 31514 ], "reverse": [ 1016912, 78220, 78220, 49540, 29881 ] },
+      "humvee": { "forward": [ 5524216, 804000, 295300, 27760, 9274 ], "reverse": [ 5524216, 88340, 88430, 27700, 9329 ] },
       "road_roller": { "forward": [ 9056593, 576400, 128500, 22990, 6996 ], "reverse": [ 9056593, 97010, 97210, 23160, 6648 ] },
-      "fire_engine": { "forward": [ 2105850, 2051000, 2051000, 438902, 438902 ], "reverse": [ 2105850, 254700, 254700, 189000, 189000 ] },
+      "fire_engine": { "forward": [ 2100450, 2051000, 2051000, 447892, 447892 ], "reverse": [ 2100450, 254700, 254700, 189000, 189000 ] },
       "motorcycle": { "forward": [ 157935, 133200, 112200, 68030, 55620 ], "reverse": [ 157935, 21230, 19620, 16300, 15350 ] },
-      "car_sports": { "forward": [ 1011590, 665500, 483000, 44490, 31369 ], "reverse": [ 1011590, 667700, 484600, 42877, 28553 ] },
-      "ambulance": { "forward": [ 1724161, 589714, 494600, 92170, 74550 ], "reverse": [ 1724161, 54450, 54030, 41110, 39970 ] },
+      "car_sports": { "forward": [ 1006190, 665500, 483000, 44490, 31712 ], "reverse": [ 1006190, 667700, 484600, 42877, 28849 ] },
+      "ambulance": { "forward": [ 1718761, 581126, 494600, 92170, 74550 ], "reverse": [ 1718761, 54450, 54030, 41110, 39970 ] },
       "superbike": { "forward": [ 232935, 126400, 73470, 45480, 26130 ], "reverse": [ 232935, 19660, 11160, 13860, 8875 ] },
-      "electric_car": { "forward": [ 727829, 203700, 169701, 16636, 13635 ], "reverse": [ 727829, 204000, 169972, 16669, 13662 ] },
+      "electric_car": { "forward": [ 722429, 203700, 173713, 16636, 13807 ], "reverse": [ 722429, 204000, 173991, 16669, 13835 ] },
       "test_beetle": { "forward": [ 711045, 499600, 434400, 116300, 95800 ], "reverse": [ 711045, 60380, 60270, 47140, 45680 ] },
       "scooter": { "forward": [ 37541, 309800, 309800, 237100, 237100 ], "reverse": [ 37541, 92444, 92444, 68680, 68680 ] },
-      "truck_swat": { "forward": [ 6058751, 629000, 112300, 34510, 7719 ], "reverse": [ 6058751, 126300, 127100, 32650, 7898 ] },
-      "fire_truck": { "forward": [ 6194143, 404800, 82000, 21260, 4751 ], "reverse": [ 6194143, 56790, 56830, 21220, 4673 ] },
-      "apc": { "forward": [ 5837894, 1558000, 1042000, 143000, 92162 ], "reverse": [ 5837894, 376700, 376700, 142900, 92760 ] },
+      "truck_swat": { "forward": [ 6053351, 629000, 112300, 34510, 7719 ], "reverse": [ 6053351, 126300, 127100, 32650, 7898 ] },
+      "fire_truck": { "forward": [ 6188743, 404800, 82000, 21260, 4751 ], "reverse": [ 6188743, 56790, 56830, 21220, 4673 ] },
+      "apc": { "forward": [ 5832494, 1558000, 1042000, 143000, 96817 ], "reverse": [ 5832494, 376700, 376700, 142900, 92760 ] },
       "quad_bike": { "forward": [ 260845, 107400, 107400, 47040, 47040 ], "reverse": [ 260845, 18770, 18770, 14750, 14750 ] },
       "golf_cart": { "forward": [ 340630, 44600, 44920, 20990, 12180 ], "reverse": [ 340630, 44670, 15800, 21030, 8274 ] },
       "tractor_plow": { "forward": [ 742758, 673600, 673600, 142700, 142700 ], "reverse": [ 742758, 62490, 62490, 47320, 47320 ] }