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.

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

Add a PoolWater to Connects_to and update JSON_INFO #40362

Merged
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions data/json/furniture_and_terrain/terrain-liquids.json
Original file line number Diff line number Diff line change
@@ -204,6 +204,7 @@
"color": "light_blue",
"move_cost": 5,
"flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "INDOORS", "DEEP_WATER" ],
"connects_to": "POOLWATER",
"examine_action": "water_source"
},
{
@@ -216,6 +217,7 @@
"color": "light_blue",
"move_cost": 5,
"flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "INDOORS", "SHALLOW_WATER" ],
"connects_to": "POOLWATER",
"examine_action": "water_source"
},
{
@@ -228,6 +230,7 @@
"color": "light_blue",
"move_cost": 5,
"flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "DEEP_WATER" ],
"connects_to": "POOLWATER",
"examine_action": "water_source"
},
{
@@ -240,6 +243,7 @@
"color": "light_blue",
"move_cost": 5,
"flags": [ "TRANSPARENT", "LIQUID", "NO_SCENT", "SWIMMABLE", "SHALLOW_WATER" ],
"connects_to": "POOLWATER",
"examine_action": "water_source"
},
{
9 changes: 7 additions & 2 deletions doc/JSON_INFO.md
Original file line number Diff line number Diff line change
@@ -2779,11 +2779,16 @@ Displayed name of the object. This will be translated.
(Optional) The group of terrains to which this terrain connects. This affects tile rotation and connections, and the ASCII symbol drawn by terrain with the flag "AUTO_WALL_SYMBOL".

Current values:
- `WALL`
- `CHAINFENCE`
- `WOODFENCE`
- `RAILING`
- `WALL`
- `WATER`
- `WOODFENCE`
- `POOLWATER`
- `PAVEMENT`
- `RAIL`



Example: `-` , `|` , `X` and `Y` are terrain which share the same `connects_to` value. `O` does not have it. `X` and `Y` also have the `AUTO_WALL_SYMBOL` flag. `X` will be drawn as a T-intersection (connected to west, south and east), `Y` will be drawn as a horizontal line (going from west to east, no connection to south).

1 change: 1 addition & 0 deletions src/mapdata.cpp
Original file line number Diff line number Diff line change
@@ -187,6 +187,7 @@ static const std::unordered_map<std::string, ter_connects> ter_connects_map = {
{ "WOODFENCE", TERCONN_WOODFENCE },
{ "RAILING", TERCONN_RAILING },
{ "WATER", TERCONN_WATER },
{ "POOLWATER", TERCONN_POOLWATER },
{ "PAVEMENT", TERCONN_PAVEMENT },
{ "RAIL", TERCONN_RAIL },
}
1 change: 1 addition & 0 deletions src/mapdata.h
Original file line number Diff line number Diff line change
@@ -218,6 +218,7 @@ enum ter_connects : int {
TERCONN_CHAINFENCE,
TERCONN_WOODFENCE,
TERCONN_RAILING,
TERCONN_POOLWATER,
TERCONN_WATER,
TERCONN_PAVEMENT,
TERCONN_RAIL,