Merge pull request #74356 from Procyonae/WaterConnectsToDocks

Water terrain connects to dock terrain
CleverRaven · Jun 7, 2024 · dd9b771 · dd9b771
2 parents 1595723 + 3368165
commit dd9b771
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/data/json/furniture_and_terrain/terrain-bridges-docks.json b/data/json/furniture_and_terrain/terrain-bridges-docks.json
@@ -8,7 +8,8 @@
     "looks_like": "t_pavement",
     "color": "yellow",
     "move_cost": 2,
-    "flags": [ "TRANSPARENT", "FLAT" ]
+    "flags": [ "TRANSPARENT", "FLAT" ],
+    "connect_groups": "WATER"
   },
   {
     "type": "terrain",
@@ -20,6 +21,7 @@
     "color": "brown",
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "FLAT" ],
+    "connect_groups": "WATER",
     "deconstruct": { "ter_set": "t_water_sh", "items": [ { "item": "nail", "charges": [ 6, 12 ] }, { "item": "2x4", "count": 8 } ] },
     "bash": {
       "str_min": 8,
@@ -39,6 +41,7 @@
     "color": "brown",
     "move_cost": 8,
     "flags": [ "TRANSPARENT", "LIQUID", "SWIMMABLE", "DEEP_WATER", "FISHABLE" ],
+    "connect_groups": "WATER",
     "examine_action": "water_source",
     "deconstruct": { "ter_set": "t_water_moving_dp", "items": [ { "item": "spike", "count": 4 }, { "item": "wood_beam", "count": 1 } ] },
     "looks_like": "t_column",
@@ -60,6 +63,7 @@
     "color": "brown",
     "move_cost": 6,
     "flags": [ "TRANSPARENT", "NOITEM", "THIN_OBSTACLE", "MOUNTABLE", "TINY", "AUTO_WALL_SYMBOL", "UNSTABLE" ],
+    "connect_groups": "WATER",
     "deconstruct": { "ter_set": "t_dock_deep_pile", "items": [ { "item": "spike", "count": 8 }, { "item": "log", "count": 4 } ] },
     "looks_like": "t_wall_log_half",
     "bash": {
@@ -80,6 +84,7 @@
     "color": "brown",
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "FLAT" ],
+    "connect_groups": "WATER",
     "deconstruct": {
       "ter_set": "t_dock_deep_frame",
       "items": [ { "item": "nail", "charges": [ 12, 24 ] }, { "item": "2x4", "count": 16 } ]
@@ -104,6 +109,7 @@
     "color": "brown",
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "FLAT" ],
+    "connect_groups": "WATER",
     "deconstruct": { "ter_set": "t_water_sh", "items": [ { "item": "nail", "charges": [ 6, 12 ] }, { "item": "2x4", "count": 8 } ] },
     "bash": {
       "str_min": 8,
@@ -124,6 +130,7 @@
     "color": "brown",
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "FLAT" ],
+    "connect_groups": "WATER",
     "deconstruct": {
       "ter_set": "t_water_dp",
       "items": [ { "item": "rope_makeshift_6", "count": [ 3, 4 ] }, { "item": "2x4", "count": 8 } ]
@@ -147,6 +154,7 @@
     "color": "brown",
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "FLAT" ],
+    "connect_groups": "WATER",
     "deconstruct": {
       "ter_set": "t_water_moving_dp",
       "items": [ { "item": "rope_makeshift_6", "count": [ 3, 4 ] }, { "item": "2x4", "count": 8 } ]
@@ -170,7 +178,7 @@
     "color": "dark_gray",
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "FLAT", "ROAD", "MINEABLE" ],
-    "connect_groups": "PAVEMENT",
+    "connect_groups": [ "PAVEMENT", "WATER" ],
     "connects_to": "PAVEMENT",
     "bash": {
       "str_min": 70,
@@ -191,7 +199,7 @@
     "color": "yellow",
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "FLAT", "ROAD", "MINEABLE" ],
-    "connect_groups": "PAVEMENT",
+    "connect_groups": [ "PAVEMENT", "WATER" ],
     "connects_to": "PAVEMENT",
     "bash": {
       "str_min": 70,
@@ -212,6 +220,7 @@
     "color": "light_gray",
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "FLAT", "ROAD", "MINEABLE" ],
+    "connect_groups": "WATER",
     "bash": {
       "str_min": 70,
       "str_max": 300,
@@ -231,6 +240,7 @@
     "color": "light_gray",
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "FLAT" ],
+    "connect_groups": "WATER",
     "deconstruct": {
       "ter_set": "t_water_sh",
       "items": [ { "item": "scrap", "charges": [ 3, 6 ] }, { "item": "sheet_metal", "count": 2 } ]
@@ -254,6 +264,7 @@
     "color": "light_gray",
     "move_cost": 8,
     "flags": [ "TRANSPARENT", "LIQUID", "SWIMMABLE", "DEEP_WATER", "FISHABLE" ],
+    "connect_groups": "WATER",
     "deconstruct": {
       "ter_set": "t_water_moving_dp",
       "items": [ { "item": "rebar", "count": [ 4, 6 ] }, { "item": "rock", "count": [ 6, 10 ] } ]
@@ -280,6 +291,7 @@
     "color": "light_gray",
     "move_cost": 6,
     "flags": [ "TRANSPARENT", "NOITEM", "THIN_OBSTACLE", "MOUNTABLE", "TINY", "AUTO_WALL_SYMBOL", "UNSTABLE" ],
+    "connect_groups": "WATER",
     "deconstruct": { "ter_set": "t_concrete_dock_deep_pile", "items": [ { "item": "spike", "count": 8 }, { "item": "pipe", "count": 4 } ] },
     "looks_like": "t_sconc_wall_halfway",
     "bash": {
@@ -300,6 +312,7 @@
     "color": "light_gray",
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "FLAT" ],
+    "connect_groups": "WATER",
     "deconstruct": {
       "ter_set": "t_metal_dock_deep_frame",
       "items": [ { "item": "nail", "charges": [ 12, 24 ] }, { "item": "sheet_metal", "count": 4 } ]
@@ -324,6 +337,7 @@
     "color": "light_gray",
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "FLAT" ],
+    "connect_groups": "WATER",
     "deconstruct": { "ter_set": "t_water_dp", "items": [ { "item": "sheet_metal", "count": [ 2, 4 ] }, { "item": "scrap", "count": 8 } ] },
     "bash": {
       "str_min": 20,