From 051ffbbcb1e4a5a520122be3fd48922eb5876002 Mon Sep 17 00:00:00 2001 From: Zenny Date: Tue, 3 Feb 2026 02:24:54 -0800 Subject: [PATCH] Fix bug with Boss A (hit box didn't get scaled correctly) Fix reset of death animation --- Zennysoft.Game.Ma/src/enemy/BossTypeA.cs | 1 + .../enemy_types/14. horse_head/HorseFace.tscn | 4 +- .../14. horse_head/HorseFaceModelView.tscn | 62 ++++++++---- .../animation/OxFaceAnimations.tres | 2 +- .../14. horse_head/animation/walking2.res | Bin 9060 -> 9067 bytes .../enemy/enemy_types/15. ox_face/OxFace.tscn | 8 +- .../15. ox_face/OxFaceModelView.tscn | 94 ++++++++++++------ Zennysoft.Game.Ma/src/player/Player.tscn | 12 +++ 8 files changed, 126 insertions(+), 57 deletions(-) diff --git a/Zennysoft.Game.Ma/src/enemy/BossTypeA.cs b/Zennysoft.Game.Ma/src/enemy/BossTypeA.cs index 2871d26c..2d38bdd0 100644 --- a/Zennysoft.Game.Ma/src/enemy/BossTypeA.cs +++ b/Zennysoft.Game.Ma/src/enemy/BossTypeA.cs @@ -131,6 +131,7 @@ public partial class BossTypeA : Enemy, IHaveEngagePlayerBehavior, IHaveFollowBe public override void Die() { + SetProcess(false); SetPhysicsProcess(false); _enemyLogic.Input(new EnemyLogic.Input.Defeated()); _collisionShape.SetDeferred(CollisionShape3D.PropertyName.Disabled, true); diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFace.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFace.tscn index 503240fb..964a6c9d 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFace.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/HorseFace.tscn @@ -12,7 +12,7 @@ radius = 1.0 height = 4.0 -[sub_resource type="SphereShape3D" id="SphereShape3D_jl3qa"] +[sub_resource type="SphereShape3D" id="SphereShape3D_nt5fo"] radius = 2.70035 [sub_resource type="CylinderShape3D" id="CylinderShape3D_wp4vi"] @@ -41,7 +41,7 @@ collision_mask = 0 [node name="EnemyHitbox" type="CollisionShape3D" parent="Collision"] unique_name_in_owner = true -shape = SubResource("SphereShape3D_jl3qa") +shape = SubResource("SphereShape3D_nt5fo") disabled = true [node name="Rotation" type="Node3D" parent="."] 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 d77ab238..2ba43570 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,4 +1,4 @@ -[gd_scene load_steps=134 format=4 uid="uid://bid6f48l0q58o"] +[gd_scene load_steps=135 format=4 uid="uid://bid6f48l0q58o"] [ext_resource type="Script" uid="uid://cycffa0wn7sks" path="res://src/enemy/BossAModelView.cs" id="1_58wyj"] [ext_resource type="Texture2D" uid="uid://csj3kjwyn3s2u" path="res://src/enemy/enemy_types/14. horse_head/animation/HORSE-FACE 1_Metal054C_1K-JPG_Color.jpg" id="2_58wyj"] @@ -1004,7 +1004,7 @@ states/Walking/position = Vector2(652, -44) states/attack_walk/node = SubResource("AnimationNodeAnimation_b3lw2") states/attack_walk/position = Vector2(912, 42) transitions = ["Start", "Idle", SubResource("AnimationNodeStateMachineTransition_b3lw2"), "Idle", "Walking", SubResource("AnimationNodeStateMachineTransition_oxssn"), "Walking", "Idle", SubResource("AnimationNodeStateMachineTransition_58wyj"), "Idle", "Primary Attack", SubResource("AnimationNodeStateMachineTransition_qhoxi"), "Primary Attack", "Idle", SubResource("AnimationNodeStateMachineTransition_lj3cb"), "Secondary Attack", "Idle", SubResource("AnimationNodeStateMachineTransition_agk0q"), "Idle", "Secondary Attack", SubResource("AnimationNodeStateMachineTransition_rv3ka"), "Idle", "attack_walk", SubResource("AnimationNodeStateMachineTransition_xl8ei"), "attack_walk", "Idle", SubResource("AnimationNodeStateMachineTransition_n4ran")] -graph_offset = Vector2(-31, 161.037) +graph_offset = Vector2(-62, -109.963) [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_yymq7"] resource_name = "Material" @@ -3251,10 +3251,38 @@ tracks/85/path = NodePath("Cube_020") tracks/85/interp = 1 tracks/85/loop_wrap = true tracks/85/keys = PackedFloat32Array(0, 1, 0, 0, 0, 1, 0.0333333, 1, 0, 0, 0, 1, 0.0666667, 1, 0.0567484, 0.129568, 0.00957177, 0.989899, 0.1, 1, 0.0513303, 0.290463, -0.0118299, 0.955435, 0.133333, 1, 0.0512785, 0.441693, -0.0277469, 0.89527, 0.166667, 1, 0.0492144, 0.579779, -0.0422652, 0.812187, 0.2, 1, 0.0453018, 0.701546, -0.0549837, 0.709054, 0.233333, 1, 0.039782, 0.804402, -0.0655632, 0.589115, 0.266667, 1, 0.0329313, 0.88637, -0.0737486, 0.455879, 0.3, 1, 0.02505, 0.946096, -0.0793698, 0.313009, 0.333333, 1, 0.0164516, 0.982844, -0.0823403, 0.164219, 0.366667, 1, 0.00745292, 0.996463, -0.0826535, 0.0131736, 0.4, 1, 0.00163573, -0.98736, 0.0803768, 0.136593, 0.433333, 1, 0.0105183, -0.956441, 0.0756449, 0.281759, 0.466667, 1, 0.0189201, -0.905063, 0.0686513, 0.419274, 0.5, 1, 0.0265941, -0.834965, 0.0596391, 0.546415, 0.533333, 1, 0.0333248, -0.748207, 0.0488923, 0.660822, 0.566667, 1, 0.0389323, -0.647095, 0.0367251, 0.760529, 0.6, 1, 0.0432741, -0.53412, 0.0234732, 0.843974, 0.633333, 1, 0.0462466, -0.411887, 0.00948396, 0.910011, 0.666667, 1, 0.0477846, -0.283054, -0.00489225, 0.9579, 0.7, 1, 0.0478613, -0.150274, -0.01931, 0.987296, 0.733333, 1, 0.0464858, -0.0161382, -0.0334364, 0.998229, 0.766667, 1, 0.0437015, 0.116867, -0.0469574, 0.991074, 0.8, 1, 0.0395826, 0.246404, -0.0595834, 0.966524, 0.833333, 1, 0.0342312, 0.370316, -0.0710537, 0.925551, 0.866667, 1, 0.0277735, 0.486659, -0.0811405, 0.869372, 0.9, 1, 0.0203557, 0.59372, -0.0896513, 0.799403, 0.933333, 1, 0.01214, 0.690028, -0.0964306, 0.717227, 0.966667, 1, 0.00330084, 0.774373, -0.101361, 0.624549, 1, 1, -0.00597952, 0.8458, -0.104363, 0.523159, 1.03333, 1, -0.0155146, 0.90361, -0.105395, 0.414898, 1.06667, 1, -0.0251175, 0.947357, -0.104452, 0.301619, 1.1, 1, -0.0346045, 0.976834, -0.101562, 0.185159, 1.13333, 1, -0.0437977, 0.99206, -0.0967862, 0.0673104, 1.16667, 1, 0.0525286, -0.993268, 0.0902148, 0.0502082, 1.2, 1, 0.0606397, -0.98088, 0.0819646, 0.165768, 1.23333, 1, 0.0679874, -0.955493, 0.0721755, 0.277853, 1.26667, 1, 0.0744434, -0.917853, 0.0610068, 0.385073, 1.3, 1, 0.0798959, -0.86884, 0.0486343, 0.486177, 1.33333, 1, 0.0842508, -0.809439, 0.0352466, 0.580058, 1.36667, 1, 0.0874327, -0.740723, 0.0210417, 0.665764, 1.4, 1, 0.0893844, -0.66383, 0.00622325, 0.742497, 1.43333, 1, 0.0900679, -0.579945, -0.00900189, 0.809611, 1.46667, 1, 0.0894634, -0.490278, -0.0244273, 0.866618, 1.5, 1, 0.0240514, -0.430824, -0.0227596, 0.901828, 1.53333, 1, -0.0640392, -0.384611, -0.0217425, 0.920598, 1.56667, 1, -0.143108, -0.335021, -0.0317327, 0.930739, 1.6, 1, -0.217426, -0.285391, -0.037554, 0.932667, 1.63333, 1, -0.286333, -0.233301, -0.0445784, 0.928222, 1.66667, 1, -0.351341, -0.179011, -0.0529202, 0.91745, 1.7, 1, -0.411738, -0.1232, -0.0627818, 0.900751, 1.73333, 1, -0.468527, -0.0644399, -0.0787116, 0.877573, 1.8, 1, -0.570419, 0.0556305, -0.118884, 0.810799, 1.83333, 1, -0.614707, 0.115189, -0.142486, 0.76718, 1.9, 1, -0.707412, 0.21963, -0.213886, 0.636855, 1.93333, 1, -0.74555, 0.259473, -0.243675, 0.563428, 1.96667, 1, -0.783619, 0.271099, -0.250962, 0.499465, 2, 1, -0.817099, 0.280682, -0.256413, 0.433381, 2.03333, 1, -0.845939, 0.28826, -0.260019, 0.365628, 2.06667, 1, -0.867146, 0.289654, -0.249847, 0.318957, 2.1, 1, -0.885071, 0.289277, -0.235354, 0.278525, 2.13333, 1, -0.900469, 0.288625, -0.218229, 0.241303, 2.16667, 1, -0.913598, 0.288073, -0.198867, 0.206891, 2.2, 1, -0.924695, 0.287748, -0.17778, 0.174739, 2.23333, 1, -0.934323, 0.285938, -0.155689, 0.145055, 2.26667, 1, -0.942588, 0.282754, -0.131827, 0.119162, 2.3, 1, -0.949634, 0.27827, -0.106218, 0.0973551, 2.33333, 1, -0.955442, 0.272932, -0.0788531, 0.0801271, 2.36667, 1, -0.960174, 0.26668, -0.0504246, 0.0663649, 2.4, 1, -0.962991, 0.262221, -0.020959, 0.0587346, 2.46667, 1, -0.961861, 0.264247, 0.0386945, 0.0591656, 2.5, 1, -0.958685, 0.268929, 0.0685151, 0.062494, 2.53333, 1, -0.953697, 0.275995, 0.0982533, 0.0680858, 2.56667, 1, -0.946777, 0.285463, 0.127869, 0.0759874, 2.6, 1, -0.937761, 0.297306, 0.157288, 0.0864493, 2.63333, 1, -0.926388, 0.3116, 0.186433, 0.0997638, 2.66667, 1, -0.912382, 0.328287, 0.215189, 0.116108, 2.7, 1, -0.895298, 0.347497, 0.243401, 0.135804, 2.73333, 1, -0.872417, 0.383184, 0.261533, 0.153815, 2.76667, 1, -0.845332, 0.427713, 0.271975, 0.168834, 2.8, 1, -0.824023, 0.45362, 0.28329, 0.186982, 2.9, 1, -0.75931, 0.514839, 0.316625, 0.241118, 2.93333, 1, -0.735285, 0.530461, 0.330376, 0.262331, 2.96667, 1, -0.709463, 0.543962, 0.345452, 0.285362, 3, 1, -0.691406, 0.546273, 0.359754, 0.30679, 3.03333, 1, -0.677836, 0.545094, 0.369297, 0.327155, 3.06667, 1, -0.663597, 0.54308, 0.379348, 0.347561, 3.1, 1, -0.650092, 0.54066, 0.388302, 0.366456, 3.13333, 1, -0.637335, 0.538158, 0.396326, 0.383558, 3.16667, 1, -0.627096, 0.534384, 0.403948, 0.397506, 3.2, 1, -0.620241, 0.531022, 0.409074, 0.407399, 3.23333, 1, -0.615117, 0.528726, 0.412994, 0.414145, 3.26667, 1, -0.612206, 0.527414, 0.41519, 0.417918, 3.3, 1, -0.611496, 0.527099, 0.415726, 0.418821, 3.33333, 1, -0.61297, 0.527782, 0.414628, 0.41689, 3.36667, 1, -0.616614, 0.529454, 0.411884, 0.412089, 3.4, 1, -0.622414, 0.532078, 0.407424, 0.404351, 3.43333, 1, -0.630276, 0.535716, 0.401069, 0.393578, 3.46667, 1, -0.64043, 0.538489, 0.394092, 0.380224, 3.5, 1, -0.651307, 0.540564, 0.387221, 0.365581, 3.53333, 1, -0.662861, 0.542636, 0.379538, 0.349445, 3.56667, 1, -0.675209, 0.544621, 0.370889, 0.331546, 3.6, 1, -0.688608, 0.545996, 0.361457, 0.311537, 3.63333, 1, -0.702455, 0.546329, 0.351657, 0.290549, 3.66667, 1, -0.713536, 0.544518, 0.345269, 0.274144, 3.7, 1, -0.723134, 0.542068, 0.340246, 0.259753, 3.73333, 1, -0.731528, 0.538465, 0.336907, 0.247824, 3.76667, 1, -0.738955, 0.533701, 0.3352, 0.238224, 3.8, 1, -0.745569, 0.527603, 0.335235, 0.23104, 3.83333, 1, -0.751486, 0.519962, 0.337135, 0.22638, 3.86667, 1, -0.756833, 0.510659, 0.340854, 0.224164, 3.9, 1, -0.761603, 0.500365, 0.345618, 0.223928, 3.93333, 1, -0.764365, 0.497819, 0.345298, 0.220665, 3.96667, 1, -0.766489, 0.497633, 0.343747, 0.21609, 4, 1, -0.768612, 0.495443, 0.343731, 0.213592, 4.03333, 1, -0.770182, 0.49406, 0.343504, 0.211492, 4.06667, 1, -0.771234, 0.49312, 0.343348, 0.210101, 4.1, 1, -0.771776, 0.492634, 0.343268, 0.209381, 4.16667, 1, -0.771373, 0.492994, 0.343338, 0.209902, 4.2, 1, -0.770425, 0.493839, 0.343494, 0.211138, 4.23333, 1, -0.768966, 0.495135, 0.343723, 0.213043, 4.26667, 1, -0.767049, 0.496768, 0.344058, 0.215598, 4.3, 1, -0.764677, 0.498769, 0.344459, 0.218739, 4.33333, 1, -0.761805, 0.501162, 0.344938, 0.222503, 4.36667, 1, -0.758384, 0.503972, 0.345487, 0.226947, 4.4, 1, -0.754344, 0.507233, 0.346115, 0.232131, 4.43333, 1, -0.749606, 0.510982, 0.346818, 0.238132, 4.46667, 1, -0.744081, 0.515252, 0.347601, 0.245015, 4.5, 1, -0.737655, 0.52009, 0.348455, 0.252884, 4.53333, 1, -0.730193, 0.52554, 0.349381, 0.261838, 4.56667, 1, -0.721539, 0.531646, 0.350361, 0.271995, 4.6, 1, -0.711508, 0.53845, 0.351385, 0.283473, 4.63333, 1, -0.699853, 0.546343, 0.352121, 0.296185, 4.66667, 1, -0.693727, 0.545477, 0.356474, 0.306797, 4.7, 1, -0.68889, 0.545012, 0.360007, 0.314304, 4.73333, 1, -0.685439, 0.544667, 0.362494, 0.319544, 4.76667, 1, -0.683385, 0.544452, 0.363957, 0.322633, 4.8, 1, -0.682708, 0.54438, 0.364436, 0.323647, 4.83333, 1, -0.683395, 0.544452, 0.363948, 0.322622, 4.86667, 1, -0.685439, 0.544663, 0.36249, 0.319555, 4.9, 1, -0.688842, 0.544998, 0.360031, 0.314408, 4.93333, 1, -0.693589, 0.545434, 0.356543, 0.307105, 4.96667, 1, -0.699711, 0.545929, 0.351924, 0.297514, 5, 1, -0.704895, 0.545199, 0.349115, 0.28983, 5.03333, 1, -0.708665, 0.543537, 0.348188, 0.284828, 5.06667, 1, -0.711156, 0.540813, 0.349175, 0.282586, 5.1, 1, -0.712321, 0.53768, 0.351465, 0.282791, 5.13333, 1, -0.711818, 0.538265, 0.351403, 0.283023, 5.16667, 1, -0.710026, 0.539501, 0.351536, 0.284999, 5.2, 1, -0.706783, 0.541716, 0.351783, 0.28853, 5.23333, 1, -0.702047, 0.544899, 0.352088, 0.293682, 5.26667, 1, -0.698328, 0.546105, 0.35335, 0.29875) +tracks/86/type = "value" +tracks/86/imported = false +tracks/86/enabled = true +tracks/86/path = NodePath("%WalkSFX:playing") +tracks/86/interp = 1 +tracks/86/loop_wrap = true +tracks/86/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} + +[sub_resource type="Animation" id="Animation_58wyj"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("%WalkSFX:playing") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} [sub_resource type="AnimationLibrary" id="AnimationLibrary_8t2vx"] _data = { -&"Animation": SubResource("Animation_fq053") +&"Animation": SubResource("Animation_fq053"), +&"RESET": SubResource("Animation_58wyj") } [sub_resource type="Animation" id="Animation_wu83k"] @@ -4246,7 +4274,7 @@ 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.19517e-08, 1.48981e-06, 0.000155807, -0.00105953, -2.01735) bones/0/enabled = true -bones/0/position = Vector3(0.0996386, -0.401585, -1.53144) +bones/0/position = Vector3(0.0996386, -0.305531, -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" @@ -4275,7 +4303,7 @@ 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.00333627, 0.060827, 0.18899, 0.980088) +bones/4/rotation = Quaternion(0.00548408, 0.0659449, 0.205413, 0.976436) bones/4/scale = Vector3(1, 1, 1) bones/5/name = "neck4" bones/5/parent = 4 @@ -4289,7 +4317,7 @@ 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.330625, 0.0509286, -0.459739, 0.822638) +bones/6/rotation = Quaternion(-0.34044, 0.0518631, -0.487374, 0.80242) bones/6/scale = Vector3(1, 1, 1) bones/7/name = "Bone.007" bones/7/parent = 6 @@ -4324,7 +4352,7 @@ 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.812698, -0.0920842, -0.0237739, 0.574872) +bones/11/rotation = Quaternion(-0.807507, -0.0823642, -0.0235502, 0.583604) bones/11/scale = Vector3(1, 1, 1) bones/12/name = "arm2_L" bones/12/parent = 11 @@ -4351,7 +4379,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.0157695, 0.981227, 0.192212, 0.00107862, 3.8461, -0.0821097) bones/15/enabled = true -bones/15/position = Vector3(-0.175918, 3.44573, 0.114308) +bones/15/position = Vector3(-0.196922, 3.60726, 0.0837666) bones/15/rotation = Quaternion(-0.502686, 0.531044, 0.680821, -0.0422068) bones/15/scale = Vector3(1, 1, 1) bones/16/name = "arm2_R" @@ -4366,7 +4394,7 @@ 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.0159131, 0.096325, 0.275379, 0.956365) +bones/17/rotation = Quaternion(-0.0395544, 0.0971454, 0.267161, 0.957927) bones/17/scale = Vector3(1, 1, 1) bones/18/name = "hand_R" bones/18/parent = 17 @@ -4379,7 +4407,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.0598959, 0.000155807, -0.00105953, -2.01735) bones/19/enabled = true -bones/19/position = Vector3(0.147751, -0.352904, -1.49267) +bones/19/position = Vector3(0.147751, -0.297316, -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" @@ -4387,14 +4415,14 @@ 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.43422, -0.329708, -0.37484, 0.749828) +bones/20/rotation = Quaternion(-0.437059, -0.326192, -0.370501, 0.751869) 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.0490764, 0.00187908, 0.392566, 0.918412) +bones/21/rotation = Quaternion(-0.047834, 0.00188777, 0.382627, 0.922662) bones/21/scale = Vector3(1, 1, 1) bones/22/name = "foot1_L" bones/22/parent = 21 @@ -4428,7 +4456,7 @@ 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.0598959, -0.000155807, -0.00105953, -2.01735) bones/26/enabled = true -bones/26/position = Vector3(0.0289172, -0.345227, -1.59603) +bones/26/position = Vector3(0.0289172, -0.308168, -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" @@ -4436,14 +4464,14 @@ 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.312572, 0.17762, 0.184248, 0.914769) +bones/27/rotation = Quaternion(-0.316438, 0.174848, 0.183985, 0.914027) 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.276536, 0.0201479, -0.180436, 0.943697) +bones/28/rotation = Quaternion(-0.269812, 0.0202071, -0.176048, 0.946467) bones/28/scale = Vector3(1, 1, 1) bones/29/name = "foot1_R" bones/29/parent = 28 @@ -4480,12 +4508,12 @@ mesh = SubResource("ArrayMesh_jpm24") skin = SubResource("Skin_uxw16") [node name="BoneAttachment3D" type="BoneAttachment3D" parent="Armature/Skeleton3D"] -transform = Transform3D(-0.370164, -0.13327, -0.919357, -0.294523, -0.921764, 0.252204, -0.881042, 0.364129, 0.301953, -2.00357, 8.7346, 6.29248) +transform = Transform3D(-0.370165, -0.13327, -0.919357, -0.266254, -0.932916, 0.242438, -0.889993, 0.334525, 0.309849, -2.00357, 8.77453, 6.17365) bone_name = "TOP OF SKULL" bone_idx = 8 [node name="BoneAttachment3D2" type="BoneAttachment3D" parent="Armature/Skeleton3D"] -transform = Transform3D(0.960238, 0.142738, 0.239936, -0.239754, -0.0187265, 0.970653, 0.143042, -0.989584, 0.0162402, -2.41576, 1.62851, -9.08846) +transform = Transform3D(0.960238, 0.142738, 0.239935, -0.232277, -0.0683425, 0.970246, 0.154889, -0.987399, -0.0324702, -2.41576, 1.71749, -8.93596) bone_name = "hand_R" bone_idx = 18 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 f59c4986..c30c710e 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 @@ -1221,7 +1221,7 @@ tracks/40/keys = { "start_offset": 0.0, "stream": ExtResource("1_5mwcl") }], -"times": PackedFloat32Array(0.133333, 0.733333) +"times": PackedFloat32Array(0, 0.666667) } tracks/40/use_blend = true diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/animation/walking2.res b/Zennysoft.Game.Ma/src/enemy/enemy_types/14. horse_head/animation/walking2.res index 1de8b2828426f424408d272a9d351e252216bf34..7963ae68f3b5c35cbac30603fe6f825a86bcaca7 100644 GIT binary patch delta 5400 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 delta 5425 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 WPd_7kwug-uKodu|f&U+$^#1@0;x^&{ diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFace.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFace.tscn index 4a33d87f..5a0efb11 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFace.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/15. ox_face/OxFace.tscn @@ -12,8 +12,8 @@ radius = 1.0 height = 4.0 -[sub_resource type="SphereShape3D" id="SphereShape3D_j7u30"] -radius = 15.426 +[sub_resource type="SphereShape3D" id="SphereShape3D_i0akf"] +radius = 3.31305 [sub_resource type="CylinderShape3D" id="CylinderShape3D_ow3fn"] height = 7.0 @@ -40,8 +40,8 @@ collision_mask = 0 [node name="EnemyHitbox" type="CollisionShape3D" parent="Collision"] unique_name_in_owner = true -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 14.3724, 0) -shape = SubResource("SphereShape3D_j7u30") +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.87204, 0) +shape = SubResource("SphereShape3D_i0akf") disabled = true [node name="Rotation" type="Node3D" parent="."] 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 283b4af4..1c4f7f73 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,4 +1,4 @@ -[gd_scene load_steps=130 format=4 uid="uid://dnomfbym36ivg"] +[gd_scene load_steps=131 format=4 uid="uid://dnomfbym36ivg"] [ext_resource type="Script" uid="uid://cycffa0wn7sks" path="res://src/enemy/BossAModelView.cs" id="1_1ch7e"] [ext_resource type="Script" uid="uid://ckv5dmrw6pvn6" path="res://src/enemy/EnemyModelView3D.cs" id="1_6miqu"] @@ -2672,10 +2672,38 @@ tracks/95/path = NodePath("Cube_009") tracks/95/interp = 1 tracks/95/loop_wrap = true tracks/95/keys = PackedFloat32Array(0, 1, 0, 0, 0, 1, 0.0333333, 1, 0, 0, 0, 1, 0.0666667, 1, 0.101779, 0.0328614, 0.0297112, 0.99382, 0.1, 1, 0.254283, 0.0746811, 0.0614763, 0.96228, 0.133333, 1, 0.415433, 0.114047, 0.0840566, 0.898523, 0.166667, 1, 0.55658, 0.153342, 0.103806, 0.809895, 0.2, 1, 0.677756, 0.194714, 0.118105, 0.699131, 0.266667, 1, 0.85285, 0.272995, 0.127622, 0.426419, 0.333333, 1, 0.926466, 0.339573, 0.114535, 0.11503, 0.366667, 1, 0.923264, 0.368133, 0.101069, -0.0429731, 0.4, 1, -0.894719, -0.391669, -0.0845984, 0.197271, 0.466667, 1, -0.768048, -0.421905, -0.046077, 0.479558, 0.5, 1, -0.674454, -0.428065, -0.025738, 0.601008, 0.533333, 1, -0.564375, -0.429357, -0.00623446, 0.705049, 0.566667, 1, -0.44119, -0.424447, 0.0120101, 0.790603, 0.6, 1, -0.308183, -0.413526, 0.0284205, 0.856278, 0.633333, 1, -0.16871, -0.396911, 0.0425073, 0.901217, 0.666667, 1, -0.0261114, -0.375022, 0.0538747, 0.925081, 0.7, 1, 0.116079, -0.349367, 0.0615719, 0.927727, 0.733333, 1, 0.255013, -0.319437, 0.0660374, 0.910257, 0.8, 1, 0.512108, -0.249494, 0.065025, 0.81931, 0.833333, 1, 0.625468, -0.21094, 0.0596123, 0.748826, 0.866667, 1, 0.725763, -0.171829, 0.0504249, 0.664229, 0.9, 1, 0.786285, -0.122809, 0.0539777, 0.603126, 0.933333, 1, 0.772923, -0.107361, 0.0507181, 0.623291, 1, 1, 0.601753, -0.144921, 0.0190185, 0.785194, 1.03333, 1, 0.504484, -0.159967, 0.00092427, 0.848472, 1.06667, 1, 0.390986, -0.174877, -0.0235703, 0.903323, 1.1, 1, 0.243497, -0.189706, -0.0562633, 0.949503, 1.13333, 1, 0.0647502, -0.200947, -0.0946334, 0.972868, 1.16667, 1, -0.116488, -0.204963, -0.132629, 0.96272, 1.2, 1, -0.263566, -0.211157, -0.150585, 0.929123, 1.23333, 1, -0.38509, -0.215694, -0.163714, 0.882258, 1.26667, 1, -0.490486, -0.218611, -0.174621, 0.825312, 1.33333, 1, -0.670557, -0.219107, -0.193691, 0.681784, 1.36667, 1, -0.745425, -0.217461, -0.202372, 0.596739, 1.4, 1, -0.799598, -0.22172, -0.202141, 0.520214, 1.43333, 1, -0.836201, -0.228692, -0.195512, 0.458523, 1.46667, 1, -0.861039, -0.235046, -0.185816, 0.410899, 1.5, 1, -0.88105, -0.236994, -0.176867, 0.369192, 1.53333, 1, -0.898014, -0.235169, -0.168639, 0.331401, 1.56667, 1, -0.912916, -0.231087, -0.160772, 0.295526, 1.6, 1, -0.924387, -0.225767, -0.154137, 0.266044, 1.63333, 1, -0.931965, -0.219911, -0.149223, 0.246602, 1.66667, 1, -0.935641, -0.213783, -0.14606, 0.239872, 1.7, 1, -0.937034, -0.206368, -0.143483, 0.242471, 1.73333, 1, -0.936662, -0.197961, -0.1414, 0.251957, 1.76667, 1, -0.934996, -0.187155, -0.139777, 0.266867, 1.8, 1, -0.932102, -0.176813, -0.138261, 0.284265, 1.83333, 1, -0.92801, -0.17414, -0.136235, 0.299853, 1.86667, 1, -0.922538, -0.17895, -0.13363, 0.314712, 1.9, 1, -0.916242, -0.183976, -0.130972, 0.330907, 1.93333, 1, -0.909453, -0.185627, -0.128668, 0.349117, 1.96667, 1, -0.901877, -0.184429, -0.126628, 0.369552, 2, 1, -0.892584, -0.185024, -0.124255, 0.391944, 2.03333, 1, -0.880887, -0.185036, -0.122057, 0.418213, 2.06667, 1, -0.866534, -0.185012, -0.119832, 0.447805, 2.1, 1, -0.8489, -0.184493, -0.117717, 0.481117, 2.13333, 1, -0.828048, -0.181669, -0.116249, 0.517512, 2.16667, 1, -0.804921, -0.173426, -0.116388, 0.55541, 2.2, 1, -0.782027, -0.162256, -0.117721, 0.590126, 2.23333, 1, -0.758533, -0.150789, -0.119354, 0.622612, 2.3, 1, -0.708433, -0.128257, -0.123029, 0.683035, 2.33333, 1, -0.680777, -0.118156, -0.124231, 0.712144, 2.36667, 1, -0.650002, -0.109167, -0.124733, 0.741634, 2.4, 1, -0.615759, -0.100691, -0.124796, 0.771446, 2.43333, 1, -0.577463, -0.0924157, -0.124748, 0.80152, 2.46667, 1, -0.534518, -0.0841679, -0.124762, 0.83165, 2.5, 1, -0.486331, -0.0759189, -0.124857, 0.861469, 2.53333, 1, -0.42953, -0.0676124, -0.12525, 0.891765, 2.56667, 1, -0.365034, -0.0589968, -0.125825, 0.920564, 2.6, 1, -0.292892, -0.0501263, -0.126536, 0.946409, 2.63333, 1, -0.212029, -0.041536, -0.122231, 0.968699, 2.66667, 1, -0.12014, -0.0342048, -0.102604, 0.986848, 2.7, 1, -0.0327845, -0.0260341, -0.080087, 0.995908, 2.73333, 1, 0.0441101, -0.0175077, -0.0558963, 0.997308, 2.76667, 1, 0.113642, -0.00867802, -0.0310568, 0.992998, 2.8, 1, 0.176336, 2.8275e-06, -0.00747404, 0.984302, 2.83333, 1, 0.230156, 0.00766478, 0.0120093, 0.97305, 2.86667, 1, 0.265869, 0.0135714, 0.0223449, 0.963655, 2.9, 1, 0.29229, 0.0184036, 0.0288777, 0.955717, 2.93333, 1, 0.30972, 0.0216501, 0.0309198, 0.950078, 2.96667, 1, 0.31912, 0.0233739, 0.0286833, 0.946992, 3, 1, 0.322075, 0.024208, 0.0232723, 0.946118, 3.03333, 1, 0.316439, 0.0237591, 0.0136751, 0.948217, 3.06667, 1, 0.301218, 0.0224307, 0.000369765, 0.953291, 3.1, 1, 0.277882, 0.0205285, -0.0158134, 0.960266, 3.13333, 1, 0.246671, 0.0188075, -0.033206, 0.968348, 3.16667, 1, 0.206611, 0.0184716, -0.0492944, 0.977006, 3.2, 1, 0.161659, 0.0199614, -0.0621351, 0.984686, 3.23333, 1, 0.113699, 0.0219319, -0.0735154, 0.990549, 3.26667, 1, 0.0618103, 0.0240237, -0.0835185, 0.994297, 3.3, 1, 0.00513029, 0.0260116, -0.0919743, 0.995408, 3.33333, 1, -0.0571088, 0.0278041, -0.0984539, 0.993113, 3.36667, 1, -0.123154, 0.0294279, -0.101998, 0.986693, 3.4, 1, -0.187975, 0.0302049, -0.101144, 0.976485, 3.43333, 1, -0.242635, 0.030248, -0.09676, 0.964806, 3.46667, 1, -0.283778, 0.0298618, -0.09047, 0.954145, 3.5, 1, -0.313295, 0.0294879, -0.0844635, 0.945433, 3.53333, 1, -0.333158, 0.0297436, -0.0791029, 0.939076, 3.56667, 1, -0.346072, 0.0304624, -0.074209, 0.934772, 3.6, 1, -0.352255, 0.0316319, -0.0697842, 0.932763, 3.63333, 1, -0.35184, 0.0332366, -0.0658256, 0.933151, 3.66667, 1, -0.344877, 0.0352583, -0.0623271, 0.935912, 3.7, 1, -0.329154, 0.0377927, -0.0594454, 0.941645, 3.73333, 1, -0.30661, 0.0406628, -0.0570353, 0.949255, 3.76667, 1, -0.276917, 0.043841, -0.0551111, 0.95831, 3.8, 1, -0.240039, 0.0472462, -0.0534389, 0.968139, 3.83333, 1, -0.19627, 0.0507447, -0.0515406, 0.977879, 3.86667, 1, -0.151435, 0.0539086, -0.0477222, 0.985842, 3.9, 1, -0.108927, 0.0568803, -0.0430279, 0.991488, 3.93333, 1, -0.0687067, 0.0597688, -0.0379449, 0.995122, 3.96667, 1, -0.0312179, 0.0626161, -0.0324892, 0.99702, 4, 1, 0.00260553, 0.0654017, -0.026209, 0.997511, 4.03333, 1, 0.0284427, 0.0681173, -0.0172724, 0.997122, 4.06667, 1, 0.0481746, 0.0706426, -0.00858974, 0.996301, 4.1, 1, 0.0626346, 0.0728856, -0.00302573, 0.995367, 4.13333, 1, 0.0723503, 0.0747763, -0.00198586, 0.99457, 4.16667, 1, 0.0775338, 0.0762635, -0.00541939, 0.994054, 4.2, 1, 0.0752048, 0.0773618, -0.0124031, 0.994085, 4.23333, 1, 0.067267, 0.078604, -0.0173136, 0.994483, 4.26667, 1, 0.0541169, 0.0799769, -0.0200507, 0.995125, 4.3, 1, 0.0358777, 0.0814434, -0.0205481, 0.99582, 4.33333, 1, 0.0124025, 0.082941, -0.0187735, 0.9963, 4.36667, 1, -0.0173541, 0.0843662, -0.0141464, 0.996183, 4.4, 1, -0.0491244, 0.0856419, -0.00866146, 0.995077, 4.43333, 1, -0.0825408, 0.0867321, -0.00261253, 0.992803, 4.46667, 1, -0.117123, 0.0876843, 0.00300318, 0.989234, 4.5, 1, -0.152285, 0.0886331, 0.00648701, 0.984333, 4.53333, 1, -0.185378, 0.090009, 0.00587548, 0.978519, 4.56667, 1, -0.216911, 0.0919583, 0.00178375, 0.971849, 4.6, 1, -0.239024, 0.0943266, -0.0052319, 0.966407, 4.63333, 1, -0.249773, 0.0971085, -0.0142361, 0.963318, 4.66667, 1, -0.252938, 0.100373, -0.0239159, 0.961965, 4.7, 1, -0.246086, 0.104149, -0.0345821, 0.963015, 4.73333, 1, -0.231814, 0.108221, -0.0453995, 0.965655, 4.76667, 1, -0.212912, 0.111945, -0.0536595, 0.969153, 4.83333, 1, -0.169643, 0.117704, -0.060702, 0.976566, 4.86667, 1, -0.14839, 0.119902, -0.0602063, 0.979785, 4.9, 1, -0.12941, 0.121841, -0.0581337, 0.982358, 4.93333, 1, -0.112573, 0.123574, -0.0545385, 0.98442, 4.96667, 1, -0.0977715, 0.125141, -0.0494808, 0.986069, 5, 1, -0.08493, 0.126575, -0.0430258, 0.987378, 5.03333, 1, -0.0748354, 0.127933, -0.0359498, 0.988302, 5.06667, 1, -0.0666785, 0.129246, -0.0285422, 0.988956, 5.1, 1, -0.060391, 0.130518, -0.0207628, 0.989387, 5.13333, 1, -0.0559123, 0.131747, -0.0125737, 0.989626, 5.16667, 1, -0.053189, 0.132933, -0.00393989, 0.989689, 5.2, 1, -0.0528955, 0.134069, 0.00480451, 0.989548, 5.23333, 1, -0.0544382, 0.135187, 0.0124606, 0.989245, 5.26667, 1, -0.0575216, 0.136347, 0.0178285, 0.988829, 5.3, 1, -0.0619614, 0.137602, 0.0201965, 0.988341, 5.33333, 1, -0.0676831, 0.138998, 0.0193411, 0.987788, 5.36667, 1, -0.0752087, 0.140621, 0.0142713, 0.9871, 5.4, 1, -0.084459, 0.142395, 0.00673885, 0.986177, 5.43333, 1, -0.095682, 0.144204, -0.00152501, 0.98491, 5.46667, 1, -0.108967, 0.145978, -0.00946993, 0.983223, 5.5, 1, -0.124242, 0.147683, -0.0167266, 0.981058, 5.53333, 1, -0.142349, 0.149293, -0.0231462, 0.978219, 5.6, 1, -0.180925, 0.152432, -0.0357004, 0.970956, 5.63333, 1, -0.199634, 0.153867, -0.0409831, 0.966846, 5.66667, 1, -0.217668, 0.15506, -0.0446704, 0.962591, 5.7, 1, -0.23349, 0.155609, -0.0445238, 0.958794, 5.73333, 1, -0.240414, 0.156296, -0.0445606, 0.956968, 5.76667, 1, -0.23957, 0.157376, -0.0452359, 0.956971, 5.8, 1, -0.232985, 0.158637, -0.0455092, 0.958374, 5.83333, 1, -0.223612, 0.159432, -0.0428499, 0.960595, 5.86667, 1, -0.212929, 0.159585, -0.0362929, 0.963264, 5.9, 1, -0.201946, 0.159512, -0.0282356, 0.965907, 5.93333, 1, -0.190853, 0.159413, -0.020031, 0.968381, 5.96667, 1, -0.179755, 0.159451, -0.0127486, 0.970619, 6, 1, -0.168659, 0.159745, -0.00717264, 0.972617, 6.03333, 1, -0.157422, 0.160353, -0.0038407, 0.974418, 6.1, 1, -0.134327, 0.162136, -0.00202765, 0.977581, 6.13333, 1, -0.123268, 0.163189, -0.00282965, 0.97886, 6.16667, 1, -0.114155, 0.164181, -0.00344375, 0.979797, 6.2, 1, -0.10809, 0.165051, -0.00317906, 0.980339, 6.23333, 1, -0.104222, 0.165837, -0.00225767, 0.980628, 6.26667, 1, -0.102511, 0.166545, -0.000677116, 0.98069, 6.3, 1, -0.102927, 0.167176, 0.00156763, 0.980538, 6.33333, 1, -0.105452, 0.167727, 0.00448424, 0.980167, 6.36667, 1, -0.110786, 0.168161, 0.00832024, 0.979479, 6.43333, 1, -0.125825, 0.169195, 0.0127581, 0.977435, 6.46667, 1, -0.133193, 0.169985, 0.0120554, 0.976329, 6.5, 1, -0.139789, 0.171017, 0.00919274, 0.975258, 6.53333, 1, -0.145636, 0.172333, 0.00399424, 0.974205, 6.56667, 1, -0.151044, 0.173845, -0.00279935, 0.973117, 6.6, 1, -0.156065, 0.175554, -0.0111813, 0.971957, 6.63333, 1, -0.160739, 0.177434, -0.0209868, 0.97069, 6.66667, 1, -0.165103, 0.179442, -0.0318923, 0.969291, 6.7, 1, -0.168806, 0.181337, -0.0419262, 0.967917, 6.73333, 1, -0.171797, 0.183049, -0.0505117, 0.966658, 6.76667, 1, -0.173778, 0.184507, -0.0569994, 0.965665, 6.8, 1, -0.174566, 0.185675, -0.0610173, 0.965054, 6.83333, 1, -0.174093, 0.18655, -0.0624695, 0.964877, 6.86667, 1, -0.171949, 0.187047, -0.0605586, 0.965288, 6.9, 1, -0.168535, 0.187271, -0.0561444, 0.966112, 6.93333, 1, -0.164971, 0.187226, -0.0495281, 0.967098, 6.96667, 1, -0.162396, 0.186913, -0.0409919, 0.967993, 7, 1, -0.161971, 0.186335, -0.0307986, 0.968554, 7.03333, 1, -0.162444, 0.185592, -0.0197637, 0.968905, 7.06667, 1, -0.162682, 0.184991, -0.0101419, 0.969129, 7.1, 1, -0.162695, 0.184575, -0.00215773, 0.969257, 7.13333, 1, -0.162482, 0.184371, 0.00407568, 0.969325, 7.16667, 1, -0.162031, 0.184391, 0.00855689, 0.969367, 7.2, 1, -0.161131, 0.184763, 0.0103452, 0.969429, 7.23333, 1, -0.159795, 0.18545, 0.00979049, 0.969525, 7.26667, 1, -0.158101, 0.186408, 0.00718506, 0.969641, 7.3, 1, -0.156105, 0.187597, 0.00276243, 0.969758, 7.33333, 1, -0.153844, 0.188979, -0.00330267, 0.969849, 7.36667, 1, -0.151235, 0.190598, -0.0115204, 0.96988, 7.4, 1, -0.149242, 0.19226, -0.0206059, 0.96971, 7.43333, 1, -0.148986, 0.193784, -0.0290612, 0.96923, 7.46667, 1, -0.150934, 0.195073, -0.0359796, 0.968438, 7.5, 1, -0.154896, 0.196111, -0.0410452, 0.9674, 7.53333, 1, -0.161547, 0.196819, -0.0437044, 0.966051, 7.6, 1, -0.177985, 0.197454, -0.0434688, 0.963039, 7.66667, 1, -0.192203, 0.197125, -0.0359913, 0.960679, 7.7, 1, -0.197986, 0.196521, -0.0292893, 0.959856, 7.73333, 1, -0.203447, 0.195749, -0.0217101, 0.959073, 7.76667, 1, -0.208725, 0.194892, -0.0138898, 0.958258, 7.8, 1, -0.213974, 0.19409, -0.00671002, 0.95734, 7.83333, 1, -0.21937, 0.193542, -0.00129656, 0.956251, 7.86667, 1, -0.225009, 0.193396, 0.001654, 0.954969, 7.9, 1, -0.226184, 0.193624, 0.0023065, 0.954644, 7.93333, 1, -0.224758, 0.194291, 0.000714316, 0.954848, 7.96667, 1, -0.222317, 0.195368, -0.0029445, 0.955195, 8, 1, -0.220174, 0.196741, -0.00836713, 0.955378, 8.03333, 1, -0.218325, 0.19834, -0.0152393, 0.955386, 8.06667, 1, -0.216434, 0.19977, -0.0212347, 0.955404, 8.1, 1, -0.214376, 0.20099, -0.0260573, 0.955493, 8.13333, 1, -0.211998, 0.201955, -0.0293745, 0.955724, 8.16667, 1, -0.209117, 0.20262, -0.0308178, 0.956172, 8.2, 1, -0.205526, 0.202904, -0.0297932, 0.956923, 8.23333, 1, -0.201483, 0.202957, -0.0272187, 0.957848, 8.26667, 1, -0.197146, 0.202845, -0.0235344, 0.958871, 8.3, 1, -0.192599, 0.202618, -0.0190636, 0.959942, 8.33333, 1, -0.187861, 0.202307, -0.0140141, 0.961033) +tracks/96/type = "value" +tracks/96/imported = false +tracks/96/enabled = true +tracks/96/path = NodePath("%WalkSFX:playing") +tracks/96/interp = 1 +tracks/96/loop_wrap = true +tracks/96/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} + +[sub_resource type="Animation" id="Animation_1ch7e"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("%WalkSFX:playing") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} [sub_resource type="AnimationLibrary" id="AnimationLibrary_krkt8"] _data = { -&"Animation": SubResource("Animation_f72ka") +&"Animation": SubResource("Animation_f72ka"), +&"RESET": SubResource("Animation_1ch7e") } [node name="EnemyModelView" type="Node3D"] @@ -2692,50 +2720,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.260041, -1.02704, -1.9695) -bones/0/rotation = Quaternion(0.0915277, -0.692111, -0.0341586, 0.715149) +bones/0/position = Vector3(-0.009526, 0.366754, -1.88784) +bones/0/rotation = Quaternion(-0.00308433, -0.68495, -0.00289962, 0.728578) 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/rotation = Quaternion(0.0586044, 0.0623993, -0.341393, 0.936014) 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.0217442, -0.0146702, 0.0478742, 0.998509) 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.00345914, 0.0130109, 0.0151201, 0.999795) 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.103663, 0.214122, 0.101145, 0.96601) 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.0473537, -0.0122364, 0.0232444, 0.998533) 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.0511204, -0.295537, -0.744273, 0.596743) +bones/6/rotation = Quaternion(-0.190028, -0.328604, -0.405057, 0.831768) bones/6/scale = Vector3(1, 1, 1) bones/7/name = "Bone.007" bones/7/parent = 6 @@ -2770,14 +2798,14 @@ 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.781012, -0.0583908, 0.0792691, 0.616706) +bones/11/rotation = Quaternion(-0.785673, -0.0724002, 0.0590847, 0.611544) 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.572568, -0.639491, -0.229818, 0.458694) bones/12/scale = Vector3(1, 1, 1) bones/13/name = "arm3_L" bones/13/parent = 12 @@ -2797,22 +2825,22 @@ 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.21412, 0.743259, 0.615823, -0.149935) +bones/15/position = Vector3(0.00107843, 3.8461, -0.0821096) +bones/15/rotation = Quaternion(-0.0474424, 0.655558, 0.750149, -0.0725857) 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/rotation = Quaternion(-0.425852, -0.0135801, -0.446033, 0.787096) 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/rotation = Quaternion(-0.0566708, -0.040868, 0.634575, 0.769697) bones/17/scale = Vector3(1, 0.999999, 1) bones/18/name = "hand_R" bones/18/parent = 17 @@ -2825,29 +2853,29 @@ 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.35994, -1.17996, -1.78744) -bones/19/rotation = Quaternion(0.623398, 0.298153, 0.552326, -0.466278) +bones/19/position = Vector3(0.000155844, -0.00105979, -2.01735) +bones/19/rotation = Quaternion(0.608697, 0.3155, 0.575514, -0.445793) 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.323315, -0.427838, -0.293183, 0.791496) +bones/20/rotation = Quaternion(-0.492424, -0.143601, -0.357923, 0.780249) 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.0604385, 0.00129877, 0.489251, 0.870045) +bones/21/rotation = Quaternion(-0.0403868, 0.00142275, 0.327379, 0.944028) 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.155407, 0.0488441, -0.63195, 0.757695) bones/22/scale = Vector3(1, 1, 1) bones/23/name = "foot2_L" bones/23/parent = 22 @@ -2860,21 +2888,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(7.04992, -9.46662, 3.49458) -bones/24/rotation = Quaternion(0.427621, 0.561851, 0.530083, 0.469549) +bones/24/position = Vector3(1.83022, -6.67107, 3.18901) +bones/24/rotation = Quaternion(0.453784, 0.542292, 0.542291, 0.453784) 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(1.99656, -12.4846, 0.97679) +bones/25/rotation = Quaternion(-0.451514, 0.545238, -0.541753, 0.453161) 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.0853782, -1.11395, -2.01875) +bones/26/position = Vector3(-0.000155844, -0.00105979, -2.01735) bones/26/rotation = Quaternion(0.608697, -0.3155, -0.575514, -0.445793) bones/26/scale = Vector3(1, 1, 1) bones/27/name = "leg1_R" @@ -2882,14 +2910,14 @@ 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.203399, 0.42403, 0.138817, 0.871526) +bones/27/rotation = Quaternion(-0.482712, 0.00371048, 0.197321, 0.853253) 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.0631028, -0.00116242, -0.503807, 0.861507) +bones/28/rotation = Quaternion(-0.0581196, -0.00118045, -0.463371, 0.884256) bones/28/scale = Vector3(1, 1, 1) bones/29/name = "foot1_R" bones/29/parent = 28 @@ -2909,19 +2937,19 @@ 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/position = Vector3(-1.83022, -6.67107, 3.18901) bones/31/rotation = Quaternion(-0.453784, 0.542292, 0.542291, -0.453784) 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.70148, -11.5541, -6.03943) +bones/32/rotation = Quaternion(0.457231, 0.539389, -0.539388, -0.45723) bones/32/scale = Vector3(1, 1, 1) [node name="BoneAttachment3D" type="BoneAttachment3D" parent="Armature/Skeleton3D"] -transform = Transform3D(-0.270421, -0.0424509, -0.961806, -0.333173, -0.933171, 0.134862, -0.903254, 0.356917, 0.238205, -1.68568, 8.22845, 4.95477) +transform = Transform3D(-0.316562, -0.00667414, -0.948549, -0.615674, -0.759278, 0.210813, -0.721618, 0.650733, 0.236249, -0.0878583, 11.0923, 6.15032) bone_name = "TOP OF SKULL" bone_idx = 8 @@ -2944,7 +2972,7 @@ mesh = SubResource("ArrayMesh_5ew54") skin = SubResource("Skin_e330f") [node name="BoneAttachment3D2" type="BoneAttachment3D" parent="Armature/Skeleton3D"] -transform = Transform3D(-0.0469599, 0.00371186, -0.998889, -0.0817386, -0.996652, 0.000138789, -0.995545, 0.0816552, 0.0471056, -6.28071, -1.24312, -0.15852) +transform = Transform3D(0.0410828, -0.148389, -0.988074, -0.125662, -0.981824, 0.142226, -0.991221, 0.118321, -0.0589835, -5.64809, 0.693097, -1.34025) bone_name = "hand_R" bone_idx = 18 diff --git a/Zennysoft.Game.Ma/src/player/Player.tscn b/Zennysoft.Game.Ma/src/player/Player.tscn index da0ca74f..db8a1ad7 100644 --- a/Zennysoft.Game.Ma/src/player/Player.tscn +++ b/Zennysoft.Game.Ma/src/player/Player.tscn @@ -1477,6 +1477,18 @@ tracks/10/keys = { "update": 1, "values": [SubResource("SpriteFrames_xbcdg")] } +tracks/11/type = "value" +tracks/11/imported = false +tracks/11/enabled = true +tracks/11/path = NodePath("%Camera3D:position") +tracks/11/interp = 1 +tracks/11/loop_wrap = true +tracks/11/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector3(0.003, 2.1, -0.01)] +} [sub_resource type="Animation" id="Animation_es4xk"] resource_name = "death"