From cfa79f262faa7ead2196a3f0a7b212591d7c440b Mon Sep 17 00:00:00 2001 From: Zenny Date: Tue, 25 Feb 2025 22:20:04 -0800 Subject: [PATCH] Fix fake error and also looking during attacks --- src/enemy/Enemy.cs | 2 +- .../01. sproingy/SproingyModelView.tscn | 28 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/enemy/Enemy.cs b/src/enemy/Enemy.cs index e6f6a965..b5687732 100644 --- a/src/enemy/Enemy.cs +++ b/src/enemy/Enemy.cs @@ -90,7 +90,7 @@ public partial class Enemy : CharacterBody3D, IEnemy, IProvide return; var lookDir = GlobalPosition + Velocity; - if (_enemyLogic.Value is not EnemyLogic.State.Attacking && (!lookDir.IsEqualApprox(GlobalPosition) || !Velocity.IsZeroApprox())) + if (!lookDir.IsEqualApprox(GlobalPosition) || !Velocity.IsZeroApprox()) LookAt(lookDir, Vector3.Up, true); var isWalking = _enemyLogic.Value is EnemyLogic.State.Patrolling or EnemyLogic.State.FollowPlayer; diff --git a/src/enemy/enemy_types/01. sproingy/SproingyModelView.tscn b/src/enemy/enemy_types/01. sproingy/SproingyModelView.tscn index 85ead55c..638fb768 100644 --- a/src/enemy/enemy_types/01. sproingy/SproingyModelView.tscn +++ b/src/enemy/enemy_types/01. sproingy/SproingyModelView.tscn @@ -264,7 +264,7 @@ tracks/0/loop_wrap = true tracks/0/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), -"update": 0, +"update": 1, "values": [&"idle_left_walk"] } tracks/1/type = "value" @@ -276,7 +276,7 @@ tracks/1/loop_wrap = true tracks/1/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), -"update": 0, +"update": 1, "values": [0] } tracks/2/type = "value" @@ -336,7 +336,7 @@ tracks/0/loop_wrap = true tracks/0/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), -"update": 0, +"update": 1, "values": [&"idle_back_walk"] } tracks/1/type = "value" @@ -348,7 +348,7 @@ tracks/1/loop_wrap = true tracks/1/keys = { "times": PackedFloat32Array(0, 0.0833333, 0.166667, 0.25, 0.333333, 0.416667, 0.5, 0.583333, 0.666666, 0.75, 0.833333, 0.916666, 1, 1.08333, 1.16667), "transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1), -"update": 0, +"update": 1, "values": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14] } @@ -366,7 +366,7 @@ tracks/0/loop_wrap = true tracks/0/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), -"update": 0, +"update": 1, "values": [&"idle_front_walk"] } tracks/1/type = "value" @@ -378,7 +378,7 @@ tracks/1/loop_wrap = true tracks/1/keys = { "times": PackedFloat32Array(0, 0.0833333, 0.166667, 0.333333, 0.416667, 0.5, 0.583333, 0.666667, 0.75, 0.833333, 0.916667, 1, 1.08333, 1.16667, 1.25), "transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1), -"update": 0, +"update": 1, "values": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14] } @@ -396,7 +396,7 @@ tracks/0/loop_wrap = true tracks/0/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), -"update": 0, +"update": 1, "values": [&"idle_front_walk"] } tracks/1/type = "value" @@ -408,7 +408,7 @@ tracks/1/loop_wrap = true tracks/1/keys = { "times": PackedFloat32Array(0, 0.0833333, 0.166667, 0.25, 0.333333, 0.416667, 0.5, 0.583333, 0.666667, 0.75, 0.833333, 0.916667, 1, 1.08333, 1.16667), "transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1), -"update": 0, +"update": 1, "values": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14] } @@ -426,7 +426,7 @@ tracks/0/loop_wrap = true tracks/0/keys = { "times": PackedFloat32Array(0, 0.0833333, 0.166667, 0.25, 0.333333, 0.416667, 0.5, 0.583333, 0.666666, 0.75, 0.833333, 0.916666, 1, 1.08333, 1.16667), "transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1), -"update": 0, +"update": 1, "values": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14] } tracks/1/type = "value" @@ -438,7 +438,7 @@ tracks/1/loop_wrap = true tracks/1/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), -"update": 0, +"update": 1, "values": [&"idle_left_walk"] } @@ -456,7 +456,7 @@ tracks/0/loop_wrap = true tracks/0/keys = { "times": PackedFloat32Array(0, 0.0833333, 0.166667, 0.25, 0.333333, 0.416667, 0.5, 0.583333, 0.666666, 0.75, 0.833333, 0.916666, 1, 1.08333, 1.16667), "transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1), -"update": 0, +"update": 1, "values": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14] } tracks/1/type = "value" @@ -468,7 +468,7 @@ tracks/1/loop_wrap = true tracks/1/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), -"update": 0, +"update": 1, "values": [&"idle_left_walk"] } @@ -485,7 +485,7 @@ tracks/0/loop_wrap = true tracks/0/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), -"update": 0, +"update": 1, "values": [&"attack"] } tracks/1/type = "value" @@ -497,7 +497,7 @@ tracks/1/loop_wrap = true tracks/1/keys = { "times": PackedFloat32Array(0, 0.0833333, 0.166667, 0.25, 0.333333, 0.416667, 0.5, 0.583333, 0.666666, 0.75), "transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1), -"update": 0, +"update": 1, "values": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] } tracks/2/type = "value"