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..87cc85e 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(null); func get_ammo(): return ammo diff --git a/growth/player.gd b/growth/player.gd index aea1279..dca7daf 100644 --- a/growth/player.gd +++ b/growth/player.gd @@ -68,10 +68,11 @@ 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) - 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():