diff --git a/Assets/Scripts/CommonScripts/CommonData.cs b/Assets/Scripts/CommonScripts/CommonData.cs index 89dcbd3..da8d67d 100644 --- a/Assets/Scripts/CommonScripts/CommonData.cs +++ b/Assets/Scripts/CommonScripts/CommonData.cs @@ -14,7 +14,7 @@ public partial class CommonData : Node // Level information public string CurrentLevel; - // Player information + // Player stats public float CurrentHealth; public float MaxHealth = 100; @@ -33,13 +33,14 @@ public partial class CommonData : Node GetTree().Root.CallDeferred(Node.MethodName.AddChild, inst); // Start game by loading the main menu - scene = GD.Load("res://Assets/Scenes/MenusAndLevels/MainMenu.tscn"); - //scene = GD.Load("res://Assets/Scenes/DEVSCENES/EnemyTest.tscn"); + //scene = GD.Load("res://Assets/Scenes/MenusAndLevels/MainMenu.tscn"); + scene = GD.Load("res://Assets/Scenes/DEVSCENES/EnemyTest.tscn"); inst = scene.Instantiate(); GetTree().Root.CallDeferred(Node.MethodName.AddChild, inst); PlayMusic("MainMenu"); // Load in saved data + //....? } public override void _Process(double delta) @@ -49,28 +50,18 @@ public partial class CommonData : Node GlobalTimer = NumFramesElapsed / FPS; GlobalTimer = (float)Convert.ToDouble(GlobalTimer.ToString("0.##")); // Truncates seconds elapsed to hundreds place (0.00) //GD.Print(GlobalTimer); - if (Input.IsActionJustPressed("quit_game")){GetTree().Quit();} + if (Input.IsActionJustPressed("quit_game")) GetTree().Quit(); - if (Input.IsActionJustPressed("mute")) - { - if (Muted) - { - Muted = false; - GetNode("AudioStreamPlayer").VolumeDb = 0; - } - else - { - Muted = true; - GetNode("AudioStreamPlayer").VolumeDb = -80; - } + if (Input.IsActionJustPressed("mute")){ + Muted = ! Muted; + GetNode("AudioStreamPlayer").VolumeDb = (Muted) ? -80 : 0; } } // BG Audio Management public void StopMusic(){GetNode("AudioStreamPlayer").Stop();}// Stop whatever audio is playing\ - public void PlayMusic(string AudioName) - { + public void PlayMusic(string AudioName){ // Load target audio and play the audio GetNode("AudioStreamPlayer").Stream = (Godot.AudioStream)GD.Load($"res://Assets/Audio/Music/{AudioName}.mp3"); GetNode("AudioStreamPlayer").Play(); diff --git a/fracturepoint.csproj b/fracturepoint.csproj index 65eb1f8..63a009f 100644 --- a/fracturepoint.csproj +++ b/fracturepoint.csproj @@ -1,4 +1,4 @@ - + net8.0 net9.0 diff --git a/fracturepoint.csproj.old b/fracturepoint.csproj.old new file mode 100644 index 0000000..65eb1f8 --- /dev/null +++ b/fracturepoint.csproj.old @@ -0,0 +1,7 @@ + + + net8.0 + net9.0 + true + + \ No newline at end of file diff --git a/project.godot b/project.godot index 1d30aba..45f3057 100644 --- a/project.godot +++ b/project.godot @@ -8,11 +8,15 @@ config_version=5 +[animation] + +compatibility/default_parent_skeleton_in_mesh_instance_3d=true + [application] config/name="fracturepoint" run/main_scene="uid://bn5opy6atakg" -config/features=PackedStringArray("4.5", "C#", "GL Compatibility") +config/features=PackedStringArray("4.6", "C#", "GL Compatibility") run/max_fps=90 config/icon="res://icon.svg"