From 54bfc3c021186836bae80a1b6508f2e7b8eab654 Mon Sep 17 00:00:00 2001 From: jonathan Date: Tue, 11 Nov 2025 14:06:58 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20enemy=20groups=20show=20?= =?UTF-8?q?in=20different=20spots=20and=20even=20when=20all=20enemies=20ar?= =?UTF-8?q?e=20dead?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/CSharp/Common/Fight/FightRoomSceneSetup.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/CSharp/Common/Fight/FightRoomSceneSetup.cs b/scripts/CSharp/Common/Fight/FightRoomSceneSetup.cs index 12c316d..de19a5c 100644 --- a/scripts/CSharp/Common/Fight/FightRoomSceneSetup.cs +++ b/scripts/CSharp/Common/Fight/FightRoomSceneSetup.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Linq; using Babushka.scripts.CSharp.Common.Util; using Godot; @@ -15,15 +16,14 @@ public partial class FightRoomSceneSetup : Node { var room = FightWorld.Instance.currentRoom!; - var i = 0; - foreach (var availableParent in _enemyGroupSpawns.Shuffle()) + foreach (var (parent, group) in _enemyGroupSpawns.Zip(room.enemyGroups)) { - var enemyGroup = room.enemyGroups[i]; + if (group.AreAllDead()) + continue; + var roamingEnemyGroup = _roamingEnemyGroupPrefab.Instantiate(); - roamingEnemyGroup.Initialize(enemyGroup, _fightSceneSwitcher); - availableParent.AddChild(roamingEnemyGroup); - if (i >= room.enemyGroups.Count - 1) break; - i++; + roamingEnemyGroup.Initialize(group, _fightSceneSwitcher); + parent.AddChild(roamingEnemyGroup); } } } \ No newline at end of file