diff --git a/globals/currentgame.gd b/globals/currentgame.gd index d0e2f93..e606696 100644 --- a/globals/currentgame.gd +++ b/globals/currentgame.gd @@ -17,8 +17,8 @@ func change_graze(amount): func change_lives(amount): lives += amount - Hud.lives_label = str("GRAZE: ") + str(lives) + Hud.lives_label = str("LIVES: ") + str(lives) func change_bombs(amount): bombs += amount - Hud.bombs_label = str("GRAZE: ") + str(bombs) + Hud.bombs_label = str("BOMB: ") + str(bombs) diff --git a/objects/player/player.tscn b/objects/player/player.tscn index cc81483..e15a3f3 100644 --- a/objects/player/player.tscn +++ b/objects/player/player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=3 uid="uid://c714s5d7d5765"] +[gd_scene load_steps=13 format=3 uid="uid://c714s5d7d5765"] [ext_resource type="Script" uid="uid://bpo15kuxdmulu" path="res://objects/player/player.gd" id="1_cqmt1"] [ext_resource type="Texture2D" uid="uid://cre6i8tsdlt7j" path="res://graphics/player/player_1.png" id="2_jnjyq"] @@ -33,6 +33,10 @@ size = Vector2(22, 22) [sub_resource type="CircleShape2D" id="CircleShape2D_gnkmh"] radius = 13.038404 +[sub_resource type="Gradient" id="Gradient_aeam7"] +offsets = PackedFloat32Array(0, 0.513333, 1) +colors = PackedColorArray(0, 0.647059, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1) + [node name="Player" type="CharacterBody2D"] collision_layer = 2 script = ExtResource("1_cqmt1") @@ -80,12 +84,21 @@ debug_color = Color(0.7740294, 0.14773864, 0.99999994, 0.41960785) unique_name_in_owner = true stream = ExtResource("5_gnkmh") -[node name="GrazeParticles" parent="." instance=ExtResource("6_xkryw")] +[node name="GrazeParticles" type="CPUParticles2D" parent="." instance=ExtResource("6_xkryw")] unique_name_in_owner = true +emitting = false amount = 10 -scale_amount_min = 1.0 -scale_amount_max = 1.0 -script = null +lifetime = 0.15 +one_shot = true +speed_scale = 0.5 +explosiveness = 0.6 +randomness = 1.0 +lifetime_randomness = 1.0 +spread = 154.09 +gravity = Vector2(0, 630) +initial_velocity_min = 251.99 +initial_velocity_max = 484.86 +color_ramp = SubResource("Gradient_aeam7") [connection signal="area_entered" from="Hurtbox" to="." method="_on_hurtbox_area_entered"] [connection signal="area_entered" from="GrazeBox" to="." method="_on_graze_box_area_entered"]