Player now comes up from the bottom of the screen on a new game.

This commit is contained in:
Henry 2025-12-20 19:37:32 +00:00
parent dec3cbe595
commit 099440d27f
3 changed files with 20 additions and 13 deletions

View file

@ -46,8 +46,8 @@ func _on_player_died():
func new_game(): func new_game():
Global.score = 0 Global.score = 0
EventBus.initialize_shieldbar.emit() EventBus.initialize_shieldbar.emit()
$CanvasLayer/UI.update_score(Global.score)
$Player.start() $Player.start()
$CanvasLayer/UI.update_score(Global.score)
spawn_enemies() spawn_enemies()
playing = true playing = true

View file

@ -9,7 +9,7 @@ signal damage_taken
@export var cooldown: float = 0.25 @export var cooldown: float = 0.25
@export var bullet_scene : PackedScene @export var bullet_scene : PackedScene
@export var max_shield: int = 10 @export var max_shield: int = 10
var shield: int = max_shield: var shield: int = 0:
set = set_shield set = set_shield
var can_shoot = true var can_shoot = true
@ -22,16 +22,21 @@ var clamp_shield = clamp(shield, 0, max_shield)
@onready var ship = $Ship @onready var ship = $Ship
func _ready(): func _ready():
start() print(shield)
$Ship.hide()
# start()
func start(): func start():
print(shield)
set_process(true) set_process(true)
$Ship.show() $Ship.show()
position = Vector2(screensize.x / 2, screensize.y - 64) position = Vector2(screensize.x / 2, screensize.y + 32)
var tween = create_tween()
tween.tween_property($Ship, "position:y", 32 * -1, .25)
$GunCooldown.wait_time = cooldown $GunCooldown.wait_time = cooldown
var old_value = 0
set_shield(max_shield) set_shield(max_shield)
EventBus.shield_changed.emit(max_shield, old_value, shield) print(shield)
# EventBus.shield_changed.emit(max_shield, old_value, shield)
func _process(delta): func _process(delta):
var input = Input.get_vector("left", "right", "up", "down") var input = Input.get_vector("left", "right", "up", "down")
@ -56,10 +61,10 @@ func shoot():
$GunCooldown.start() $GunCooldown.start()
var b = bullet_scene.instantiate() var b = bullet_scene.instantiate()
get_tree().root.add_child(b) get_tree().root.add_child(b)
b.start(position + Vector2(0, -8)) b.start(position + $Ship.position + Vector2(0, -1))
var tween = create_tween().set_parallel(false) var tween = create_tween().set_parallel(false)
tween.tween_property($Ship, "position:y", 1, 0.1) tween.tween_property($Ship, "position:y", 1, 0.1).as_relative()
tween.tween_property($Ship, "position:y", 0, 0.05) tween.tween_property($Ship, "position:y", 0, 0.05).as_relative()
func set_shield(value: int): func set_shield(value: int):
var old_value = shield var old_value = shield

10
ui.gd
View file

@ -18,7 +18,8 @@ func _on_shield_changed(max_value: int, old_value: int, new_value: int) -> void:
shield_bar.max_value = max_value shield_bar.max_value = max_value
shield_bar.value = new_value shield_bar.value = new_value
var tween = create_tween() var tween = create_tween()
tween.tween_property(shield_bar, "value", new_value, 3).set_trans(Tween.TRANS_LINEAR) print_debug("Tweening shield bar")
tween.tween_property(shield_bar, "value", new_value, .25).set_trans(Tween.TRANS_LINEAR)
_on_fx_shield_ui() _on_fx_shield_ui()
@ -31,6 +32,7 @@ func _on_fx_shield_ui():
func _on_initialize_shieldbar(): func _on_initialize_shieldbar():
print("Shieldbar Initializing!") print("Shieldbar Initializing!")
# var tween = create_tween() var tween = create_tween()
# tween.tween_property(shield_bar, "value", 10, 3).set_trans(Tween.TRANS_LINEAR) tween.tween_property(shield_bar, "value", 100, .25).set_trans(Tween.TRANS_LINEAR)
# print("Tweens played!") print_debug("Tweens played!")
return