summaryrefslogtreecommitdiff
path: root/Game/Selection/SelectionManager.gd
diff options
context:
space:
mode:
Diffstat (limited to 'Game/Selection/SelectionManager.gd')
-rw-r--r--Game/Selection/SelectionManager.gd11
1 files changed, 5 insertions, 6 deletions
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: