diff --git a/Autoloads/GameSettings.cs b/Autoloads/GameSettings.cs new file mode 100644 index 0000000..822ed2e --- /dev/null +++ b/Autoloads/GameSettings.cs @@ -0,0 +1,7 @@ +namespace CMSGame +{ + public partial class GameSettings : Node + { + public bool PauseBattleWhenCharacterIsSelected = true; + } +} diff --git a/CMSGame.csproj b/CMSGame.csproj index d3d9ffb..9db91b5 100644 --- a/CMSGame.csproj +++ b/CMSGame.csproj @@ -2,6 +2,7 @@ net6.0 true + $(DefaultItemExcludes);ScriptTemplates\**\*.cs diff --git a/Components/BattleCharacter.cs b/Components/BattleCharacter.cs index c6b2faa..17d7670 100644 --- a/Components/BattleCharacter.cs +++ b/Components/BattleCharacter.cs @@ -1,3 +1,6 @@ -public partial class BattleCharacter : Sprite2D +namespace CMSGame { + public partial class BattleCharacter : Sprite2D + { + } } diff --git a/Components/PauseMenu.cs b/Components/PauseMenu.cs index d68b39a..6d022af 100644 --- a/Components/PauseMenu.cs +++ b/Components/PauseMenu.cs @@ -1,15 +1,19 @@ -public partial class PauseMenu : Control +namespace CMSGame { - private GameSettings _settings; - - public override void _Ready() + public partial class PauseMenu : Control { - _settings = GetNode("/root/GameSettings"); - GetNode("%CheckBoxPauseBattleWhenCharacterIsSelected").ToggleMode = _settings.PauseBattleWhenCharacterIsSelected; - } + private GameSettings _settings; - public void On_CheckBoxPauseBattleWhenCharacterIsSelected_Toggled() - { - _settings.PauseBattleWhenCharacterIsSelected = false; + public override void _Ready() + { + _settings = GetNode("/root/GameSettings"); + GetNode("%CheckBoxPauseBattleWhenCharacterIsSelected").ToggleMode = _settings.PauseBattleWhenCharacterIsSelected; + } + + public void On_CheckBoxPauseBattleWhenCharacterIsSelected_Toggled() + { + _settings.PauseBattleWhenCharacterIsSelected = false; + } } + } diff --git a/Components/PrebattleMenu.tscn b/Components/PrebattleMenu.tscn index c471e1d..446f616 100644 --- a/Components/PrebattleMenu.tscn +++ b/Components/PrebattleMenu.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://blobono0y4pqs"] -[node name="PrebattleMenu" type="Control"] +[node name="PreBattleMenu" type="Control"] layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 diff --git a/Entities/Character.cs b/Entities/Character.cs new file mode 100644 index 0000000..e31ae9e --- /dev/null +++ b/Entities/Character.cs @@ -0,0 +1,21 @@ +namespace CMSGame +{ + public partial class Character : Node + { + private int _hp; + + public int Hp + { + get => _hp; + set => _hp = value; + } + + public override void _Ready() + { + } + + public override void _Process(double delta) + { + } + } +} diff --git a/Helpers/TimeHelper.cs b/Helpers/TimeHelper.cs new file mode 100644 index 0000000..adc90aa --- /dev/null +++ b/Helpers/TimeHelper.cs @@ -0,0 +1,10 @@ +namespace CMSGame +{ + static class TimeHelper + { + public static string FormatTime(double time) + { + return TimeSpan.FromSeconds(time).ToString("c"); + } + } +} diff --git a/Scenes/Battle.cs b/Scenes/Battle.cs deleted file mode 100644 index 06ce8b4..0000000 --- a/Scenes/Battle.cs +++ /dev/null @@ -1,40 +0,0 @@ -public partial class Battle : Control -{ - private Label _labelBattleTime; - - public double Time; - - public bool IsPause = false; - - public override void _Ready() - { - _labelBattleTime = GetNode