player/player.gd

@@ -10,14 +10,11 @@ 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
-
-# Player UI
-
 func resize_ui():
 	var hud_h = 200
 	var size = get_viewport().get_visible_rect().size
@@ -34,7 +31,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):
@@ -42,21 +39,6 @@ func message(string):
 	$Message.visible = true
 	$Message/VanishTimer.start()
 
-# State functions
-
-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
@@ -73,7 +55,7 @@ func die():
 func respawn():
 	position = Vector3(spawn)
 	$CameraGimbal.reset()
-	_health = 100
+	health = 100
 	visible = true
 	suspended = false
 
@@ -147,7 +129,7 @@ func equip(gear: Gear):
 	message("Backpack full")
 	return false
 
-# Player mechanics
+# Player movement and engine callbacks
 
 func move_player(x, z):
 	var camera_basis = $CameraGimbal.get_global_transform().basis
@@ -168,7 +150,19 @@ func move_player(x, z):
 	if x != 0:
 		direction += camera_basis.x * x
 
-func do_backpack_keys():
+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
 	if Input.is_action_just_pressed("backpack_1"):
 		use_backpack_slot("1")
 	if Input.is_action_just_pressed("backpack_2"):
@@ -176,7 +170,7 @@ func do_backpack_keys():
 	if Input.is_action_just_pressed("backpack_3"):
 		use_backpack_slot("3")
 
-func do_movement(delta):
+	# Movement keys
 	var mx = 0
 	var mz = 0
 
@@ -204,7 +198,7 @@ func do_movement(delta):
 
 	move_and_slide()
 
-func do_gears():
+	# Gear uses
 	var gear = $Pivot/Container/Gear
 	assert(gear is Gear)
 	if gear.continuous():
@@ -214,27 +208,6 @@ func do_gears():
 		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():

world/killbrick.gd

@@ -2,4 +2,4 @@ extends Area3D
 
 func _on_body_entered(body: Node3D):
 	if body is Player:
-		body.die()
+		body.health = 0