Merge branch 'main' of github.com:RYGhub/ld50

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"]

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

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

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

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

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