Merge branch 'master' of ssh://codeberg.org/metamuffin/undercooked

7 files changed, 7 insertions, 16 deletions

diff --git a/client/map/item_factory.gd b/client/map/item_factory.gd
index f66f990d..1fa21b27 100644
--- a/client/map/item_factory.gd
+++ b/client/map/item_factory.gd
@@ -16,8 +16,8 @@
 class_name ItemFactory
 extends Object
 
-static func produce(idx: int, owned_by: Node3D) -> Item:
-	match Multiplayer.item_names[idx]:
+static func produce(name: String, owned_by: Node3D) -> Item:
+	match name:
 		"plate":
 			return Plate.new(owned_by)
 		"dirty-plate":
diff --git a/client/map/map.gd b/client/map/map.gd
index 913c29da..a26da0fd 100644
--- a/client/map/map.gd
+++ b/client/map/map.gd
@@ -20,9 +20,6 @@ extends Node3D
 
 var tile_by_pos: Dictionary = {}
 
-func _ready():
-	Multiplayer.connect("update_map", update)
-
 func update(pos, tile_name, neighbors):
 	var instance: Floor
 	var node_name = str(pos)
diff --git a/client/map/tiles/chair.gd b/client/map/tiles/chair.gd
index a821ac80..b7014028 100644
--- a/client/map/tiles/chair.gd
+++ b/client/map/tiles/chair.gd
@@ -21,7 +21,7 @@ func _init(rename: String, neighbors: Array):
 	var chair = load("res://map/tiles/chair.tscn").instantiate()
 	var facing = 0;
 	for i in range(4):
-		if tile_name(neighbors[i]) == "table":
+		if neighbors[i] == "table":
 			facing = i
 			break
 	base.add_child(chair)
diff --git a/client/map/tiles/counter.gd b/client/map/tiles/counter.gd
index 6783d486..62868087 100644
--- a/client/map/tiles/counter.gd
+++ b/client/map/tiles/counter.gd
@@ -43,7 +43,7 @@ func _init(rename: String, neighbors: Array):
 	for start in range(4):
 		var series = 0
 		for i in range(4):
-			if tile_name(neighbors[(start + i) % 4]) == "floor":
+			if neighbors[(start + i) % 4] == "floor":
 				series += 1
 			else:
 				break
@@ -55,7 +55,7 @@ func _init(rename: String, neighbors: Array):
 	# backsplash
 	facing = max_idx
 	if max_series == 1:
-		if WallTile.is_wall(tile_name(neighbors[(max_idx + 2) % 4])):
+		if WallTile.is_wall(neighbors[(max_idx + 2) % 4]):
 			kind = CounterKind.STRAIGHT_BACKSPLASH
 		else:
 			kind = CounterKind.STRAIGHT
diff --git a/client/map/tiles/door.gd b/client/map/tiles/door.gd
index 79f6ee85..5d86c000 100644
--- a/client/map/tiles/door.gd
+++ b/client/map/tiles/door.gd
@@ -21,7 +21,7 @@ func _init(rename: String, neighbors: Array):
 
 	var facing = 0
 	for i in range(4):
-		if tile_name(neighbors[i]) == "door":
+		if neighbors[i] == "door":
 			facing = i % 4
 	base.add_child(load("res://map/tiles/door.tscn").instantiate())
 	turn_facing(facing)
diff --git a/client/map/tiles/floor.gd b/client/map/tiles/floor.gd
index 2433849d..c5089feb 100644
--- a/client/map/tiles/floor.gd
+++ b/client/map/tiles/floor.gd
@@ -46,12 +46,6 @@ func _init(rename: String, _neighbors: Array):
 func turn_facing(facing: Facing):
 	base.rotate_y(facing * 0.5 * PI + PI)
 
-func tile_name(idx):
-	if idx == null:
-		return null
-	return Multiplayer.tile_names[idx]
-
-
 # defines where items go when interacting
 static func interact_target() -> Vector3:
 	return Vector3(0, 0, 0)
diff --git a/client/map/tiles/wall_tile.gd b/client/map/tiles/wall_tile.gd
index 85e3e6ff..08d3c080 100644
--- a/client/map/tiles/wall_tile.gd
+++ b/client/map/tiles/wall_tile.gd
@@ -40,7 +40,7 @@ func _init(rename: String, neighbors: Array):
 	for start in range(4):
 		var series = 0
 		for i in range(4):
-			var i_name = tile_name(neighbors[(start + i) % 4])
+			var i_name = neighbors[(start + i) % 4]
 			if is_wall(i_name):
 				series += 1
 			else: