Skip to content

Commit 419ca18

Browse files
MaleclypseMaleclypse
authored
Merge pull request #82772 from ShnitzelX2/pseudo-terrain-flag-2
2 parents 00965e8 + f5b7d13 commit 419ca18

File tree

6 files changed

+147
-186
lines changed

6 files changed

+147
-186
lines changed

‎data/json/furniture_and_terrain/furniture-regional-pseudo.json‎

Lines changed: 48 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +1,93 @@
11
[
22
{
33
"type": "furniture",
4-
"id": "f_region_flower",
5-
"name": "this should never actually show up, it's a pseudo furniture",
6-
"description": "This is pseudo-furniture and should never actually show up. Please report this bug.",
4+
"abstract": "f_region_pseudo",
5+
"name": "pseudo furniture",
6+
"description": "This should never actually show up, it should have been replaced with regional furniture.",
77
"symbol": " ",
88
"color": "black",
99
"move_cost_mod": 0,
1010
"required_str": 0,
11-
"flags": [ "TRANSPARENT" ]
11+
"flags": [ "TRANSPARENT", "REGION_PSEUDO" ]
12+
},
13+
{
14+
"type": "furniture",
15+
"id": "f_region_flower",
16+
"copy-from": "f_region_pseudo",
17+
"name": "pseudo furniture",
18+
"description": "This should never actually show up, it should have been replaced with regional furniture.",
19+
"move_cost_mod": 0
1220
},
1321
{
1422
"type": "furniture",
1523
"id": "f_region_weed",
16-
"name": "this should never actually show up, it's a pseudo furniture",
17-
"description": "This is pseudo-furniture and should never actually show up. Please report this bug.",
18-
"symbol": " ",
19-
"color": "black",
20-
"move_cost_mod": 0,
21-
"required_str": 0,
22-
"flags": [ "TRANSPARENT" ]
24+
"copy-from": "f_region_pseudo",
25+
"name": "pseudo furniture",
26+
"description": "This should never actually show up, it should have been replaced with regional furniture.",
27+
"move_cost_mod": 0
2328
},
2429
{
2530
"type": "furniture",
2631
"id": "f_region_water_plant",
27-
"name": "this should never actually show up, it's a pseudo furniture",
28-
"description": "This is pseudo-furniture and should never actually show up. Please report this bug.",
29-
"symbol": " ",
30-
"color": "black",
31-
"move_cost_mod": 0,
32-
"required_str": 0,
33-
"flags": [ "TRANSPARENT" ]
32+
"copy-from": "f_region_pseudo",
33+
"name": "pseudo furniture",
34+
"description": "This should never actually show up, it should have been replaced with regional furniture.",
35+
"move_cost_mod": 0
3436
},
3537
{
3638
"type": "furniture",
3739
"id": "f_region_plain",
38-
"name": "this should never actually show up, it's a pseudo furniture",
39-
"description": "This is pseudo-furniture and should never actually show up. Please report this bug.",
40-
"symbol": " ",
41-
"color": "black",
42-
"move_cost_mod": 0,
43-
"required_str": 0,
44-
"flags": [ "TRANSPARENT" ]
40+
"copy-from": "f_region_pseudo",
41+
"name": "pseudo furniture",
42+
"description": "This should never actually show up, it should have been replaced with regional furniture.",
43+
"move_cost_mod": 0
4544
},
4645
{
4746
"type": "furniture",
4847
"id": "f_region_forest",
49-
"name": "this should never actually show up, it's a pseudo furniture",
50-
"description": "This is pseudo-furniture and should never actually show up. Please report this bug.",
51-
"symbol": " ",
52-
"color": "black",
53-
"move_cost_mod": 0,
54-
"required_str": 0,
55-
"flags": [ "TRANSPARENT" ]
48+
"copy-from": "f_region_pseudo",
49+
"name": "pseudo furniture",
50+
"description": "This should never actually show up, it should have been replaced with regional furniture.",
51+
"move_cost_mod": 0
5652
},
5753
{
5854
"type": "furniture",
5955
"id": "f_region_forest_dense",
60-
"name": "this should never actually show up, it's a pseudo furniture",
61-
"description": "This is pseudo-furniture and should never actually show up. Please report this bug.",
62-
"symbol": " ",
63-
"color": "black",
64-
"move_cost_mod": 0,
65-
"required_str": 0,
66-
"flags": [ "TRANSPARENT" ]
56+
"copy-from": "f_region_pseudo",
57+
"name": "pseudo furniture",
58+
"description": "This should never actually show up, it should have been replaced with regional furniture.",
59+
"move_cost_mod": 0
6760
},
6861
{
6962
"type": "furniture",
7063
"id": "f_region_forest_water",
71-
"name": "this should never actually show up, it's a pseudo furniture",
72-
"description": "This is pseudo-furniture and should never actually show up. Please report this bug.",
73-
"symbol": " ",
74-
"color": "black",
75-
"move_cost_mod": 0,
76-
"required_str": 0,
77-
"flags": [ "TRANSPARENT" ]
64+
"copy-from": "f_region_pseudo",
65+
"name": "pseudo furniture",
66+
"description": "This should never actually show up, it should have been replaced with regional furniture.",
67+
"move_cost_mod": 0
7868
},
7969
{
8070
"type": "furniture",
8171
"id": "f_region_flower_decorative",
82-
"name": "this should never actually show up, it's a pseudo furniture",
83-
"description": "This is pseudo-furniture and should never actually show up. Please report this bug.",
84-
"symbol": " ",
85-
"color": "black",
86-
"move_cost_mod": 0,
87-
"required_str": 0,
88-
"flags": [ "TRANSPARENT" ]
72+
"copy-from": "f_region_pseudo",
73+
"name": "pseudo furniture",
74+
"description": "This should never actually show up, it should have been replaced with regional furniture.",
75+
"move_cost_mod": 0
8976
},
9077
{
9178
"type": "furniture",
9279
"id": "f_region_lake_bed",
93-
"name": "this should never actually show up, it's a pseudo furniture",
94-
"description": "This is pseudo-furniture and should never actually show up. Please report this bug.",
95-
"symbol": " ",
96-
"color": "black",
97-
"move_cost_mod": 0,
98-
"required_str": 0,
99-
"flags": [ "TRANSPARENT" ]
80+
"copy-from": "f_region_pseudo",
81+
"name": "pseudo furniture",
82+
"description": "This should never actually show up, it should have been replaced with regional furniture.",
83+
"move_cost_mod": 0
10084
},
10185
{
10286
"type": "furniture",
10387
"id": "f_region_ocean_bed",
104-
"name": "this should never actually show up, it's a pseudo furniture",
105-
"description": "This is pseudo-furniture and should never actually show up. Please report this bug.",
106-
"symbol": " ",
107-
"color": "black",
108-
"move_cost_mod": 0,
109-
"required_str": 0,
110-
"flags": [ "TRANSPARENT" ]
88+
"copy-from": "f_region_pseudo",
89+
"name": "pseudo furniture",
90+
"description": "This should never actually show up, it should have been replaced with regional furniture.",
91+
"move_cost_mod": 0
11192
}
11293
]

0 commit comments

Comments
 (0)