From b177e0aee32f3fe0d09bc0786f5887c91c1d11b4 Mon Sep 17 00:00:00 2001 From: siim Date: Wed, 26 Aug 2026 08:39:40 +0300 Subject: [PATCH] matadors dont come inside the player anymore with sword attack. also got rid of matador.gd dublicate.. that i made for testing animation --- Assets/matador.gd | 5 ----- Assets/matador.gd.uid | 1 - debug_params.gd | 2 +- matador.gd | 3 ++- 4 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 Assets/matador.gd delete mode 100644 Assets/matador.gd.uid diff --git a/Assets/matador.gd b/Assets/matador.gd deleted file mode 100644 index c4f22d6..0000000 --- a/Assets/matador.gd +++ /dev/null @@ -1,5 +0,0 @@ -extends Node3D - - -func _ready() -> void: - $AnimationPlayer.play("Taunt") diff --git a/Assets/matador.gd.uid b/Assets/matador.gd.uid deleted file mode 100644 index 0cb4e05..0000000 --- a/Assets/matador.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://bn3xwnlktwdlf diff --git a/debug_params.gd b/debug_params.gd index cde5afe..9b573e6 100644 --- a/debug_params.gd +++ b/debug_params.gd @@ -133,7 +133,7 @@ func _register_all() -> void: _reg_f("Matador", "mat_attack_range", 8.0, 2.0, 20.0) _reg_f("Matador", "mat_attack_speed", 7.5, 1.0, 12.0) _reg_f("Matador", "mat_attack_duration", 1.8, 0.5, 5.0, 0.1) - _reg_f("Matador", "mat_attack_min_dist", 3.2, 0.5, 6.0, 0.1) + _reg_f("Matador", "mat_attack_min_dist", 5, 0.5, 6.0, 0.1) # Forward drive during the opening of a melee swing — turns the stationary stab # into an estocada lunge so the blade covers ground toward the bull. _reg_f("Matador", "mat_lunge_speed", 13.0, 0.0, 20.0) diff --git a/matador.gd b/matador.gd index 06cd584..0aaec8e 100644 --- a/matador.gd +++ b/matador.gd @@ -61,6 +61,7 @@ var _blood_burst: CPUParticles3D = null @onready var _mesh: Node3D = $matador2 @onready var _hit_area: Area3D = $HitArea + const _ANIM_RUN: StringName = &"Run" const _ANIM_IDLE: StringName = &"Taunt" const _ANIM_ATTACK: StringName = &"Attack" @@ -551,7 +552,7 @@ func _tick_attack(delta: float) -> void: if _swing_timer > 0.0: _lunge_timer = maxf(0.0, _lunge_timer - delta) - if _lunge_timer > 0.0 and dist > 0.1: + if _lunge_timer > 0.0 and dist > DP.f("mat_attack_min_dist"): _accelerate(to_bull.normalized(), DP.f("mat_lunge_speed"), delta) else: _decelerate(22.0, delta)