From 73afb696a2de85720b4a973952e9159ca61c750b Mon Sep 17 00:00:00 2001
From: Rob Kelly <contact@robkel.ly>
Date: Fri, 4 Jul 2025 15:20:26 -0600
Subject: [PATCH] Tools are deactivated and tool HUD hidden when holding object

---
 src/player/hold_component.gd |  7 +++++--
 src/player/player.gd         | 20 +++++++++++---------
 src/player/tool_mount.gd     | 18 +++++++++++++++++-
 src/ui/hud/hold_hud.gd       |  9 +++++++++
 src/ui/hud/player_hud.tscn   |  8 ++++----
 vault/TODO.md                |  4 ++--
 6 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/src/player/hold_component.gd b/src/player/hold_component.gd
index eff8a96..5ddc457 100644
--- a/src/player/hold_component.gd
+++ b/src/player/hold_component.gd
@@ -1,6 +1,9 @@
 class_name HoldComponent extends Node3D
 ## Component for managing physics object holding
 
+signal held
+signal dropped
+
 ## Held object position lerp acceleration.
 @export var hold_accel := 20.0
 
@@ -43,7 +46,7 @@ func attach(prop: RigidBody3D, hold_distance: float) -> void:
 	_original_collision_mask = prop.collision_mask
 	prop.collision_mask = hold_collision_physics
 
-	Player.instance.hud.hold_hud.prop_held()
+	held.emit()
 
 
 func drop() -> void:
@@ -52,7 +55,7 @@ func drop() -> void:
 	_held_object.collision_mask = _original_collision_mask
 	_held_object = null
 
-	Player.instance.hud.hold_hud.reset()
+	dropped.emit()
 
 
 func holding_object() -> bool:
diff --git a/src/player/player.gd b/src/player/player.gd
index d9c34bb..b44b35e 100644
--- a/src/player/player.gd
+++ b/src/player/player.gd
@@ -204,16 +204,18 @@ func _physics_process(delta: float) -> void:
 		elif Input.is_action_just_pressed("select_stickers"):
 			tool_mount.set_active(sticker_pack)
 
-		# Tool use
-		if Input.is_action_pressed("fire"):
-			get_tool().fire()
-			firing = true
-		else:
-			get_tool().idle()
-			firing = false
+		var tool := get_tool()
+		firing = false
+		if tool:
+			# Tool use
+			if Input.is_action_pressed("fire"):
+				tool.fire()
+				firing = true
+			else:
+				tool.idle()
 
-		if Input.is_action_just_pressed("switch_mode"):
-			get_tool().switch_mode()
+			if Input.is_action_just_pressed("switch_mode"):
+				tool.switch_mode()
 
 		# Two sneaking modes -- hold and toggle
 		if Game.settings.hold_to_sneak:
diff --git a/src/player/tool_mount.gd b/src/player/tool_mount.gd
index 06c74f0..b37bee8 100644
--- a/src/player/tool_mount.gd
+++ b/src/player/tool_mount.gd
@@ -8,11 +8,27 @@ var _active: Tool
 
 func _ready() -> void:
 	set_active(initial_tool)
+	_deferred_init.call_deferred()
+
+
+func _deferred_init() -> void:
+	Player.instance.hold_component.dropped.connect(show_tool)
+	Player.instance.hold_component.held.connect(hide_tool)
+
+
+func hide_tool() -> void:
+	# TODO maybe animate?
+	visible = false
+
+
+func show_tool() -> void:
+	# TODO maybe animate?
+	visible = true
 
 
 ## Returns the currently-active tool.
 func get_active() -> Tool:
-	return _active
+	return _active if visible else null
 
 
 ## Sets the given tool as active.
diff --git a/src/ui/hud/hold_hud.gd b/src/ui/hud/hold_hud.gd
index 74530fa..09a35f3 100644
--- a/src/ui/hud/hold_hud.gd
+++ b/src/ui/hud/hold_hud.gd
@@ -13,6 +13,15 @@ var _selected_this_frame := false
 @onready var closed_hand: Label = %ClosedHand
 
 
+func _ready() -> void:
+	_deferred_init.call_deferred()
+
+
+func _deferred_init() -> void:
+	Player.instance.hold_component.dropped.connect(reset)
+	Player.instance.hold_component.held.connect(prop_held)
+
+
 func prop_selected() -> void:
 	state = State.SELECTED
 	open_hand.visible = true
diff --git a/src/ui/hud/player_hud.tscn b/src/ui/hud/player_hud.tscn
index 68883c7..0c3b16a 100644
--- a/src/ui/hud/player_hud.tscn
+++ b/src/ui/hud/player_hud.tscn
@@ -427,10 +427,10 @@ anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
-offset_left = -23.5555
-offset_top = -20.5418
-offset_right = -23.5555
-offset_bottom = -20.5418
+offset_left = -19.5065
+offset_top = -22.2032
+offset_right = -19.5065
+offset_bottom = -22.2032
 grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("4_ud8na")
diff --git a/vault/TODO.md b/vault/TODO.md
index 6d84e90..1c10117 100644
--- a/vault/TODO.md
+++ b/vault/TODO.md
@@ -167,8 +167,8 @@
 			- [ ] wraparound desk
 - [ ] etc
 	- [ ] Make sofa cushions separate physics objects
-	- [ ] Object hold UX
+	- [x] Object hold UX
 		- [x] holdable object HUD icon
 			- [ ] highlight holdable objects?
-		- [ ] hide tool UI when holding
+		- [x] hide tool UI when holding
 	- [ ] Keep bonus tracks, taco fiesta, maybe stickers in upgrade track. Everything else comes from the [[company store]], as well as upgrades.
\ No newline at end of file