Merge pull request #61336 from mlange-42/asym-connects-to

Multiple connection groups and asymmetric connect
CleverRaven · Oct 10, 2022 · 03732f2 · 03732f2
2 parents 2343bfc + 4d6a8b5
commit 03732f2
Show file tree

Hide file tree

Showing 48 changed files with 759 additions and 484 deletions.
diff --git a/data/json/furniture_and_terrain/furniture-flora.json b/data/json/furniture_and_terrain/furniture-flora.json
@@ -420,6 +420,7 @@
     "move_cost_mod": 3,
     "coverage": 50,
     "required_str": -1,
+    "connect_groups": "WOODFENCE",
     "connects_to": "WOODFENCE",
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "SHRUB", "PERMEABLE" ],
     "bash": {
@@ -445,6 +446,7 @@
     "move_cost_mod": -1,
     "coverage": 90,
     "required_str": 14,
+    "connect_groups": "WOODFENCE",
     "connects_to": "WOODFENCE",
     "flags": [ "FLAMMABLE_ASH", "SHRUB", "PERMEABLE", "BLOCK_WIND", "NOITEM" ],
     "bash": {

diff --git a/data/json/furniture_and_terrain/furniture-plumbing.json b/data/json/furniture_and_terrain/furniture-plumbing.json
@@ -64,6 +64,7 @@
     "coverage": 60,
     "required_str": -1,
     "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "CONTAINER", "PLACE_ITEM", "MOUNTABLE" ],
+    "connect_groups": "COUNTER",
     "connects_to": "COUNTER",
     "rotates_to": "INDOORFLOOR",
     "bash": {

diff --git a/data/json/furniture_and_terrain/furniture-surfaces.json b/data/json/furniture_and_terrain/furniture-surfaces.json
@@ -10,6 +10,7 @@
     "coverage": 60,
     "required_str": 10,
     "flags": [ "TRANSPARENT", "FLAMMABLE", "ORGANIC", "MOUNTABLE", "SHORT", "FLAT_SURF" ],
+    "connect_groups": "COUNTER",
     "connects_to": "COUNTER",
     "deconstruct": {
       "items": [ { "item": "2x4", "count": 4 }, { "item": "wood_panel", "count": 1 }, { "item": "nail", "charges": [ 6, 10 ] } ]
@@ -36,6 +37,7 @@
     "coverage": 55,
     "required_str": -1,
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "CONTAINER", "PLACE_ITEM", "ORGANIC", "MOUNTABLE", "FLAT_SURF" ],
+    "connect_groups": "COUNTER",
     "connects_to": "COUNTER",
     "rotates_to": "INDOORFLOOR",
     "deconstruct": {
@@ -68,6 +70,7 @@
     "required_str": 4,
     "coverage": 60,
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "DOOR", "ORGANIC" ],
+    "connect_groups": "COUNTER",
     "connects_to": "COUNTER",
     "open": "f_counter_gate_o",
     "crafting_pseudo_item": "medium_surface_pseudo",
@@ -89,8 +92,9 @@
     "color": "blue",
     "move_cost_mod": 2,
     "required_str": 4,
-    "connects_to": "COUNTER",
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "FLAT", "ROAD", "ORGANIC" ],
+    "connect_groups": "COUNTER",
+    "connects_to": "COUNTER",
     "close": "f_counter_gate_c",
     "deconstruct": { "items": [ { "item": "2x4", "count": 4 }, { "item": "wood_panel", "count": 1 }, { "item": "nail", "charges": 10 } ] },
     "bash": {

diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json
@@ -353,6 +353,7 @@
     "coverage": 95,
     "required_str": -1,
     "flags": [ "FLAMMABLE_HARD", "NOITEM", "BLOCK_WIND", "SUN_ROOF_ABOVE" ],
+    "connect_groups": "CANVAS_WALL",
     "connects_to": "CANVAS_WALL",
     "bash": {
       "str_min": 1,
@@ -374,6 +375,7 @@
     "coverage": 95,
     "required_str": -1,
     "flags": [ "FLAMMABLE_HARD", "NOITEM", "BLOCK_WIND", "SUN_ROOF_ABOVE" ],
+    "connect_groups": "CANVAS_WALL",
     "connects_to": "CANVAS_WALL",
     "bash": {
       "str_min": 1,
@@ -396,8 +398,9 @@
     "coverage": 95,
     "required_str": -1,
     "flags": [ "FLAMMABLE_HARD", "NOITEM", "DOOR", "BLOCK_WIND", "SUN_ROOF_ABOVE" ],
-    "open": "f_canvas_door_o",
+    "connect_groups": "CANVAS_WALL",
     "connects_to": "CANVAS_WALL",
+    "open": "f_canvas_door_o",
     "bash": {
       "str_min": 1,
       "str_max": 8,
@@ -417,8 +420,9 @@
     "move_cost_mod": 0,
     "required_str": -1,
     "flags": [ "TRANSPARENT" ],
-    "close": "f_canvas_door",
+    "connect_groups": "CANVAS_WALL",
     "connects_to": "CANVAS_WALL",
+    "close": "f_canvas_door",
     "bash": {
       "str_min": 1,
       "str_max": 8,
@@ -439,8 +443,9 @@
     "coverage": 95,
     "required_str": -1,
     "flags": [ "FLAMMABLE_HARD", "NOITEM", "DOOR", "BLOCK_WIND", "SUN_ROOF_ABOVE" ],
-    "open": "f_large_canvas_door_o",
+    "connect_groups": "CANVAS_WALL",
     "connects_to": "CANVAS_WALL",
+    "open": "f_large_canvas_door_o",
     "bash": {
       "str_min": 1,
       "str_max": 8,
@@ -461,8 +466,9 @@
     "move_cost_mod": 0,
     "required_str": -1,
     "flags": [ "TRANSPARENT" ],
-    "close": "f_large_canvas_door",
+    "connect_groups": "CANVAS_WALL",
     "connects_to": "CANVAS_WALL",
+    "close": "f_large_canvas_door",
     "bash": {
       "str_min": 1,
       "str_max": 8,
@@ -568,6 +574,7 @@
     "coverage": 95,
     "required_str": -1,
     "flags": [ "FLAMMABLE_HARD", "NOITEM", "BLOCK_WIND", "SUN_ROOF_ABOVE" ],
+    "connect_groups": "CANVAS_WALL",
     "connects_to": "CANVAS_WALL",
     "bash": {
       "str_min": 1,
@@ -589,8 +596,9 @@
     "coverage": 95,
     "required_str": -1,
     "flags": [ "FLAMMABLE_HARD", "NOITEM", "BLOCK_WIND", "SUN_ROOF_ABOVE" ],
-    "open": "f_skin_door_o",
+    "connect_groups": "CANVAS_WALL",
     "connects_to": "CANVAS_WALL",
+    "open": "f_skin_door_o",
     "bash": {
       "str_min": 1,
       "str_max": 8,
@@ -610,8 +618,9 @@
     "move_cost_mod": 0,
     "required_str": -1,
     "flags": [ "TRANSPARENT" ],
-    "close": "f_skin_door",
+    "connect_groups": "CANVAS_WALL",
     "connects_to": "CANVAS_WALL",
+    "close": "f_skin_door",
     "bash": {
       "str_min": 1,
       "str_max": 8,

diff --git a/data/json/furniture_and_terrain/furniture-tools.json b/data/json/furniture_and_terrain/furniture-tools.json
@@ -11,6 +11,7 @@
     "coverage": 50,
     "required_str": -1,
     "flags": [ "TRANSPARENT", "NOITEM", "INDOORS", "SHORT", "PERMEABLE" ],
+    "connect_groups": "COUNTER",
     "connects_to": "COUNTER",
     "deconstruct": {
       "furn_set": "f_counter",
@@ -60,6 +61,7 @@
     "required_str": -1,
     "light_emitted": 10,
     "flags": [ "TRANSPARENT", "CONSOLE", "NOITEM", "INDOORS", "SHORT", "PERMEABLE" ],
+    "connect_groups": "COUNTER",
     "connects_to": "COUNTER",
     "deconstruct": {
       "furn_set": "f_counter",

diff --git a/data/json/furniture_and_terrain/terrain-bridges-docks.json b/data/json/furniture_and_terrain/terrain-bridges-docks.json
@@ -164,13 +164,14 @@
     "type": "terrain",
     "id": "t_pavement_bg_dp",
     "name": "bridge pavement",
-    "connects_to": "PAVEMENT",
     "description": "A bridge section made out of concrete and metal.",
     "looks_like": "t_pavement",
     "symbol": ".",
     "color": "dark_gray",
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "FLAT", "ROAD", "MINEABLE" ],
+    "connect_groups": "PAVEMENT",
+    "connects_to": "PAVEMENT",
     "bash": {
       "str_min": 70,
       "str_max": 300,
@@ -184,13 +185,14 @@
     "type": "terrain",
     "id": "t_pavement_y_bg_dp",
     "name": "bridge yellow pavement",
-    "connects_to": "PAVEMENT",
     "description": "A bridge section made out of concrete and metal.  It's painted yellow.",
     "looks_like": "t_pavement_y",
     "symbol": ".",
     "color": "yellow",
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "FLAT", "ROAD", "MINEABLE" ],
+    "connect_groups": "PAVEMENT",
+    "connects_to": "PAVEMENT",
     "bash": {
       "str_min": 70,
       "str_max": 300,