fix warnings

9 files changed, 32 insertions, 10 deletions

diff --git a/client/scripts/controllable_player.gd b/client/scripts/controllable_player.gd
index dce81d06..819e7a08 100644
--- a/client/scripts/controllable_player.gd
+++ b/client/scripts/controllable_player.gd
@@ -62,8 +62,8 @@ func collide(dt: float):
 		self.velocity_.x += norm.x * f * dt
 		self.velocity_.y += norm.y * f * dt
 
-func aabb_point_distance(min: Vector2, max: Vector2, p: Vector2) -> float:
-	return (p - p.clamp(min, max)).length()
+func aabb_point_distance(mi: Vector2, ma: Vector2, p: Vector2) -> float:
+	return (p - p.clamp(mi, ma)).length()
 
 func update_position(_new_position: Vector2, _new_rotation: float):
 	pass
diff --git a/client/scripts/follow_camera.gd b/client/scripts/follow_camera.gd
index 524ae9bc..8c14c72a 100644
--- a/client/scripts/follow_camera.gd
+++ b/client/scripts/follow_camera.gd
@@ -32,7 +32,7 @@ func _process(delta):
 func follow(delta):
 	var new_transform = transform.looking_at(target.position)
 
-	transform.basis = transform.basis.from_euler(Vector3(
+	transform.basis = Basis.from_euler(Vector3(
 		lerp_angle(transform.basis.get_euler().x, new_transform.basis.get_euler().x, delta * LOOK_WEIGHT),
 		lerp_angle(transform.basis.get_euler().y, new_transform.basis.get_euler().y, delta * LOOK_WEIGHT),
 		lerp_angle(transform.basis.get_euler().z, new_transform.basis.get_euler().z, delta * LOOK_WEIGHT)
diff --git a/client/scripts/game.gd b/client/scripts/game.gd
index 2dcd9c03..1c966fa6 100644
--- a/client/scripts/game.gd
+++ b/client/scripts/game.gd
@@ -25,9 +25,9 @@ func _ready():
 	)
 
 	Multiplayer.connect("position",
-		func(player: int, position: Vector2, rotation: float):
+		func(player: int, pos: Vector2, rot: float):
 			var player_instance: Player = players[player]
-			player_instance.update_position(position, rotation)
+			player_instance.update_position(pos, rot)
 	)
 
 	Multiplayer.connect("remove_player", func(id: int):
diff --git a/client/scripts/item.gd b/client/scripts/item.gd
index 5c73db9f..91ee012f 100644
--- a/client/scripts/item.gd
+++ b/client/scripts/item.gd
@@ -14,7 +14,7 @@ func _init(idx: int, owned_by_: Node3D):
 			add_child(load("res://models/prefabs/map/bag.tscn").instantiate())
 			var mesh = MeshInstance3D.new()
 			var text = TextMesh.new()
-			var mat = ORMMaterial3D.new()
+			var mat = StandardMaterial3D.new()
 			text.text = t
 			text.font = SystemFont.new()
 			text.depth = 0
@@ -37,5 +37,5 @@ func progress(p: float, warn: bool):
 	progress_instance.visible = true
 	progress_instance.set_progress(p, warn)
 
-func finish(warn: bool):
+func finish(_warn: bool):
 	progress_instance.visible = false
diff --git a/client/scripts/map.gd b/client/scripts/map.gd
index 01c7b66e..bceccd8f 100644
--- a/client/scripts/map.gd
+++ b/client/scripts/map.gd
@@ -47,8 +47,8 @@ func update(pos, tile_name, neighbors):
 		"door":
 			instance = Door.new(node_name, neighbors)
 		var t:
-			push_error("tile tile %s unknown" % t)
-			instance = Floor.new(node_name, neighbors)
+			push_warning("tile tile %s unknown" % t)
+			instance = GenericTile.new(node_name, neighbors, t)
 
 	instance.position = Vector3(pos[0], 0, pos[1])
 	tile_by_pos[str(Vector2i(pos[0],pos[1]))] = instance
diff --git a/client/scripts/tiles/counter.gd b/client/scripts/tiles/counter.gd
index f4b609d5..a10f3986 100644
--- a/client/scripts/tiles/counter.gd
+++ b/client/scripts/tiles/counter.gd
@@ -25,7 +25,7 @@ func _init(rename: String, neighbors: Array):
 	var edges = neighbors.duplicate()
 	for i in range(4):
 		var i_name = tile_name(edges[i])
-		if is_counter(i_name):
+		if Counter.is_counter(i_name):
 			edges[i] = "counter"
 		else:
 			edges[i] = tile_name(edges[i])
diff --git a/client/scripts/tiles/floor.gd b/client/scripts/tiles/floor.gd
index b596895a..ba352bde 100644
--- a/client/scripts/tiles/floor.gd
+++ b/client/scripts/tiles/floor.gd
@@ -19,6 +19,8 @@ func _init(rename: String, _neighbors: Array):
 	add_child(base)
 	self.name = rename
 	var item_base_ = Node3D.new()
+	# this method is supposed to be overriden
+	@warning_ignore("static_called_on_instance")
 	item_base_.position = interact_target()
 	item_base_.name = "ItemBase"
 	base.add_child(item_base_)
diff --git a/client/scripts/tiles/flour_counter.gd b/client/scripts/tiles/flour_counter.gd
index 6c512d92..56dad60f 100644
--- a/client/scripts/tiles/flour_counter.gd
+++ b/client/scripts/tiles/flour_counter.gd
@@ -4,6 +4,8 @@ extends CounterBase
 func _init(rename: String, neighbors: Array):
 	super(rename, neighbors)
 	var bag = load("res://models/prefabs/map/bag.tscn").instantiate()
+	# this is supposed to be overridden
+	@warning_ignore("static_called_on_instance")
 	bag.position = interact_target()
 	bag.rotation_degrees.y = 45
 	base.add_child(bag)
diff --git a/client/scripts/tiles/generic_tile.gd b/client/scripts/tiles/generic_tile.gd
new file mode 100644
index 00000000..23b86a84
--- /dev/null
+++ b/client/scripts/tiles/generic_tile.gd
@@ -0,0 +1,18 @@
+class_name GenericTile
+extends Floor
+
+func _init(rename: String, neighbors: Array, kind: String):
+	super(rename, neighbors)
+	var mesh = MeshInstance3D.new()
+	var text = TextMesh.new()
+	var mat = StandardMaterial3D.new()
+	text.text = kind
+	text.font = SystemFont.new()
+	text.depth = 0
+	mesh.mesh = text
+	mesh.position.y = 1
+	mesh.scale = Vector3(3, 3, 3)
+	mat.billboard_mode = mat.BILLBOARD_ENABLED
+	mat.shading_mode = BaseMaterial3D.SHADING_MODE_UNSHADED
+	text.material = mat
+	item_base.add_child(mesh)