Vesna resets to bed after death

Merge pull request 'Kampf Tooltip wird ausgeblendet' (#43 ) from Kampf_Tooltip into develop
Reviewed-on: #43 Reviewed-by: Jonathan <cblech@ymail.com>
2025-12-16 15:34:52 +01:00 · 2025-12-11 17:29:54 +01:00 · 2025-12-10 16:23:41 +01:00 · 2025-12-10 16:23:04 +01:00 · 2025-12-10 15:53:55 +01:00 · 2025-12-09 15:20:36 +01:00
2 changed files with 9 additions and 2 deletions
@@ -168,6 +168,7 @@ theme_override_constants/margin_left = 200
 theme_override_constants/margin_right = 200

 [node name="MarginContainer" type="MarginContainer" parent="ActionSelect/BottomPanel/VBoxContainer/MarginContainer2"]
+visible = false
 layout_mode = 2
 theme_override_constants/margin_left = 10
 theme_override_constants/margin_top = 10
@@ -9,9 +9,15 @@ public partial class SwitchSceneOnFightEnd : Node

    public void OnFightStateEnter(FightHappening.FightState to)
    {
-        if (to is FightHappening.FightState.PlayerWin
-            or FightHappening.FightState.EnemyWin)
+        if (to is FightHappening.FightState.PlayerWin )
            _ = SwitchSceneAfterTime(2.0f);
+
+        if (to is FightHappening.FightState.EnemyWin)
+        {
+            _fightSceneSwitcher.ExitFight();
+            _fightSceneSwitcher.ExitFightWorld();
+        }
+            
    }

    private async Task SwitchSceneAfterTime(float seconds)
Author	SHA1	Message	Date
jlink	2ed9dbbc52	Vesna resets to bed after death	2025-12-16 15:34:52 +01:00
Jonathan	b810ea1d9f	Merge pull request 'Kampf Tooltip wird ausgeblendet' (#43 ) from Kampf_Tooltip into develop Reviewed-on: #43 Reviewed-by: Jonathan <cblech@ymail.com>	2025-12-11 17:29:54 +01:00
kziolkowski	3d19509826	Merge pull request 'feature/art_update' (#40 ) from feature/art_update into develop Reviewed-on: #40 Reviewed-by: Jonathan <cblech@ymail.com>	2025-12-10 16:23:41 +01:00
kziolkowski	113dd0820f	Merge branch 'develop' into feature/art_update	2025-12-10 16:23:04 +01:00
jlink	fc00559483	Kampf Tooltip wird ausgeblendet	2025-12-10 15:53:55 +01:00
Jonathan	0434667c22	Merge pull request 'feature/bugfixes_And_Polish' (#39 ) from feature/bugfixes_And_Polish into develop Reviewed-on: #39 Reviewed-by: Jonathan <cblech@ymail.com>	2025-12-09 15:20:36 +01:00