diff --git a/Zennysoft.Game.Ma/src/enemy/EnemyDie.tres b/Zennysoft.Game.Ma/src/enemy/EnemyDie.tres index bf8adf9b..b7646913 100644 --- a/Zennysoft.Game.Ma/src/enemy/EnemyDie.tres +++ b/Zennysoft.Game.Ma/src/enemy/EnemyDie.tres @@ -1,6 +1,6 @@ [gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://wrsnwuvv1rw3"] -[ext_resource type="Shader" path="res://src/enemy/EnemyDie.gdshader" id="1_pk3sx"] +[ext_resource type="Shader" uid="uid://86pfv5qnd36q" path="res://src/enemy/EnemyDie.gdshader" id="1_pk3sx"] [resource] render_priority = 0 diff --git a/Zennysoft.Game.Ma/src/enemy/EnemyModelView3D.cs b/Zennysoft.Game.Ma/src/enemy/EnemyModelView3D.cs index 3bc86fcb..bcecde02 100644 --- a/Zennysoft.Game.Ma/src/enemy/EnemyModelView3D.cs +++ b/Zennysoft.Game.Ma/src/enemy/EnemyModelView3D.cs @@ -22,6 +22,8 @@ public partial class EnemyModelView3D : Node3D, IEnemyModelView [Node] private AnimationPlayer _animationPlayer { get; set; } = default!; + [Node] private AnimationPlayer _damagePlayer { get; set; } = default!; + [Node] public AnimationTree AnimationTree { get; set; } = default!; [Node] public IHitbox Hitbox { get; set; } = default!; @@ -32,36 +34,36 @@ public partial class EnemyModelView3D : Node3D, IEnemyModelView public void PlayPrimaryAttackAnimation() { - AnimationTree.Get(PARAMETERS_PLAYBACK).As().Travel(PRIMARY_ATTACK); + AnimationTree.Get(PARAMETERS_PLAYBACK).As().Travel(PRIMARY_ATTACK); } public void PlaySecondaryAttackAnimation() { - AnimationTree.Get(PARAMETERS_PLAYBACK).As().Travel(SECONDARY_ATTACK); + AnimationTree.Get(PARAMETERS_PLAYBACK).As().Travel(SECONDARY_ATTACK); } public void PlayPrimarySkillAnimation() { - AnimationTree.Get(PARAMETERS_PLAYBACK).As().Travel(PRIMARY_SKILL); + AnimationTree.Get(PARAMETERS_PLAYBACK).As().Travel(PRIMARY_SKILL); } public void PlayHitAnimation() { - _animationPlayer.Play(TAKE_DAMAGE); + _damagePlayer.Play(TAKE_DAMAGE); } public void PlayDeathAnimation() { - _animationPlayer.Play(DEFEATED); + _damagePlayer.Play(DEFEATED); } public void PlayWalkAnimation() { - AnimationTree.Get(PARAMETERS_PLAYBACK).As().Travel(WALK); + AnimationTree.Get(PARAMETERS_PLAYBACK).As().Travel(WALK); } public void PlayIdleAnimation() { - AnimationTree.Get(PARAMETERS_PLAYBACK).As().Travel(IDLE); + AnimationTree.Get(PARAMETERS_PLAYBACK).As().Travel(IDLE); } } diff --git a/Zennysoft.Game.Ma/src/enemy/defeated.res b/Zennysoft.Game.Ma/src/enemy/defeated.res index 093b5bf7..2e001d77 100644 Binary files a/Zennysoft.Game.Ma/src/enemy/defeated.res and b/Zennysoft.Game.Ma/src/enemy/defeated.res differ diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/04. sara/Sara.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/04. sara/Sara.tscn index 9a088ff5..665e9659 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/04. sara/Sara.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/04. sara/Sara.tscn @@ -81,6 +81,7 @@ collision_mask = 3 [node name="Visual" type="Node3D" parent="."] [node name="EnemyModelView" parent="Visual" instance=ExtResource("4_82s0m")] +unique_name_in_owner = true [node name="Timers" type="Node" parent="."] diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/04. sara/SaraLoreInfo.tres b/Zennysoft.Game.Ma/src/enemy/enemy_types/04. sara/SaraLoreInfo.tres index 23c500ee..97e23882 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/04. sara/SaraLoreInfo.tres +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/04. sara/SaraLoreInfo.tres @@ -1,9 +1,9 @@ [gd_resource type="Resource" script_class="EnemyLoreInfo" load_steps=2 format=3 uid="uid://bctxs1jlkhgmc"] -[ext_resource type="Script" path="res://src/enemy/EnemyLoreInfo.cs" id="1_220d4"] +[ext_resource type="Script" uid="uid://dlsgyx4i1jmp3" path="res://src/enemy/EnemyLoreInfo.cs" id="1_220d4"] [resource] script = ExtResource("1_220d4") -Name = "Sproingy" -Description = "A guy who likes to have fun." -metadata/_custom_type_script = ExtResource("1_220d4") +Name = "" +Description = "" +metadata/_custom_type_script = "uid://dlsgyx4i1jmp3" diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/04. sara/SaraModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/04. sara/SaraModelView.tscn index abaca618..6e6a0472 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/04. sara/SaraModelView.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/04. sara/SaraModelView.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=127 format=3 uid="uid://bli0t0d6ommvi"] +[gd_scene load_steps=166 format=3 uid="uid://bli0t0d6ommvi"] [ext_resource type="Script" uid="uid://cvr1qimxpignl" path="res://src/enemy/EnemyModelView2D.cs" id="1_oh25a"] [ext_resource type="Texture2D" uid="uid://cddgp7j8e3yb6" path="res://src/enemy/enemy_types/04. sara/animations/IDLE_BACK/1.png" id="2_kaqik"] @@ -621,12 +621,21 @@ _data = { [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_sobol"] animation = &"idle_back" +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_wtyys"] +animation = &"idle_back" + [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_pkiq5"] animation = &"idle_front" +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_ftlpx"] +animation = &"idle_front" + [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_pep5o"] animation = &"idle_left" +[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_pfxm2"] +animation = &"idle_left" + [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_r14ie"] animation = &"primary_attack" @@ -681,21 +690,105 @@ switch_mode = 2 [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_muxwo"] switch_mode = 2 +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_q5tap"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_osqmv"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_yfx2u"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_qtw3l"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_dknic"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_cgu3i"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_u17iy"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_dqhfm"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_8yvxr"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_8wbas"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_nybjf"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_x05ki"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_7et5w"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_hmpkn"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_j77nn"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_62h8a"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_1ifgr"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_rlwyu"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_pnlhe"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_hf1ee"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_mcv7m"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_m3t2u"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_jh4gc"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_2jjmk"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_cyvy2"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_jeun6"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_7ynqt"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_c3av8"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_8klos"] +switch_mode = 2 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_bxaaw"] +switch_mode = 2 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_ybkyy"] +switch_mode = 2 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_m041n"] +switch_mode = 2 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_hj8eq"] +switch_mode = 2 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_pbcgo"] +switch_mode = 2 + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_tneej"] + +[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_6r8mp"] + [sub_resource type="AnimationNodeStateMachine" id="AnimationNodeStateMachine_d5bmw"] states/End/position = Vector2(905, 301) states/Start/position = Vector2(29, 290) states/idle_back/node = SubResource("AnimationNodeAnimation_sobol") -states/idle_back/position = Vector2(498.532, 164.977) +states/idle_back/position = Vector2(391.532, 251.977) +states/idle_back_walk/node = SubResource("AnimationNodeAnimation_wtyys") +states/idle_back_walk/position = Vector2(596.532, 143.977) states/idle_front/node = SubResource("AnimationNodeAnimation_pkiq5") -states/idle_front/position = Vector2(270.532, 290) +states/idle_front/position = Vector2(101.532, 347) +states/idle_front_walk/node = SubResource("AnimationNodeAnimation_ftlpx") +states/idle_front_walk/position = Vector2(73.532, 176.977) states/idle_left/node = SubResource("AnimationNodeAnimation_pep5o") -states/idle_left/position = Vector2(431.532, 573.977) +states/idle_left/position = Vector2(443.532, 809.977) +states/idle_left_walk/node = SubResource("AnimationNodeAnimation_pfxm2") +states/idle_left_walk/position = Vector2(-255.468, 571.977) states/primary_attack/node = SubResource("AnimationNodeAnimation_r14ie") -states/primary_attack/position = Vector2(757.532, 257.977) +states/primary_attack/position = Vector2(1032.53, 251.977) states/secondary_attack/node = SubResource("AnimationNodeAnimation_iw0no") -states/secondary_attack/position = Vector2(784.532, 557.977) -transitions = ["idle_front", "idle_left", SubResource("AnimationNodeStateMachineTransition_wtyys"), "idle_left", "idle_front", SubResource("AnimationNodeStateMachineTransition_ftlpx"), "idle_front", "idle_back", SubResource("AnimationNodeStateMachineTransition_pfxm2"), "idle_back", "idle_front", SubResource("AnimationNodeStateMachineTransition_0p57o"), "idle_left", "idle_back", SubResource("AnimationNodeStateMachineTransition_4070g"), "idle_back", "idle_left", SubResource("AnimationNodeStateMachineTransition_qd8rk"), "idle_back", "primary_attack", SubResource("AnimationNodeStateMachineTransition_wfk5u"), "idle_front", "primary_attack", SubResource("AnimationNodeStateMachineTransition_v7k5y"), "idle_left", "primary_attack", SubResource("AnimationNodeStateMachineTransition_tff1e"), "primary_attack", "idle_back", SubResource("AnimationNodeStateMachineTransition_yaeox"), "primary_attack", "idle_front", SubResource("AnimationNodeStateMachineTransition_ar6u5"), "primary_attack", "idle_left", SubResource("AnimationNodeStateMachineTransition_63kln"), "idle_back", "secondary_attack", SubResource("AnimationNodeStateMachineTransition_edyim"), "idle_front", "secondary_attack", SubResource("AnimationNodeStateMachineTransition_7aslh"), "idle_left", "secondary_attack", SubResource("AnimationNodeStateMachineTransition_0xylu"), "secondary_attack", "idle_back", SubResource("AnimationNodeStateMachineTransition_4pr4i"), "secondary_attack", "idle_front", SubResource("AnimationNodeStateMachineTransition_6sacx"), "secondary_attack", "idle_left", SubResource("AnimationNodeStateMachineTransition_muxwo")] -graph_offset = Vector2(-448.468, 116.977) +states/secondary_attack/position = Vector2(797.532, 686.977) +transitions = ["idle_front", "idle_left", SubResource("AnimationNodeStateMachineTransition_wtyys"), "idle_left", "idle_front", SubResource("AnimationNodeStateMachineTransition_ftlpx"), "idle_front", "idle_back", SubResource("AnimationNodeStateMachineTransition_pfxm2"), "idle_back", "idle_front", SubResource("AnimationNodeStateMachineTransition_0p57o"), "idle_left", "idle_back", SubResource("AnimationNodeStateMachineTransition_4070g"), "idle_back", "idle_left", SubResource("AnimationNodeStateMachineTransition_qd8rk"), "idle_back", "primary_attack", SubResource("AnimationNodeStateMachineTransition_wfk5u"), "idle_front", "primary_attack", SubResource("AnimationNodeStateMachineTransition_v7k5y"), "idle_left", "primary_attack", SubResource("AnimationNodeStateMachineTransition_tff1e"), "primary_attack", "idle_back", SubResource("AnimationNodeStateMachineTransition_yaeox"), "primary_attack", "idle_front", SubResource("AnimationNodeStateMachineTransition_ar6u5"), "primary_attack", "idle_left", SubResource("AnimationNodeStateMachineTransition_63kln"), "idle_back", "secondary_attack", SubResource("AnimationNodeStateMachineTransition_edyim"), "idle_front", "secondary_attack", SubResource("AnimationNodeStateMachineTransition_7aslh"), "idle_left", "secondary_attack", SubResource("AnimationNodeStateMachineTransition_0xylu"), "secondary_attack", "idle_back", SubResource("AnimationNodeStateMachineTransition_4pr4i"), "secondary_attack", "idle_front", SubResource("AnimationNodeStateMachineTransition_6sacx"), "secondary_attack", "idle_left", SubResource("AnimationNodeStateMachineTransition_muxwo"), "idle_front", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_q5tap"), "idle_front_walk", "idle_front", SubResource("AnimationNodeStateMachineTransition_osqmv"), "idle_front_walk", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_yfx2u"), "idle_left_walk", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_qtw3l"), "idle_front_walk", "idle_left", SubResource("AnimationNodeStateMachineTransition_dknic"), "idle_left", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_cgu3i"), "idle_front_walk", "idle_back", SubResource("AnimationNodeStateMachineTransition_u17iy"), "idle_back", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_dqhfm"), "idle_front_walk", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_8yvxr"), "idle_back_walk", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_8wbas"), "idle_front_walk", "primary_attack", SubResource("AnimationNodeStateMachineTransition_nybjf"), "idle_front_walk", "secondary_attack", SubResource("AnimationNodeStateMachineTransition_x05ki"), "idle_left_walk", "idle_front", SubResource("AnimationNodeStateMachineTransition_7et5w"), "idle_front", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_hmpkn"), "idle_left_walk", "idle_left", SubResource("AnimationNodeStateMachineTransition_j77nn"), "idle_left", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_62h8a"), "idle_left_walk", "secondary_attack", SubResource("AnimationNodeStateMachineTransition_1ifgr"), "idle_left_walk", "primary_attack", SubResource("AnimationNodeStateMachineTransition_rlwyu"), "idle_left_walk", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_pnlhe"), "idle_back_walk", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_hf1ee"), "idle_back", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_mcv7m"), "idle_left_walk", "idle_back", SubResource("AnimationNodeStateMachineTransition_m3t2u"), "idle_back_walk", "idle_left", SubResource("AnimationNodeStateMachineTransition_jh4gc"), "idle_left", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_2jjmk"), "idle_back_walk", "idle_back", SubResource("AnimationNodeStateMachineTransition_cyvy2"), "idle_back", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_jeun6"), "idle_back_walk", "primary_attack", SubResource("AnimationNodeStateMachineTransition_7ynqt"), "idle_back_walk", "secondary_attack", SubResource("AnimationNodeStateMachineTransition_c3av8"), "secondary_attack", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_8klos"), "secondary_attack", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_bxaaw"), "secondary_attack", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_ybkyy"), "primary_attack", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_m041n"), "primary_attack", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_hj8eq"), "primary_attack", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_pbcgo"), "idle_front", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_tneej"), "idle_back_walk", "idle_front", SubResource("AnimationNodeStateMachineTransition_6r8mp")] +graph_offset = Vector2(-448.468, 288.816) [node name="EnemyModelView" type="Node3D"] script = ExtResource("1_oh25a") diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFaceModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFaceModelView.tscn index b9a7cf1c..7167b514 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFaceModelView.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFaceModelView.tscn @@ -1,10 +1,12 @@ -[gd_scene load_steps=34 format=4 uid="uid://bid6f48l0q58o"] +[gd_scene load_steps=39 format=4 uid="uid://bid6f48l0q58o"] [ext_resource type="Script" uid="uid://ckv5dmrw6pvn6" path="res://src/enemy/EnemyModelView3D.cs" id="1_q3bfl"] [ext_resource type="Texture2D" uid="uid://2e4cp477ex0t" path="res://src/enemy/enemy_types/14. horse_head/animation/Horse Head 1_Metal054C_1K-JPG_Color.jpg" id="1_vv6g0"] [ext_resource type="Animation" uid="uid://bhsp32c05j2o5" path="res://src/enemy/enemy_types/14. horse_head/animation/walking.res" id="2_yvw71"] [ext_resource type="Animation" uid="uid://ccq41qrm1lduk" path="res://src/enemy/enemy_types/14. horse_head/animation/walking2.res" id="3_bkc4x"] [ext_resource type="Script" uid="uid://6edayafleq8y" path="res://src/hitbox/Hitbox.cs" id="4_bkc4x"] +[ext_resource type="Animation" uid="uid://cttdq1c2wjrs6" path="res://src/enemy/take_damage.res" id="6_0er43"] +[ext_resource type="Animation" uid="uid://2vqtvhbhe0ba" path="res://src/enemy/defeated.res" id="7_i2g67"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_tv6dm"] resource_name = "Material" @@ -865,8 +867,36 @@ tracks/32/interp = 1 tracks/32/loop_wrap = true tracks/32/keys = PackedFloat32Array(0, 1, -0.514417, -0.701671, 0.342235, 0.354835, 0.0333333, 1, -0.516575, -0.696077, 0.34818, 0.356928, 0.0666667, 1, -0.521046, -0.683648, 0.361099, 0.361585, 0.1, 1, -0.526802, -0.665825, 0.378966, 0.368161, 0.133333, 1, -0.532831, -0.644142, 0.399731, 0.376016, 0.166667, 1, -0.538235, -0.620345, 0.421387, 0.384587, 0.2, 1, -0.541623, -0.598138, 0.440584, 0.393398, 0.233333, 1, -0.543484, -0.578544, 0.457025, 0.401298, 0.266667, 1, -0.544416, -0.56113, 0.47147, 0.407996, 0.3, 1, -0.544778, -0.545632, 0.484336, 0.413427, 0.333333, 1, -0.544721, -0.531989, 0.495718, 0.417767, 0.366667, 1, -0.544377, -0.520646, 0.505311, 0.421002, 0.4, 1, -0.543924, -0.510791, 0.513622, 0.423594, 0.433333, 1, -0.543459, -0.502293, 0.520716, 0.425687, 0.466667, 1, -0.543068, -0.495006, 0.52665, 0.427418, 0.5, 1, -0.542828, -0.488779, 0.531472, 0.428917, 0.533333, 1, -0.542927, -0.483649, 0.534893, 0.430352, 0.566667, 1, -0.543361, -0.479085, 0.537304, 0.431904, 0.6, 1, -0.544186, -0.474919, 0.538729, 0.433686, 0.633333, 1, -0.545455, -0.470982, 0.539193, 0.435806, 0.666667, 1, -0.547213, -0.467098, 0.538712, 0.438368, 0.7, 1, -0.549718, -0.46294, 0.537006, 0.441725, 0.733333, 1, -0.552835, -0.458304, 0.534392, 0.445821, 0.766667, 1, -0.556593, -0.453005, 0.530871, 0.450742, 0.8, 1, -0.561009, -0.446855, 0.526438, 0.456567, 0.833333, 1, -0.566094, -0.43966, 0.521083, 0.463367, 0.866667, 1, -0.574512, -0.428383, 0.511969, 0.473617, 0.9, 1, -0.580739, -0.420013, 0.504981, 0.480963, 0.933333, 1, -0.583481, -0.416308, 0.501836, 0.484146, 1.5, 1, -0.583481, -0.416308, 0.501836, 0.484147, 1.53333, 1, -0.586926, -0.412707, 0.504724, 0.480046, 1.56667, 1, -0.593849, -0.405313, 0.510547, 0.4716, 1.6, 1, -0.602537, -0.395719, 0.517887, 0.460596, 1.63333, 1, -0.611371, -0.385577, 0.525409, 0.44889, 1.66667, 1, -0.618875, -0.376627, 0.531899, 0.43844, 1.7, 1, -0.62194, -0.372867, 0.534831, 0.433723, 1.73333, 1, -0.621975, -0.376239, 0.534019, 0.431758, 1.76667, 1, -0.620122, -0.387062, 0.529695, 0.430181, 1.8, 1, -0.616869, -0.404941, 0.52204, 0.42775, 1.83333, 1, -0.61211, -0.428794, 0.511234, 0.424379, 1.86667, 1, -0.605462, -0.458552, 0.496893, 0.419813, 1.9, 1, -0.597286, -0.490892, 0.480276, 0.414256, 1.93333, 1, -0.587653, -0.524555, 0.461789, 0.407745, 2, 1, -0.564883, -0.591093, 0.421348, 0.392406, 2.03333, 1, -0.552901, -0.620859, 0.401387, 0.384349, 2.06667, 1, -0.54137, -0.646947, 0.382828, 0.376592, 2.1, 1, -0.530904, -0.668795, 0.366451, 0.36955, 2.13333, 1, -0.522132, -0.685942, 0.353021, 0.363646, 2.16667, 1, -0.515661, -0.697975, 0.34327, 0.359292, 2.2, 1, -0.513299, -0.702245, 0.339742, 0.357704, 2.20833, 1, -0.512705, -0.703308, 0.338857, 0.357304) +[sub_resource type="Animation" id="Animation_i2g67"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Armature/Skeleton3D/Cube_035:material_override") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [null] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath("Armature/Skeleton3D/Cube_035:transparency") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [0.0] +} + [sub_resource type="AnimationLibrary" id="AnimationLibrary_h244y"] _data = { +&"RESET": SubResource("Animation_i2g67"), &"attack_walk": ExtResource("2_yvw71"), &"idle": SubResource("Animation_bsekl"), &"primary_attack": SubResource("Animation_wf6hu"), @@ -874,6 +904,28 @@ _data = { &"walk": ExtResource("3_bkc4x") } +[sub_resource type="Animation" id="Animation_i5d3v"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Armature/Skeleton3D/Cube_035:material_override") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [null] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_q73y1"] +_data = { +&"RESET": SubResource("Animation_i5d3v"), +&"defeated": ExtResource("7_i2g67"), +&"take_damage": ExtResource("6_0er43") +} + [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_b3lw2"] animation = &"attack_walk" @@ -946,15 +998,15 @@ bones/0/name = "spine1" bones/0/parent = -1 bones/0/rest = Transform3D(1.49012e-06, 0.00846654, -0.999964, 2.93367e-08, 0.999964, 0.00846654, 1, -4.23752e-08, 1.49012e-06, 0.000155807, -0.00105953, -2.01735) bones/0/enabled = true -bones/0/position = Vector3(0.104478, -0.336349, -1.53144) -bones/0/rotation = Quaternion(0.0282287, -0.805736, 0.00830401, 0.591544) +bones/0/position = Vector3(0.0996386, -0.425489, -1.53144) +bones/0/rotation = Quaternion(0.0256267, -0.805691, 0.0118477, 0.591662) bones/0/scale = Vector3(1, 1, 1) bones/1/name = "spine0" bones/1/parent = 0 bones/1/rest = Transform3D(0.978036, -0.207805, 0.0162095, 0.208126, 0.977864, -0.021554, -0.0113716, 0.0244542, 0.999636, 3.72054e-09, 2.48165, 7.14749e-08) bones/1/enabled = true bones/1/position = Vector3(3.72054e-09, 2.48165, 7.14749e-08) -bones/1/rotation = Quaternion(-0.0131985, -0.120125, -0.244974, 0.961969) +bones/1/rotation = Quaternion(-0.0145981, -0.120534, -0.248151, 0.961083) bones/1/scale = Vector3(1, 1, 1) bones/2/name = "neck1" bones/2/parent = 1 @@ -968,14 +1020,14 @@ bones/3/parent = 2 bones/3/rest = Transform3D(0.998394, -0.0314302, 0.0471444, 0.0306775, 0.999391, 0.016606, -0.0476376, -0.015133, 0.99875, 2.23517e-07, 1.61011, -1.04308e-07) bones/3/enabled = true bones/3/position = Vector3(2.23517e-07, 1.61011, -1.04308e-07) -bones/3/rotation = Quaternion(-0.00967744, 0.0223004, 0.0124265, 0.999627) +bones/3/rotation = Quaternion(-0.00793817, 0.0237057, 0.0155337, 0.999567) bones/3/scale = Vector3(1, 1, 1) bones/4/name = "neck3" bones/4/parent = 3 bones/4/rest = Transform3D(0.901905, -0.410135, 0.135488, 0.412416, 0.910915, 0.0120912, -0.128377, 0.0449723, 0.990705, 2.5332e-07, 0.990515, -7.07805e-08) bones/4/enabled = true bones/4/position = Vector3(2.5332e-07, 0.990515, -7.07805e-08) -bones/4/rotation = Quaternion(0.0109698, 0.0691156, 0.21559, 0.973973) +bones/4/rotation = Quaternion(-0.00553085, 0.0595498, 0.184892, 0.980937) bones/4/scale = Vector3(1, 1, 1) bones/5/name = "neck4" bones/5/parent = 4 @@ -989,49 +1041,49 @@ bones/6/parent = 5 bones/6/rest = Transform3D(0.0598389, 0.98531, 0.15995, -0.975271, 0.0235553, 0.219755, 0.212759, -0.169144, 0.962353, 3.65078e-07, 1.40318, 0) bones/6/enabled = true bones/6/position = Vector3(3.65078e-07, 1.40318, 0) -bones/6/rotation = Quaternion(-0.325025, 0.0855093, -0.499725, 0.798324) +bones/6/rotation = Quaternion(-0.328118, 0.0506861, -0.452772, 0.827506) bones/6/scale = Vector3(1, 1, 1) bones/7/name = "Bone.007" bones/7/parent = 6 bones/7/rest = Transform3D(0.919359, 0.388053, -0.0647639, -0.392726, 0.91499, -0.0925153, 0.0233576, 0.110489, 0.993603, -1.81049e-06, 1.774, 3.31551e-07) bones/7/enabled = true bones/7/position = Vector3(-1.81049e-06, 1.774, 3.31551e-07) -bones/7/rotation = Quaternion(0.0518791, -0.02252, -0.199533, 0.978258) +bones/7/rotation = Quaternion(0.051879, -0.02252, -0.199533, 0.978258) bones/7/scale = Vector3(1, 1, 1) bones/8/name = "TOP OF SKULL" bones/8/parent = 7 bones/8/rest = Transform3D(0.737897, 0.668505, 0.0927903, -0.666136, 0.699281, 0.259362, 0.108498, -0.253193, 0.961312, -1.41654e-06, 1.52173, -1.23307e-06) bones/8/enabled = true bones/8/position = Vector3(-1.41654e-06, 1.52173, -1.23307e-06) -bones/8/rotation = Quaternion(-0.139017, -0.00426043, -0.361986, 0.92175) +bones/8/rotation = Quaternion(-0.139017, -0.00426026, -0.361986, 0.92175) bones/8/scale = Vector3(1, 1, 1) bones/9/name = "Bone.009" bones/9/parent = 6 bones/9/rest = Transform3D(-0.103913, 0.969259, 0.223021, -0.986095, -0.12964, 0.103969, 0.129686, -0.209116, 0.969253, -1.81049e-06, 1.774, 3.31551e-07) bones/9/enabled = true bones/9/position = Vector3(-1.81049e-06, 1.774, 3.31551e-07) -bones/9/rotation = Quaternion(-0.118822, 0.0354225, -0.742093, 0.65873) +bones/9/rotation = Quaternion(-0.118822, 0.0354223, -0.742093, 0.65873) bones/9/scale = Vector3(1, 1, 1) bones/10/name = "Bone.010" bones/10/parent = 9 bones/10/rest = Transform3D(0.73102, -0.682334, -0.00551312, 0.677742, 0.726991, -0.110229, 0.0792208, 0.076843, 0.993891, -2.98023e-07, 2.05216, 2.38419e-07) bones/10/enabled = true bones/10/position = Vector3(-2.98023e-07, 2.05216, 2.38419e-07) -bones/10/rotation = Quaternion(0.0503441, -0.0228033, 0.366019, 0.928965) +bones/10/rotation = Quaternion(0.0503442, -0.0228033, 0.366019, 0.928965) bones/10/scale = Vector3(1, 1, 1) bones/11/name = "arm1_L" bones/11/parent = 1 bones/11/rest = Transform3D(0.981457, 0.0769315, -0.175568, 0.18837, -0.217537, 0.957703, 0.035485, -0.973015, -0.227995, -1.09896e-07, 3.84743, -2.10479e-07) bones/11/enabled = true bones/11/position = Vector3(-1.09896e-07, 3.84743, -2.10479e-07) -bones/11/rotation = Quaternion(-0.805738, -0.0791136, -0.0234744, 0.586495) +bones/11/rotation = Quaternion(-0.813964, -0.0945, -0.0238288, 0.572682) bones/11/scale = Vector3(1, 1, 1) bones/12/name = "arm2_L" bones/12/parent = 11 bones/12/rest = Transform3D(0.999962, 0.00846541, -0.00203671, -0.00853764, 0.99922, -0.0385481, 0.0017088, 0.038564, 0.999255, 8.19564e-07, 3.65838, 1.35601e-06) bones/12/enabled = true bones/12/position = Vector3(8.19564e-07, 3.65838, 1.35601e-06) -bones/12/rotation = Quaternion(-0.110517, 0.104857, -0.148408, 0.977121) +bones/12/rotation = Quaternion(-0.115057, 0.109368, -0.147698, 0.97621) bones/12/scale = Vector3(1, 1, 1) bones/13/name = "arm3_L" bones/13/parent = 12 @@ -1051,7 +1103,7 @@ bones/15/name = "arm1_R" bones/15/parent = 1 bones/15/rest = Transform3D(-0.98213, 0.0512573, -0.181089, -0.187541, -0.185921, 0.964501, 0.0157694, 0.981227, 0.192212, 0.00107862, 3.8461, -0.0821097) bones/15/enabled = true -bones/15/position = Vector3(-0.203939, 3.66122, 0.0735636) +bones/15/position = Vector3(-0.170691, 3.40553, 0.121909) bones/15/rotation = Quaternion(-0.502686, 0.531044, 0.680821, -0.0422068) bones/15/scale = Vector3(1, 1, 1) bones/16/name = "arm2_R" @@ -1059,14 +1111,14 @@ bones/16/parent = 15 bones/16/rest = Transform3D(0.999962, -0.00846545, 0.00203661, 0.00853768, 0.99922, -0.0385481, -0.0017087, 0.038564, 0.999254, -4.28408e-07, 3.65838, -2.16067e-06) bones/16/enabled = true bones/16/position = Vector3(-4.28408e-07, 3.65838, -2.16067e-06) -bones/16/rotation = Quaternion(-0.167967, 0.00983894, -0.337985, 0.92599) +bones/16/rotation = Quaternion(-0.167967, 0.00983893, -0.337985, 0.92599) bones/16/scale = Vector3(1, 1, 1) bones/17/name = "arm3_R" bones/17/parent = 16 bones/17/rest = Transform3D(0.998789, 0.0488077, -0.00615137, -0.0491113, 0.996528, -0.0672226, 0.00284903, 0.0674433, 0.997719, -5.21541e-08, 3.04263, -1.31503e-06) bones/17/enabled = true bones/17/position = Vector3(-5.21541e-08, 3.04263, -1.31503e-06) -bones/17/rotation = Quaternion(-0.0414144, 0.0972074, 0.266507, 0.958024) +bones/17/rotation = Quaternion(-0.0100291, 0.0961115, 0.277396, 0.955884) bones/17/scale = Vector3(1, 1, 1) bones/18/name = "hand_R" bones/18/parent = 17 @@ -1079,7 +1131,7 @@ bones/19/name = "hip_L" bones/19/parent = -1 bones/19/rest = Transform3D(0.138486, 0.897208, 0.419333, -0.129033, -0.403458, 0.905854, 0.981923, -0.179556, 0.059896, 0.000155807, -0.00105953, -2.01735) bones/19/enabled = true -bones/19/position = Vector3(0.147751, -0.278747, -1.49267) +bones/19/position = Vector3(0.147751, -0.366737, -1.49267) bones/19/rotation = Quaternion(0.427793, 0.34021, 0.687061, -0.478745) bones/19/scale = Vector3(1, 1, 1) bones/20/name = "leg1_L" @@ -1087,21 +1139,21 @@ bones/20/parent = 19 bones/20/rest = Transform3D(0.945603, 0.113405, 0.304916, -0.324072, 0.410457, 0.852351, -0.0284943, -0.9048, 0.424881, 2.08616e-07, 2.00996, -7.1153e-07) bones/20/enabled = true bones/20/position = Vector3(2.08616e-07, 2.00996, -7.1153e-07) -bones/20/rotation = Quaternion(-0.445543, -0.327094, -0.417177, 0.721432) +bones/20/rotation = Quaternion(-0.433913, -0.330085, -0.375304, 0.749607) bones/20/scale = Vector3(1, 1, 1) bones/21/name = "leg2_L" bones/21/parent = 20 bones/21/rest = Transform3D(0.990336, -0.138679, 0.00180777, 0.138628, 0.990193, 0.0173138, -0.00419111, -0.0168959, 0.999848, 5.96046e-08, 5.85994, -5.23403e-07) bones/21/enabled = true bones/21/position = Vector3(5.96046e-08, 5.85994, -5.23403e-07) -bones/21/rotation = Quaternion(-0.0625342, 0.00137561, 0.523428, 0.849771) +bones/21/rotation = Quaternion(-0.0493778, 0.00187693, 0.394976, 0.917362) bones/21/scale = Vector3(1, 1, 1) bones/22/name = "foot1_L" bones/22/parent = 21 bones/22/rest = Transform3D(0.101237, 0.986735, -0.126909, -0.955585, 0.0609561, -0.288344, -0.276783, 0.150463, 0.94908, 4.47035e-08, 7.00093, 2.65427e-08) bones/22/enabled = true bones/22/position = Vector3(4.47035e-08, 7.00093, 2.65427e-08) -bones/22/rotation = Quaternion(0.150998, 0.0515735, -0.668372, 0.726511) +bones/22/rotation = Quaternion(0.150998, 0.0515734, -0.668372, 0.726511) bones/22/scale = Vector3(1, 1, 1) bones/23/name = "foot2_L" bones/23/parent = 22 @@ -1114,21 +1166,21 @@ bones/24/name = "kneeIK_L" bones/24/parent = -1 bones/24/rest = Transform3D(-0.176321, 1.3113e-06, 0.984333, 0.984333, 1.54972e-06, 0.176321, -1.3113e-06, 1, -1.54972e-06, 1.83022, -6.67107, 3.18901) bones/24/enabled = true -bones/24/position = Vector3(1.54491, -6.6192, 3.18901) -bones/24/rotation = Quaternion(0.442335, 0.551671, 0.551669, 0.442335) +bones/24/position = Vector3(2.31525, -7.34861, 2.3999) +bones/24/rotation = Quaternion(0.350356, 0.345508, 0.703917, 0.512226) bones/24/scale = Vector3(1, 1, 1) bones/25/name = "heelIK_L" bones/25/parent = -1 bones/25/rest = Transform3D(-0.16376, -1.63913e-06, 0.9865, -0.9865, 1.19209e-07, -0.16376, 8.9407e-08, -1, -1.66893e-06, 1.91204, -13.5859, -3.56646) bones/25/enabled = true -bones/25/position = Vector3(2.15898, -11.7376, 0.159555) -bones/25/rotation = Quaternion(-0.452381, 0.544357, -0.541398, 0.453779) +bones/25/position = Vector3(2.86478, -12.4291, 1.43256) +bones/25/rotation = Quaternion(-0.253375, 0.464951, -0.563517, 0.63409) bones/25/scale = Vector3(1, 1, 1) bones/26/name = "hip_R" bones/26/parent = -1 bones/26/rest = Transform3D(0.138486, -0.897208, -0.419333, 0.129033, -0.403458, 0.905854, -0.981923, -0.179556, 0.059896, -0.000155807, -0.00105953, -2.01735) bones/26/enabled = true -bones/26/position = Vector3(0.0289172, -0.295789, -1.59603) +bones/26/position = Vector3(0.0289172, -0.354449, -1.59603) bones/26/rotation = Quaternion(0.695067, -0.09936, -0.377924, -0.603475) bones/26/scale = Vector3(1, 1, 1) bones/27/name = "leg1_R" @@ -1136,21 +1188,21 @@ bones/27/parent = 26 bones/27/rest = Transform3D(0.945603, -0.113405, -0.304916, 0.324072, 0.410457, 0.852351, 0.0284943, -0.9048, 0.424881, -9.54606e-09, 2.00996, -3.52971e-07) bones/27/enabled = true bones/27/position = Vector3(-9.54606e-09, 2.00996, -3.52971e-07) -bones/27/rotation = Quaternion(-0.463995, -0.132815, 0.536092, 0.692585) +bones/27/rotation = Quaternion(-0.312194, 0.177893, 0.184271, 0.914841) bones/27/scale = Vector3(1, 1, 1) bones/28/name = "leg2_R" bones/28/parent = 27 bones/28/rest = Transform3D(0.990336, 0.138679, -0.00180777, -0.138628, 0.990193, 0.0173138, 0.00419111, -0.0168959, 0.999848, 4.51691e-08, 5.85994, -3.72529e-09) bones/28/enabled = true bones/28/position = Vector3(4.51691e-08, 5.85994, -3.72529e-09) -bones/28/rotation = Quaternion(-0.0787076, -0.00227073, -0.641211, 0.763314) +bones/28/rotation = Quaternion(-0.277924, 0.0201355, -0.181342, 0.943116) bones/28/scale = Vector3(1, 1, 1) bones/29/name = "foot1_R" bones/29/parent = 28 bones/29/rest = Transform3D(0.101237, -0.986735, 0.126909, 0.955585, 0.0609561, -0.288344, 0.276783, 0.150463, 0.94908, -1.2666e-07, 7.00093, 4.19095e-09) bones/29/enabled = true bones/29/position = Vector3(-1.2666e-07, 7.00093, 4.19095e-09) -bones/29/rotation = Quaternion(0.150998, -0.0515735, 0.668372, 0.726511) +bones/29/rotation = Quaternion(0.150998, -0.0515734, 0.668372, 0.726511) bones/29/scale = Vector3(1, 1, 1) bones/30/name = "foot2_R" bones/30/parent = 29 @@ -1163,15 +1215,15 @@ bones/31/name = "kneeIK_R" bones/31/parent = -1 bones/31/rest = Transform3D(-0.176321, -1.3113e-06, -0.984333, -0.984333, 1.54972e-06, 0.176321, 1.3113e-06, 1, -1.54972e-06, -1.83022, -6.67107, 3.18901) bones/31/enabled = true -bones/31/position = Vector3(-1.0737, -6.73592, 3.18901) -bones/31/rotation = Quaternion(-0.453784, 0.542293, 0.542291, -0.453784) +bones/31/position = Vector3(-3.50195, -6.14899, -3.29558) +bones/31/rotation = Quaternion(-0.631114, 0.565121, 0.468982, -0.249777) bones/31/scale = Vector3(1, 1, 1) bones/32/name = "heelIK_R" bones/32/parent = -1 bones/32/rest = Transform3D(-0.16376, 1.63913e-06, -0.9865, 0.9865, 1.19209e-07, -0.16376, -8.9407e-08, -1, -1.66893e-06, -1.91204, -13.5859, -3.56646) bones/32/enabled = true -bones/32/position = Vector3(-1.9167, -9.9376, -6.71761) -bones/32/rotation = Quaternion(0.456226, 0.540424, -0.539809, -0.456516) +bones/32/position = Vector3(-3.87024, -12.3974, -5.7547) +bones/32/rotation = Quaternion(0.514417, 0.701671, -0.342235, -0.354835) bones/32/scale = Vector3(1, 1, 1) [node name="Cube_035" type="MeshInstance3D" parent="Armature/Skeleton3D"] @@ -1179,7 +1231,7 @@ mesh = SubResource("ArrayMesh_6e63x") skin = SubResource("Skin_yvw71") [node name="BoneAttachment3D" type="BoneAttachment3D" parent="Armature/Skeleton3D"] -transform = Transform3D(-0.350128, -0.0609955, -0.934714, -0.292161, -0.940986, 0.170843, -0.889973, 0.332904, 0.311645, -1.93219, 8.75996, 6.16943) +transform = Transform3D(-0.370165, -0.13327, -0.919357, -0.301508, -0.918844, 0.254593, -0.878676, 0.371435, 0.299942, -2.00357, 8.72419, 6.32127) bone_name = "TOP OF SKULL" bone_idx = 8 @@ -1208,6 +1260,12 @@ libraries = { &"": SubResource("AnimationLibrary_h244y") } +[node name="DamagePlayer" type="AnimationPlayer" parent="."] +unique_name_in_owner = true +libraries = { +&"": SubResource("AnimationLibrary_q73y1") +} + [node name="AnimationTree" type="AnimationTree" parent="."] unique_name_in_owner = true root_node = NodePath("%AnimationTree/..") diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/animation/OxFaceAnimations.tres b/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/animation/OxFaceAnimations.tres index 08b6cf5f..f55565ff 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/animation/OxFaceAnimations.tres +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/animation/OxFaceAnimations.tres @@ -1,4 +1,6 @@ -[gd_resource type="AnimationLibrary" load_steps=6 format=3 uid="uid://dn4501qsypsu"] +[gd_resource type="AnimationLibrary" load_steps=7 format=3 uid="uid://dn4501qsypsu"] + +[ext_resource type="Shader" uid="uid://86pfv5qnd36q" path="res://src/enemy/EnemyDie.gdshader" id="1_il05d"] [sub_resource type="Animation" id="Animation_ttkyx"] length = 0.001 @@ -26,6 +28,42 @@ tracks/1/keys = { "update": 0, "values": [true] } +tracks/2/type = "value" +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/path = NodePath("Armature/Skeleton3D/Cube_035:material_override") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [null] +} +tracks/3/type = "value" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("Armature/Skeleton3D/Cube_035:material_override:shader") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [ExtResource("1_il05d")] +} +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath("Armature/Skeleton3D/Cube_035:transparency") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [0.0] +} [sub_resource type="Animation" id="Animation_sfyuh"] resource_name = "idle" diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFaceModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFaceModelView.tscn index 5e4d3b29..fb10b460 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFaceModelView.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFaceModelView.tscn @@ -1,8 +1,10 @@ -[gd_scene load_steps=25 format=4 uid="uid://dnomfbym36ivg"] +[gd_scene load_steps=29 format=4 uid="uid://dnomfbym36ivg"] [ext_resource type="Script" uid="uid://ckv5dmrw6pvn6" path="res://src/enemy/EnemyModelView3D.cs" id="1_6miqu"] [ext_resource type="Texture2D" uid="uid://dp6hwvuhfkji8" path="res://src/enemy/enemy_types/15. ox_face/models/OX FACE_Metal054C_1K-JPG_Color.jpg" id="1_lsf8e"] [ext_resource type="AnimationLibrary" uid="uid://dn4501qsypsu" path="res://src/enemy/enemy_types/14. horse_head/animation/OxFaceAnimations.tres" id="3_pmgg3"] +[ext_resource type="Animation" uid="uid://2vqtvhbhe0ba" path="res://src/enemy/defeated.res" id="4_i5d3v"] +[ext_resource type="Animation" uid="uid://cttdq1c2wjrs6" path="res://src/enemy/take_damage.res" id="5_5s5ab"] [ext_resource type="Script" uid="uid://6edayafleq8y" path="res://src/hitbox/Hitbox.cs" id="5_f2iok"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_y7226"] @@ -134,6 +136,28 @@ bind/32/name = &"heelIK_R" bind/32/bone = -1 bind/32/pose = Transform3D(-0.16376, 0.9865, -2.58876e-07, 1.58082e-06, 2.84217e-14, -1, -0.9865, -0.16376, -1.55948e-06, 0.296279, -1.51158, -0.141545) +[sub_resource type="Animation" id="Animation_i5d3v"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Armature/Skeleton3D/Cube_035:material_override") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [null] +} + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_q73y1"] +_data = { +&"RESET": SubResource("Animation_i5d3v"), +&"defeated": ExtResource("4_i5d3v"), +&"take_damage": ExtResource("5_5s5ab") +} + [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_pmgg3"] animation = &"idle" @@ -429,7 +453,7 @@ bones/32/rotation = Quaternion(0.456756, 0.539878, -0.539587, -0.456893) bones/32/scale = Vector3(1, 1, 1) [node name="BoneAttachment3D" type="BoneAttachment3D" parent="Armature/Skeleton3D"] -transform = Transform3D(-0.293971, -0.0792461, -0.952524, -0.329406, -0.927105, 0.178793, -0.897258, 0.366328, 0.246437, -1.66466, 8.29246, 4.94882) +transform = Transform3D(-0.29397, -0.0792464, -0.952524, -0.329406, -0.927105, 0.178794, -0.897258, 0.366327, 0.246437, -1.66466, 8.29245, 4.94882) bone_name = "TOP OF SKULL" bone_idx = 8 @@ -451,6 +475,12 @@ libraries = { &"": ExtResource("3_pmgg3") } +[node name="DamagePlayer" type="AnimationPlayer" parent="."] +unique_name_in_owner = true +libraries = { +&"": SubResource("AnimationLibrary_q73y1") +} + [node name="AnimationTree" type="AnimationTree" parent="."] unique_name_in_owner = true root_node = NodePath("%AnimationTree/..") diff --git a/Zennysoft.Game.Ma/src/enemy/take_damage.res b/Zennysoft.Game.Ma/src/enemy/take_damage.res new file mode 100644 index 00000000..a375c6a1 Binary files /dev/null and b/Zennysoft.Game.Ma/src/enemy/take_damage.res differ