Add a PoolWater to Connects_to and update JSON_INFO (#40362)

CleverRaven · May 10, 2020 · b317cba · b317cba
1 parent 053dbe4
commit b317cba
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/data/json/furniture_and_terrain/terrain-liquids.json b/data/json/furniture_and_terrain/terrain-liquids.json
@@ -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"
   },
   {

diff --git a/doc/JSON_INFO.md b/doc/JSON_INFO.md
@@ -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).
 

diff --git a/src/mapdata.cpp b/src/mapdata.cpp
@@ -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 },
     }

diff --git a/src/mapdata.h b/src/mapdata.h
@@ -218,6 +218,7 @@ enum ter_connects : int {
     TERCONN_CHAINFENCE,
     TERCONN_WOODFENCE,
     TERCONN_RAILING,
+    TERCONN_POOLWATER,
     TERCONN_WATER,
     TERCONN_PAVEMENT,
     TERCONN_RAIL,