From 39794265b361c2f259a58d677f9e2e10b64d00af Mon Sep 17 00:00:00 2001 From: bd Date: Sun, 25 May 2025 15:17:58 -0400 Subject: Add more chaos to warlock bolts, fix crash with oob upgrades --- scripts/warlock.gd | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'scripts/warlock.gd') diff --git a/scripts/warlock.gd b/scripts/warlock.gd index 80d6e58..e19b394 100644 --- a/scripts/warlock.gd +++ b/scripts/warlock.gd @@ -10,11 +10,17 @@ func _ready(): func _on_fire_timer_timeout(): select_target() if (target != null): - var tmp_projectile = projectile.instantiate() - tmp_projectile.target = target - tmp_projectile.speed = tower_data["projectile_speed"] - tmp_projectile.projectile_damage = tower_data["damage"] - get_node("ProjectileContainer").call_deferred("add_child", tmp_projectile) - tmp_projectile.global_position = $Aim.global_position + var bolt = _get_projectile() + bolt.target = target + get_node("ProjectileContainer").call_deferred("add_child", bolt) + bolt.global_position = $Aim.global_position else: $FireTimer.stop() + +func _get_projectile() -> CharacterBody2D: + var bolt = projectile.instantiate() + bolt.speed = tower_data["projectile_speed"] + bolt.projectile_damage = tower_data["damage"] + bolt.chaos_factor = tower_data["chaos_factor"] + bolt.max_lifetime = tower_data["max_projectile_lifetime"] + return bolt -- cgit v1.2.3