4 files changed, 37 insertions, 27 deletions
diff --git a/Game/Selection/SelectableArea.tscn b/Game/Selection/SelectableArea.tscn
index e7cebfd..77d1ab9 100644
--- a/Game/Selection/SelectableArea.tscn
+++ b/Game/Selection/SelectableArea.tscn
@@ -7,8 +7,14 @@ collision_layer = 32
 collision_mask = 16
 script = ExtResource("1_8w2y0")
 
-[connection signal="area_entered" from="." to="." method="_on_area_entered"]
-[connection signal="area_exited" from="." to="." method="_on_area_exited"]
+[node name="HoverControl" type="Control" parent="."]
+layout_mode = 3
+anchors_preset = 0
+offset_right = 40.0
+offset_bottom = 40.0
+mouse_filter = 1
+mouse_default_cursor_shape = 2
+
 [connection signal="input_event" from="." to="." method="_on_input_event"]
 [connection signal="mouse_entered" from="." to="." method="_on_mouse_entered"]
 [connection signal="mouse_exited" from="." to="." method="_on_mouse_exited"]
diff --git a/Game/Selection/SelectionManager.gd b/Game/Selection/SelectionManager.gd
index 86f08af..7ea98ff 100644
--- a/Game/Selection/SelectionManager.gd
+++ b/Game/Selection/SelectionManager.gd
@@ -6,7 +6,7 @@ signal added_to_group(nodes: Array[Node], id: String)
 signal removed_from_group(nodes: Array[Node], id: String)
 signal moved_to_group(nodes: Array[Node], previous_id: String, new_id: String)
 
-var selection_groups := {}
+var selection_groups: Dictionary[String, Array] = {}
 
 signal selected_group_changed(previous_id: String, new_id: String)
 var selected_group := "":
@@ -58,10 +58,7 @@ func move_to_selection_group(nodes: Array[Node], previous_id: String, new_id: St
 	moved_to_group.emit(nodes, previous_id, new_id)
 
 
-func get_ordered_group_ids() -> Array:#Array[String]:
-	# TODO: remove bound to Tower
-	# TODO: use static function on Tower get_sort_conditions?
-	
+func get_ordered_group_ids() -> Array[String]:
 	var keys = selection_groups.keys()
 	
 	keys.sort_custom(func(a, b):
@@ -71,6 +68,8 @@ func get_ordered_group_ids() -> Array:#Array[String]:
 		return group_a.size() > group_b.size()
 	)
 	
+	# TODO: also sort in units and make node type checks
+	
 	keys.sort_custom(func(a, b):
 		var group_a = selection_groups[a]
 		var group_b = selection_groups[b]
@@ -94,7 +93,7 @@ func get_ordered_group_ids() -> Array:#Array[String]:
 		return group_a[0].components.size() > group_b[0].components.size()
 	)
 	
-	return keys
+	return keys as Array[String]
 
 
 func get_selected_nodes() -> Array:
diff --git a/Game/Selection/selectable_area.gd b/Game/Selection/selectable_area.gd
index 0b3557d..e611835 100644
--- a/Game/Selection/selectable_area.gd
+++ b/Game/Selection/selectable_area.gd
@@ -1,3 +1,4 @@
+class_name SelectableArea
 extends Area2D
 
 
@@ -7,23 +8,22 @@ signal hover_exit
 signal select_primary(event: InputEvent)
 signal select_secondary(event: InputEvent)
 
+@export var root: Node2D
 
-#func _on_area_entered(_area: Area2D) -> void:
-	#hover_enter.emit()
-#
-#
-#func _on_area_exited(_area: Area2D) -> void:
-	#hover_exit.emit()
+
+func _ready() -> void:
+	var cshapes := find_children("*", "CollisionShape2D")
+	assert(cshapes.size() > 0)
+	assert(cshapes[0].shape is RectangleShape2D)
+	$HoverControl.size = cshapes[0].shape.size
 
 
 func _on_mouse_entered() -> void:
-	if not get_tree().get_first_node_in_group("selection_rectangle").is_active:
-		hover_enter.emit()
+	hover_enter.emit()
 
 
 func _on_mouse_exited() -> void:
-	if not get_tree().get_first_node_in_group("selection_rectangle").is_active:
-		hover_exit.emit()
+	hover_exit.emit()
 
 
 func _on_input_event(_viewport: Node, event: InputEvent, _shape_idx: int) -> void:
diff --git a/Game/Selection/selection_rectangle.gd b/Game/Selection/selection_rectangle.gd
index 0b6bb22..1d1590a 100644
--- a/Game/Selection/selection_rectangle.gd
+++ b/Game/Selection/selection_rectangle.gd
@@ -1,20 +1,25 @@
 extends Area2D
 
 
+signal hover_entered(node: Node2D)
+signal hover_exited(node: Node2D)
+
 @export_group("Color", "color")
 @export var color_background: Color
 @export var color_border: Color
 
+@export var is_enabled: bool
+
 var anchor: Vector2 = Vector2.ZERO
-var size: Vector2 = Vector2.ZERO :
+var size: Vector2 = Vector2.ZERO:
 	set(value):
 		size = value
 		$CollisionShape2D.position = size / 2
 		$CollisionShape2D.shape.size = abs(size)
 
-var is_active: bool :
+var is_active: bool:
 	get():
-		return abs(size) > Vector2(1, 1) and Client.state is StateDefault
+		return abs(size) > Vector2(1, 1) and is_enabled
 
 @onready var camera: Camera = get_viewport().get_camera_2d()
 
@@ -50,11 +55,11 @@ func _draw():
 		draw_rect(rect, color_border, false, 1.1 / max(camera.zoom.x, camera.zoom.y))
 
 
-func _on_area_entered(area: Area2D) -> void:
-	if area.get_parent().owner_id == multiplayer.get_unique_id():
-		area.get_parent().is_hovered = true
+func _on_area_entered(area: SelectableArea) -> void:
+	if area.root.owner_id == multiplayer.get_unique_id():
+		hover_entered.emit(area.root)
 
 
-func _on_area_exited(area: Area2D) -> void:
-	if area.get_parent().owner_id == multiplayer.get_unique_id():
-		area.get_parent().is_hovered = false
+func _on_area_exited(area: SelectableArea) -> void:
+	if area.root.owner_id == multiplayer.get_unique_id():
+		hover_exited.emit(area.root)