diff --git a/project/ui/confetti.png b/project/ui/confetti.png deleted file mode 100644 index 70e2165..0000000 Binary files a/project/ui/confetti.png and /dev/null differ diff --git a/project/ui/confetti.png.import b/project/ui/confetti.png.import deleted file mode 100644 index 719d5c2..0000000 --- a/project/ui/confetti.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://ewcgcadv26sj" -path="res://.godot/imported/confetti.png-fa9d6cba5753b42474602a1ffe35c6e2.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://ui/confetti.png" -dest_files=["res://.godot/imported/confetti.png-fa9d6cba5753b42474602a1ffe35c6e2.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/project/ui/year_indicator.gd b/project/ui/year_indicator.gd index a5cc6cf..a1f9d5f 100644 --- a/project/ui/year_indicator.gd +++ b/project/ui/year_indicator.gd @@ -17,13 +17,12 @@ var world: World: Year.Name.JUNIOR: %Year3, Year.Name.SENIOR: %Year4, } -@onready var _particles: CPUParticles2D = %Particles func _year_progressed(years: int) -> void: - _particles.emitting = true _update_display(years) + func _update_display(new_year: Year.Name) -> void: _year_circles[new_year].year_passed = true _year_name.text = Year.as_string(new_year) diff --git a/project/ui/year_indicator.tscn b/project/ui/year_indicator.tscn index aa1aebd..51f8304 100644 --- a/project/ui/year_indicator.tscn +++ b/project/ui/year_indicator.tscn @@ -1,18 +1,7 @@ -[gd_scene load_steps=6 format=3 uid="uid://cn7vhi2yphyq2"] +[gd_scene load_steps=3 format=3 uid="uid://cn7vhi2yphyq2"] [ext_resource type="Script" path="res://ui/year_indicator.gd" id="1_u77pd"] [ext_resource type="PackedScene" uid="uid://c114f4p83ky61" path="res://ui/year_progress_circle.tscn" id="2_mloxu"] -[ext_resource type="Texture2D" uid="uid://ewcgcadv26sj" path="res://ui/confetti.png" id="3_obfaj"] - -[sub_resource type="Gradient" id="Gradient_sn0fg"] -offsets = PackedFloat32Array(0, 0.844444, 1) -colors = PackedColorArray(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0) - -[sub_resource type="Curve" id="Curve_jv6hi"] -min_value = -1.0 -bake_resolution = 1 -_data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0] -point_count = 2 [node name="YearIndicator" type="HBoxContainer"] anchors_preset = 15 @@ -63,31 +52,3 @@ size_flags_vertical = 4 layout_mode = 2 size_flags_horizontal = 3 size_flags_stretch_ratio = 5.0 - -[node name="Particles" type="CPUParticles2D" parent="."] -unique_name_in_owner = true -z_index = 10 -position = Vector2(380, 1) -emitting = false -amount = 48 -lifetime = 2.0 -one_shot = true -explosiveness = 0.95 -randomness = 0.1 -lifetime_randomness = 0.1 -texture = ExtResource("3_obfaj") -emission_shape = 3 -emission_rect_extents = Vector2(360, 1) -direction = Vector2(0, 1) -gravity = Vector2(0, 32) -initial_velocity_min = 20.0 -initial_velocity_max = 240.0 -angular_velocity_min = -90.0 -angular_velocity_max = 90.0 -angle_max = 320.0 -scale_amount_min = 0.5 -scale_amount_max = 2.0 -color_ramp = SubResource("Gradient_sn0fg") -hue_variation_min = -1.0 -hue_variation_max = 1.0 -hue_variation_curve = SubResource("Curve_jv6hi")