aboutsummaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/map/tiles/fence.gd7
-rw-r--r--client/map/tiles/fence_end.resbin0 -> 4044 bytes
-rw-r--r--client/map/tiles/fence_end.tscn10
-rw-r--r--client/map/tiles/wall_tile.gd1
4 files changed, 16 insertions, 2 deletions
diff --git a/client/map/tiles/fence.gd b/client/map/tiles/fence.gd
index 0510c4b9..bf849167 100644
--- a/client/map/tiles/fence.gd
+++ b/client/map/tiles/fence.gd
@@ -17,10 +17,15 @@ class_name Fence
extends WallTile
func _init(ctx: TileFactory.TileCC):
+ walls = ["fence"]
super(ctx)
+ var neighboring_fences := ctx.neighbors.map(is_wall).count(true)
match kind:
WallKind.STRAIGHT:
- base.add_child(load("res://map/tiles/fence_straight.tscn").instantiate())
+ if neighboring_fences == 1:
+ base.add_child(load("res://map/tiles/fence_end.tscn").instantiate())
+ else:
+ base.add_child(load("res://map/tiles/fence_straight.tscn").instantiate())
WallKind.OUTER_CORNER:
base.add_child(load("res://map/tiles/fence_corner.tscn").instantiate())
WallKind.T:
diff --git a/client/map/tiles/fence_end.res b/client/map/tiles/fence_end.res
new file mode 100644
index 00000000..2e7826a7
--- /dev/null
+++ b/client/map/tiles/fence_end.res
Binary files differ
diff --git a/client/map/tiles/fence_end.tscn b/client/map/tiles/fence_end.tscn
new file mode 100644
index 00000000..2dffa811
--- /dev/null
+++ b/client/map/tiles/fence_end.tscn
@@ -0,0 +1,10 @@
+[gd_scene load_steps=2 format=3 uid="uid://dseef40ucueuv"]
+
+[ext_resource type="ArrayMesh" uid="uid://bhdxbn6ivop6k" path="res://map/tiles/fence_end.res" id="1_cdo5n"]
+
+[node name="FenceEnd" type="Node3D"]
+
+[node name="Mesh" type="MeshInstance3D" parent="."]
+transform = Transform3D(5.9624404e-07, 0, -50, 0, 50, 0, 50, 0, 5.9624404e-07, 0, 0, 0)
+mesh = ExtResource("1_cdo5n")
+skeleton = NodePath("")
diff --git a/client/map/tiles/wall_tile.gd b/client/map/tiles/wall_tile.gd
index de9e551f..b8109516 100644
--- a/client/map/tiles/wall_tile.gd
+++ b/client/map/tiles/wall_tile.gd
@@ -33,7 +33,6 @@ const WALLS: Array = [
"counter-window",
"counter-window-conveyor",
"door",
- "fence"
]
var walls: Array = WALLS