diff --git a/project.godot b/project.godot index 564d310..e5c6e50 100644 --- a/project.godot +++ b/project.godot @@ -8,6 +8,10 @@ config_version=5 +[animation] + +warnings/check_invalid_track_paths=false + [application] config/name="Grunk" diff --git a/src/equipment/toothbrush/toothbrush.tscn b/src/equipment/toothbrush/toothbrush.tscn index c2d2eff..b02b207 100644 --- a/src/equipment/toothbrush/toothbrush.tscn +++ b/src/equipment/toothbrush/toothbrush.tscn @@ -111,7 +111,8 @@ unique_name_in_owner = true visible = false texture_filter = 1 layout_mode = 0 -offset_right = 64.0 +offset_left = -40.0 +offset_right = 24.0 offset_bottom = 128.0 scale = Vector2(5, 5) texture = ExtResource("4_atd0h") diff --git a/src/equipment/wide_spray/wide_spray.tscn b/src/equipment/wide_spray/wide_spray.tscn index be78f1c..6a5df2a 100644 --- a/src/equipment/wide_spray/wide_spray.tscn +++ b/src/equipment/wide_spray/wide_spray.tscn @@ -50,6 +50,9 @@ initial_velocity_min = 8.0 initial_velocity_max = 8.0 gravity = Vector3(0, 0, 0) +[sub_resource type="BoxMesh" id="BoxMesh_fmqw2"] +size = Vector3(0.05, 0.05, 0.3) + [sub_resource type="Animation" id="Animation_ku0nd"] length = 0.001 tracks/0/type = "value" @@ -160,9 +163,6 @@ _data = { &"rotate": SubResource("Animation_ay2b7") } -[sub_resource type="BoxMesh" id="BoxMesh_fmqw2"] -size = Vector3(0.05, 0.05, 0.3) - [node name="WideSpray" type="Node3D"] script = ExtResource("1_ggkto") @@ -255,12 +255,6 @@ local_coords = true process_material = SubResource("ParticleProcessMaterial_lyk2j") draw_pass_1 = SubResource("QuadMesh_trcry") -[node name="AnimationPlayer" type="AnimationPlayer" parent="."] -unique_name_in_owner = true -libraries = { -&"": SubResource("AnimationLibrary_fmqw2") -} - [node name="HUDTool" type="Node3D" parent="."] unique_name_in_owner = true @@ -290,6 +284,7 @@ grow_vertical = 2 [node name="WideNozzle" type="TextureRect" parent="HUDTool/Rumbler/NozzleMarker/HUDElement"] texture_filter = 3 +layout_mode = 0 offset_left = -256.0 offset_top = -186.0 offset_right = -192.0 @@ -300,6 +295,7 @@ texture = ExtResource("9_8vo2h") [node name="TallNozzle" type="TextureRect" parent="HUDTool/Rumbler/NozzleMarker/HUDElement"] visible = false texture_filter = 3 +layout_mode = 0 offset_left = -256.0 offset_top = -186.0 offset_right = -192.0 @@ -307,4 +303,10 @@ offset_bottom = -122.0 scale = Vector2(10, 10) texture = ExtResource("10_hv82w") +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +unique_name_in_owner = true +libraries = { +&"": SubResource("AnimationLibrary_fmqw2") +} + [connection signal="animation_finished" from="AnimationPlayer" to="." method="_on_animation_finished"]