Skip to content

Commit

Permalink
fix: stop wander spawns from spawning inside doorways (#5682)
Browse files Browse the repository at this point in the history
* IM MAD

* Update terrain-doors.json
  • Loading branch information
RoyalFox2140 authored Nov 7, 2024
1 parent b851965 commit d309c46
Showing 1 changed file with 28 additions and 28 deletions.
56 changes: 28 additions & 28 deletions data/json/furniture_and_terrain/terrain-doors.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"move_cost": 2,
"looks_like": "t_reinforced_door_glass_o",
"roof": "t_flat_roof",
"flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD", "MINEABLE" ],
"flags": [ "TRANSPARENT", "INDOORS", "FLAT", "CONNECT_TO_WALL", "ROAD", "MINEABLE" ],
"close": "t_laminated_door_glass_c",
"bash": {
"str_min": 60,
Expand Down Expand Up @@ -82,7 +82,7 @@
"move_cost": 2,
"looks_like": "t_reinforced_door_glass_o",
"roof": "t_flat_roof",
"flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD", "MINEABLE" ],
"flags": [ "TRANSPARENT", "INDOORS", "FLAT", "CONNECT_TO_WALL", "ROAD", "MINEABLE" ],
"close": "t_ballistic_door_glass_c",
"bash": {
"str_min": 100,
Expand Down Expand Up @@ -155,7 +155,7 @@
"color": "light_cyan",
"move_cost": 2,
"roof": "t_flat_roof",
"flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD", "MINEABLE" ],
"flags": [ "TRANSPARENT", "INDOORS", "FLAT", "CONNECT_TO_WALL", "ROAD", "MINEABLE" ],
"close": "t_reinforced_door_glass_c",
"bash": {
"str_min": 80,
Expand All @@ -178,7 +178,7 @@
"color": "light_cyan",
"move_cost": 2,
"roof": "t_flat_roof",
"flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD", "MINEABLE" ],
"flags": [ "TRANSPARENT", "INDOORS", "FLAT", "CONNECT_TO_WALL", "ROAD", "MINEABLE" ],
"close": "t_reinforced_door_glass_lab_c",
"bash": {
"str_min": 80,
Expand Down Expand Up @@ -434,7 +434,7 @@
"color": "brown",
"move_cost": 2,
"roof": "t_flat_roof",
"flags": [ "FLAMMABLE_ASH", "TRANSPARENT", "FLAT", "BARRICADABLE_DOOR", "CONNECT_TO_WALL", "ROAD" ],
"flags": [ "FLAMMABLE_ASH", "INDOORS", "TRANSPARENT", "FLAT", "BARRICADABLE_DOOR", "CONNECT_TO_WALL", "ROAD" ],
"deconstruct": {
"ter_set": "t_door_white_frame",
"items": [
Expand Down Expand Up @@ -471,7 +471,7 @@
"color": "brown",
"move_cost": 2,
"roof": "t_flat_roof",
"flags": [ "FLAMMABLE_ASH", "TRANSPARENT", "FLAT", "BARRICADABLE_DOOR", "CONNECT_TO_WALL", "ROAD" ],
"flags": [ "FLAMMABLE_ASH", "INDOORS", "TRANSPARENT", "FLAT", "BARRICADABLE_DOOR", "CONNECT_TO_WALL", "ROAD" ],
"deconstruct": {
"ter_set": "t_door_gray_frame",
"items": [
Expand Down Expand Up @@ -508,7 +508,7 @@
"color": "brown",
"move_cost": 2,
"roof": "t_flat_roof",
"flags": [ "FLAMMABLE_ASH", "TRANSPARENT", "FLAT", "BARRICADABLE_DOOR", "CONNECT_TO_WALL", "ROAD" ],
"flags": [ "FLAMMABLE_ASH", "INDOORS", "TRANSPARENT", "FLAT", "BARRICADABLE_DOOR", "CONNECT_TO_WALL", "ROAD" ],
"deconstruct": {
"ter_set": "t_door_red_frame",
"items": [
Expand Down Expand Up @@ -545,7 +545,7 @@
"color": "brown",
"move_cost": 2,
"roof": "t_flat_roof",
"flags": [ "FLAMMABLE_ASH", "TRANSPARENT", "FLAT", "BARRICADABLE_DOOR", "CONNECT_TO_WALL", "ROAD" ],
"flags": [ "FLAMMABLE_ASH", "INDOORS", "TRANSPARENT", "FLAT", "BARRICADABLE_DOOR", "CONNECT_TO_WALL", "ROAD" ],
"deconstruct": {
"ter_set": "t_door_green_frame",
"items": [
Expand Down Expand Up @@ -932,7 +932,7 @@
"color": "light_cyan",
"move_cost": 2,
"roof": "t_flat_roof",
"flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD" ],
"flags": [ "TRANSPARENT", "INDOORS", "FLAT", "CONNECT_TO_WALL", "ROAD" ],
"close": "t_door_glass_red_c",
"deconstruct": { "ter_set": "t_door_red_frame", "items": [ { "item": "glass_sheet", "count": 1 } ] },
"bash": {
Expand All @@ -956,7 +956,7 @@
"color": "light_cyan",
"move_cost": 2,
"roof": "t_flat_roof",
"flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD" ],
"flags": [ "TRANSPARENT", "INDOORS", "FLAT", "CONNECT_TO_WALL", "ROAD" ],
"close": "t_door_glass_green_c",
"deconstruct": { "ter_set": "t_door_green_frame", "items": [ { "item": "glass_sheet", "count": 1 } ] },
"bash": {
Expand All @@ -980,7 +980,7 @@
"color": "light_cyan",
"move_cost": 2,
"roof": "t_flat_roof",
"flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD" ],
"flags": [ "TRANSPARENT", "INDOORS", "FLAT", "CONNECT_TO_WALL", "ROAD" ],
"close": "t_door_glass_white_c",
"deconstruct": { "ter_set": "t_door_white_frame", "items": [ { "item": "glass_sheet", "count": 1 } ] },
"bash": {
Expand All @@ -1004,7 +1004,7 @@
"color": "light_cyan",
"move_cost": 2,
"roof": "t_flat_roof",
"flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD" ],
"flags": [ "TRANSPARENT", "INDOORS", "FLAT", "CONNECT_TO_WALL", "ROAD" ],
"close": "t_door_glass_gray_c",
"deconstruct": { "ter_set": "t_door_gray_frame", "items": [ { "item": "glass_sheet", "count": 1 } ] },
"bash": {
Expand All @@ -1029,7 +1029,7 @@
"move_cost": 0,
"coverage": 95,
"roof": "t_flat_roof",
"flags": [ "FLAMMABLE_ASH", "DOOR", "NOITEM", "BARRICADABLE_DOOR", "CONNECT_TO_WALL", "BLOCK_WIND" ],
"flags": [ "FLAMMABLE_ASH", "INDOORS", "DOOR", "NOITEM", "BARRICADABLE_DOOR", "CONNECT_TO_WALL", "BLOCK_WIND" ],
"examine_action": "door_peephole",
"open": "t_door_o_peep",
"deconstruct": {
Expand Down Expand Up @@ -1180,7 +1180,7 @@
"color": "brown",
"move_cost": 2,
"roof": "t_flat_roof",
"flags": [ "FLAMMABLE_ASH", "TRANSPARENT", "FLAT", "BARRICADABLE_DOOR", "CONNECT_TO_WALL", "ROAD" ],
"flags": [ "FLAMMABLE_ASH", "INDOORS", "TRANSPARENT", "FLAT", "BARRICADABLE_DOOR", "CONNECT_TO_WALL", "ROAD" ],
"deconstruct": {
"ter_set": "t_door_frame",
"items": [
Expand Down Expand Up @@ -1217,7 +1217,7 @@
"color": "brown",
"move_cost": 2,
"roof": "t_flat_roof",
"flags": [ "FLAMMABLE_ASH", "TRANSPARENT", "FLAT", "BARRICADABLE_DOOR", "CONNECT_TO_WALL", "ROAD" ],
"flags": [ "FLAMMABLE_ASH", "INDOORS", "TRANSPARENT", "FLAT", "BARRICADABLE_DOOR", "CONNECT_TO_WALL", "ROAD" ],
"deconstruct": {
"ter_set": "t_door_lab_frame",
"items": [
Expand Down Expand Up @@ -1253,7 +1253,7 @@
"color": "brown",
"move_cost": 2,
"roof": "t_flat_roof",
"flags": [ "FLAMMABLE_ASH", "TRANSPARENT", "FLAT", "BARRICADABLE_DOOR", "CONNECT_TO_WALL", "ROAD" ],
"flags": [ "FLAMMABLE_ASH", "INDOORS", "TRANSPARENT", "FLAT", "BARRICADABLE_DOOR", "CONNECT_TO_WALL", "ROAD" ],
"deconstruct": {
"ter_set": "t_door_frame",
"items": [
Expand Down Expand Up @@ -1362,7 +1362,7 @@
"color": "red",
"move_cost": 2,
"roof": "t_flat_roof",
"flags": [ "FLAMMABLE_ASH", "TRANSPARENT", "FLAT", "BARRICADABLE_DOOR_REINFORCED", "CONNECT_TO_WALL", "ROAD" ],
"flags": [ "FLAMMABLE_ASH", "INDOORS", "TRANSPARENT", "FLAT", "BARRICADABLE_DOOR_REINFORCED", "CONNECT_TO_WALL", "ROAD" ],
"deconstruct": {
"ter_set": "t_door_c",
"items": [ { "item": "2x4", "count": 12 }, { "item": "nail", "charges": 48 }, { "item": "hinge", "count": 1 } ]
Expand Down Expand Up @@ -1685,7 +1685,7 @@
"color": "dark_gray",
"move_cost": 2,
"roof": "t_flat_roof",
"flags": [ "FLAMMABLE_ASH", "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD", "EASY_DECONSTRUCT" ],
"flags": [ "FLAMMABLE_ASH", "INDOORS", "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD", "EASY_DECONSTRUCT" ],
"deconstruct": {
"ter_set": "t_dirt",
"items": [ { "item": "stick", "count": 1 }, { "item": "sheet", "count": 2 }, { "item": "withered", "count": 12 } ]
Expand Down Expand Up @@ -1717,7 +1717,7 @@
"color": "brown",
"move_cost": 2,
"roof": "t_flat_roof",
"flags": [ "FLAMMABLE_ASH", "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD", "EASY_DECONSTRUCT" ],
"flags": [ "FLAMMABLE_ASH", "INDOORS", "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD", "EASY_DECONSTRUCT" ],
"deconstruct": { "ter_set": "t_door_frame", "items": [ { "item": "2x4", "count": 6 }, { "item": "rope_makeshift_6", "count": 2 } ] },
"close": "t_door_makeshift_c",
"bash": {
Expand Down Expand Up @@ -2086,7 +2086,7 @@
"symbol": "'",
"color": "cyan",
"move_cost": 2,
"flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD", "MINEABLE" ],
"flags": [ "TRANSPARENT", "INDOORS", "FLAT", "CONNECT_TO_WALL", "ROAD", "MINEABLE" ],
"open": "t_null",
"close": "t_secretdoor_metal_c"
},
Expand Down Expand Up @@ -2127,7 +2127,7 @@
"color": "cyan",
"move_cost": 2,
"roof": "t_flat_roof",
"flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD", "MINEABLE" ],
"flags": [ "TRANSPARENT", "INDOORS", "FLAT", "CONNECT_TO_WALL", "ROAD", "MINEABLE" ],
"close": "t_door_metal_c",
"bash": {
"str_min": 90,
Expand All @@ -2152,7 +2152,7 @@
"color": "cyan",
"move_cost": 2,
"roof": "t_flat_roof",
"flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD", "MINEABLE" ],
"flags": [ "TRANSPARENT", "INDOORS", "FLAT", "CONNECT_TO_WALL", "ROAD", "MINEABLE" ],
"close": "t_door_metal_lab_c",
"bash": {
"str_min": 90,
Expand Down Expand Up @@ -2206,7 +2206,7 @@
"color": "cyan",
"move_cost": 2,
"roof": "t_flat_roof",
"flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD", "MINEABLE" ],
"flags": [ "TRANSPARENT", "INDOORS", "FLAT", "CONNECT_TO_WALL", "ROAD", "MINEABLE" ],
"close": "t_door_metal_c_peep",
"bash": {
"str_min": 90,
Expand Down Expand Up @@ -2400,7 +2400,7 @@
"color": "cyan",
"move_cost": 2,
"roof": "t_flat_roof",
"flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD" ],
"flags": [ "TRANSPARENT", "INDOORS", "FLAT", "CONNECT_TO_WALL", "ROAD" ],
"close": "t_door_bar_c",
"bash": {
"str_min": 20,
Expand Down Expand Up @@ -2520,7 +2520,7 @@
"color": "light_cyan",
"move_cost": 2,
"roof": "t_flat_roof",
"flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD" ],
"flags": [ "TRANSPARENT", "INDOORS", "FLAT", "CONNECT_TO_WALL", "ROAD" ],
"close": "t_door_glass_c",
"deconstruct": { "ter_set": "t_door_frame", "items": [ { "item": "glass_sheet", "count": 1 } ] },
"bash": {
Expand All @@ -2544,7 +2544,7 @@
"color": "light_cyan",
"move_cost": 2,
"roof": "t_flat_roof",
"flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD" ],
"flags": [ "TRANSPARENT", "INDOORS", "FLAT", "CONNECT_TO_WALL", "ROAD" ],
"close": "t_door_glass_lab_c",
"deconstruct": { "ter_set": "t_door_frame", "items": [ { "item": "glass_sheet", "count": 1 } ] },
"bash": {
Expand Down Expand Up @@ -2590,7 +2590,7 @@
"symbol": "'",
"looks_like": "t_door_glass_o",
"color": "white",
"flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD" ],
"flags": [ "TRANSPARENT", "INDOORS", "FLAT", "CONNECT_TO_WALL", "ROAD" ],
"close": "t_door_glass_frosted_c",
"copy-from": "t_door_glass_o"
},
Expand All @@ -2602,7 +2602,7 @@
"symbol": "'",
"looks_like": "t_door_glass_frosted_o",
"color": "white",
"flags": [ "TRANSPARENT", "FLAT", "CONNECT_TO_WALL", "ROAD" ],
"flags": [ "TRANSPARENT", "INDOORS", "FLAT", "CONNECT_TO_WALL", "ROAD" ],
"close": "t_door_glass_frosted_lab_c",
"copy-from": "t_door_glass_lab_o"
},
Expand Down

0 comments on commit d309c46

Please sign in to comment.