Fix dying loop, add death counter, add die button to debug
This commit is contained in:
@@ -99,6 +99,7 @@ public partial class Game : Node3D, IGame
|
||||
},
|
||||
QuestData = new QuestData()
|
||||
{
|
||||
DeathCount = QuestData.DeathCount,
|
||||
QuestMarker1 = QuestData.QuestMarker1
|
||||
}
|
||||
};
|
||||
@@ -145,6 +146,8 @@ public partial class Game : Node3D, IGame
|
||||
|
||||
public async void OnResolved()
|
||||
{
|
||||
LoadExistingGame();
|
||||
|
||||
await InitializeGame();
|
||||
|
||||
GameState.Set(GameRepo);
|
||||
@@ -256,8 +259,10 @@ public partial class Game : Node3D, IGame
|
||||
|
||||
public IDungeonFloor CurrentFloor => _map.CurrentFloor;
|
||||
|
||||
public void GameOver()
|
||||
public async void GameOver()
|
||||
{
|
||||
QuestData.DeathCount++;
|
||||
await Save();
|
||||
_player.Deactivate();
|
||||
GameState.Input(new GameState.Input.GameOver());
|
||||
}
|
||||
@@ -363,8 +368,8 @@ public partial class Game : Node3D, IGame
|
||||
})
|
||||
.Handle((in GameState.Output.GameOver _) =>
|
||||
{
|
||||
//GameRepo.Pause();
|
||||
//DeathMenu.FadeIn();
|
||||
GameRepo.Pause();
|
||||
GameOverMenu.FadeIn();
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
[gd_scene load_steps=7 format=3 uid="uid://33ek675mfb5n"]
|
||||
[gd_scene load_steps=6 format=3 uid="uid://33ek675mfb5n"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://chftlu4proh3d" path="res://src/game/Game.cs" id="1_ytcii"]
|
||||
[ext_resource type="PackedScene" uid="uid://b1muxus5qdbeu" path="res://src/ui/in_game_ui/InGameUI.tscn" id="5_lxtnp"]
|
||||
[ext_resource type="PackedScene" uid="uid://cgwiwufvxvfs4" path="res://src/ui/load_next_level/LoadNextLevel.tscn" id="7_yw8km"]
|
||||
[ext_resource type="Script" uid="uid://cbal5oeaha4nx" path="res://src/ui/pause_menu/PauseMenu.cs" id="11_5ng8c"]
|
||||
[ext_resource type="PackedScene" uid="uid://dbtfgrtgpr4qg" path="res://src/ui/game_over/GameOverMenu.tscn" id="11_wypid"]
|
||||
[ext_resource type="PackedScene" uid="uid://blbqgw3wosc1w" path="res://src/ui/pause_menu/PauseMenu.tscn" id="12_yev8k"]
|
||||
|
||||
@@ -45,4 +44,3 @@ unique_name_in_owner = true
|
||||
[node name="PauseMenu" parent="." instance=ExtResource("12_yev8k")]
|
||||
unique_name_in_owner = true
|
||||
visible = false
|
||||
script = ExtResource("11_5ng8c")
|
||||
|
||||
Reference in New Issue
Block a user