add points to overlay

3 files changed, 48 insertions, 19 deletions

diff --git a/client/menu/overlay.gd b/client/menu/overlay.gd
index 528c3993..0fc40f0b 100644
--- a/client/menu/overlay.gd
+++ b/client/menu/overlay.gd
@@ -5,11 +5,13 @@ const LABEL_SCALE: Vector2 = Vector2(1.5, 1.5)
 
 var failed: int = 0
 var completed: int = 0
+var points: int = 0
 
-@onready var failed_label: Label = $Control/Paper/MarginContainer/VBoxContainer/HBoxContainer2/Failed
-@onready var completed_label: Label = $Control/Paper/MarginContainer/VBoxContainer/HBoxContainer/Completed
+@onready var failed_label: Label = $Control/Paper/Margin/Lines/Line2/Failed
+@onready var completed_label: Label = $Control/Paper/Margin/Lines/Line1/Completed
+@onready var points_label: Label = $Control/Paper/Margin/Lines/Line3/Points
 
-func update(failed_: int, completed_: int):
+func update(failed_: int, completed_: int, points_: int):
 	if failed_ - failed:
 		failed_label.text = str(failed_)
 		failed_label.scale = LABEL_SCALE
@@ -18,7 +20,12 @@ func update(failed_: int, completed_: int):
 		completed_label.text = str(completed_)
 		completed_label.scale = LABEL_SCALE
 		completed = completed_
+	if points_ - points:
+		points_label.text = str(points_)
+		points_label.scale = LABEL_SCALE
+		points = points_
 
 func _process(delta):
 	failed_label.scale = lerp(failed_label.scale, Vector2(1, 1), delta * 4.)
 	completed_label.scale = lerp(completed_label.scale, Vector2(1, 1), delta * 4.)
+	points_label.scale = lerp(points_label.scale, Vector2(1, 1), delta * 4.)
diff --git a/client/menu/overlay.tscn b/client/menu/overlay.tscn
index ba274ef4..ed377635 100644
--- a/client/menu/overlay.tscn
+++ b/client/menu/overlay.tscn
@@ -40,15 +40,15 @@ layout_mode = 1
 anchors_preset = 2
 anchor_top = 1.0
 anchor_bottom = 1.0
-offset_left = -63.0
-offset_top = -463.0
-offset_right = 449.0
-offset_bottom = 49.0
+offset_left = -42.0
+offset_top = -412.0
+offset_right = 470.0
+offset_bottom = 100.0
 grow_vertical = 0
 rotation = 0.0610865
 texture = SubResource("NoiseTexture2D_jq3d3")
 
-[node name="MarginContainer" type="MarginContainer" parent="Control/Paper"]
+[node name="Margin" type="MarginContainer" parent="Control/Paper"]
 layout_mode = 1
 anchors_preset = 2
 anchor_top = 1.0
@@ -59,25 +59,25 @@ grow_vertical = 0
 theme_override_constants/margin_left = 10
 theme_override_constants/margin_bottom = 10
 
-[node name="VBoxContainer" type="VBoxContainer" parent="Control/Paper/MarginContainer"]
+[node name="Lines" type="VBoxContainer" parent="Control/Paper/Margin"]
 layout_mode = 2
 size_flags_horizontal = 0
 size_flags_vertical = 8
 
-[node name="HBoxContainer" type="HBoxContainer" parent="Control/Paper/MarginContainer/VBoxContainer"]
+[node name="Line1" type="HBoxContainer" parent="Control/Paper/Margin/Lines"]
 layout_mode = 2
 
-[node name="Label" type="Label" parent="Control/Paper/MarginContainer/VBoxContainer/HBoxContainer"]
+[node name="Label" type="Label" parent="Control/Paper/Margin/Lines/Line1"]
 layout_mode = 2
 theme_override_colors/font_color = Color(0, 0, 0, 1)
 theme_override_font_sizes/font_size = 25
 text = "Completed"
 
-[node name="Control" type="Control" parent="Control/Paper/MarginContainer/VBoxContainer/HBoxContainer"]
+[node name="Spacer" type="Control" parent="Control/Paper/Margin/Lines/Line1"]
 layout_mode = 2
 size_flags_horizontal = 3
 
-[node name="Completed" type="Label" parent="Control/Paper/MarginContainer/VBoxContainer/HBoxContainer"]
+[node name="Completed" type="Label" parent="Control/Paper/Margin/Lines/Line1"]
 custom_minimum_size = Vector2(100, 0)
 layout_mode = 2
 theme_override_colors/font_color = Color(0, 0.278431, 0, 1)
@@ -85,23 +85,44 @@ theme_override_font_sizes/font_size = 35
 text = "0"
 horizontal_alignment = 1
 
-[node name="HBoxContainer2" type="HBoxContainer" parent="Control/Paper/MarginContainer/VBoxContainer"]
+[node name="Line2" type="HBoxContainer" parent="Control/Paper/Margin/Lines"]
 layout_mode = 2
 
-[node name="Label" type="Label" parent="Control/Paper/MarginContainer/VBoxContainer/HBoxContainer2"]
+[node name="Label" type="Label" parent="Control/Paper/Margin/Lines/Line2"]
 layout_mode = 2
 theme_override_colors/font_color = Color(0, 0, 0, 1)
 theme_override_font_sizes/font_size = 25
 text = "Failed"
 
-[node name="Control" type="Control" parent="Control/Paper/MarginContainer/VBoxContainer/HBoxContainer2"]
+[node name="Spacer" type="Control" parent="Control/Paper/Margin/Lines/Line2"]
 layout_mode = 2
 size_flags_horizontal = 3
 
-[node name="Failed" type="Label" parent="Control/Paper/MarginContainer/VBoxContainer/HBoxContainer2"]
+[node name="Failed" type="Label" parent="Control/Paper/Margin/Lines/Line2"]
 custom_minimum_size = Vector2(100, 0)
 layout_mode = 2
 theme_override_colors/font_color = Color(0.505882, 0, 0, 1)
 theme_override_font_sizes/font_size = 35
 text = "0"
 horizontal_alignment = 1
+
+[node name="Line3" type="HBoxContainer" parent="Control/Paper/Margin/Lines"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="Control/Paper/Margin/Lines/Line3"]
+layout_mode = 2
+theme_override_colors/font_color = Color(0, 0, 0, 1)
+theme_override_font_sizes/font_size = 35
+text = "Points"
+
+[node name="Spacer" type="Control" parent="Control/Paper/Margin/Lines/Line3"]
+layout_mode = 2
+size_flags_horizontal = 3
+
+[node name="Points" type="Label" parent="Control/Paper/Margin/Lines/Line3"]
+custom_minimum_size = Vector2(100, 0)
+layout_mode = 2
+theme_override_colors/font_color = Color(0, 0, 0, 1)
+theme_override_font_sizes/font_size = 45
+text = "0"
+horizontal_alignment = 1
diff --git a/client/multiplayer.gd b/client/multiplayer.gd
index 00bf193b..6ea36595 100644
--- a/client/multiplayer.gd
+++ b/client/multiplayer.gd
@@ -42,7 +42,7 @@ signal remove_player_item(player: int)
 signal set_progress(tile: Vector2i, progress: float, warn: bool)
 signal set_finished(tile: Vector2i, warn: bool)
 signal set_ingame(state: bool)
-signal score(demands_failed: int, demands_completed: int)
+signal score(demands_failed: int, demands_completed: int, points: int)
 
 signal connection_closed(reason: String)
 
@@ -175,7 +175,8 @@ func handle_packet(bytes: PackedByteArray):
 		"score":
 			var demands_failed: int = decoded["demands_failed"]
 			var demands_completed: int = decoded["demands_completed"]
-			emit_signal("score", demands_failed, demands_completed)
+			var points: int = decoded["points"]
+			emit_signal("score", demands_failed, demands_completed, points)
 		_:
 			push_error("Unrecognized packet type: %s" % packet_type)