Tune and expand furniture bash fields (#81628)

I-am-Erk · web-flow · commit 3fe918c8c0ed · 2025-07-07T08:54:21.000-05:00
* adjust spread of debris and rename fields

* add mechanical fluid to debris of a lot of machinery

* make some things drop water

also moves the Mechanical Fluids field into debris, and adds looks_like to fd_dust

* add moppable to mechanical fluid and water

* Update field_type.json

* syntax fix I missed
diff --git a/data/json/field_type.json b/data/json/field_type.json
@@ -1882,21 +1882,6 @@
     "display_field": true,
     "looks_like": "fd_smoke"
   },
-  {
-    "id": "fd_mechanical_fluid",
-    "type": "field_type",
-    "intensity_levels": [
-      { "name": "mechanical fluid splatter", "color": "light_gray" },
-      { "name": "mechanical fluid stain" },
-      { "name": "puddle of mechanical fluid", "color": "dark_gray" }
-    ],
-    "description_affix": "covered_in",
-    "is_splattering": true,
-    "half_life": "10 days",
-    "phase": "liquid",
-    "display_field": true,
-    "looks_like": "fd_sludge"
-  },
   {
     "id": "fd_electricity_unlit",
     "type": "field_type",
diff --git a/data/json/fields/debris.json b/data/json/fields/debris.json
@@ -5,7 +5,7 @@
     "intensity_levels": [
       { "name": "dust", "sym": "%", "color": "brown", "transparent": true, "dangerous": false, "concentration": 1 },
       {
-        "name": "fountain of dust",
+        "name": "dust and grime",
         "sym": "%",
         "color": "brown",
         "transparent": true,
@@ -20,13 +20,14 @@
     "description_affix": "covered_in",
     "mopsafe": true,
     "moppable": true,
-    "percent_spread": 33,
-    "phase": "gas"
+    "percent_spread": 20,
+    "phase": "gas",
+    "looks_like": "t_open_air"
   },
   {
     "type": "field_type",
     "id": "fd_splinters",
-    "intensity_levels": [ { "name": "splinters", "sym": "%", "color": "brown", "transparent": true, "dangerous": false, "concentration": 1 } ],
+    "intensity_levels": [ { "name": "wood debris", "sym": "%", "color": "brown", "transparent": true, "dangerous": false, "concentration": 1 } ],
     "priority": 2,
     "dirty_transparency_cache": false,
     "display_items": true,
@@ -35,6 +36,40 @@
     "mopsafe": true,
     "moppable": true,
     "percent_spread": 8,
-    "phase": "gas"
+    "phase": "gas",
+    "looks_like": "fd_dust"
+  },
+  {
+    "id": "fd_mechanical_fluid",
+    "type": "field_type",
+    "intensity_levels": [
+      { "name": "mechanical fluid splatter", "color": "light_gray" },
+      { "name": "mechanical fluid stain" },
+      { "name": "puddle of mechanical fluid", "color": "dark_gray" }
+    ],
+    "description_affix": "covered_in",
+    "is_splattering": true,
+    "mopsafe": true,
+    "moppable": true,
+    "half_life": "10 days",
+    "phase": "liquid",
+    "display_field": true,
+    "looks_like": "fd_sludge"
+  },
+  {
+    "id": "fd_dirty_water",
+    "type": "field_type",
+    "intensity_levels": [
+      { "name": "dirty water splatter", "color": "light_gray" },
+      { "name": "dirty water stain" },
+      { "name": "puddle of dirty water", "color": "dark_gray" }
+    ],
+    "description_affix": "covered_in",
+    "mopsafe": true,
+    "moppable": true,
+    "half_life": "2 hours",
+    "phase": "liquid",
+    "display_field": true,
+    "looks_like": "water"
   }
 ]
diff --git a/data/json/furniture_and_terrain/furniture-industrial.json b/data/json/furniture_and_terrain/furniture-industrial.json
@@ -21,7 +21,8 @@
         { "item": "metal_tank_little", "count": [ 0, 2 ] },
         { "item": "jerrycan", "count": [ 0, 2 ] },
         { "item": "metal_tank", "count": [ 0, 2 ] }
-      ]
+      ],
+      "destroyed_field": [ "fd_mechanical_fluid", 2 ]
     },
     "deconstruct": {
       "items": [
@@ -57,7 +58,8 @@
         { "item": "lc_steel_chunk", "count": [ 1, 4 ] },
         { "item": "scrap", "count": [ 3, 7 ] },
         { "item": "pipe", "count": [ 0, 1 ] }
-      ]
+      ],
+      "destroyed_field": [ "fd_mechanical_fluid", 1 ]
     },
     "deconstruct": {
       "items": [
@@ -165,7 +167,8 @@
         { "item": "bearing", "charges": [ 2, 8 ] },
         { "item": "frame", "prob": 20 },
         { "item": "motor_small", "prob": 10 }
-      ]
+      ],
+      "destroyed_field": [ "fd_mechanical_fluid", 1 ]
     }
   },
   {
@@ -222,7 +225,8 @@
         { "item": "motor", "prob": 10 },
         { "item": "metal_tank", "prob": 20 },
         { "item": "motor_large", "prob": 5 }
-      ]
+      ],
+      "destroyed_field": [ "fd_mechanical_fluid", 2 ]
     }
   },
   {
@@ -278,8 +282,8 @@
         { "item": "2x4", "count": 2 },
         { "item": "nail", "charges": [ 2, 5 ] }
       ],
-      "hit_field": [ "fd_dust", 2 ],
-      "destroyed_field": [ "fd_splinters", 1 ]
+      "hit_field": [ "fd_dust", 3 ],
+      "destroyed_field": [ "fd_mechanical_fluid", 1 ]
     }
   },
   {
@@ -516,7 +520,8 @@
         { "item": "amplifier", "prob": 40 },
         { "item": "plastic_chunk", "count": [ 2, 8 ] },
         { "item": "scrap", "count": [ 3, 8 ] }
-      ]
+      ],
+      "destroyed_field": [ "fd_mechanical_fluid", 1 ]
     }
   },
   {
diff --git a/data/json/furniture_and_terrain/furniture-medical.json b/data/json/furniture_and_terrain/furniture-medical.json
@@ -43,7 +43,8 @@
         { "item": "amplifier", "prob": 25 },
         { "item": "plastic_chunk", "count": [ 4, 10 ], "prob": 50 },
         { "item": "scrap", "count": [ 2, 6 ], "prob": 50 }
-      ]
+      ],
+      "destroyed_field": [ "fd_mechanical_fluid", 1 ]
     }
   },
   {
@@ -81,8 +82,7 @@
         { "item": "sheet_cotton", "count": [ 3, 4 ] },
         { "item": "cotton_patchwork", "count": [ 3, 4 ] }
       ],
-      "hit_field": [ "fd_dust", 2 ],
-      "destroyed_field": [ "fd_splinters", 1 ]
+      "destroyed_field": [ "fd_mechanical_fluid", 1 ]
     }
   },
   {
@@ -113,7 +113,8 @@
         { "item": "hose", "count": [ 0, 2 ] },
         { "item": "cu_pipe", "count": [ 1, 4 ] },
         { "item": "scrap_copper", "count": [ 0, 2 ] }
-      ]
+      ],
+      "destroyed_field": [ "fd_mechanical_fluid", 1 ]
     }
   },
   {
@@ -156,7 +157,8 @@
         { "item": "hose", "count": [ 0, 2 ] },
         { "item": "cu_pipe", "count": [ 1, 4 ] },
         { "item": "scrap_copper", "count": [ 0, 2 ] }
-      ]
+      ],
+      "destroyed_field": [ "fd_mechanical_fluid", 1 ]
     }
   },
   {
@@ -201,7 +203,8 @@
         { "item": "cu_pipe", "count": [ 2, 4 ] },
         { "item": "scrap_copper", "count": [ 1, 2 ] },
         { "item": "motor_tiny", "prob": 25 }
-      ]
+      ],
+      "destroyed_field": [ "fd_mechanical_fluid", 1 ]
     }
   },
   {
@@ -288,7 +291,8 @@
         { "item": "pipe", "count": 1 },
         { "item": "glass_shard", "count": [ 25, 100 ] },
         { "item": "cable", "charges": [ 1, 2 ] }
-      ]
+      ],
+      "destroyed_field": [ "fd_mechanical_fluid", 1 ]
     }
   },
   {
@@ -327,7 +331,8 @@
         { "item": "sheet_metal", "count": [ 1, 4 ] },
         { "item": "element", "count": [ 1, 3 ] },
         { "item": "cable", "charges": [ 1, 15 ] }
-      ]
+      ],
+      "destroyed_field": [ "fd_mechanical_fluid", 1 ]
     }
   },
   {
@@ -429,7 +434,8 @@
         { "item": "hose", "count": [ 0, 1 ] },
         { "item": "e_scrap", "count": [ 5, 10 ] },
         { "item": "plastic_chunk", "count": [ 0, 2 ] }
-      ]
+      ],
+      "destroyed_field": [ "fd_mechanical_fluid", 2 ]
     }
   },
   {
@@ -473,7 +479,8 @@
         { "item": "hose", "count": [ 0, 1 ] },
         { "item": "e_scrap", "count": [ 5, 10 ] },
         { "item": "plastic_chunk", "count": [ 0, 2 ] }
-      ]
+      ],
+      "destroyed_field": [ "fd_mechanical_fluid", 2 ]
     }
   },
   {
@@ -513,7 +520,8 @@
         { "item": "cable", "charges": [ 1, 15 ] },
         { "item": "e_scrap", "count": [ 5, 10 ] },
         { "item": "plastic_chunk", "count": [ 0, 2 ] }
-      ]
+      ],
+      "destroyed_field": [ "fd_mechanical_fluid", 2 ]
     }
   },
   {
@@ -552,7 +560,8 @@
         { "item": "cable", "charges": [ 1, 15 ] },
         { "item": "e_scrap", "count": [ 5, 10 ] },
         { "item": "plastic_chunk", "count": [ 0, 2 ] }
-      ]
+      ],
+      "destroyed_field": [ "fd_mechanical_fluid", 2 ]
     }
   },
   {
@@ -590,7 +599,8 @@
         { "item": "cable", "charges": [ 1, 15 ] },
         { "item": "e_scrap", "count": [ 5, 10 ] },
         { "item": "plastic_chunk", "count": [ 0, 2 ] }
-      ]
+      ],
+      "destroyed_field": [ "fd_mechanical_fluid", 1 ]
     }
   },
   {
@@ -630,7 +640,8 @@
         { "item": "cable", "charges": [ 1, 15 ] },
         { "item": "e_scrap", "count": [ 5, 10 ] },
         { "item": "plastic_chunk", "count": [ 0, 2 ] }
-      ]
+      ],
+      "destroyed_field": [ "fd_mechanical_fluid", 2 ]
     }
   },
   {
@@ -670,7 +681,8 @@
         { "item": "cable", "charges": [ 1, 15 ] },
         { "item": "e_scrap", "count": [ 5, 10 ] },
         { "item": "plastic_chunk", "count": [ 0, 2 ] }
-      ]
+      ],
+      "destroyed_field": [ "fd_mechanical_fluid", 2 ]
     }
   },
   {
@@ -750,7 +762,8 @@
         { "item": "hose", "count": [ 0, 1 ] },
         { "item": "e_scrap", "count": [ 5, 10 ] },
         { "item": "plastic_chunk", "count": [ 0, 2 ] }
-      ]
+      ],
+      "destroyed_field": [ "fd_mechanical_fluid", 1 ]
     }
   },
   {
@@ -793,7 +806,8 @@
         { "item": "hose", "count": [ 0, 1 ] },
         { "item": "e_scrap", "count": [ 5, 10 ] },
         { "item": "plastic_chunk", "count": [ 0, 2 ] }
-      ]
+      ],
+      "destroyed_field": [ "fd_mechanical_fluid", 3 ]
     }
   },
   {
@@ -836,7 +850,8 @@
         { "item": "hose", "count": [ 0, 1 ] },
         { "item": "e_scrap", "count": [ 5, 10 ] },
         { "item": "plastic_chunk", "count": [ 0, 2 ] }
-      ]
+      ],
+      "destroyed_field": [ "fd_mechanical_fluid", 1 ]
     }
   },
   {
@@ -939,7 +954,8 @@
         { "item": "mc_steel_chunk", "count": [ 0, 3 ] },
         { "item": "sheet_metal", "count": [ 1, 3 ] },
         { "item": "cable", "charges": [ 1, 15 ] }
-      ]
+      ],
+      "destroyed_field": [ "fd_mechanical_fluid", 1 ]
     }
   },
   {
@@ -979,7 +995,8 @@
         { "item": "cable", "charges": [ 1, 15 ] },
         { "item": "e_scrap", "count": [ 5, 10 ] },
         { "item": "plastic_chunk", "count": [ 0, 2 ] }
-      ]
+      ],
+      "destroyed_field": [ "fd_mechanical_fluid", 1 ]
     }
   },
   {
@@ -1019,7 +1036,8 @@
         { "item": "cable", "charges": [ 1, 15 ] },
         { "item": "e_scrap", "count": [ 2, 4 ] },
         { "item": "plastic_chunk", "count": [ 0, 2 ] }
-      ]
+      ],
+      "destroyed_field": [ "fd_mechanical_fluid", 1 ]
     }
   },
   {
diff --git a/data/json/furniture_and_terrain/furniture-plumbing.json b/data/json/furniture_and_terrain/furniture-plumbing.json
diff --git a/data/json/furniture_and_terrain/furniture_refrigeration.json b/data/json/furniture_and_terrain/furniture_refrigeration.json

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,8 @@`
`43`	`43`	`{ "item": "amplifier", "prob": 25 },`
`44`	`44`	`{ "item": "plastic_chunk", "count": [ 4, 10 ], "prob": 50 },`
`45`	`45`	`{ "item": "scrap", "count": [ 2, 6 ], "prob": 50 }`
`46`		`- ]`
	`46`	`+ ],`
	`47`	`+ "destroyed_field": [ "fd_mechanical_fluid", 1 ]`
`47`	`48`	`}`
`48`	`49`	`},`
`49`	`50`	`{`
`@@ -81,8 +82,7 @@`
`81`	`82`	`{ "item": "sheet_cotton", "count": [ 3, 4 ] },`
`82`	`83`	`{ "item": "cotton_patchwork", "count": [ 3, 4 ] }`
`83`	`84`	`],`
`84`		`- "hit_field": [ "fd_dust", 2 ],`
`85`		`- "destroyed_field": [ "fd_splinters", 1 ]`
	`85`	`+ "destroyed_field": [ "fd_mechanical_fluid", 1 ]`
`86`	`86`	`}`
`87`	`87`	`},`
`88`	`88`	`{`
`@@ -113,7 +113,8 @@`
`113`	`113`	`{ "item": "hose", "count": [ 0, 2 ] },`
`114`	`114`	`{ "item": "cu_pipe", "count": [ 1, 4 ] },`
`115`	`115`	`{ "item": "scrap_copper", "count": [ 0, 2 ] }`
`116`		`- ]`
	`116`	`+ ],`
	`117`	`+ "destroyed_field": [ "fd_mechanical_fluid", 1 ]`
`117`	`118`	`}`
`118`	`119`	`},`
`119`	`120`	`{`
`@@ -156,7 +157,8 @@`
`156`	`157`	`{ "item": "hose", "count": [ 0, 2 ] },`
`157`	`158`	`{ "item": "cu_pipe", "count": [ 1, 4 ] },`
`158`	`159`	`{ "item": "scrap_copper", "count": [ 0, 2 ] }`
`159`		`- ]`
	`160`	`+ ],`
	`161`	`+ "destroyed_field": [ "fd_mechanical_fluid", 1 ]`
`160`	`162`	`}`
`161`	`163`	`},`
`162`	`164`	`{`
`@@ -201,7 +203,8 @@`
`201`	`203`	`{ "item": "cu_pipe", "count": [ 2, 4 ] },`
`202`	`204`	`{ "item": "scrap_copper", "count": [ 1, 2 ] },`
`203`	`205`	`{ "item": "motor_tiny", "prob": 25 }`
`204`		`- ]`
	`206`	`+ ],`
	`207`	`+ "destroyed_field": [ "fd_mechanical_fluid", 1 ]`
`205`	`208`	`}`
`206`	`209`	`},`
`207`	`210`	`{`
`@@ -288,7 +291,8 @@`
`288`	`291`	`{ "item": "pipe", "count": 1 },`
`289`	`292`	`{ "item": "glass_shard", "count": [ 25, 100 ] },`
`290`	`293`	`{ "item": "cable", "charges": [ 1, 2 ] }`
`291`		`- ]`
	`294`	`+ ],`
	`295`	`+ "destroyed_field": [ "fd_mechanical_fluid", 1 ]`
`292`	`296`	`}`
`293`	`297`	`},`
`294`	`298`	`{`
`@@ -327,7 +331,8 @@`
`327`	`331`	`{ "item": "sheet_metal", "count": [ 1, 4 ] },`
`328`	`332`	`{ "item": "element", "count": [ 1, 3 ] },`
`329`	`333`	`{ "item": "cable", "charges": [ 1, 15 ] }`
`330`		`- ]`
	`334`	`+ ],`
	`335`	`+ "destroyed_field": [ "fd_mechanical_fluid", 1 ]`
`331`	`336`	`}`
`332`	`337`	`},`
`333`	`338`	`{`
`@@ -429,7 +434,8 @@`
`429`	`434`	`{ "item": "hose", "count": [ 0, 1 ] },`
`430`	`435`	`{ "item": "e_scrap", "count": [ 5, 10 ] },`
`431`	`436`	`{ "item": "plastic_chunk", "count": [ 0, 2 ] }`
`432`		`- ]`
	`437`	`+ ],`
	`438`	`+ "destroyed_field": [ "fd_mechanical_fluid", 2 ]`
`433`	`439`	`}`
`434`	`440`	`},`
`435`	`441`	`{`
`@@ -473,7 +479,8 @@`
`473`	`479`	`{ "item": "hose", "count": [ 0, 1 ] },`
`474`	`480`	`{ "item": "e_scrap", "count": [ 5, 10 ] },`
`475`	`481`	`{ "item": "plastic_chunk", "count": [ 0, 2 ] }`
`476`		`- ]`
	`482`	`+ ],`
	`483`	`+ "destroyed_field": [ "fd_mechanical_fluid", 2 ]`
`477`	`484`	`}`
`478`	`485`	`},`
`479`	`486`	`{`
`@@ -513,7 +520,8 @@`
`513`	`520`	`{ "item": "cable", "charges": [ 1, 15 ] },`
`514`	`521`	`{ "item": "e_scrap", "count": [ 5, 10 ] },`
`515`	`522`	`{ "item": "plastic_chunk", "count": [ 0, 2 ] }`
`516`		`- ]`
	`523`	`+ ],`
	`524`	`+ "destroyed_field": [ "fd_mechanical_fluid", 2 ]`
`517`	`525`	`}`
`518`	`526`	`},`
`519`	`527`	`{`
`@@ -552,7 +560,8 @@`
`552`	`560`	`{ "item": "cable", "charges": [ 1, 15 ] },`
`553`	`561`	`{ "item": "e_scrap", "count": [ 5, 10 ] },`
`554`	`562`	`{ "item": "plastic_chunk", "count": [ 0, 2 ] }`
`555`		`- ]`
	`563`	`+ ],`
	`564`	`+ "destroyed_field": [ "fd_mechanical_fluid", 2 ]`
`556`	`565`	`}`
`557`	`566`	`},`
`558`	`567`	`{`
`@@ -590,7 +599,8 @@`
`590`	`599`	`{ "item": "cable", "charges": [ 1, 15 ] },`
`591`	`600`	`{ "item": "e_scrap", "count": [ 5, 10 ] },`
`592`	`601`	`{ "item": "plastic_chunk", "count": [ 0, 2 ] }`
`593`		`- ]`
	`602`	`+ ],`
	`603`	`+ "destroyed_field": [ "fd_mechanical_fluid", 1 ]`
`594`	`604`	`}`
`595`	`605`	`},`
`596`	`606`	`{`
`@@ -630,7 +640,8 @@`
`630`	`640`	`{ "item": "cable", "charges": [ 1, 15 ] },`
`631`	`641`	`{ "item": "e_scrap", "count": [ 5, 10 ] },`
`632`	`642`	`{ "item": "plastic_chunk", "count": [ 0, 2 ] }`
`633`		`- ]`
	`643`	`+ ],`
	`644`	`+ "destroyed_field": [ "fd_mechanical_fluid", 2 ]`
`634`	`645`	`}`
`635`	`646`	`},`
`636`	`647`	`{`
`@@ -670,7 +681,8 @@`
`670`	`681`	`{ "item": "cable", "charges": [ 1, 15 ] },`
`671`	`682`	`{ "item": "e_scrap", "count": [ 5, 10 ] },`
`672`	`683`	`{ "item": "plastic_chunk", "count": [ 0, 2 ] }`
`673`		`- ]`
	`684`	`+ ],`
	`685`	`+ "destroyed_field": [ "fd_mechanical_fluid", 2 ]`
`674`	`686`	`}`
`675`	`687`	`},`
`676`	`688`	`{`
`@@ -750,7 +762,8 @@`
`750`	`762`	`{ "item": "hose", "count": [ 0, 1 ] },`
`751`	`763`	`{ "item": "e_scrap", "count": [ 5, 10 ] },`
`752`	`764`	`{ "item": "plastic_chunk", "count": [ 0, 2 ] }`
`753`		`- ]`
	`765`	`+ ],`
	`766`	`+ "destroyed_field": [ "fd_mechanical_fluid", 1 ]`
`754`	`767`	`}`
`755`	`768`	`},`
`756`	`769`	`{`
`@@ -793,7 +806,8 @@`
`793`	`806`	`{ "item": "hose", "count": [ 0, 1 ] },`
`794`	`807`	`{ "item": "e_scrap", "count": [ 5, 10 ] },`
`795`	`808`	`{ "item": "plastic_chunk", "count": [ 0, 2 ] }`
`796`		`- ]`
	`809`	`+ ],`
	`810`	`+ "destroyed_field": [ "fd_mechanical_fluid", 3 ]`
`797`	`811`	`}`
`798`	`812`	`},`
`799`	`813`	`{`
`@@ -836,7 +850,8 @@`
`836`	`850`	`{ "item": "hose", "count": [ 0, 1 ] },`
`837`	`851`	`{ "item": "e_scrap", "count": [ 5, 10 ] },`
`838`	`852`	`{ "item": "plastic_chunk", "count": [ 0, 2 ] }`
`839`		`- ]`
	`853`	`+ ],`
	`854`	`+ "destroyed_field": [ "fd_mechanical_fluid", 1 ]`
`840`	`855`	`}`
`841`	`856`	`},`
`842`	`857`	`{`
`@@ -939,7 +954,8 @@`
`939`	`954`	`{ "item": "mc_steel_chunk", "count": [ 0, 3 ] },`
`940`	`955`	`{ "item": "sheet_metal", "count": [ 1, 3 ] },`
`941`	`956`	`{ "item": "cable", "charges": [ 1, 15 ] }`
`942`		`- ]`
	`957`	`+ ],`
	`958`	`+ "destroyed_field": [ "fd_mechanical_fluid", 1 ]`
`943`	`959`	`}`
`944`	`960`	`},`
`945`	`961`	`{`
`@@ -979,7 +995,8 @@`
`979`	`995`	`{ "item": "cable", "charges": [ 1, 15 ] },`
`980`	`996`	`{ "item": "e_scrap", "count": [ 5, 10 ] },`
`981`	`997`	`{ "item": "plastic_chunk", "count": [ 0, 2 ] }`
`982`		`- ]`
	`998`	`+ ],`
	`999`	`+ "destroyed_field": [ "fd_mechanical_fluid", 1 ]`
`983`	`1000`	`}`
`984`	`1001`	`},`
`985`	`1002`	`{`
`@@ -1019,7 +1036,8 @@`
`1019`	`1036`	`{ "item": "cable", "charges": [ 1, 15 ] },`
`1020`	`1037`	`{ "item": "e_scrap", "count": [ 2, 4 ] },`
`1021`	`1038`	`{ "item": "plastic_chunk", "count": [ 0, 2 ] }`
`1022`		`- ]`
	`1039`	`+ ],`
	`1040`	`+ "destroyed_field": [ "fd_mechanical_fluid", 1 ]`
`1023`	`1041`	`}`
`1024`	`1042`	`},`
`1025`	`1043`	`{`