diff --git a/menus/marathon_results.gd b/menus/marathon_results.gd index e003778..272d492 100644 --- a/menus/marathon_results.gd +++ b/menus/marathon_results.gd @@ -9,11 +9,11 @@ func _ready() -> void: Audio.play_music(load("res://audio/music/rumble_revolution_demo.ogg")) score.text = score.text % Game.marathon_score shards.text = shards.text % Game.marathon_shards + $"%Deaths".text = $"%Deaths".text % Game.marathon_deaths Fade.fade_in() func _input(event: InputEvent) -> void: if Input.is_action_just_pressed("ui_accept"): Fade.fade_out(Options.transition_speed_secs) - yield(Fade, "fade_finished") Game.change_map(load("res://menus/marathon_start.tscn")) diff --git a/menus/marathon_results.tscn b/menus/marathon_results.tscn index bd02188..eadc7b4 100644 --- a/menus/marathon_results.tscn +++ b/menus/marathon_results.tscn @@ -26,52 +26,63 @@ material = SubResource( 1 ) anchor_right = 1.0 anchor_bottom = 1.0 -[node name="Panel" type="Panel" parent="."] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -60.0 -margin_top = -32.0 -margin_right = 60.0 -margin_bottom = 38.0 - -[node name="Label" type="Label" parent="Panel"] -material = ExtResource( 4 ) -anchor_right = 1.0 -margin_bottom = 22.0 -text = "Good Job!" -align = 1 -valign = 1 - -[node name="Score" type="Label" parent="Panel"] -unique_name_in_owner = true -material = ExtResource( 4 ) -anchor_right = 1.0 -margin_left = 4.0 -margin_top = 24.0 -margin_right = -4.0 -margin_bottom = 46.0 -text = "Score: %05d" -align = 1 -valign = 1 - -[node name="Shards" type="Label" parent="Panel"] -unique_name_in_owner = true -material = ExtResource( 4 ) -anchor_right = 1.0 -margin_left = 4.0 -margin_top = 46.0 -margin_right = -4.0 -margin_bottom = 68.0 -text = "got %d shards!" -align = 1 -valign = 1 - -[node name="ComingSoon" type="Label" parent="."] +[node name="Victory" type="Label" parent="."] material = ExtResource( 4 ) margin_top = 16.0 margin_right = 256.0 margin_bottom = 39.0 text = "Wow you done did it!" align = 1 + +[node name="PanelContainer" type="PanelContainer" parent="."] +margin_left = 68.0 +margin_top = 64.0 +margin_right = 188.0 +margin_bottom = 134.0 + +[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer"] +margin_left = 3.0 +margin_top = 3.0 +margin_right = 117.0 +margin_bottom = 67.0 + +[node name="Label" type="Label" parent="PanelContainer/VBoxContainer"] +material = ExtResource( 4 ) +margin_right = 114.0 +margin_bottom = 10.0 +text = "Good Job!" +align = 1 +valign = 1 + +[node name="Score" type="Label" parent="PanelContainer/VBoxContainer"] +unique_name_in_owner = true +material = ExtResource( 4 ) +margin_top = 16.0 +margin_right = 114.0 +margin_bottom = 26.0 +size_flags_vertical = 6 +text = "Score: %05d" +align = 1 +valign = 1 + +[node name="Shards" type="Label" parent="PanelContainer/VBoxContainer"] +unique_name_in_owner = true +material = ExtResource( 4 ) +margin_top = 34.0 +margin_right = 114.0 +margin_bottom = 44.0 +size_flags_vertical = 6 +text = "got %d shards!" +align = 1 +valign = 1 + +[node name="Deaths" type="Label" parent="PanelContainer/VBoxContainer"] +unique_name_in_owner = true +material = ExtResource( 4 ) +margin_top = 52.0 +margin_right = 114.0 +margin_bottom = 62.0 +size_flags_vertical = 6 +text = "Died %d times." +align = 1 +valign = 1