From 04cce84c6c34c839419e43ca399627af89c3cec7 Mon Sep 17 00:00:00 2001 From: Gabriel Kaszewski Date: Fri, 9 May 2025 02:16:38 +0200 Subject: [PATCH] Add death and game over screens to the scene; update export files and project settings --- export_presets.cfg | 2 +- objects/ui/death_screen.tscn | 57 +++++++++++++++++++++++++++++++ objects/ui/game_over_screen.tscn | 54 +++++++++++++++++++++++++++++ project.godot | 1 + scenes/test.tscn | 11 +++++- sprites/ppc_icon.png | Bin 464 -> 690 bytes 6 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 objects/ui/death_screen.tscn create mode 100644 objects/ui/game_over_screen.tscn diff --git a/export_presets.cfg b/export_presets.cfg index 226fc9e..11b7d26 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -7,7 +7,7 @@ advanced_options=true dedicated_server=false custom_features="" export_filter="scenes" -export_files=PackedStringArray("res://scenes/test.tscn", "res://objects/brick_player.tscn", "res://objects/coin.tscn", "res://objects/collapsing_bridge.tscn", "res://objects/game_manager.tscn") +export_files=PackedStringArray("res://scenes/test.tscn", "res://objects/game_manager.tscn") include_filter="" exclude_filter="" export_path="builds/optimized_for_size/Mr. Brick Adventures.exe" diff --git a/objects/ui/death_screen.tscn b/objects/ui/death_screen.tscn new file mode 100644 index 0000000..4a1399b --- /dev/null +++ b/objects/ui/death_screen.tscn @@ -0,0 +1,57 @@ +[gd_scene load_steps=3 format=3 uid="uid://dulkm3ah4tm0u"] + +[ext_resource type="Texture2D" uid="uid://jix7wdn0isr3" path="res://sprites/ppc_icon.png" id="1_m30em"] + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_eaoak"] +bg_color = Color(0, 0, 0, 1) + +[node name="DeathScreen" type="Control"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="PanelContainer" type="PanelContainer" parent="."] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_styles/panel = SubResource("StyleBoxFlat_eaoak") + +[node name="MarginContainer" type="MarginContainer" parent="PanelContainer"] +layout_mode = 2 +theme_override_constants/margin_left = 16 +theme_override_constants/margin_top = 32 +theme_override_constants/margin_right = 16 +theme_override_constants/margin_bottom = 16 + +[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer"] +layout_mode = 2 +size_flags_horizontal = 4 +size_flags_vertical = 0 +theme_override_constants/separation = 16 + +[node name="LevelName" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer"] +layout_mode = 2 +text = "LEVEL NAME - 1" +uppercase = true + +[node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer"] +layout_mode = 2 +size_flags_horizontal = 4 +size_flags_vertical = 4 + +[node name="TextureRect" type="TextureRect" parent="PanelContainer/MarginContainer/VBoxContainer/HBoxContainer"] +layout_mode = 2 +size_flags_horizontal = 4 +size_flags_vertical = 4 +texture = ExtResource("1_m30em") + +[node name="LivesLeft" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer/HBoxContainer"] +layout_mode = 2 +text = "x 3" +uppercase = true diff --git a/objects/ui/game_over_screen.tscn b/objects/ui/game_over_screen.tscn new file mode 100644 index 0000000..bc5703b --- /dev/null +++ b/objects/ui/game_over_screen.tscn @@ -0,0 +1,54 @@ +[gd_scene load_steps=2 format=3 uid="uid://wmw6gaisyrvx"] + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_mtg1b"] +bg_color = Color(0, 0, 0, 1) + +[node name="GameOverScreen" type="Control"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="PanelContainer" type="PanelContainer" parent="."] +layout_mode = 1 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +theme_override_styles/panel = SubResource("StyleBoxFlat_mtg1b") + +[node name="MarginContainer" type="MarginContainer" parent="PanelContainer"] +layout_mode = 2 +theme_override_constants/margin_left = 16 +theme_override_constants/margin_top = 32 +theme_override_constants/margin_right = 16 +theme_override_constants/margin_bottom = 16 + +[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer"] +layout_mode = 2 +size_flags_horizontal = 4 +size_flags_vertical = 0 +theme_override_constants/separation = 16 + +[node name="Label" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer"] +layout_mode = 2 +text = "game over" +horizontal_alignment = 1 +uppercase = true + +[node name="Control" type="Control" parent="PanelContainer/MarginContainer/VBoxContainer"] +custom_minimum_size = Vector2(0, 32) +layout_mode = 2 + +[node name="RestartLevelButton" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer"] +layout_mode = 2 +text = "RESTART LEVEL" +flat = true + +[node name="MenuButton" type="Button" parent="PanelContainer/MarginContainer/VBoxContainer"] +layout_mode = 2 +text = "GO TO MENU" +flat = true diff --git a/project.godot b/project.godot index 92f8b78..1614dd0 100644 --- a/project.godot +++ b/project.godot @@ -43,6 +43,7 @@ file_logging/enable_file_logging=true window/size/viewport_width=480 window/size/viewport_height=270 +window/size/mode=4 window/size/initial_position=Vector2i(400, 100) window/size/window_width_override=1440 window/size/window_height_override=810 diff --git a/scenes/test.tscn b/scenes/test.tscn index 55bd0d4..1f23e82 100644 --- a/scenes/test.tscn +++ b/scenes/test.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=42 format=4 uid="uid://h60obxmju6mo"] +[gd_scene load_steps=44 format=4 uid="uid://h60obxmju6mo"] [ext_resource type="Texture2D" uid="uid://djifxc5x0dyrw" path="res://sprites/ppc_tileset.png" id="1_5lb42"] [ext_resource type="TileSet" uid="uid://cl4bn8lofqvky" path="res://tileset/village/tileset_village.tres" id="1_d680t"] @@ -30,6 +30,8 @@ [ext_resource type="PackedScene" uid="uid://y0ae6e7t70fj" path="res://objects/ui/settings_menu.tscn" id="26_y81of"] [ext_resource type="PackedScene" uid="uid://cvfsbiy5ggrpg" path="res://objects/ui/input_settings.tscn" id="27_gsk6d"] [ext_resource type="Script" uid="uid://8r1y8elyw7kt" path="res://scripts/console_management.gd" id="28_1dqgb"] +[ext_resource type="PackedScene" uid="uid://dulkm3ah4tm0u" path="res://objects/ui/death_screen.tscn" id="28_4k8fq"] +[ext_resource type="PackedScene" uid="uid://wmw6gaisyrvx" path="res://objects/ui/game_over_screen.tscn" id="29_75pfo"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_cagp7"] texture = ExtResource("1_5lb42") @@ -589,6 +591,13 @@ visible = false settings_menu = ExtResource("26_y81of") [node name="Input Settings" parent="CanvasLayer" instance=ExtResource("27_gsk6d")] +visible = false + +[node name="DeathScreen" parent="CanvasLayer" instance=ExtResource("28_4k8fq")] +visible = false + +[node name="GameOverScreen" parent="CanvasLayer" instance=ExtResource("29_75pfo")] +visible = false [node name="Killzone" parent="." instance=ExtResource("20_8a4vc")] position = Vector2(0, 990) diff --git a/sprites/ppc_icon.png b/sprites/ppc_icon.png index 968abba82d635e147a757ad5196214f6150beee8..4b56e8d8e5d6602c4d59347e9ee806248c5d1356 100644 GIT binary patch delta 654 zcmV;90&)G&1F{8>FnFzP2L7k?x_97~x|Kfy{ZD>wL& zV5tN={$kg0BZrYZ>L*-WuJX!im5&Y*E*HRx58uAI;B>jA64-b6P1ojd43rD<|LKRO zQAX$WXB8nEoGEx$0}8kNUbyh|SwK(TCyTwjwIKk=aHkhf+RT$SMp^zUbm4>$)a&(p{$`Z}U>5*z6wVe@bS$#dl^agw z>4R0+^B63ISj+&x>>(g?eHnROk+%*I&8|rlMVV(n-UFNbtId~l@_AwO2AWqeM8GGn zE6P&|uM}PbSo;k1XFUZz`CJAFAt;?YX1-V^#I0=ZO@H!41R=!Sg)kbRiUtuGFOlL^ zw@mXk+4Q-YeWOcLlx_p(6LSHHLi0PHPmHuxkJEsS3h?L-Se4t=k8J?JPQ3{ir}&+E z6Y)>b>AL6SAl}vhnxfamtPYbr={cS+C zRn=yp6@MAkdUZ~<=i|M=p}`Y@{cT`6e&uStrWXC@u6rQy8gMrFw~46w0JQndzVDm~ z0pz~zHaXu+=rurL(V^4_X9|w@0vsJAS2~n>o6&AphIBoUYq#6Z#VOtgX9RwA*YNw~ okS|ksbnafbM)&K7Rvmu<6fz%(lR;2`00000Ne4wvM6N<$g8wKxcK`qY delta 426 zcmV;b0agC81<(VKFnw~SkG~9Rr>MPn&Ks132Fs=GgaVHbc3El1IvfUo_~4l**Dnd1?Z($(JI0bAIoJ(@$BhAzzYQ1?J_L`$XkhlP3bOTz?Ut zx2c&g6WwV_7UhHYe)SGaeNf`RzC0&zLHt2 zH)qk>mF(AVL~0LMyS>CKY)iX