diff --git a/Sprites/TimerBar.png b/Sprites/TimerBar.png new file mode 100644 index 0000000..89a88ab Binary files /dev/null and b/Sprites/TimerBar.png differ diff --git a/Sprites/TimerBar.png.import b/Sprites/TimerBar.png.import new file mode 100644 index 0000000..96acb0d --- /dev/null +++ b/Sprites/TimerBar.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bo6fu0cxym44d" +path="res://.godot/imported/TimerBar.png-85ab3d51874f28b0a907690e906ad3ba.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/TimerBar.png" +dest_files=["res://.godot/imported/TimerBar.png-85ab3d51874f28b0a907690e906ad3ba.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Sprites/TimerBarGrey.png b/Sprites/TimerBarGrey.png new file mode 100644 index 0000000..2487435 Binary files /dev/null and b/Sprites/TimerBarGrey.png differ diff --git a/Sprites/TimerBarGrey.png.import b/Sprites/TimerBarGrey.png.import new file mode 100644 index 0000000..eece87c --- /dev/null +++ b/Sprites/TimerBarGrey.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bvgpivc827tra" +path="res://.godot/imported/TimerBarGrey.png-e42bda8fe1e5a18e85b349701a50f5e6.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/TimerBarGrey.png" +dest_files=["res://.godot/imported/TimerBarGrey.png-e42bda8fe1e5a18e85b349701a50f5e6.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/game.tscn b/game.tscn index 1fa5b29..b80151c 100644 --- a/game.tscn +++ b/game.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=13 format=3 uid="uid://sntwtley2f7d"] +[gd_scene load_steps=15 format=3 uid="uid://sntwtley2f7d"] [ext_resource type="Texture2D" uid="uid://dj6mkweo8kgcs" path="res://Sprites/smol-up.png" id="1_80nbo"] [ext_resource type="Script" uid="uid://c7c1yy0hv1u3r" path="res://logic.gd" id="1_e2o6t"] @@ -7,8 +7,10 @@ [ext_resource type="Texture2D" uid="uid://25g6athehh1s" path="res://Sprites/smol-left.png" id="5_eow3j"] [ext_resource type="Texture2D" uid="uid://y2ytspjqefbk" path="res://Sprites/smol-blank.png" id="6_ryrav"] [ext_resource type="Texture2D" uid="uid://n6rnl67gxggv" path="res://Sprites/hint00.png" id="7_hve3p"] +[ext_resource type="Texture2D" uid="uid://bvgpivc827tra" path="res://Sprites/TimerBarGrey.png" id="8_iotsf"] [ext_resource type="Texture2D" uid="uid://drtw5y8tfkxp8" path="res://Sprites/ScoreLife.png" id="8_mfdv2"] [ext_resource type="Texture2D" uid="uid://bwq8fwuhoax4i" path="res://Sprites/SamLife.png" id="9_iotsf"] +[ext_resource type="Texture2D" uid="uid://bo6fu0cxym44d" path="res://Sprites/TimerBar.png" id="9_lc2xo"] [ext_resource type="Texture2D" uid="uid://c8u0xx3dnbcwq" path="res://Sprites/targetBG.png" id="10_lc2xo"] [sub_resource type="LabelSettings" id="LabelSettings_215e1"] @@ -19,9 +21,9 @@ font_size = 30 [node name="Node2D" type="Node2D" node_paths=PackedStringArray("icon_container", "progress_bar", "scroll_container", "score_label", "life_container")] script = ExtResource("1_e2o6t") -icon_container = NodePath("CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer") +icon_container = NodePath("CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer") icons = Array[Texture]([ExtResource("1_80nbo"), ExtResource("3_7jktm"), ExtResource("4_ryrav"), ExtResource("5_eow3j"), ExtResource("6_ryrav")]) -progress_bar = NodePath("CanvasLayer/VBoxContainer/ProgressBar") +progress_bar = NodePath("CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/ProgressBar") scroll_container = NodePath("CanvasLayer/VBoxContainer/HFlowContainer") score_label = NodePath("CanvasLayer/Score_Lives Display/ScoreLabel") life_container = NodePath("CanvasLayer/Score_Lives Display/Lives") @@ -43,185 +45,193 @@ layout_mode = 2 size_flags_vertical = 4 vertical_scroll_mode = 0 -[node name="HBoxContainer" type="HBoxContainer" parent="CanvasLayer/VBoxContainer/HFlowContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="CanvasLayer/VBoxContainer/HFlowContainer"] layout_mode = 2 -size_flags_horizontal = 3 +size_flags_horizontal = 6 + +[node name="HBoxContainer" type="HBoxContainer" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer"] +layout_mode = 2 +size_flags_horizontal = 6 alignment = 1 -[node name="TextureRect" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect2" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect2" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect3" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect3" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect4" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect4" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect5" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect5" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect6" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect6" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect7" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect7" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect8" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect8" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect9" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect9" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect10" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect10" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect11" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect11" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect12" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect12" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect13" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect13" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect14" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect14" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect15" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect15" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect16" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect16" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect17" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect17" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect18" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect18" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect19" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect19" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect20" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect20" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect21" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect21" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect22" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect22" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect23" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect23" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect24" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect24" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect25" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect25" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect26" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect26" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect27" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect27" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect28" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect28" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect29" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect29" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect30" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect30" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect31" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect31" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect32" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect32" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect33" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect33" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="TextureRect34" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/HBoxContainer"] +[node name="TextureRect34" type="TextureRect" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer/HBoxContainer"] visible = false layout_mode = 2 texture = ExtResource("6_ryrav") -[node name="ProgressBar" type="ProgressBar" parent="CanvasLayer/VBoxContainer"] +[node name="ProgressBar" type="TextureProgressBar" parent="CanvasLayer/VBoxContainer/HFlowContainer/VBoxContainer"] +custom_minimum_size = Vector2(0, 10) layout_mode = 2 max_value = 1.0 step = 0.0 +nine_patch_stretch = true +texture_under = ExtResource("8_iotsf") +texture_progress = ExtResource("9_lc2xo") [node name="Hint" type="TextureRect" parent="CanvasLayer"] offset_left = 47.0 diff --git a/logic.gd b/logic.gd index c4c9ac4..0b5ab06 100644 --- a/logic.gd +++ b/logic.gd @@ -6,7 +6,7 @@ extends Node2D @export var starting_lives : int = 3 @export var icon_container: HBoxContainer @export var icons : Array[Texture] -@export var progress_bar : ProgressBar +@export var progress_bar : TextureProgressBar @export var scroll_container : ScrollContainer @export var score_label : Label @export var life_container : HBoxContainer