From b755d48a2e58805fe6fd19b13f318e8445e13362 Mon Sep 17 00:00:00 2001
From: Fris0uman <sthapplz@gmail.com>
Date: Mon, 2 Dec 2019 23:51:31 +0100
Subject: [PATCH 1/5] Max_volume for terrain and furniture can be defined with
 strings

---
 src/mapdata.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/mapdata.cpp b/src/mapdata.cpp
index d60449df38bca..56167247f4705 100644
--- a/src/mapdata.cpp
+++ b/src/mapdata.cpp
@@ -1144,8 +1144,7 @@ void ter_t::load( JsonObject &jo, const std::string &src )
     mandatory( jo, was_loaded, "name", name_ );
     mandatory( jo, was_loaded, "move_cost", movecost );
     optional( jo, was_loaded, "coverage", coverage );
-    optional( jo, was_loaded, "max_volume", max_volume, legacy_volume_reader,
-              DEFAULT_MAX_VOLUME_IN_SQUARE );
+    assign( jo, "max_volume", max_volume, src == "dda" );
     optional( jo, was_loaded, "trap", trap_id_str );
 
     optional( jo, was_loaded, "light_emitted", light_emitted );
@@ -1254,8 +1253,7 @@ void furn_t::load( JsonObject &jo, const std::string &src )
     optional( jo, was_loaded, "bonus_fire_warmth_feet", bonus_fire_warmth_feet, 300 );
     optional( jo, was_loaded, "keg_capacity", keg_capacity, legacy_volume_reader, 0_ml );
     mandatory( jo, was_loaded, "required_str", move_str_req );
-    optional( jo, was_loaded, "max_volume", max_volume, legacy_volume_reader,
-              DEFAULT_MAX_VOLUME_IN_SQUARE );
+    assign( jo, "max_volume", max_volume, src == "dda" );
     optional( jo, was_loaded, "crafting_pseudo_item", crafting_pseudo_item, "" );
     optional( jo, was_loaded, "deployed_item", deployed_item );
     load_symbol( jo );

From 13a48c003fde0cd45ece1f66dbb817728d365cca Mon Sep 17 00:00:00 2001
From: Fris0uman <sthapplz@gmail.com>
Date: Tue, 3 Dec 2019 01:50:36 +0100
Subject: [PATCH 2/5] init max_volume

---
 src/mapdata.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mapdata.h b/src/mapdata.h
index f897dd0304428..e680c4180fb18 100644
--- a/src/mapdata.h
+++ b/src/mapdata.h
@@ -245,7 +245,8 @@ struct map_data_common_t {
         int light_emitted;
         int movecost;   // The amount of movement points required to pass this terrain by default.
         int coverage; // The coverage percentage of a furniture piece of terrain. <30 won't cover from sight.
-        units::volume max_volume; // Maximal volume of items that can be stored in/on this furniture
+        units::volume max_volume =
+            1000_liter; // Maximal volume of items that can be stored in/on this furniture
 
         translation description;
 

From 93f0b2823370c90a40fe176aff469f8e92a53dce Mon Sep 17 00:00:00 2001
From: Fris0uman <sthapplz@gmail.com>
Date: Tue, 3 Dec 2019 01:51:16 +0100
Subject: [PATCH 3/5] remove entry not updating the default value

---
 .../furniture_and_terrain/furniture-appliances.json  |  4 ++--
 .../furniture_and_terrain/furniture-fireplaces.json  |  6 +++---
 data/json/furniture_and_terrain/furniture-flora.json |  2 +-
 .../furniture_and_terrain/furniture-medical.json     | 12 ++++++------
 .../furniture_and_terrain/furniture-plumbing.json    |  2 +-
 .../furniture_and_terrain/furniture-recreation.json  |  2 +-
 data/json/furniture_and_terrain/furniture-seats.json | 12 ++++++------
 data/json/furniture_and_terrain/furniture-sleep.json |  8 ++++----
 .../furniture_and_terrain/furniture-storage.json     |  6 +++---
 .../furniture_and_terrain/furniture-surfaces.json    | 10 +++++-----
 .../furniture_and_terrain/furniture-terrains.json    |  6 +++---
 11 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/data/json/furniture_and_terrain/furniture-appliances.json b/data/json/furniture_and_terrain/furniture-appliances.json
index 8b1a5d4c3ae15..a96cdddd94362 100644
--- a/data/json/furniture_and_terrain/furniture-appliances.json
+++ b/data/json/furniture_and_terrain/furniture-appliances.json
@@ -10,7 +10,7 @@
     "move_cost_mod": -1,
     "coverage": 55,
     "required_str": -1,
-    "max_volume": 4000,
+
     "deconstruct": {
       "items": [
         { "item": "pipe", "count": 1 },
@@ -267,7 +267,7 @@
     "move_cost_mod": -1,
     "coverage": 60,
     "required_str": -1,
-    "max_volume": 4000,
+
     "flags": [ "CONTAINER", "PLACE_ITEM", "FIRE_CONTAINER", "SUPPRESS_SMOKE", "BLOCKSDOOR" ],
     "examine_action": "fireplace",
     "deconstruct": {
diff --git a/data/json/furniture_and_terrain/furniture-fireplaces.json b/data/json/furniture_and_terrain/furniture-fireplaces.json
index e2b29e1989499..9f0e2b6ee04b5 100644
--- a/data/json/furniture_and_terrain/furniture-fireplaces.json
+++ b/data/json/furniture_and_terrain/furniture-fireplaces.json
@@ -54,7 +54,7 @@
     "flags": [ "PLACE_ITEM", "TRANSPARENT", "FIRE_CONTAINER", "EASY_DECONSTRUCT" ],
     "deployed_item": "brazier",
     "examine_action": "fireplace",
-    "max_volume": 4000,
+
     "bash": {
       "str_min": 8,
       "str_max": 30,
@@ -81,7 +81,7 @@
     "flags": [ "PLACE_ITEM", "TRANSPARENT", "FIRE_CONTAINER", "EASY_DECONSTRUCT" ],
     "deployed_item": "55gal_firebarrel",
     "examine_action": "fireplace",
-    "max_volume": 4000,
+
     "bash": {
       "str_min": 8,
       "str_max": 30,
@@ -108,7 +108,7 @@
     "flags": [ "PLACE_ITEM", "TRANSPARENT", "FIRE_CONTAINER", "EASY_DECONSTRUCT" ],
     "deployed_item": "30gal_firebarrel",
     "examine_action": "fireplace",
-    "max_volume": 4000,
+
     "bash": {
       "str_min": 8,
       "str_max": 30,
diff --git a/data/json/furniture_and_terrain/furniture-flora.json b/data/json/furniture_and_terrain/furniture-flora.json
index 15a818826aa11..bfc2b71e64234 100644
--- a/data/json/furniture_and_terrain/furniture-flora.json
+++ b/data/json/furniture_and_terrain/furniture-flora.json
@@ -277,7 +277,7 @@
     "floor_bedding_warmth": 50,
     "required_str": -1,
     "deconstruct": { "items": [ { "item": "withered", "count": 50 } ] },
-    "max_volume": 4000,
+
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "SHORT", "EASY_DECONSTRUCT" ],
     "bash": {
       "str_min": 2,
diff --git a/data/json/furniture_and_terrain/furniture-medical.json b/data/json/furniture_and_terrain/furniture-medical.json
index ed7fe56116d92..ceb905857339a 100644
--- a/data/json/furniture_and_terrain/furniture-medical.json
+++ b/data/json/furniture_and_terrain/furniture-medical.json
@@ -66,7 +66,7 @@
         { "item": "cable", "charges": [ 1, 2 ], "prob": 50 }
       ]
     },
-    "max_volume": 4000,
+
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "BLOCKSDOOR", "MOUNTABLE" ],
     "bash": {
       "str_min": 10,
@@ -91,7 +91,7 @@
     "move_cost_mod": 3,
     "coverage": 60,
     "required_str": 16,
-    "max_volume": 4000,
+
     "looks_like": "f_washer",
     "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "FLAT_SURF" ],
     "deconstruct": {
@@ -136,7 +136,7 @@
     "move_cost_mod": 3,
     "coverage": 60,
     "required_str": 16,
-    "max_volume": 4000,
+
     "looks_like": "f_washer",
     "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "FLAT_SURF", "SEALED" ],
     "deconstruct": {
@@ -313,7 +313,7 @@
     "move_cost_mod": 3,
     "coverage": 45,
     "required_str": 10,
-    "max_volume": 4000,
+
     "looks_like": "f_glass_fridge",
     "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "FLAT_SURF" ],
     "deconstruct": {
@@ -501,7 +501,7 @@
     "move_cost_mod": -1,
     "coverage": 45,
     "required_str": -1,
-    "max_volume": 4000,
+
     "looks_like": "t_machinery_heavy",
     "flags": [ "TRANSPARENT" ],
     "deconstruct": {
@@ -543,7 +543,7 @@
     "move_cost_mod": -1,
     "coverage": 65,
     "required_str": -1,
-    "max_volume": 4000,
+
     "looks_like": "t_machinery_heavy",
     "deconstruct": {
       "items": [
diff --git a/data/json/furniture_and_terrain/furniture-plumbing.json b/data/json/furniture_and_terrain/furniture-plumbing.json
index 2a4f1b5f04970..c0615a818251b 100644
--- a/data/json/furniture_and_terrain/furniture-plumbing.json
+++ b/data/json/furniture_and_terrain/furniture-plumbing.json
@@ -105,7 +105,7 @@
     "move_cost_mod": -1,
     "coverage": 55,
     "required_str": -1,
-    "max_volume": 4000,
+
     "flags": [ "CONTAINER", "PLACE_ITEM", "LIQUIDCONT", "NOITEM", "SEALED" ],
     "examine_action": "keg",
     "keg_capacity": 240,
diff --git a/data/json/furniture_and_terrain/furniture-recreation.json b/data/json/furniture_and_terrain/furniture-recreation.json
index 6993d6cc7fdcf..e99c686fea6c9 100644
--- a/data/json/furniture_and_terrain/furniture-recreation.json
+++ b/data/json/furniture_and_terrain/furniture-recreation.json
@@ -59,7 +59,7 @@
     "move_cost_mod": 2,
     "coverage": 50,
     "required_str": -1,
-    "max_volume": 4000,
+
     "flags": [ "TRANSPARENT", "FLAMMABLE", "ORGANIC", "MOUNTABLE", "SHORT", "FLAT_SURF" ],
     "deconstruct": {
       "items": [
diff --git a/data/json/furniture_and_terrain/furniture-seats.json b/data/json/furniture_and_terrain/furniture-seats.json
index 44d107e66e1bc..c639eb85a61f4 100644
--- a/data/json/furniture_and_terrain/furniture-seats.json
+++ b/data/json/furniture_and_terrain/furniture-seats.json
@@ -13,7 +13,7 @@
     "bonus_fire_warmth_feet": 1000,
     "required_str": 8,
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "SHORT", "CAN_SIT" ],
-    "max_volume": 4000,
+
     "deconstruct": { "items": [ { "item": "2x4", "count": 4 }, { "item": "nail", "charges": [ 6, 10 ] } ] },
     "bash": {
       "str_min": 12,
@@ -39,7 +39,7 @@
     "deconstruct": {
       "items": [ { "item": "2x4", "count": 10 }, { "item": "rag", "count": [ 30, 33 ] }, { "item": "nail", "charges": [ 6, 8 ] } ]
     },
-    "max_volume": 4000,
+
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "CAN_SIT" ],
     "bash": {
       "str_min": 12,
@@ -70,7 +70,7 @@
     "bonus_fire_warmth_feet": 1000,
     "required_str": 7,
     "deconstruct": { "items": [ { "item": "pipe", "count": 10 }, { "item": "rag", "count": [ 30, 33 ] }, { "item": "rope_6" } ] },
-    "max_volume": 4000,
+
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "CAN_SIT" ],
     "bash": {
       "str_min": 12,
@@ -100,7 +100,7 @@
     "required_str": 4,
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "CAN_SIT" ],
     "deconstruct": { "items": [ { "item": "2x4", "count": 4 }, { "item": "nail", "charges": [ 6, 8 ] } ] },
-    "max_volume": 4000,
+
     "bash": {
       "str_min": 6,
       "str_max": 20,
@@ -124,7 +124,7 @@
     "deconstruct": {
       "items": [ { "item": "2x4", "count": 12 }, { "item": "rag", "count": [ 30, 33 ] }, { "item": "nail", "charges": [ 8, 10 ] } ]
     },
-    "max_volume": 4000,
+
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "BLOCKSDOOR", "MOUNTABLE", "CAN_SIT" ],
     "bash": {
       "str_min": 12,
@@ -195,7 +195,7 @@
     "bonus_fire_warmth_feet": 1000,
     "required_str": 5,
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "SHORT", "CAN_SIT" ],
-    "max_volume": 4000,
+
     "deconstruct": { "items": [ { "item": "2x4", "count": 4 }, { "item": "nail", "charges": [ 6, 10 ] } ] },
     "bash": {
       "str_min": 12,
diff --git a/data/json/furniture_and_terrain/furniture-sleep.json b/data/json/furniture_and_terrain/furniture-sleep.json
index 4e527b9652f1c..12a93fd102d86 100644
--- a/data/json/furniture_and_terrain/furniture-sleep.json
+++ b/data/json/furniture_and_terrain/furniture-sleep.json
@@ -12,7 +12,7 @@
     "floor_bedding_warmth": 1000,
     "required_str": -1,
     "deconstruct": { "items": [ { "item": "mattress", "count": 1 } ], "furn_set": "f_bed_frame" },
-    "max_volume": 4000,
+
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "PLACE_ITEM", "ORGANIC", "MOUNTABLE", "CAN_SIT", "EASY_DECONSTRUCT" ],
     "bash": {
       "str_min": 12,
@@ -39,7 +39,7 @@
     "coverage": 40,
     "required_str": 5,
     "deconstruct": { "items": [ { "item": "2x4", "count": 12 }, { "item": "nail", "charges": [ 8, 10 ] } ] },
-    "max_volume": 4000,
+
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "PLACE_ITEM", "ORGANIC", "MOUNTABLE", "CAN_SIT" ],
     "bash": {
       "str_min": 10,
@@ -116,7 +116,7 @@
     "deconstruct": {
       "items": [ { "item": "2x4", "count": 4 }, { "item": "rag", "count": [ 30, 35 ] }, { "item": "nail", "charges": [ 4, 6 ] } ]
     },
-    "max_volume": 4000,
+
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "SHORT" ],
     "bash": {
       "str_min": 8,
@@ -144,7 +144,7 @@
     "floor_bedding_warmth": 200,
     "required_str": -1,
     "deconstruct": { "items": [ { "item": "stick", "count": 4 }, { "item": "straw_pile", "count": [ 7, 8 ] } ] },
-    "max_volume": 4000,
+
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "SHORT", "EASY_DECONSTRUCT" ],
     "bash": {
       "str_min": 6,
diff --git a/data/json/furniture_and_terrain/furniture-storage.json b/data/json/furniture_and_terrain/furniture-storage.json
index 10b1edf65da2a..ff308d5522ff9 100644
--- a/data/json/furniture_and_terrain/furniture-storage.json
+++ b/data/json/furniture_and_terrain/furniture-storage.json
@@ -157,7 +157,7 @@
     "deconstruct": {
       "items": [ { "item": "2x4", "count": 4 }, { "item": "wood_panel", "count": [ 1, 2 ] }, { "item": "nail", "charges": [ 6, 10 ] } ]
     },
-    "max_volume": 4000,
+
     "bash": {
       "str_min": 12,
       "str_max": 40,
@@ -180,7 +180,7 @@
     "deconstruct": {
       "items": [ { "item": "2x4", "count": 4 }, { "item": "wood_panel", "count": [ 0, 1 ] }, { "item": "nail", "charges": [ 6, 10 ] } ]
     },
-    "max_volume": 4000,
+
     "bash": {
       "str_min": 12,
       "str_max": 40,
@@ -228,7 +228,7 @@
     "deconstruct": {
       "items": [ { "item": "2x4", "count": 3 }, { "item": "wood_panel", "count": 1 }, { "item": "nail", "charges": [ 6, 8 ] } ]
     },
-    "max_volume": 4000,
+
     "bash": {
       "str_min": 8,
       "str_max": 30,
diff --git a/data/json/furniture_and_terrain/furniture-surfaces.json b/data/json/furniture_and_terrain/furniture-surfaces.json
index 673529dfe9f0f..95c6b46efa20d 100644
--- a/data/json/furniture_and_terrain/furniture-surfaces.json
+++ b/data/json/furniture_and_terrain/furniture-surfaces.json
@@ -13,7 +13,7 @@
     "deconstruct": {
       "items": [ { "item": "2x4", "count": 4 }, { "item": "wood_panel", "count": 1 }, { "item": "nail", "charges": [ 6, 10 ] } ]
     },
-    "max_volume": 4000,
+
     "bash": {
       "str_min": 12,
       "str_max": 40,
@@ -81,7 +81,7 @@
     "deconstruct": {
       "items": [ { "item": "2x4", "count": 8 }, { "item": "wood_panel", "count": 1 }, { "item": "nail", "charges": [ 16, 24 ] } ]
     },
-    "max_volume": 4000,
+
     "bash": {
       "str_min": 12,
       "str_max": 40,
@@ -115,7 +115,7 @@
         { "item": "sheet_metal_small", "count": [ 2, 4 ] }
       ]
     },
-    "max_volume": 4000,
+
     "bash": {
       "str_min": 35,
       "str_max": 80,
@@ -236,7 +236,7 @@
     "move_cost_mod": 2,
     "coverage": 50,
     "required_str": 5,
-    "max_volume": 4000,
+
     "flags": [ "TRANSPARENT", "FLAMMABLE", "ORGANIC", "MOUNTABLE", "SHORT", "FLAT_SURF" ],
     "deconstruct": {
       "items": [ { "item": "2x4", "count": 4 }, { "item": "wood_panel", "count": 1 }, { "item": "nail", "charges": [ 6, 8 ] } ]
@@ -267,7 +267,7 @@
     "move_cost_mod": 2,
     "coverage": 50,
     "required_str": 5,
-    "max_volume": 4000,
+
     "flags": [ "TRANSPARENT", "FLAMMABLE", "ORGANIC", "MOUNTABLE", "SHORT", "FLAT_SURF" ],
     "deconstruct": {
       "items": [ { "item": "2x4", "count": 2 }, { "item": "wood_panel", "count": 1 }, { "item": "nail", "charges": [ 6, 8 ] } ]
diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json
index a325683a846cc..6db664037fd85 100644
--- a/data/json/furniture_and_terrain/furniture-terrains.json
+++ b/data/json/furniture_and_terrain/furniture-terrains.json
@@ -9,7 +9,7 @@
     "move_cost_mod": 0,
     "comfort": 2,
     "floor_bedding_warmth": -1500,
-    "max_volume": 4000,
+
     "required_str": 7,
     "bash": {
       "str_min": 8,
@@ -37,7 +37,7 @@
     "floor_bedding_warmth": 1000,
     "required_str": -1,
     "deconstruct": { "items": [ { "item": "pillow", "count": 19 }, { "item": "blanket", "count": 3 } ] },
-    "max_volume": 4000,
+
     "flags": [
       "TRANSPARENT",
       "FLAMMABLE_ASH",
@@ -77,7 +77,7 @@
         { "item": "pillow", "count": 4 }
       ]
     },
-    "max_volume": 4000,
+
     "flags": [
       "TRANSPARENT",
       "FLAMMABLE_ASH",

From 117a903a0470d8e18a762f0721b2ddd3bcf6d8d8 Mon Sep 17 00:00:00 2001
From: Fris0uman <sthapplz@gmail.com>
Date: Tue, 3 Dec 2019 01:59:52 +0100
Subject: [PATCH 4/5] lint

---
 data/json/furniture_and_terrain/furniture-appliances.json | 2 --
 data/json/furniture_and_terrain/furniture-fireplaces.json | 3 ---
 data/json/furniture_and_terrain/furniture-flora.json      | 1 -
 data/json/furniture_and_terrain/furniture-medical.json    | 6 ------
 data/json/furniture_and_terrain/furniture-plumbing.json   | 1 -
 data/json/furniture_and_terrain/furniture-recreation.json | 1 -
 data/json/furniture_and_terrain/furniture-seats.json      | 6 ------
 data/json/furniture_and_terrain/furniture-sleep.json      | 4 ----
 data/json/furniture_and_terrain/furniture-storage.json    | 3 ---
 data/json/furniture_and_terrain/furniture-surfaces.json   | 5 -----
 data/json/furniture_and_terrain/furniture-terrains.json   | 3 ---
 11 files changed, 35 deletions(-)

diff --git a/data/json/furniture_and_terrain/furniture-appliances.json b/data/json/furniture_and_terrain/furniture-appliances.json
index a96cdddd94362..0e87becbedbbd 100644
--- a/data/json/furniture_and_terrain/furniture-appliances.json
+++ b/data/json/furniture_and_terrain/furniture-appliances.json
@@ -10,7 +10,6 @@
     "move_cost_mod": -1,
     "coverage": 55,
     "required_str": -1,
-
     "deconstruct": {
       "items": [
         { "item": "pipe", "count": 1 },
@@ -267,7 +266,6 @@
     "move_cost_mod": -1,
     "coverage": 60,
     "required_str": -1,
-
     "flags": [ "CONTAINER", "PLACE_ITEM", "FIRE_CONTAINER", "SUPPRESS_SMOKE", "BLOCKSDOOR" ],
     "examine_action": "fireplace",
     "deconstruct": {
diff --git a/data/json/furniture_and_terrain/furniture-fireplaces.json b/data/json/furniture_and_terrain/furniture-fireplaces.json
index 9f0e2b6ee04b5..c2f947e551738 100644
--- a/data/json/furniture_and_terrain/furniture-fireplaces.json
+++ b/data/json/furniture_and_terrain/furniture-fireplaces.json
@@ -54,7 +54,6 @@
     "flags": [ "PLACE_ITEM", "TRANSPARENT", "FIRE_CONTAINER", "EASY_DECONSTRUCT" ],
     "deployed_item": "brazier",
     "examine_action": "fireplace",
-
     "bash": {
       "str_min": 8,
       "str_max": 30,
@@ -81,7 +80,6 @@
     "flags": [ "PLACE_ITEM", "TRANSPARENT", "FIRE_CONTAINER", "EASY_DECONSTRUCT" ],
     "deployed_item": "55gal_firebarrel",
     "examine_action": "fireplace",
-
     "bash": {
       "str_min": 8,
       "str_max": 30,
@@ -108,7 +106,6 @@
     "flags": [ "PLACE_ITEM", "TRANSPARENT", "FIRE_CONTAINER", "EASY_DECONSTRUCT" ],
     "deployed_item": "30gal_firebarrel",
     "examine_action": "fireplace",
-
     "bash": {
       "str_min": 8,
       "str_max": 30,
diff --git a/data/json/furniture_and_terrain/furniture-flora.json b/data/json/furniture_and_terrain/furniture-flora.json
index bfc2b71e64234..e3845c8944146 100644
--- a/data/json/furniture_and_terrain/furniture-flora.json
+++ b/data/json/furniture_and_terrain/furniture-flora.json
@@ -277,7 +277,6 @@
     "floor_bedding_warmth": 50,
     "required_str": -1,
     "deconstruct": { "items": [ { "item": "withered", "count": 50 } ] },
-
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "SHORT", "EASY_DECONSTRUCT" ],
     "bash": {
       "str_min": 2,
diff --git a/data/json/furniture_and_terrain/furniture-medical.json b/data/json/furniture_and_terrain/furniture-medical.json
index ceb905857339a..3e1775b39eabe 100644
--- a/data/json/furniture_and_terrain/furniture-medical.json
+++ b/data/json/furniture_and_terrain/furniture-medical.json
@@ -66,7 +66,6 @@
         { "item": "cable", "charges": [ 1, 2 ], "prob": 50 }
       ]
     },
-
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "BLOCKSDOOR", "MOUNTABLE" ],
     "bash": {
       "str_min": 10,
@@ -91,7 +90,6 @@
     "move_cost_mod": 3,
     "coverage": 60,
     "required_str": 16,
-
     "looks_like": "f_washer",
     "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "FLAT_SURF" ],
     "deconstruct": {
@@ -136,7 +134,6 @@
     "move_cost_mod": 3,
     "coverage": 60,
     "required_str": 16,
-
     "looks_like": "f_washer",
     "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "FLAT_SURF", "SEALED" ],
     "deconstruct": {
@@ -313,7 +310,6 @@
     "move_cost_mod": 3,
     "coverage": 45,
     "required_str": 10,
-
     "looks_like": "f_glass_fridge",
     "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "FLAT_SURF" ],
     "deconstruct": {
@@ -501,7 +497,6 @@
     "move_cost_mod": -1,
     "coverage": 45,
     "required_str": -1,
-
     "looks_like": "t_machinery_heavy",
     "flags": [ "TRANSPARENT" ],
     "deconstruct": {
@@ -543,7 +538,6 @@
     "move_cost_mod": -1,
     "coverage": 65,
     "required_str": -1,
-
     "looks_like": "t_machinery_heavy",
     "deconstruct": {
       "items": [
diff --git a/data/json/furniture_and_terrain/furniture-plumbing.json b/data/json/furniture_and_terrain/furniture-plumbing.json
index c0615a818251b..2ee49791a36f7 100644
--- a/data/json/furniture_and_terrain/furniture-plumbing.json
+++ b/data/json/furniture_and_terrain/furniture-plumbing.json
@@ -105,7 +105,6 @@
     "move_cost_mod": -1,
     "coverage": 55,
     "required_str": -1,
-
     "flags": [ "CONTAINER", "PLACE_ITEM", "LIQUIDCONT", "NOITEM", "SEALED" ],
     "examine_action": "keg",
     "keg_capacity": 240,
diff --git a/data/json/furniture_and_terrain/furniture-recreation.json b/data/json/furniture_and_terrain/furniture-recreation.json
index e99c686fea6c9..7d9450ee57262 100644
--- a/data/json/furniture_and_terrain/furniture-recreation.json
+++ b/data/json/furniture_and_terrain/furniture-recreation.json
@@ -59,7 +59,6 @@
     "move_cost_mod": 2,
     "coverage": 50,
     "required_str": -1,
-
     "flags": [ "TRANSPARENT", "FLAMMABLE", "ORGANIC", "MOUNTABLE", "SHORT", "FLAT_SURF" ],
     "deconstruct": {
       "items": [
diff --git a/data/json/furniture_and_terrain/furniture-seats.json b/data/json/furniture_and_terrain/furniture-seats.json
index c639eb85a61f4..f1bb34e80ba5c 100644
--- a/data/json/furniture_and_terrain/furniture-seats.json
+++ b/data/json/furniture_and_terrain/furniture-seats.json
@@ -13,7 +13,6 @@
     "bonus_fire_warmth_feet": 1000,
     "required_str": 8,
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "SHORT", "CAN_SIT" ],
-
     "deconstruct": { "items": [ { "item": "2x4", "count": 4 }, { "item": "nail", "charges": [ 6, 10 ] } ] },
     "bash": {
       "str_min": 12,
@@ -39,7 +38,6 @@
     "deconstruct": {
       "items": [ { "item": "2x4", "count": 10 }, { "item": "rag", "count": [ 30, 33 ] }, { "item": "nail", "charges": [ 6, 8 ] } ]
     },
-
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "CAN_SIT" ],
     "bash": {
       "str_min": 12,
@@ -70,7 +68,6 @@
     "bonus_fire_warmth_feet": 1000,
     "required_str": 7,
     "deconstruct": { "items": [ { "item": "pipe", "count": 10 }, { "item": "rag", "count": [ 30, 33 ] }, { "item": "rope_6" } ] },
-
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "CAN_SIT" ],
     "bash": {
       "str_min": 12,
@@ -100,7 +97,6 @@
     "required_str": 4,
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "CAN_SIT" ],
     "deconstruct": { "items": [ { "item": "2x4", "count": 4 }, { "item": "nail", "charges": [ 6, 8 ] } ] },
-
     "bash": {
       "str_min": 6,
       "str_max": 20,
@@ -124,7 +120,6 @@
     "deconstruct": {
       "items": [ { "item": "2x4", "count": 12 }, { "item": "rag", "count": [ 30, 33 ] }, { "item": "nail", "charges": [ 8, 10 ] } ]
     },
-
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "BLOCKSDOOR", "MOUNTABLE", "CAN_SIT" ],
     "bash": {
       "str_min": 12,
@@ -195,7 +190,6 @@
     "bonus_fire_warmth_feet": 1000,
     "required_str": 5,
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "SHORT", "CAN_SIT" ],
-
     "deconstruct": { "items": [ { "item": "2x4", "count": 4 }, { "item": "nail", "charges": [ 6, 10 ] } ] },
     "bash": {
       "str_min": 12,
diff --git a/data/json/furniture_and_terrain/furniture-sleep.json b/data/json/furniture_and_terrain/furniture-sleep.json
index 12a93fd102d86..c471e71882488 100644
--- a/data/json/furniture_and_terrain/furniture-sleep.json
+++ b/data/json/furniture_and_terrain/furniture-sleep.json
@@ -12,7 +12,6 @@
     "floor_bedding_warmth": 1000,
     "required_str": -1,
     "deconstruct": { "items": [ { "item": "mattress", "count": 1 } ], "furn_set": "f_bed_frame" },
-
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "PLACE_ITEM", "ORGANIC", "MOUNTABLE", "CAN_SIT", "EASY_DECONSTRUCT" ],
     "bash": {
       "str_min": 12,
@@ -39,7 +38,6 @@
     "coverage": 40,
     "required_str": 5,
     "deconstruct": { "items": [ { "item": "2x4", "count": 12 }, { "item": "nail", "charges": [ 8, 10 ] } ] },
-
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "PLACE_ITEM", "ORGANIC", "MOUNTABLE", "CAN_SIT" ],
     "bash": {
       "str_min": 10,
@@ -116,7 +114,6 @@
     "deconstruct": {
       "items": [ { "item": "2x4", "count": 4 }, { "item": "rag", "count": [ 30, 35 ] }, { "item": "nail", "charges": [ 4, 6 ] } ]
     },
-
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "SHORT" ],
     "bash": {
       "str_min": 8,
@@ -144,7 +141,6 @@
     "floor_bedding_warmth": 200,
     "required_str": -1,
     "deconstruct": { "items": [ { "item": "stick", "count": 4 }, { "item": "straw_pile", "count": [ 7, 8 ] } ] },
-
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC", "MOUNTABLE", "SHORT", "EASY_DECONSTRUCT" ],
     "bash": {
       "str_min": 6,
diff --git a/data/json/furniture_and_terrain/furniture-storage.json b/data/json/furniture_and_terrain/furniture-storage.json
index ff308d5522ff9..83f6f98670ce3 100644
--- a/data/json/furniture_and_terrain/furniture-storage.json
+++ b/data/json/furniture_and_terrain/furniture-storage.json
@@ -157,7 +157,6 @@
     "deconstruct": {
       "items": [ { "item": "2x4", "count": 4 }, { "item": "wood_panel", "count": [ 1, 2 ] }, { "item": "nail", "charges": [ 6, 10 ] } ]
     },
-
     "bash": {
       "str_min": 12,
       "str_max": 40,
@@ -180,7 +179,6 @@
     "deconstruct": {
       "items": [ { "item": "2x4", "count": 4 }, { "item": "wood_panel", "count": [ 0, 1 ] }, { "item": "nail", "charges": [ 6, 10 ] } ]
     },
-
     "bash": {
       "str_min": 12,
       "str_max": 40,
@@ -228,7 +226,6 @@
     "deconstruct": {
       "items": [ { "item": "2x4", "count": 3 }, { "item": "wood_panel", "count": 1 }, { "item": "nail", "charges": [ 6, 8 ] } ]
     },
-
     "bash": {
       "str_min": 8,
       "str_max": 30,
diff --git a/data/json/furniture_and_terrain/furniture-surfaces.json b/data/json/furniture_and_terrain/furniture-surfaces.json
index 95c6b46efa20d..d64a8100f8a7e 100644
--- a/data/json/furniture_and_terrain/furniture-surfaces.json
+++ b/data/json/furniture_and_terrain/furniture-surfaces.json
@@ -13,7 +13,6 @@
     "deconstruct": {
       "items": [ { "item": "2x4", "count": 4 }, { "item": "wood_panel", "count": 1 }, { "item": "nail", "charges": [ 6, 10 ] } ]
     },
-
     "bash": {
       "str_min": 12,
       "str_max": 40,
@@ -81,7 +80,6 @@
     "deconstruct": {
       "items": [ { "item": "2x4", "count": 8 }, { "item": "wood_panel", "count": 1 }, { "item": "nail", "charges": [ 16, 24 ] } ]
     },
-
     "bash": {
       "str_min": 12,
       "str_max": 40,
@@ -115,7 +113,6 @@
         { "item": "sheet_metal_small", "count": [ 2, 4 ] }
       ]
     },
-
     "bash": {
       "str_min": 35,
       "str_max": 80,
@@ -236,7 +233,6 @@
     "move_cost_mod": 2,
     "coverage": 50,
     "required_str": 5,
-
     "flags": [ "TRANSPARENT", "FLAMMABLE", "ORGANIC", "MOUNTABLE", "SHORT", "FLAT_SURF" ],
     "deconstruct": {
       "items": [ { "item": "2x4", "count": 4 }, { "item": "wood_panel", "count": 1 }, { "item": "nail", "charges": [ 6, 8 ] } ]
@@ -267,7 +263,6 @@
     "move_cost_mod": 2,
     "coverage": 50,
     "required_str": 5,
-
     "flags": [ "TRANSPARENT", "FLAMMABLE", "ORGANIC", "MOUNTABLE", "SHORT", "FLAT_SURF" ],
     "deconstruct": {
       "items": [ { "item": "2x4", "count": 2 }, { "item": "wood_panel", "count": 1 }, { "item": "nail", "charges": [ 6, 8 ] } ]
diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json
index 6db664037fd85..a8274256c5ca0 100644
--- a/data/json/furniture_and_terrain/furniture-terrains.json
+++ b/data/json/furniture_and_terrain/furniture-terrains.json
@@ -9,7 +9,6 @@
     "move_cost_mod": 0,
     "comfort": 2,
     "floor_bedding_warmth": -1500,
-
     "required_str": 7,
     "bash": {
       "str_min": 8,
@@ -37,7 +36,6 @@
     "floor_bedding_warmth": 1000,
     "required_str": -1,
     "deconstruct": { "items": [ { "item": "pillow", "count": 19 }, { "item": "blanket", "count": 3 } ] },
-
     "flags": [
       "TRANSPARENT",
       "FLAMMABLE_ASH",
@@ -77,7 +75,6 @@
         { "item": "pillow", "count": 4 }
       ]
     },
-
     "flags": [
       "TRANSPARENT",
       "FLAMMABLE_ASH",

From 702386ab8651f2547dcfedaf441affdd1c026622 Mon Sep 17 00:00:00 2001
From: Fris0uman <sthapplz@gmail.com>
Date: Tue, 3 Dec 2019 10:47:40 +0100
Subject: [PATCH 5/5] astyle

---
 src/mapdata.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mapdata.h b/src/mapdata.h
index e680c4180fb18..62532d79200e0 100644
--- a/src/mapdata.h
+++ b/src/mapdata.h
@@ -245,8 +245,8 @@ struct map_data_common_t {
         int light_emitted;
         int movecost;   // The amount of movement points required to pass this terrain by default.
         int coverage; // The coverage percentage of a furniture piece of terrain. <30 won't cover from sight.
-        units::volume max_volume =
-            1000_liter; // Maximal volume of items that can be stored in/on this furniture
+        // Maximal volume of items that can be stored in/on this furniture
+        units::volume max_volume = 1000_liter;
 
         translation description;