henry/the-third-place
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed Player from the Main scene in favor of instantiatiating Player

Browse source 
during the start of a new game.
This commit is contained in:
Henry 2025-12-23 16:27:48 +00:00
parent a20e496c2e
commit a007b08b83
3 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
main.gd
View file

@ -1,6 +1,8 @@
extends Node2D extends Node2D
var enemy = preload("res://enemy.tscn") var enemy = preload("res://enemy.tscn")
var player = preload("res://player.tscn")
var instance = null
var playing = false var playing = false
var enemy_count: int = 0 var enemy_count: int = 0
@ -14,8 +16,6 @@ func _ready():
EventBus.enemy_died.connect(_on_enemy_died) EventBus.enemy_died.connect(_on_enemy_died)
# spawn_enemies()
func spawn_enemies(): func spawn_enemies():
for x in range(9): for x in range(9):
@ -41,7 +41,7 @@ func _on_player_died():
# get_tree().call_group("enemies", "queue_free") # get_tree().call_group("enemies", "queue_free")
EventBus.enemy_win.emit() EventBus.enemy_win.emit()
# $Player.set_process(false) # $Player.set_process(false)
# $Player.monitoring = false instance.queue_free()
game_over.show() game_over.show()
await get_tree().create_timer(2).timeout await get_tree().create_timer(2).timeout
game_over.hide() game_over.hide()
@ -50,8 +50,11 @@ func _on_player_died():
func new_game(): func new_game():
get_tree().call_group("enemies", "queue_free") get_tree().call_group("enemies", "queue_free")
# get_node("player").start()
Global.score = 0 Global.score = 0
# EventBus.initialize_shieldbar.emit() instance = player.instantiate()
add_child(instance)
$Player.shader_active = false
$Player.start() $Player.start()
$CanvasLayer/UI.update_score(Global.score) $CanvasLayer/UI.update_score(Global.score)
spawn_enemies() spawn_enemies()

6
main.tscn
View file

@ -1,8 +1,7 @@
[gd_scene load_steps=11 format=3 uid="uid://cc2dnhuv4qx7m"] [gd_scene load_steps=10 format=3 uid="uid://cc2dnhuv4qx7m"]
[ext_resource type="Script" uid="uid://c51huloycn5as" path="res://main.gd" id="1_h2yge"] [ext_resource type="Script" uid="uid://c51huloycn5as" path="res://main.gd" id="1_h2yge"]
[ext_resource type="Texture2D" uid="uid://jj8b7vqj3ihx" path="res://Mini Pixel Pack 3/Space_BG (2 frames) (64 x 64).png" id="1_ig7tw"] [ext_resource type="Texture2D" uid="uid://jj8b7vqj3ihx" path="res://Mini Pixel Pack 3/Space_BG (2 frames) (64 x 64).png" id="1_ig7tw"]
[ext_resource type="PackedScene" uid="uid://pyuorpwb7lpe" path="res://player.tscn" id="2_0xm2m"]
[ext_resource type="PackedScene" uid="uid://s6wf3egdqtmh" path="res://ui.tscn" id="4_1bvp3"] [ext_resource type="PackedScene" uid="uid://s6wf3egdqtmh" path="res://ui.tscn" id="4_1bvp3"]
[ext_resource type="Texture2D" uid="uid://bonoqs5pisflo" path="res://Mini Pixel Pack 3/UI objects/START (48 x 8).png" id="5_lquwl"] [ext_resource type="Texture2D" uid="uid://bonoqs5pisflo" path="res://Mini Pixel Pack 3/UI objects/START (48 x 8).png" id="5_lquwl"]
[ext_resource type="Texture2D" uid="uid://bubqwoum50gf8" path="res://Mini Pixel Pack 3/UI objects/GAME_OVER (72 x 8).png" id="6_7mycd"] [ext_resource type="Texture2D" uid="uid://bubqwoum50gf8" path="res://Mini Pixel Pack 3/UI objects/GAME_OVER (72 x 8).png" id="6_7mycd"]
@ -59,9 +58,6 @@ centered = false
region_enabled = true region_enabled = true
region_rect = Rect2(0, 0, 240, 320) region_rect = Rect2(0, 0, 240, 320)
[node name="Player" parent="." groups=["ship"] instance=ExtResource("2_0xm2m")]
position = Vector2(123, 254)
[node name="AnimationPlayer" type="AnimationPlayer" parent="."] [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = { libraries = {
&"": SubResource("AnimationLibrary_lquwl") &"": SubResource("AnimationLibrary_lquwl")

2
player.gd
View file

@ -101,8 +101,8 @@ func _on_damage_taken() -> void:
shader_active = true shader_active = true
$Ship.material.set_shader_parameter("toggle", 1.0) $Ship.material.set_shader_parameter("toggle", 1.0)
await get_tree().create_timer(1).timeout await get_tree().create_timer(1).timeout
shader_active = false
$Ship.material.set_shader_parameter("toggle", 0.0) $Ship.material.set_shader_parameter("toggle", 0.0)
shader_active = false
func _on_game_over() -> void: func _on_game_over() -> void:
print("Game over!") print("Game over!")