Simplify units setup

source/match/Match.gd

@@ -120,7 +120,7 @@ func _setup_player_units():
 		var player_index = player.get_index()
 		var predefined_units = player.get_children().filter(func(child): return child is Unit)
 		if not predefined_units.is_empty():
-			predefined_units.map(func(unit): _setup_unit(unit))
+			predefined_units.map(func(unit): _setup_unit_groups(unit))
 		else:
 			_spawn_player_units(
 				player, map.find_child("SpawnPoints").get_child(player_index).global_transform
@@ -144,13 +144,12 @@ func _setup_and_spawn_unit(unit, a_transform, player, mark_structure_under_const
 	unit.global_transform = a_transform
 	if unit is Structure and mark_structure_under_construction:
 		unit.mark_as_under_construction()
+	_setup_unit_groups(unit)
 	player.add_child(unit)
-	_setup_unit(unit)
 	MatchSignals.unit_spawned.emit(unit)
 
 
-func _setup_unit(unit):
-	unit.color = unit.player.color
+func _setup_unit_groups(unit):
 	unit.add_to_group("units")
 	if unit.player == _get_human_player():
 		unit.add_to_group("controlled_units")

source/match/units/Unit.gd

@@ -31,8 +31,9 @@ var sight_range = null
 var player:
 	get:
 		return get_parent()
-var color = null:
-	set = _set_color
+var color:
+	get:
+		return player.color
 var action = null:
 	set = _set_action
 
@@ -44,6 +45,7 @@ var _action_locked = false
 func _ready():
 	if not _match.is_node_ready():
 		await _match.ready
+	_setup_color()
 	_setup_default_properties_from_constants()
 	assert(_safety_checks())
 
@@ -94,8 +96,7 @@ func _is_movable():
 	return _get_movement_speed() > 0.0
 
 
-func _set_color(a_color):
-	color = a_color
+func _setup_color():
 	var material = player.get_color_material()
 	Utils.Match.traverse_node_tree_and_replace_materials_matching_albedo(
 		find_child("Geometry"),