Improve cleanup of 'UnitMenus'

lampe-games · Aug 27, 2023 · 1620feb · 1620feb
1 parent 35f1d04
commit 1620feb
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 2 deletions.
diff --git a/source/match/MatchSignals.gd b/source/match/MatchSignals.gd
@@ -11,4 +11,5 @@ signal unit_spawned(unit)
 signal unit_targeted(unit)
 signal unit_selected(unit)
 signal unit_deselected(unit)
+signal unit_died(unit)
 signal controlled_player_changed(player)
diff --git a/source/match/debug/UnitsManager.gd b/source/match/debug/UnitsManager.gd
@@ -18,7 +18,8 @@ func _unhandled_input(event):
 		return
 	if event.is_action_pressed("god_mode_delete_units"):
 		for unit in get_tree().get_nodes_in_group("selected_units"):
-			unit.queue_free()
+			if "hp" in unit:
+				unit.hp = 0
 
 
 func _get_requested_units():

diff --git a/source/match/hud/UnitMenus.gd b/source/match/hud/UnitMenus.gd
@@ -16,6 +16,7 @@ func _ready():
 	_reset_menus()
 	MatchSignals.unit_selected.connect(func(_unit): _reset_menus())
 	MatchSignals.unit_deselected.connect(func(_unit): _reset_menus())
+	MatchSignals.unit_died.connect(func(_unit): _reset_menus())
 
 
 func _reset_menus():

diff --git a/source/match/units/Unit.gd b/source/match/units/Unit.gd
@@ -118,6 +118,7 @@ func _teardown_current_action():
 
 
 func _handle_unit_death():
+	tree_exited.connect(func(): MatchSignals.unit_died.emit(self))
 	queue_free()
 
 

diff --git a/source/match/units/traits/Selection.gd b/source/match/units/traits/Selection.gd
@@ -18,7 +18,6 @@ func _ready():
 		return
 	MatchSignals.deselect_all_units.connect(deselect)
 	_unit.input_event.connect(_on_input_event)
-	_unit.tree_exiting.connect(deselect)
 	_circle.hide()