From 099440d27fecc57c335e0b02ef2d4bdd0262accb Mon Sep 17 00:00:00 2001
From: Henry <hfabulous@gmail.com>
Date: Sat, 20 Dec 2025 19:37:32 +0000
Subject: [PATCH] Player now comes up from the bottom of the screen on a new
 game.

---
 main.gd   |  2 +-
 player.gd | 21 +++++++++++++--------
 ui.gd     | 10 ++++++----
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/main.gd b/main.gd
index 301ffc1..d24ef2c 100644
--- a/main.gd
+++ b/main.gd
@@ -46,8 +46,8 @@ func _on_player_died():
 func new_game():
     Global.score = 0
     EventBus.initialize_shieldbar.emit()
-    $CanvasLayer/UI.update_score(Global.score)
     $Player.start()
+    $CanvasLayer/UI.update_score(Global.score)
     spawn_enemies()
     playing = true
 
diff --git a/player.gd b/player.gd
index bea960e..20da701 100644
--- a/player.gd
+++ b/player.gd
@@ -9,7 +9,7 @@ signal damage_taken
 @export var cooldown: float = 0.25
 @export var bullet_scene : PackedScene
 @export var max_shield: int = 10
-var shield: int = max_shield:
+var shield: int = 0:
     set = set_shield
 
 var can_shoot = true
@@ -22,16 +22,21 @@ var clamp_shield = clamp(shield, 0, max_shield)
 @onready var ship = $Ship
 
 func _ready():
-    start()
+    print(shield)
+    $Ship.hide()
+    # start()
 
 func start():
+    print(shield)
     set_process(true)
     $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
-    var old_value = 0
     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):
     var input = Input.get_vector("left", "right", "up", "down")
@@ -56,10 +61,10 @@ func shoot():
     $GunCooldown.start()
     var b = bullet_scene.instantiate()
     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)
-    tween.tween_property($Ship, "position:y", 1, 0.1)
-    tween.tween_property($Ship, "position:y", 0, 0.05)
+    tween.tween_property($Ship, "position:y", 1, 0.1).as_relative()
+    tween.tween_property($Ship, "position:y", 0, 0.05).as_relative()
 
 func set_shield(value: int):
     var old_value = shield
diff --git a/ui.gd b/ui.gd
index 9cc4abe..0f935d4 100644
--- a/ui.gd
+++ b/ui.gd
@@ -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.value = new_value
     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()
 
 
@@ -31,6 +32,7 @@ func _on_fx_shield_ui():
 
 func _on_initialize_shieldbar():
     print("Shieldbar Initializing!")
-    # var tween = create_tween()
-    # tween.tween_property(shield_bar, "value", 10, 3).set_trans(Tween.TRANS_LINEAR)
-    # print("Tweens played!")
+    var tween = create_tween()
+    tween.tween_property(shield_bar, "value", 100, .25).set_trans(Tween.TRANS_LINEAR)
+    print_debug("Tweens played!")
+    return