henry/Shmup-01b
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tracking down the spawning of extra enemies; removed extraneous enemy

Browse source 
counting and queue_free of enemies.
This commit is contained in:
Henry 2025-12-24 15:59:15 +00:00
parent be3919acd7
commit 25a4897697
4 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
enemy.gd
View file

@ -8,8 +8,6 @@ var exploding = false
@onready var screensize = get_viewport_rect().size @onready var screensize = get_viewport_rect().size
func _ready() -> void:
EventBus.enemy_win.connect(_on_enemy_win)
func start(pos): func start(pos):
speed = 0 speed = 0
@ -24,8 +22,6 @@ func start(pos):
$ShootTimer.wait_time = randf_range(4, 20) $ShootTimer.wait_time = randf_range(4, 20)
$ShootTimer.start() $ShootTimer.start()
func _on_enemy_win() -> void:
print("Enemy win!")
func _on_timer_timeout() -> void: func _on_timer_timeout() -> void:
speed = randf_range(75, 100) speed = randf_range(75, 100)

1
event_bus.gd
View file

@ -5,7 +5,6 @@ extends Node
signal shield_changed(max_value: int, old_value: int, new_value: int) signal shield_changed(max_value: int, old_value: int, new_value: int)
signal player_died() signal player_died()
signal enemy_died(value: int) signal enemy_died(value: int)
signal enemy_win()
signal initialize_shieldbar() signal initialize_shieldbar()
signal start_game() signal start_game()

13
main.gd
View file

@ -17,7 +17,6 @@ func _ready():
func spawn_enemies(): func spawn_enemies():
get_tree().call_group("enemies", "queue_free")
for x in range(9): for x in range(9):
for y in range(3): for y in range(3):
var e = enemy.instantiate() var e = enemy.instantiate()
@ -39,7 +38,7 @@ func _on_enemy_died(value: int):
func _on_player_died(): func _on_player_died():
# get_tree().call_group("enemies", "queue_free") # get_tree().call_group("enemies", "queue_free")
EventBus.enemy_win.emit() enemy_win()
# $Player.set_process(false) # $Player.set_process(false)
# get_tree().call_group("enemies", "set_process", false) # get_tree().call_group("enemies", "set_process", false)
instance.queue_free() instance.queue_free()
@ -51,16 +50,18 @@ func _on_player_died():
func new_game(): func new_game():
# Ensure enemies are cleared. # Ensure enemies are cleared.
enemy_count = 0
get_tree().call_group("enemies", "queue_free") get_tree().call_group("enemies", "queue_free")
get_tree().call_group("enemy_bullets", "queue_free") get_tree().call_group("enemy_bullets", "queue_free")
print("Number of enemies at new_game: ",enemy_count) # print("Number of enemies at new_game: ",enemy_count)
await get_tree().process_frame
# Reset score. # Reset score.
Global.score = 0 Global.score = 0
$CanvasLayer/UI.update_score(Global.score) $CanvasLayer/UI.update_score(Global.score)
# instantiate the Player # instantiate the Player
# await get_tree().create_timer(1).timeout
instance = player.instantiate() instance = player.instantiate()
add_child(instance) add_child(instance)
$Player.start() $Player.start()
@ -69,6 +70,7 @@ func new_game():
EventBus.initialize_shieldbar.emit() EventBus.initialize_shieldbar.emit()
# Tell the enemies to spawn! # Tell the enemies to spawn!
#await get_tree().create_timer(.5).timeout
spawn_enemies() spawn_enemies()
# Tell the game we're playing. # Tell the game we're playing.
@ -93,3 +95,6 @@ func win_game():
await get_tree().create_timer(2).timeout await get_tree().create_timer(2).timeout
game_over.hide() game_over.hide()
start_button.show() start_button.show()
func enemy_win() -> void:
print("Enemy win!")

9
player.gd
View file

@ -30,15 +30,17 @@ func start():
print(shield) print(shield)
shader_active = false shader_active = false
$Ship.frame = 1 $Ship.frame = 1
$Ship/Boosters.hide()
$Ship.show() $Ship.show()
position = Vector2(screensize.x / 2, screensize.y) position = Vector2(screensize.x / 2, screensize.y)
var tween = create_tween() var tween = create_tween()
tween.tween_property(self, "position:y", 32 * -1, .25).as_relative() tween.tween_property(self, "position:y", 48 * -1, .75).as_relative()
$GunCooldown.wait_time = cooldown $GunCooldown.wait_time = cooldown
set_shield(max_shield) set_shield(max_shield)
print(shield) print(shield)
await get_tree().create_timer(2).timeout await get_tree().create_timer(2).timeout
set_process(true) set_process(true)
$Ship/Boosters.show()
can_shoot = true can_shoot = true
# EventBus.shield_changed.emit(max_shield, old_value, shield) # EventBus.shield_changed.emit(max_shield, old_value, shield)
@ -77,13 +79,14 @@ func set_shield(value: int):
print("Shield set to:", shield) print("Shield set to:", shield)
if shield <= 0: if shield <= 0:
print("Shader deactivated!") print("Shader deactivated!")
EventBus.player_died.emit()
set_process(false) set_process(false)
$Ship.hide() $Ship.hide()
shader_active = false
$Explosion.show() $Explosion.show()
$Explosion/AnimationPlayer.play("explosion-one-shot") $Explosion/AnimationPlayer.play("explosion-one-shot")
await $Explosion/AnimationPlayer.animation_finished await $Explosion/AnimationPlayer.animation_finished
shader_active = false EventBus.player_died.emit()
func _on_gun_cooldown_timeout() -> void: func _on_gun_cooldown_timeout() -> void:
can_shoot = true can_shoot = true