From 7582b91926274195c107114c17323863d8b4cb2f Mon Sep 17 00:00:00 2001 From: SondreElg Date: Sun, 5 Oct 2025 15:11:19 +0200 Subject: [PATCH 1/3] dasher --- growth/CardInjects/Katana/katana_card_inject.gd | 5 ++++- growth/CardInjects/Mine/mine_card_inject.gd | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/growth/CardInjects/Katana/katana_card_inject.gd b/growth/CardInjects/Katana/katana_card_inject.gd index c035221..7b8a613 100644 --- a/growth/CardInjects/Katana/katana_card_inject.gd +++ b/growth/CardInjects/Katana/katana_card_inject.gd @@ -51,8 +51,11 @@ func _activate(_world, activator, position): assert(false, "who are you, activator?") # world.add_child(katana) -func discard(world, activator, do_ability): + +func discard(_world, activator, do_ability): ammo = max_ammo + if do_ability: + activator.dash(_activate); func get_ammo(): return ammo diff --git a/growth/CardInjects/Mine/mine_card_inject.gd b/growth/CardInjects/Mine/mine_card_inject.gd index 11d6ec6..966edfa 100644 --- a/growth/CardInjects/Mine/mine_card_inject.gd +++ b/growth/CardInjects/Mine/mine_card_inject.gd @@ -47,8 +47,10 @@ func _activate(world, activator, position): assert(false, "who are you, activator?") world.add_child(mine) -func discard(world, activator, do_ability): +func discard(_world, activator, do_ability): ammo = max_ammo + if do_ability: + activator.dash(_activate); func get_ammo(): return ammo From 0b0a5963e4f6db71098a840379f3ce90e31a1c96 Mon Sep 17 00:00:00 2001 From: SondreElg Date: Sun, 5 Oct 2025 15:12:07 +0200 Subject: [PATCH 2/3] a --- growth/CardInjects/Mine/mine_card_inject.gd | 2 +- growth/player.gd | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/growth/CardInjects/Mine/mine_card_inject.gd b/growth/CardInjects/Mine/mine_card_inject.gd index 966edfa..87cc85e 100644 --- a/growth/CardInjects/Mine/mine_card_inject.gd +++ b/growth/CardInjects/Mine/mine_card_inject.gd @@ -50,7 +50,7 @@ func _activate(world, activator, position): func discard(_world, activator, do_ability): ammo = max_ammo if do_ability: - activator.dash(_activate); + activator.dash(null); func get_ammo(): return ammo diff --git a/growth/player.gd b/growth/player.gd index aea1279..b9f1f50 100644 --- a/growth/player.gd +++ b/growth/player.gd @@ -71,7 +71,8 @@ func charge(): func dash(on_end: Callable): dash_cooldown_timer.start(dash_cooldown); var target_dir = position.direction_to(target) - dash_cooldown_timer.timeout.connect(func(): on_end.call(null, self, target_dir), CONNECT_ONE_SHOT); + if (on_end): + dash_cooldown_timer.timeout.connect(func(): on_end.call(null, self, target_dir), CONNECT_ONE_SHOT); velocity = move_direction * speed * 5; func _ready(): From 8eaec9c4f3f843af89019fbedb522ebc1fee5de0 Mon Sep 17 00:00:00 2001 From: SondreElg Date: Sun, 5 Oct 2025 15:12:38 +0200 Subject: [PATCH 3/3] a --- growth/player.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/growth/player.gd b/growth/player.gd index b9f1f50..dca7daf 100644 --- a/growth/player.gd +++ b/growth/player.gd @@ -68,7 +68,7 @@ func charge(): # Gradual charge dropoff charge_level = max(charge_level - charge_rate * 2, 0); -func dash(on_end: Callable): +func dash(on_end): dash_cooldown_timer.start(dash_cooldown); var target_dir = position.direction_to(target) if (on_end):