add hit and merge vfx
This commit is contained in:
@@ -141,6 +141,7 @@ func _chase(delta: float) -> void:
|
||||
contact_timer = CONTACT_CD
|
||||
if target.has_method("take_damage"):
|
||||
target.take_damage(damage_to_player)
|
||||
FX.hit_spark(target.global_position + Vector3(0, 0.5, 0), get_parent(), Color(0.95, 0.18, 0.08))
|
||||
if randf() < 0.3:
|
||||
var knock_dir := diff.normalized() if dist > 0.01 else -global_transform.basis.z
|
||||
knock_dir.y = 0.0
|
||||
@@ -196,6 +197,7 @@ func _try_enemy_kick() -> void:
|
||||
nearest_kickable = k
|
||||
if nearest_kickable != null:
|
||||
nearest_kickable.call("receive_kick", kick_dir, 35.0 + kick_tier * 8.0)
|
||||
FX.hit_spark(nearest_kickable.global_position + Vector3(0, 0.4, 0), get_parent(), Color(1.0, 0.72, 0.1))
|
||||
kickable_kick_timer = KICKABLE_KICK_COOLDOWN
|
||||
return
|
||||
|
||||
@@ -225,6 +227,7 @@ func _try_enemy_kick() -> void:
|
||||
var player_toughness: int = target.get("toughness_tier") if target.get("toughness_tier") != null else 0
|
||||
if player_toughness < kick_tier:
|
||||
target.call("receive_kick", kick_dir, 12.0 + kick_tier * 10.0)
|
||||
FX.hit_spark(target.global_position + Vector3(0, 0.5, 0), get_parent(), Color(0.95, 0.18, 0.08))
|
||||
enemy_kick_timer = ENEMY_KICK_COOLDOWN
|
||||
|
||||
func _fly(delta: float) -> void:
|
||||
@@ -328,9 +331,11 @@ func _on_merge_complete() -> void:
|
||||
var merge_type := _next_enemy_type(enemy_type)
|
||||
var new_level: int = enemy_level + 1
|
||||
var new_wave: int = wave_num
|
||||
var par := get_parent()
|
||||
if is_instance_valid(merge_partner):
|
||||
merge_pos = (global_position + merge_partner.global_position) / 2.0
|
||||
merge_partner.queue_free()
|
||||
FX.merge_smoke(merge_pos + Vector3(0, 0.3, 0), par)
|
||||
queue_free()
|
||||
emit_signal("merged", true)
|
||||
var tree := get_tree()
|
||||
|
||||
Reference in New Issue
Block a user