From 7e1847942bbe00cdf6ad01b96f742db699f14fcb Mon Sep 17 00:00:00 2001
From: Jeremy Baxter <jeremy@baxters.nz>
Date: Thu, 22 Jan 2026 21:11:05 +1300
Subject: [PATCH 1/2] player: add health callbacks

Allows us to update the HUD on health change
---
 player/player.gd   | 22 ++++++++++++++++++----
 world/killbrick.gd |  2 +-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/player/player.gd b/player/player.gd
index 02bba3c..b91bccc 100644
--- a/player/player.gd
+++ b/player/player.gd
@@ -10,11 +10,12 @@ const gear_slots = ["1", "2", "3"]
 
 var starting_gear = preload("res://gears/ball.tscn")
 
-var health = 100
 var suspended = false
 var direction = Vector3.ZERO
 var target_velocity = Vector3.ZERO
 
+var _health = 100
+
 func resize_ui():
 	var hud_h = 200
 	var size = get_viewport().get_visible_rect().size
@@ -31,7 +32,7 @@ func make_hud():
 			continue
 		text += "%s (%s)\n" % [node.gear_name(), node.name]
 	text += "Holding " + $Pivot/Container/Gear.gear_name() + "\n"
-	text += str(health) + " hp"
+	text += str(health()) + " hp"
 	$HUD.text = text
 
 func message(string):
@@ -39,6 +40,19 @@ func message(string):
 	$Message.visible = true
 	$Message/VanishTimer.start()
 
+func harm(hp):
+	assert(hp >= 0)
+	_health -= hp
+	make_hud()
+
+func heal(hp):
+	assert(hp >= 0)
+	_health += hp
+	make_hud()
+
+func health():
+	return _health
+
 func die():
 	suspended = true
 	visible = false
@@ -55,7 +69,7 @@ func die():
 func respawn():
 	position = Vector3(spawn)
 	$CameraGimbal.reset()
-	health = 100
+	_health = 100
 	visible = true
 	suspended = false
 
@@ -159,7 +173,7 @@ func _physics_process(delta):
 	if suspended:
 		return
 
-	if health < 1 or position.y <= -1000:
+	if health() < 1 or position.y <= -1000:
 		die()
 
 	# UI and backpack keys
diff --git a/world/killbrick.gd b/world/killbrick.gd
index c587fe8..45f437b 100644
--- a/world/killbrick.gd
+++ b/world/killbrick.gd
@@ -2,4 +2,4 @@ extends Area3D
 
 func _on_body_entered(body: Node3D):
 	if body is Player:
-		body.health = 0
+		body.die()

From 27613b766f18c876e14105c8847e7ef38eb48297 Mon Sep 17 00:00:00 2001
From: Jeremy Baxter <jeremy@baxters.nz>
Date: Thu, 22 Jan 2026 21:17:47 +1300
Subject: [PATCH 2/2] player: organise code

---
 player/player.gd | 45 +++++++++++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/player/player.gd b/player/player.gd
index b91bccc..48f08e0 100644
--- a/player/player.gd
+++ b/player/player.gd
@@ -16,6 +16,8 @@ var target_velocity = Vector3.ZERO
 
 var _health = 100
 
+# Player UI
+
 func resize_ui():
 	var hud_h = 200
 	var size = get_viewport().get_visible_rect().size
@@ -40,6 +42,8 @@ func message(string):
 	$Message.visible = true
 	$Message/VanishTimer.start()
 
+# State functions
+
 func harm(hp):
 	assert(hp >= 0)
 	_health -= hp
@@ -143,7 +147,7 @@ func equip(gear: Gear):
 	message("Backpack full")
 	return false
 
-# Player movement and engine callbacks
+# Player mechanics
 
 func move_player(x, z):
 	var camera_basis = $CameraGimbal.get_global_transform().basis
@@ -164,19 +168,7 @@ func move_player(x, z):
 	if x != 0:
 		direction += camera_basis.x * x
 
-func _ready():
-	get_viewport().size_changed.connect(resize_ui)
-	resize_ui()
-	respawn()
-
-func _physics_process(delta):
-	if suspended:
-		return
-
-	if health() < 1 or position.y <= -1000:
-		die()
-
-	# UI and backpack keys
+func do_backpack_keys():
 	if Input.is_action_just_pressed("backpack_1"):
 		use_backpack_slot("1")
 	if Input.is_action_just_pressed("backpack_2"):
@@ -184,7 +176,7 @@ func _physics_process(delta):
 	if Input.is_action_just_pressed("backpack_3"):
 		use_backpack_slot("3")
 
-	# Movement keys
+func do_movement(delta):
 	var mx = 0
 	var mz = 0
 
@@ -212,7 +204,7 @@ func _physics_process(delta):
 
 	move_and_slide()
 
-	# Gear uses
+func do_gears():
 	var gear = $Pivot/Container/Gear
 	assert(gear is Gear)
 	if gear.continuous():
@@ -222,6 +214,27 @@ func _physics_process(delta):
 		if Input.is_action_just_pressed("gear_use"):
 			gear.use(self)
 
+# Engine callbacks
+
+func _ready():
+	get_viewport().size_changed.connect(resize_ui)
+	resize_ui()
+	respawn()
+
+func _physics_process(delta):
+	if health() < 1 or position.y <= -1000:
+		die()
+
+	if suspended:
+		return
+
+	# Backpack keys
+	do_backpack_keys()
+	# Movement
+	do_movement(delta)
+	# Use gears
+	do_gears()
+
 # Signals
 
 func _on_vanish_timer_timeout():