Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: description and id of t_thconc_floor_nofloor #4203

Merged
merged 2 commits into from
Feb 9, 2024
Merged

fix: description and id of t_thconc_floor_nofloor #4203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65b287d
Update terrain-floors-outdoors.json
0Monet Feb 8, 2024
b6fccc4
Update acidia_commercial_destroyed_palette.json
0Monet Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions data/json/furniture_and_terrain/terrain-floors-outdoors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,5 +505,29 @@
{ "item": "rebar", "count": [ 0, 2 ] }
]
}
},
{
"type": "terrain",
"id": "t_thconc_floor_no_roof",
"alias": "t_thconc_floor_nofloor",
"name": "concrete floor",
"description": "A bare and cold concrete floor.",
"symbol": ".",
"color": "cyan",
"looks_like": "t_thconc_floor",
"move_cost": 2,
"flags": [ "TRANSPARENT", "FLAT", "ROAD" ],
"bash": {
"sound": "SMASH!",
"ter_set": "t_null",
"str_min": 100,
"str_max": 400,
"str_min_supported": 150,
"items": [
{ "item": "rock", "count": [ 5, 10 ] },
{ "item": "scrap", "count": [ 5, 8 ] },
{ "item": "rebar", "count": [ 0, 2 ] }
]
}
}
]
23 changes: 0 additions & 23 deletions data/json/mapgen_palettes/acidia_commercial_destroyed_palette.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,4 @@
[
{
"type": "terrain",
"id": "t_thconc_floor_nofloor",
"name": "concrete floor",
"description": "A bare and cold concrete floor with matching roof, could still insulate from the outdoors but roof collapse is possible if supporting walls are broken down.",
"symbol": ".",
"color": "cyan",
"looks_like": "t_thconc_floor",
"move_cost": 2,
"flags": [ "TRANSPARENT", "FLAT", "ROAD" ],
"bash": {
"sound": "SMASH!",
"ter_set": "t_null",
"str_min": 100,
"str_max": 400,
"str_min_supported": 150,
"items": [
{ "item": "rock", "count": [ 5, 10 ] },
{ "item": "scrap", "count": [ 5, 8 ] },
{ "item": "rebar", "count": [ 0, 2 ] }
]
}
},
{
"type": "palette",
"id": "acidia_commercial_destroyed_palette",
Expand Down
Loading