matadors dont come inside the player anymore with sword attack. also got rid of matador.gd dublicate.. that i made for testing animation
This commit is contained in:
@@ -1,5 +0,0 @@
|
|||||||
extends Node3D
|
|
||||||
|
|
||||||
|
|
||||||
func _ready() -> void:
|
|
||||||
$AnimationPlayer.play("Taunt")
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
uid://bn3xwnlktwdlf
|
|
||||||
+1
-1
@@ -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_range", 8.0, 2.0, 20.0)
|
||||||
_reg_f("Matador", "mat_attack_speed", 7.5, 1.0, 12.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_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
|
# 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.
|
# into an estocada lunge so the blade covers ground toward the bull.
|
||||||
_reg_f("Matador", "mat_lunge_speed", 13.0, 0.0, 20.0)
|
_reg_f("Matador", "mat_lunge_speed", 13.0, 0.0, 20.0)
|
||||||
|
|||||||
+2
-1
@@ -61,6 +61,7 @@ var _blood_burst: CPUParticles3D = null
|
|||||||
@onready var _mesh: Node3D = $matador2
|
@onready var _mesh: Node3D = $matador2
|
||||||
@onready var _hit_area: Area3D = $HitArea
|
@onready var _hit_area: Area3D = $HitArea
|
||||||
|
|
||||||
|
|
||||||
const _ANIM_RUN: StringName = &"Run"
|
const _ANIM_RUN: StringName = &"Run"
|
||||||
const _ANIM_IDLE: StringName = &"Taunt"
|
const _ANIM_IDLE: StringName = &"Taunt"
|
||||||
const _ANIM_ATTACK: StringName = &"Attack"
|
const _ANIM_ATTACK: StringName = &"Attack"
|
||||||
@@ -551,7 +552,7 @@ func _tick_attack(delta: float) -> void:
|
|||||||
|
|
||||||
if _swing_timer > 0.0:
|
if _swing_timer > 0.0:
|
||||||
_lunge_timer = maxf(0.0, _lunge_timer - delta)
|
_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)
|
_accelerate(to_bull.normalized(), DP.f("mat_lunge_speed"), delta)
|
||||||
else:
|
else:
|
||||||
_decelerate(22.0, delta)
|
_decelerate(22.0, delta)
|
||||||
|
|||||||
Reference in New Issue
Block a user