diff --git a/data/json/furniture_and_terrain/furniture-appliances.json b/data/json/furniture_and_terrain/furniture-appliances.json
index eff64b6f0b45f..32aec2c82e6ac 100644
--- a/data/json/furniture_and_terrain/furniture-appliances.json
+++ b/data/json/furniture_and_terrain/furniture-appliances.json
@@ -581,7 +581,7 @@
"color": "yellow",
"move_cost_mod": 2,
"required_str": -1,
- "flags": [ "TRANSPARENT", "BASHABLE" ],
+ "flags": [ "TRANSPARENT" ],
"deconstruct": {
"items": [
{ "item": "scrap", "count": [ 4, 6 ] },
diff --git a/data/json/furniture_and_terrain/furniture-decorative.json b/data/json/furniture_and_terrain/furniture-decorative.json
index f5088cc6b66e7..0d5adc2076e30 100644
--- a/data/json/furniture_and_terrain/furniture-decorative.json
+++ b/data/json/furniture_and_terrain/furniture-decorative.json
@@ -184,7 +184,7 @@
"color": "white",
"move_cost_mod": -2,
"required_str": 10,
- "flags": [ "TRANSPARENT", "BLOCKSDOOR", "BASHABLE", "PLACE_ITEM" ],
+ "flags": [ "TRANSPARENT", "BLOCKSDOOR", "PLACE_ITEM" ],
"deconstruct": {
"items": [
{ "item": "pipe", "count": 6 },
diff --git a/data/json/furniture_and_terrain/furniture-domestic_plants.json b/data/json/furniture_and_terrain/furniture-domestic_plants.json
index 3bbc6013faaef..37dede65583e7 100644
--- a/data/json/furniture_and_terrain/furniture-domestic_plants.json
+++ b/data/json/furniture_and_terrain/furniture-domestic_plants.json
@@ -108,7 +108,7 @@
"color": "brown",
"move_cost_mod": 0,
"required_str": -1,
- "flags": [ "PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN", "GROWTH_SEED" ],
+ "flags": [ "PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN" ],
"examine_action": "aggie_plant",
"bash": { "str_min": 1, "str_max": 5, "sound": "crunch.", "sound_fail": "whish." },
"plant_data": { "transform": "f_plant_seedling", "base": "f_null" }
@@ -239,7 +239,7 @@
"looks_like": "f_plant_seed",
"move_cost_mod": 1,
"required_str": -1,
- "flags": [ "PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN", "GROWTH_SEED" ],
+ "flags": [ "PLANT", "SEALED", "TRANSPARENT", "CONTAINER", "NOITEM", "TINY", "DONT_REMOVE_ROTTEN" ],
"examine_action": "aggie_plant",
"deconstruct": {
"items": [
diff --git a/data/json/furniture_and_terrain/furniture-industrial.json b/data/json/furniture_and_terrain/furniture-industrial.json
index 12b0c39272053..7c25fe4fc4bef 100644
--- a/data/json/furniture_and_terrain/furniture-industrial.json
+++ b/data/json/furniture_and_terrain/furniture-industrial.json
@@ -90,7 +90,7 @@
"move_cost_mod": -1,
"coverage": 30,
"required_str": 16,
- "flags": [ "TRANSPARENT", "NOITEM", "REDUCE_SCENT", "MOUNTABLE", "PERMEABLE", "BLOCKS_DOOR" ],
+ "flags": [ "TRANSPARENT", "NOITEM", "REDUCE_SCENT", "MOUNTABLE", "PERMEABLE", "BLOCKSDOOR" ],
"bash": {
"str_min": 20,
"str_max": 150,
@@ -210,7 +210,7 @@
"move_cost_mod": 10,
"coverage": 65,
"required_str": -1,
- "flags": [ "TRANSPARENT", "BASHABLE", "CONTAINER", "FLAMMABLE", "PLACE_ITEM" ],
+ "flags": [ "TRANSPARENT", "CONTAINER", "FLAMMABLE", "PLACE_ITEM" ],
"deconstruct": {
"items": [
{ "item": "wire", "count": [ 1, 3 ] },
@@ -254,7 +254,7 @@
"move_cost_mod": 10,
"coverage": 75,
"required_str": -1,
- "flags": [ "BASHABLE", "CONTAINER", "SEALED", "PLACE_ITEM" ],
+ "flags": [ "CONTAINER", "SEALED", "PLACE_ITEM" ],
"deconstruct": {
"items": [
{ "item": "wire", "count": [ 1, 3 ] },
@@ -305,7 +305,7 @@
"move_cost_mod": 4,
"coverage": 55,
"required_str": -1,
- "flags": [ "TRANSPARENT", "BASHABLE", "CONTAINER", "FLAMMABLE", "PLACE_ITEM" ],
+ "flags": [ "TRANSPARENT", "CONTAINER", "FLAMMABLE", "PLACE_ITEM" ],
"deconstruct": {
"items": [
{ "item": "wire", "count": 1 },
@@ -354,7 +354,7 @@
"move_cost_mod": 8,
"coverage": 55,
"required_str": -1,
- "flags": [ "TRANSPARENT", "BASHABLE", "CONTAINER", "SEALED", "FLAMMABLE", "PLACE_ITEM" ],
+ "flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "FLAMMABLE", "PLACE_ITEM" ],
"deconstruct": {
"items": [
{ "item": "wire", "count": [ 1, 3 ] },
@@ -502,7 +502,7 @@
"move_cost_mod": 8,
"coverage": 55,
"required_str": -1,
- "flags": [ "TRANSPARENT", "BASHABLE", "FLAMMABLE", "PLACE_ITEM" ],
+ "flags": [ "TRANSPARENT", "FLAMMABLE", "PLACE_ITEM" ],
"deconstruct": {
"items": [
{ "item": "wire", "count": [ 1, 3 ] },
diff --git a/data/json/furniture_and_terrain/furniture-medical.json b/data/json/furniture_and_terrain/furniture-medical.json
index 85e0c1d6244dd..97a9ed03067e6 100644
--- a/data/json/furniture_and_terrain/furniture-medical.json
+++ b/data/json/furniture_and_terrain/furniture-medical.json
@@ -735,7 +735,7 @@
"move_cost_mod": -1,
"coverage": 40,
"required_str": 6,
- "flags": [ "BLOCKS_DOOR" ],
+ "flags": [ "BLOCKSDOOR" ],
"looks_like": "f_ventilator",
"deconstruct": {
"items": [
@@ -781,7 +781,7 @@
"move_cost_mod": -1,
"coverage": 50,
"required_str": 5,
- "flags": [ "BLOCKS_DOOR" ],
+ "flags": [ "BLOCKSDOOR" ],
"looks_like": "f_standing_tank",
"deconstruct": {
"items": [
@@ -825,7 +825,7 @@
"move_cost_mod": -1,
"coverage": 35,
"required_str": 4,
- "flags": [ "BLOCKS_DOOR" ],
+ "flags": [ "BLOCKSDOOR" ],
"looks_like": "f_standing_tank",
"deconstruct": {
"items": [
diff --git a/data/json/furniture_and_terrain/furniture-recreation.json b/data/json/furniture_and_terrain/furniture-recreation.json
index 52759263e3958..ff7ab6741c47b 100644
--- a/data/json/furniture_and_terrain/furniture-recreation.json
+++ b/data/json/furniture_and_terrain/furniture-recreation.json
@@ -375,7 +375,7 @@
"move_cost_mod": -1,
"coverage": 65,
"required_str": 10,
- "flags": [ "BASHABLE", "BLOCKSDOOR", "PLACE_ITEM", "ORGANIC", "WORKOUT_ARMS" ],
+ "flags": [ "BLOCKSDOOR", "PLACE_ITEM", "ORGANIC", "WORKOUT_ARMS" ],
"examine_action": "workout",
"bash": {
"str_min": 15,
diff --git a/data/json/furniture_and_terrain/furniture-roof.json b/data/json/furniture_and_terrain/furniture-roof.json
index e58575b943e9a..b7b0f8372fe1e 100644
--- a/data/json/furniture_and_terrain/furniture-roof.json
+++ b/data/json/furniture_and_terrain/furniture-roof.json
@@ -8,7 +8,7 @@
"color": "white",
"move_cost_mod": -2,
"required_str": 10,
- "flags": [ "TRANSPARENT", "PLACE_ITEM", "BASHABLE", "DECONSTRUCT" ],
+ "flags": [ "TRANSPARENT", "PLACE_ITEM" ],
"bash": {
"str_min": 6,
"str_max": 10,
@@ -43,7 +43,7 @@
"color": "light_gray",
"move_cost_mod": -2,
"required_str": 10,
- "flags": [ "TRANSPARENT", "BASHABLE", "NOITEM" ],
+ "flags": [ "TRANSPARENT", "NOITEM" ],
"bash": {
"items": [
{ "item": "scrap", "count": [ 4, 6 ] },
@@ -64,7 +64,7 @@
"move_cost_mod": 2,
"coverage": 35,
"required_str": -1,
- "flags": [ "BASHABLE", "MINEABLE" ],
+ "flags": [ "MINEABLE" ],
"deconstruct": { "items": [ { "item": "sheet_metal", "count": 2 }, { "item": "brick", "count": 30 } ] },
"bash": {
"str_min": 15,
@@ -83,7 +83,7 @@
"color": "light_gray",
"move_cost_mod": 2,
"required_str": 8,
- "flags": [ "TRANSPARENT", "BASHABLE" ],
+ "flags": [ "TRANSPARENT" ],
"deconstruct": {
"items": [ { "item": "pipe", "count": 6 }, { "item": "steel_chunk", "count": 2 }, { "item": "cable", "charges": 10 } ]
},
@@ -109,7 +109,7 @@
"move_cost_mod": 2,
"coverage": 40,
"required_str": -1,
- "flags": [ "TRANSPARENT", "BASHABLE" ],
+ "flags": [ "TRANSPARENT" ],
"deconstruct": { "items": [ { "item": "pipe", "count": 2 }, { "item": "steel_chunk", "count": 2 } ] },
"bash": {
"str_min": 10,
@@ -129,7 +129,7 @@
"move_cost_mod": 2,
"coverage": 40,
"required_str": -1,
- "flags": [ "TRANSPARENT", "BASHABLE" ],
+ "flags": [ "TRANSPARENT" ],
"deconstruct": { "items": [ { "item": "sheet_metal_small", "count": 6 }, { "item": "steel_chunk", "count": 2 } ] },
"bash": {
"str_min": 8,
diff --git a/data/json/furniture_and_terrain/furniture-storage.json b/data/json/furniture_and_terrain/furniture-storage.json
index 1f2efa0f92448..ba69c8f69efd3 100644
--- a/data/json/furniture_and_terrain/furniture-storage.json
+++ b/data/json/furniture_and_terrain/furniture-storage.json
@@ -205,17 +205,7 @@
"max_volume": "324 L",
"deployed_item": "box_large",
"examine_action": "deployed_furniture",
- "flags": [
- "TRANSPARENT",
- "FLAMMABLE_ASH",
- "PLACE_ITEM",
- "ORGANIC",
- "EASY_DECONSTRUCT",
- "BASHABLE",
- "HIDE_PLACE",
- "NO_SIGHT",
- "CONTAINER"
- ],
+ "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "PLACE_ITEM", "ORGANIC", "EASY_DECONSTRUCT", "HIDE_PLACE", "NO_SIGHT", "CONTAINER" ],
"bash": {
"str_min": 2,
"str_max": 15,
@@ -1082,7 +1072,7 @@
"move_cost_mod": -1,
"coverage": 90,
"required_str": -1,
- "flags": [ "BASHABLE", "CONTAINER", "DECONSTRUCT", "LIQUIDCONT", "NOITEM", "SEALED", "TRANSPARENT" ],
+ "flags": [ "CONTAINER", "LIQUIDCONT", "NOITEM", "SEALED", "TRANSPARENT" ],
"deconstruct": { "items": [ { "item": "metal_tank", "count": 4 }, { "item": "water_faucet", "count": 1 } ] },
"examine_action": "keg",
"keg_capacity": 1200,
diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json
index 57a04db58113a..edb11d60303a8 100644
--- a/data/json/furniture_and_terrain/furniture-terrains.json
+++ b/data/json/furniture_and_terrain/furniture-terrains.json
@@ -43,7 +43,6 @@
"ORGANIC",
"REDUCE_SCENT",
"EASY_DECONSTRUCT",
- "BASHABLE",
"HIDE_PLACE",
"NO_SIGHT"
],
@@ -82,7 +81,6 @@
"ORGANIC",
"REDUCE_SCENT",
"EASY_DECONSTRUCT",
- "BASHABLE",
"HIDE_PLACE",
"NO_SIGHT",
"BLOCK_WIND"
@@ -676,7 +674,7 @@
"coverage": 45,
"required_str": 16,
"crafting_pseudo_item": "boulder_anvil",
- "flags": [ "NOITEM", "TRANSPARENT", "MINEABLE", "UNSTABLE", "MOUNTABLE", "SHORT", "BASHABLE" ],
+ "flags": [ "NOITEM", "TRANSPARENT", "MINEABLE", "UNSTABLE", "MOUNTABLE", "SHORT" ],
"bash": {
"str_min": 32,
"str_max": 80,
@@ -695,7 +693,7 @@
"move_cost_mod": -1,
"coverage": 65,
"required_str": 32,
- "flags": [ "NOITEM", "MINEABLE", "BASHABLE", "BLOCK_WIND" ],
+ "flags": [ "NOITEM", "MINEABLE", "BLOCK_WIND" ],
"bash": {
"str_min": 64,
"str_max": 160,
@@ -722,7 +720,7 @@
"move_cost_mod": -1,
"coverage": 40,
"required_str": 32,
- "flags": [ "BASHABLE", "TRANSPARENT" ],
+ "flags": [ "TRANSPARENT" ],
"bash": {
"str_min": 30,
"str_max": 100,
@@ -749,7 +747,7 @@
"move_cost_mod": -1,
"coverage": 40,
"required_str": 32,
- "flags": [ "BASHABLE", "TRANSPARENT" ],
+ "flags": [ "TRANSPARENT" ],
"bash": {
"str_min": 30,
"str_max": 100,
@@ -775,7 +773,6 @@
"move_cost_mod": -1,
"coverage": 40,
"required_str": 26,
- "flags": [ "BASHABLE" ],
"bash": {
"str_min": 20,
"str_max": 100,
diff --git a/data/json/furniture_and_terrain/terrain-manufactured.json b/data/json/furniture_and_terrain/terrain-manufactured.json
index d76c67afba282..fbca827703d71 100644
--- a/data/json/furniture_and_terrain/terrain-manufactured.json
+++ b/data/json/furniture_and_terrain/terrain-manufactured.json
@@ -1101,7 +1101,7 @@
"symbol": "=",
"color": "brown",
"move_cost": 6,
- "flags": [ "TRANSPARENT", "BASHABLE", "PLACE_ITEM", "INDOORS" ],
+ "flags": [ "TRANSPARENT", "PLACE_ITEM", "INDOORS" ],
"coverage": 30,
"deconstruct": {
"ter_set": "t_rock_floor",
@@ -1188,7 +1188,7 @@
{ "item": "steel_chunk", "count": [ 1, 10 ] }
]
},
- "flags": [ "BASHABLE", "CONTAINER", "SEALED", "PLACE_ITEM", "WALL", "MINEABLE" ]
+ "flags": [ "CONTAINER", "SEALED", "PLACE_ITEM", "WALL", "MINEABLE" ]
},
{
"type": "terrain",
@@ -1199,7 +1199,7 @@
"color": "green",
"looks_like": "t_pit",
"move_cost": 0,
- "flags": [ "TRANSPARENT", "CONTAINER", "PLACE_ITEM", "INDOORS", "DECONSTRUCT" ],
+ "flags": [ "TRANSPARENT", "CONTAINER", "PLACE_ITEM", "INDOORS" ],
"deconstruct": { "ter_set": "t_pit", "items": [ { "item": "rock", "count": 40 }, { "item": "stick", "count": [ 16, 16 ] } ] },
"bash": {
"str_min": 18,
diff --git a/data/json/furniture_and_terrain/terrain-migo.json b/data/json/furniture_and_terrain/terrain-migo.json
index 3b197e7d95821..05782133b5bc4 100644
--- a/data/json/furniture_and_terrain/terrain-migo.json
+++ b/data/json/furniture_and_terrain/terrain-migo.json
@@ -29,7 +29,7 @@
"move_cost": 0,
"coverage": 100,
"roof": "t_resin_roof",
- "flags": [ "NOITEM", "WALL", "PERMEABLE", "TRANSPARENT", "INDOORS", "NONFLAMMABLE", "MINEABLE" ],
+ "flags": [ "NOITEM", "WALL", "PERMEABLE", "TRANSPARENT", "INDOORS", "MINEABLE" ],
"bash": {
"str_min": 70,
"str_max": 300,
@@ -48,7 +48,7 @@
"color": "dark_gray",
"move_cost": 1,
"roof": "t_resin_roof",
- "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "ROAD", "NONFLAMMABLE", "NOCOLLIDE" ],
+ "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "ROAD", "NOCOLLIDE" ],
"bash": {
"str_min": 250,
"str_max": 700,
@@ -67,7 +67,7 @@
"color": "light_gray",
"looks_like": "t_floor_resin",
"move_cost": 1,
- "flags": [ "TRANSPARENT", "COLLAPSES", "FLAT", "ROAD", "NONFLAMMABLE" ],
+ "flags": [ "TRANSPARENT", "COLLAPSES", "FLAT", "ROAD" ],
"bash": {
"str_min": 250,
"str_max": 700,
@@ -86,7 +86,7 @@
"color": "dark_gray",
"move_cost": 2,
"looks_like": "t_floor_resin",
- "flags": [ "TRANSPARENT", "FLAT", "NONFLAMMABLE" ],
+ "flags": [ "TRANSPARENT", "FLAT" ],
"bash": {
"str_min": 250,
"str_max": 700,
@@ -106,7 +106,7 @@
"move_cost": 0,
"coverage": 95,
"roof": "t_resin_roof",
- "flags": [ "DOOR", "NOITEM", "CONNECT_TO_WALL", "BLOCK_WIND", "NONFLAMMABLE" ],
+ "flags": [ "DOOR", "NOITEM", "CONNECT_TO_WALL", "BLOCK_WIND" ],
"open": "t_resin_hole_o",
"deconstruct": { "ter_set": "t_resin_hole", "items": [ { "item": "resin_chunk", "count": [ 2, 5 ] } ] },
"bash": {
@@ -127,7 +127,7 @@
"color": "light_gray",
"move_cost": 2,
"roof": "t_resin_roof",
- "flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "NONFLAMMABLE" ],
+ "flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL" ],
"deconstruct": { "ter_set": "t_resin_hole", "items": [ { "item": "resin_chunk", "count": [ 2, 5 ] } ] },
"close": "t_resin_hole_c",
"bash": {
@@ -148,7 +148,7 @@
"color": "light_gray",
"move_cost": 4,
"roof": "t_resin_roof",
- "flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "NONFLAMMABLE" ],
+ "flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL" ],
"bash": {
"str_min": 100,
"str_max": 500,
diff --git a/data/json/furniture_and_terrain/terrain-railroads.json b/data/json/furniture_and_terrain/terrain-railroads.json
index d1703d4db547c..f5ba2294686b6 100644
--- a/data/json/furniture_and_terrain/terrain-railroads.json
+++ b/data/json/furniture_and_terrain/terrain-railroads.json
@@ -55,7 +55,7 @@
]
},
"connects_to": "RAIL",
- "flags": [ "BASHABLE", "RAIL", "TRANSPARENT" ]
+ "flags": [ "RAIL", "TRANSPARENT" ]
},
{
"id": "t_railroad_track_h",
@@ -86,7 +86,7 @@
]
},
"connects_to": "RAIL",
- "flags": [ "BASHABLE", "RAIL", "TRANSPARENT" ]
+ "flags": [ "RAIL", "TRANSPARENT" ]
},
{
"id": "t_railroad_track_v",
@@ -117,7 +117,7 @@
]
},
"connects_to": "RAIL",
- "flags": [ "BASHABLE", "RAIL", "TRANSPARENT" ]
+ "flags": [ "RAIL", "TRANSPARENT" ]
},
{
"id": "t_railroad_track_d",
@@ -148,7 +148,7 @@
]
},
"connects_to": "RAIL",
- "flags": [ "BASHABLE", "RAIL", "TRANSPARENT" ]
+ "flags": [ "RAIL", "TRANSPARENT" ]
},
{
"id": "t_railroad_track_d1",
@@ -179,7 +179,7 @@
]
},
"connects_to": "RAIL",
- "flags": [ "BASHABLE", "RAIL", "TRANSPARENT" ]
+ "flags": [ "RAIL", "TRANSPARENT" ]
},
{
"id": "t_railroad_track_d2",
@@ -210,7 +210,7 @@
]
},
"connects_to": "RAIL",
- "flags": [ "BASHABLE", "RAIL", "TRANSPARENT" ]
+ "flags": [ "RAIL", "TRANSPARENT" ]
},
{
"id": "t_railroad_tie",
@@ -233,7 +233,7 @@
"items": [ { "item": "log", "count": [ 0, 1 ] }, { "item": "splinter", "count": [ 10, 20 ] } ]
},
"connects_to": "RAIL",
- "flags": [ "BASHABLE", "TRANSPARENT" ]
+ "flags": [ "TRANSPARENT" ]
},
{
"id": "t_railroad_tie_h",
@@ -256,7 +256,7 @@
"items": [ { "item": "log", "count": [ 0, 1 ] }, { "item": "splinter", "count": [ 10, 20 ] } ]
},
"connects_to": "RAIL",
- "flags": [ "BASHABLE", "TRANSPARENT" ]
+ "flags": [ "TRANSPARENT" ]
},
{
"id": "t_railroad_tie_v",
@@ -279,7 +279,7 @@
"items": [ { "item": "log", "count": [ 0, 1 ] }, { "item": "splinter", "count": [ 10, 20 ] } ]
},
"connects_to": "RAIL",
- "flags": [ "BASHABLE", "TRANSPARENT" ]
+ "flags": [ "TRANSPARENT" ]
},
{
"id": "t_railroad_tie_d",
@@ -302,7 +302,7 @@
"items": [ { "item": "log", "count": [ 0, 1 ] }, { "item": "splinter", "count": [ 10, 20 ] } ]
},
"connects_to": "RAIL",
- "flags": [ "BASHABLE", "TRANSPARENT" ]
+ "flags": [ "TRANSPARENT" ]
},
{
"id": "t_railroad_track_on_tie",
@@ -336,7 +336,7 @@
]
},
"connects_to": "RAIL",
- "flags": [ "BASHABLE", "RAIL", "TRANSPARENT" ]
+ "flags": [ "RAIL", "TRANSPARENT" ]
},
{
"id": "t_railroad_track_h_on_tie",
@@ -370,7 +370,7 @@
]
},
"connects_to": "RAIL",
- "flags": [ "BASHABLE", "RAIL", "TRANSPARENT" ]
+ "flags": [ "RAIL", "TRANSPARENT" ]
},
{
"id": "t_railroad_track_v_on_tie",
@@ -404,7 +404,7 @@
]
},
"connects_to": "RAIL",
- "flags": [ "BASHABLE", "RAIL", "TRANSPARENT" ]
+ "flags": [ "RAIL", "TRANSPARENT" ]
},
{
"id": "t_railroad_track_d_on_tie",
@@ -438,7 +438,7 @@
]
},
"connects_to": "RAIL",
- "flags": [ "BASHABLE", "RAIL", "TRANSPARENT" ]
+ "flags": [ "RAIL", "TRANSPARENT" ]
},
{
"id": "t_buffer_stop",
@@ -456,7 +456,7 @@
"sound_fail": "whump.",
"items": [ { "item": "2x4", "count": [ 2, 5 ] }, { "item": "nail", "charges": [ 3, 8 ] }, { "item": "splinter", "count": 2 } ]
},
- "flags": [ "BASHABLE", "TRANSPARENT", "NOITEM", "MOUNTABLE" ]
+ "flags": [ "TRANSPARENT", "NOITEM", "MOUNTABLE" ]
},
{
"id": "t_railroad_tie_d1",
@@ -479,7 +479,7 @@
"items": [ { "item": "log", "count": [ 0, 1 ] }, { "item": "splinter", "count": [ 10, 20 ] } ]
},
"connects_to": "RAIL",
- "flags": [ "BASHABLE", "TRANSPARENT" ]
+ "flags": [ "TRANSPARENT" ]
},
{
"id": "t_railroad_tie_d2",
@@ -502,7 +502,7 @@
"items": [ { "item": "log", "count": [ 0, 1 ] }, { "item": "splinter", "count": [ 10, 20 ] } ]
},
"connects_to": "RAIL",
- "flags": [ "BASHABLE", "TRANSPARENT" ]
+ "flags": [ "TRANSPARENT" ]
},
{
"id": "t_railroad_crossing_signal",
@@ -600,7 +600,7 @@
]
},
"connects_to": "RAIL",
- "flags": [ "BASHABLE", "RAIL", "TRANSPARENT" ]
+ "flags": [ "RAIL", "TRANSPARENT" ]
},
{
"id": "t_railroad_track_small_d",
@@ -634,6 +634,6 @@
]
},
"connects_to": "RAIL",
- "flags": [ "BASHABLE", "RAIL", "TRANSPARENT" ]
+ "flags": [ "RAIL", "TRANSPARENT" ]
}
]
diff --git a/data/json/furniture_and_terrain/terrain-walls.json b/data/json/furniture_and_terrain/terrain-walls.json
index ca1f7dc60f58d..99365c9430d55 100644
--- a/data/json/furniture_and_terrain/terrain-walls.json
+++ b/data/json/furniture_and_terrain/terrain-walls.json
@@ -74,17 +74,7 @@
"coverage": 60,
"connects_to": "WALL",
"roof": "t_flat_roof",
- "flags": [
- "TRANSPARENT",
- "FLAMMABLE",
- "PLACE_ITEM",
- "INDOORS",
- "AUTO_WALL_SYMBOL",
- "BASHABLE",
- "THIN_OBSTACLE",
- "MOUNTABLE",
- "SHORT"
- ],
+ "flags": [ "TRANSPARENT", "FLAMMABLE", "PLACE_ITEM", "INDOORS", "AUTO_WALL_SYMBOL", "THIN_OBSTACLE", "MOUNTABLE", "SHORT" ],
"deconstruct": { "ter_set": "t_floor", "items": [ { "item": "2x4", "count": 10 }, { "item": "nail", "charges": 20 } ] },
"bash": {
"str_min": 8,
diff --git a/data/json/furniture_and_terrain/terrain-zlevel-transitions.json b/data/json/furniture_and_terrain/terrain-zlevel-transitions.json
index a0eb14cb807f3..f9dba542a88ad 100644
--- a/data/json/furniture_and_terrain/terrain-zlevel-transitions.json
+++ b/data/json/furniture_and_terrain/terrain-zlevel-transitions.json
@@ -334,7 +334,7 @@
"symbol": "<",
"color": "dark_gray_white",
"move_cost": 4,
- "flags": [ "TRANSPARENT", "BASHABLE", "FLAMMABLE", "PLACE_ITEM", "RAMP", "SEEN_FROM_ABOVE" ],
+ "flags": [ "TRANSPARENT", "FLAMMABLE", "PLACE_ITEM", "RAMP", "SEEN_FROM_ABOVE" ],
"bash": {
"str_min": 12,
"str_max": 50,
@@ -356,7 +356,7 @@
"symbol": "<",
"color": "black_white",
"move_cost": 0,
- "flags": [ "BASHABLE", "FLAMMABLE", "PLACE_ITEM", "RAMP", "RAMP_END", "SEEN_FROM_ABOVE" ],
+ "flags": [ "FLAMMABLE", "PLACE_ITEM", "RAMP", "RAMP_END", "SEEN_FROM_ABOVE" ],
"bash": {
"str_min": 20,
"str_max": 50,
diff --git a/data/json/obsolete.json b/data/json/obsolete.json
index 4c73e0137d8cf..d38e0367f06e0 100644
--- a/data/json/obsolete.json
+++ b/data/json/obsolete.json
@@ -1197,7 +1197,7 @@
"color": "dark_gray",
"move_cost": 10,
"coverage": 65,
- "flags": [ "TRANSPARENT", "BASHABLE", "CONTAINER", "FLAMMABLE", "PLACE_ITEM" ],
+ "flags": [ "TRANSPARENT", "CONTAINER", "FLAMMABLE", "PLACE_ITEM" ],
"deconstruct": {
"ter_set": "t_rock_floor",
"items": [
@@ -1241,7 +1241,7 @@
"color": "light_gray",
"move_cost": 0,
"coverage": 75,
- "flags": [ "BASHABLE", "CONTAINER", "SEALED", "PLACE_ITEM" ],
+ "flags": [ "CONTAINER", "SEALED", "PLACE_ITEM" ],
"deconstruct": {
"ter_set": "t_rock_floor",
"items": [
@@ -1291,7 +1291,7 @@
"color": "brown",
"move_cost": 4,
"coverage": 55,
- "flags": [ "TRANSPARENT", "BASHABLE", "CONTAINER", "FLAMMABLE", "PLACE_ITEM" ],
+ "flags": [ "TRANSPARENT", "CONTAINER", "FLAMMABLE", "PLACE_ITEM" ],
"deconstruct": {
"ter_set": "t_rock_floor",
"items": [
@@ -1339,7 +1339,7 @@
"color": "yellow",
"move_cost": 8,
"coverage": 55,
- "flags": [ "TRANSPARENT", "BASHABLE", "CONTAINER", "SEALED", "FLAMMABLE", "PLACE_ITEM" ],
+ "flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "FLAMMABLE", "PLACE_ITEM" ],
"deconstruct": {
"ter_set": "t_rock_floor",
"items": [
diff --git a/data/mods/Aftershock/maps/terrain.json b/data/mods/Aftershock/maps/terrain.json
index 0256df631f0dc..167a9250f18c2 100644
--- a/data/mods/Aftershock/maps/terrain.json
+++ b/data/mods/Aftershock/maps/terrain.json
@@ -20,7 +20,7 @@
"move_cost": 0,
"coverage": 100,
"roof": "t_foamcrete_floor",
- "flags": [ "NOITEM", "SUPPORTS_ROOF", "DESTROY_ITEM", "MINEABLE", "BASHABLE", "BLOCK_WIND" ],
+ "flags": [ "NOITEM", "SUPPORTS_ROOF", "DESTROY_ITEM", "MINEABLE", "BLOCK_WIND" ],
"bash": { "str_min": 15, "str_max": 40, "sound": "crash!", "sound_fail": "thump!", "ter_set": "t_null" }
},
{
diff --git a/data/mods/Aftershock/maps/terrain_floraxeno.json b/data/mods/Aftershock/maps/terrain_floraxeno.json
index 3a67dc85bae55..11cb14aedf709 100644
--- a/data/mods/Aftershock/maps/terrain_floraxeno.json
+++ b/data/mods/Aftershock/maps/terrain_floraxeno.json
@@ -142,7 +142,7 @@
"move_cost_mod": -1,
"coverage": 65,
"required_str": -1,
- "flags": [ "NOITEM", "MINEABLE", "BASHABLE", "BLOCK_WIND", "EMITTER" ],
+ "flags": [ "NOITEM", "MINEABLE", "BLOCK_WIND", "EMITTER" ],
"emissions": [ "emit_smoke_plume", "emit_hot_air_migo_seep" ],
"bash": {
"str_min": 65,
diff --git a/data/mods/Aftershock/maps/terrain_groundxeno.json b/data/mods/Aftershock/maps/terrain_groundxeno.json
index f21d78887f670..d9a618d63d0c0 100644
--- a/data/mods/Aftershock/maps/terrain_groundxeno.json
+++ b/data/mods/Aftershock/maps/terrain_groundxeno.json
@@ -95,7 +95,7 @@
"move_cost_mod": -1,
"coverage": 65,
"required_str": -1,
- "flags": [ "NOITEM", "MINEABLE", "BASHABLE", "BLOCK_WIND", "EMITTER" ],
+ "flags": [ "NOITEM", "MINEABLE", "BLOCK_WIND", "EMITTER" ],
"emissions": [ "emit_smoke_plume", "emit_hot_air_migo_seep" ],
"bash": {
"str_min": 65,
@@ -121,7 +121,7 @@
"color": "white",
"move_cost": 0,
"coverage": 80,
- "flags": [ "NOITEM", "MINEABLE", "BASHABLE", "BLOCK_WIND", "EMITTER" ],
+ "flags": [ "NOITEM", "MINEABLE", "BLOCK_WIND", "EMITTER" ],
"emissions": [ "emit_smoke_plume", "emit_hot_air_migo_seep" ],
"bash": { "str_min": 45, "str_max": 140, "sound": "smash!", "sound_fail": "thump.", "ter_set": "t_fumarole" }
},
@@ -134,7 +134,7 @@
"color": "white",
"move_cost": 0,
"coverage": 80,
- "flags": [ "NOITEM", "MINEABLE", "BASHABLE", "BLOCK_WIND" ],
+ "flags": [ "NOITEM", "MINEABLE", "BLOCK_WIND" ],
"bash": { "str_min": 45, "str_max": 140, "sound": "smash!", "sound_fail": "thump.", "ter_set": "t_fumarole" }
},
{
@@ -345,7 +345,7 @@
"move_cost_mod": 3,
"coverage": 30,
"required_str": 10,
- "flags": [ "TRANSPARENT", "UNSTABLE", "MOUNTABLE", "TINY", "BASHABLE" ],
+ "flags": [ "TRANSPARENT", "UNSTABLE", "MOUNTABLE", "TINY" ],
"bash": { "str_min": 8, "str_max": 40, "sound": "flump!", "sound_fail": "thump." }
},
{
@@ -358,7 +358,7 @@
"move_cost_mod": 6,
"coverage": 45,
"required_str": 16,
- "flags": [ "NOITEM", "TRANSPARENT", "UNSTABLE", "MOUNTABLE", "SHORT", "BASHABLE" ],
+ "flags": [ "NOITEM", "TRANSPARENT", "UNSTABLE", "MOUNTABLE", "SHORT" ],
"bash": { "str_min": 12, "str_max": 80, "sound": "flump!", "sound_fail": "thump." }
},
{
@@ -371,7 +371,7 @@
"move_cost_mod": -1,
"coverage": 65,
"required_str": 20,
- "flags": [ "NOITEM", "BASHABLE", "BLOCK_WIND" ],
+ "flags": [ "NOITEM", "BLOCK_WIND" ],
"bash": { "str_min": 24, "str_max": 160, "sound": "flump!", "sound_fail": "thump." }
},
{
@@ -397,7 +397,7 @@
"move_cost_mod": 6,
"coverage": 45,
"required_str": 16,
- "flags": [ "NOITEM", "TRANSPARENT", "MINEABLE", "UNSTABLE", "MOUNTABLE", "SHORT", "BASHABLE" ],
+ "flags": [ "NOITEM", "TRANSPARENT", "MINEABLE", "UNSTABLE", "MOUNTABLE", "SHORT" ],
"bash": { "str_min": 32, "str_max": 80, "sound": "smash!", "sound_fail": "thump." }
},
{
@@ -410,7 +410,7 @@
"move_cost_mod": -1,
"coverage": 65,
"required_str": 32,
- "flags": [ "NOITEM", "MINEABLE", "BASHABLE", "BLOCK_WIND" ],
+ "flags": [ "NOITEM", "MINEABLE", "BLOCK_WIND" ],
"bash": { "str_min": 64, "str_max": 160, "sound": "smash!", "sound_fail": "thump." }
},
{
diff --git a/data/mods/Magiclysm/furniture.json b/data/mods/Magiclysm/furniture.json
index 4fda22308f974..4b31ad91391bc 100644
--- a/data/mods/Magiclysm/furniture.json
+++ b/data/mods/Magiclysm/furniture.json
@@ -33,7 +33,7 @@
"move_cost_mod": -1,
"coverage": 65,
"required_str": 32,
- "flags": [ "NOITEM", "MINEABLE", "BASHABLE", "BLOCK_WIND" ],
+ "flags": [ "NOITEM", "MINEABLE", "BLOCK_WIND" ],
"bash": {
"str_min": 64,
"str_max": 160,
@@ -196,7 +196,6 @@
"color": "light_gray",
"coverage": 40,
"required_str": 30,
- "flags": [ "BASHABLE" ],
"description": "This is a big stone altar. Most commonly used in morally questionable rituals.",
"bash": {
"str_min": 30,
@@ -216,7 +215,6 @@
"coverage": 40,
"looks_like": "t_pedestal_temple",
"required_str": 30,
- "flags": [ "BASHABLE" ],
"examine_action": "attunement_altar",
"description": "An ancient stone plinth covered in symbols that appear to be combinations and variations of the eight magic classes. Eight depressions are on the top with the original symbols of the classes, each look as though they can hold an item.",
"bash": {
@@ -259,7 +257,7 @@
"move_cost_mod": -1,
"required_str": 12,
"light_emitted": 40,
- "flags": [ "TRANSPARENT", "BASHABLE" ],
+ "flags": [ "TRANSPARENT" ],
"bash": {
"sound": "SMASH!",
"str_min": 20,
diff --git a/data/mods/More_Locations/terrain.json b/data/mods/More_Locations/terrain.json
index 8c18758547610..e7baa0ac919c2 100644
--- a/data/mods/More_Locations/terrain.json
+++ b/data/mods/More_Locations/terrain.json
@@ -54,7 +54,7 @@
"symbol": "0",
"color": "white_red",
"move_cost": 0,
- "flags": [ "WALL", "BASHABLE", "PERMEABLE", "CONTAINER", "FIRE_CONTAINER", "SUPPRESS_SMOKE", "PLACE_ITEM" ],
+ "flags": [ "WALL", "PERMEABLE", "CONTAINER", "FIRE_CONTAINER", "SUPPRESS_SMOKE", "PLACE_ITEM" ],
"bash": {
"str_min": 20,
"str_max": 150,
@@ -85,7 +85,7 @@
"symbol": "7",
"color": "yellow_red",
"move_cost": 0,
- "flags": [ "WALL", "PERMEABLE", "NOITEM", "BASHABLE", "DECONSTRUCT" ],
+ "flags": [ "WALL", "PERMEABLE", "NOITEM" ],
"bash": {
"str_min": 20,
"str_max": 150,
@@ -117,7 +117,7 @@
"symbol": "9",
"color": "black_red",
"move_cost": 0,
- "flags": [ "WALL", "PERMEABLE", "NOITEM", "BASHABLE", "DECONSTRUCT" ],
+ "flags": [ "WALL", "PERMEABLE", "NOITEM" ],
"bash": {
"str_min": 20,
"str_max": 150,
@@ -148,7 +148,7 @@
"symbol": "4",
"color": "cyan_red",
"move_cost": 0,
- "flags": [ "WALL", "PERMEABLE", "NOITEM", "BASHABLE", "DECONSTRUCT" ],
+ "flags": [ "WALL", "PERMEABLE", "NOITEM" ],
"bash": {
"str_min": 20,
"str_max": 150,
@@ -179,7 +179,7 @@
"symbol": "3",
"color": "magenta_cyan",
"move_cost": 0,
- "flags": [ "WALL", "TRANSPARENT", "PERMEABLE", "NOITEM", "BASHABLE", "DECONSTRUCT" ],
+ "flags": [ "WALL", "TRANSPARENT", "PERMEABLE", "NOITEM" ],
"bash": {
"str_min": 20,
"str_max": 150,
@@ -222,7 +222,7 @@
"symbol": "0",
"color": "red_green",
"move_cost": 0,
- "flags": [ "WALL", "PERMEABLE", "NOITEM", "BASHABLE", "DECONSTRUCT", "CONTAINER", "LIQUIDCONT", "SEALED" ],
+ "flags": [ "WALL", "PERMEABLE", "NOITEM", "CONTAINER", "LIQUIDCONT", "SEALED" ],
"bash": {
"str_min": 20,
"str_max": 150,
diff --git a/data/mods/My_Sweet_Cataclysm/sweet_furniture.json b/data/mods/My_Sweet_Cataclysm/sweet_furniture.json
index e751874e3d09c..d09cc1a73205f 100644
--- a/data/mods/My_Sweet_Cataclysm/sweet_furniture.json
+++ b/data/mods/My_Sweet_Cataclysm/sweet_furniture.json
@@ -54,7 +54,7 @@
"coverage": 45,
"required_str": 16,
"crafting_pseudo_item": "boulder_anvil",
- "flags": [ "NOITEM", "TRANSPARENT", "MINEABLE", "UNSTABLE", "MOUNTABLE", "SHORT", "BASHABLE" ],
+ "flags": [ "NOITEM", "TRANSPARENT", "MINEABLE", "UNSTABLE", "MOUNTABLE", "SHORT" ],
"bash": {
"str_min": 32,
"str_max": 80,
@@ -73,7 +73,7 @@
"move_cost_mod": -1,
"coverage": 65,
"required_str": 32,
- "flags": [ "NOITEM", "MINEABLE", "BASHABLE", "BLOCK_WIND" ],
+ "flags": [ "NOITEM", "MINEABLE", "BLOCK_WIND" ],
"bash": {
"str_min": 64,
"str_max": 160,
diff --git a/doc/JSON_FLAGS.md b/doc/JSON_FLAGS.md
index 4384f0291af09..d1ef06194fe2a 100644
--- a/doc/JSON_FLAGS.md
+++ b/doc/JSON_FLAGS.md
@@ -528,7 +528,6 @@ List of known flags, used in both `terrain.json` and `furniture.json`.
- ```BARRICADABLE_DOOR``` Door that can be barricaded.
- ```BARRICADABLE_WINDOW_CURTAINS```
- ```BARRICADABLE_WINDOW``` Window that can be barricaded.
-- ```BASHABLE``` Players + Monsters can bash this.
- ```BLOCK_WIND``` This terrain will block the effects of wind.
- ```BURROWABLE``` Burrowing monsters can travel under this terrain, while most others can't (e.g. graboid will traverse under the chain link fence, while ordinary zombie will be stopped by it).
- ```BUTCHER_EQ``` Butcher's equipment - required for full butchery of corpses.
@@ -538,7 +537,6 @@ List of known flags, used in both `terrain.json` and `furniture.json`.
- ```CONNECT_TO_WALL``` (only for terrain) This flag has been superseded by the JSON entry `connects_to`, but is retained for backward compatibility.
- ```CONSOLE``` Used as a computer.
- ```CONTAINER``` Items on this square are hidden until looted by the player.
-- ```DECONSTRUCT``` Can be deconstructed.
- ```DEEP_WATER``` This is water that can submerge the player
- ```DESTROY_ITEM``` Items that land here are destroyed. See also `NOITEM`
- ```DIFFICULT_Z``` Most zombies will not be able to follow you up this terrain ( i.e a ladder )
@@ -556,7 +554,6 @@ List of known flags, used in both `terrain.json` and `furniture.json`.
- ```FORAGE_POISION``` This item can be found with the `HIDDEN_POISON` flag when found through foraging.
- ```GOES_DOWN``` Can use > to go down a level.
- ```GOES_UP``` Can use < to go up a level.
-- ```GROWTH_SEED``` This plant is in its seed stage of growth.
- ```GROWTH_SEEDLING``` This plant is in its seedling stage of growth.
- ```GROWTH_MATURE``` This plant is in a mature stage of a growth.
- ```GROWTH_HARVEST``` This plant is ready for harvest.