Ver código fonte

Improve particles and VFX, add blob shadow below player and enemies (#180)

- Add projector light textures.
- Tweak the flying forklift's dynamic light and particles to be more noticeable.
- Add bullet impact particles with collision against level geometry
  (using a generated SDF).
- Don't use fixed FPS and disable interpolation to make particles smoother
  (trails aren't used, so fixed FPS isn't strictly needed).
- Add proximity fade to some particles to smooth out the transition
  with solid geometry.
- Fix some particles being shaded when they should be unshaded.
- Reduce crosshair size to be more subtle while aiming.
Hugo Locurcio 1 ano atrás
pai
commit
241b450ed6

+ 12 - 0
effects_shared/blob_shadow.tres

@@ -0,0 +1,12 @@
+[gd_resource type="GradientTexture2D" load_steps=2 format=3 uid="uid://8d78kbpqjumj"]
+
+[sub_resource type="Gradient" id="Gradient_m6m55"]
+interpolation_mode = 2
+offsets = PackedFloat32Array(0, 0.2, 1)
+colors = PackedColorArray(0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0)
+
+[resource]
+gradient = SubResource("Gradient_m6m55")
+fill = 1
+fill_from = Vector2(0.5, 0.5)
+fill_to = Vector2(0.5, 0.01)

BIN
effects_shared/spotlight_projector.png


+ 34 - 0
effects_shared/spotlight_projector.png.import

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

BIN
enemies/red_robot/laser/BarrelSmoke_Plane.mesh


+ 1 - 4
enemies/red_robot/parts/sparks_effect/SparkMaterial.tres

@@ -1,10 +1,7 @@
-[gd_resource type="ShaderMaterial" load_steps=3 format=3 uid="uid://b0yi1uf4xb6ex"]
+[gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://b0yi1uf4xb6ex"]
 
-[ext_resource type="Texture2D" uid="uid://ic4gy2igsmd4" path="res://enemies/red_robot/parts/sparks_effect/SparkTexture.png" id="1"]
 [ext_resource type="Shader" path="res://enemies/red_robot/parts/sparks_effect/SparkShader.gdshader" id="2"]
 
 [resource]
 render_priority = 0
 shader = ExtResource("2")
-shader_parameter/emission_factor = 3.0
-shader_parameter/alpha_texture = ExtResource("1")

BIN
enemies/red_robot/parts/sparks_effect/SparkParticle_Sphere.mesh


Diferenças do arquivo suprimidas por serem muito extensas
+ 4156 - 1
enemies/red_robot/red_robot.tscn


+ 4 - 0
level/forklift/flying_forklift.gd

@@ -1,7 +1,11 @@
 extends Node3D
 
+@onready var spot_light = $SpotLight3D
 
 func _ready():
+	if not Settings.config_file.get_value("rendering", "shadow_mapping"):
+		spot_light.shadow_enabled = false
+
 	# Randomize the forklift model.
 	# We have 3 models, may as well use them.
 	randomize()

+ 44 - 28
level/forklift/flying_forklift.tscn

@@ -1,8 +1,9 @@
-[gd_scene load_steps=8 format=3 uid="uid://dln4kthc3tvfv"]
+[gd_scene load_steps=10 format=3 uid="uid://dln4kthc3tvfv"]
 
 [ext_resource type="PackedScene" uid="uid://b3kcdt0p1pr74" path="res://level/forklift/flying_forklift.glb" id="1"]
 [ext_resource type="Texture2D" uid="uid://8lj2sib517fx" path="res://level/forklift/dot.png" id="2"]
 [ext_resource type="Script" path="res://level/forklift/flying_forklift.gd" id="3"]
+[ext_resource type="Texture2D" uid="uid://biye81cs18sdp" path="res://effects_shared/spotlight_projector.png" id="4_47076"]
 
 [sub_resource type="BoxShape3D" id="1"]
 size = Vector3(4, 2, 8)
@@ -16,6 +17,7 @@ vertex_color_is_srgb = true
 albedo_color = Color(1, 1, 1, 0.176471)
 albedo_texture = ExtResource("2")
 billboard_mode = 3
+billboard_keep_scale = true
 particles_anim_h_frames = 1
 particles_anim_v_frames = 1
 particles_anim_loop = false
@@ -23,8 +25,13 @@ particles_anim_loop = false
 [sub_resource type="QuadMesh" id="3"]
 material = SubResource("2")
 
+[sub_resource type="Curve" id="Curve_bs8xw"]
+_data = [Vector2(0, 0.3), 0.0, 0.0, 0, 0, Vector2(0.2, 0.8), 0.0, 0.0, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0]
+point_count = 3
+
 [sub_resource type="Gradient" id="4"]
-colors = PackedColorArray(0, 1, 0.976562, 1, 1, 1, 1, 0)
+offsets = PackedFloat32Array(0, 0.1, 0.3, 1)
+colors = PackedColorArray(0.0431373, 0.458824, 1, 1, 0.42, 0.874333, 1, 0.858824, 0.945098, 0.627451, 1, 0.411765, 0.12549, 0.25098, 1, 0)
 
 [node name="FlyingForklift" type="CharacterBody3D"]
 script = ExtResource("3")
@@ -41,70 +48,79 @@ visible = false
 shape = SubResource("1")
 
 [node name="Particles1" type="CPUParticles3D" parent="."]
-transform = Transform3D(-1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, 0.471727, -0.377269, -3.29514)
-amount = 16
+transform = Transform3D(-1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, 0.471727, -0.277269, -2.89514)
+amount = 20
 lifetime = 0.5
-fixed_fps = 60
-fract_delta = false
 mesh = SubResource("3")
+emission_shape = 1
+emission_sphere_radius = 0.1
 direction = Vector3(0, 0, 1)
-spread = 0.0
-gravity = Vector3(0, 0, 0)
+spread = 10.0
+gravity = Vector3(0, 6, 0)
 initial_velocity_min = 3.0
 initial_velocity_max = 3.0
 angular_velocity_max = 360.0
+scale_amount_curve = SubResource("Curve_bs8xw")
 color_ramp = SubResource("4")
 
 [node name="Particles2" type="CPUParticles3D" parent="."]
-transform = Transform3D(-1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, -0.501376, -0.377269, -3.29514)
-amount = 16
+transform = Transform3D(-1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, -0.501376, -0.277269, -2.89514)
+amount = 20
 lifetime = 0.5
-fixed_fps = 60
-fract_delta = false
 mesh = SubResource("3")
+emission_shape = 1
+emission_sphere_radius = 0.1
 direction = Vector3(0, 0, 1)
-spread = 0.0
-gravity = Vector3(0, 0, 0)
+spread = 10.0
+gravity = Vector3(0, 6, 0)
 initial_velocity_min = 3.0
 initial_velocity_max = 3.0
 angular_velocity_max = 360.0
+scale_amount_curve = SubResource("Curve_bs8xw")
 color_ramp = SubResource("4")
 
 [node name="Particles3" type="CPUParticles3D" parent="."]
-transform = Transform3D(-1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, 1.42691, -0.514244, -2.88934)
-amount = 16
+transform = Transform3D(-1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, 1.42691, -0.414244, -2.48934)
+amount = 20
 lifetime = 0.5
-fixed_fps = 60
-fract_delta = false
 mesh = SubResource("3")
+emission_shape = 1
+emission_sphere_radius = 0.1
 direction = Vector3(0, 0, 1)
-spread = 0.0
-gravity = Vector3(0, 0, 0)
+spread = 10.0
+gravity = Vector3(0, 6, 0)
 initial_velocity_min = 3.0
 initial_velocity_max = 3.0
 angular_velocity_max = 360.0
+scale_amount_curve = SubResource("Curve_bs8xw")
 color_ramp = SubResource("4")
 
 [node name="Particles4" type="CPUParticles3D" parent="."]
-transform = Transform3D(-1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, -1.33273, -0.514244, -2.88934)
-amount = 16
+transform = Transform3D(-1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, -1.33273, -0.414244, -2.48934)
+amount = 20
 lifetime = 0.5
-fixed_fps = 60
-fract_delta = false
 mesh = SubResource("3")
+emission_shape = 1
+emission_sphere_radius = 0.1
 direction = Vector3(0, 0, 1)
-spread = 0.0
-gravity = Vector3(0, 0, 0)
+spread = 10.0
+gravity = Vector3(0, 6, 0)
 initial_velocity_min = 3.0
 initial_velocity_max = 3.0
 angular_velocity_max = 360.0
+scale_amount_curve = SubResource("Curve_bs8xw")
 color_ramp = SubResource("4")
 
 [node name="SpotLight3D" type="SpotLight3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, -0.819152, 0.573576, 0, -0.573576, -0.819152, 0, 0.181815, 4.10661)
+light_color = Color(0.439216, 0.752941, 1, 1)
+light_energy = 12.0
+light_volumetric_fog_energy = 10000.0
+light_projector = ExtResource("4_47076")
 light_bake_mode = 0
 shadow_enabled = true
-spot_range = 7.70138
-spot_angle = 22.7554
+shadow_blur = 0.5
+spot_range = 50.0
+spot_angle = 50.0
 
 [editable path="FlyingForkliftModel2"]

+ 1 - 1
level/geometry/environment.tres

@@ -31,6 +31,6 @@ fog_light_color = Color(0.4, 0.25098, 0.101961, 1)
 fog_density = 0.002
 volumetric_fog_density = 0.0001
 volumetric_fog_gi_inject = 0.0
-volumetric_fog_temporal_reprojection_enabled = false
+volumetric_fog_temporal_reprojection_amount = 0.85
 adjustment_enabled = true
 adjustment_saturation = 1.4

+ 0 - 3
level/geometry/scenes/core.tscn

@@ -197,9 +197,6 @@ size = Vector3(1.2, 1.2, 2.8)
 
 [node name="CoreModel" parent="." instance=ExtResource("3")]
 
-[node name="Sphere001" parent="CoreModel" index="105"]
-visible = false
-
 [node name="Plasma" type="CPUParticles3D" parent="."]
 transform = Transform3D(5, 0, 0, 0, 5, 0, 0, 0, 5, 0, -2.3, 0)
 material_override = SubResource("12")

+ 54 - 27
level/geometry/scenes/lights.tscn

@@ -1,6 +1,7 @@
-[gd_scene load_steps=2 format=3 uid="uid://dgvowmn3iop44"]
+[gd_scene load_steps=3 format=3 uid="uid://dgvowmn3iop44"]
 
 [ext_resource type="PackedScene" uid="uid://y2c4qh77xij5" path="res://level/geometry/models/lights.glb" id="1"]
+[ext_resource type="Texture2D" uid="uid://biye81cs18sdp" path="res://effects_shared/spotlight_projector.png" id="2_fkvu6"]
 
 [node name="LightsModel" instance=ExtResource("1")]
 
@@ -13,119 +14,145 @@ omni_range = 25.0
 
 [node name="Spot_010_Orientation" parent="Spot_010" index="0"]
 light_color = Color(1, 1, 1, 1)
-light_energy = 12.0
-light_volumetric_fog_energy = 10000.0
+light_energy = 24.0
+light_volumetric_fog_energy = 5000.0
+light_projector = ExtResource("2_fkvu6")
 light_bake_mode = 1
 shadow_enabled = true
 spot_range = 25.0
+spot_angle = 30.0
 spot_angle_attenuation = 2.0
 
 [node name="Spot_009_Orientation" parent="Spot_009" index="0"]
 light_color = Color(1, 1, 1, 1)
-light_energy = 12.0
-light_volumetric_fog_energy = 10000.0
+light_energy = 24.0
+light_volumetric_fog_energy = 5000.0
+light_projector = ExtResource("2_fkvu6")
 light_bake_mode = 1
 shadow_enabled = true
 spot_range = 25.0
+spot_angle = 30.0
 spot_angle_attenuation = 2.0
 
 [node name="Spot_008_Orientation" parent="Spot_008" index="0"]
 light_color = Color(1, 1, 1, 1)
-light_energy = 12.0
-light_volumetric_fog_energy = 10000.0
+light_energy = 24.0
+light_volumetric_fog_energy = 5000.0
+light_projector = ExtResource("2_fkvu6")
 light_bake_mode = 1
 shadow_enabled = true
 spot_range = 25.0
+spot_angle = 30.0
 spot_angle_attenuation = 2.0
 
 [node name="Spot_007_Orientation" parent="Spot_007" index="0"]
 light_color = Color(1, 1, 1, 1)
-light_energy = 12.0
-light_volumetric_fog_energy = 10000.0
+light_energy = 24.0
+light_volumetric_fog_energy = 5000.0
+light_projector = ExtResource("2_fkvu6")
 light_bake_mode = 1
 shadow_enabled = true
 spot_range = 25.0
+spot_angle = 30.0
 spot_angle_attenuation = 2.0
 
 [node name="Spot_006_Orientation" parent="Spot_006" index="0"]
 light_color = Color(1, 1, 1, 1)
-light_energy = 12.0
-light_volumetric_fog_energy = 10000.0
+light_energy = 24.0
+light_volumetric_fog_energy = 5000.0
+light_projector = ExtResource("2_fkvu6")
 light_bake_mode = 1
 shadow_enabled = true
 spot_range = 25.0
+spot_angle = 30.0
 spot_angle_attenuation = 2.0
 
 [node name="Spot_005_Orientation" parent="Spot_005" index="0"]
 light_color = Color(1, 1, 1, 1)
-light_energy = 12.0
-light_volumetric_fog_energy = 10000.0
+light_energy = 24.0
+light_volumetric_fog_energy = 5000.0
+light_projector = ExtResource("2_fkvu6")
 light_bake_mode = 1
 shadow_enabled = true
 spot_range = 25.0
+spot_angle = 30.0
 spot_angle_attenuation = 2.0
 
 [node name="Spot_004_Orientation" parent="Spot_004" index="0"]
 light_color = Color(1, 1, 1, 1)
-light_energy = 12.0
-light_volumetric_fog_energy = 10000.0
+light_energy = 24.0
+light_volumetric_fog_energy = 5000.0
+light_projector = ExtResource("2_fkvu6")
 light_bake_mode = 1
 shadow_enabled = true
 spot_range = 25.0
+spot_angle = 30.0
 spot_angle_attenuation = 2.0
 
 [node name="Spot_003_Orientation" parent="Spot_003" index="0"]
 light_color = Color(1, 1, 1, 1)
-light_energy = 12.0
-light_volumetric_fog_energy = 10000.0
+light_energy = 24.0
+light_volumetric_fog_energy = 5000.0
+light_projector = ExtResource("2_fkvu6")
 light_bake_mode = 1
 shadow_enabled = true
 spot_range = 25.0
+spot_angle = 30.0
 spot_angle_attenuation = 2.0
 
 [node name="Spot_002_Orientation" parent="Spot_002" index="0"]
 light_color = Color(1, 1, 1, 1)
-light_energy = 12.0
-light_volumetric_fog_energy = 10000.0
+light_energy = 24.0
+light_volumetric_fog_energy = 5000.0
+light_projector = ExtResource("2_fkvu6")
 light_bake_mode = 1
 shadow_enabled = true
 spot_range = 25.0
+spot_angle = 30.0
 spot_angle_attenuation = 2.0
 
 [node name="Spot_001_Orientation" parent="Spot_001" index="0"]
 light_color = Color(1, 1, 1, 1)
-light_energy = 12.0
-light_volumetric_fog_energy = 10000.0
+light_energy = 24.0
+light_volumetric_fog_energy = 5000.0
+light_projector = ExtResource("2_fkvu6")
 light_bake_mode = 1
 shadow_enabled = true
 spot_range = 25.0
+spot_angle = 30.0
 spot_angle_attenuation = 2.0
 
 [node name="Spot_000_Orientation" parent="Spot_000" index="0"]
 light_color = Color(1, 1, 1, 1)
-light_energy = 12.0
-light_volumetric_fog_energy = 10000.0
+light_energy = 24.0
+light_volumetric_fog_energy = 5000.0
+light_projector = ExtResource("2_fkvu6")
 light_bake_mode = 1
 shadow_enabled = true
 spot_range = 25.0
+spot_angle = 30.0
 spot_angle_attenuation = 2.0
 
 [node name="Spot_013_Orientation" parent="Spot_013" index="0"]
 light_color = Color(1, 1, 1, 1)
-light_energy = 12.0
-light_volumetric_fog_energy = 10000.0
+light_energy = 24.0
+light_volumetric_fog_energy = 5000.0
+light_projector = ExtResource("2_fkvu6")
 light_bake_mode = 1
 shadow_enabled = true
 spot_range = 25.0
+spot_angle = 30.0
 spot_angle_attenuation = 2.0
 
 [node name="Spot_012_Orientation" parent="Spot_012" index="0"]
 light_color = Color(1, 1, 1, 1)
-light_energy = 12.0
-light_volumetric_fog_energy = 10000.0
+light_energy = 24.0
+light_volumetric_fog_energy = 5000.0
+light_projector = ExtResource("2_fkvu6")
 light_bake_mode = 1
 shadow_enabled = true
 spot_range = 25.0
+spot_angle = 30.0
 spot_angle_attenuation = 2.0
 
 [node name="Point_010_Orientation" parent="Point_010" index="0"]

BIN
level/level.GPUParticlesCollisionSDF3D_data.exr


+ 26 - 0
level/level.GPUParticlesCollisionSDF3D_data.exr.import

@@ -0,0 +1,26 @@
+[remap]
+
+importer="3d_texture"
+type="CompressedTexture3D"
+uid="uid://b2x2pkclq230n"
+path="res://.godot/imported/level.GPUParticlesCollisionSDF3D_data.exr-f48cddafd6a1fc6fdf7e42a99134c74e.ctex3d"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://level/level.GPUParticlesCollisionSDF3D_data.exr"
+dest_files=["res://.godot/imported/level.GPUParticlesCollisionSDF3D_data.exr-f48cddafd6a1fc6fdf7e42a99134c74e.ctex3d"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/channel_pack=1
+mipmaps/generate=false
+mipmaps/limit=-1
+slices/horizontal=1
+slices/vertical=256

+ 8 - 1
level/level.tscn

@@ -1,10 +1,11 @@
-[gd_scene load_steps=14 format=3 uid="uid://b51qillnxp84r"]
+[gd_scene load_steps=15 format=3 uid="uid://b51qillnxp84r"]
 
 [ext_resource type="Script" path="res://level/level.gd" id="1"]
 [ext_resource type="PackedScene" uid="uid://bpihm2o3g658" path="res://level/geometry/scenes/props.tscn" id="2"]
 [ext_resource type="VoxelGIData" uid="uid://bw86lhn5p1ovp" path="res://level/geometry/giprobe_data.res" id="5"]
 [ext_resource type="AudioStream" uid="uid://vxxm8xm1fr6y" path="res://level/level_music.ogg" id="8"]
 [ext_resource type="Script" path="res://level/debug.gd" id="9"]
+[ext_resource type="CompressedTexture3D" uid="uid://b2x2pkclq230n" path="res://level/level.GPUParticlesCollisionSDF3D_data.exr" id="11_mt3nw"]
 [ext_resource type="PackedScene" uid="uid://dln4kthc3tvfv" path="res://level/forklift/flying_forklift.tscn" id="12"]
 [ext_resource type="PackedScene" uid="uid://dgvowmn3iop44" path="res://level/geometry/scenes/lights.tscn" id="13"]
 [ext_resource type="PackedScene" uid="uid://ddbnmy6um5fjg" path="res://level/geometry/scenes/core.tscn" id="14"]
@@ -257,3 +258,9 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.6666, -10.2858, -15.6046)
 
 [node name="LightmapProbe32" type="LightmapProbe" parent="LightmapProbes"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -19.3694, -10.2858, 7.23363)
+
+[node name="GPUParticlesCollisionSDF3D" type="GPUParticlesCollisionSDF3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 26.1415, 0, 31.955)
+size = Vector3(140, 40, 140)
+resolution = 4
+texture = ExtResource("11_mt3nw")

+ 6 - 0
player/bullet/bullet.gd

@@ -7,6 +7,7 @@ var hit = false
 
 @onready var animation_player = $AnimationPlayer
 @onready var collision_shape = $CollisionShape3D
+@onready var omni_light = $OmniLight3D
 
 func _ready():
 	if not multiplayer.is_server():
@@ -35,6 +36,11 @@ func _physics_process(delta):
 func explode():
 	animation_player.play("explode")
 
+	# Only enable shadows for the explosion, as the moving light
+	# is very small and doesn't noticeably benefit from shadow mapping.
+	if Settings.config_file.get_value("rendering", "shadow_mapping"):
+		omni_light.shadow_enabled = true
+
 
 func destroy():
 	if not multiplayer.is_server():

+ 138 - 56
player/bullet/bullet.tscn

@@ -6,13 +6,16 @@
 [ext_resource type="Material" uid="uid://bxjcw6j767jtn" path="res://player/bullet/effect/BlastMaterial.tres" id="4"]
 [ext_resource type="Material" path="res://player/bullet/effect/light_rays_material.tres" id="5"]
 [ext_resource type="Texture2D" uid="uid://d17qvns23fvuv" path="res://player/bullet/blue_myst.png" id="8"]
-[ext_resource type="Material" path="res://player/bullet/bullet_material.tres" id="9"]
+[ext_resource type="Material" uid="uid://byb8a73wgvytk" path="res://player/bullet/bullet_material.tres" id="9"]
 
 [sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_peqai"]
 properties/0/path = NodePath(".:global_transform")
 properties/0/spawn = true
 properties/0/replication_mode = 1
 
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ffosa"]
+shading_mode = 0
+
 [sub_resource type="SphereMesh" id="SphereMesh_ku2wu"]
 radial_segments = 9
 rings = 5
@@ -22,7 +25,7 @@ radius = 0.170413
 
 [sub_resource type="Animation" id="Animation_8lnsf"]
 resource_name = "explode"
-length = 3.0
+length = 1.6
 step = 0.05
 tracks/0/type = "value"
 tracks/0/imported = false
@@ -31,7 +34,7 @@ tracks/0/path = NodePath("OmniLight3D:light_energy")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/keys = {
-"times": PackedFloat32Array(0, 0.25, 0.85),
+"times": PackedFloat32Array(0, 0.25, 0.7),
 "transitions": PackedFloat32Array(1, 1, 1),
 "update": 0,
 "values": [1.5, 3.0, 0.0]
@@ -81,7 +84,7 @@ tracks/4/path = NodePath("ExplosionAudio:playing")
 tracks/4/interp = 1
 tracks/4/loop_wrap = true
 tracks/4/keys = {
-"times": PackedFloat32Array(0.1),
+"times": PackedFloat32Array(0.01),
 "transitions": PackedFloat32Array(1),
 "update": 1,
 "values": [true]
@@ -129,7 +132,7 @@ tracks/8/path = NodePath("Blast/Smoke:emitting")
 tracks/8/interp = 1
 tracks/8/loop_wrap = true
 tracks/8/keys = {
-"times": PackedFloat32Array(0.2),
+"times": PackedFloat32Array(0),
 "transitions": PackedFloat32Array(1),
 "update": 1,
 "values": [true]
@@ -141,7 +144,7 @@ tracks/9/path = NodePath("Blast/LightParticle:emitting")
 tracks/9/interp = 1
 tracks/9/loop_wrap = true
 tracks/9/keys = {
-"times": PackedFloat32Array(0.05),
+"times": PackedFloat32Array(0),
 "transitions": PackedFloat32Array(1),
 "update": 1,
 "values": [true]
@@ -170,9 +173,73 @@ tracks/11/keys = {
 "update": 1,
 "values": [false]
 }
+tracks/12/type = "value"
+tracks/12/imported = false
+tracks/12/enabled = true
+tracks/12/path = NodePath("OmniLight3D:omni_range")
+tracks/12/interp = 1
+tracks/12/loop_wrap = true
+tracks/12/keys = {
+"times": PackedFloat32Array(0, 0.85),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [3.0, 0.0]
+}
+
+[sub_resource type="Animation" id="Animation_gjuvs"]
+length = 0.001
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("OmniLight3D:omni_range")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [1.5]
+}
+tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("BulletBody/MainBody:emitting")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 1,
+"values": [true]
+}
+tracks/2/type = "value"
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/path = NodePath("BulletBody/Trail:emitting")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 1,
+"values": [true]
+}
+tracks/3/type = "value"
+tracks/3/imported = false
+tracks/3/enabled = true
+tracks/3/path = NodePath("MeshInstance3D:visible")
+tracks/3/interp = 1
+tracks/3/loop_wrap = true
+tracks/3/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 1,
+"values": [true]
+}
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_dbep6"]
 _data = {
+"RESET": SubResource("Animation_gjuvs"),
 "explode": SubResource("Animation_8lnsf")
 }
 
@@ -276,15 +343,17 @@ height = 0.06
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_1bio2"]
 transparency = 1
-cull_mode = 2
+shading_mode = 0
 vertex_color_use_as_albedo = true
-albedo_color = Color(0.701961, 0.701961, 0.701961, 0.560784)
+albedo_color = Color(0.12549, 0.627451, 1, 0.560784)
 albedo_texture = ExtResource("8")
 billboard_mode = 3
 billboard_keep_scale = true
 particles_anim_h_frames = 1
 particles_anim_v_frames = 1
 particles_anim_loop = false
+proximity_fade_enabled = true
+proximity_fade_distance = 0.25
 
 [sub_resource type="Curve" id="Curve_s4ylr"]
 min_value = -1.0
@@ -295,17 +364,15 @@ point_count = 2
 width = 128
 curve = SubResource("Curve_s4ylr")
 
-[sub_resource type="Gradient" id="Gradient_je0no"]
-offsets = PackedFloat32Array(0, 0.918519)
-colors = PackedColorArray(1, 1, 1, 0.8, 0, 0.309753, 0.792969, 0.0196078)
+[sub_resource type="Gradient" id="Gradient_2kcl1"]
+colors = PackedColorArray(1, 1, 1, 1, 1, 1, 1, 0)
 
-[sub_resource type="GradientTexture2D" id="GradientTexture2D_hfu4w"]
-gradient = SubResource("Gradient_je0no")
-width = 128
+[sub_resource type="GradientTexture1D" id="GradientTexture1D_kbdte"]
+gradient = SubResource("Gradient_2kcl1")
 
 [sub_resource type="Curve" id="Curve_5e7et"]
-_data = [Vector2(0, 0), 0.0, 0.0, 0, 0, Vector2(0.14557, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), -3.50114, 0.0, 0, 0]
-point_count = 3
+_data = [Vector2(0, 0), 0.0, 0.0, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0]
+point_count = 2
 
 [sub_resource type="CurveTexture" id="CurveTexture_v5ggx"]
 width = 128
@@ -313,11 +380,21 @@ curve = SubResource("Curve_5e7et")
 
 [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_rdv14"]
 emission_shape = 1
-emission_sphere_radius = 0.4
+emission_sphere_radius = 0.1
+angle_max = 360.0
+direction = Vector3(0, 1, 0)
+spread = 180.0
+initial_velocity_max = 2.0
 angular_velocity_curve = SubResource("CurveTexture_160ax")
-gravity = Vector3(0, 2, 0)
+radial_velocity_min = 1.0
+radial_velocity_max = 1.0
+gravity = Vector3(0, 0, 0)
+scale_min = 0.01
+scale_max = 0.2
 scale_curve = SubResource("CurveTexture_v5ggx")
-color_ramp = SubResource("GradientTexture2D_hfu4w")
+color = Color(0.752941, 0.752941, 0.752941, 0.501961)
+color_ramp = SubResource("GradientTexture1D_kbdte")
+hue_variation_min = -0.2
 
 [sub_resource type="QuadMesh" id="QuadMesh_e01jp"]
 size = Vector2(2, 2)
@@ -328,17 +405,8 @@ emission_enabled = true
 emission = Color(0, 0.486275, 1, 1)
 emission_energy_multiplier = 4.0
 
-[sub_resource type="Curve" id="Curve_68ic0"]
-min_value = -1.0
-_data = [Vector2(0, 0.0181819), 0.0, 0.0, 0, 0, Vector2(1, -0.745454), 0.0, 0.0, 0, 0]
-point_count = 2
-
-[sub_resource type="CurveTexture" id="CurveTexture_rplrp"]
-width = 128
-curve = SubResource("Curve_68ic0")
-
 [sub_resource type="Curve" id="Curve_ecfbn"]
-_data = [Vector2(0, 0), 0.0, 0.0, 0, 0, Vector2(0.746835, 1), 2.15455, -3.73455, 0, 1, Vector2(1, 0.0545454), 0.0, 0.0, 0, 0]
+_data = [Vector2(0, 0.021978), 0.0, 0.0, 0, 0, Vector2(0.1, 1), 0.0, 0.0, 0, 0, Vector2(1, 0.021978), 0.0, 0.0, 0, 0]
 point_count = 3
 
 [sub_resource type="CurveTexture" id="CurveTexture_2uw6g"]
@@ -350,15 +418,20 @@ emission_shape = 1
 emission_sphere_radius = 0.3
 direction = Vector3(0, 1, 0)
 spread = 180.0
-gravity = Vector3(0, 3, 0)
-radial_accel_curve = SubResource("CurveTexture_rplrp")
+initial_velocity_max = 3.0
+gravity = Vector3(0, -9.81, 0)
+scale_min = 0.5
 scale_curve = SubResource("CurveTexture_2uw6g")
+collision_mode = 1
+collision_friction = 0.03
+collision_bounce = 0.6
+collision_use_scale = true
 
 [sub_resource type="SphereMesh" id="SphereMesh_20no5"]
-radius = 0.05
-height = 0.1
-radial_segments = 4
-rings = 4
+radius = 0.03
+height = 0.06
+radial_segments = 6
+rings = 3
 
 [sub_resource type="Curve" id="Curve_lados"]
 _data = [Vector2(0, 0), 0.0, 0.0, 0, 0, Vector2(0.379747, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
@@ -378,19 +451,17 @@ height = 0.6
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_dne7i"]
 transparency = 1
+shading_mode = 0
 vertex_color_use_as_albedo = true
 vertex_color_is_srgb = true
-roughness = 0.0
-emission_enabled = true
-emission = Color(0, 0.929412, 1, 1)
-emission_energy_multiplier = 2.0
+albedo_color = Color(0.2, 1, 2, 0.00392157)
 
 [sub_resource type="SphereMesh" id="SphereMesh_pyp6s"]
 material = SubResource("StandardMaterial3D_dne7i")
 radius = 0.1
 height = 0.2
-radial_segments = 5
-rings = 3
+radial_segments = 16
+rings = 8
 
 [sub_resource type="Curve" id="Curve_s8ihl"]
 max_value = 4.0
@@ -400,8 +471,8 @@ point_count = 2
 [sub_resource type="SphereMesh" id="SphereMesh_o6gaf"]
 radius = 0.05
 height = 0.3
-radial_segments = 4
-rings = 4
+radial_segments = 12
+rings = 6
 
 [sub_resource type="Curve" id="Curve_grwmh"]
 _data = [Vector2(0, 0), 0.0, 0.0, 0, 0, Vector2(0.417722, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
@@ -418,17 +489,19 @@ replication_config = SubResource("SceneReplicationConfig_peqai")
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
 transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0)
-visible = false
+material_override = SubResource("StandardMaterial3D_ffosa")
 cast_shadow = 0
 mesh = SubResource("SphereMesh_ku2wu")
 
 [node name="OmniLight3D" type="OmniLight3D" parent="."]
-light_color = Color(0, 1, 0.952941, 1)
-light_energy = 0.0
+light_color = Color(0.12549, 0.627451, 1, 1)
+light_energy = 1.5
+light_volumetric_fog_energy = 15000.0
 light_bake_mode = 0
-omni_range = 3.0
+shadow_bias = 0.03
+shadow_blur = 2.0
+omni_range = 1.5
 omni_attenuation = 2.0
-omni_shadow_mode = 0
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
 shape = SubResource("SphereShape3D_klbc5")
@@ -451,6 +524,7 @@ emitting = false
 amount = 1
 lifetime = 0.6
 one_shot = true
+fixed_fps = 0
 process_material = SubResource("ParticleProcessMaterial_3pmfp")
 draw_pass_1 = ExtResource("2")
 
@@ -461,6 +535,7 @@ emitting = false
 amount = 1
 lifetime = 0.15
 one_shot = true
+fixed_fps = 0
 process_material = SubResource("ParticleProcessMaterial_55i88")
 draw_pass_1 = SubResource("QuadMesh_bc4sa")
 
@@ -472,6 +547,7 @@ amount = 10
 lifetime = 0.3
 one_shot = true
 explosiveness = 0.92
+fixed_fps = 0
 process_material = SubResource("ParticleProcessMaterial_et6w6")
 draw_pass_1 = SubResource("SphereMesh_bmjnx")
 
@@ -479,10 +555,11 @@ draw_pass_1 = SubResource("SphereMesh_bmjnx")
 material_override = SubResource("StandardMaterial3D_1bio2")
 cast_shadow = 0
 emitting = false
-amount = 5
-lifetime = 1.5
+amount = 250
+lifetime = 0.6
 one_shot = true
 explosiveness = 1.0
+fixed_fps = 0
 process_material = SubResource("ParticleProcessMaterial_rdv14")
 draw_pass_1 = SubResource("QuadMesh_e01jp")
 
@@ -490,10 +567,12 @@ draw_pass_1 = SubResource("QuadMesh_e01jp")
 material_override = SubResource("StandardMaterial3D_g4vtw")
 cast_shadow = 0
 emitting = false
-amount = 3
-lifetime = 0.8
+amount = 40
+lifetime = 1.5
 one_shot = true
 explosiveness = 0.84
+fixed_fps = 0
+collision_base_size = 0.2
 process_material = SubResource("ParticleProcessMaterial_vah46")
 draw_pass_1 = SubResource("SphereMesh_20no5")
 
@@ -504,6 +583,7 @@ emitting = false
 amount = 1
 lifetime = 0.2
 one_shot = true
+fixed_fps = 0
 process_material = SubResource("ParticleProcessMaterial_c0umg")
 draw_pass_1 = SubResource("SphereMesh_iddid")
 
@@ -519,7 +599,6 @@ mesh = ExtResource("2")
 cast_shadow = 0
 amount = 100
 lifetime = 0.1
-fixed_fps = 30
 mesh = SubResource("SphereMesh_pyp6s")
 spread = 180.0
 gravity = Vector3(0, -1, 0)
@@ -530,7 +609,8 @@ scale_amount_curve = SubResource("Curve_s8ihl")
 [node name="Trail" type="CPUParticles3D" parent="BulletBody"]
 material_override = ExtResource("9")
 cast_shadow = 0
-amount = 10
+amount = 25
+lifetime = 0.3
 mesh = SubResource("SphereMesh_o6gaf")
 emission_shape = 1
 emission_sphere_radius = 0.1
@@ -538,7 +618,9 @@ particle_flag_align_y = true
 direction = Vector3(0, 0, -1)
 spread = 0.0
 gravity = Vector3(0, 0, 0)
-initial_velocity_min = 9.0
-initial_velocity_max = 9.0
+initial_velocity_min = 0.01
+initial_velocity_max = 0.01
+radial_accel_min = 6.0
+radial_accel_max = 6.0
 scale_amount_min = 0.3
 scale_amount_curve = SubResource("Curve_grwmh")

+ 3 - 8
player/bullet/bullet_material.tres

@@ -1,11 +1,6 @@
-[gd_resource type="StandardMaterial3D" format=2]
+[gd_resource type="StandardMaterial3D" format=3 uid="uid://byb8a73wgvytk"]
 
 [resource]
+shading_mode = 0
 vertex_color_use_as_albedo = true
-albedo_color = Color( 0, 0, 0, 1 )
-roughness = 0.0
-emission_enabled = true
-emission = Color( 0.109804, 0.894118, 1, 1 )
-emission_energy = 7.34
-emission_operator = 0
-emission_on_uv2 = false
+albedo_color = Color(0.14902, 0.74902, 1.50196, 1)

BIN
player/model/muzzle_flash_particle_mesh_Cone.mesh


+ 260 - 247
player/player.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=106 format=3 uid="uid://cs1k22tdf04k4"]
+[gd_scene load_steps=107 format=3 uid="uid://cs1k22tdf04k4"]
 
 [ext_resource type="Script" path="res://player/player.gd" id="1"]
 [ext_resource type="PackedScene" uid="uid://div25sd40yx1d" path="res://player/model/player.glb" id="2"]
@@ -7,8 +7,9 @@
 [ext_resource type="AudioStream" uid="uid://do3ko5enqvvrb" path="res://player/audio/step_random_pitch.tres" id="4"]
 [ext_resource type="AudioStream" uid="uid://evwr35k4yn6g" path="res://player/audio/jump.wav" id="5"]
 [ext_resource type="AudioStream" uid="uid://fbnqspetw2oy" path="res://player/audio/land.wav" id="6"]
+[ext_resource type="Texture2D" uid="uid://8d78kbpqjumj" path="res://effects_shared/blob_shadow.tres" id="7_5auco"]
 [ext_resource type="Script" path="res://player/camera_noise_shake_effect.gd" id="8"]
-[ext_resource type="Material" path="res://player/bullet/bullet_material.tres" id="9"]
+[ext_resource type="Material" uid="uid://byb8a73wgvytk" path="res://player/bullet/bullet_material.tres" id="9"]
 [ext_resource type="ArrayMesh" uid="uid://pok2ib14r47b" path="res://player/model/muzzle_flash_particle_mesh_Cone.mesh" id="10"]
 [ext_resource type="Texture2D" uid="uid://dj46di0ip66q5" path="res://player/bullet/effect/FlarePolar.png" id="11"]
 [ext_resource type="AudioStream" uid="uid://glpjepixvmdl" path="res://player/audio/shoot.wav" id="11_cqsut"]
@@ -65,7 +66,7 @@ albedo_texture = ExtResource("11")
 _data = [Vector2(0, 0), 0.0, 0.0, 0, 0, Vector2(0.791139, 0.990909), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
 point_count = 3
 
-[sub_resource type="Animation" id="Animation_k6bgn"]
+[sub_resource type="Animation" id="Animation_nk48h"]
 resource_name = "AIM-Center"
 length = 0.001
 tracks/0/type = "position_3d"
@@ -1378,7 +1379,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_cmwyy"]
+[sub_resource type="Animation" id="Animation_ddnka"]
 resource_name = "AIM-Down"
 length = 0.001
 tracks/0/type = "position_3d"
@@ -2691,7 +2692,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_n2c7a"]
+[sub_resource type="Animation" id="Animation_5b4tf"]
 resource_name = "AIM-Left-noexp"
 length = 0.001
 tracks/0/type = "position_3d"
@@ -4004,7 +4005,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_7pad8"]
+[sub_resource type="Animation" id="Animation_ar4ec"]
 resource_name = "AIM-Right-noexp"
 length = 0.001
 tracks/0/type = "position_3d"
@@ -5317,7 +5318,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_wrcm1"]
+[sub_resource type="Animation" id="Animation_ysytt"]
 resource_name = "AIM-Up"
 length = 0.001
 tracks/0/type = "position_3d"
@@ -6630,7 +6631,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_qaqqc"]
+[sub_resource type="Animation" id="Animation_reqhm"]
 resource_name = "ARMCANNON-noexp"
 length = 0.916667
 tracks/0/type = "position_3d"
@@ -7943,7 +7944,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_wi53w"]
+[sub_resource type="Animation" id="Animation_ryu8y"]
 resource_name = "borrar1-noexp"
 length = 2.5
 tracks/0/type = "position_3d"
@@ -9256,7 +9257,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_re04l"]
+[sub_resource type="Animation" id="Animation_xcfq5"]
 resource_name = "borrar2-noexp"
 length = 2.5
 tracks/0/type = "position_3d"
@@ -10569,7 +10570,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_t0f4n"]
+[sub_resource type="Animation" id="Animation_i0rbr"]
 resource_name = "borrar3-noexp"
 length = 2.5
 tracks/0/type = "position_3d"
@@ -11882,7 +11883,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_k8q81"]
+[sub_resource type="Animation" id="Animation_av8f6"]
 resource_name = "Cannon_activation-noexp"
 length = 0.916667
 tracks/0/type = "position_3d"
@@ -13195,7 +13196,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_7f4em"]
+[sub_resource type="Animation" id="Animation_6v1k5"]
 resource_name = "Cannon_Charge"
 length = 1.875
 tracks/0/type = "position_3d"
@@ -14508,7 +14509,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_wbtrc"]
+[sub_resource type="Animation" id="Animation_d2xac"]
 resource_name = "Cannon_Charge-cycle"
 length = 0.416667
 loop_mode = 1
@@ -15822,7 +15823,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_w8dvb"]
+[sub_resource type="Animation" id="Animation_a4jsj"]
 resource_name = "flinch1"
 length = 0.416667
 tracks/0/type = "position_3d"
@@ -17135,7 +17136,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_hsljj"]
+[sub_resource type="Animation" id="Animation_2xp3o"]
 resource_name = "flinch1_001"
 length = 0.416667
 tracks/0/type = "position_3d"
@@ -18448,7 +18449,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_l04e2"]
+[sub_resource type="Animation" id="Animation_dm15w"]
 resource_name = "flinch2"
 length = 0.416667
 tracks/0/type = "position_3d"
@@ -19761,7 +19762,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_ohnny"]
+[sub_resource type="Animation" id="Animation_7i2jo"]
 resource_name = "flinch_heavy"
 length = 0.416667
 tracks/0/type = "position_3d"
@@ -21074,7 +21075,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_m42xd"]
+[sub_resource type="Animation" id="Animation_881il"]
 resource_name = "jump_1_up"
 length = 0.25
 tracks/0/type = "position_3d"
@@ -22387,7 +22388,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_3qm8n"]
+[sub_resource type="Animation" id="Animation_8sowg"]
 resource_name = "jump_5_hardlanding"
 length = 0.416667
 tracks/0/type = "position_3d"
@@ -23700,7 +23701,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_wi0k2"]
+[sub_resource type="Animation" id="Animation_bjahd"]
 resource_name = "metarigAction-noexp"
 length = 1.66667
 tracks/0/type = "position_3d"
@@ -25013,7 +25014,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_qmjj1"]
+[sub_resource type="Animation" id="Animation_cl0qq"]
 resource_name = "running_aiming"
 length = 2.5
 tracks/0/type = "position_3d"
@@ -26326,7 +26327,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_dw04h"]
+[sub_resource type="Animation" id="Animation_u7awe"]
 resource_name = "strafe_allinone-noexp"
 length = 9.79167
 tracks/0/type = "position_3d"
@@ -27639,7 +27640,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_qk30b"]
+[sub_resource type="Animation" id="Animation_q16eu"]
 resource_name = "strafe_idle_to_forward-noexp"
 length = 7.91667
 tracks/0/type = "position_3d"
@@ -28952,7 +28953,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_761m3"]
+[sub_resource type="Animation" id="Animation_6inf7"]
 resource_name = "strafe_neu_to_left-noexp"
 length = 0.833333
 tracks/0/type = "position_3d"
@@ -30265,7 +30266,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_6xqsi"]
+[sub_resource type="Animation" id="Animation_a33ej"]
 resource_name = "strafe_neu_to_right-noexp"
 length = 0.833333
 tracks/0/type = "position_3d"
@@ -31578,7 +31579,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_l77ag"]
+[sub_resource type="Animation" id="Animation_5axe6"]
 resource_name = "Strafeapartirderun-noexp"
 length = 2.5
 tracks/0/type = "position_3d"
@@ -32891,7 +32892,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_inlng"]
+[sub_resource type="Animation" id="Animation_h3brn"]
 resource_name = "xxx_001-noexp"
 length = 0.833333
 tracks/0/type = "position_3d"
@@ -34204,7 +34205,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_xqfe4"]
+[sub_resource type="Animation" id="Animation_t7kpn"]
 resource_name = "yateusare-noexp"
 length = 0.916667
 tracks/0/type = "position_3d"
@@ -35517,7 +35518,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_2rbul"]
+[sub_resource type="Animation" id="Animation_arr7f"]
 resource_name = "z_running_PH-noexp"
 length = 1.66667
 tracks/0/type = "position_3d"
@@ -36830,7 +36831,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_tnohw"]
+[sub_resource type="Animation" id="Animation_twos7"]
 resource_name = "zdasdasdas-noexp"
 length = 3.33333
 tracks/0/type = "position_3d"
@@ -38143,7 +38144,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_pytpj"]
+[sub_resource type="Animation" id="Animation_72pas"]
 resource_name = "zDSDASD-noexp"
 length = 1.04167
 tracks/0/type = "position_3d"
@@ -39456,7 +39457,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, -0.384436, -5.74738e-10, 4.27475e-09, 0.923152)
 
-[sub_resource type="Animation" id="Animation_3usg6"]
+[sub_resource type="Animation" id="Animation_tj74l"]
 resource_name = "zjump_fullcycle-noexp"
 length = 1.25
 tracks/0/type = "position_3d"
@@ -40769,7 +40770,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_aopd8"]
+[sub_resource type="Animation" id="Animation_78etr"]
 resource_name = "zkneepadmod-noexp"
 length = 0.416667
 tracks/0/type = "position_3d"
@@ -42082,7 +42083,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_u0fj5"]
+[sub_resource type="Animation" id="Animation_17ip0"]
 resource_name = "zSPINE-BOUNCE-noexp"
 length = 0.833333
 tracks/0/type = "position_3d"
@@ -43395,7 +43396,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_v8v4v"]
+[sub_resource type="Animation" id="Animation_bd8yp"]
 resource_name = "zSPINE_LR-noexp"
 length = 1.66667
 tracks/0/type = "position_3d"
@@ -44708,7 +44709,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_0txj5"]
+[sub_resource type="Animation" id="Animation_l8mi3"]
 resource_name = "zSPINE_StS-noexp"
 length = 1.66667
 tracks/0/type = "position_3d"
@@ -46021,7 +46022,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_3i7kr"]
+[sub_resource type="Animation" id="Animation_dmtrn"]
 resource_name = "zSPINE_ud-noexp"
 length = 1.66667
 tracks/0/type = "position_3d"
@@ -47334,7 +47335,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_6tr52"]
+[sub_resource type="Animation" id="Animation_r3qdw"]
 resource_name = "Zstrafetest-noexp"
 length = 2.5
 tracks/0/type = "position_3d"
@@ -48647,7 +48648,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_ugft6"]
+[sub_resource type="Animation" id="Animation_5c6jq"]
 resource_name = "zzARMCANNONNOUSAR-noexp"
 length = 0.916667
 tracks/0/type = "position_3d"
@@ -49960,7 +49961,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_2pgkg"]
+[sub_resource type="Animation" id="Animation_iumhc"]
 resource_name = "zzIdleph-noexp"
 length = 5.375
 tracks/0/type = "position_3d"
@@ -51273,7 +51274,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_v4h6s"]
+[sub_resource type="Animation" id="Animation_0gmsb"]
 resource_name = "Idle-cycle"
 length = 15.0
 loop_mode = 1
@@ -52587,7 +52588,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_b5gbw"]
+[sub_resource type="Animation" id="Animation_uja4c"]
 resource_name = "Idlecombat-cycle"
 length = 3.33333
 loop_mode = 1
@@ -53901,7 +53902,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_kmtqi"]
+[sub_resource type="Animation" id="Animation_47a44"]
 resource_name = "Idlecombatrest-cycle"
 length = 10.0
 loop_mode = 1
@@ -55215,7 +55216,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_bdj6k"]
+[sub_resource type="Animation" id="Animation_3m1rl"]
 resource_name = "eyes-cycle"
 length = 5.0
 loop_mode = 1
@@ -56529,7 +56530,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_a7ug5"]
+[sub_resource type="Animation" id="Animation_1o860"]
 resource_name = "jump_2_upwards-cycle"
 length = 0.416667
 loop_mode = 1
@@ -57843,7 +57844,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_kw36k"]
+[sub_resource type="Animation" id="Animation_om4st"]
 resource_name = "jump_3_midair-cycle"
 length = 1.25
 loop_mode = 1
@@ -59157,7 +59158,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_31ji1"]
+[sub_resource type="Animation" id="Animation_cyni8"]
 resource_name = "jump_4_falling-cycle"
 length = 0.833333
 loop_mode = 1
@@ -60471,7 +60472,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 0.760341, 0.625441, 0.76034)
 
-[sub_resource type="Animation" id="Animation_5xaai"]
+[sub_resource type="Animation" id="Animation_jo7dy"]
 resource_name = "lean_left-cycle"
 length = 0.833333
 loop_mode = 1
@@ -61785,7 +61786,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_e80m1"]
+[sub_resource type="Animation" id="Animation_0m4ng"]
 resource_name = "lean_right-cycle"
 length = 0.833333
 loop_mode = 1
@@ -63099,7 +63100,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_cvryb"]
+[sub_resource type="Animation" id="Animation_g87dl"]
 resource_name = "running_gun-cycle"
 length = 0.833333
 loop_mode = 1
@@ -64413,7 +64414,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_eny0c"]
+[sub_resource type="Animation" id="Animation_mapls"]
 resource_name = "running_nogun-cycle"
 length = 0.833333
 loop_mode = 1
@@ -65727,7 +65728,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_bfj2x"]
+[sub_resource type="Animation" id="Animation_kqmcw"]
 resource_name = "strafe_back-cycle"
 length = 0.833333
 loop_mode = 1
@@ -67041,7 +67042,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_shqw3"]
+[sub_resource type="Animation" id="Animation_7phda"]
 resource_name = "strafe_front-cycle"
 length = 0.833333
 loop_mode = 1
@@ -68355,7 +68356,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_nvh0t"]
+[sub_resource type="Animation" id="Animation_4ll2y"]
 resource_name = "strafe_left-cycle"
 length = 0.833333
 loop_mode = 1
@@ -69669,7 +69670,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_j58eg"]
+[sub_resource type="Animation" id="Animation_qo8rr"]
 resource_name = "strafe_right-cycle"
 length = 0.833333
 loop_mode = 1
@@ -70983,7 +70984,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_4y77i"]
+[sub_resource type="Animation" id="Animation_5eih8"]
 resource_name = "walking_gun-cycle"
 length = 1.25
 loop_mode = 1
@@ -72297,7 +72298,7 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="Animation" id="Animation_qeh3i"]
+[sub_resource type="Animation" id="Animation_2gy8a"]
 resource_name = "walking_nogun-cycle"
 length = 1.25
 loop_mode = 1
@@ -73611,64 +73612,64 @@ tracks/186/interp = 1
 tracks/186/loop_wrap = true
 tracks/186/keys = PackedFloat32Array(0, 1, 7.37258e-07, 3.86478e-06, -5.63318e-08, 1)
 
-[sub_resource type="AnimationLibrary" id="AnimationLibrary_6ta8k"]
+[sub_resource type="AnimationLibrary" id="AnimationLibrary_b344y"]
 _data = {
-"AIM-Center": SubResource("Animation_k6bgn"),
-"AIM-Down": SubResource("Animation_cmwyy"),
-"AIM-Left-noexp": SubResource("Animation_n2c7a"),
-"AIM-Right-noexp": SubResource("Animation_7pad8"),
-"AIM-Up": SubResource("Animation_wrcm1"),
-"ARMCANNON-noexp": SubResource("Animation_qaqqc"),
-"Cannon_Charge": SubResource("Animation_7f4em"),
-"Cannon_Charge-cycle": SubResource("Animation_wbtrc"),
-"Cannon_activation-noexp": SubResource("Animation_k8q81"),
-"Idle": SubResource("Animation_v4h6s"),
-"Idlecombat": SubResource("Animation_b5gbw"),
-"Idlecombatrest": SubResource("Animation_kmtqi"),
-"Strafeapartirderun-noexp": SubResource("Animation_l77ag"),
-"Zstrafetest-noexp": SubResource("Animation_6tr52"),
-"borrar1-noexp": SubResource("Animation_wi53w"),
-"borrar2-noexp": SubResource("Animation_re04l"),
-"borrar3-noexp": SubResource("Animation_t0f4n"),
-"eyes": SubResource("Animation_bdj6k"),
-"flinch1": SubResource("Animation_w8dvb"),
-"flinch1_001": SubResource("Animation_hsljj"),
-"flinch2": SubResource("Animation_l04e2"),
-"flinch_heavy": SubResource("Animation_ohnny"),
-"jump_1_up": SubResource("Animation_m42xd"),
-"jump_2_upwards": SubResource("Animation_a7ug5"),
-"jump_3_midair": SubResource("Animation_kw36k"),
-"jump_4_falling": SubResource("Animation_31ji1"),
-"jump_5_hardlanding": SubResource("Animation_3qm8n"),
-"lean_left": SubResource("Animation_5xaai"),
-"lean_right": SubResource("Animation_e80m1"),
-"metarigAction-noexp": SubResource("Animation_wi0k2"),
-"running_aiming": SubResource("Animation_qmjj1"),
-"running_gun": SubResource("Animation_cvryb"),
-"running_nogun": SubResource("Animation_eny0c"),
-"strafe_allinone-noexp": SubResource("Animation_dw04h"),
-"strafe_back": SubResource("Animation_bfj2x"),
-"strafe_front": SubResource("Animation_shqw3"),
-"strafe_idle_to_forward-noexp": SubResource("Animation_qk30b"),
-"strafe_left": SubResource("Animation_nvh0t"),
-"strafe_neu_to_left-noexp": SubResource("Animation_761m3"),
-"strafe_neu_to_right-noexp": SubResource("Animation_6xqsi"),
-"strafe_right": SubResource("Animation_j58eg"),
-"walking_gun": SubResource("Animation_4y77i"),
-"walking_nogun": SubResource("Animation_qeh3i"),
-"xxx_001-noexp": SubResource("Animation_inlng"),
-"yateusare-noexp": SubResource("Animation_xqfe4"),
-"zDSDASD-noexp": SubResource("Animation_pytpj"),
-"zSPINE-BOUNCE-noexp": SubResource("Animation_u0fj5"),
-"zSPINE_LR-noexp": SubResource("Animation_v8v4v"),
-"zSPINE_StS-noexp": SubResource("Animation_0txj5"),
-"zSPINE_ud-noexp": SubResource("Animation_3i7kr"),
-"z_running_PH-noexp": SubResource("Animation_2rbul"),
-"zdasdasdas-noexp": SubResource("Animation_tnohw"),
-"zjump_fullcycle-noexp": SubResource("Animation_3usg6"),
-"zkneepadmod-noexp": SubResource("Animation_aopd8"),
-"zzARMCANNONNOUSAR-noexp": SubResource("Animation_ugft6"),
-"zzIdleph-noexp": SubResource("Animation_2pgkg")
+"AIM-Center": SubResource("Animation_nk48h"),
+"AIM-Down": SubResource("Animation_ddnka"),
+"AIM-Left-noexp": SubResource("Animation_5b4tf"),
+"AIM-Right-noexp": SubResource("Animation_ar4ec"),
+"AIM-Up": SubResource("Animation_ysytt"),
+"ARMCANNON-noexp": SubResource("Animation_reqhm"),
+"Cannon_Charge": SubResource("Animation_6v1k5"),
+"Cannon_Charge-cycle": SubResource("Animation_d2xac"),
+"Cannon_activation-noexp": SubResource("Animation_av8f6"),
+"Idle": SubResource("Animation_0gmsb"),
+"Idlecombat": SubResource("Animation_uja4c"),
+"Idlecombatrest": SubResource("Animation_47a44"),
+"Strafeapartirderun-noexp": SubResource("Animation_5axe6"),
+"Zstrafetest-noexp": SubResource("Animation_r3qdw"),
+"borrar1-noexp": SubResource("Animation_ryu8y"),
+"borrar2-noexp": SubResource("Animation_xcfq5"),
+"borrar3-noexp": SubResource("Animation_i0rbr"),
+"eyes": SubResource("Animation_3m1rl"),
+"flinch1": SubResource("Animation_a4jsj"),
+"flinch1_001": SubResource("Animation_2xp3o"),
+"flinch2": SubResource("Animation_dm15w"),
+"flinch_heavy": SubResource("Animation_7i2jo"),
+"jump_1_up": SubResource("Animation_881il"),
+"jump_2_upwards": SubResource("Animation_1o860"),
+"jump_3_midair": SubResource("Animation_om4st"),
+"jump_4_falling": SubResource("Animation_cyni8"),
+"jump_5_hardlanding": SubResource("Animation_8sowg"),
+"lean_left": SubResource("Animation_jo7dy"),
+"lean_right": SubResource("Animation_0m4ng"),
+"metarigAction-noexp": SubResource("Animation_bjahd"),
+"running_aiming": SubResource("Animation_cl0qq"),
+"running_gun": SubResource("Animation_g87dl"),
+"running_nogun": SubResource("Animation_mapls"),
+"strafe_allinone-noexp": SubResource("Animation_u7awe"),
+"strafe_back": SubResource("Animation_kqmcw"),
+"strafe_front": SubResource("Animation_7phda"),
+"strafe_idle_to_forward-noexp": SubResource("Animation_q16eu"),
+"strafe_left": SubResource("Animation_4ll2y"),
+"strafe_neu_to_left-noexp": SubResource("Animation_6inf7"),
+"strafe_neu_to_right-noexp": SubResource("Animation_a33ej"),
+"strafe_right": SubResource("Animation_qo8rr"),
+"walking_gun": SubResource("Animation_5eih8"),
+"walking_nogun": SubResource("Animation_2gy8a"),
+"xxx_001-noexp": SubResource("Animation_h3brn"),
+"yateusare-noexp": SubResource("Animation_t7kpn"),
+"zDSDASD-noexp": SubResource("Animation_72pas"),
+"zSPINE-BOUNCE-noexp": SubResource("Animation_17ip0"),
+"zSPINE_LR-noexp": SubResource("Animation_bd8yp"),
+"zSPINE_StS-noexp": SubResource("Animation_l8mi3"),
+"zSPINE_ud-noexp": SubResource("Animation_dmtrn"),
+"z_running_PH-noexp": SubResource("Animation_arr7f"),
+"zdasdasdas-noexp": SubResource("Animation_twos7"),
+"zjump_fullcycle-noexp": SubResource("Animation_tj74l"),
+"zkneepadmod-noexp": SubResource("Animation_78etr"),
+"zzARMCANNONNOUSAR-noexp": SubResource("Animation_5c6jq"),
+"zzIdleph-noexp": SubResource("Animation_iumhc")
 }
 
 [sub_resource type="AnimationNodeAdd3" id="9"]
@@ -73948,94 +73949,94 @@ color_rect = NodePath("../ColorRect")
 transform = Transform3D(0.803991, 0, 0, 0, 0.803991, 0, 0, 0, 0.803991, 0, 0, 0)
 
 [node name="Skeleton3D" parent="PlayerModel/Robot_Skeleton" index="0"]
-bones/1/position = Vector3(0.116697, 2.2238, -0.194805)
-bones/1/rotation = Quaternion(0.189893, -0.055537, -0.00702953, 0.980208)
-bones/2/position = Vector3(-1.62938e-05, 0.23737, 2.22686e-05)
-bones/2/rotation = Quaternion(-0.0622412, 0.0358963, -0.0100922, 0.997364)
-bones/3/position = Vector3(-1.6283e-05, 0.100696, -0.000160371)
-bones/3/rotation = Quaternion(-0.0708757, 0.0371803, -0.00283352, 0.996788)
-bones/4/position = Vector3(-1.62795e-05, 0.11552, -0.000353669)
-bones/4/rotation = Quaternion(-0.0077534, 0.0372035, 0.00251062, 0.999274)
-bones/5/position = Vector3(-1.57284e-05, 0.325074, -0.000204005)
-bones/5/rotation = Quaternion(0.180714, -0.000164983, -0.00363279, 0.983529)
-bones/6/rotation = Quaternion(-0.059595, 0.83696, 0.542908, 0.0346001)
-bones/7/position = Vector3(4.38424e-10, -0.00046025, -0.0111334)
-bones/7/rotation = Quaternion(-0.00585998, 0.70681, 0.707379, -0.000514929)
+bones/1/position = Vector3(0.117048, 2.22194, -0.186977)
+bones/1/rotation = Quaternion(0.192638, -0.0373912, -0.000890941, 0.980557)
+bones/2/position = Vector3(2.83638e-05, 0.241005, -0.000525682)
+bones/2/rotation = Quaternion(-0.063047, 0.0269172, -0.00761125, 0.997618)
+bones/3/position = Vector3(3.28969e-05, 0.105126, -0.000122525)
+bones/3/rotation = Quaternion(-0.071675, 0.0278921, -0.00216924, 0.997036)
+bones/4/position = Vector3(2.8357e-05, 0.119086, 0.000543124)
+bones/4/rotation = Quaternion(-0.00854415, 0.0279119, 0.00184162, 0.999572)
+bones/5/position = Vector3(-1.09855e-08, 0.326488, -1.01432e-05)
+bones/5/rotation = Quaternion(0.180714, -0.000136304, -0.00300117, 0.983531)
+bones/6/rotation = Quaternion(-0.0452669, 0.830387, 0.554429, 0.0319046)
+bones/7/position = Vector3(-1.83356e-10, -0.000460287, -0.0101297)
+bones/7/rotation = Quaternion(-0.00541782, 0.706918, 0.707275, 0.000311119)
 bones/8/rotation = Quaternion(0.965926, 2.04982e-08, 1.46421e-07, 0.258819)
-bones/10/position = Vector3(-1.68668e-08, 0.245584, 0.126631)
-bones/11/rotation = Quaternion(3.49432e-07, 0.966452, 0.256849, -6.1432e-07)
-bones/12/rotation = Quaternion(3.48944e-07, 0.966452, 0.256849, -6.14918e-07)
-bones/13/rotation = Quaternion(0.0471839, 0.977521, -0.205212, 0.0107281)
-bones/14/rotation = Quaternion(2.69478e-07, 0.97866, -0.205488, -7.0215e-07)
-bones/15/rotation = Quaternion(-0.327282, -0.360535, -0.468431, 0.737207)
-bones/16/rotation = Quaternion(-0.627542, 0.0525158, 0.187121, 0.753935)
-bones/17/rotation = Quaternion(-0.0800631, 0.0185202, -0.29282, 0.95263)
-bones/18/rotation = Quaternion(-0.0841143, 0.00407167, -0.293555, 0.952226)
-bones/20/rotation = Quaternion(-0.0326664, -0.0170964, 0.986199, 0.16141)
-bones/22/rotation = Quaternion(-0.116894, -0.0289932, 0.000267989, 0.992721)
-bones/23/rotation = Quaternion(-0.21174, -0.0201094, -0.00255655, 0.977116)
-bones/24/rotation = Quaternion(-0.337289, -0.119602, -0.0032762, 0.933767)
-bones/25/rotation = Quaternion(-0.357857, -0.0729889, -0.0161235, 0.93078)
-bones/25/scale = Vector3(0.905221, 0.905221, 0.905221)
-bones/27/rotation = Quaternion(-0.0424083, 0.0424088, -0.705836, 0.705831)
-bones/28/rotation = Quaternion(0.000160612, -0.00791521, 0.484311, 0.87486)
+bones/10/position = Vector3(-0.0256014, 0.245584, 0.126631)
+bones/11/rotation = Quaternion(4.16415e-07, 0.930597, 0.366045, -5.69531e-07)
+bones/12/rotation = Quaternion(4.16676e-07, 0.930597, 0.366045, -5.69879e-07)
+bones/13/rotation = Quaternion(0.0442983, 0.958142, -0.282457, 0.0147928)
+bones/14/rotation = Quaternion(2.09597e-07, 0.959165, -0.282846, -7.20663e-07)
+bones/15/rotation = Quaternion(-0.32544, -0.358506, -0.431488, 0.76117)
+bones/16/rotation = Quaternion(-0.639571, 0.0303077, 0.143202, 0.754668)
+bones/17/rotation = Quaternion(-0.0839352, 0.0104351, -0.223937, 0.970926)
+bones/18/rotation = Quaternion(-0.0911932, -0.000524446, -0.216371, 0.972043)
+bones/20/rotation = Quaternion(-0.0274616, -0.0144161, 0.990251, 0.135799)
+bones/22/rotation = Quaternion(-0.106077, -0.0364108, 0.00165498, 0.99369)
+bones/23/rotation = Quaternion(-0.179584, -0.0201824, -0.00189573, 0.983534)
+bones/24/rotation = Quaternion(-0.30097, -0.119639, 0.00134586, 0.946098)
+bones/25/rotation = Quaternion(-0.316018, -0.073635, -0.0128545, 0.945804)
+bones/25/scale = Vector3(0.923173, 0.923173, 0.923173)
+bones/27/rotation = Quaternion(-0.0485867, 0.0485873, -0.705438, 0.705433)
+bones/28/rotation = Quaternion(2.32104e-05, -0.00803497, 0.442678, 0.896645)
 bones/28/scale = Vector3(0.999995, 1.00001, 1)
 bones/29/rotation = Quaternion(0.00420373, 0.00610656, 0.137006, 0.990542)
-bones/30/rotation = Quaternion(-0.000211452, -0.00407401, 0.540909, 0.841071)
-bones/33/rotation = Quaternion(-0.111471, -0.0211269, -0.00768854, 0.993513)
-bones/34/rotation = Quaternion(-0.259624, -0.0227318, -0.00293391, 0.965438)
-bones/35/rotation = Quaternion(-0.379814, -0.119323, -0.00876513, 0.917293)
-bones/36/rotation = Quaternion(-0.396136, -0.0697566, -0.0249044, 0.9152)
-bones/36/scale = Vector3(0.870893, 0.870893, 0.870893)
-bones/39/rotation = Quaternion(-0.0851611, -0.0115504, -0.00184875, 0.996298)
-bones/40/rotation = Quaternion(-0.33876, -0.0147258, -0.0070065, 0.940731)
-bones/41/rotation = Quaternion(-0.482073, -0.117543, -0.0223326, 0.867923)
-bones/42/rotation = Quaternion(-0.450558, -0.0709738, -0.0234544, 0.889612)
-bones/42/scale = Vector3(0.782956, 0.782956, 0.782956)
-bones/45/rotation = Quaternion(0.188782, -0.135575, 0.961428, 0.147094)
-bones/47/rotation = Quaternion(-0.329519, 0.0103858, 0.241942, 0.912564)
-bones/48/rotation = Quaternion(0.102987, 0.0726806, 0.602408, 0.788172)
-bones/49/rotation = Quaternion(-0.273093, -0.0310258, -0.0771148, 0.95839)
-bones/50/rotation = Quaternion(-0.351386, 0.372596, 0.465468, 0.721831)
-bones/51/rotation = Quaternion(-0.590446, 0.0451765, -0.0225944, 0.805495)
-bones/52/rotation = Quaternion(-0.101137, -0.0303095, 0.37758, 0.919938)
-bones/53/rotation = Quaternion(-0.101119, -0.00843411, 0.349578, 0.931396)
+bones/30/rotation = Quaternion(-1.98249e-05, -0.00407944, 0.500799, 0.865554)
+bones/33/rotation = Quaternion(-0.114236, -0.0240216, -0.00713382, 0.993138)
+bones/34/rotation = Quaternion(-0.247394, -0.0241979, -0.00254064, 0.968609)
+bones/35/rotation = Quaternion(-0.364889, -0.119449, -0.00682902, 0.923332)
+bones/36/rotation = Quaternion(-0.386319, -0.0700191, -0.0241565, 0.919386)
+bones/36/scale = Vector3(0.879088, 0.879088, 0.879088)
+bones/39/rotation = Quaternion(-0.0895898, -0.0119833, -0.00194944, 0.995905)
+bones/40/rotation = Quaternion(-0.342805, -0.0145693, -0.00724018, 0.939266)
+bones/41/rotation = Quaternion(-0.484333, -0.117484, -0.0226389, 0.866664)
+bones/42/rotation = Quaternion(-0.45765, -0.0707842, -0.0240206, 0.885985)
+bones/42/scale = Vector3(0.779008, 0.779008, 0.779008)
+bones/45/rotation = Quaternion(0.185235, -0.126909, 0.96681, 0.1219)
+bones/47/rotation = Quaternion(-0.416959, 0.02116, 0.170213, 0.892594)
+bones/48/rotation = Quaternion(0.0797499, 0.0712581, 0.590878, 0.799641)
+bones/49/rotation = Quaternion(-0.313893, -0.0184781, -0.170888, 0.93377)
+bones/50/rotation = Quaternion(-0.340608, 0.368538, 0.441509, 0.743798)
+bones/51/rotation = Quaternion(-0.578954, 0.0903062, 0.0517151, 0.808692)
+bones/52/rotation = Quaternion(-0.086213, -0.0373539, 0.385061, 0.918096)
+bones/53/rotation = Quaternion(-0.088253, 0.0104554, 0.342738, 0.935218)
 bones/53/scale = Vector3(1.00345, 1.00345, 1.00345)
 bones/55/rotation = Quaternion(0.0015298, -0.0653359, 0.997819, 0.00923565)
-bones/56/rotation = Quaternion(0.0145943, -0.0170317, 0.991721, 0.126441)
+bones/56/rotation = Quaternion(0.0176412, -0.0175437, 0.996521, 0.0795392)
 bones/56/scale = Vector3(0.989954, 0.989954, 0.989954)
-bones/58/rotation = Quaternion(-0.174788, 0.0304261, 0.0278834, 0.983741)
+bones/58/rotation = Quaternion(-0.156689, 0.0308207, 0.0269785, 0.986798)
 bones/58/scale = Vector3(1, 1, 0.99999)
-bones/59/rotation = Quaternion(-0.283893, 0.0258087, 0.0113865, 0.958441)
+bones/59/rotation = Quaternion(-0.299757, 0.0258423, 0.0116888, 0.953594)
 bones/59/scale = Vector3(1.00001, 0.999999, 0.99999)
-bones/60/rotation = Quaternion(-0.357322, 0.112883, -0.0562254, 0.925428)
+bones/60/rotation = Quaternion(-0.382941, 0.11172, -0.0601358, 0.915018)
 bones/60/scale = Vector3(1.00003, 0.999986, 0.999971)
-bones/61/rotation = Quaternion(-0.466702, 0.070534, 0.0247448, 0.88125)
-bones/61/scale = Vector3(0.860492, 0.860492, 0.860492)
-bones/63/rotation = Quaternion(-0.156634, -0.156461, 0.673053, 0.705681)
-bones/64/rotation = Quaternion(0.000106497, 0.00785973, -0.520108, 0.854065)
+bones/61/rotation = Quaternion(-0.46778, 0.0705037, 0.024831, 0.880679)
+bones/61/scale = Vector3(0.84613, 0.84613, 0.84613)
+bones/63/rotation = Quaternion(-0.150558, -0.150091, 0.674438, 0.707063)
+bones/64/rotation = Quaternion(-0.000621839, 0.00864326, -0.501001, 0.865403)
 bones/64/scale = Vector3(0.999964, 1.00002, 1)
-bones/65/rotation = Quaternion(0.00393461, -0.00597093, -0.148322, 0.988913)
+bones/65/rotation = Quaternion(0.00604107, -0.00577643, -0.260024, 0.965566)
 bones/65/scale = Vector3(0.999961, 1.00004, 0.999999)
-bones/66/rotation = Quaternion(-0.000413402, 0.00403568, -0.579703, 0.814818)
-bones/66/scale = Vector3(0.996911, 0.996911, 0.996911)
-bones/69/rotation = Quaternion(-0.119299, 0.0312292, 0.0312324, 0.991876)
+bones/66/rotation = Quaternion(-0.000544051, 0.00402015, -0.60582, 0.795591)
+bones/66/scale = Vector3(0.970135, 0.970135, 0.970135)
+bones/69/rotation = Quaternion(-0.144656, 0.0320435, 0.034609, 0.988357)
 bones/69/scale = Vector3(1, 1, 0.99999)
-bones/70/rotation = Quaternion(-0.341118, 0.0265232, 0.0115396, 0.939576)
+bones/70/rotation = Quaternion(-0.363114, 0.0271615, 0.0129624, 0.931259)
 bones/70/scale = Vector3(1.00001, 0.999998, 0.999988)
-bones/71/rotation = Quaternion(-0.443829, 0.108942, -0.0697567, 0.886725)
+bones/71/rotation = Quaternion(-0.45702, 0.108434, -0.0708946, 0.879971)
 bones/71/scale = Vector3(1.00003, 0.99997, 0.999986)
-bones/72/rotation = Quaternion(-0.475633, 0.0672771, 0.0309837, 0.87652)
-bones/72/scale = Vector3(0.787395, 0.787395, 0.787395)
-bones/75/rotation = Quaternion(-0.506417, 0.0693322, 0.0279364, 0.859043)
-bones/75/scale = Vector3(0.719839, 0.719839, 0.719839)
-bones/77/rotation = Quaternion(-0.0903416, 0.0337412, 0.0246267, 0.995034)
+bones/72/rotation = Quaternion(-0.516257, 0.0657484, 0.0341079, 0.853225)
+bones/72/scale = Vector3(0.774743, 0.774743, 0.774743)
+bones/75/rotation = Quaternion(-0.56869, 0.0670711, 0.0329979, 0.819149)
+bones/75/scale = Vector3(0.693892, 0.693892, 0.693892)
+bones/77/rotation = Quaternion(-0.13315, 0.0351469, 0.0298569, 0.990022)
 bones/77/scale = Vector3(1, 1, 0.999991)
-bones/78/rotation = Quaternion(-0.398641, 0.0275527, 0.0123383, 0.91661)
+bones/78/rotation = Quaternion(-0.431685, 0.0289239, 0.0139621, 0.901453)
 bones/78/scale = Vector3(1.00001, 0.999996, 0.999989)
-bones/79/rotation = Quaternion(-0.51578, 0.104968, -0.0804658, 0.84645)
+bones/79/rotation = Quaternion(-0.531842, 0.10447, -0.0817208, 0.836392)
 bones/79/scale = Vector3(1.00002, 0.999946, 1.00001)
-bones/81/rotation = Quaternion(-0.142035, -0.083157, 0.976499, 0.139145)
+bones/81/rotation = Quaternion(-0.15058, -0.0912731, 0.980066, 0.0920107)
 bones/81/scale = Vector3(1.00003, 0.999997, 0.999962)
 bones/82/scale = Vector3(0.806007, 0.723313, 0.806006)
 bones/83/rotation = Quaternion(-0.499999, -0.499999, 0.500002, 0.499999)
@@ -74049,70 +74050,70 @@ bones/89/rotation = Quaternion(-1.75019e-05, 0.00750475, 0.999972, -3.4666e-05)
 bones/90/position = Vector3(-5.19207e-06, 0.109669, -0.0266081)
 bones/91/position = Vector3(0.000285693, 1.38812e-06, -0.119667)
 bones/92/position = Vector3(-4.50757e-06, 0.000595328, 0.0266991)
-bones/95/rotation = Quaternion(-0.299623, -0.00979693, -0.0616753, 0.952012)
-bones/96/rotation = Quaternion(0.142984, -0.105628, -0.484278, 0.856664)
-bones/97/rotation = Quaternion(-0.17849, 0.0601936, 0.290518, 0.938146)
-bones/98/rotation = Quaternion(0.999405, -0.0340657, 0.00463297, -0.00272821)
-bones/99/rotation = Quaternion(0.690824, 0.174235, 0.496136, -0.49624)
-bones/100/rotation = Quaternion(-0.119561, -0.288775, 0.929811, 0.194334)
-bones/101/rotation = Quaternion(-0.209374, -0.315951, 0.915301, -0.136237)
-bones/102/rotation = Quaternion(0.340192, 0.666726, -0.607448, 0.265993)
-bones/103/rotation = Quaternion(0.0598786, -0.0199188, 0.0318525, 0.997499)
-bones/104/rotation = Quaternion(-0.647276, 0.234601, 0.589599, 0.422339)
-bones/105/rotation = Quaternion(0.100071, -0.206475, 0.933649, -0.275051)
-bones/106/rotation = Quaternion(0.191045, -0.284694, 0.939096, 0.0234605)
-bones/107/rotation = Quaternion(-0.305751, 0.690374, -0.64157, -0.135234)
-bones/108/rotation = Quaternion(0.00148435, 0.0319409, 0.0301635, 0.999033)
-bones/112/rotation = Quaternion(0.9968, 0.044711, 0.000374225, -0.0662623)
-bones/113/rotation = Quaternion(0.998631, -0.0225982, -0.00471573, -0.0469376)
-bones/114/position = Vector3(0.114675, 0.105877, 0.116781)
-bones/114/rotation = Quaternion(0.0359656, 0.743666, 0.666478, -0.0383985)
-bones/115/position = Vector3(-0.0875997, 0.109318, 0.129186)
-bones/115/rotation = Quaternion(0.0417789, 0.74483, 0.665268, -0.0300227)
-bones/116/rotation = Quaternion(0.855546, 0.0827712, -0.0713442, 0.506064)
-bones/117/rotation = Quaternion(0.26001, -1.09364e-07, 2.149e-07, 0.965606)
+bones/95/rotation = Quaternion(-0.339745, -0.0179847, 0.0606531, 0.938387)
+bones/96/rotation = Quaternion(0.098945, -0.107441, -0.435873, 0.888077)
+bones/97/rotation = Quaternion(-0.191864, 0.0533846, 0.370386, 0.907278)
+bones/98/rotation = Quaternion(0.999318, -0.0317964, 0.00342586, -0.0184531)
+bones/99/rotation = Quaternion(0.701597, 0.155973, 0.496183, -0.48707)
+bones/100/rotation = Quaternion(-0.0686971, -0.149493, 0.885116, 0.435319)
+bones/101/rotation = Quaternion(-0.138924, -0.19006, 0.941931, 0.239466)
+bones/102/rotation = Quaternion(0.248667, 0.833115, -0.478544, 0.122802)
+bones/103/rotation = Quaternion(0.0731327, -0.0491872, 0.0395466, 0.995323)
+bones/104/rotation = Quaternion(-0.635166, 0.249726, 0.604484, 0.410853)
+bones/105/rotation = Quaternion(0.074729, -0.1694, 0.889084, -0.418627)
+bones/106/rotation = Quaternion(0.159365, -0.195092, 0.955008, -0.156531)
+bones/107/rotation = Quaternion(-0.236496, 0.777121, -0.583217, -0.00314152)
+bones/108/rotation = Quaternion(0.041637, 0.0557916, -0.00101692, 0.997573)
+bones/112/rotation = Quaternion(0.997164, 0.0332636, 0.000280334, -0.0675114)
+bones/113/rotation = Quaternion(0.998783, -0.0168314, -0.00351096, -0.0462342)
+bones/114/position = Vector3(0.111635, 0.106854, 0.118433)
+bones/114/rotation = Quaternion(0.0276923, 0.74408, 0.666955, -0.0273527)
+bones/115/position = Vector3(-0.0909754, 0.109138, 0.127612)
+bones/115/rotation = Quaternion(0.0314504, 0.744724, 0.66627, -0.0219422)
+bones/116/rotation = Quaternion(0.895653, 0.055786, -0.0475846, 0.438668)
+bones/117/rotation = Quaternion(0.207405, -3.23293e-08, 3.38518e-08, 0.978255)
 bones/117/scale = Vector3(1, 1, 0.999994)
-bones/118/rotation = Quaternion(0.179054, 1.02439e-09, 6.5737e-10, 0.983839)
-bones/118/scale = Vector3(1.0338, 1.0338, 1.0338)
-bones/119/rotation = Quaternion(-0.581188, -0.0820236, 0.00897821, 0.809576)
-bones/120/rotation = Quaternion(1.54616e-08, 0.953313, -0.301985, -3.96055e-08)
+bones/118/rotation = Quaternion(0.111737, -1.70468e-09, -3.38048e-09, 0.993738)
+bones/118/scale = Vector3(1.03266, 1.03266, 1.03266)
+bones/119/rotation = Quaternion(-0.527542, -0.0948497, 0.00307055, 0.844212)
+bones/120/rotation = Quaternion(1.63343e-08, 0.959381, -0.282113, -3.9359e-08)
 bones/121/rotation = Quaternion(-0.384436, 5.74738e-10, -6.29245e-09, 0.923152)
-bones/122/position = Vector3(-1.08228e-07, 0.0866613, -0.124063)
-bones/122/rotation = Quaternion(0.982525, 1.22974e-07, -7.44392e-09, 0.186134)
+bones/122/position = Vector3(-1.10605e-07, 0.0866697, -0.124063)
+bones/122/rotation = Quaternion(0.988835, 1.6858e-07, -9.30702e-09, 0.149014)
 bones/122/scale = Vector3(1, 1.00001, 1.00005)
-bones/123/position = Vector3(-7.96793e-09, 0.0552025, -0.129837)
-bones/124/rotation = Quaternion(0.989168, -0.0512671, 0.00888296, 0.13726)
-bones/125/rotation = Quaternion(0.222402, -6.96808e-08, 8.64171e-08, 0.974955)
+bones/123/position = Vector3(-2.9442e-09, 0.0552025, -0.129837)
+bones/124/rotation = Quaternion(0.972286, -0.000760905, 0.00377622, 0.233764)
+bones/125/rotation = Quaternion(0.3574, -1.01769e-07, 2.59751e-07, 0.933951)
 bones/125/scale = Vector3(1, 1, 0.999998)
-bones/126/rotation = Quaternion(0.0779787, -1.62486e-09, 2.49896e-09, 0.996955)
-bones/126/scale = Vector3(1.0049, 1.0049, 1.0049)
+bones/126/rotation = Quaternion(0.194192, 1.08038e-09, 9.18039e-10, 0.980964)
+bones/126/scale = Vector3(1.00604, 1.00604, 1.00603)
 bones/127/position = Vector3(0.0175439, 0.447091, -0.00175865)
-bones/127/rotation = Quaternion(-0.533563, 0.0271813, -0.0492964, 0.843885)
-bones/128/rotation = Quaternion(1.36569e-08, 0.921985, -0.387227, -4.21396e-08)
+bones/127/rotation = Quaternion(-0.616636, 0.0884013, -0.0368789, 0.7814)
+bones/128/rotation = Quaternion(1.56253e-08, 0.939887, -0.341486, -4.17537e-08)
 bones/129/rotation = Quaternion(-0.384436, -5.74738e-10, 4.27475e-09, 0.923152)
-bones/130/position = Vector3(1.03459e-07, 0.0905991, -0.124406)
-bones/130/rotation = Quaternion(0.987956, -1.27593e-07, 1.27023e-08, 0.154733)
+bones/130/position = Vector3(1.00428e-07, 0.0880043, -0.12418)
+bones/130/rotation = Quaternion(0.967216, -1.36611e-07, 7.63393e-09, 0.253954)
 bones/130/scale = Vector3(1, 1, 1.00005)
-bones/131/position = Vector3(-6.50258e-09, 0.0720587, -0.129031)
-bones/132/position = Vector3(0.181294, 1.84115, 1.06563)
-bones/133/position = Vector3(-0.0944969, 1.84115, 1.06563)
-bones/134/position = Vector3(0.327008, 1.46532, 0.032452)
-bones/135/position = Vector3(-0.105681, 1.52769, -0.484711)
+bones/131/position = Vector3(-5.70392e-09, 0.0609566, -0.129562)
+bones/132/position = Vector3(0.187198, 1.84115, 1.06563)
+bones/133/position = Vector3(-0.0885928, 1.84115, 1.06563)
+bones/134/position = Vector3(0.32442, 1.39742, 0.0372229)
+bones/135/position = Vector3(-0.0888666, 1.66098, -0.427314)
 bones/135/rotation = Quaternion(0.998099, -2.22234e-10, 0.0616301, 3.59907e-09)
-bones/136/position = Vector3(-0.0395775, 2.76037, 7.7703)
-bones/137/position = Vector3(0.546845, 2.3441, -0.325532)
+bones/136/position = Vector3(0.00268129, 2.56055, 7.7703)
+bones/137/position = Vector3(0.557749, 2.3575, -0.368711)
 bones/137/rotation = Quaternion(-0.707078, 0.00643217, -0.00643217, 0.707078)
-bones/138/position = Vector3(0.497861, 2.72758, -0.403199)
-bones/139/position = Vector3(-0.303207, 2.40672, 0.0938075)
+bones/138/position = Vector3(0.495816, 2.70715, -0.399974)
+bones/139/position = Vector3(-0.31546, 2.45017, 0.158211)
 bones/139/rotation = Quaternion(-0.707078, 0.00643217, -0.00643217, 0.707078)
-bones/140/position = Vector3(-0.493331, 2.54944, -0.376566)
-bones/142/position = Vector3(-0.137896, 1.37802, -0.626978)
-bones/143/position = Vector3(0.0232121, 3.22754, -1.24379)
-bones/143/rotation = Quaternion(0.997116, 0, -0.0758891, 0)
-bones/143/scale = Vector3(1, 0.985272, 1)
+bones/140/position = Vector3(-0.534667, 2.5764, -0.37891)
+bones/142/position = Vector3(-0.137896, 1.38327, -0.626978)
+bones/143/position = Vector3(0.0175218, 3.21222, -1.24379)
+bones/143/rotation = Quaternion(0.99835, 0, -0.0574184, 0)
+bones/143/scale = Vector3(1, 1.03008, 1)
 
 [node name="GunBone" type="BoneAttachment3D" parent="PlayerModel/Robot_Skeleton/Skeleton3D" index="5"]
-transform = Transform3D(0.350292, 0.169542, -0.924938, 0.663359, 0.6551, 0.37125, 0.666648, -0.740955, 0.116593, -0.324703, 1.12789, 0.0972091)
+transform = Transform3D(0.436536, 0.170919, -0.887242, 0.709297, 0.54571, 0.454029, 0.559914, -0.824562, 0.116573, -0.346575, 1.18472, 0.176002)
 bone_name = "hand.R"
 bone_idx = 55
 
@@ -74128,7 +74129,6 @@ amount = 10
 lifetime = 0.3
 one_shot = true
 explosiveness = 0.79
-fixed_fps = 30
 mesh = SubResource("2")
 direction = Vector3(0, 0, -1)
 spread = 15.0
@@ -74143,14 +74143,23 @@ amount = 1
 lifetime = 0.1
 one_shot = true
 explosiveness = 1.0
-fixed_fps = 30
 mesh = ExtResource("10")
 gravity = Vector3(0, 0, 0)
+scale_amount_min = 0.75
+scale_amount_max = 0.75
 scale_amount_curve = SubResource("6")
+color = Color(0.12549, 0.627451, 1, 0.376471)
 
 [node name="AnimationPlayer" parent="PlayerModel" index="1"]
 callback_mode_process = 0
 
+[node name="Decal" type="Decal" parent="PlayerModel"]
+size = Vector3(1.5, 2, 1.5)
+texture_albedo = ExtResource("7_5auco")
+albedo_mix = 0.5
+upper_fade = 3.63772
+lower_fade = 1.0
+
 [node name="RootMotionView" type="RootMotionView" parent="."]
 animation_path = NodePath("../AnimationTree")
 
@@ -74159,7 +74168,7 @@ root_node = NodePath("../PlayerModel")
 root_motion_track = NodePath("Robot_Skeleton/Skeleton3D:root")
 callback_mode_process = 0
 libraries = {
-"": SubResource("AnimationLibrary_6ta8k")
+"": SubResource("AnimationLibrary_b344y")
 }
 tree_root = SubResource("30")
 anim_player = NodePath("../PlayerModel/AnimationPlayer")
@@ -74210,19 +74219,23 @@ anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
-offset_left = -12.0
-offset_top = -12.0
-offset_right = 12.0
-offset_bottom = 12.0
+offset_left = -8.0
+offset_top = -8.0
+offset_right = 8.0
+offset_bottom = 8.0
+grow_horizontal = 2
+grow_vertical = 2
 texture = ExtResource("3")
-expand_mode = 3
-stretch_mode = 2
+expand_mode = 1
+stretch_mode = 4
 
 [node name="ColorRect" type="ColorRect" parent="."]
 modulate = Color(1, 1, 1, 0)
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
 color = Color(0, 0, 0, 1)
 
 [node name="SoundEffects" type="Node" parent="."]

+ 2 - 0
project.godot

@@ -219,6 +219,8 @@ common/physics_interpolation=true
 
 reflections/sky_reflections/texture_array_reflections=false
 scaling_3d/mode=2
+textures/decals/filter=1
+textures/light_projectors/filter=1
 anti_aliasing/quality/use_debanding=true
 occlusion_culling/use_occlusion_culling=true
 lights_and_shadows/positional_shadow/atlas_size=2048

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff