diff --git a/Game/Assets/Effects/ImpactExplosion.tscn b/Game/Assets/Effects/ImpactExplosion.tscn index 3eccc3d..73341d4 100644 --- a/Game/Assets/Effects/ImpactExplosion.tscn +++ b/Game/Assets/Effects/ImpactExplosion.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=29 format=3 uid="uid://wvxhewre31mo"] +[gd_scene load_steps=34 format=3 uid="uid://wvxhewre31mo"] [ext_resource type="Script" path="res://Assets/Effects/Impact.gd" id="1_7cd22"] [ext_resource type="Texture2D" uid="uid://pnh872qjk0oy" path="res://Assets/Effects/Flame.png" id="2_pyxv8"] @@ -7,9 +7,68 @@ [ext_resource type="Texture2D" uid="uid://m8n52wtycvro" path="res://Assets/Effects/ScorchMark_albedo.png" id="5_tp0ly"] [ext_resource type="Texture2D" uid="uid://b6ly38wgtbnfw" path="res://Assets/Effects/ScorchMark_orm.png" id="6_q3tta"] +[sub_resource type="Gradient" id="Gradient_gbvow"] +interpolation_mode = 2 +offsets = PackedFloat32Array(0, 0.202703, 0.467568, 1) +colors = PackedColorArray(3, 2.4, 0.4, 1, 1, 0.503748, 0.133411, 1, 0.13, 0.13, 0.13, 1, 0, 0, 0, 1) + +[sub_resource type="GradientTexture1D" id="GradientTexture1D_1yld1"] +gradient = SubResource( "Gradient_gbvow" ) +use_hdr = true + +[sub_resource type="Curve" id="Curve_cqj0h"] +_data = [Vector2(0, 0.154545), 0.0, 5.74743, 0, 0, Vector2(0.157761, 0.6), 1.49824, 1.49824, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0] + +[sub_resource type="CurveTexture" id="CurveTexture_n25a7"] +curve = SubResource( "Curve_cqj0h" ) + +[sub_resource type="ParticlesMaterial" id="ParticlesMaterial_pw7km"] +lifetime_randomness = 0.25 +direction = Vector3(0, 0, -1) +spread = 180.0 +gravity = Vector3(0, 0, 0) +initial_velocity_min = 5.0 +initial_velocity_max = 10.0 +angular_velocity_min = -5.0 +angular_velocity_max = 5.0 +damping_min = 20.0 +damping_max = 26.0 +angle_min = -180.0 +angle_max = 180.0 +scale_min = 4.0 +scale_max = 6.0 +scale_curve = SubResource( "CurveTexture_n25a7" ) +color_ramp = SubResource( "GradientTexture1D_1yld1" ) +anim_offset_max = 4.0 +collision_enabled = true +collision_friction = 1.0 +collision_use_scale = true + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_7jypn"] +blend_mode = 1 +shading_mode = 0 +vertex_color_use_as_albedo = true +albedo_texture = ExtResource( "2_pyxv8" ) +texture_filter = 1 +disable_receive_shadows = true +billboard_mode = 3 +particles_anim_h_frames = 2 +particles_anim_v_frames = 2 +particles_anim_loop = false +proximity_fade_enable = true + +[sub_resource type="QuadMesh" id="QuadMesh_hbyxo"] +material = SubResource( "StandardMaterial3D_7jypn" ) + +[sub_resource type="Gradient" id="Gradient_tvekl"] +colors = PackedColorArray(1, 0.911142, 0.0936153, 1, 1, 0.378857, 0.0352274, 1) + +[sub_resource type="GradientTexture1D" id="GradientTexture1D_pamqo"] +gradient = SubResource( "Gradient_tvekl" ) + [sub_resource type="Gradient" id="Gradient_npgj5"] interpolation_mode = 2 -offsets = PackedFloat32Array(0, 0.906977, 1) +offsets = PackedFloat32Array(0, 0.87027, 1) colors = PackedColorArray(32, 32, 32, 1, 8, 8, 8, 1, 0, 0, 0, 1) [sub_resource type="GradientTexture1D" id="GradientTexture1D_7sj32"] @@ -29,6 +88,7 @@ angle_max = 180.0 scale_min = 0.3 scale_max = 0.7 color_ramp = SubResource( "GradientTexture1D_7sj32" ) +color_initial_ramp = SubResource( "GradientTexture1D_pamqo" ) hue_variation_min = -0.03 hue_variation_max = 0.07 anim_offset_max = 4.0 @@ -39,11 +99,10 @@ collision_enabled = true collision_friction = 0.18 collision_bounce = 0.53 -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_xa744"] +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_8hrx8"] blend_mode = 1 shading_mode = 0 vertex_color_use_as_albedo = true -albedo_color = Color(1, 0.890196, 0.239216, 1) albedo_texture = ExtResource( "2_pyxv8" ) texture_filter = 1 disable_receive_shadows = true @@ -52,25 +111,21 @@ particles_anim_h_frames = 2 particles_anim_v_frames = 2 particles_anim_loop = false proximity_fade_distance = 0.1 +distance_fade_min_distance = 25.0 +distance_fade_max_distance = 50.0 -[sub_resource type="QuadMesh" id="QuadMesh_aihhf"] -material = SubResource( "StandardMaterial3D_xa744" ) +[sub_resource type="QuadMesh" id="QuadMesh_opq4v"] +material = SubResource( "StandardMaterial3D_8hrx8" ) -[sub_resource type="Gradient" id="Gradient_s4cup"] +[sub_resource type="Gradient" id="Gradient_65457"] interpolation_mode = 2 offsets = PackedFloat32Array(0, 0.0216998, 0.101266, 0.177215, 0.184448, 1) -colors = PackedColorArray(0, 0, 0, 1, 2, 1.66, 0.88, 1, 1, 0.510755, 0.116048, 1, 0.347656, 0.148293, 0.0503992, 1, 0.117188, 0.117188, 0.117188, 1, 0, 0, 0, 1) +colors = PackedColorArray(0, 0, 0, 1, 2, 1.66, 0.88, 1, 1, 0.510755, 0.116048, 1, 0.347656, 0.148293, 0.0503992, 1, 0.273438, 0.273438, 0.273438, 1, 0, 0, 0, 1) -[sub_resource type="GradientTexture1D" id="GradientTexture1D_1ongl"] -gradient = SubResource( "Gradient_s4cup" ) +[sub_resource type="GradientTexture1D" id="GradientTexture1D_itq0n"] +gradient = SubResource( "Gradient_65457" ) use_hdr = true -[sub_resource type="Curve" id="Curve_xub2l"] -_data = [Vector2(0, 0.154545), 0.0, 1.40979, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0] - -[sub_resource type="CurveTexture" id="CurveTexture_n25a7"] -curve = SubResource( "Curve_xub2l" ) - [sub_resource type="ParticlesMaterial" id="ParticlesMaterial_fp0kq"] lifetime_randomness = 0.25 direction = Vector3(0, 0, -1) @@ -87,7 +142,7 @@ angle_max = 180.0 scale_min = 1.5 scale_max = 2.0 scale_curve = SubResource( "CurveTexture_n25a7" ) -color_ramp = SubResource( "GradientTexture1D_1ongl" ) +color_ramp = SubResource( "GradientTexture1D_itq0n" ) hue_variation_min = -0.01 hue_variation_max = 0.01 anim_offset_max = 4.0 @@ -99,6 +154,7 @@ collision_use_scale = true blend_mode = 1 shading_mode = 0 vertex_color_use_as_albedo = true +albedo_color = Color(0.419608, 0.419608, 0.419608, 1) albedo_texture = ExtResource( "2_pyxv8" ) disable_receive_shadows = true billboard_mode = 3 @@ -106,38 +162,10 @@ particles_anim_h_frames = 2 particles_anim_v_frames = 2 particles_anim_loop = false proximity_fade_enable = true -proximity_fade_distance = 0.25 [sub_resource type="QuadMesh" id="QuadMesh_n7yo0"] material = SubResource( "StandardMaterial3D_eernl" ) -[sub_resource type="GradientTexture1D" id="GradientTexture1D_avcby"] -gradient = SubResource( "Gradient_s4cup" ) -use_hdr = true - -[sub_resource type="ParticlesMaterial" id="ParticlesMaterial_cknm1"] -direction = Vector3(0, 0, -1) -spread = 120.0 -gravity = Vector3(0, 0, 0) -initial_velocity_min = 5.0 -initial_velocity_max = 10.0 -angular_velocity_min = -5.0 -angular_velocity_max = 5.0 -damping_min = 20.0 -damping_max = 26.0 -angle_min = -180.0 -angle_max = 180.0 -scale_min = 7.0 -scale_max = 8.0 -scale_curve = SubResource( "CurveTexture_n25a7" ) -color_ramp = SubResource( "GradientTexture1D_avcby" ) -hue_variation_min = -0.01 -hue_variation_max = 0.01 -anim_offset_max = 4.0 -collision_enabled = true -collision_friction = 1.0 -collision_use_scale = true - [sub_resource type="StandardMaterial3D" id="5"] blend_mode = 1 shading_mode = 0 @@ -184,10 +212,20 @@ tracks/1/keys = { "update": 0, "values": [1.0] } +tracks/2/type = "method" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("OmniLight3D") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(), +"transitions": PackedFloat32Array(), +"values": [] +} [sub_resource type="Animation" id="8"] resource_name = "anim" -length = 0.2 step = 0.05 tracks/0/type = "value" tracks/0/imported = false @@ -196,10 +234,10 @@ tracks/0/path = NodePath("OmniLight3D:light_color") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { -"times": PackedFloat32Array(0, 0.1, 0.2), -"transitions": PackedFloat32Array(1, 1, 1), +"times": PackedFloat32Array(0, 0.45, 1), +"transitions": PackedFloat32Array(0.5, -2, 1), "update": 0, -"values": [Color(1, 0.905882, 0.34902, 1), Color(0.666667, 0.270588, 0, 1), Color(0, 0, 0, 1)] +"values": [Color(1, 0.870588, 0.188235, 1), Color(0.901961, 0.470588, 0.141176, 1), Color(0, 0, 0, 1)] } tracks/1/type = "value" tracks/1/imported = false @@ -208,10 +246,10 @@ tracks/1/path = NodePath("OmniLight3D:light_energy") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/keys = { -"times": PackedFloat32Array(0, 0.2), -"transitions": PackedFloat32Array(0.15932, 1), +"times": PackedFloat32Array(0, 1), +"transitions": PackedFloat32Array(0.0980732, 1), "update": 0, -"values": [3.0, 0.0] +"values": [25.0, 0.0] } tracks/2/type = "method" tracks/2/imported = false @@ -220,7 +258,7 @@ tracks/2/path = NodePath("OmniLight3D") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/keys = { -"times": PackedFloat32Array(0.2), +"times": PackedFloat32Array(1), "transitions": PackedFloat32Array(1), "values": [{ "args": [], @@ -338,6 +376,18 @@ tracks/4/keys = { [node name="Impact" type="Node3D"] script = ExtResource( "1_7cd22" ) +[node name="Explosion" type="GPUParticles3D" parent="."] +layers = 2 +emitting = false +lifetime = 2.0 +one_shot = true +explosiveness = 1.0 +fixed_fps = 0 +local_coords = false +trail_length_secs = 0.72 +process_material = SubResource( "ParticlesMaterial_pw7km" ) +draw_pass_1 = SubResource( "QuadMesh_hbyxo" ) + [node name="Tracers" type="GPUParticles3D" parent="."] layers = 2 emitting = false @@ -351,7 +401,7 @@ fixed_fps = 120 local_coords = false trail_length_secs = 0.66 process_material = SubResource( "ParticlesMaterial_bye5r" ) -draw_pass_1 = SubResource( "QuadMesh_aihhf" ) +draw_pass_1 = SubResource( "QuadMesh_opq4v" ) [node name="Smoke" type="GPUParticles3D" parent="Tracers"] layers = 2 @@ -364,17 +414,6 @@ trail_length_secs = 0.72 process_material = SubResource( "ParticlesMaterial_fp0kq" ) draw_pass_1 = SubResource( "QuadMesh_n7yo0" ) -[node name="Explosion" type="GPUParticles3D" parent="."] -layers = 2 -emitting = false -one_shot = true -explosiveness = 1.0 -fixed_fps = 60 -local_coords = false -trail_length_secs = 0.72 -process_material = SubResource( "ParticlesMaterial_cknm1" ) -draw_pass_1 = SubResource( "QuadMesh_n7yo0" ) - [node name="Timer" type="Timer" parent="."] wait_time = 15.0 @@ -388,10 +427,12 @@ surface_material_override/0 = null transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.369677, 0) light_color = Color(1, 0.929412, 0, 1) light_projector = SubResource( "NoiseTexture_c4len" ) -light_size = 1.0 +light_size = 0.75 +light_specular = 0.2 shadow_enabled = true -omni_range = 15.0 -omni_attenuation = 2.63902 +shadow_blur = 2.0 +omni_range = 25.0 +omni_attenuation = 1.8025 [node name="AnimationPlayer" type="AnimationPlayer" parent="."] autoplay = "anim" @@ -416,11 +457,11 @@ anims/Splat = SubResource( "Animation_55he2" ) [node name="Decal" type="Decal" parent="."] transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0) -extents = Vector3(1.5, 1, 1.5) +extents = Vector3(2, 1, 2) texture_albedo = ExtResource( "5_tp0ly" ) texture_orm = ExtResource( "6_q3tta" ) -upper_fade = 0.00618518 -lower_fade = 0.023084 +upper_fade = 2.66296 +lower_fade = 2.23928 distance_fade_enabled = true distance_fade_begin = 20.0 distance_fade_length = 10.0 diff --git a/Game/Assets/Effects/ImpactSparks.tscn b/Game/Assets/Effects/ImpactSparks.tscn index 4d80ba7..763e0ac 100644 --- a/Game/Assets/Effects/ImpactSparks.tscn +++ b/Game/Assets/Effects/ImpactSparks.tscn @@ -1,37 +1,44 @@ -[gd_scene load_steps=26 format=3 uid="uid://d1yx12uryxl26"] +[gd_scene load_steps=37 format=3 uid="uid://d1yx12uryxl26"] [ext_resource type="Script" path="res://Assets/Effects/Impact.gd" id="1"] [ext_resource type="Texture2D" uid="uid://pnh872qjk0oy" path="res://Assets/Effects/Flame.png" id="2"] +[ext_resource type="Texture2D" uid="uid://djny4vk6xkldu" path="res://Assets/Effects/BloodParticles_albedo.png" id="2_2kvg4"] +[ext_resource type="Texture2D" uid="uid://pobhi2vhmdpc" path="res://Assets/Decals/Blood/BloodSplash_normal.png" id="3_7pgtf"] [ext_resource type="PackedScene" uid="uid://c5cwnfuw4go1b" path="res://Assets/Audio/SoundPlayer.tscn" id="3_oh3bk"] [ext_resource type="Texture2D" uid="uid://cb584onhet4nd" path="res://Assets/Decals/BulletHits/BulletHitConcrete_albedo.png" id="4_6wvg3"] [ext_resource type="AudioStream" uid="uid://c847pi2pieg25" path="res://Assets/SFX/Weapons_BulletHitWall_02.wav" id="4_hrtky"] [ext_resource type="Texture2D" uid="uid://bs08bclmrvacp" path="res://Assets/Decals/BulletHits/BulletHitConcrete_normal.png" id="5_fr6k3"] [ext_resource type="Texture2D" uid="uid://ddncj1g0e27m8" path="res://Assets/Decals/BulletHits/BulletHitConcrete_orm.png" id="6_0nm8w"] -[sub_resource type="Gradient" id="Gradient_npgj5"] +[sub_resource type="Gradient" id="Gradient_r04ti"] +colors = PackedColorArray(1, 0.953311, 0.00532424, 1, 1, 0.411115, 0.0510787, 1) + +[sub_resource type="GradientTexture1D" id="GradientTexture1D_83dg4"] +gradient = SubResource( "Gradient_r04ti" ) + +[sub_resource type="Gradient" id="Gradient_v0chn"] interpolation_mode = 2 -offsets = PackedFloat32Array(0, 0.906977, 1) +offsets = PackedFloat32Array(0, 0.3, 1) colors = PackedColorArray(32, 32, 32, 1, 8, 8, 8, 1, 0, 0, 0, 1) -[sub_resource type="GradientTexture1D" id="GradientTexture1D_7sj32"] -gradient = SubResource( "Gradient_npgj5" ) +[sub_resource type="GradientTexture1D" id="GradientTexture1D_ath7b"] +gradient = SubResource( "Gradient_v0chn" ) use_hdr = true -[sub_resource type="ParticlesMaterial" id="ParticlesMaterial_kt8t6"] +[sub_resource type="ParticlesMaterial" id="ParticlesMaterial_0vkfg"] lifetime_randomness = 1.0 direction = Vector3(0, 0, -1) spread = 50.0 -initial_velocity_min = 2.0 -initial_velocity_max = 6.0 +initial_velocity_min = 3.0 +initial_velocity_max = 8.0 damping_min = 1.25 damping_max = 1.7 angle_min = -180.0 angle_max = 180.0 -scale_min = 0.1 -scale_max = 0.15 -color_ramp = SubResource( "GradientTexture1D_7sj32" ) -hue_variation_min = -0.03 -hue_variation_max = 0.07 +scale_min = 0.05 +scale_max = 0.07 +color_ramp = SubResource( "GradientTexture1D_ath7b" ) +color_initial_ramp = SubResource( "GradientTexture1D_83dg4" ) anim_offset_max = 4.0 sub_emitter_mode = 1 sub_emitter_frequency = 100.0 @@ -40,11 +47,10 @@ collision_enabled = true collision_friction = 0.18 collision_bounce = 0.53 -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_xa744"] +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_8hrx8"] blend_mode = 1 shading_mode = 0 vertex_color_use_as_albedo = true -albedo_color = Color(1, 0.890196, 0.239216, 1) albedo_texture = ExtResource( "2" ) texture_filter = 1 disable_receive_shadows = true @@ -53,31 +59,88 @@ particles_anim_h_frames = 2 particles_anim_v_frames = 2 particles_anim_loop = false proximity_fade_distance = 0.1 +distance_fade_min_distance = 25.0 +distance_fade_max_distance = 50.0 + +[sub_resource type="QuadMesh" id="QuadMesh_opq4v"] +material = SubResource( "StandardMaterial3D_8hrx8" ) + +[sub_resource type="Gradient" id="Gradient_r8cnd"] +colors = PackedColorArray(0.832031, 0.832031, 0.832031, 1, 0.19, 0.19, 0.19, 1) + +[sub_resource type="GradientTexture1D" id="GradientTexture1D_lvjfu"] +gradient = SubResource( "Gradient_r8cnd" ) + +[sub_resource type="Gradient" id="Gradient_33sxj"] +interpolation_mode = 2 +offsets = PackedFloat32Array(0, 0.640541, 1) +colors = PackedColorArray(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0) + +[sub_resource type="GradientTexture1D" id="GradientTexture1D_b2of3"] +gradient = SubResource( "Gradient_33sxj" ) + +[sub_resource type="ParticlesMaterial" id="ParticlesMaterial_5nrer"] +lifetime_randomness = 1.0 +direction = Vector3(0, 0, -1) +spread = 70.0 +initial_velocity_min = 2.0 +initial_velocity_max = 9.0 +damping_min = 1.25 +damping_max = 1.7 +angle_min = -180.0 +angle_max = 180.0 +scale_min = 0.05 +scale_max = 0.07 +color_ramp = SubResource( "GradientTexture1D_b2of3" ) +color_initial_ramp = SubResource( "GradientTexture1D_lvjfu" ) +anim_offset_max = 4.0 +sub_emitter_keep_velocity = true +collision_enabled = true +collision_friction = 0.18 +collision_bounce = 0.53 + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_o1rug"] +transparency = 1 +vertex_color_use_as_albedo = true +albedo_texture = ExtResource( "2_2kvg4" ) +roughness = 0.48 +normal_enabled = true +normal_texture = ExtResource( "3_7pgtf" ) +texture_filter = 1 +disable_receive_shadows = true +billboard_mode = 3 +particles_anim_h_frames = 2 +particles_anim_v_frames = 2 +particles_anim_loop = false +proximity_fade_distance = 0.1 +distance_fade_min_distance = 25.0 +distance_fade_max_distance = 50.0 [sub_resource type="QuadMesh" id="QuadMesh_aihhf"] -material = SubResource( "StandardMaterial3D_xa744" ) +material = SubResource( "StandardMaterial3D_o1rug" ) -[sub_resource type="Gradient" id="Gradient_s4cup"] +[sub_resource type="Gradient" id="Gradient_f4fk5"] interpolation_mode = 2 -offsets = PackedFloat32Array(0, 0.0216998, 0.101266, 0.177215, 0.184448, 1) -colors = PackedColorArray(0, 0, 0, 1, 2, 1.66, 0.88, 1, 1, 0.510755, 0.116048, 1, 0.347656, 0.148293, 0.0503992, 1, 0.117188, 0.117188, 0.117188, 1, 0, 0, 0, 1) +offsets = PackedFloat32Array(0, 0.00810811, 0.0216216, 1) +colors = PackedColorArray(0, 0, 0, 1, 0.757812, 0.323246, 0.109859, 1, 0.15625, 0.15625, 0.15625, 1, 0, 0, 0, 1) [sub_resource type="GradientTexture1D" id="GradientTexture1D_avcby"] -gradient = SubResource( "Gradient_s4cup" ) +gradient = SubResource( "Gradient_f4fk5" ) use_hdr = true [sub_resource type="Curve" id="Curve_xub2l"] -_data = [Vector2(0, 0.154545), 0.0, 1.40979, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0] +_data = [Vector2(0, 0.218182), 0.0, 0.279119, 0, 0, Vector2(0.188295, 0.481818), 1.97776, 1.97776, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0] -[sub_resource type="CurveTexture" id="CurveTexture_n25a7"] +[sub_resource type="CurveTexture" id="CurveTexture_fi5k6"] curve = SubResource( "Curve_xub2l" ) -[sub_resource type="ParticlesMaterial" id="ParticlesMaterial_cknm1"] +[sub_resource type="ParticlesMaterial" id="ParticlesMaterial_n8w51"] +lifetime_randomness = 0.4 direction = Vector3(0, 0, -1) -spread = 120.0 +spread = 70.0 gravity = Vector3(0, 0, 0) -initial_velocity_min = 5.0 -initial_velocity_max = 10.0 +initial_velocity_min = 2.0 +initial_velocity_max = 6.0 angular_velocity_min = -5.0 angular_velocity_max = 5.0 damping_min = 20.0 @@ -86,7 +149,7 @@ angle_min = -180.0 angle_max = 180.0 scale_min = 7.0 scale_max = 8.0 -scale_curve = SubResource( "CurveTexture_n25a7" ) +scale_curve = SubResource( "CurveTexture_fi5k6" ) color_ramp = SubResource( "GradientTexture1D_avcby" ) hue_variation_min = -0.01 hue_variation_max = 0.01 @@ -99,6 +162,7 @@ collision_use_scale = true blend_mode = 1 shading_mode = 0 vertex_color_use_as_albedo = true +albedo_color = Color(0.419608, 0.419608, 0.419608, 1) albedo_texture = ExtResource( "2" ) disable_receive_shadows = true billboard_mode = 3 @@ -106,7 +170,6 @@ particles_anim_h_frames = 2 particles_anim_v_frames = 2 particles_anim_loop = false proximity_fade_enable = true -proximity_fade_distance = 0.25 [sub_resource type="QuadMesh" id="QuadMesh_n7yo0"] material = SubResource( "StandardMaterial3D_eernl" ) @@ -148,6 +211,17 @@ tracks/1/keys = { "update": 0, "values": [1.0] } +tracks/2/type = "method" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("OmniLight3D") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(), +"transitions": PackedFloat32Array(), +"values": [] +} [sub_resource type="Animation" id="8"] resource_name = "anim" @@ -175,7 +249,7 @@ tracks/1/keys = { "times": PackedFloat32Array(0, 0.2), "transitions": PackedFloat32Array(0.15932, 1), "update": 0, -"values": [3.0, 0.0] +"values": [6.0, 0.0] } tracks/2/type = "method" tracks/2/imported = false @@ -305,14 +379,28 @@ script = ExtResource( "1" ) [node name="Sparks" type="GPUParticles3D" parent="."] layers = 2 emitting = false +amount = 12 lifetime = 0.33 one_shot = true explosiveness = 1.0 randomness = 0.5 fixed_fps = 120 local_coords = false -trail_length_secs = 0.15 -process_material = SubResource( "ParticlesMaterial_kt8t6" ) +trail_length_secs = 0.5 +process_material = SubResource( "ParticlesMaterial_0vkfg" ) +draw_pass_1 = SubResource( "QuadMesh_opq4v" ) + +[node name="Dust" type="GPUParticles3D" parent="."] +layers = 2 +emitting = false +amount = 48 +one_shot = true +explosiveness = 1.0 +randomness = 0.5 +fixed_fps = 0 +local_coords = false +trail_length_secs = 0.5 +process_material = SubResource( "ParticlesMaterial_5nrer" ) draw_pass_1 = SubResource( "QuadMesh_aihhf" ) [node name="Smoke" type="GPUParticles3D" parent="."] @@ -322,11 +410,11 @@ amount = 3 lifetime = 2.0 one_shot = true explosiveness = 1.0 -fixed_fps = 60 +fixed_fps = 0 local_coords = false transform_align = 2 trail_length_secs = 0.72 -process_material = SubResource( "ParticlesMaterial_cknm1" ) +process_material = SubResource( "ParticlesMaterial_n8w51" ) draw_pass_1 = SubResource( "QuadMesh_n7yo0" ) [node name="Timer" type="Timer" parent="."] diff --git a/Game/Assets/Effects/MuzzleFlash.tscn b/Game/Assets/Effects/MuzzleFlash.tscn index 59536ae..4304f8e 100644 --- a/Game/Assets/Effects/MuzzleFlash.tscn +++ b/Game/Assets/Effects/MuzzleFlash.tscn @@ -1,17 +1,17 @@ [gd_scene load_steps=10 format=3 uid="uid://ikiqohjvlqni"] [ext_resource type="Script" path="res://Assets/Weapons/Handgun/Flash.gd" id="1_ob70b"] -[ext_resource type="Texture2D" uid="uid://cguy76rs8e220" path="res://Assets/Effects/Flame.png" id="2_1simy"] +[ext_resource type="Texture2D" uid="uid://pnh872qjk0oy" path="res://Assets/Effects/Flame.png" id="2_1simy"] [sub_resource type="Animation" id="1"] length = 0.1 step = 0.025 tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true tracks/0/path = NodePath("OmniLight3D:light_color") tracks/0/interp = 1 tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true tracks/0/keys = { "times": PackedFloat32Array(0, 0.025, 0.05, 0.1), "transitions": PackedFloat32Array(1, 1, 1, 1), @@ -25,11 +25,11 @@ length = 0.001 [sub_resource type="Animation" id="3"] length = 0.001 tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true tracks/0/path = NodePath("OmniLight3D:light_color") tracks/0/interp = 1 tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true tracks/0/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), @@ -67,8 +67,6 @@ autoplay = "Off" anims/Flash = SubResource( "1" ) anims/Off = SubResource( "2" ) anims/RESET = SubResource( "3" ) -blend_times = [] -script = null [node name="CPUParticles3D" type="CPUParticles3D" parent="."] emitting = false @@ -89,22 +87,19 @@ angle_max = 180.0 scale_amount_curve = SubResource( "8" ) color_ramp = SubResource( "9" ) anim_offset_max = 1.0 -script = null [node name="Timer" type="Timer" parent="."] wait_time = 0.1 one_shot = true autostart = true -script = null [node name="OmniLight3D" type="OmniLight3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.160545, 0) light_energy = 5.0 +light_size = 0.25 light_bake_mode = 0 shadow_enabled = true -shadow_blur = 8.0 omni_range = 100.0 omni_attenuation = 4.0 -script = null [connection signal="timeout" from="Timer" to="." method="_on_Timer_timeout"]