Skip to content

Consolidate _enemies_node creation in combat_room.gd #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
niyazmft merged 2 commits into from
Jun 8, 2026
Merged

Consolidate _enemies_node creation in combat_room.gd #264

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2eebf43
chore(combat_room): consolidate _enemies_node creation logic
google-labs-jules[bot] Jun 8, 2026
9d3dd70
Merge branch 'main' into chore/combat-room-dry-fix-18431449739130651529
niyazmft Jun 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions scripts/core/combat_room.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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
Expand Down
Loading