Update horse face

src/boss/Boss.cs

@@ -69,6 +69,7 @@ namespace GameJamDungeon
     public void OnPhysicsProcess(double delta)
     {
       BossLogic.Input(new BossLogic.Input.PhysicsTick(delta));
+      MoveAndSlide();
     }
   }
 }

src/boss/state/states/BossLogic.State.ApproachPlayer.cs

@@ -26,7 +26,7 @@ namespace GameJamDungeon
 
           var targetDirection = boss.GlobalPosition - gameRepo.PlayerGlobalPosition.Value;
           boss.GlobalRotation = new Vector3(boss.GlobalRotation.X, Mathf.LerpAngle(boss.GlobalRotation.Y, Mathf.Atan2(-targetDirection.X, -targetDirection.Z), delta * 3f), boss.GlobalRotation.Z);
-          boss.AnimationTree.Get("parameters/playback").As<AnimationNodeStateMachinePlayback>().Travel("WALK");
+          boss.AnimationTree.Get("parameters/playback").As<AnimationNodeStateMachinePlayback>().Travel("Walk");
           return ToSelf();
         }
       }

src/boss/state/states/BossLogic.State.EngagePlayer.cs

@@ -12,7 +12,7 @@ namespace GameJamDungeon
       {
         public EngagePlayer()
         {
-          OnAttach(() => Get<IBoss>().AnimationTree.Get("parameters/playback").As<AnimationNodeStateMachinePlayback>().Travel("IDLE"));
+          OnAttach(() => Get<IBoss>().AnimationTree.Get("parameters/playback").As<AnimationNodeStateMachinePlayback>().Travel("Idle"));
         }
 
         public Transition On(in Input.PhysicsTick input)
@@ -32,14 +32,14 @@ namespace GameJamDungeon
         public Transition On(in Input.PrimaryAttack input)
         {
           var boss = Get<IBoss>();
-          boss.AnimationTree.Get("parameters/playback").As<AnimationNodeStateMachinePlayback>().Travel("SPEAR");
+          boss.AnimationTree.Get("parameters/playback").As<AnimationNodeStateMachinePlayback>().Travel("PrimaryAttack");
           return ToSelf();
         }
 
         public Transition On(in Input.SecondaryAttack input)
         {
           var boss = Get<IBoss>();
-          boss.AnimationTree.Get("parameters/playback").As<AnimationNodeStateMachinePlayback>().Travel("SHIELD BASH");
+          boss.AnimationTree.Get("parameters/playback").As<AnimationNodeStateMachinePlayback>().Travel("SecondaryAttack");
           return ToSelf();
         }
       }

src/boss/vfx/BossHit.tres

@@ -0,0 +1,59 @@
+[gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://cf3an7cx1vjm6"]
+
+[sub_resource type="Shader" id="Shader_veoq4"]
+code = "// NOTE: Shader automatically converted from Godot Engine 4.4.dev1.mono's StandardMaterial3D.
+
+shader_type spatial;
+render_mode blend_mix, depth_draw_opaque, cull_back, diffuse_burley, specular_schlick_ggx;
+
+uniform vec4 albedo : source_color;
+uniform sampler2D texture_albedo : source_color, filter_linear_mipmap, repeat_enable;
+uniform float point_size : hint_range(0.1, 128.0, 0.1);
+
+uniform float roughness : hint_range(0.0, 1.0);
+uniform sampler2D texture_metallic : hint_default_white, filter_linear_mipmap, repeat_enable;
+uniform vec4 metallic_texture_channel;
+uniform sampler2D texture_roughness : hint_roughness_r, filter_linear_mipmap, repeat_enable;
+
+uniform float specular : hint_range(0.0, 1.0, 0.01);
+uniform float metallic : hint_range(0.0, 1.0, 0.01);
+
+uniform vec3 uv1_scale;
+uniform vec3 uv1_offset;
+uniform vec3 uv2_scale;
+uniform vec3 uv2_offset;
+
+void vertex() {
+	UV = UV * uv1_scale.xy + uv1_offset.xy;
+}
+
+void fragment() {
+	vec2 base_uv = UV;
+
+	vec4 albedo_tex = texture(texture_albedo, base_uv);
+	ALBEDO = albedo.rgb * albedo_tex.rgb;
+
+	float metallic_tex = dot(texture(texture_metallic, base_uv), metallic_texture_channel);
+	METALLIC = metallic_tex * metallic;
+	SPECULAR = specular;
+
+	vec4 roughness_texture_channel = vec4(1.0, 0.0, 0.0, 0.0);
+	float roughness_tex = dot(texture(texture_roughness, base_uv), roughness_texture_channel);
+	ROUGHNESS = roughness_tex * roughness;
+	ALPHA *= albedo.a * albedo_tex.a;
+}
+"
+
+[resource]
+render_priority = 0
+shader = SubResource("Shader_veoq4")
+shader_parameter/albedo = Color(0.784314, 0, 0, 1)
+shader_parameter/point_size = 1.0
+shader_parameter/roughness = 1.0
+shader_parameter/metallic_texture_channel = null
+shader_parameter/specular = 0.5
+shader_parameter/metallic = 0.0
+shader_parameter/uv1_scale = Vector3(1, 1, 1)
+shader_parameter/uv1_offset = Vector3(0, 0, 0)
+shader_parameter/uv2_scale = Vector3(1, 1, 1)
+shader_parameter/uv2_offset = Vector3(0, 0, 0)

src/enemy/enemy_types/horse_head/HORSE-FACE 1.1.glb.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://cvqaccot8ltrf"
+path="res://.godot/imported/HORSE-FACE 1.1.glb-7b6844183d631775a930302cf0eb6550.scn"
+
+[deps]
+
+source_file="res://src/enemy/enemy_types/horse_head/HORSE-FACE 1.1.glb"
+dest_files=["res://.godot/imported/HORSE-FACE 1.1.glb-7b6844183d631775a930302cf0eb6550.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+_subresources={}
+gltf/naming_version=1
+gltf/embedded_image_handling=1

src/enemy/enemy_types/horse_head/HORSE-FACE 1_Metal054C_1K-JPG_Color.jpg.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://csj3kjwyn3s2u"
+path="res://.godot/imported/HORSE-FACE 1_Metal054C_1K-JPG_Color.jpg-56f957f3bae9c32639244dca2da75e04.ctex"
+metadata={
+"vram_texture": false
+}
+generator_parameters={
+"md5": "a736e2bfd0819e969c4fbfc879bc7b02"
+}
+
+[deps]
+
+source_file="res://src/enemy/enemy_types/horse_head/HORSE-FACE 1_Metal054C_1K-JPG_Color.jpg"
+dest_files=["res://.godot/imported/HORSE-FACE 1_Metal054C_1K-JPG_Color.jpg-56f957f3bae9c32639244dca2da75e04.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=true
+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=0

src/enemy/enemy_types/horse_head/HORSE-FACE 1_Metal054C_1K-JPG_Displacement.jpg.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dd7ocxanos2o7"
+path="res://.godot/imported/HORSE-FACE 1_Metal054C_1K-JPG_Displacement.jpg-94a1817c3e281a7ecc8a89941b567af0.ctex"
+metadata={
+"vram_texture": false
+}
+generator_parameters={
+"md5": "ebbb46c4f552a8b17e6801dc6b95714a"
+}
+
+[deps]
+
+source_file="res://src/enemy/enemy_types/horse_head/HORSE-FACE 1_Metal054C_1K-JPG_Displacement.jpg"
+dest_files=["res://.godot/imported/HORSE-FACE 1_Metal054C_1K-JPG_Displacement.jpg-94a1817c3e281a7ecc8a89941b567af0.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=1
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=1
+roughness/src_normal="res://src/enemy/enemy_types/horse_head/HORSE-FACE 1_Metal054C_1K-JPG_Displacement.jpg"
+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=0

src/enemy/enemy_types/ox_face/OxFace.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=24 format=4 uid="uid://6dnsw37d1uw4"]
+[gd_scene load_steps=28 format=4 uid="uid://6dnsw37d1uw4"]
 
 [ext_resource type="Texture2D" uid="uid://dp6hwvuhfkji8" path="res://src/enemy/enemy_types/ox_face/models/OX FACE_Metal054C_1K-JPG_Color.jpg" id="1_iwcva"]
 [ext_resource type="Script" path="res://src/boss/Boss.cs" id="1_xakg1"]
 [ext_resource type="Texture2D" uid="uid://cqmo71mabu36n" path="res://src/enemy/enemy_types/ox_face/models/OX FACE_Metal054C_1K-JPG_Displacement.jpg" id="2_cgb4w"]
 [ext_resource type="AnimationLibrary" uid="uid://bw3wtqy3lcbfi" path="res://src/enemy/enemy_types/horse_head/OxFace.res" id="4_4vicn"]
+[ext_resource type="Material" uid="uid://cf3an7cx1vjm6" path="res://src/boss/vfx/BossHit.tres" id="5_guymj"]
 
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_7uhtm"]
 radius = 9.4071
@@ -141,16 +142,16 @@ 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="AnimationNodeAnimation" id="AnimationNodeAnimation_jxxpn"]
-animation = &"IDLE"
-
-[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_l155d"]
-animation = &"SHIELD BASH"
+animation = &"Idle"
 
 [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_dxvik"]
-animation = &"SPEAR "
+animation = &"PrimaryAttack"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_l155d"]
+animation = &"SecondaryAttack"
 
 [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_qc5il"]
-animation = &"WALK"
+animation = &"Walk"
 
 [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_g8bck"]
 
@@ -179,30 +180,88 @@ switch_mode = 2
 advance_mode = 2
 
 [sub_resource type="AnimationNodeStateMachine" id="AnimationNodeStateMachine_2ll5b"]
-states/IDLE/node = SubResource("AnimationNodeAnimation_jxxpn")
-states/IDLE/position = Vector2(363, 111)
-"states/SHIELD BASH/node" = SubResource("AnimationNodeAnimation_l155d")
-"states/SHIELD BASH/position" = Vector2(756, 11)
-states/SPEAR/node = SubResource("AnimationNodeAnimation_dxvik")
-states/SPEAR/position = Vector2(1273, 173)
+states/End/position = Vector2(1023, 45)
+states/Idle/node = SubResource("AnimationNodeAnimation_jxxpn")
+states/Idle/position = Vector2(363, 111)
+states/PrimaryAttack/node = SubResource("AnimationNodeAnimation_dxvik")
+states/PrimaryAttack/position = Vector2(1273, 173)
+states/SecondaryAttack/node = SubResource("AnimationNodeAnimation_l155d")
+states/SecondaryAttack/position = Vector2(756, 11)
 states/Start/position = Vector2(195, 100)
-states/WALK/node = SubResource("AnimationNodeAnimation_qc5il")
-states/WALK/position = Vector2(551, 257)
-transitions = ["IDLE", "WALK", SubResource("AnimationNodeStateMachineTransition_g8bck"), "WALK", "IDLE", SubResource("AnimationNodeStateMachineTransition_8uvjf"), "SHIELD BASH", "WALK", SubResource("AnimationNodeStateMachineTransition_5o2o7"), "WALK", "SHIELD BASH", SubResource("AnimationNodeStateMachineTransition_tmxut"), "IDLE", "SHIELD BASH", SubResource("AnimationNodeStateMachineTransition_0lu76"), "Start", "IDLE", SubResource("AnimationNodeStateMachineTransition_c0ssq"), "WALK", "SPEAR", SubResource("AnimationNodeStateMachineTransition_yfrex"), "IDLE", "SPEAR", SubResource("AnimationNodeStateMachineTransition_8v83y"), "SPEAR", "IDLE", SubResource("AnimationNodeStateMachineTransition_m6j3e"), "SHIELD BASH", "IDLE", SubResource("AnimationNodeStateMachineTransition_3x2rh")]
-graph_offset = Vector2(30, -17.3442)
+states/Walk/node = SubResource("AnimationNodeAnimation_qc5il")
+states/Walk/position = Vector2(551, 257)
+transitions = ["Idle", "Walk", SubResource("AnimationNodeStateMachineTransition_g8bck"), "Walk", "Idle", SubResource("AnimationNodeStateMachineTransition_8uvjf"), "SecondaryAttack", "Walk", SubResource("AnimationNodeStateMachineTransition_5o2o7"), "Walk", "SecondaryAttack", SubResource("AnimationNodeStateMachineTransition_tmxut"), "Idle", "SecondaryAttack", SubResource("AnimationNodeStateMachineTransition_0lu76"), "Start", "Idle", SubResource("AnimationNodeStateMachineTransition_c0ssq"), "Walk", "PrimaryAttack", SubResource("AnimationNodeStateMachineTransition_yfrex"), "Idle", "PrimaryAttack", SubResource("AnimationNodeStateMachineTransition_8v83y"), "PrimaryAttack", "Idle", SubResource("AnimationNodeStateMachineTransition_m6j3e"), "SecondaryAttack", "Idle", SubResource("AnimationNodeStateMachineTransition_3x2rh")]
+graph_offset = Vector2(59, 6.52466)
+
+[sub_resource type="Animation" id="Animation_g7bmo"]
+resource_name = "Hit"
+length = 0.166675
+step = 0.0833333
+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, 0.166667),
+"transitions": PackedFloat32Array(1, 1),
+"update": 1,
+"values": [ExtResource("5_guymj"), 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, 0.0833333, 0.166667),
+"transitions": PackedFloat32Array(1, 1, 1),
+"update": 0,
+"values": [0.0, 0.07, 0.0]
+}
+
+[sub_resource type="Animation" id="Animation_kml6n"]
+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_q1mdo"]
+_data = {
+"Hit": SubResource("Animation_g7bmo"),
+"RESET": SubResource("Animation_kml6n")
+}
 
 [node name="OX FACE" type="CharacterBody3D"]
-transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, 0, -1, 0)
+transform = Transform3D(0.15, 0, 0, 0, 0.15, 0, 0, 0, 0.15, 0, -1, 0)
+axis_lock_linear_y = true
 script = ExtResource("1_xakg1")
 
-[node name="RayCast3D" type="RayCast3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 15.5512, 14.1445)
-target_position = Vector3(0, 0, 5)
-debug_shape_custom_color = Color(0.52404, 0.417417, 0.9936, 1)
-debug_shape_thickness = 5
-
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.212402, 11.5976, 0)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.212402, 16.2998, 0)
 shape = SubResource("CapsuleShape3D_7uhtm")
 
 [node name="Armature" type="Node3D" parent="."]
@@ -213,50 +272,50 @@ 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.2603, -1.05667, -1.9675)
-bones/0/rotation = Quaternion(0.0915277, -0.692111, -0.0341586, 0.715149)
+bones/0/position = Vector3(-0.00753816, 0.293079, -1.87887)
+bones/0/rotation = Quaternion(-0.000196849, -0.746636, -0.00068548, 0.665232)
 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.0828172, 0.0642671, -0.39627, 0.91213)
-bones/1/scale = Vector3(1, 1, 1)
+bones/1/rotation = Quaternion(0.0435095, 0.0545994, -0.340328, 0.937711)
+bones/1/scale = Vector3(1, 0.999999, 1)
 bones/2/name = "neck1"
 bones/2/parent = 1
 bones/2/rest = Transform3D(0.931038, 0.338155, -0.137179, -0.337694, 0.940859, 0.0273421, 0.138312, 0.020868, 0.990169, -1.09896e-07, 3.84743, -2.10479e-07)
 bones/2/enabled = true
 bones/2/position = Vector3(-1.09896e-07, 3.84743, -2.10479e-07)
-bones/2/rotation = Quaternion(-0.137837, 0.137086, 0.403643, 0.894025)
+bones/2/rotation = Quaternion(-0.0312364, 0.00429589, 0.0462139, 0.998434)
 bones/2/scale = Vector3(1, 1, 1)
 bones/3/name = "neck2"
 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.00338816, 0.00852271, 0.0152662, 0.999842)
+bones/3/rotation = Quaternion(-0.0829402, -0.0436853, 0.0175177, 0.995443)
 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.037164, 0.133882, 0.101977, 0.985036)
+bones/4/rotation = Quaternion(0.0914695, 0.080805, 0.150013, 0.981122)
 bones/4/scale = Vector3(1, 1, 1)
 bones/5/name = "neck4"
 bones/5/parent = 4
 bones/5/rest = Transform3D(0.999746, -0.0223582, -0.00293604, 0.0225401, 0.994675, 0.10057, 0.000671851, -0.10061, 0.994926, 2.23517e-07, 1.26785, -4.84288e-08)
 bones/5/enabled = true
 bones/5/position = Vector3(2.23517e-07, 1.26785, -4.84288e-08)
-bones/5/rotation = Quaternion(-0.0397875, -0.0104688, 0.0235613, 0.998875)
+bones/5/rotation = Quaternion(0.0550904, 0.0117023, 0.0274051, 0.998037)
 bones/5/scale = Vector3(1, 1, 1)
 bones/6/name = "head1"
 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.0504223, -0.29528, -0.744251, 0.596958)
+bones/6/rotation = Quaternion(-0.26182, -0.142586, -0.41486, 0.859657)
 bones/6/scale = Vector3(1, 1, 1)
 bones/7/name = "Bone.007"
 bones/7/parent = 6
@@ -291,84 +350,84 @@ 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.779541, -0.0571158, 0.0821721, 0.618305)
-bones/11/scale = Vector3(1, 1, 1)
+bones/11/rotation = Quaternion(-0.809654, -0.00891391, 0.118134, 0.574827)
+bones/11/scale = Vector3(1, 0.999999, 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.607818, -0.670503, -0.284916, 0.31592)
+bones/12/rotation = Quaternion(-0.578149, -0.583179, -0.303723, 0.483114)
 bones/12/scale = Vector3(1, 1, 1)
 bones/13/name = "arm3_L"
 bones/13/parent = 12
 bones/13/rest = Transform3D(0.998789, -0.0488077, 0.00615136, 0.0491112, 0.996528, -0.0672226, -0.00284903, 0.0674433, 0.997719, -3.7998e-07, 3.04263, 2.94298e-07)
 bones/13/enabled = true
 bones/13/position = Vector3(-3.7998e-07, 3.04263, 2.94298e-07)
-bones/13/rotation = Quaternion(-0.255941, 0.586097, -0.127235, 0.758153)
-bones/13/scale = Vector3(1, 1, 1)
+bones/13/rotation = Quaternion(-0.273771, 0.562904, -0.126956, 0.769461)
+bones/13/scale = Vector3(1, 0.999999, 1)
 bones/14/name = "hand_L"
 bones/14/parent = 13
 bones/14/rest = Transform3D(0.999684, -0.0250832, -0.0012569, 0.0250806, 0.999683, -0.0020528, 0.001308, 0.00202063, 0.999997, 6.61239e-07, 3.62262, 3.26894e-07)
 bones/14/enabled = true
 bones/14/position = Vector3(6.61239e-07, 3.62262, 3.26894e-07)
 bones/14/rotation = Quaternion(-0.513517, -0.227335, -0.228787, 0.795157)
-bones/14/scale = Vector3(1, 1, 1)
+bones/14/scale = Vector3(0.999999, 1, 1)
 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.00107886, 3.8461, -0.0821095)
-bones/15/rotation = Quaternion(-0.215516, 0.745421, 0.613436, -0.146955)
+bones/15/position = Vector3(0.00107843, 3.8461, -0.0821096)
+bones/15/rotation = Quaternion(0.0131668, 0.689625, 0.715984, -0.107754)
 bones/15/scale = Vector3(1, 1, 1)
 bones/16/name = "arm2_R"
 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.486067, -0.16412, -0.362283, 0.778174)
-bones/16/scale = Vector3(1, 1, 1)
+bones/16/rotation = Quaternion(-0.403296, -0.0463298, -0.397088, 0.82312)
+bones/16/scale = Vector3(1, 1, 0.999999)
 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.0553629, -0.0361614, 0.62832, 0.77514)
-bones/17/scale = Vector3(1, 1, 1)
+bones/17/rotation = Quaternion(-0.0446941, 0.0180485, 0.600886, 0.79788)
+bones/17/scale = Vector3(1, 0.999999, 1)
 bones/18/name = "hand_R"
 bones/18/parent = 17
 bones/18/rest = Transform3D(0.999684, 0.0250832, 0.0012569, -0.0250806, 0.999683, -0.00205275, -0.00130799, 0.00202058, 0.999997, -7.45058e-08, 3.62262, 4.46569e-07)
 bones/18/enabled = true
 bones/18/position = Vector3(-7.45058e-08, 3.62262, 4.46569e-07)
 bones/18/rotation = Quaternion(-0.119289, 0.0998131, -0.0173011, 0.987678)
-bones/18/scale = Vector3(1, 1, 1)
+bones/18/scale = Vector3(0.999999, 1, 1)
 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.3838, -1.20254, -1.70882)
-bones/19/rotation = Quaternion(0.628214, 0.29212, 0.54421, -0.473125)
+bones/19/position = Vector3(0.00567306, -0.0010693, -2.01735)
+bones/19/rotation = Quaternion(0.608868, 0.315169, 0.575757, -0.44548)
 bones/19/scale = Vector3(1, 1, 1)
 bones/20/name = "leg1_L"
 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.328398, -0.422052, -0.301647, 0.789326)
-bones/20/scale = Vector3(1, 1, 1)
+bones/20/rotation = Quaternion(-0.478018, -0.011059, -0.210228, 0.852749)
+bones/20/scale = Vector3(1, 0.999999, 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.0605336, 0.0012981, 0.490022, 0.869605)
+bones/21/rotation = Quaternion(-0.06968, 0.00112036, 0.556543, 0.827891)
 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.156218, 0.0483037, -0.624744, 0.763516)
+bones/22/rotation = Quaternion(0.152019, 0.0509711, -0.660329, 0.733661)
 bones/22/scale = Vector3(1, 1, 1)
 bones/23/name = "foot2_L"
 bones/23/parent = 22
@@ -381,36 +440,36 @@ 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(7.04992, -9.46662, 3.49458)
-bones/24/rotation = Quaternion(0.427621, 0.561851, 0.530083, 0.469549)
+bones/24/position = Vector3(1.82848, -6.67306, 3.18901)
+bones/24/rotation = Quaternion(0.454079, 0.542046, 0.542044, 0.454079)
 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(4.82744, -12.3397, 0.183847)
-bones/25/rotation = Quaternion(-0.400051, 0.463947, -0.598439, 0.516317)
+bones/25/position = Vector3(2.6197, -10.5126, -6.72772)
+bones/25/rotation = Quaternion(-0.456329, 0.540264, -0.539891, 0.456505)
 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.0152458, -1.11395, -2.01923)
-bones/26/rotation = Quaternion(0.608697, -0.3155, -0.575514, -0.445793)
+bones/26/position = Vector3(0.0121368, 0.025457, -2.01735)
+bones/26/rotation = Quaternion(0.608525, -0.315831, -0.575272, -0.446105)
 bones/26/scale = Vector3(1, 1, 1)
 bones/27/name = "leg1_R"
 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.20182, 0.424906, 0.137622, 0.871656)
-bones/27/scale = Vector3(1, 1, 1)
+bones/27/rotation = Quaternion(-0.469345, 0.125338, 0.384715, 0.784857)
+bones/27/scale = Vector3(1, 0.999999, 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.0627236, -0.00116484, -0.500779, 0.863299)
+bones/28/rotation = Quaternion(-0.0513029, -0.00135233, -0.415124, 0.908316)
 bones/28/scale = Vector3(1, 1, 1)
 bones/29/name = "foot1_R"
 bones/29/parent = 28
@@ -424,32 +483,33 @@ bones/30/parent = 29
 bones/30/rest = Transform3D(0.758027, -0.644694, 0.0988167, 0.648058, 0.727399, -0.225635, 0.0735861, 0.235076, 0.969187, -9.12696e-08, 2.35941, -7.45058e-09)
 bones/30/enabled = true
 bones/30/position = Vector3(-9.12696e-08, 2.35941, -7.45058e-09)
-bones/30/rotation = Quaternion(0.123936, 0.00678731, 0.347765, 0.92933)
+bones/30/rotation = Quaternion(0.123936, 0.00678723, 0.347765, 0.92933)
 bones/30/scale = Vector3(1, 1, 1)
 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(-7.29038, -6.72226, -0.133983)
-bones/31/rotation = Quaternion(-0.453784, 0.542292, 0.542291, -0.453784)
+bones/31/position = Vector3(-1.83196, -6.66907, 3.18901)
+bones/31/rotation = Quaternion(-0.453489, 0.542539, 0.542538, -0.453489)
 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(-6.21519, -12.0654, -3.61992)
-bones/32/rotation = Quaternion(0.456756, 0.539878, -0.539587, -0.456893)
+bones/32/position = Vector3(-2.44561, -12.2119, -0.0447071)
+bones/32/rotation = Quaternion(0.452422, 0.54437, -0.541256, -0.453892)
 bones/32/scale = Vector3(1, 1, 1)
 
 [node name="BoneAttachment3D" type="BoneAttachment3D" parent="Armature/Skeleton3D"]
-transform = Transform3D(-0.269618, -0.0411959, -0.962086, -0.333281, -0.933347, 0.133365, -0.903454, 0.356603, 0.237918, -1.68663, 8.19848, 4.95684)
+transform = Transform3D(-0.319995, -0.0263101, -0.947054, -0.624515, -0.745842, 0.231734, -0.712449, 0.665603, 0.222234, -0.216629, 11.2858, 5.66224)
 bone_name = "TOP OF SKULL"
 bone_idx = 8
 
 [node name="OmniLight3D" type="OmniLight3D" parent="Armature/Skeleton3D/BoneAttachment3D"]
+transform = Transform3D(4.99626, -0.00507843, 0.193288, -0.00661814, 4.99085, 0.302241, -0.193245, -0.302273, 4.98712, -0.204844, -0.541859, 0.113504)
 light_color = Color(0, 0.180392, 1, 1)
 light_energy = 15.248
-omni_range = 0.306
+omni_range = 0.482
 
 [node name="Cube_035" type="MeshInstance3D" parent="Armature/Skeleton3D"]
 mesh = SubResource("ArrayMesh_5ew54")
@@ -469,3 +529,9 @@ anim_player = NodePath("../AnimationPlayer")
 [node name="AttackTimer" type="Timer" parent="."]
 unique_name_in_owner = true
 wait_time = 3.5
+
+[node name="HitAnimation" type="AnimationPlayer" parent="."]
+unique_name_in_owner = true
+libraries = {
+"": SubResource("AnimationLibrary_q1mdo")
+}

src/map/dungeon/code/BossRoom.cs

@@ -26,7 +26,7 @@ namespace GameJamDungeon
 
     [Node] public Boss OxFace { get; set; } = default!;
 
-    [Node] public HorseHead HorseHead { get; set; } = default!;
+    [Node] public Boss HorseFace { get; set; } = default!;
 
     [Node] public Area3D ActivateTrap { get; set; } = default!;
 
@@ -53,6 +53,7 @@ namespace GameJamDungeon
       OxFaceStatue.Hide();
       HorseHeadStatue.Hide();
       OxFace.Activate();
+      HorseFace.Activate();
     }
   }
 }

src/map/dungeon/scenes/BossRoom.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=139 format=4 uid="uid://5ja3qxn8h7iw"]
+[gd_scene load_steps=138 format=4 uid="uid://5ja3qxn8h7iw"]
 
 [ext_resource type="Script" path="res://src/map/dungeon/code/BossRoom.cs" id="1_54g2q"]
 [ext_resource type="Texture2D" uid="uid://dq0nn4lvfqxn" path="res://src/map/dungeon/models/boss/FLOOR 11 (BOSS FLOOR)_FLOOR1.jpg" id="2_1w0ee"]
@@ -30,10 +30,9 @@
 [ext_resource type="Texture2D" uid="uid://bc3tr22bhcwv5" path="res://src/map/dungeon/models/boss/FLOOR 11 (BOSS FLOOR)_png-clipart-tibetan-buddhism-mandala-tibetan-buddhism-vajra-buddhism-religion-tibet.png" id="27_1cdri"]
 [ext_resource type="Texture2D" uid="uid://4k6x3hgsij5c" path="res://src/map/dungeon/models/boss/FLOOR 11 (BOSS FLOOR)_HAND_CYCLE_MOTIF.png" id="28_h6wv5"]
 [ext_resource type="PackedScene" uid="uid://8yaqqojv4nuv" path="res://src/enemy/enemy_types/horse_head/HorseHeadStatue.tscn" id="30_5mo8n"]
+[ext_resource type="PackedScene" uid="uid://2wibfnu2jvlv" path="res://src/enemy/enemy_types/horse_head/HorseFace.tscn" id="31_1c0yq"]
 [ext_resource type="PackedScene" uid="uid://bvv5giqyrhtl1" path="res://src/enemy/enemy_types/ox_face/OxFaceStatue.tscn" id="31_2ctrv"]
 [ext_resource type="PackedScene" uid="uid://6dnsw37d1uw4" path="res://src/enemy/enemy_types/ox_face/OxFace.tscn" id="32_s5lyv"]
-[ext_resource type="PackedScene" uid="uid://d1lmftfty1qr6" path="res://src/enemy/enemy_types/horse_head/HorseHead.tscn" id="33_dhi0j"]
-[ext_resource type="Script" path="res://src/enemy/enemy_types/horse_head/HorseHead.cs" id="35_qdor1"]
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_onsay"]
 
@@ -2306,6 +2305,11 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -178.343, -1.83362, 16.2439)
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -101.69, -2.61498, 12.6854)
 
+[node name="HorseFace" parent="." instance=ExtResource("31_1c0yq")]
+unique_name_in_owner = true
+transform = Transform3D(0.15, 0, 0, 0, 0.15, 0, 0, 0, 0.15, -101.69, -2.61498, 12.6854)
+visible = false
+
 [node name="OxFaceStatue" parent="." instance=ExtResource("31_2ctrv")]
 unique_name_in_owner = true
 transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -101.69, -2.61498, 20.462)
@@ -2315,12 +2319,6 @@ unique_name_in_owner = true
 transform = Transform3D(-0.15, 0, -2.26494e-08, 0, 0.15, 0, 2.26494e-08, 0, -0.15, -101.838, -2.74817, 20.9742)
 visible = false
 
-[node name="HorseHead" parent="." instance=ExtResource("33_dhi0j")]
-unique_name_in_owner = true
-transform = Transform3D(0.15, 0, 0, 0, 0.15, 0, 0, 0, 0.15, -101.69, -2.73141, 12.6854)
-visible = false
-script = ExtResource("35_qdor1")
-
 [node name="ActivateTrap" type="Area3D" parent="."]
 unique_name_in_owner = true
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 115.921, -35.0626, -17.4901)