From 3761958bc9c7a7dd8e2adc5676c766c12acf5fd0 Mon Sep 17 00:00:00 2001 From: RoyalFox2140 Date: Mon, 15 Jan 2024 18:40:35 -0500 Subject: [PATCH 1/2] no_scent added to glass windows --- .../terrain-windows.json | 83 ++++++++++--------- 1 file changed, 43 insertions(+), 40 deletions(-) diff --git a/data/json/furniture_and_terrain/terrain-windows.json b/data/json/furniture_and_terrain/terrain-windows.json index 07727f607d25..e5bd85323c54 100644 --- a/data/json/furniture_and_terrain/terrain-windows.json +++ b/data/json/furniture_and_terrain/terrain-windows.json @@ -9,7 +9,7 @@ "move_cost": 0, "coverage": 60, "roof": "t_flat_roof", - "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "REDUCE_SCENT", "BARRICADABLE_WINDOW", "CONNECT_TO_WALL", "BLOCK_WIND" ], + "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "NO_SCENT", "BARRICADABLE_WINDOW", "CONNECT_TO_WALL", "BLOCK_WIND" ], "deconstruct": { "ter_set": "t_window_empty", "items": [ { "item": "glass_sheet", "count": 1 } ] }, "bash": { "str_min": 3, @@ -142,7 +142,7 @@ "symbol": "\"", "color": "dark_gray", "move_cost": 0, - "delete": { "flags": [ "TRANSPARENT", "REDUCE_SCENT", "BARRICADABLE_WINDOW", "CONNECT_TO_WALL" ] }, + "delete": { "flags": [ "TRANSPARENT", "NO_SCENT", "BARRICADABLE_WINDOW", "CONNECT_TO_WALL" ] }, "extend": { "flags": [ "WALL" ] }, "bash": { "items": [ { "item": "glass_shard", "count": [ 1, 3 ] } ], @@ -182,7 +182,7 @@ "color": "light_gray", "move_cost": 4, "extend": { "flags": [ "OPENCLOSE_INSIDE", "MOUNTABLE", "THIN_OBSTACLE", "SMALL_PASSAGE", "WINDOW" ] }, - "delete": { "flags": [ "REDUCE_SCENT", "BARRICADABLE_WINDOW", "BLOCK_WIND" ] }, + "delete": { "flags": [ "NO_SCENT", "BARRICADABLE_WINDOW", "BLOCK_WIND" ] }, "curtain_transform": "t_window_no_curtains", "examine_action": "curtains", "close": "t_window_domestic", @@ -206,7 +206,7 @@ "move_cost": 0, "coverage": 95, "extend": { "flags": [ "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW_CURTAINS", "WINDOW" ] }, - "delete": { "flags": [ "TRANSPARENT", "REDUCE_SCENT", "BARRICADABLE_WINDOW" ] }, + "delete": { "flags": [ "TRANSPARENT", "BARRICADABLE_WINDOW" ] }, "curtain_transform": "t_window_no_curtains", "open": "t_window_domestic", "examine_action": "curtains", @@ -361,7 +361,7 @@ "move_cost": 0, "coverage": 95, "roof": "t_flat_roof", - "flags": [ "FLAMMABLE", "NOITEM", "REDUCE_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND" ], + "flags": [ "FLAMMABLE", "NOITEM", "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND" ], "bash": { "str_min": 3, "str_max": 30, @@ -384,7 +384,7 @@ "move_cost": 0, "coverage": 95, "roof": "t_flat_roof", - "flags": [ "FLAMMABLE", "NOITEM", "REDUCE_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND" ], + "flags": [ "FLAMMABLE", "NOITEM", "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND" ], "bash": { "str_min": 12, "str_max": 30, @@ -432,7 +432,7 @@ "message": "You finish cutting the metal.", "byproducts": [ { "item": "rebar", "count": [ 1, 4 ] } ] }, - "flags": [ "NOITEM", "REDUCE_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND" ], + "flags": [ "NOITEM", "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND" ], "oxytorch": { "result": "t_window_empty", "duration": "4 seconds", @@ -547,7 +547,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW_CURTAINS", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND", "WINDOW" @@ -593,7 +593,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW_CURTAINS", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND" ], @@ -625,7 +625,7 @@ "color": "light_green", "move_cost": 0, "roof": "t_flat_roof", - "flags": [ "NOITEM", "SUPPORTS_ROOF", "WALL", "BARRICADABLE_WINDOW", "CONNECT_TO_WALL", "MINEABLE", "BLOCK_WIND" ], + "flags": [ "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "BARRICADABLE_WINDOW", "CONNECT_TO_WALL", "MINEABLE", "BLOCK_WIND" ], "bash": { "str_min": 100, "str_max": 400, @@ -644,7 +644,7 @@ "color": "light_red", "move_cost": 0, "roof": "t_flat_roof", - "flags": [ "NOITEM", "SUPPORTS_ROOF", "WALL", "BARRICADABLE_WINDOW", "CONNECT_TO_WALL", "MINEABLE", "BLOCK_WIND" ], + "flags": [ "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "BARRICADABLE_WINDOW", "CONNECT_TO_WALL", "MINEABLE", "BLOCK_WIND" ], "bash": { "str_min": 100, "str_max": 400, @@ -663,7 +663,7 @@ "color": "light_blue", "move_cost": 0, "roof": "t_flat_roof", - "flags": [ "NOITEM", "SUPPORTS_ROOF", "WALL", "BARRICADABLE_WINDOW", "CONNECT_TO_WALL", "MINEABLE", "BLOCK_WIND" ], + "flags": [ "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "BARRICADABLE_WINDOW", "CONNECT_TO_WALL", "MINEABLE", "BLOCK_WIND" ], "bash": { "str_min": 100, "str_max": 400, @@ -701,7 +701,7 @@ "BARRICADABLE_WINDOW", "THIN_OBSTACLE", "BLOCK_WIND", - "REDUCE_SCENT", + "NO_SCENT", "WINDOW" ], "deconstruct": { @@ -743,7 +743,7 @@ "message": "You finish cutting the metal.", "byproducts": [ { "item": "pipe", "count": [ 1, 12 ] }, { "item": "sheet_metal", "count": 4 } ] }, - "flags": [ "NOITEM", "CONNECT_TO_WALL", "THIN_OBSTACLE", "BARRICADABLE_WINDOW_CURTAINS", "BLOCK_WIND", "REDUCE_SCENT", "WINDOW" ], + "flags": [ "NOITEM", "CONNECT_TO_WALL", "THIN_OBSTACLE", "BARRICADABLE_WINDOW_CURTAINS", "BLOCK_WIND", "NO_SCENT", "WINDOW" ], "curtain_transform": "t_window_bars", "examine_action": "curtains", "open": "t_metal_grate_window_with_curtain_open", @@ -782,7 +782,7 @@ "THIN_OBSTACLE", "BARRICADABLE_WINDOW_CURTAINS", "BLOCK_WIND", - "REDUCE_SCENT", + "NO_SCENT", "WINDOW" ], "oxytorch": { @@ -969,7 +969,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND" ], @@ -1047,7 +1047,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW_CURTAINS", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND", "WINDOW" @@ -1093,7 +1093,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW_CURTAINS", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND" ], @@ -1186,7 +1186,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND" ], @@ -1264,7 +1264,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW_CURTAINS", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND", "WINDOW" @@ -1310,7 +1310,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW_CURTAINS", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND" ], @@ -1403,7 +1403,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND" ], @@ -1481,7 +1481,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW_CURTAINS", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND", "WINDOW" @@ -1527,7 +1527,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW_CURTAINS", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND" ], @@ -1620,7 +1620,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND" ], @@ -1699,7 +1699,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW_CURTAINS", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND", "WINDOW" @@ -1745,6 +1745,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "MOUNTABLE", + "NO_SCENT", "BARRICADABLE_WINDOW_CURTAINS", "CONNECT_TO_WALL", "THIN_OBSTACLE", @@ -1840,7 +1841,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND" ], @@ -1918,7 +1919,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW_CURTAINS", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND", "WINDOW" @@ -1964,7 +1965,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW_CURTAINS", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND" ], @@ -2057,7 +2058,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND" ], @@ -2135,7 +2136,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW_CURTAINS", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND", "WINDOW" @@ -2181,6 +2182,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "MOUNTABLE", + "NO_SCENT", "BARRICADABLE_WINDOW_CURTAINS", "CONNECT_TO_WALL", "THIN_OBSTACLE", @@ -2276,7 +2278,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND" ], @@ -2352,7 +2354,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW_CURTAINS", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND", "WINDOW" @@ -2398,7 +2400,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW_CURTAINS", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND" ], @@ -2491,7 +2493,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND" ], @@ -2569,7 +2571,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW_CURTAINS", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND", "WINDOW" @@ -2663,6 +2665,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "MOUNTABLE", + "NO_SCENT", "BARRICADABLE_WINDOW_CURTAINS", "CONNECT_TO_WALL", "THIN_OBSTACLE", @@ -3167,7 +3170,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND" ], @@ -3244,7 +3247,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW_CURTAINS", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND", "WINDOW" @@ -3290,7 +3293,7 @@ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW_CURTAINS", - "REDUCE_SCENT", + "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND" ], @@ -3376,7 +3379,7 @@ "color": "light_gray", "move_cost": 0, "roof": "t_metal_flat_roof", - "flags": [ "TRANSPARENT", "NOITEM", "CONNECT_TO_WALL", "THIN_OBSTACLE", "BLOCK_WIND", "REDUCE_SCENT" ], + "flags": [ "TRANSPARENT", "NOITEM", "CONNECT_TO_WALL", "THIN_OBSTACLE", "BLOCK_WIND", "NO_SCENT" ], "bash": { "str_min": 50, "str_max": 75, From 9e264165ab87894a66183275fd59e0b0c06e8518 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 23:45:45 +0000 Subject: [PATCH 2/2] style(autofix.ci): automated formatting --- data/json/furniture_and_terrain/terrain-windows.json | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/data/json/furniture_and_terrain/terrain-windows.json b/data/json/furniture_and_terrain/terrain-windows.json index e5bd85323c54..ca50fc1e6f37 100644 --- a/data/json/furniture_and_terrain/terrain-windows.json +++ b/data/json/furniture_and_terrain/terrain-windows.json @@ -543,15 +543,7 @@ }, "roof": "t_flat_roof", "oxytorch": { "result": "t_window_domestic", "duration": "9 seconds", "byproducts": [ { "item": "rebar", "count": [ 1, 2 ] } ] }, - "flags": [ - "NOITEM", - "OPENCLOSE_INSIDE", - "BARRICADABLE_WINDOW_CURTAINS", - "NO_SCENT", - "CONNECT_TO_WALL", - "BLOCK_WIND", - "WINDOW" - ], + "flags": [ "NOITEM", "OPENCLOSE_INSIDE", "BARRICADABLE_WINDOW_CURTAINS", "NO_SCENT", "CONNECT_TO_WALL", "BLOCK_WIND", "WINDOW" ], "curtain_transform": "t_window_bars", "examine_action": "curtains", "open": "t_window_bars_domestic",