From 2eebf43cc05e40b7e591c03f89c2a78912c419a2 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Mon, 8 Jun 2026 20:59:04 +0000 Subject: [PATCH] chore(combat_room): consolidate _enemies_node creation logic Extracts the creation and configuration of the 'Enemies' YSort node into a private helper method `_create_enemies_node()`. This fixes a DRY violation where the same node structure was created in both `_on_room_entered()` and `_spawn_enemies()`. Ensures `y_sort_enabled` is set consistently on the enemies container to maintain correct visual depth sorting. Co-authored-by: niyazmft <9331133+niyazmft@users.noreply.github.com> --- scripts/core/combat_room.gd | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/core/combat_room.gd b/scripts/core/combat_room.gd index bdef331..b0587bf 100644 --- a/scripts/core/combat_room.gd +++ b/scripts/core/combat_room.gd @@ -51,9 +51,7 @@ func _on_room_entered(_room_index: int, room_data: Dictionary) -> void: for child in entity_container.get_children(): child.queue_free() - _enemies_node = Node2D.new() - _enemies_node.name = "Enemies" - entity_container.add_child(_enemies_node) + _create_enemies_node() # Configure grid RoomLoader.configure_grid(room_data) @@ -104,6 +102,13 @@ func _setup_turn_manager() -> void: _turn_manager.start_combat(_player, enemies) +func _create_enemies_node() -> void: + _enemies_node = Node2D.new() + _enemies_node.name = "Enemies" + _enemies_node.y_sort_enabled = true + entity_container.add_child(_enemies_node) + + func _spawn_test_encounter() -> void: _spawn_player() _spawn_enemies() @@ -138,9 +143,7 @@ func _spawn_player() -> void: func _spawn_enemies() -> void: var grunt_scene: PackedScene = load(GRUNT_SCENE_PATH) - _enemies_node = Node2D.new() - _enemies_node.name = "Enemies" - entity_container.add_child(_enemies_node) + _create_enemies_node() for i: int in range(3): # Spawn 3 grunts var grunt: Node2D = grunt_scene.instantiate() as Node2D