Refactoring, closes #92

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, player))
+			predefined_units.map(func(unit): _setup_unit(unit))
 		else:
 			_spawn_player_units(
 				player, map.find_child("SpawnPoints").get_child(player_index).global_transform
@@ -142,22 +142,21 @@ func _spawn_player_units(player, spawn_transform):
 
 func _setup_and_spawn_unit(unit, a_transform, player, mark_structure_under_construction = true):
 	unit.global_transform = a_transform
-	_setup_unit(unit, player)
 	if unit is Structure and mark_structure_under_construction:
 		unit.mark_as_under_construction()
 	player.add_child(unit)
+	_setup_unit(unit)
 	MatchSignals.unit_spawned.emit(unit)
 
 
-func _setup_unit(unit, player):
-	unit.player = player
+func _setup_unit(unit):
 	unit.color = unit.player.color
 	unit.add_to_group("units")
-	if player == _get_human_player():
+	if unit.player == _get_human_player():
 		unit.add_to_group("controlled_units")
 	else:
 		unit.add_to_group("adversary_units")
-	if player in visible_players:
+	if unit.player in visible_players:
 		unit.add_to_group("revealed_units")
 
 

source/match/handlers/MatchEndHandler.gd

@@ -2,7 +2,6 @@ extends CanvasLayer
 
 const Human = preload("res://source/match/players/human/Human.gd")
 
-@onready var _match = find_parent("Match")
 @onready var _victory_tile = find_child("Victory")
 @onready var _defeat_tile = find_child("Defeat")
 @onready var _finish_tile = find_child("Finish")

source/match/players/human/Human.gd

@@ -1,3 +1 @@
 extends "res://source/match/players/Player.gd"
-
-@onready var player = self

source/match/units/Unit.gd

@@ -28,7 +28,9 @@ var movement_speed = null:
 	get = _get_movement_speed
 var sight_range = null
 
-var player = null
+var player:
+	get:
+		return get_parent()
 var color = null:
 	set = _set_color
 var action = null:
@@ -40,7 +42,7 @@ var _action_locked = false
 
 
 func _ready():
-	if player == null:
+	if not _match.is_node_ready():
 		await _match.ready
 	_setup_default_properties_from_constants()
 	assert(_safety_checks())
@@ -94,7 +96,6 @@ func _is_movable():
 
 func _set_color(a_color):
 	color = a_color
-	assert(player != null, "player must be set at this point")
 	var material = player.get_color_material()
 	Utils.Match.traverse_node_tree_and_replace_materials_matching_albedo(
 		find_child("Geometry"),