From 79f57264ec1efc7643a00e44541465becc59e45e Mon Sep 17 00:00:00 2001 From: Zenny Date: Tue, 18 Mar 2025 00:58:52 -0700 Subject: [PATCH] Small fixes to sara animation, attempt to add back boss damage/death (didn't work) --- Zennysoft.Game.Ma/src/enemy/EnemyDie.tres | 2 +- .../src/enemy/EnemyModelView3D.cs | 16 ++- Zennysoft.Game.Ma/src/enemy/defeated.res | Bin 708 -> 640 bytes .../src/enemy/enemy_types/04. sara/Sara.tscn | 1 + .../enemy_types/04. sara/SaraLoreInfo.tres | 8 +- .../enemy_types/04. sara/SaraModelView.tscn | 109 +++++++++++++-- .../14. horse_head/HorseFaceModelView.tscn | 124 +++++++++++++----- .../animation/OxFaceAnimations.tres | 40 +++++- .../15. ox_face/OxFaceModelView.tscn | 34 ++++- Zennysoft.Game.Ma/src/enemy/take_damage.res | Bin 0 -> 594 bytes 10 files changed, 278 insertions(+), 56 deletions(-) create mode 100644 Zennysoft.Game.Ma/src/enemy/take_damage.res 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 093b5bf70c921d7d225334099fa26979d5a03070..2e001d77895e44a0e99856984892327c68e181a9 100644 GIT binary patch literal 640 zcmV-`0)PEdQ$s@n000005C8yo1^@tP0ssIgwJ-f(cLntl0A^WNJ}{4x4k3p+7^W#p z4GieoaWYm)NJ~;Jk>%Wb?`>|#%iSb!EY3C*so`HaL}CD4+uTge)C`py`p}P9Yptb1 z06zdp0K7~+^MA&dHRe@`lhelA`u=M^fn;P_6sp981jb&sAI^V`FH^0L1^k!rj};wF zh2n&Z|CqzrT3>@0{tx(%k@*87(EKdrp1dCpaJGzc3${t>`j6mp8^D*vH^~^Cr&Hj% zr_jI`?wV8V$?1x2+Qn3y%l{d?T5wtAgv$NDzylvJSV{yAM+*@qMv&-)_*`z0Z6+C@ z>MdMo@q{1>A=hwu%f@R;k|arz6h%=KMNzdMsmvk4C2zxxds-!1hoW%VHb?o|%BrCy zC!CZ2mR~L#2oEeFAPyQ>K0Gp)1sxm;wv|b0W?bmd2y8z0wa#dc`QPz>;{fGUrNYWe z2@5GY@AvTVxh%rAbvG;n`ES{1fKc&*MSG}mRWl!DH^>8X&LIKA@c0XNlY3*P&2M0`Rq8urk=%Y;tIT_1Xa|p!rOHW<#xzAcACKEDE>>aVS z)>20RMF3C$yiG;(f9FpfZ!6YTz?-9FS$BexS+rvbYWq-hy7oW7HB>8A1cK2`_g*CV zPvF0VdrF*Oj7Ern`M)`gt`&1I!~cr^062ebF^BP$qn0R0Q{__bwk>-Xbk=g#QZKnp z@of>aWQ#RBj9;I%vq}Vy-!VfsAWx_H^aq!pjQ?i;v4WfK>Qg z9%3rSm0%p@t%@t>+lZ?D8z^IO)8^2gws8*eGRr) zj`M2BJ;5zt1%NOd1p*$MjYSX2@qd7bO7xx_PUHZ252BMIkt3D#sImI#_8?X?pRgVw zx&_#tdFnVK4MOd+Ybs@Hy=5nCEY?M7f)K1AzPvv8IiLmK;KRp|g!3bWWua0gCiVdA zMiDHKN*>mjqU|XscmwP=+)DD1#uVF+_*Qe3zI~%CBx|H2P!AVuS-A#Gzv3NB_Ay-A qhWR`uSs08q_=y+0YUY`B$i$(1!MpVH5Pq@>=;R+{uo-zT`Yi=Q z06hRi0CGa*{(s=h8uOw=<+Sm(zW*ApAQGb1WZGm9fw9-E#Q9&~%Tw#)0skM|!v+x` zK1jfH_>XZITkC5O!+!$*16=-3$TOv-+>=*g0cXo5w_sCJ*Z+*m?fDbS(rqxH!p*+y6G!>RRoDmA6yv#pN4cApLzrQl0?DOQ-*5= g9&165p^CWb{iF@Q^6pnhAVTwjpJ`CIcv4eCLtqLNr~m)} literal 0 HcmV?d00001