From 6cfcb640c9116577eadefdf48b59fd02caa57098 Mon Sep 17 00:00:00 2001 From: SondreElg Date: Sun, 5 Oct 2025 00:12:40 +0200 Subject: [PATCH] unify ammo system --- growth/CardInjects/cursor_gun_card_inject.gd | 7 +++---- growth/CardInjects/firewall_card_inject.gd | 3 +++ growth/CardInjects/rocket_launcher_card_inject.gd | 3 +++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/growth/CardInjects/cursor_gun_card_inject.gd b/growth/CardInjects/cursor_gun_card_inject.gd index fc99a0a..8740885 100644 --- a/growth/CardInjects/cursor_gun_card_inject.gd +++ b/growth/CardInjects/cursor_gun_card_inject.gd @@ -1,8 +1,8 @@ extends Node @export var CursorBullet: PackedScene -@export var max_ammo = 10 -var ammo = 10 +@export var max_ammo = 30 +var ammo = max_ammo func activate(world, activator): var target: Vector2 = activator.get_target_pos() @@ -13,13 +13,12 @@ func activate(world, activator): if activator.get_collision_layer_bit(1): # player object bullet.set_collision_layer_bit(1, false) bullet.set_collision_layer_bit(2, true) + ammo -= 1 elif activator.get_collision_layer_bit(2): # enemy object bullet.set_collision_layer_bit(1, true) bullet.set_collision_layer_bit(2, false) else: assert(false, "who are you, activator?") - ammo -= 1 - # TODO: handle ammo for player and virus func discard(world, activator): pass diff --git a/growth/CardInjects/firewall_card_inject.gd b/growth/CardInjects/firewall_card_inject.gd index f0a869b..9a6a42d 100644 --- a/growth/CardInjects/firewall_card_inject.gd +++ b/growth/CardInjects/firewall_card_inject.gd @@ -3,6 +3,8 @@ extends Node @export var FireWall: PackedScene @export var max_range = 10 @export var min_range = 5 +@export var max_ammo = 5 +var ammo = max_ammo func activate(world, activator): var firewall = FireWall.instantiate() @@ -13,6 +15,7 @@ func activate(world, activator): if activator.get_collision_layer_bit(1): # player object firewall.set_collision_layer_bit(1, false) firewall.set_collision_layer_bit(2, true) + ammo -= 1 elif activator.get_collision_layer_bit(2): # enemy object firewall.set_collision_layer_bit(1, true) firewall.set_collision_layer_bit(2, false) diff --git a/growth/CardInjects/rocket_launcher_card_inject.gd b/growth/CardInjects/rocket_launcher_card_inject.gd index 7705afd..d00b166 100644 --- a/growth/CardInjects/rocket_launcher_card_inject.gd +++ b/growth/CardInjects/rocket_launcher_card_inject.gd @@ -1,6 +1,8 @@ extends Node @export var RocketProjectile: PackedScene +@export var max_ammo = 3 +var ammo = max_ammo func activate(world, activator): var rocket = RocketProjectile.instantiate() @@ -10,6 +12,7 @@ func activate(world, activator): if activator.get_collision_layer_bit(1): # player object rocket.set_collision_layer_bit(1, false) rocket.set_collision_layer_bit(2, true) + ammo -= 1 elif activator.get_collision_layer_bit(2): # enemy object rocket.set_collision_layer_bit(1, true) rocket.set_collision_layer_bit(2, false)