diff --git a/Zennysoft.Game.Ma/src/enemy/Enemy2D.cs b/Zennysoft.Game.Ma/src/enemy/Enemy2D.cs index f0dd617fc..b04a8e17f 100644 --- a/Zennysoft.Game.Ma/src/enemy/Enemy2D.cs +++ b/Zennysoft.Game.Ma/src/enemy/Enemy2D.cs @@ -35,7 +35,7 @@ public abstract partial class Enemy2D : Enemy if (_enemyLogic.Value is EnemyLogic.State.FollowPlayer || _enemyLogic.Value is EnemyLogic.State.Patrolling) { var velocity = (GlobalPosition - _previousPosition) / (float)delta; - if (velocity.Length() < 0.3f) + if (velocity.Length() < 0.15f) _enemyLogic.Input(new EnemyLogic.Input.Idle()); else _enemyLogic.Input(new EnemyLogic.Input.Move()); diff --git a/Zennysoft.Game.Ma/src/enemy/enemy_types/03. filth_eater/FilthEaterModelView.tscn b/Zennysoft.Game.Ma/src/enemy/enemy_types/03. filth_eater/FilthEaterModelView.tscn index e078afd08..64c178817 100644 --- a/Zennysoft.Game.Ma/src/enemy/enemy_types/03. filth_eater/FilthEaterModelView.tscn +++ b/Zennysoft.Game.Ma/src/enemy/enemy_types/03. filth_eater/FilthEaterModelView.tscn @@ -1098,6 +1098,18 @@ tracks/4/keys = { "update": 0, "values": [1.0] } +tracks/5/type = "value" +tracks/5/imported = false +tracks/5/enabled = true +tracks/5/path = NodePath("attack VFX:frame") +tracks/5/interp = 1 +tracks/5/loop_wrap = true +tracks/5/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [0] +} [sub_resource type="Animation" id="Animation_b1kem"] resource_name = "idle_back" diff --git a/Zennysoft.Game.Ma/src/items/weapons/Weapon.tscn b/Zennysoft.Game.Ma/src/items/weapons/Weapon.tscn index 6c6c0b8e5..8f950243e 100644 --- a/Zennysoft.Game.Ma/src/items/weapons/Weapon.tscn +++ b/Zennysoft.Game.Ma/src/items/weapons/Weapon.tscn @@ -1,7 +1,6 @@ -[gd_scene load_steps=5 format=3 uid="uid://bg3654q6tmtbk"] +[gd_scene load_steps=4 format=3 uid="uid://bg3654q6tmtbk"] [ext_resource type="Script" uid="uid://bq8aaf1ae4afh" path="res://src/items/weapons/Weapon.cs" id="1_7pkyf"] -[ext_resource type="Texture2D" uid="uid://bnkshsssabl0" path="res://src/items/weapons/textures/Air Sword.png" id="2_udu2u"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_1051i"] height = 0.725098 @@ -32,7 +31,6 @@ unique_name_in_owner = true pixel_size = 0.005 billboard = 2 texture_filter = 0 -texture = ExtResource("2_udu2u") [node name="CollisionShape3D" type="CollisionShape3D" parent="Pickup"] shape = SubResource("CapsuleShape3D_wll7p") diff --git a/Zennysoft.Game.Ma/src/map/dungeon/code/MonsterRoom.cs b/Zennysoft.Game.Ma/src/map/dungeon/code/MonsterRoom.cs index 73958c16e..b1f9d7b2e 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/code/MonsterRoom.cs +++ b/Zennysoft.Game.Ma/src/map/dungeon/code/MonsterRoom.cs @@ -65,7 +65,7 @@ public partial class MonsterRoom : DungeonRoom var selectedItem = database.PickItem() as Node3D; var duplicated = selectedItem.Duplicate((int)DuplicateFlags.UseInstantiation) as Node3D; - duplicated.GlobalPosition = new Vector3(spawnPoint.GlobalPosition.X, 0, spawnPoint.GlobalPosition.Z); + duplicated.Position = new Vector3(spawnPoint.Position.X, 0, spawnPoint.Position.Z); AddChild(duplicated); } }