diff --git a/data/json/connect_groups.json b/data/json/connect_groups.json index ae38b23f784b1..f0f5af2dd3dcb 100644 --- a/data/json/connect_groups.json +++ b/data/json/connect_groups.json @@ -45,6 +45,10 @@ "type": "connect_group", "id": "COUNTER" }, + { + "type": "connect_group", + "id": "LIXATUBE" + }, { "type": "connect_group", "id": "CANVAS_WALL" diff --git a/data/json/furniture_and_terrain/LIXA_furniture_and_terrain.json b/data/json/furniture_and_terrain/LIXA_furniture_and_terrain.json index 093e26c639f01..91ab17915d723 100644 --- a/data/json/furniture_and_terrain/LIXA_furniture_and_terrain.json +++ b/data/json/furniture_and_terrain/LIXA_furniture_and_terrain.json @@ -33,7 +33,8 @@ "color": "light_gray", "move_cost": 3, "coverage": 50, - "connect_groups": "INDOORFLOOR", + "connect_groups": [ "INDOORFLOOR", "LIXATUBE" ], + "connects_to": "LIXATUBE", "flags": [ "TRANSPARENT", "MOUNTABLE", "PERMEABLE", "THIN_OBSTACLE", "MINEABLE", "UNSTABLE", "INDOORS" ], "bash": { "str_min": 30, @@ -106,7 +107,8 @@ "color": "light_gray", "move_cost": 3, "coverage": 50, - "connect_groups": "INDOORFLOOR", + "connect_groups": [ "INDOORFLOOR", "LIXATUBE" ], + "connects_to": "LIXATUBE", "flags": [ "TRANSPARENT", "MOUNTABLE", "PERMEABLE", "INDOORS", "THIN_OBSTACLE", "UNSTABLE", "MINEABLE" ], "bash": { "str_min": 7, @@ -128,7 +130,8 @@ "light_emitted": 120, "move_cost": 2, "coverage": 50, - "connect_groups": "INDOORFLOOR", + "connect_groups": [ "INDOORFLOOR", "LIXATUBE" ], + "connects_to": "LIXATUBE", "flags": [ "TRANSPARENT", "MOUNTABLE", "PERMEABLE", "INDOORS", "THIN_OBSTACLE", "UNSTABLE", "MINEABLE" ], "emissions": [ "emit_congealed_light" ] }, @@ -304,6 +307,8 @@ "move_cost": 3, "roof": "t_metal_roof", "flags": [ "TRANSPARENT", "FLAMMABLE", "FLAT" ], + "connect_groups": [ "INDOORFLOOR", "LIXATUBE" ], + "connects_to": "LIXATUBE", "deconstruct": { "ter_set": "t_metal_floor", "items": [ diff --git a/src/mapdata.h b/src/mapdata.h index f3ef0e1af8361..73c09b5c1dacc 100644 --- a/src/mapdata.h +++ b/src/mapdata.h @@ -33,7 +33,7 @@ struct itype; struct tripoint; // size of connect groups bitset; increase if needed -const int NUM_TERCONN = 32; +const int NUM_TERCONN = 256; connect_group get_connect_group( const std::string &name ); template struct enum_traits;