diff --git a/GodotTestGame/scenes/game.tscn b/GodotTestGame/scenes/game.tscn index ab60dee..e4b253f 100644 --- a/GodotTestGame/scenes/game.tscn +++ b/GodotTestGame/scenes/game.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://scripts/mini_game_manager.gd" id="2_4hqfw"] [ext_resource type="Script" path="res://scripts/game_manager.gd" id="2_pf3uh"] -[ext_resource type="Material" path="res://assets/rainbow_material.tres" id="2_uvjvp"] +[ext_resource type="Material" uid="uid://b87yd308vxbfo" path="res://assets/rainbow_material.tres" id="2_uvjvp"] [ext_resource type="Texture2D" uid="uid://basg0soh3ki6a" path="res://assets/sgj_poster.png" id="3_ycf6g"] [ext_resource type="PackedScene" uid="uid://ct43nyfh03g4k" path="res://prefabs/player_result_panel.tscn" id="4_3hok5"] [ext_resource type="FontFile" uid="uid://bg4kldgugtb2r" path="res://assets/urbanist/static/Urbanist-Black.ttf" id="4_supns"] @@ -99,8 +99,11 @@ size_flags_vertical = 3 theme_override_constants/separation = 20 alignment = 1 -[node name="PlayerPanel" parent="Control/MarginContainer/VBoxContainer/PlayerPanelContainer" instance=ExtResource("5_3hguh")] +[node name="PlayerPanel" parent="Control/MarginContainer/VBoxContainer/PlayerPanelContainer" node_paths=PackedStringArray("player_label", "points_label", "click_button") instance=ExtResource("5_3hguh")] layout_mode = 2 +player_label = NodePath("VBoxContainer/PlayerLabel") +points_label = NodePath("VBoxContainer/PointsLabel") +click_button = NodePath("VBoxContainer/ClickButton") [node name="CountdownOverlay" type="ColorRect" parent="."] visible = false @@ -166,8 +169,11 @@ horizontal_alignment = 1 layout_mode = 2 theme_override_constants/separation = 16 -[node name="PlayerResultPanel" parent="ResultsOverlay/VBoxContainer/ResultPanelContainer" instance=ExtResource("4_3hok5")] +[node name="PlayerResultPanel" parent="ResultsOverlay/VBoxContainer/ResultPanelContainer" node_paths=PackedStringArray("player_label", "points_change_label", "points_label") instance=ExtResource("4_3hok5")] layout_mode = 2 +player_label = NodePath("VBoxContainer/PlayerLabel") +points_change_label = NodePath("VBoxContainer/PointsChangeLabel") +points_label = NodePath("VBoxContainer/PointsLabel") [node name="PlayerResultPanel2" parent="ResultsOverlay/VBoxContainer/ResultPanelContainer" node_paths=PackedStringArray("player_label", "points_change_label", "points_label") instance=ExtResource("4_3hok5")] layout_mode = 2 diff --git a/GodotTestGame/scripts/game_manager.gd b/GodotTestGame/scripts/game_manager.gd index 2889a46..748a7ab 100644 --- a/GodotTestGame/scripts/game_manager.gd +++ b/GodotTestGame/scripts/game_manager.gd @@ -100,7 +100,7 @@ func _end_game(): if i >= player_reward_points.size(): break results.append(MiniGameManager.PlayerResultData.new( - player.player_data.number, + player.player_data.index, player_reward_points[i] )) prev_player = player diff --git a/GodotTestGame/scripts/mini_game_manager.gd b/GodotTestGame/scripts/mini_game_manager.gd index d587758..8203324 100644 --- a/GodotTestGame/scripts/mini_game_manager.gd +++ b/GodotTestGame/scripts/mini_game_manager.gd @@ -105,7 +105,7 @@ class PlayerData: ## Holds information about the result of a match for a player class PlayerResultData: - ## Player's number + ## Player's index (0 for player 1, 1 for player 2) var player: int ## The points a player has earned/lost var points: int @@ -116,7 +116,7 @@ class PlayerResultData: func to_dict() -> Dictionary: return { - "player": player - 1, + "player": player, "points": points } @@ -164,7 +164,7 @@ func apply_results(results: Array[PlayerResultData]): ## ## [ ## { -## "player": 1, +## "player": 0, ## "points": 1 ## }, ## {