diff --git a/project.godot b/project.godot index 5cc0dbc..c8d0ffe 100644 --- a/project.godot +++ b/project.godot @@ -121,9 +121,9 @@ locale/translations=PackedStringArray("res://translations/plants.en.translation" 2d_physics/layer_1="Reserved" 2d_physics/layer_2="Plants Dummy" -2d_physics/layer_3="Plants Full" +2d_physics/layer_3="Plants True" 2d_physics/layer_4="Zombies Dummy" -2d_physics/layer_5="Zombies Full" +2d_physics/layer_5="Zombies True" 2d_physics/layer_7="FallLine" 2d_physics/layer_8="FallParticles" diff --git a/scripts/LevelController.cs b/scripts/LevelController.cs index 8330947..a1fe24e 100644 --- a/scripts/LevelController.cs +++ b/scripts/LevelController.cs @@ -39,13 +39,20 @@ public partial class LevelController : Node _isLevelRunning = true; } - + public void RestartLevel() + { + if (_isLevelRunning == false) + return; + var resource = RuntimeLevelData.LevelResource; + GetTree().ReloadCurrentScene(); + RuntimeLevelData.LevelResource = resource; + } public void EndLevel() { if (_isLevelRunning == false) return; RuntimeLevelData.LevelResource = null; - + _isLevelRunning = false; } } diff --git a/scripts/gui/PauseMenu.cs b/scripts/gui/PauseMenu.cs index 4c132f9..3b52a40 100644 --- a/scripts/gui/PauseMenu.cs +++ b/scripts/gui/PauseMenu.cs @@ -1,4 +1,5 @@ using Godot; +using Newlon; using System; public partial class PauseMenu : Control @@ -21,7 +22,7 @@ public partial class PauseMenu : Control public void Restart() { GetTree().Paused = false; - GetTree().ReloadCurrentScene(); + LevelController.Instance.RestartLevel(); currently_paused = false; } public void Exit()