From 157b907bd602e17a017c729a142838d52dc3fbf8 Mon Sep 17 00:00:00 2001 From: Cookie-CHR Date: Mon, 4 Apr 2022 12:42:10 +0200 Subject: [PATCH 1/2] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20UI=20Bar=20sprites?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/ui/LifeBarBg.png | 3 +++ src/ui/LifeBarBg.png.import | 35 +++++++++++++++++++++++++++++++++++ src/ui/LifeBarFg.png | 3 +++ src/ui/LifeBarFg.png.import | 35 +++++++++++++++++++++++++++++++++++ src/ui/Music_off.png | 3 +++ src/ui/Music_off.png.import | 35 +++++++++++++++++++++++++++++++++++ src/ui/Music_on.png | 3 +++ src/ui/Music_on.png.import | 35 +++++++++++++++++++++++++++++++++++ src/ui/UIBar.png | 3 +++ src/ui/UIBar.png.import | 35 +++++++++++++++++++++++++++++++++++ 10 files changed, 190 insertions(+) create mode 100644 src/ui/LifeBarBg.png create mode 100644 src/ui/LifeBarBg.png.import create mode 100644 src/ui/LifeBarFg.png create mode 100644 src/ui/LifeBarFg.png.import create mode 100644 src/ui/Music_off.png create mode 100644 src/ui/Music_off.png.import create mode 100644 src/ui/Music_on.png create mode 100644 src/ui/Music_on.png.import create mode 100644 src/ui/UIBar.png create mode 100644 src/ui/UIBar.png.import diff --git a/src/ui/LifeBarBg.png b/src/ui/LifeBarBg.png new file mode 100644 index 0000000..6eacdbc --- /dev/null +++ b/src/ui/LifeBarBg.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b243a9925328813a8760796fa5e14072d91573b9ed0728d0618792e92970aaac +size 5254 diff --git a/src/ui/LifeBarBg.png.import b/src/ui/LifeBarBg.png.import new file mode 100644 index 0000000..4e55ad9 --- /dev/null +++ b/src/ui/LifeBarBg.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/LifeBarBg.png-99f7fc4234c2ec6ac697cc824f58880b.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://src/ui/LifeBarBg.png" +dest_files=[ "res://.import/LifeBarBg.png-99f7fc4234c2ec6ac697cc824f58880b.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/src/ui/LifeBarFg.png b/src/ui/LifeBarFg.png new file mode 100644 index 0000000..fb5f87e --- /dev/null +++ b/src/ui/LifeBarFg.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5dd30be1538773c916fa6350976a10cc1ecd325bd928896036a88cd840e134df +size 10200 diff --git a/src/ui/LifeBarFg.png.import b/src/ui/LifeBarFg.png.import new file mode 100644 index 0000000..6e6b68d --- /dev/null +++ b/src/ui/LifeBarFg.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/LifeBarFg.png-0d39793826fe9b1367d14793755cf28a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://src/ui/LifeBarFg.png" +dest_files=[ "res://.import/LifeBarFg.png-0d39793826fe9b1367d14793755cf28a.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/src/ui/Music_off.png b/src/ui/Music_off.png new file mode 100644 index 0000000..72902d5 --- /dev/null +++ b/src/ui/Music_off.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee7af8545e49a35179a5247aeac4de9c0fbb55023c5abc874ca91c45e3a01d50 +size 906 diff --git a/src/ui/Music_off.png.import b/src/ui/Music_off.png.import new file mode 100644 index 0000000..b7f27c7 --- /dev/null +++ b/src/ui/Music_off.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Music_off.png-27b13d35b03a178cf5a3bbf66101607e.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://src/ui/Music_off.png" +dest_files=[ "res://.import/Music_off.png-27b13d35b03a178cf5a3bbf66101607e.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/src/ui/Music_on.png b/src/ui/Music_on.png new file mode 100644 index 0000000..30c27a0 --- /dev/null +++ b/src/ui/Music_on.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3fa620645c490359413f5d91b1d10c488caae8adf0d807ebbfe678e45eea7423 +size 3486 diff --git a/src/ui/Music_on.png.import b/src/ui/Music_on.png.import new file mode 100644 index 0000000..4af38e0 --- /dev/null +++ b/src/ui/Music_on.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Music_on.png-a4e74b2de0c60b71ef58425ddb79e339.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://src/ui/Music_on.png" +dest_files=[ "res://.import/Music_on.png-a4e74b2de0c60b71ef58425ddb79e339.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/src/ui/UIBar.png b/src/ui/UIBar.png new file mode 100644 index 0000000..ee2fcf7 --- /dev/null +++ b/src/ui/UIBar.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:abede14f1b7d7a9f1c10d0e41af3027e6b423d71a99ca9baf603b3af25ed4859 +size 85907 diff --git a/src/ui/UIBar.png.import b/src/ui/UIBar.png.import new file mode 100644 index 0000000..9ea2b03 --- /dev/null +++ b/src/ui/UIBar.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/UIBar.png-1a0464279903795260a97a88d660c35b.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://src/ui/UIBar.png" +dest_files=[ "res://.import/UIBar.png-1a0464279903795260a97a88d660c35b.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 From 241c0bc37739584ddea6f1744764c4cd432a15c6 Mon Sep 17 00:00:00 2001 From: Cookie-CHR Date: Mon, 4 Apr 2022 12:43:04 +0200 Subject: [PATCH 2/2] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20put=20sprites=20on=20u?= =?UTF-8?q?i?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/levels/Game.tscn | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/src/levels/Game.tscn b/src/levels/Game.tscn index f8b1eca..24c9f32 100644 --- a/src/levels/Game.tscn +++ b/src/levels/Game.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=17 format=2] [ext_resource path="res://src/mechanics/Background.tscn" type="PackedScene" id=1] [ext_resource path="res://src/mechanics/Darkness.tscn" type="PackedScene" id=2] @@ -6,8 +6,12 @@ [ext_resource path="res://src/entities/players/PhaseOnePlayer.tscn" type="PackedScene" id=4] [ext_resource path="res://src/mechanics/RNG.tscn" type="PackedScene" id=5] [ext_resource path="res://src/levels/Game.gd" type="Script" id=6] +[ext_resource path="res://src/ui/UIBar.png" type="Texture" id=7] [ext_resource path="res://src/ui/TheDarkNightUI.tscn" type="PackedScene" id=8] +[ext_resource path="res://src/ui/LifeBarFg.png" type="Texture" id=9] +[ext_resource path="res://src/ui/LifeBarBg.png" type="Texture" id=10] [ext_resource path="res://src/levels/PhaseOneMusic.gd" type="Script" id=11] +[ext_resource path="res://src/ui/Music_on.png" type="Texture" id=12] [ext_resource path="res://src/music/BaseDrum.mp3" type="AudioStream" id=19] [ext_resource path="res://src/music/BaseBell.mp3" type="AudioStream" id=20] [ext_resource path="res://src/music/BaseChoir.mp3" type="AudioStream" id=21] @@ -88,13 +92,16 @@ margin_right = 0.0 anchor_right = 1.0 anchor_bottom = 1.0 +[node name="UIBar" type="Sprite" parent="UserInterface/TheDarkNightUI/Panel"] +position = Vector2( 640, 40 ) +texture = ExtResource( 7 ) + [node name="TimeSurvived" type="Label" parent="UserInterface/TheDarkNightUI/Panel"] -anchor_left = 1.0 -anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = 14.0 -margin_right = -14.0 -margin_bottom = -14.0 +margin_left = 600.0 +margin_top = 16.0 +margin_right = 680.0 +margin_bottom = -12.0 grow_horizontal = 0 grow_vertical = 2 text = "00:00.000" @@ -103,6 +110,7 @@ valign = 1 script = SubResource( 1 ) [node name="HealthBar" type="ProgressBar" parent="UserInterface/TheDarkNightUI/Panel"] +visible = false anchor_bottom = 1.0 margin_left = 14.0 margin_top = 14.0 @@ -111,4 +119,28 @@ margin_bottom = -14.0 grow_vertical = 2 value = 50.0 +[node name="TextureProgress" type="TextureProgress" parent="UserInterface/TheDarkNightUI/Panel"] +margin_left = 15.0 +margin_top = 15.0 +margin_right = 317.0 +margin_bottom = -15.0 +value = 50.0 +texture_under = ExtResource( 10 ) +texture_progress = ExtResource( 9 ) +texture_progress_offset = Vector2( 10, 5 ) + +[node name="Button" type="Button" parent="UserInterface/TheDarkNightUI/Panel"] +anchor_left = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = -100.0 +margin_top = 10.0 +margin_right = -50.0 +margin_bottom = -10.0 +flat = true + +[node name="Sprite" type="Sprite" parent="UserInterface/TheDarkNightUI/Panel/Button"] +position = Vector2( 25, 30 ) +texture = ExtResource( 12 ) + [connection signal="intensity_changed" from="PhaseOne/Entities/Fire" to="PhaseOne/Music" method="_on_Fire_intensity_changed"]