Adding visuals

Adding character sprites
Textured bars
Animated notes

Author: LifeHckr

scenes/BattleDirector/BattleDirector.cs

@@ -92,16 +92,16 @@ private bool AddNoteToLane(Note note)
     #endregion
 
     //Creeate dummy notes
-    private void AddExampleNote()
+    private void AddExampleNotes()
     {
         for (int i = 0; i < 4; i++)
         {
-            Note exampleNote = new Note(NoteArrow.ArrowType.Up, i + 3);
+            Note exampleNote = new Note(NoteArrow.ArrowType.Up, i + 20);
             AddNoteToLane(exampleNote);
         }
         for (int i = 0; i < 1; i++)
         {
-            Note exampleNote = new Note(NoteArrow.ArrowType.Left, i + 4);
+            Note exampleNote = new Note(NoteArrow.ArrowType.Left, i + 21);
             AddNoteToLane(exampleNote);
         }
     }
@@ -115,11 +115,26 @@ public override void _Ready()
             NumLoops = 5,
         };
         CM.PrepChart(_curSong);
-        AddExampleNote();
+        AddExampleNotes();
 
         Player = GetNode<HealthBar>("PlayerHP");
+        Player.GetNode<Sprite2D>("Sprite2D").Scale *= .5f; //TEMP
+        Player.GetNode<Sprite2D>("Sprite2D").Position += Vector2.Down * 30; //TEMP
         Enemy = GetNode<HealthBar>("EnemyHP");
 
+        //TEMP
+        var enemTween = CreateTween();
+        enemTween
+            .TweenProperty(Enemy.GetNode<Sprite2D>("Sprite2D"), "position", Vector2.Down * 5, 1f)
+            .AsRelative();
+        enemTween
+            .TweenProperty(Enemy.GetNode<Sprite2D>("Sprite2D"), "position", Vector2.Up * 5, 1f)
+            .AsRelative();
+        enemTween.SetTrans(Tween.TransitionType.Spring);
+        enemTween.SetEase(Tween.EaseType.In);
+        enemTween.SetLoops();
+        enemTween.Play();
+
         CM.Connect(nameof(InputHandler.NotePressed), new Callable(this, nameof(OnNotePressed)));
         CM.Connect(nameof(InputHandler.NoteReleased), new Callable(this, nameof(OnNoteReleased)));
     }
@@ -174,25 +189,25 @@ private void HandleTiming(NoteArrow.ArrowType type, double beatDif)
         if (beatDif < _timingInterval * 2)
         {
             GD.Print("Perfect");
-            Enemy.TakeDamage(10);
+            Enemy.TakeDamage(1);
             NotePlacementBar.HitNote();
         }
         else if (beatDif < _timingInterval * 4)
         {
             GD.Print("Good");
-            Enemy.TakeDamage(5);
+            Enemy.TakeDamage(0);
             NotePlacementBar.HitNote();
         }
         else if (beatDif < _timingInterval * 6)
         {
             GD.Print("Okay");
-            Enemy.TakeDamage(1);
+            Player.TakeDamage(1);
             NotePlacementBar.HitNote();
         }
         else
         {
             GD.Print("Miss");
-            Player.TakeDamage(10);
+            Player.TakeDamage(2);
             NotePlacementBar.MissNote();
         }
     }

scenes/BattleDirector/HealthBar.cs

@@ -7,16 +7,21 @@ public partial class HealthBar : Control
     int _health = MaxHealth;
 
     [Export]
-    public ProgressBar PlayerHealthBar;
+    public TextureProgressBar PlayerHealthBar;
+
+    [Export]
+    public Texture2D SpriteText;
+
     //we can change this to a Texture Progress bar once we have art assets for it
 
-    
+
     public override void _Ready()
     {
         if (PlayerHealthBar != null)
         {
             SetHealth(MaxHealth, MaxHealth);
         }
+        GetNode<Sprite2D>("Sprite2D").Texture = SpriteText;
     }
 
     public void SetHealth(int max, int current)

scenes/BattleDirector/HealthBar.tscn

@@ -1,7 +1,30 @@
-[gd_scene load_steps=2 format=3 uid="uid://bgomxovxs7sr8"]
+[gd_scene load_steps=8 format=3 uid="uid://bgomxovxs7sr8"]
 
 [ext_resource type="Script" path="res://scenes/BattleDirector/HealthBar.cs" id="1_b1t4i"]
 
+[sub_resource type="Gradient" id="Gradient_ve5ki"]
+colors = PackedColorArray(0, 0, 0, 1, 0, 0, 0, 1)
+
+[sub_resource type="GradientTexture2D" id="GradientTexture2D_ti0cv"]
+gradient = SubResource("Gradient_ve5ki")
+width = 150
+height = 20
+
+[sub_resource type="Gradient" id="Gradient_soqhm"]
+colors = PackedColorArray(0, 1, 0.0999999, 1, 1, 1, 1, 1)
+
+[sub_resource type="GradientTexture2D" id="GradientTexture2D_r4hau"]
+gradient = SubResource("Gradient_soqhm")
+width = 146
+height = 16
+
+[sub_resource type="Gradient" id="Gradient_58kj0"]
+offsets = PackedFloat32Array(1)
+colors = PackedColorArray(1, 1, 1, 1)
+
+[sub_resource type="GradientTexture2D" id="GradientTexture2D_wwca1"]
+gradient = SubResource("Gradient_58kj0")
+
 [node name="Control" type="Control" node_paths=PackedStringArray("PlayerHealthBar")]
 layout_mode = 3
 anchors_preset = 0
@@ -10,9 +33,15 @@ offset_bottom = 40.0
 script = ExtResource("1_b1t4i")
 PlayerHealthBar = NodePath("ProgressBar")
 
-[node name="ProgressBar" type="ProgressBar" parent="."]
+[node name="ProgressBar" type="TextureProgressBar" parent="."]
 layout_mode = 0
-offset_left = 29.0
-offset_top = 18.0
-offset_right = 229.0
-offset_bottom = 45.0
+offset_right = 150.0
+offset_bottom = 20.0
+texture_under = SubResource("GradientTexture2D_ti0cv")
+texture_progress = SubResource("GradientTexture2D_r4hau")
+texture_progress_offset = Vector2(2, 2)
+
+[node name="Sprite2D" type="Sprite2D" parent="."]
+position = Vector2(75, 86)
+scale = Vector2(2, 2)
+texture = SubResource("GradientTexture2D_wwca1")

scenes/BattleDirector/assets/Character1.png

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b6fkei0i83vte"
+path="res://.godot/imported/Character1.png-d73d4a980ad79d80867b72bd7a029fb4.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://scenes/BattleDirector/assets/Character1.png"
+dest_files=["res://.godot/imported/Character1.png-d73d4a980ad79d80867b72bd7a029fb4.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

scenes/BattleDirector/assets/Character1.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://veedngaorx3l"
+path="res://.godot/imported/Enemy1.png-fb95639d1545a326b6c39640343f3786.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://scenes/BattleDirector/assets/Enemy1.png"
+dest_files=["res://.godot/imported/Enemy1.png-fb95639d1545a326b6c39640343f3786.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

scenes/BattleDirector/assets/Enemy1.png

@@ -0,0 +1,61 @@
+shader_type canvas_item;
+//Credit: https://godotshaders.com/shader/balatro-background-shader/
+
+
+uniform highp float spin_rotation_speed = 2.0;
+uniform highp float move_speed = 7.0;
+uniform highp vec2 offset = vec2(0., 0.);
+uniform highp vec4 colour_1 : source_color = vec4(0.871, 0.267, 0.231, 1.0);
+uniform highp vec4 colour_2 : source_color = vec4(0.0, 0.42, 0.706, 1.0);
+uniform highp vec4 colour_3 : source_color = vec4(0.086, 0.137, 0.145, 1.0);
+uniform highp float contrast = 3.5;
+uniform highp float lighting = 0.4;
+uniform highp float spin_amount = 0.25;
+uniform highp float pixel_filter = 740.;
+uniform bool is_rotating = false;
+#define SPIN_EASE 1.0
+
+
+vec4 effect(vec2 screenSize, vec2 screen_coords){
+
+	highp float pixel_size = length(screenSize.xy) / pixel_filter;
+    highp vec2 uv = (floor(screen_coords.xy*(1./pixel_size))*pixel_size - 0.5*screenSize.xy)/length(screenSize.xy) - offset;
+    highp float uv_len = length(uv);
+
+
+    highp float speed = (spin_rotation_speed*SPIN_EASE*0.2);
+	if(is_rotating){
+		speed = TIME * speed;
+	}
+	speed += 302.2;
+    highp float new_pixel_angle = (atan(uv.y, uv.x)) + speed - SPIN_EASE*20.*(1.*spin_amount*uv_len + (1. - 1.*spin_amount));
+    highp vec2 mid = (screenSize.xy/length(screenSize.xy))/2.;
+    uv = (vec2((uv_len * cos(new_pixel_angle) + mid.x), (uv_len * sin(new_pixel_angle) + mid.y)) - mid);
+
+    uv *= 30.;
+    speed = TIME*(move_speed);
+	highp vec2 uv2 = vec2(uv.x+uv.y);
+
+	for(int i=0; i < 5; i++) {
+		uv2 += sin(max(uv.x, uv.y)) + uv;
+		uv  += 0.5*vec2(cos(5.1123314 + 0.353*uv2.y + speed*0.131121),sin(uv2.x - 0.113*speed));
+		uv  -= 1.0*cos(uv.x + uv.y) - 1.0*sin(uv.x*0.711 - uv.y);
+	}
+
+
+    highp float contrast_mod = (0.25*contrast + 0.5*spin_amount + 1.2);
+	highp float paint_res = min(2., max(0.,length(uv)*(0.035)*contrast_mod));
+    highp float c1p = max(0.,1. - contrast_mod*abs(1.-paint_res));
+    highp float c2p = max(0.,1. - contrast_mod*abs(paint_res));
+    highp float c3p = 1. - min(1., c1p + c2p);
+	
+	highp float ligth = (lighting - 0.2) * max(c1p*5. - 4., 0.) + lighting * max(c2p*5. - 4., 0.); 
+	highp vec4 ret_col = (0.3/contrast)*colour_1 + (1. - 0.3/contrast)*(colour_1*c1p + colour_2*c2p + vec4(c3p*colour_3.rgb, c3p*colour_1.a)) + ligth;
+	return ret_col;
+}
+
+
+void fragment() {
+    vec2 uv = UV;
+	COLOR *= effect(TEXTURE_PIXEL_SIZE, uv);
+}

scenes/BattleDirector/assets/Enemy1.png.import

@@ -1,9 +1,26 @@
-[gd_scene load_steps=5 format=3 uid="uid://b0mrgr7h0ty1y"]
+[gd_scene load_steps=9 format=3 uid="uid://b0mrgr7h0ty1y"]
 
 [ext_resource type="Script" path="res://scenes/BattleDirector/BattleDirector.cs" id="1_cwqqr"]
 [ext_resource type="PackedScene" uid="uid://dfevfib11kou1" path="res://scenes/ChartViewport/ChartViewport.tscn" id="2_cupb3"]
+[ext_resource type="Shader" path="res://scenes/BattleDirector/assets/test_background.gdshader" id="3_h0nj6"]
 [ext_resource type="PackedScene" uid="uid://bgomxovxs7sr8" path="res://scenes/BattleDirector/HealthBar.tscn" id="3_pp0u0"]
-[ext_resource type="PackedScene" uid="uid://duhiilcv4tat3" path="res://scenes/BattleDirector/NotePlacementBar.tscn" id="4_y2yh3"]
+[ext_resource type="Texture2D" uid="uid://b6fkei0i83vte" path="res://scenes/BattleDirector/assets/Character1.png" id="5_elveq"]
+[ext_resource type="Texture2D" uid="uid://veedngaorx3l" path="res://scenes/BattleDirector/assets/Enemy1.png" id="6_0k4pw"]
+[ext_resource type="PackedScene" uid="uid://duhiilcv4tat3" path="res://scenes/BattleDirector/NotePlacementBar.tscn" id="7_3ko4g"]
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_v58v7"]
+shader = ExtResource("3_h0nj6")
+shader_parameter/spin_rotation_speed = 2.0
+shader_parameter/move_speed = 7.0
+shader_parameter/offset = Vector2(0, 0)
+shader_parameter/colour_1 = Color(0.211765, 0.239216, 0.321569, 1)
+shader_parameter/colour_2 = Color(0.278431, 0.54902, 0.74902, 1)
+shader_parameter/colour_3 = Color(0.086, 0.137, 0.145, 1)
+shader_parameter/contrast = 2.5
+shader_parameter/lighting = 0.4
+shader_parameter/spin_amount = 0.1
+shader_parameter/pixel_filter = 200.0
+shader_parameter/is_rotating = false
 
 [node name="ProtoBattleDirector" type="Node2D" node_paths=PackedStringArray("CM", "IH", "NotePlacementBar")]
 script = ExtResource("1_cwqqr")
@@ -13,24 +30,36 @@ NotePlacementBar = NodePath("NotePlacementBar")
 
 [node name="SubViewport" parent="." instance=ExtResource("2_cupb3")]
 offset_left = 80.0
-offset_top = 140.0
+offset_top = 150.0
 offset_right = 560.0
-offset_bottom = 360.0
+offset_bottom = 350.0
 
 [node name="ColorRect" type="ColorRect" parent="."]
 z_index = -1
+material = SubResource("ShaderMaterial_v58v7")
+offset_left = -49.0
+offset_top = -32.0
+offset_right = 695.0
+offset_bottom = 396.0
+
+[node name="ColorRect2" type="ColorRect" parent="."]
+self_modulate = Color(0.36, 0.36, 0.36, 0.780392)
+z_index = -1
 offset_left = -70.0
-offset_top = -34.0
+offset_top = 140.0
 offset_right = 673.0
-offset_bottom = 393.0
-color = Color(0.147672, 0.147672, 0.147672, 1)
+offset_bottom = 360.0
+color = Color(0.165656, 0.165656, 0.165656, 1)
 
 [node name="PlayerHP" parent="." instance=ExtResource("3_pp0u0")]
+offset_left = 92.0
+offset_right = 132.0
+SpriteText = ExtResource("5_elveq")
 
 [node name="EnemyHP" parent="." instance=ExtResource("3_pp0u0")]
 offset_left = 403.0
 offset_top = -4.0
 offset_right = 443.0
-offset_bottom = 36.0
+SpriteText = ExtResource("6_0k4pw")
 
-[node name="NotePlacementBar" parent="." instance=ExtResource("4_y2yh3")]
+[node name="NotePlacementBar" parent="." instance=ExtResource("7_3ko4g")]

scenes/BattleDirector/assets/test_background.gdshader

@@ -44,6 +44,7 @@ public void PrepChart(BattleDirector.SongData songData)
         BeatsPerLoop = (int)(_loopLen / (60f / songData.Bpm));
         ChartLength = (float)_loopLen * (float)Math.Floor(ChartLength / _loopLen);
         TimeKeeper.ChartLength = (float)ChartLength;
+        TimeKeeper.Bpm = songData.Bpm;
 
         InitBackgrounds();