Door hit

Audio/BGM/BossTheme.wav.import

@@ -18,7 +18,7 @@ force/max_rate=false
 force/max_rate_hz=44100
 edit/trim=false
 edit/normalize=false
-edit/loop_mode=0
+edit/loop_mode=2
 edit/loop_begin=0
 edit/loop_end=-1
 compress/mode=0

Audio/BGM/LevelTheme.wav.import

@@ -18,7 +18,7 @@ force/max_rate=false
 force/max_rate_hz=44100
 edit/trim=false
 edit/normalize=false
-edit/loop_mode=0
+edit/loop_mode=2
 edit/loop_begin=0
 edit/loop_end=-1
 compress/mode=0

Audio/BGM/OpeningTheme.wav.import

@@ -18,7 +18,7 @@ force/max_rate=false
 force/max_rate_hz=44100
 edit/trim=false
 edit/normalize=false
-edit/loop_mode=0
+edit/loop_mode=1
 edit/loop_begin=0
 edit/loop_end=-1
 compress/mode=0

Audio/BGM/TitleTheme.wav.import

@@ -18,7 +18,7 @@ force/max_rate=false
 force/max_rate_hz=44100
 edit/trim=false
 edit/normalize=false
-edit/loop_mode=0
+edit/loop_mode=2
 edit/loop_begin=0
 edit/loop_end=-1
 compress/mode=0

Enemies/Attacks/EnemyBullet.tscn

@@ -1,20 +1,17 @@
-[gd_scene load_steps=6 format=3 uid="uid://rlxnnw4yay7e"]
+[gd_scene load_steps=5 format=3 uid="uid://rlxnnw4yay7e"]
 
 [ext_resource type="Script" path="res://Enemies/Attacks/EnemyBullet.cs" id="1_rv13r"]
 [ext_resource type="Texture2D" uid="uid://dd71tdgrgic46" path="res://Textures/Projectiles/LB ORB.png" id="2_6l2aj"]
-
+[ext_resource type="AudioStream" uid="uid://cfj82os5p8i4p" path="res://Audio/SFX/shooting.wav" id="2_q6wdf"]
-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_phgri"]
-albedo_color = Color(0.584314, 0.0352941, 0.141176, 1)
-
-[sub_resource type="SphereMesh" id="SphereMesh_wuk0e"]
-material = SubResource("StandardMaterial3D_phgri")
 
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_e4v7f"]
+height = 8.99869
 radius = 0.4
 
 [node name="TestBullet" type="Node3D"]
 script = ExtResource("1_rv13r")
-_projectileSpeed = 3.0
+Cooldown = 3.0
+_soundEffect = ExtResource("2_q6wdf")
 
 [node name="RigidBody3D" type="RigidBody3D" parent="."]
 collision_layer = 4
@@ -25,19 +22,14 @@ continuous_cd = true
 max_contacts_reported = 10
 contact_monitor = true
 can_sleep = false
-
+lock_rotation = true
-[node name="MeshInstance3D" type="MeshInstance3D" parent="RigidBody3D"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.02602, 0)
-visible = false
-mesh = SubResource("SphereMesh_wuk0e")
-skeleton = NodePath("../..")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0111055, 1.02602, 0)
+transform = Transform3D(0.3, 0, 0, 0, 0.3, 0, 0, 0, 0.3, 0.0111055, 1.02602, 0)
 shape = SubResource("CylinderShape3D_e4v7f")
 
-[node name="Sprite3D" type="Sprite3D" parent="RigidBody3D"]
+[node name="Sprite3D" type="Sprite3D" parent="RigidBody3D/CollisionShape3D"]
-transform = Transform3D(0.08, 0, 0, 0, 0.08, 0, 0, 0, 0.08, -0.379318, 1.02602, 0.436329)
+transform = Transform3D(0.08, 0, 0, 0, 0.08, 0, 0, 0, 0.08, -0.390424, 0, 0.436329)
 centered = false
 axis = 1
 texture = ExtResource("2_6l2aj")

Enemies/Attacks/FireAtPlayer.cs

@@ -16,7 +16,7 @@ public partial class FireAtPlayer : Timer
          var convertedPlayers = players.Select(x => (Node3D)x);
          var target = convertedPlayers.OrderBy(x => _enemy.Position.DistanceTo(x.Position)).FirstOrDefault();
          var projectile = _fireProjectile.Instantiate<Projectile>() as EnemyBullet;
-         projectile.Rotation = _enemy.Rotation;
+         projectile.Rotation = new Vector3(0, _enemy.Rotation.Y, 0);
          projectile.Position = _enemy.Position;
          GetParent().AddChild(projectile);
       }

Enemies/Scripts/RangedEnemy.cs

@@ -10,8 +10,9 @@ public partial class RangedEnemy : BasicEnemy
       {
          var convertedPlayers = players.Select(x => (Node3D)x);
          var target = convertedPlayers.OrderBy(x => Position.DistanceTo(x.Position)).FirstOrDefault();
-         var area = GetChildren().OfType<Area3D>().Single();
+         var hitBox = GetChildren().OfType<Area3D>().Single();
-         area.LookAt(target.Position, Vector3.Up);
+         hitBox.LookAt(target.Position, Vector3.Up);
+         hitBox.Rotation = new Vector3(0, hitBox.Rotation.Y, hitBox.Rotation.Z);
       }
    }
 }

GameLogic/GameManager.cs

@@ -6,164 +6,140 @@ using System.Linq;
 public partial class GameManager : Node
 {
    [Signal]
-   public delegate void OnGameOverEventHandler();
+   public delegate void OnPlayerGameOverEventHandler();
    [Signal]
-   public delegate void ReselectCharacterEventHandler(PlayerManager player);
+   public delegate void ReselectCharacterEventHandler(Player player);
 
    [Export]
    private Array<PackedScene> PlayerScenes;
 
-   public Array<Controls> P1CharactersOut = new Array<Controls>();
+   public IEnumerable<Player> Players = new List<Player>();
-   public Array<Controls> P2CharactersOut = new Array<Controls>();
-
-   public IEnumerable<PlayerManager> Players = new List<PlayerManager>();
 
    private int _levelIndex;
 
+   public bool IsGameOverScreenOn = false;
+
    public override void _Ready()
    {
       var main = GetTree().Root.GetNode<Main>("/root/Main");
       for (var i = 0; i < main.NumberOfPlayers; i++)
       {
          var player = PlayerScenes[i].Instantiate();
-         Players = Players.Append((PlayerManager)player);
+         Players = Players.Append((Player)player);
          GetTree().Root.AddChild(player);
       }
    }
 
    public void OnAllEnemiesDefeated()
    {
-      GD.Print("All enemies defeated");
       OnLevelClear();
    }
 
-   public void OnHandleCharacterSelectUI(PlayerManager player)
+   public void OnHandleCharacterSelectUI(Player player)
    {
       EmitSignal(SignalName.ReselectCharacter, player);
    }
 
-   public void SetToNextCharacter(PlayerManager player)
+   public void SetToNextCharacter(Player player)
    {
-      player._characterIndex = (++player._characterIndex) % player.CharactersLeftOnStage.Count();
+      player.CharacterIndex = (++player.CharacterIndex) % player.CharactersLeftOnStage.Count();
-      GD.Print(player.CharactersLeftOnStage.ElementAt(player._characterIndex));
+      GD.Print(player.CharactersLeftOnStage.ElementAt(player.CharacterIndex));
    }
 
-   public void SetToPreviousCharacter(PlayerManager player)
+   public void SetToPreviousCharacter(Player player)
    {
-      player._characterIndex = player._characterIndex == 0 ? player.CharactersLeftOnStage.Count() - 1 : --player._characterIndex;
+      player.CharacterIndex = player.CharacterIndex == 0 ? player.CharactersLeftOnStage.Count() - 1 : --player.CharacterIndex;
    }
 
-   public void ResetPlayerPosition(PlayerManager player)
+   public void ResetPlayerPosition(Player player)
    {
       player.SpawnPoint.SetPlayerPosition(player.SelectedCharacter);
-      GD.Print(player.CharactersLeftOnStage.ElementAt(player._characterIndex));
+      GD.Print(player.CharactersLeftOnStage.ElementAt(player.CharacterIndex));
    }
 
-   public void OnCharacterSelected(PlayerManager player)
+   public void OnCharacterSelected(Player player)
    {
       var sfxPlayer = GetTree().Root.GetNode<AudioStreamPlayer>("Main/SFXPlayer");
       var audioStream = ResourceLoader.Load<AudioStream>("Audio/SFX/Select.wav");
       sfxPlayer.Stream = audioStream;
       sfxPlayer.Play();
       GD.Print("Instancing...");
-      var names = player.CharactersLeftOnStage.Select(x => x.Name).ToArray();
+      GD.Print(player.Name);
-      GD.Print(names);
       if (player.CharactersLeftOnStage.Any())
       {
-         var selectedCharacter = player.CharactersLeftOnStage[player._characterIndex];
+         player.SelectedCharacter = player.CharactersLeftOnStage[player.CharacterIndex];
-         player.SelectedCharacter = selectedCharacter;
          GetTree().Root.AddChild(player.SelectedCharacter);
          player.SpawnPoint.SetPlayerPosition(player.SelectedCharacter);
       }
    }
 
-   public void RemoveCharacter(P1Controls character)
+   public void RemoveCharacter(Player player)
    {
-      Players.ElementAt(0).CharactersLeftOnStage.Remove(character);
+      player.CharactersLeftOnStage.Remove(player.SelectedCharacter);
+      GetTree().Root.RemoveChild(player.SelectedCharacter);
 
-      GetTree().Root.RemoveChild(character);
+      GD.Print(player.CharactersLeftOnStage.Select(x => x.Name).ToArray());
 
-      GD.Print(Players.ElementAt(0).CharactersLeftOnStage.Select(x => x.Name).ToArray());
+      player.CharacterIndex = 0;
+      if (player.CharactersLeftOnStage.Any())
+         EmitSignal(SignalName.ReselectCharacter, player);
 
-      Players.ElementAt(0)._characterIndex = 0;
+      if (!player.CharactersExited.Any() && !player.CharactersLeftOnStage.Any())
-      if (Players.ElementAt(0).CharactersLeftOnStage.Any())
+         SetGameOver(player, true);
-         EmitSignal(SignalName.ReselectCharacter, Players.ElementAt(0));
 
-      if (!P1CharactersOut.Any() && !Players.ElementAt(0).CharactersLeftOnStage.Any())
+      if (Players.All(x => !x.CharactersLeftOnStage.Any()) && Players.Any(x => x.CharactersExited.Any()))
-         SetGameOver(Players.ElementAt(0), true);
+         OnLevelClear();
-
-      if (Players.Count() == 2 && !P2CharactersOut.Any() && !Players.ElementAt(1).CharactersLeftOnStage.Any())
-         SetGameOver(Players.ElementAt(1), true);
    }
 
-   public void RemoveCharacter(P2Controls character)
+   public void RemoveCharacterAndAddToExit(Player player)
    {
-      Players.ElementAt(1).CharactersLeftOnStage.Remove(character);
+      player.CharactersExited.Add(player.SelectedCharacter);
+      player.CharactersLeftOnStage.Remove(player.SelectedCharacter);
+      GetTree().Root.RemoveChild(player.SelectedCharacter);
 
-      GetTree().Root.RemoveChild(character);
+      GD.Print(player.CharactersLeftOnStage.Select(x => x.Name).ToArray());
 
-      GD.Print(Players.ElementAt(1).CharactersLeftOnStage.Select(x => x.Name).ToArray());
+      player.CharacterIndex = 0;
-
+      if (player.CharactersLeftOnStage.Any())
-      Players.ElementAt(1)._characterIndex = 0;
+         EmitSignal(SignalName.ReselectCharacter, player);
-      if (Players.ElementAt(1).CharactersLeftOnStage.Any())
-         EmitSignal(SignalName.ReselectCharacter, Players.ElementAt(1));
    }
 
-   public void RemoveCharacterAndAddToExit(P1Controls character)
+   public void SetGameOver(Player player, bool isGameOver)
-   {
-      P1CharactersOut.Add(character);
-      Players.ElementAt(0).CharactersLeftOnStage.Remove(character);
-
-      GetTree().Root.RemoveChild(character);
-
-      GD.Print(Players.ElementAt(0).CharactersLeftOnStage.Select(x => x.Name).ToArray());
-
-      Players.ElementAt(0)._characterIndex = 0;
-      if (Players.ElementAt(0).CharactersLeftOnStage.Any())
-         EmitSignal(SignalName.ReselectCharacter, Players.ElementAt(0));
-   }
-
-   public void RemoveCharacterAndAddToExit(P2Controls character)
-   {
-      P2CharactersOut.Add(character);
-      Players.ElementAt(1).CharactersLeftOnStage.Remove(character);
-
-      GetTree().Root.RemoveChild(character);
-
-      Players.ElementAt(1)._characterIndex = 0;
-      if (Players.ElementAt(1).CharactersLeftOnStage.Any())
-         EmitSignal(SignalName.ReselectCharacter, Players.ElementAt(1));
-   }
-
-   public void SetGameOver(PlayerManager player, bool isGameOver)
    {
       player.GameOver = isGameOver;
       if (isGameOver)
-         EmitSignal(SignalName.OnGameOver);
+         EmitSignal(SignalName.OnPlayerGameOver);
       GD.Print($"Game over for {player.Name}");
    }
 
+   public void ReloadGameScene()
+   {
+      GD.Print("Reloading scene");
+      var players = GetTree().Root.GetChildren().OfType<Player>();
+      foreach (var player in players)
+         player.QueueFree();
+      var levels = GetTree().Root.GetChildren().OfType<Level>();
+      foreach (var level in levels)
+         level.QueueFree();
+      GetTree().ReloadCurrentScene();
+   }
+
    public void OnLevelClear()
    {
-      Players.ElementAt(0).CharactersLeftOnStage.AddRange(P1CharactersOut);
+      foreach (var player in Players)
-      if (Players.Count() == 2)
+      {
-         Players.ElementAt(1).CharactersLeftOnStage.AddRange(P2CharactersOut);
+         player.CharactersLeftOnStage.AddRange(player.CharactersExited);
+         player.CharactersExited.Clear();
+         player.CharacterIndex = 0;
+      }
 
-      P1CharactersOut.Clear();
+      var playerCharacters = GetTree().GetNodesInGroup("Player");
-      if (Players.Count() == 2)
+      foreach (var character in playerCharacters)
-         P2CharactersOut.Clear();
+         character.GetParent().RemoveChild(character);
-
-      Players.ElementAt(0)._characterIndex = 0;
-      if (Players.Count() == 2)
-         Players.ElementAt(1)._characterIndex = 0;
-
-      var players = GetTree().GetNodesInGroup("Player");
-      foreach (var player in players)
-         GetTree().Root.RemoveChild(player);
 
       var projectiles = GetTree().Root.GetChildren().OfType<Projectile>();
       foreach (var projectile in projectiles)
-         GetTree().Root.RemoveChild(projectile);
+         projectile.QueueFree();
 
       var main = GetTree().Root.GetNode<Main>("/root/Main");
       main.LoadNextLevel(_levelIndex++);

GameLogic/GameManager.tscn

@@ -1,9 +1,17 @@
-[gd_scene load_steps=5 format=3 uid="uid://cxj6yeddshy16"]
+[gd_scene load_steps=13 format=3 uid="uid://cxj6yeddshy16"]
 
 [ext_resource type="Script" path="res://GameLogic/GameManager.cs" id="1_ya2kt"]
 [ext_resource type="PackedScene" uid="uid://b57xus5rqasy8" path="res://Player/Base/Player2.tscn" id="3_y1wkr"]
 [ext_resource type="PackedScene" uid="uid://xcmspevaqcrc" path="res://Player/Base/Player1.tscn" id="4_3fl70"]
-[ext_resource type="PackedScene" uid="uid://dq1gtd55p04do" path="res://UI/StageGUI.tscn" id="4_xi0i5"]
+[ext_resource type="Script" path="res://UI/StageGUI.cs" id="4_8bo7m"]
+[ext_resource type="Script" path="res://UI/GameOverService.cs" id="5_3te1o"]
+[ext_resource type="Texture2D" uid="uid://d18xmfbg47qpi" path="res://Textures/Portraits/blank-background.png" id="5_ecqoa"]
+[ext_resource type="Script" path="res://UI/CharacterSelectUpdateService.cs" id="6_8tbm6"]
+[ext_resource type="Texture2D" uid="uid://dveeywi80ux2l" path="res://UI/Game_Over.jpg" id="6_hq16y"]
+[ext_resource type="Texture2D" uid="uid://c3eubpygfvc3l" path="res://Textures/Portraits/cap-bg-char.png" id="7_jroqd"]
+[ext_resource type="Texture2D" uid="uid://1pgw8he4k5va" path="res://Textures/Portraits/pisces-bg-char.png" id="8_pvs36"]
+[ext_resource type="Texture2D" uid="uid://bacwvejc4hcou" path="res://Textures/Portraits/sag-bg-char.png" id="9_1jise"]
+[ext_resource type="Texture2D" uid="uid://o7uu4efxf36e" path="res://Textures/Portraits/scorpio-bg-char.png" id="10_mqkvb"]
 
 [node name="GameManager" type="Node3D"]
 script = ExtResource("1_ya2kt")
@@ -12,13 +20,226 @@ PlayerScenes = Array[PackedScene]([ExtResource("4_3fl70"), ExtResource("3_y1wkr"
 [node name="Camera3D" type="Camera3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, -0.527878, 10.966, 6.61121)
 projection = 1
-current = true
 size = 10.8546
 
 [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, -0.504317, 0.863519, 0, -0.863519, -0.504317, 0, 19.9508, 0)
+visible = false
+shadow_enabled = true
+shadow_bias = 0.0
+shadow_normal_bias = 0.0
+directional_shadow_mode = 0
+sky_mode = 1
 
-[node name="StageGUI" parent="." instance=ExtResource("4_xi0i5")]
+[node name="DirectionalLight3D2" type="DirectionalLight3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 0.993572, 0.113203, 0, -0.113203, 0.993572, 0, 6.22805, 0)
+shadow_enabled = true
+shadow_bias = 0.0
+shadow_normal_bias = 0.0
+directional_shadow_mode = 0
+sky_mode = 1
+
+[node name="StageGUI" type="Control" parent="."]
+process_mode = 3
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("4_8bo7m")
+metadata/_edit_horizontal_guides_ = [-342.0]
+
+[node name="SidebarLeft" type="TextureRect" parent="StageGUI"]
+layout_mode = 1
+anchors_preset = 4
+anchor_top = 0.5
+anchor_bottom = 0.5
+offset_top = -540.0
+offset_right = 420.0
+offset_bottom = 540.0
+grow_vertical = 2
+texture = ExtResource("5_ecqoa")
+
+[node name="SidebarRight" type="TextureRect" parent="StageGUI"]
+layout_mode = 1
+anchors_preset = 6
+anchor_left = 1.0
+anchor_top = 0.5
+anchor_right = 1.0
+anchor_bottom = 0.5
+offset_left = -420.0
+offset_top = -540.0
+offset_bottom = 540.0
+grow_horizontal = 0
+grow_vertical = 2
+texture = ExtResource("5_ecqoa")
+
+[node name="CharacterSelect" type="Control" parent="StageGUI"]
+process_mode = 3
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("6_8tbm6")
+
+[node name="P1" type="Control" parent="StageGUI/CharacterSelect"]
+layout_mode = 1
+anchors_preset = 4
+anchor_top = 0.5
+anchor_bottom = 0.5
+offset_top = -20.0
+offset_right = 40.0
+offset_bottom = 20.0
+grow_vertical = 2
+
+[node name="CapBG" type="TextureRect" parent="StageGUI/CharacterSelect/P1"]
+visible = false
+layout_mode = 1
+anchors_preset = 4
+anchor_top = 0.5
+anchor_bottom = 0.5
+offset_top = -540.0
+offset_right = 420.0
+offset_bottom = 540.0
+grow_vertical = 2
+texture = ExtResource("7_jroqd")
+stretch_mode = 2
+
+[node name="PiscesBG" type="TextureRect" parent="StageGUI/CharacterSelect/P1"]
+visible = false
+layout_mode = 1
+anchors_preset = 4
+anchor_top = 0.5
+anchor_bottom = 0.5
+offset_top = -540.0
+offset_right = 420.0
+offset_bottom = 540.0
+grow_vertical = 2
+texture = ExtResource("8_pvs36")
+stretch_mode = 2
+
+[node name="SagBG" type="TextureRect" parent="StageGUI/CharacterSelect/P1"]
+visible = false
+layout_mode = 1
+anchors_preset = 4
+anchor_top = 0.5
+anchor_bottom = 0.5
+offset_top = -540.0
+offset_right = 420.0
+offset_bottom = 540.0
+grow_vertical = 2
+texture = ExtResource("9_1jise")
+stretch_mode = 2
+
+[node name="ScorpioBG" type="TextureRect" parent="StageGUI/CharacterSelect/P1"]
+visible = false
+layout_mode = 1
+anchors_preset = 4
+anchor_top = 0.5
+anchor_bottom = 0.5
+offset_top = -540.0
+offset_right = 420.0
+offset_bottom = 540.0
+grow_vertical = 2
+texture = ExtResource("10_mqkvb")
+stretch_mode = 2
+
+[node name="P2" type="Control" parent="StageGUI/CharacterSelect"]
+layout_mode = 1
+anchors_preset = 6
+anchor_left = 1.0
+anchor_top = 0.5
+anchor_right = 1.0
+anchor_bottom = 0.5
+offset_left = -40.0
+offset_top = -20.0
+offset_bottom = 20.0
+grow_horizontal = 0
+grow_vertical = 2
+
+[node name="CapBG" type="TextureRect" parent="StageGUI/CharacterSelect/P2"]
+visible = false
+layout_mode = 1
+anchors_preset = 6
+anchor_left = 1.0
+anchor_top = 0.5
+anchor_right = 1.0
+anchor_bottom = 0.5
+offset_left = -420.0
+offset_top = -540.0
+offset_bottom = 540.0
+grow_horizontal = 0
+grow_vertical = 2
+texture = ExtResource("7_jroqd")
+
+[node name="PiscesBG" type="TextureRect" parent="StageGUI/CharacterSelect/P2"]
+visible = false
+layout_mode = 1
+anchors_preset = 6
+anchor_left = 1.0
+anchor_top = 0.5
+anchor_right = 1.0
+anchor_bottom = 0.5
+offset_left = -420.0
+offset_top = -540.0
+offset_bottom = 540.0
+grow_horizontal = 0
+grow_vertical = 2
+texture = ExtResource("8_pvs36")
+
+[node name="SagBG" type="TextureRect" parent="StageGUI/CharacterSelect/P2"]
+visible = false
+layout_mode = 1
+anchors_preset = 6
+anchor_left = 1.0
+anchor_top = 0.5
+anchor_right = 1.0
+anchor_bottom = 0.5
+offset_left = -420.0
+offset_top = -540.0
+offset_bottom = 540.0
+grow_horizontal = 0
+grow_vertical = 2
+texture = ExtResource("9_1jise")
+
+[node name="ScorpioBG" type="TextureRect" parent="StageGUI/CharacterSelect/P2"]
+visible = false
+layout_mode = 1
+anchors_preset = 6
+anchor_left = 1.0
+anchor_top = 0.5
+anchor_right = 1.0
+anchor_bottom = 0.5
+offset_left = -420.0
+offset_top = -540.0
+offset_bottom = 540.0
+grow_horizontal = 0
+grow_vertical = 2
+texture = ExtResource("10_mqkvb")
+
+[node name="GameOver" type="Control" parent="."]
+visible = false
+layout_mode = 3
+anchors_preset = 0
+offset_right = 40.0
+offset_bottom = 40.0
+script = ExtResource("5_3te1o")
+
+[node name="GameOverScreen" type="TextureRect" parent="GameOver"]
+layout_mode = 0
+offset_right = 40.0
+offset_bottom = 40.0
+texture = ExtResource("6_hq16y")
 
 [connection signal="ReselectCharacter" from="." to="StageGUI" method="OnCharacterSelect"]
+[connection signal="CapricornSelected" from="StageGUI" to="StageGUI/CharacterSelect" method="OnCapricornSelected"]
 [connection signal="OnCharacterSelectionMade" from="StageGUI" to="." method="OnCharacterSelected"]
+[connection signal="OnGameOver" from="StageGUI" to="GameOver" method="OnGameOver"]
+[connection signal="OnPlayerGameOver" from="StageGUI" to="StageGUI/CharacterSelect" method="OnPlayerGameOver"]
+[connection signal="PiscesSelected" from="StageGUI" to="StageGUI/CharacterSelect" method="OnPiscesSelected"]
+[connection signal="SagittariusSelected" from="StageGUI" to="StageGUI/CharacterSelect" method="OnSagittariusSelected"]
+[connection signal="ScorpioSelected" from="StageGUI" to="StageGUI/CharacterSelect" method="OnScorpioSelected"]
+[connection signal="ReloadGame" from="GameOver" to="." method="ReloadGameScene"]

GameLogic/Main.tscn

@@ -1,21 +1,13 @@
-[gd_scene load_steps=13 format=3 uid="uid://vwrw05ob2caq"]
+[gd_scene load_steps=5 format=3 uid="uid://vwrw05ob2caq"]
 
 [ext_resource type="Script" path="res://GameLogic/Main.cs" id="1_g4hua"]
-[ext_resource type="PackedScene" uid="uid://dqv03pua4j8ga" path="res://Levels/Scenes/Level1.tscn" id="2_8xl51"]
 [ext_resource type="PackedScene" uid="uid://b12gq4yqc3d8i" path="res://UI/MainMenu.tscn" id="2_kvovw"]
-[ext_resource type="PackedScene" uid="uid://basequfmpg04f" path="res://Levels/Scenes/Level2.tscn" id="3_t7swd"]
 [ext_resource type="PackedScene" uid="uid://btl5fdyjewnwc" path="res://Levels/Scenes/Level3.tscn" id="4_bs7wi"]
-[ext_resource type="PackedScene" uid="uid://ctvkevnc0wxka" path="res://Levels/Scenes/Level4.tscn" id="5_n8o1o"]
-[ext_resource type="PackedScene" uid="uid://col60npvg7wr1" path="res://Levels/Scenes/Level6.tscn" id="6_pqdlv"]
-[ext_resource type="PackedScene" uid="uid://8ukphol1isp2" path="res://Levels/Scenes/Level5.tscn" id="7_8fpis"]
-[ext_resource type="PackedScene" uid="uid://bsq7edeueqyjg" path="res://Levels/Scenes/Level7.tscn" id="8_mi3pb"]
-[ext_resource type="PackedScene" uid="uid://c4xcka4ekuur8" path="res://Levels/Scenes/Level8.tscn" id="9_1ajc1"]
-[ext_resource type="PackedScene" uid="uid://djwln4at4ho44" path="res://Levels/Scenes/Level9.tscn" id="11_hkjaq"]
 [ext_resource type="PackedScene" uid="uid://cxj6yeddshy16" path="res://GameLogic/GameManager.tscn" id="11_wiyvp"]
 
 [node name="Main" type="Node3D"]
 script = ExtResource("1_g4hua")
-Levels = Array[PackedScene]([ExtResource("2_8xl51"), ExtResource("3_t7swd"), ExtResource("4_bs7wi"), ExtResource("5_n8o1o"), ExtResource("6_pqdlv"), ExtResource("7_8fpis"), ExtResource("8_mi3pb"), ExtResource("9_1ajc1"), ExtResource("11_hkjaq"), ExtResource("11_hkjaq")])
+Levels = Array[PackedScene]([ExtResource("4_bs7wi")])
 GameManager = ExtResource("11_wiyvp")
 
 [node name="MainMenu" parent="." instance=ExtResource("2_kvovw")]

Levels/DoorShader.tres

@@ -0,0 +1,8 @@
+[gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://blksoavfhtf06"]
+
+[ext_resource type="Shader" path="res://Levels/Scenes/Door.gdshader" id="1_by6f6"]
+
+[resource]
+render_priority = 1
+shader = ExtResource("1_by6f6")
+shader_parameter/albedo = null

Levels/ExitPortal.tscn

@@ -94,7 +94,6 @@ radius = 1.79103
 
 [node name="Exit Portal" instance=ExtResource("1_jebs8")]
 transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0)
-script = ExtResource("2_4y188")
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="." index="3"]
 autoplay = "Spin"
@@ -103,10 +102,12 @@ libraries = {
 }
 
 [node name="Area3D" type="Area3D" parent="." index="4"]
-disable_mode = 2
+collision_layer = 8
+collision_mask = 8
+script = ExtResource("2_4y188")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D" index="0"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.11619)
 shape = SubResource("CylinderShape3D_v7qe0")
 
-[connection signal="body_entered" from="Area3D" to="." method="OnExitEntered"]
+[connection signal="body_entered" from="Area3D" to="Area3D" method="OnExitEntered"]

Levels/Models/Stage2/stage_2Collisions.tscn

@@ -12,11 +12,20 @@ backface_collision = true
 
 [node name="STAGE 2" instance=ExtResource("1_4808a")]
 
+[node name="Plane" parent="." index="0"]
+cast_shadow = 0
+
+[node name="Cube" parent="." index="1"]
+cast_shadow = 0
+
 [node name="StaticBody3D" type="StaticBody3D" parent="Cube" index="0"]
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="Cube/StaticBody3D" index="0"]
 shape = SubResource("ConcavePolygonShape3D_sdbt6")
 
+[node name="Cube002" parent="." index="2"]
+cast_shadow = 0
+
 [node name="StaticBody3D" type="StaticBody3D" parent="Cube002" index="0"]
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="Cube002/StaticBody3D" index="0"]

Levels/Models/Stage3/Stage3.tscn

@@ -302,11 +302,13 @@ disabled = true
 
 [node name="Plane" type="MeshInstance3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0715971, 0)
+cast_shadow = 0
 mesh = SubResource("ArrayMesh_54w4i")
 skeleton = NodePath("")
 
 [node name="Cube" type="MeshInstance3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 0.537041, -2.80098, 0.0936406, 0.666337)
+cast_shadow = 0
 mesh = SubResource("ArrayMesh_ae5pk")
 skeleton = NodePath("")
 
@@ -317,6 +319,7 @@ shape = SubResource("ConcavePolygonShape3D_qdpti")
 
 [node name="Cube001" type="MeshInstance3D" parent="."]
 transform = Transform3D(-1, 0, 0, 0, 1, 0, 0, 0, 0.537041, 1.75914, 0.0849344, 0.673152)
+cast_shadow = 0
 mesh = SubResource("ArrayMesh_6dg1r")
 skeleton = NodePath("")
 
@@ -327,6 +330,7 @@ shape = SubResource("ConcavePolygonShape3D_cctvu")
 
 [node name="Plane001" type="MeshInstance3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.370022, 0)
+cast_shadow = 0
 mesh = SubResource("ArrayMesh_jwojp")
 skeleton = NodePath("")
 

Levels/Models/Stage4/STAGE 4_Layer 10.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://drut43wq4drhb"
+uid="uid://dfmgox3hesp42"
 path.s3tc="res://.godot/imported/STAGE 4_Layer 10.png-fcf2d32eb97c1eebbb56728a8e2fdef0.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],

Levels/Models/Stage4/STAGE 4_Layer 12.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://1d1fd1bvrhwc"
+uid="uid://pxmnxhmtt5o1"
 path.s3tc="res://.godot/imported/STAGE 4_Layer 12.png-85ac93d94123c8a2bc61410d6e5cc773.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],

Levels/Models/Stage4/STAGE 4_Layer 14.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://ctl432gtbvh30"
+uid="uid://d02eq0l8to2wj"
 path.s3tc="res://.godot/imported/STAGE 4_Layer 14.png-d174a74c5b3073fa73a7be6e30c1c0b8.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],

Levels/Models/Stage4/STAGE 4_Layer 16.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://bddw54eylw7j6"
+uid="uid://bdd2rf4peaisg"
 path.s3tc="res://.godot/imported/STAGE 4_Layer 16.png-3906fdb70e5c3a2af37e1f4a673738cc.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],

Levels/Models/Stage4/STAGE 4_Layer 17.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://b02ce3uctmo37"
+uid="uid://btmdurs0ikn8"
 path.s3tc="res://.godot/imported/STAGE 4_Layer 17.png-d69de310b47cd17cee9c115e72bcc084.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],

Levels/Models/Stage4/STAGE 4_Layer 18.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://c26udapr2muyf"
+uid="uid://ntx22gjosp7k"
 path.s3tc="res://.godot/imported/STAGE 4_Layer 18.png-693d66233f3e8d19252f7f56dfd4116d.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],

Levels/Models/Stage4/STAGE 4_Layer 19.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://b03lux2re8t4b"
+uid="uid://dv1pgckeq4iuk"
 path.s3tc="res://.godot/imported/STAGE 4_Layer 19.png-5b43e2fd3acbccf79f7fba57b8bc292a.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],

Levels/Models/Stage4/STAGE 4_Layer 2.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://e0n5ob5rh843"
+uid="uid://doftuukn3ynhl"
 path.s3tc="res://.godot/imported/STAGE 4_Layer 2.png-9b3f578822b5de25bde26a967eca8823.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],

Levels/Models/Stage4/STAGE 4_Layer 3.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://co3ld2fio5w5g"
+uid="uid://5n7env7c24cr"
 path.s3tc="res://.godot/imported/STAGE 4_Layer 3.png-bc14b1003c880ebf576026fda0840537.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],

Levels/Models/Stage4/STAGE 4_Layer 4.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://dtvu7jfeq774w"
+uid="uid://50vabqq7favp"
 path.s3tc="res://.godot/imported/STAGE 4_Layer 4.png-7bb18f60a07205cec614659acc890009.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],

Levels/Models/Stage4/STAGE 4_Layer 6.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://ci11mgqkh485r"
+uid="uid://cx38fehvmvhm5"
 path.s3tc="res://.godot/imported/STAGE 4_Layer 6.png-154fc394484be8ce6faf2e42f81b0a6d.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],

Levels/Models/Stage4/STAGE 4_Layer 7.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://druqhfjfng42d"
+uid="uid://cs6qqvllb4bpw"
 path.s3tc="res://.godot/imported/STAGE 4_Layer 7.png-889d36f585aed64049d49c40427d1d64.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],

Levels/Models/Stage4/STAGE 4_hakkero.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://lhbmpatcp45n"
+uid="uid://c2uop8t70xt1r"
 path.s3tc="res://.godot/imported/STAGE 4_hakkero.png-cc746b7dfd050dc5733055a2ad6d2479.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],

Levels/Models/Stage4/STAGE 4_horsehad.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://b1swgex027qlb"
+uid="uid://dno4guqdlja4e"
 path.s3tc="res://.godot/imported/STAGE 4_horsehad.png-a6f88fbbc663646b898087f177f991af.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],

Levels/Models/Stage4/STAGE 4_ohxhead.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://dpjd2ieex6evv"
+uid="uid://dnvdbe5ujicpb"
 path.s3tc="res://.godot/imported/STAGE 4_ohxhead.png-a740d7df88e7cb6b637f9353842bb3c4.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],

Levels/Scenes/Door.gdshader

@@ -0,0 +1,8 @@
+shader_type spatial;
+
+uniform vec3 albedo : source_color;
+varying float setAlpha;
+void fragment() {
+  ALBEDO = albedo;
+  ALPHA = setAlpha;
+}

Levels/Scenes/Level1.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=7 format=3 uid="uid://dqv03pua4j8ga"]
+[gd_scene load_steps=11 format=3 uid="uid://dqv03pua4j8ga"]
 
 [ext_resource type="Script" path="res://Levels/Scripts/Level.cs" id="1_k32xj"]
 [ext_resource type="PackedScene" uid="uid://dahp73fwld24h" path="res://Enemies/RangedEnemy.tscn" id="2_fyxib"]
@@ -9,8 +9,21 @@
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_kv6vl"]
 radius = 0.957319
 
+[sub_resource type="BoxShape3D" id="BoxShape3D_hxepo"]
+size = Vector3(5, 20, 27.822)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_a01sw"]
+size = Vector3(5, 20, 27.822)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_vtgsw"]
+size = Vector3(5, 20, 27.822)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_hcwif"]
+size = Vector3(5, 20, 27.822)
+
 [node name="Level1" type="Node3D" groups=["Level"]]
 process_mode = 3
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.158514, 0)
 script = ExtResource("1_k32xj")
 
 [node name="Area3D2" type="Area3D" parent="." groups=["Level"]]
@@ -60,4 +73,27 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.08228, 0, -0.694794)
 [node name="RangedEnemy6" parent="Enemies" instance=ExtResource("2_fyxib")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.78224, 0, -0.525299)
 
-[connection signal="body_entered" from="Area3D2" to="." method="OnExitEntered"]
+[node name="Camera3D3" type="Camera3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, -0.527878, 10.966, 6.61121)
+projection = 1
+size = 10.8546
+
+[node name="StaticBody3D" type="StaticBody3D" parent="."]
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.52066, 2.71587, 0)
+shape = SubResource("BoxShape3D_hxepo")
+
+[node name="CollisionShape3D2" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.4847, 0, 0)
+shape = SubResource("BoxShape3D_a01sw")
+
+[node name="CollisionShape3D3" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 2.43488, -8.0292)
+shape = SubResource("BoxShape3D_vtgsw")
+
+[node name="CollisionShape3D4" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 8.54801)
+shape = SubResource("BoxShape3D_hcwif")
+
+[connection signal="body_entered" from="Area3D2" to="Area3D2/Exit Portal" method="OnExitEntered"]

Levels/Scenes/Level10.tscn

@@ -1,15 +1,27 @@
-[gd_scene load_steps=8 format=3 uid="uid://0hdnmilwrsq6"]
+[gd_scene load_steps=12 format=3 uid="uid://0hdnmilwrsq6"]
 
 [ext_resource type="Script" path="res://Levels/Scripts/FinalLevel.cs" id="1_sy7dk"]
 [ext_resource type="Script" path="res://Enemies/HealthbarProgress.cs" id="2_53ar2"]
 [ext_resource type="PackedScene" uid="uid://brbshysbgd47q" path="res://Enemies/GodCircuit.tscn" id="4_vmhpd"]
-[ext_resource type="Texture2D" uid="uid://ccnmmyvs53gni" path="res://Textures/GUI/Style_1.png" id="5_jjg8p"]
+[ext_resource type="Texture2D" uid="uid://ccnmmyvs53gni" path="res://Textures/Style_1.png" id="5_jjg8p"]
 [ext_resource type="PackedScene" uid="uid://b0chkusc2bo2v" path="res://Levels/Models/Stage10/AnimatedFinal.tscn" id="6_8beqh"]
 [ext_resource type="PackedScene" uid="uid://b1j0g6ikmnibm" path="res://Enemies/HPComponent.tscn" id="7_nvq88"]
 
 [sub_resource type="LabelSettings" id="LabelSettings_cs88m"]
 font_color = Color(0, 0, 0, 1)
 
+[sub_resource type="BoxShape3D" id="BoxShape3D_43mih"]
+size = Vector3(5, 20, 27.822)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_ch2gq"]
+size = Vector3(5, 20, 27.822)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_hf7lb"]
+size = Vector3(5, 20, 27.822)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_myhef"]
+size = Vector3(5, 20, 27.822)
+
 [node name="Level10" type="Node3D" groups=["Level"]]
 process_mode = 3
 script = ExtResource("1_sy7dk")
@@ -61,3 +73,21 @@ label_settings = SubResource("LabelSettings_cs88m")
 [node name="HP Component" parent="God Circuit" node_paths=PackedStringArray("_healthBar") instance=ExtResource("7_nvq88")]
 MaximumHP = 10000000
 _healthBar = NodePath("../../FinalBossGUI/TextureProgressBar")
+
+[node name="StaticBody3D" type="StaticBody3D" parent="."]
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.52066, 2.71587, 0)
+shape = SubResource("BoxShape3D_43mih")
+
+[node name="CollisionShape3D2" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.39414, 0, 0)
+shape = SubResource("BoxShape3D_ch2gq")
+
+[node name="CollisionShape3D3" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 2.43488, -8.5122)
+shape = SubResource("BoxShape3D_hf7lb")
+
+[node name="CollisionShape3D4" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 9.03101)
+shape = SubResource("BoxShape3D_myhef")

Levels/Scenes/Level2.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=7 format=3 uid="uid://basequfmpg04f"]
+[gd_scene load_steps=11 format=3 uid="uid://basequfmpg04f"]
 
 [ext_resource type="Script" path="res://Levels/Scripts/Level.cs" id="1_rkcp4"]
 [ext_resource type="PackedScene" uid="uid://dvhuxo7h0opvm" path="res://Levels/Models/Stage2/stage_2Collisions.tscn" id="2_gsn0b"]
@@ -9,6 +9,18 @@
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_tux5n"]
 radius = 0.957319
 
+[sub_resource type="BoxShape3D" id="BoxShape3D_pdbhu"]
+size = Vector3(5, 20, 27.822)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_krx21"]
+size = Vector3(5, 20, 27.822)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_xkc5v"]
+size = Vector3(5, 20, 27.822)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_xtojv"]
+size = Vector3(5, 20, 27.822)
+
 [node name="Level2" type="Node3D" groups=["Level"]]
 process_mode = 3
 script = ExtResource("1_rkcp4")
@@ -20,55 +32,68 @@ collision_layer = 0
 collision_mask = 16
 
 [node name="Exit Portal" parent="Area3D2" instance=ExtResource("2_sq8bv")]
-transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, -0.0428823, 0, 3.24448)
+transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, -0.0428823, 0, 3.24448)
-_levelIndex = 1
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D2"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -2.51823)
 shape = SubResource("CylinderShape3D_tux5n")
 
-[node name="Collisions" type="Node3D" parent="."]
-
-[node name="StaticBody3D" type="StaticBody3D" parent="Collisions"]
-
 [node name="STAGE 2" parent="." instance=ExtResource("2_gsn0b")]
 
 [node name="Enemies" type="Node3D" parent="."]
 
 [node name="RangedEnemy" parent="Enemies" instance=ExtResource("3_hfsy3")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.3199, 0.732413, -5.12032)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.3199, 0.25446, -5.12032)
 
 [node name="RangedEnemy2" parent="Enemies" instance=ExtResource("3_hfsy3")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.35919, 0.732413, -3.66653)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.35919, 0.25446, -3.66653)
 
 [node name="RangedEnemy3" parent="Enemies" instance=ExtResource("3_hfsy3")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.333, 0.732413, -1.64955)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.333, 0.25446, -1.64955)
 
 [node name="RangedEnemy4" parent="Enemies" instance=ExtResource("3_hfsy3")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.47707, 0.732413, 0.275753)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.47707, 0.25446, 0.275753)
 
 [node name="RangedEnemy5" parent="Enemies" instance=ExtResource("3_hfsy3")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.49938, 0, 0.0400016)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.49938, -0.477953, 0.0400016)
 
 [node name="RangedEnemy6" parent="Enemies" instance=ExtResource("3_hfsy3")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.11107, 0, -0.798224)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.11107, -0.486121, -0.798224)
 
 [node name="MeleeEnemyOrb" parent="Enemies" instance=ExtResource("4_3lkwt")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.34221, 0, -2.23892)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.34221, -0.75971, -2.23892)
 
 [node name="MeleeEnemyOrb2" parent="Enemies" instance=ExtResource("4_3lkwt")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.967, 0, -2.26512)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.967, -0.75971, -2.26512)
 
 [node name="MeleeEnemyOrb3" parent="Enemies" instance=ExtResource("4_3lkwt")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.27673, 0, -3.50936)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.27673, -0.75971, -3.50936)
 
 [node name="MeleeEnemyOrb4" parent="Enemies" instance=ExtResource("4_3lkwt")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.00629, 0, -3.50936)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.00629, -0.75971, -3.50936)
 
 [node name="RangedEnemy7" parent="Enemies" instance=ExtResource("3_hfsy3")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.12321, 0, -1.78045)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.12321, -0.521506, -1.78045)
 
 [node name="RangedEnemy8" parent="Enemies" instance=ExtResource("3_hfsy3")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.2018, 0, -0.0385171)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.2018, -0.521506, -0.0385171)
+
+[node name="StaticBody3D" type="StaticBody3D" parent="."]
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.52066, 2.71587, 0)
+shape = SubResource("BoxShape3D_pdbhu")
+
+[node name="CollisionShape3D2" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.39414, 0, 0)
+shape = SubResource("BoxShape3D_krx21")
+
+[node name="CollisionShape3D3" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 2.43488, -8.5122)
+shape = SubResource("BoxShape3D_xkc5v")
+
+[node name="CollisionShape3D4" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 9.03101)
+shape = SubResource("BoxShape3D_xtojv")
 
 [connection signal="body_entered" from="Area3D2" to="." method="OnExitEntered"]

Levels/Scenes/Level5.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=4 format=3 uid="uid://8ukphol1isp2"]
+[gd_scene load_steps=8 format=3 uid="uid://8ukphol1isp2"]
 
 [ext_resource type="PackedScene" uid="uid://jgf7k1r35km1" path="res://Levels/ExitPortal.tscn" id="3_0wdh0"]
 [ext_resource type="PackedScene" uid="uid://dldy6w23fyr5t" path="res://Levels/Models/Stage6/Stage6.tscn" id="3_ajkvk"]
@@ -6,6 +6,18 @@
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_wu0in"]
 radius = 0.957319
 
+[sub_resource type="BoxShape3D" id="BoxShape3D_ismub"]
+size = Vector3(5, 20, 27.822)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_f5ly1"]
+size = Vector3(5, 20, 27.822)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_ovwgx"]
+size = Vector3(5, 20, 27.822)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_1rqjd"]
+size = Vector3(5, 20, 27.822)
+
 [node name="Level6" type="Node3D" groups=["Level"]]
 process_mode = 3
 
@@ -17,7 +29,6 @@ collision_mask = 16
 
 [node name="Exit Portal" parent="Area3D2" instance=ExtResource("3_0wdh0")]
 transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, 0, -2.53252)
-_levelIndex = 5
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D2"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.07326, -2.51823)
@@ -25,4 +36,22 @@ shape = SubResource("CylinderShape3D_wu0in")
 
 [node name="STAGE 6" parent="." instance=ExtResource("3_ajkvk")]
 
+[node name="StaticBody3D" type="StaticBody3D" parent="."]
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.52066, 2.71587, 0)
+shape = SubResource("BoxShape3D_ismub")
+
+[node name="CollisionShape3D2" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.39414, 0, 0)
+shape = SubResource("BoxShape3D_f5ly1")
+
+[node name="CollisionShape3D3" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 2.43488, -8.5122)
+shape = SubResource("BoxShape3D_ovwgx")
+
+[node name="CollisionShape3D4" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 9.03101)
+shape = SubResource("BoxShape3D_1rqjd")
+
 [connection signal="body_entered" from="Area3D2" to="." method="OnExitEntered"]

Levels/Scenes/Level6.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=5 format=3 uid="uid://col60npvg7wr1"]
+[gd_scene load_steps=9 format=3 uid="uid://col60npvg7wr1"]
 
 [ext_resource type="Script" path="res://Levels/Scripts/Level.cs" id="1_o0w6s"]
 [ext_resource type="PackedScene" uid="uid://jgf7k1r35km1" path="res://Levels/ExitPortal.tscn" id="3_ehcts"]
@@ -7,6 +7,18 @@
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_a8pxa"]
 radius = 0.957319
 
+[sub_resource type="BoxShape3D" id="BoxShape3D_lhf45"]
+size = Vector3(5, 20, 27.822)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_g5uqx"]
+size = Vector3(5, 20, 27.822)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_7mryj"]
+size = Vector3(5, 20, 27.822)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_2edgb"]
+size = Vector3(5, 20, 27.822)
+
 [node name="Level5" type="Node3D" groups=["Level"]]
 process_mode = 3
 script = ExtResource("1_o0w6s")
@@ -19,7 +31,6 @@ collision_mask = 16
 
 [node name="Exit Portal" parent="Area3D2" instance=ExtResource("3_ehcts")]
 transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, 0, -2.53252)
-_levelIndex = 4
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D2"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.02346, -2.51823)
@@ -27,4 +38,22 @@ shape = SubResource("CylinderShape3D_a8pxa")
 
 [node name="STAGE 5" parent="." instance=ExtResource("3_yun3r")]
 
+[node name="StaticBody3D" type="StaticBody3D" parent="."]
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.52066, 2.71587, 0)
+shape = SubResource("BoxShape3D_lhf45")
+
+[node name="CollisionShape3D2" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.39414, 0, 0)
+shape = SubResource("BoxShape3D_g5uqx")
+
+[node name="CollisionShape3D3" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 2.43488, -8.5122)
+shape = SubResource("BoxShape3D_7mryj")
+
+[node name="CollisionShape3D4" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 9.03101)
+shape = SubResource("BoxShape3D_2edgb")
+
 [connection signal="body_entered" from="Area3D2" to="." method="OnExitEntered"]

Levels/Scenes/Level7.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=4 format=3 uid="uid://bsq7edeueqyjg"]
+[gd_scene load_steps=8 format=3 uid="uid://bsq7edeueqyjg"]
 
 [ext_resource type="PackedScene" uid="uid://bgf5byqt71kir" path="res://Levels/Models/Stage7/Stage7.tscn" id="2_21i6n"]
 [ext_resource type="PackedScene" uid="uid://jgf7k1r35km1" path="res://Levels/ExitPortal.tscn" id="3_sjnhq"]
@@ -6,6 +6,18 @@
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_a56hv"]
 radius = 0.957319
 
+[sub_resource type="BoxShape3D" id="BoxShape3D_ny8q1"]
+size = Vector3(5, 20, 27.822)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_3bvlx"]
+size = Vector3(5, 20, 27.822)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_xgagj"]
+size = Vector3(5, 20, 27.822)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_cxjq3"]
+size = Vector3(5, 20, 27.822)
+
 [node name="Level7" type="Node3D" groups=["Level"]]
 process_mode = 3
 
@@ -17,7 +29,6 @@ collision_mask = 16
 
 [node name="Exit Portal" parent="Area3D2" instance=ExtResource("3_sjnhq")]
 transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, 0.0799288, -1.92508)
-_levelIndex = 6
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D2"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.11323, -2.51823)
@@ -32,4 +43,22 @@ projection = 1
 current = true
 size = 10.8546
 
+[node name="StaticBody3D" type="StaticBody3D" parent="."]
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.80235, 2.71587, 0)
+shape = SubResource("BoxShape3D_ny8q1")
+
+[node name="CollisionShape3D2" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.61603, 0, 0)
+shape = SubResource("BoxShape3D_3bvlx")
+
+[node name="CollisionShape3D3" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 2.43488, -8.7119)
+shape = SubResource("BoxShape3D_xgagj")
+
+[node name="CollisionShape3D4" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 9.24233)
+shape = SubResource("BoxShape3D_cxjq3")
+
 [connection signal="body_entered" from="Area3D2" to="." method="OnExitEntered"]

Levels/Scenes/Level8.tscn

@@ -1,13 +1,25 @@
-[gd_scene load_steps=5 format=3 uid="uid://c4xcka4ekuur8"]
+[gd_scene load_steps=9 format=3 uid="uid://c4xcka4ekuur8"]
 
 [ext_resource type="PackedScene" uid="uid://b6ciyf30f07ll" path="res://Levels/Models/Stage8/STAGE 8.glb" id="2_wcvbl"]
-[ext_resource type="PackedScene" uid="uid://jgf7k1r35km1" path="res://Scenes/ExitPortal.tscn" id="3_44edv"]
+[ext_resource type="PackedScene" uid="uid://jgf7k1r35km1" path="res://Levels/ExitPortal.tscn" id="3_44edv"]
 
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_3ne7n"]
 radius = 0.957319
 
 [sub_resource type="SpriteFrames" id="SpriteFrames_16emx"]
 
+[sub_resource type="BoxShape3D" id="BoxShape3D_3n0wx"]
+size = Vector3(5, 20, 27.822)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_bimq8"]
+size = Vector3(5, 20, 27.822)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_gb7u1"]
+size = Vector3(5, 20, 27.822)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_yia8d"]
+size = Vector3(5, 20, 27.822)
+
 [node name="Level8" type="Node3D" groups=["Level"]]
 process_mode = 3
 
@@ -29,4 +41,22 @@ sprite_frames = SubResource("SpriteFrames_16emx")
 
 [node name="STAGE 8" parent="." instance=ExtResource("2_wcvbl")]
 
+[node name="StaticBody3D" type="StaticBody3D" parent="."]
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.52066, 2.71587, 0)
+shape = SubResource("BoxShape3D_3n0wx")
+
+[node name="CollisionShape3D2" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.39414, 0, 0)
+shape = SubResource("BoxShape3D_bimq8")
+
+[node name="CollisionShape3D3" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 2.43488, -8.5122)
+shape = SubResource("BoxShape3D_gb7u1")
+
+[node name="CollisionShape3D4" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 9.03101)
+shape = SubResource("BoxShape3D_yia8d")
+
 [connection signal="body_entered" from="Area3D2" to="." method="OnExitEntered"]

Levels/Scenes/Level9.tscn

@@ -1,7 +1,37 @@
-[gd_scene load_steps=2 format=3 uid="uid://djwln4at4ho44"]
+[gd_scene load_steps=6 format=3 uid="uid://djwln4at4ho44"]
 
 [ext_resource type="PackedScene" uid="uid://bjnnv5oblx6wh" path="res://Levels/Models/Stage9/STAGE 9.gltf" id="1_ami18"]
 
+[sub_resource type="BoxShape3D" id="BoxShape3D_bbrhu"]
+size = Vector3(5, 20, 27.822)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_8ppap"]
+size = Vector3(5, 20, 27.822)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_kcyjt"]
+size = Vector3(5, 20, 27.822)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_b1svp"]
+size = Vector3(5, 20, 27.822)
+
 [node name="Stage9" type="Node3D"]
 
 [node name="STAGE 9" parent="." instance=ExtResource("1_ami18")]
+
+[node name="StaticBody3D" type="StaticBody3D" parent="."]
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.52066, 2.71587, 0)
+shape = SubResource("BoxShape3D_bbrhu")
+
+[node name="CollisionShape3D2" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.39414, 0, 0)
+shape = SubResource("BoxShape3D_8ppap")
+
+[node name="CollisionShape3D3" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 2.43488, -8.5122)
+shape = SubResource("BoxShape3D_kcyjt")
+
+[node name="CollisionShape3D4" type="CollisionShape3D" parent="StaticBody3D"]
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 9.03101)
+shape = SubResource("BoxShape3D_b1svp")

Levels/Scripts/AreaExit.cs

@@ -16,14 +16,17 @@ public partial class AreaExit : Node3D
 
    private void OnExitEntered(Node3D node)
    {
-      if (node is Controls)
+      Character incoming = null;
-      {
+      if (node is Character nodeCharacter)
-         if (node.GetType() == typeof(P1Controls) || node.GetType() == typeof(CapricornP1Controls))
+         incoming = nodeCharacter;
-            _gameManager.RemoveCharacterAndAddToExit((P1Controls)node);
+      else if (node.GetParent().GetParent() is Character parentedNode)
-         if (node.GetType() == typeof(P2Controls) || node.GetType() == typeof(CapricornP2Controls))
+         incoming = parentedNode;
-            _gameManager.RemoveCharacterAndAddToExit((P2Controls)node);
 
-         GD.Print("Exit reached");
+      if (incoming != null)
+      {
+         _gameManager.RemoveCharacterAndAddToExit(incoming.OwnerPlayer);
+
+         GD.Print($"Exit reached by {incoming.Name}");
 
          if (!_gameManager.Players.Any(x => x.CharactersLeftOnStage.Any()))
             _gameManager.OnLevelClear();

Levels/Scripts/Level.cs

@@ -7,7 +7,7 @@ public partial class Level : Node3D
    private List<BasicEnemy> _enemies;
    private GameManager _gameManager;
 
-   public override void _Ready()
+   public override void _EnterTree()
    {
       _gameManager = GetTree().Root.GetNode<GameManager>("Main/GameManager");
       _enemies = GetNode("Enemies").GetChildren().OfType<BasicEnemy>().ToList();

Levels/Scripts/Level3.cs

@@ -2,7 +2,11 @@ using Godot;
 
 public partial class Level3 : Level
 {
-	private int _numberOfHits = 3;
+	[Export]
+	public AnimationPlayer AnimationPlayer { get; set; }
+	[Export]
+	private int _numberOfHits = 10;
+
 	private MeshInstance3D _door;
 
 	public override void _Ready()
@@ -15,7 +19,9 @@ public partial class Level3 : Level
 	{
 		_numberOfHits--;
 		GD.Print(_numberOfHits);
-		if (_numberOfHits == 0)
+		AnimationPlayer.Play("HitFlash");
+
+      if (_numberOfHits == 0)
 		{
 			_door.QueueFree();
       }

Player/Base/Character.cs

@@ -1,25 +1,32 @@
-using Godot;
+using Godot;
 
-public partial class P1Controls : Controls
+public partial class Character : CharacterBody3D
 {
    [Export]
-   private PackedScene _fireProjectile;
+   protected PackedScene _fireProjectile;
    [Export]
-   private PackedScene _altFireProjectile;
+   protected PackedScene _altFireProjectile;
+
+   public Player OwnerPlayer;
 
    [Export]
-   private float _speed = 3.0f;
+   protected float _speed = 3.0f;
 
    public bool CanShoot { get; protected set; }
 
-   private GameManager _gameManager;
+   protected GameManager _gameManager;
 
-   public override void _Ready()
+   public override void _EnterTree()
    {
       CanShoot = true;
       _gameManager = GetTree().Root.GetNode<GameManager>("Main/GameManager");
    }
 
+   public void Initialize(Player ownerPlayer)
+   {
+      OwnerPlayer = ownerPlayer;
+   }
+
    public override void _PhysicsProcess(double delta)
    {
       Velocity = CalculateCharacterMovement(delta);
@@ -31,9 +38,9 @@ public partial class P1Controls : Controls
       if (Input.IsActionJustPressed("exit"))
          GetTree().Quit();
 
-      if (Input.IsActionJustPressed($"p1_fire") && CanShoot)
+      if (Input.IsActionJustPressed(OwnerPlayer.PlayerInput.Fire()) && CanShoot)
          Fire();
-      if (Input.IsActionJustPressed($"p1_altfire") && CanShoot)
+      if (Input.IsActionJustPressed(OwnerPlayer.PlayerInput.AltFire()) && CanShoot)
          AltFire();
    }
 
@@ -41,8 +48,9 @@ public partial class P1Controls : Controls
    {
       var velocity = Velocity;
 
-      var inputDir = Input.GetVector($"p1_left", $"p1_right", $"p1_up", $"p1_down");
+      var inputDir = Input.GetVector(OwnerPlayer.PlayerInput.Left(), OwnerPlayer.PlayerInput.Right(), OwnerPlayer.PlayerInput.Up(), OwnerPlayer.PlayerInput.Down());
       var direction = (Transform.Basis * new Vector3(inputDir.X, 0, inputDir.Y)).Normalized();
+      direction = new Vector3(direction.X, 0, direction.Z);
       if (direction != Vector3.Zero)
       {
          velocity.X = direction.X * _speed;
@@ -81,7 +89,8 @@ public partial class P1Controls : Controls
 
    public void OnHit(Node3D node)
    {
+      GD.Print($"Hit by {node.Name}");
       if (this != null)
-         _gameManager.CallDeferred(GameManager.MethodName.RemoveCharacter, this);
+         _gameManager.CallDeferred(GameManager.MethodName.RemoveCharacter, OwnerPlayer);
    }
 }

Player/Base/Controls.cs

@@ -1,11 +0,0 @@
-using Godot;
-
-public partial class Controls : CharacterBody3D
-{
-   private GameManager _gameManager;
-
-   public override void _Ready()
-   {
-      _gameManager = GetTree().Root.GetNode<GameManager>("Main/GameManager");
-   }
-}

Player/Base/P2Controls.cs

@@ -1,85 +0,0 @@
-using Godot;
-
-public partial class P2Controls : Controls
-{
-   [Export]
-   private PackedScene _fireProjectile;
-   [Export]
-   private PackedScene _altFireProjectile;
-
-   [Export]
-   private float _speed = 3.0f;
-
-   public bool CanShoot { get; protected set; }
-
-   private GameManager _gameManager;
-
-   public override void _Ready()
-   {
-      CanShoot = true;
-      _gameManager = GetTree().Root.GetNode<GameManager>("Main/GameManager");
-   }
-
-   public override void _PhysicsProcess(double delta)
-   {
-      Velocity = CalculateCharacterMovement(delta);
-      MoveAndSlide();
-   }
-
-   public override void _UnhandledInput(InputEvent @event)
-   {
-      if (Input.IsActionJustPressed("exit"))
-         GetTree().Quit();
-
-      if (Input.IsActionJustPressed($"p2_fire") && CanShoot)
-         Fire();
-      if (Input.IsActionJustPressed($"p2_altfire") && CanShoot)
-         AltFire();
-   }
-
-   private Vector3 CalculateCharacterMovement(double delta)
-   {
-      var velocity = Velocity;
-
-      var inputDir = Input.GetVector($"p2_left", $"p2_right", $"p2_up", $"p2_down");
-      var direction = (Transform.Basis * new Vector3(inputDir.X, 0, inputDir.Y)).Normalized();
-      if (direction != Vector3.Zero)
-      {
-         velocity.X = direction.X * _speed;
-         velocity.Z = direction.Z * _speed;
-         GetNode<Node3D>("Pivot").LookAt(Position + direction, Vector3.Up);
-         GetNode<Node3D>("CollisionShape3D").LookAt(Position + direction, Vector3.Up);
-      }
-      else
-      {
-         velocity.X = Mathf.MoveToward(Velocity.X, 0, _speed);
-         velocity.Z = Mathf.MoveToward(Velocity.Z, 0, _speed);
-      }
-      return velocity;
-   }
-
-   private async void Fire()
-   {
-      var projectile = _fireProjectile.Instantiate<Projectile>();
-      projectile.Position = Position + new Vector3(0f, 1f, 0f);
-      GetParent().AddChild(projectile);
-      CanShoot = false;
-      await ToSignal(GetTree().CreateTimer(projectile.Cooldown), "timeout");
-      CanShoot = true;
-   }
-
-   private async void AltFire()
-   {
-      var projectile = _altFireProjectile.Instantiate<Projectile>();
-      projectile.Position = Position + new Vector3(0f, 1f, 0f);
-      GetParent().AddChild(projectile);
-      CanShoot = false;
-      await ToSignal(GetTree().CreateTimer(projectile.Cooldown), "timeout");
-      CanShoot = true;
-   }
-
-   public void OnHit(Node3D node)
-   {
-      _gameManager.RemoveCharacter(this);
-   }
-}

Player/Base/Player.cs

@@ -0,0 +1,38 @@
+using Godot;
+using Godot.Collections;
+
+public partial class Player : Node3D
+{
+   [Export]
+   public SpawnPoint SpawnPoint;
+
+   [Export]
+   public Array<PackedScene> PlayableCharacterScenes;
+
+   [Export]
+   public PlayerInput PlayerInput;
+
+   [Export]
+   public int PlayerNumber;
+
+   public Array<Character> CharactersLeftOnStage = new Array<Character>();
+   public Array<Character> CharactersExited = new Array<Character>();
+
+   public Character SelectedCharacter;
+
+   public bool IsSelectingCharacter = false;
+
+   public int CharacterIndex = 0;
+
+   public bool GameOver = false;
+
+   public override void _Ready()
+   {
+      foreach (var character in PlayableCharacterScenes)
+      {
+         var instance = (Character)character.Instantiate();
+         instance.Initialize(this);
+         CharactersLeftOnStage.Add(instance);
+      }
+   }
+}

Player/Base/Player1.tscn

@@ -1,18 +1,23 @@
-[gd_scene load_steps=7 format=3 uid="uid://xcmspevaqcrc"]
+[gd_scene load_steps=8 format=3 uid="uid://xcmspevaqcrc"]
 
-[ext_resource type="Script" path="res://Player/Base/PlayerManager.cs" id="1_mmi2c"]
+[ext_resource type="Script" path="res://Player/Base/Player.cs" id="1_otv3t"]
-[ext_resource type="PackedScene" uid="uid://b38hcomu4tpm5" path="res://Player/Pisces/P1PiscesWitch.tscn" id="2_g10gf"]
+[ext_resource type="PackedScene" uid="uid://b38hcomu4tpm5" path="res://Player/Pisces/Pisces.tscn" id="2_g10gf"]
-[ext_resource type="PackedScene" uid="uid://iempdafdn6ct" path="res://Player/Scorpio/P1PlayerScorpio.tscn" id="3_nsh6r"]
+[ext_resource type="PackedScene" uid="uid://iempdafdn6ct" path="res://Player/Scorpio/Scorpio.tscn" id="3_nsh6r"]
-[ext_resource type="PackedScene" uid="uid://bgkqfamdiwrrw" path="res://Player/Sagittarius/P1Megami.tscn" id="4_vnhuv"]
+[ext_resource type="PackedScene" uid="uid://bgkqfamdiwrrw" path="res://Player/Sagittarius/Sagittarius.tscn" id="4_vnhuv"]
-[ext_resource type="PackedScene" uid="uid://crkon4c8ah1a2" path="res://Player/Capricorn/CapricornP1.tscn" id="5_ccoeb"]
+[ext_resource type="PackedScene" uid="uid://crkon4c8ah1a2" path="res://Player/Capricorn/Capricorn.tscn" id="5_ccoeb"]
 [ext_resource type="Script" path="res://Player/Base/SpawnPoint.cs" id="6_lida8"]
+[ext_resource type="PackedScene" uid="uid://dklmu3wwoukmw" path="res://Player/Base/Player1Input.tscn" id="7_nyh7j"]
 
-[node name="Player1" type="Node3D" node_paths=PackedStringArray("SpawnPoint")]
+[node name="Player1" type="Node3D" node_paths=PackedStringArray("SpawnPoint", "PlayerInput")]
-script = ExtResource("1_mmi2c")
+script = ExtResource("1_otv3t")
 SpawnPoint = NodePath("Marker3D")
 PlayableCharacterScenes = Array[PackedScene]([ExtResource("2_g10gf"), ExtResource("3_nsh6r"), ExtResource("4_vnhuv"), ExtResource("5_ccoeb")])
+PlayerInput = NodePath("Player1Input")
+PlayerNumber = 1
 
 [node name="Marker3D" type="Marker3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.5, 0, 5.513)
 gizmo_extents = 1.0
 script = ExtResource("6_lida8")
+
+[node name="Player1Input" parent="." instance=ExtResource("7_nyh7j")]

Player/Base/Player1Input.cs

@@ -0,0 +1,14 @@
+public partial class Player1Input : PlayerInput
+{
+   public override string Up() => "p1_up";
+
+   public override string Down() => "p1_down";
+
+   public override string Left() => "p1_left";
+
+   public override string Right() => "p1_right";
+
+   public override string Fire() => "p1_fire";
+
+   public override string AltFire() => "p1_altfire";
+}

Player/Base/Player1Input.tscn

@@ -0,0 +1,6 @@
+[gd_scene load_steps=2 format=3 uid="uid://dklmu3wwoukmw"]
+
+[ext_resource type="Script" path="res://Player/Base/Player1Input.cs" id="1_te7aw"]
+
+[node name="Player1Input" type="Node"]
+script = ExtResource("1_te7aw")

Player/Base/Player2.tscn

@@ -1,15 +1,23 @@
-[gd_scene load_steps=5 format=3 uid="uid://b57xus5rqasy8"]
+[gd_scene load_steps=8 format=3 uid="uid://b57xus5rqasy8"]
 
-[ext_resource type="Script" path="res://Player/Base/PlayerManager.cs" id="1_gttsr"]
+[ext_resource type="Script" path="res://Player/Base/Player.cs" id="1_wlxdt"]
 [ext_resource type="Script" path="res://Player/Base/SpawnPoint.cs" id="1_xs6nn"]
-[ext_resource type="PackedScene" uid="uid://dfanwejjy3iue" path="res://Player/Pisces/P2PiscesWitch.tscn" id="2_78cal"]
+[ext_resource type="PackedScene" uid="uid://b38hcomu4tpm5" path="res://Player/Pisces/Pisces.tscn" id="2_gtqii"]
-[ext_resource type="PackedScene" uid="uid://cg6hdoeq70ke8" path="res://Player/Scorpio/P2PlayerScorpio.tscn" id="3_04rrx"]
+[ext_resource type="PackedScene" uid="uid://iempdafdn6ct" path="res://Player/Scorpio/Scorpio.tscn" id="3_0k4g2"]
+[ext_resource type="PackedScene" uid="uid://bgkqfamdiwrrw" path="res://Player/Sagittarius/Sagittarius.tscn" id="4_0vqor"]
+[ext_resource type="PackedScene" uid="uid://crkon4c8ah1a2" path="res://Player/Capricorn/Capricorn.tscn" id="5_ke8lm"]
+[ext_resource type="PackedScene" uid="uid://bsvjdu8ao1wva" path="res://Player/Base/Player2Input.tscn" id="5_u4w27"]
 
-[node name="Player2" type="Node3D" groups=["Player"]]
+[node name="Player2" type="Node3D" node_paths=PackedStringArray("SpawnPoint", "PlayerInput") groups=["Player"]]
-script = ExtResource("1_gttsr")
+script = ExtResource("1_wlxdt")
-PlayableCharacterScenes = Array[PackedScene]([ExtResource("2_78cal"), ExtResource("3_04rrx")])
+SpawnPoint = NodePath("Marker3D")
+PlayableCharacterScenes = Array[PackedScene]([ExtResource("2_gtqii"), ExtResource("3_0k4g2"), ExtResource("4_0vqor"), ExtResource("5_ke8lm")])
+PlayerInput = NodePath("Player2Input")
+PlayerNumber = 2
 
 [node name="Marker3D" type="Marker3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.5, 0, 5.513)
 gizmo_extents = 1.0
 script = ExtResource("1_xs6nn")
+
+[node name="Player2Input" parent="." instance=ExtResource("5_u4w27")]

Player/Base/Player2Input.cs

@@ -0,0 +1,14 @@
+public partial class Player2Input : PlayerInput
+{
+   public override string Up() => "p2_up";
+
+   public override string Down() => "p2_down";
+
+   public override string Left() => "p2_left";
+
+   public override string Right() => "p2_right";
+
+   public override string Fire() => "p2_fire";
+
+   public override string AltFire() => "p2_altfire";
+}

Player/Base/Player2Input.tscn

@@ -0,0 +1,6 @@
+[gd_scene load_steps=2 format=3 uid="uid://bsvjdu8ao1wva"]
+
+[ext_resource type="Script" path="res://Player/Base/Player2Input.cs" id="1_j3rvl"]
+
+[node name="Player2Input" type="Node"]
+script = ExtResource("1_j3rvl")

Player/Base/PlayerInput.cs

@@ -0,0 +1,35 @@
+using Godot;
+
+public partial class PlayerInput : Node
+{
+   public virtual string Up()
+   {
+      GD.PrintErr("Using base type");
+      return string.Empty;
+   }
+   public virtual string Down()
+   {
+      GD.PrintErr("Using base type");
+      return string.Empty;
+   }
+   public virtual string Left()
+   {
+      GD.PrintErr("Using base type");
+      return string.Empty;
+   }
+   public virtual string Right()
+   {
+      GD.PrintErr("Using base type");
+      return string.Empty;
+   }
+   public virtual string Fire()
+   {
+      GD.PrintErr("Using base type");
+      return string.Empty;
+   }
+   public virtual string AltFire()
+   {
+      GD.PrintErr("Using base type");
+      return string.Empty;
+   }
+}

Player/Base/PlayerManager.cs

@@ -1,30 +0,0 @@
-using Godot;
-using Godot.Collections;
-
-public partial class PlayerManager : Node3D
-{
-   [Export]
-   public SpawnPoint SpawnPoint;
-
-   [Export]
-   public Array<PackedScene> PlayableCharacterScenes;
-
-   public Array<Controls> CharactersLeftOnStage = new Array<Controls>();
-
-   public Controls SelectedCharacter;
-
-   public bool IsSelectingCharacter = false;
-
-   public int _characterIndex = 0;
-
-   public bool GameOver = false;
-
-   public override void _Ready()
-   {
-      foreach (var character in PlayableCharacterScenes)
-      {
-         var instance = character.Instantiate();
-         CharactersLeftOnStage.Add((Controls)instance);
-      }
-   }
-}

Player/Base/Projectile.cs

@@ -1,16 +1,21 @@
 using Godot;
+using Godot.Collections;
+using System.Linq;
 
 public partial class Projectile : Node3D
 {
    [Export]
    public double Cooldown { get; protected set; }
+
+   [Export]
+   protected float _projectileSpeed = 1f;
+
    [Export]
    public AudioStream _soundEffect;
 
-   public Controls ParentCharacter;
+   public Character ParentCharacter;
 
-   [Export]
+   private Array<Path3D> _paths;
-   private float _projectileSpeed = 1f;
 
    public override void _Ready()
    {
@@ -18,12 +23,19 @@ public partial class Projectile : Node3D
       var sfxPlayer = GetTree().Root.GetNode<AudioStreamPlayer>("Main/SFXPlayer");
       sfxPlayer.Stream = _soundEffect;
       sfxPlayer.Play();
+      _paths = new Array<Path3D>(GetChildren().OfType<Path3D>());
+   }
+
+   public override void _PhysicsProcess(double delta)
+   {
+      foreach (var paths in _paths)
+      {
+         var pathFollow = paths.GetChildren().OfType<PathFollow3D>().Single();
+         pathFollow.Progress += Speed * (float)delta;
+         if (pathFollow.ProgressRatio > 0.9f)
+            QueueFree();
+      }
    }
 
    public float Speed { get; private set; }
-
-   public void OnTimeToLiveTimeout()
-   {
-      QueueFree();
-   }
 }

Player/Capricorn/Attacks/CapricornLaser.tscn

@@ -1,21 +1,39 @@
-[gd_scene load_steps=5 format=3 uid="uid://5ce7ky4o0q2e"]
+[gd_scene load_steps=6 format=3 uid="uid://5ce7ky4o0q2e"]
 
 [ext_resource type="Texture2D" uid="uid://dha44dnvwhajo" path="res://Textures/Projectiles/Projectile_Capricorn.png" id="1_bvyt4"]
-[ext_resource type="Script" path="res://Player/Capricorn/Attacks/CapricornLaserShot.cs" id="1_nkyy8"]
+[ext_resource type="Script" path="res://Player/Base/Projectile.cs" id="1_ovnwu"]
 [ext_resource type="AudioStream" uid="uid://bykwwct1not4e" path="res://Audio/SFX/capricorn laeser.wav" id="2_lofnw"]
 
+[sub_resource type="Curve3D" id="Curve3D_bnc6v"]
+_data = {
+"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0.008, 1, -5),
+"tilts": PackedFloat32Array(0, 0)
+}
+point_count = 2
+
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_bnunv"]
 height = 7.40727
 radius = 0.419241
 
 [node name="CapricornLaser" type="Node3D"]
-script = ExtResource("1_nkyy8")
+script = ExtResource("1_ovnwu")
-_soundEffect = ExtResource("2_lofnw")
+Cooldown = 1.0
 _projectileSpeed = 3.0
+_soundEffect = ExtResource("2_lofnw")
 
-[node name="Forward Shot" type="RigidBody3D" parent="."]
+[node name="Forward Shot" type="Path3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.5)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.25)
-collision_layer = 0
+top_level = true
+curve = SubResource("Curve3D_bnc6v")
+
+[node name="PathFollow3D" type="PathFollow3D" parent="Forward Shot"]
+transform = Transform3D(-0.999998, 0, 0.00159994, 0, 1, 0, -0.00159994, 0, -0.999998, 0, 1, 0)
+loop = false
+tilt_enabled = false
+
+[node name="Hitbox" type="RigidBody3D" parent="Forward Shot/PathFollow3D"]
+transform = Transform3D(-1, 0, -0.000800046, 0, 1, 0, 0.000800046, 0, -1, 0.000400023, -1, 0.5)
+collision_layer = 34
 collision_mask = 34
 gravity_scale = 0.0
 continuous_cd = true
@@ -23,19 +41,29 @@ max_contacts_reported = 1
 contact_monitor = true
 can_sleep = false
 
-[node name="CollisionShape3D" type="CollisionShape3D" parent="Forward Shot"]
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Forward Shot/PathFollow3D/Hitbox"]
 transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0)
 shape = SubResource("CylinderShape3D_bnunv")
 
-[node name="Sprite3D2" type="Sprite3D" parent="Forward Shot"]
+[node name="Sprite3D2" type="Sprite3D" parent="Forward Shot/PathFollow3D/Hitbox"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.33, 0, 0.5)
 centered = false
 axis = 1
 texture = ExtResource("1_bvyt4")
 
-[node name="BackwardShot" type="RigidBody3D" parent="."]
+[node name="Backward Shot" type="Path3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0.5)
+transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0.25)
-collision_layer = 0
+top_level = true
+curve = SubResource("Curve3D_bnc6v")
+
+[node name="PathFollow3D" type="PathFollow3D" parent="Backward Shot"]
+transform = Transform3D(-0.999998, 0, 0.00159994, 0, 1, 0, -0.00159994, 0, -0.999998, 0, 1, 0)
+loop = false
+tilt_enabled = false
+
+[node name="Hitbox" type="RigidBody3D" parent="Backward Shot/PathFollow3D"]
+transform = Transform3D(-1, 0, -0.000800046, 0, 1, 0, 0.000800046, 0, -1, 0.000400023, -1, 0.5)
+collision_layer = 34
 collision_mask = 34
 gravity_scale = 0.0
 continuous_cd = true
@@ -43,12 +71,12 @@ max_contacts_reported = 1
 contact_monitor = true
 can_sleep = false
 
-[node name="CollisionShape3D" type="CollisionShape3D" parent="BackwardShot"]
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Backward Shot/PathFollow3D/Hitbox"]
-transform = Transform3D(-0.5, 0, -4.37114e-08, 0, 0.5, 0, 4.37114e-08, 0, -0.5, 0, -0.5, 0.5)
+transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0)
 shape = SubResource("CylinderShape3D_bnunv")
 
-[node name="Sprite3D2" type="Sprite3D" parent="BackwardShot/CollisionShape3D"]
+[node name="Sprite3D2" type="Sprite3D" parent="Backward Shot/PathFollow3D/Hitbox"]
-transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -0.66, 0, 0.965768)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.33, 0, 0.5)
 centered = false
 axis = 1
 texture = ExtResource("1_bvyt4")

Player/Capricorn/Attacks/CapricornLaserAltFire.tscn

@@ -1,21 +1,39 @@
-[gd_scene load_steps=5 format=3 uid="uid://cdsc35cj566q1"]
+[gd_scene load_steps=6 format=3 uid="uid://cdsc35cj566q1"]
 
-[ext_resource type="Script" path="res://Player/Capricorn/Attacks/CapricornLaserShot.cs" id="1_8lywi"]
+[ext_resource type="Script" path="res://Player/Base/Projectile.cs" id="1_tbx8y"]
 [ext_resource type="Texture2D" uid="uid://dha44dnvwhajo" path="res://Textures/Projectiles/Projectile_Capricorn.png" id="2_8osg4"]
 [ext_resource type="AudioStream" uid="uid://bykwwct1not4e" path="res://Audio/SFX/capricorn laeser.wav" id="2_jeoco"]
 
-[sub_resource type="CylinderShape3D" id="CylinderShape3D_bnunv"]
+[sub_resource type="Curve3D" id="Curve3D_goxuk"]
-height = 8.32444
+_data = {
+"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0.008, 1, -5),
+"tilts": PackedFloat32Array(0, 0)
+}
+point_count = 2
+
+[sub_resource type="CylinderShape3D" id="CylinderShape3D_hebl4"]
+height = 7.40727
 radius = 0.419241
 
 [node name="CapricornLaser" type="Node3D"]
-transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.242816, 0, 0)
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 0)
-script = ExtResource("1_8lywi")
+script = ExtResource("1_tbx8y")
-_soundEffect = ExtResource("2_jeoco")
+Cooldown = 1.0
 _projectileSpeed = 3.0
+_soundEffect = ExtResource("2_jeoco")
 
-[node name="Forward Shot" type="RigidBody3D" parent="."]
+[node name="Forward Shot" type="Path3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.5)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.25)
+top_level = true
+curve = SubResource("Curve3D_goxuk")
+
+[node name="PathFollow3D" type="PathFollow3D" parent="Forward Shot"]
+transform = Transform3D(-0.999998, 0, 0.00159994, 0, 1, 0, -0.00159994, 0, -0.999998, 0, 1, 0)
+loop = false
+tilt_enabled = false
+
+[node name="Hitbox" type="RigidBody3D" parent="Forward Shot/PathFollow3D"]
+transform = Transform3D(-1, 0, -0.000800046, 0, 1, 0, 0.000800046, 0, -1, 0.000400023, -1, 0.5)
 collision_layer = 34
 collision_mask = 34
 gravity_scale = 0.0
@@ -24,18 +42,28 @@ max_contacts_reported = 1
 contact_monitor = true
 can_sleep = false
 
-[node name="CollisionShape3D" type="CollisionShape3D" parent="Forward Shot"]
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Forward Shot/PathFollow3D/Hitbox"]
 transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0)
-shape = SubResource("CylinderShape3D_bnunv")
+shape = SubResource("CylinderShape3D_hebl4")
 
-[node name="Sprite3D2" type="Sprite3D" parent="Forward Shot"]
+[node name="Sprite3D2" type="Sprite3D" parent="Forward Shot/PathFollow3D/Hitbox"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.33, 0, 0.5)
 centered = false
 axis = 1
 texture = ExtResource("2_8osg4")
 
-[node name="BackwardShot" type="RigidBody3D" parent="."]
+[node name="Backward Shot" type="Path3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0.5)
+transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0.25)
+top_level = true
+curve = SubResource("Curve3D_goxuk")
+
+[node name="PathFollow3D" type="PathFollow3D" parent="Backward Shot"]
+transform = Transform3D(-0.999998, 0, 0.00159994, 0, 1, 0, -0.00159994, 0, -0.999998, 0, 1, 0)
+loop = false
+tilt_enabled = false
+
+[node name="Hitbox" type="RigidBody3D" parent="Backward Shot/PathFollow3D"]
+transform = Transform3D(-1, 0, -0.000800046, 0, 1, 0, 0.000800046, 0, -1, 0.000400023, -1, 0.5)
 collision_layer = 34
 collision_mask = 34
 gravity_scale = 0.0
@@ -44,12 +72,12 @@ max_contacts_reported = 1
 contact_monitor = true
 can_sleep = false
 
-[node name="CollisionShape3D" type="CollisionShape3D" parent="BackwardShot"]
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Backward Shot/PathFollow3D/Hitbox"]
-transform = Transform3D(-0.5, 0, -4.37114e-08, 0, 0.5, 0, 4.37114e-08, 0, -0.5, 0, -0.5, 0.5)
+transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0)
-shape = SubResource("CylinderShape3D_bnunv")
+shape = SubResource("CylinderShape3D_hebl4")
 
-[node name="Sprite3D2" type="Sprite3D" parent="BackwardShot/CollisionShape3D"]
+[node name="Sprite3D2" type="Sprite3D" parent="Backward Shot/PathFollow3D/Hitbox"]
-transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -0.66, 0, 0.965768)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.33, 0, 0.5)
 centered = false
 axis = 1
 texture = ExtResource("2_8osg4")

Player/Capricorn/Attacks/CapricornLaserShot.cs

@@ -1,12 +0,0 @@
-using Godot;
-using System.Linq;
-
-public partial class CapricornLaserShot : Projectile
-{
-   public override void _PhysicsProcess(double delta)
-   {
-      var shots = GetChildren().OfType<RigidBody3D>();
-      shots.ElementAt(0).Translate(new Vector3(0, 0, Speed * -(float)delta));
-      shots.ElementAt(1).Translate(new Vector3(0, 0, Speed * (float)delta));
-   }
-}

Player/Capricorn/Capricorn.tscn

@@ -1,109 +1,109 @@
 [gd_scene load_steps=36 format=3 uid="uid://crkon4c8ah1a2"]
 
-[ext_resource type="Script" path="res://Player/Capricorn/CapricornP1Controls.cs" id="1_02lam"]
+[ext_resource type="Script" path="res://Player/Capricorn/CapricornControls.cs" id="1_aqn5t"]
-[ext_resource type="PackedScene" uid="uid://5ce7ky4o0q2e" path="res://Player/Capricorn/Attacks/CapricornLaser.tscn" id="2_5fur4"]
+[ext_resource type="PackedScene" uid="uid://5ce7ky4o0q2e" path="res://Player/Capricorn/Attacks/CapricornLaser.tscn" id="2_e6qos"]
-[ext_resource type="Texture2D" uid="uid://s0j0kj4ila8s" path="res://Player/Capricorn/Sprites/GameJam_DevilCapricorn_AttackForward.png" id="2_ebqay"]
+[ext_resource type="Texture2D" uid="uid://s0j0kj4ila8s" path="res://Player/Capricorn/Sprites/GameJam_DevilCapricorn_AttackForward.png" id="2_ichjm"]
-[ext_resource type="PackedScene" uid="uid://cdsc35cj566q1" path="res://Player/Capricorn/Attacks/CapricornLaserAltFire.tscn" id="3_7c7sn"]
+[ext_resource type="Texture2D" uid="uid://dchysrwcxhfvx" path="res://Player/Capricorn/Sprites/GameJam_DevilCapricorn_AttackBehind.png" id="3_qnhtc"]
-[ext_resource type="Texture2D" uid="uid://dchysrwcxhfvx" path="res://Player/Capricorn/Sprites/GameJam_DevilCapricorn_AttackBehind.png" id="3_c6jic"]
+[ext_resource type="PackedScene" uid="uid://cdsc35cj566q1" path="res://Player/Capricorn/Attacks/CapricornLaserAltFire.tscn" id="3_wbhxk"]
-[ext_resource type="Texture2D" uid="uid://cju5ycxiuwy25" path="res://Player/Capricorn/Sprites/GameJam_DevilCapricorn_AttackSide.png" id="4_ivql6"]
+[ext_resource type="Texture2D" uid="uid://cju5ycxiuwy25" path="res://Player/Capricorn/Sprites/GameJam_DevilCapricorn_AttackSide.png" id="4_n8euj"]
-[ext_resource type="Texture2D" uid="uid://utm2g5q7m2b3" path="res://Player/Capricorn/Sprites/GameJam_DevilCapricorn_WalkForward.png" id="5_7h4md"]
+[ext_resource type="Texture2D" uid="uid://utm2g5q7m2b3" path="res://Player/Capricorn/Sprites/GameJam_DevilCapricorn_WalkForward.png" id="5_coe3k"]
-[ext_resource type="Texture2D" uid="uid://w444vcu8rvae" path="res://Player/Capricorn/Sprites/GameJam_DevilCapricorn_WalkBehind.png" id="6_go5g3"]
+[ext_resource type="Texture2D" uid="uid://w444vcu8rvae" path="res://Player/Capricorn/Sprites/GameJam_DevilCapricorn_WalkBehind.png" id="6_2w4xq"]
-[ext_resource type="Texture2D" uid="uid://c5t256wcykb47" path="res://Player/Capricorn/Sprites/GameJam_DevilCapricorn_WalkSide.png" id="7_3c18n"]
+[ext_resource type="Texture2D" uid="uid://c5t256wcykb47" path="res://Player/Capricorn/Sprites/GameJam_DevilCapricorn_WalkSide.png" id="7_uiqsg"]
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_njxhk"]
-atlas = ExtResource("2_ebqay")
+atlas = ExtResource("2_ichjm")
 region = Rect2(0, 0, 120, 140)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_bmuvx"]
-atlas = ExtResource("2_ebqay")
+atlas = ExtResource("2_ichjm")
 region = Rect2(120, 0, 120, 140)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_14ft5"]
-atlas = ExtResource("2_ebqay")
+atlas = ExtResource("2_ichjm")
 region = Rect2(240, 0, 120, 140)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_olmdj"]
-atlas = ExtResource("2_ebqay")
+atlas = ExtResource("2_ichjm")
 region = Rect2(360, 0, 120, 140)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_qaudm"]
-atlas = ExtResource("3_c6jic")
+atlas = ExtResource("3_qnhtc")
 region = Rect2(0, 0, 120, 144)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_a52sr"]
-atlas = ExtResource("3_c6jic")
+atlas = ExtResource("3_qnhtc")
 region = Rect2(120, 0, 120, 144)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_qkrgl"]
-atlas = ExtResource("3_c6jic")
+atlas = ExtResource("3_qnhtc")
 region = Rect2(240, 0, 120, 144)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_k5oj5"]
-atlas = ExtResource("3_c6jic")
+atlas = ExtResource("3_qnhtc")
 region = Rect2(360, 0, 120, 144)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_6iqcx"]
-atlas = ExtResource("4_ivql6")
+atlas = ExtResource("4_n8euj")
 region = Rect2(0, 0, 113, 142)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_kiiv3"]
-atlas = ExtResource("4_ivql6")
+atlas = ExtResource("4_n8euj")
 region = Rect2(113, 0, 113, 142)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_up4ur"]
-atlas = ExtResource("4_ivql6")
+atlas = ExtResource("4_n8euj")
 region = Rect2(226, 0, 113, 142)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_hvxie"]
-atlas = ExtResource("4_ivql6")
+atlas = ExtResource("4_n8euj")
 region = Rect2(339, 0, 113, 142)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_vc5hj"]
-atlas = ExtResource("5_7h4md")
+atlas = ExtResource("5_coe3k")
 region = Rect2(0, 0, 120, 128)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_672u0"]
-atlas = ExtResource("5_7h4md")
+atlas = ExtResource("5_coe3k")
 region = Rect2(120, 0, 120, 128)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_po3o8"]
-atlas = ExtResource("5_7h4md")
+atlas = ExtResource("5_coe3k")
 region = Rect2(240, 0, 120, 128)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_v0my0"]
-atlas = ExtResource("5_7h4md")
+atlas = ExtResource("5_coe3k")
 region = Rect2(360, 0, 120, 128)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_fge82"]
-atlas = ExtResource("6_go5g3")
+atlas = ExtResource("6_2w4xq")
 region = Rect2(0, 0, 120, 132)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_v2d05"]
-atlas = ExtResource("6_go5g3")
+atlas = ExtResource("6_2w4xq")
 region = Rect2(120, 0, 120, 132)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_mkdc6"]
-atlas = ExtResource("6_go5g3")
+atlas = ExtResource("6_2w4xq")
 region = Rect2(240, 0, 120, 132)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_0nnnw"]
-atlas = ExtResource("6_go5g3")
+atlas = ExtResource("6_2w4xq")
 region = Rect2(360, 0, 120, 132)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_sjqet"]
-atlas = ExtResource("7_3c18n")
+atlas = ExtResource("7_uiqsg")
 region = Rect2(0, 0, 113, 130)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_l8c3l"]
-atlas = ExtResource("7_3c18n")
+atlas = ExtResource("7_uiqsg")
 region = Rect2(113, 0, 113, 130)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_a72tn"]
-atlas = ExtResource("7_3c18n")
+atlas = ExtResource("7_uiqsg")
 region = Rect2(226, 0, 113, 130)
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_s2v14"]
-atlas = ExtResource("7_3c18n")
+atlas = ExtResource("7_uiqsg")
 region = Rect2(339, 0, 113, 130)
 
 [sub_resource type="SpriteFrames" id="SpriteFrames_h2iud"]
@@ -214,14 +214,14 @@ animations = [{
 [sub_resource type="BoxShape3D" id="BoxShape3D_r4spg"]
 size = Vector3(0.856928, 1.65704, 0.82877)
 
-[node name="CapricornP1" type="CharacterBody3D" groups=["Player"]]
+[node name="Capricorn" type="CharacterBody3D" groups=["Player"]]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.408962, 0)
+collision_layer = 25
 motion_mode = 1
-script = ExtResource("1_02lam")
+script = ExtResource("1_aqn5t")
-_fireProjectile = ExtResource("2_5fur4")
+_fireProjectile = ExtResource("2_e6qos")
-_altFireProjectile = ExtResource("3_7c7sn")
+_altFireProjectile = ExtResource("3_wbhxk")
-_fireProjectile = ExtResource("2_5fur4")
+_speed = 1.0
-_altFireProjectile = ExtResource("3_7c7sn")
 
 [node name="Pivot" type="Node3D" parent="."]
 

Player/Capricorn/CapricornControls.cs

@@ -1,28 +1,17 @@
 using Godot;
 
-public partial class CapricornP1Controls : P1Controls
+public partial class CapricornControls : Character
 {
    private AnimatedSprite3D _sprite;
 
    public override void _Ready()
    {
+      base._Ready();
       _sprite = GetNode<AnimatedSprite3D>("Pivot/Sprite");
-      CanShoot = true;
-      _gameManager = GetTree().Root.GetNode<GameManager>("Main/GameManager");
    }
 
-   [Export]
-   private PackedScene _fireProjectile;
-   [Export]
-   private PackedScene _altFireProjectile;
-
-   [Export]
-   private float _speed = 3.0f;
-
    public bool IsShooting = false;
 
-   private GameManager _gameManager;
-
    public override void _PhysicsProcess(double delta)
    {
       Velocity = CalculateCharacterMovement(delta);
@@ -34,17 +23,17 @@ public partial class CapricornP1Controls : P1Controls
       if (Input.IsActionJustPressed("exit"))
          GetTree().Quit();
 
-      if (Input.IsActionJustPressed($"p1_fire") && CanShoot)
+      if (Input.IsActionJustPressed(OwnerPlayer.PlayerInput.Fire()) && CanShoot)
-         Fire();
+         Fire(_fireProjectile);
-      if (Input.IsActionJustPressed($"p1_altfire") && CanShoot)
+      if (Input.IsActionJustPressed(OwnerPlayer.PlayerInput.AltFire()) && CanShoot)
-         AltFire();
+         Fire(_altFireProjectile);
    }
 
    private Vector3 CalculateCharacterMovement(double delta)
    {
       var velocity = Velocity;
 
-      var inputDir = Input.GetVector($"p1_left", $"p1_right", $"p1_up", $"p1_down");
+      var inputDir = Input.GetVector(OwnerPlayer.PlayerInput.Left(), OwnerPlayer.PlayerInput.Right(), OwnerPlayer.PlayerInput.Up(), OwnerPlayer.PlayerInput.Down());
       var direction = (Transform.Basis * new Vector3(inputDir.X, 0, inputDir.Y)).Normalized();
       if (direction != Vector3.Zero)
       {
@@ -91,25 +80,12 @@ public partial class CapricornP1Controls : P1Controls
          _sprite.Play("WalkBack");
    }
 
-   private async void Fire()
+   private async void Fire(PackedScene projectileScene)
    {
       IsShooting = true;
       CanShoot = false;
-      await ToSignal(GetTree().CreateTimer(0.8f), "timeout");
+      var projectile = projectileScene.Instantiate<Projectile>();
-      var projectile = _fireProjectile.Instantiate<Projectile>();
+      await ToSignal(GetTree().CreateTimer(projectile.Cooldown), "timeout");
-      projectile.Position = Position + new Vector3(0f, 1f, 0f);
-      projectile.ParentCharacter = this;
-      GetParent().AddChild(projectile);
-      CanShoot = true;
-      IsShooting = false;
-   }
-
-   private async void AltFire()
-   {
-      IsShooting = true;
-      CanShoot = false;
-      await ToSignal(GetTree().CreateTimer(0.8f), "timeout");
-      var projectile = _altFireProjectile.Instantiate<Projectile>();
       projectile.Position = Position + new Vector3(0f, 1f, 0f);
       projectile.ParentCharacter = this;
       GetParent().AddChild(projectile);
@@ -143,6 +119,6 @@ public partial class CapricornP1Controls : P1Controls
    public new void OnHit(Node3D node)
    {
       if (this != null)
-         _gameManager.CallDeferred(GameManager.MethodName.RemoveCharacter, this);
+         _gameManager.CallDeferred(GameManager.MethodName.RemoveCharacter, OwnerPlayer);
    }
 }

Player/Capricorn/CapricornP2.tscn

@@ -1,248 +0,0 @@
-[gd_scene load_steps=36 format=3 uid="uid://db6xew8wvbcl8"]
-
-[ext_resource type="Script" path="res://Player/Capricorn/CapricornP2Controls.cs" id="1_5dwa3"]
-[ext_resource type="Texture2D" uid="uid://s0j0kj4ila8s" path="res://Player/Capricorn/Sprites/GameJam_DevilCapricorn_AttackForward.png" id="2_8qhd4"]
-[ext_resource type="PackedScene" uid="uid://5ce7ky4o0q2e" path="res://Player/Capricorn/Attacks/CapricornLaser.tscn" id="2_241c5"]
-[ext_resource type="PackedScene" uid="uid://cdsc35cj566q1" path="res://Player/Capricorn/Attacks/CapricornLaserAltFire.tscn" id="3_4gj1h"]
-[ext_resource type="Texture2D" uid="uid://dchysrwcxhfvx" path="res://Player/Capricorn/Sprites/GameJam_DevilCapricorn_AttackBehind.png" id="3_qftyj"]
-[ext_resource type="Texture2D" uid="uid://cju5ycxiuwy25" path="res://Player/Capricorn/Sprites/GameJam_DevilCapricorn_AttackSide.png" id="4_pwka2"]
-[ext_resource type="Texture2D" uid="uid://utm2g5q7m2b3" path="res://Player/Capricorn/Sprites/GameJam_DevilCapricorn_WalkForward.png" id="5_4q5hl"]
-[ext_resource type="Texture2D" uid="uid://w444vcu8rvae" path="res://Player/Capricorn/Sprites/GameJam_DevilCapricorn_WalkBehind.png" id="6_x36jg"]
-[ext_resource type="Texture2D" uid="uid://c5t256wcykb47" path="res://Player/Capricorn/Sprites/GameJam_DevilCapricorn_WalkSide.png" id="7_03beh"]
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_njxhk"]
-atlas = ExtResource("2_8qhd4")
-region = Rect2(0, 0, 120, 140)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_bmuvx"]
-atlas = ExtResource("2_8qhd4")
-region = Rect2(120, 0, 120, 140)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_14ft5"]
-atlas = ExtResource("2_8qhd4")
-region = Rect2(240, 0, 120, 140)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_olmdj"]
-atlas = ExtResource("2_8qhd4")
-region = Rect2(360, 0, 120, 140)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_qaudm"]
-atlas = ExtResource("3_qftyj")
-region = Rect2(0, 0, 120, 144)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_a52sr"]
-atlas = ExtResource("3_qftyj")
-region = Rect2(120, 0, 120, 144)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_qkrgl"]
-atlas = ExtResource("3_qftyj")
-region = Rect2(240, 0, 120, 144)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_k5oj5"]
-atlas = ExtResource("3_qftyj")
-region = Rect2(360, 0, 120, 144)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_6iqcx"]
-atlas = ExtResource("4_pwka2")
-region = Rect2(0, 0, 113, 142)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_kiiv3"]
-atlas = ExtResource("4_pwka2")
-region = Rect2(113, 0, 113, 142)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_up4ur"]
-atlas = ExtResource("4_pwka2")
-region = Rect2(226, 0, 113, 142)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_hvxie"]
-atlas = ExtResource("4_pwka2")
-region = Rect2(339, 0, 113, 142)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_vc5hj"]
-atlas = ExtResource("5_4q5hl")
-region = Rect2(0, 0, 120, 128)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_672u0"]
-atlas = ExtResource("5_4q5hl")
-region = Rect2(120, 0, 120, 128)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_po3o8"]
-atlas = ExtResource("5_4q5hl")
-region = Rect2(240, 0, 120, 128)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_v0my0"]
-atlas = ExtResource("5_4q5hl")
-region = Rect2(360, 0, 120, 128)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_fge82"]
-atlas = ExtResource("6_x36jg")
-region = Rect2(0, 0, 120, 132)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_v2d05"]
-atlas = ExtResource("6_x36jg")
-region = Rect2(120, 0, 120, 132)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_mkdc6"]
-atlas = ExtResource("6_x36jg")
-region = Rect2(240, 0, 120, 132)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_0nnnw"]
-atlas = ExtResource("6_x36jg")
-region = Rect2(360, 0, 120, 132)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_sjqet"]
-atlas = ExtResource("7_03beh")
-region = Rect2(0, 0, 113, 130)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_l8c3l"]
-atlas = ExtResource("7_03beh")
-region = Rect2(113, 0, 113, 130)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_a72tn"]
-atlas = ExtResource("7_03beh")
-region = Rect2(226, 0, 113, 130)
-
-[sub_resource type="AtlasTexture" id="AtlasTexture_s2v14"]
-atlas = ExtResource("7_03beh")
-region = Rect2(339, 0, 113, 130)
-
-[sub_resource type="SpriteFrames" id="SpriteFrames_h2iud"]
-animations = [{
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_njxhk")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_bmuvx")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_14ft5")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_olmdj")
-}],
-"loop": true,
-"name": &"AttackBack",
-"speed": 5.0
-}, {
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_qaudm")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_a52sr")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_qkrgl")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_k5oj5")
-}],
-"loop": true,
-"name": &"AttackForward",
-"speed": 5.0
-}, {
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_6iqcx")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_kiiv3")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_up4ur")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_hvxie")
-}],
-"loop": true,
-"name": &"AttackSide",
-"speed": 5.0
-}, {
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_vc5hj")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_672u0")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_po3o8")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_v0my0")
-}],
-"loop": true,
-"name": &"WalkBack",
-"speed": 5.0
-}, {
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_fge82")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_v2d05")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_mkdc6")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_0nnnw")
-}],
-"loop": true,
-"name": &"WalkForward",
-"speed": 5.0
-}, {
-"frames": [{
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_sjqet")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_l8c3l")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_a72tn")
-}, {
-"duration": 1.0,
-"texture": SubResource("AtlasTexture_s2v14")
-}],
-"loop": true,
-"name": &"WalkSide",
-"speed": 5.0
-}]
-
-[sub_resource type="BoxShape3D" id="BoxShape3D_r4spg"]
-size = Vector3(0.856928, 1.65704, 0.82877)
-
-[node name="CapricornP2" type="CharacterBody3D" groups=["Player"]]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.704732, 0)
-motion_mode = 1
-script = ExtResource("1_5dwa3")
-_fireProjectile = ExtResource("2_241c5")
-_altFireProjectile = ExtResource("3_4gj1h")
-_fireProjectile = ExtResource("2_241c5")
-_altFireProjectile = ExtResource("3_4gj1h")
-
-[node name="Pivot" type="Node3D" parent="."]
-
-[node name="Sprite" type="AnimatedSprite3D" parent="Pivot"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.51107, 0)
-billboard = 1
-sprite_frames = SubResource("SpriteFrames_h2iud")
-animation = &"WalkSide"
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.41651, 0)
-shape = SubResource("BoxShape3D_r4spg")
-
-[node name="Area3D" type="Area3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.75657e-15, 1.43031, 0)
-disable_mode = 2
-collision_layer = 16
-collision_mask = 4100
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"]
-transform = Transform3D(0.999665, -0.0258978, -7.10543e-15, 0.0258978, 0.999665, 0, 0, 0, 1, 0, 0, 0)
-shape = SubResource("BoxShape3D_r4spg")
-
-[connection signal="body_entered" from="Area3D" to="." method="OnHit" flags=18]

Player/Capricorn/CapricornP2Controls.cs

@@ -1,148 +0,0 @@
-using Godot;
-
-public partial class CapricornP2Controls : P2Controls
-{
-   private AnimatedSprite3D _sprite;
-
-   public override void _Ready()
-   {
-      _sprite = GetNode<AnimatedSprite3D>("Pivot/Sprite");
-      CanShoot = true;
-      _gameManager = GetTree().Root.GetNode<GameManager>("Main/GameManager");
-   }
-
-   [Export]
-   private PackedScene _fireProjectile;
-   [Export]
-   private PackedScene _altFireProjectile;
-
-   [Export]
-   private float _speed = 3.0f;
-
-   public bool IsShooting = false;
-
-   private GameManager _gameManager;
-
-   public override void _PhysicsProcess(double delta)
-   {
-      Velocity = CalculateCharacterMovement(delta);
-      MoveAndSlide();
-   }
-
-   public override void _UnhandledInput(InputEvent @event)
-   {
-      if (Input.IsActionJustPressed("exit"))
-         GetTree().Quit();
-
-      if (Input.IsActionJustPressed($"p2_fire") && CanShoot)
-         Fire();
-      if (Input.IsActionJustPressed($"p2_altfire") && CanShoot)
-         AltFire();
-   }
-
-   private Vector3 CalculateCharacterMovement(double delta)
-   {
-      var velocity = Velocity;
-
-      var inputDir = Input.GetVector($"p2_left", $"p2_right", $"p2_up", $"p2_down");
-      var direction = (Transform.Basis * new Vector3(inputDir.X, 0, inputDir.Y)).Normalized();
-      if (direction != Vector3.Zero)
-      {
-         velocity.X = direction.X * _speed;
-         velocity.Z = direction.Z * _speed;
-      }
-      else
-      {
-         velocity.X = Mathf.MoveToward(Velocity.X, 0, _speed);
-         velocity.Z = Mathf.MoveToward(Velocity.Z, 0, _speed);
-      }
-
-      if (IsShooting)
-         AttackSprite(direction);
-      else
-         WalkSprite(direction);
-
-      if (!IsShooting && direction.IsEqualApprox(Vector3.Zero))
-      {
-         _sprite.Play("WalkForward");
-         _sprite.Stop();
-      }
-
-      return velocity;
-   }
-
-   private void WalkSprite(Vector3 direction)
-   {
-      var roundedDirection = direction.Round();
-
-      if (roundedDirection == Vector3.Right)
-      {
-         _sprite.Play("WalkSide");
-         _sprite.FlipH = false;
-      }
-      if (roundedDirection == Vector3.Left)
-      {
-         _sprite.Play("WalkSide");
-         _sprite.FlipH = true;
-      }
-      if (roundedDirection == Vector3.Forward)
-         _sprite.Play("WalkForward");
-      if (roundedDirection == Vector3.Back)
-         _sprite.Play("WalkBack");
-   }
-
-   private async void Fire()
-   {
-      IsShooting = true;
-      var projectile = _fireProjectile.Instantiate<Projectile>();
-      projectile.Position = Position + new Vector3(0f, 1f, 0f);
-      projectile.ParentCharacter = this;
-      GetParent().AddChild(projectile);
-      CanShoot = false;
-      await ToSignal(GetTree().CreateTimer(2.0f), "timeout");
-      CanShoot = true;
-      IsShooting = false;
-   }
-
-   private async void AltFire()
-   {
-      IsShooting = true;
-      var projectile = _altFireProjectile.Instantiate<Projectile>();
-      projectile.Position = Position + new Vector3(0f, 1f, 0f);
-      projectile.ParentCharacter = this;
-      GetParent().AddChild(projectile);
-      CanShoot = false;
-      await ToSignal(GetTree().CreateTimer(2.0f), "timeout");
-      CanShoot = true;
-      IsShooting = false;
-   }
-
-   private void AttackSprite(Vector3 direction)
-   {
-      var roundedDirection = direction.Round();
-
-      if (roundedDirection == Vector3.Right)
-      {
-         _sprite.Play("AttackSide");
-         _sprite.FlipH = false;
-      }
-      if (roundedDirection == Vector3.Left)
-      {
-         _sprite.Play("AttackSide");
-         _sprite.FlipH = true;
-      }
-      if (roundedDirection == Vector3.Forward)
-         _sprite.Play("AttackForward");
-      if (roundedDirection == Vector3.Back)
-         _sprite.Play("AttackBack");
-
-      if (direction.IsEqualApprox(Vector3.Zero))
-         _sprite.Play("AttackForward");
-   }
-
-   public new void OnHit(Node3D node)
-   {
-      if (this != null)
-         _gameManager.CallDeferred(GameManager.MethodName.RemoveCharacter, this);
-   }
-}

Player/Pisces/Attacks/ShotgunBullet.cs

@@ -1,13 +0,0 @@
-using Godot;
-using System.Linq;
-
-public partial class ShotgunBullet : Projectile
-{
-   public override void _PhysicsProcess(double delta)
-   {
-      var pellets = GetChildren().OfType<RigidBody3D>();
-
-      foreach (var pellet in pellets)
-         pellet.Translate(new Vector3(pellet.Rotation.Y, 0, Speed * -(float)delta));
-   }
-}

Player/Pisces/Attacks/ShotgunBullet.tscn

@@ -1,27 +1,37 @@
-[gd_scene load_steps=7 format=3 uid="uid://bq40xbqibrk1y"]
+[gd_scene load_steps=6 format=3 uid="uid://bq40xbqibrk1y"]
 
-[ext_resource type="Script" path="res://Player/Pisces/Attacks/ShotgunBullet.cs" id="1_0khuu"]
+[ext_resource type="Script" path="res://Player/Base/Projectile.cs" id="1_ivbjp"]
 [ext_resource type="Texture2D" uid="uid://crlvrwo2l11ja" path="res://Textures/Projectiles/Projectile_Pisces_MultiAttack.png" id="2_a612r"]
 [ext_resource type="AudioStream" uid="uid://cw1jlubd7wmw6" path="res://Audio/SFX/blue laser.wav" id="2_oxtlx"]
 
-[sub_resource type="CylinderShape3D" id="CylinderShape3D_eme14"]
+[sub_resource type="Curve3D" id="Curve3D_h8ghr"]
-radius = 0.3
+_data = {
-
+"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.008, 0, -5),
-[sub_resource type="CylinderShape3D" id="CylinderShape3D_752q2"]
+"tilts": PackedFloat32Array(0, 0)
-radius = 0.3
+}
+point_count = 2
 
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_ebbqv"]
 radius = 0.3
 
 [node name="ShotgunBullet" type="Node3D"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.73894, 0)
-script = ExtResource("1_0khuu")
+script = ExtResource("1_ivbjp")
-Cooldown = 0.5
+Cooldown = 1.0
 _soundEffect = ExtResource("2_oxtlx")
-_projectileSpeed = 15.0
 
-[node name="RigidBody3D" type="RigidBody3D" parent="."]
+[node name="Center Shot" type="Path3D" parent="."]
-transform = Transform3D(0.99863, 0, -0.052336, 0, 1, 0, 0.052336, 0, 0.99863, -0.334469, 0, 0)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.25)
+top_level = true
+curve = SubResource("Curve3D_h8ghr")
+
+[node name="PathFollow3D" type="PathFollow3D" parent="Center Shot"]
+transform = Transform3D(-0.999998, 0, 0.00159994, 0, 1, 0, -0.00159994, 0, -0.999998, 0, 0, 0)
+loop = false
+tilt_enabled = false
+
+[node name="Hitbox" type="RigidBody3D" parent="Center Shot/PathFollow3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00512208, 0, 0.096)
 collision_layer = 34
 collision_mask = 34
 gravity_scale = 0.0
@@ -30,52 +40,66 @@ max_contacts_reported = 1000
 contact_monitor = true
 can_sleep = false
 
-[node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D"]
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Center Shot/PathFollow3D/Hitbox"]
-transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0)
-shape = SubResource("CylinderShape3D_eme14")
-
-[node name="Sprite3D" type="Sprite3D" parent="RigidBody3D/CollisionShape3D"]
-axis = 1
-texture = ExtResource("2_a612r")
-
-[node name="RigidBody3D2" type="RigidBody3D" parent="."]
-transform = Transform3D(0.99863, 0, 0.052336, 0, 1, 0, -0.052336, 0, 0.99863, 0.463951, 0, 0)
-collision_layer = 34
-collision_mask = 34
-gravity_scale = 0.0
-continuous_cd = true
-max_contacts_reported = 1000
-contact_monitor = true
-can_sleep = false
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D2"]
-transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0)
-shape = SubResource("CylinderShape3D_752q2")
-
-[node name="Sprite3D" type="Sprite3D" parent="RigidBody3D2/CollisionShape3D"]
-axis = 1
-texture = ExtResource("2_a612r")
-
-[node name="RigidBody3D3" type="RigidBody3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0600076, 0, -0.345734)
-collision_layer = 34
-collision_mask = 34
-gravity_scale = 0.0
-continuous_cd = true
-max_contacts_reported = 1000
-contact_monitor = true
-can_sleep = false
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D3"]
 transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0)
 shape = SubResource("CylinderShape3D_ebbqv")
 
-[node name="Sprite3D" type="Sprite3D" parent="RigidBody3D3/CollisionShape3D"]
+[node name="Sprite3D" type="Sprite3D" parent="Center Shot/PathFollow3D/Hitbox/CollisionShape3D"]
 axis = 1
 texture = ExtResource("2_a612r")
 
-[node name="TTL" type="Timer" parent="."]
+[node name="Left Shot" type="Path3D" parent="."]
-process_callback = 0
+transform = Transform3D(0.984808, 0, 0.173648, 0, 1, 0, -0.173648, 0, 0.984808, -0.462206, 0, -0.1)
-autostart = true
+top_level = true
+curve = SubResource("Curve3D_h8ghr")
 
-[connection signal="timeout" from="TTL" to="." method="OnTimeToLiveTimeout"]
+[node name="PathFollow3D" type="PathFollow3D" parent="Left Shot"]
+transform = Transform3D(-0.999998, 0, 0.00159994, 0, 1, 0, -0.00159994, 0, -0.999998, 0, 0, 0)
+loop = false
+tilt_enabled = false
+
+[node name="Hitbox" type="RigidBody3D" parent="Left Shot/PathFollow3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.03827, 0, 0.0309103)
+collision_layer = 34
+collision_mask = 34
+gravity_scale = 0.0
+continuous_cd = true
+max_contacts_reported = 1000
+contact_monitor = true
+can_sleep = false
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Left Shot/PathFollow3D/Hitbox"]
+transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0)
+shape = SubResource("CylinderShape3D_ebbqv")
+
+[node name="Sprite3D" type="Sprite3D" parent="Left Shot/PathFollow3D/Hitbox/CollisionShape3D"]
+axis = 1
+texture = ExtResource("2_a612r")
+
+[node name="Right Shot" type="Path3D" parent="."]
+transform = Transform3D(0.984808, 0, -0.173648, 0, 1, 0, 0.173648, 0, 0.984808, 0.426491, 0, 0)
+top_level = true
+curve = SubResource("Curve3D_h8ghr")
+
+[node name="PathFollow3D" type="PathFollow3D" parent="Right Shot"]
+transform = Transform3D(-0.999998, 0, 0.00159994, 0, 1, 0, -0.00159994, 0, -0.999998, 0, 0, 0)
+loop = false
+tilt_enabled = false
+
+[node name="Hitbox" type="RigidBody3D" parent="Right Shot/PathFollow3D"]
+transform = Transform3D(-1, 0, -0.00159994, 0, 1, 0, 0.00159994, 0, -1, -0.06, 0, 0.096)
+collision_layer = 34
+collision_mask = 34
+gravity_scale = 0.0
+continuous_cd = true
+max_contacts_reported = 1000
+contact_monitor = true
+can_sleep = false
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Right Shot/PathFollow3D/Hitbox"]
+transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, -0.00941685, 0, -0.0539098)
+shape = SubResource("CylinderShape3D_ebbqv")
+
+[node name="Sprite3D" type="Sprite3D" parent="Right Shot/PathFollow3D/Hitbox/CollisionShape3D"]
+axis = 1
+texture = ExtResource("2_a612r")

Player/Pisces/Attacks/Single.tscn

@@ -1,19 +1,36 @@
-[gd_scene load_steps=5 format=3 uid="uid://cyn2wn6ffsnu7"]
+[gd_scene load_steps=6 format=3 uid="uid://cyn2wn6ffsnu7"]
 
-[ext_resource type="Script" path="res://Player/Pisces/Attacks/SingleShot.cs" id="1_18l5k"]
+[ext_resource type="Script" path="res://Player/Base/Projectile.cs" id="1_62kpd"]
 [ext_resource type="AudioStream" uid="uid://cw1jlubd7wmw6" path="res://Audio/SFX/blue laser.wav" id="2_7lbn3"]
 [ext_resource type="Texture2D" uid="uid://kecmkchurnin" path="res://Textures/Projectiles/Projectile_Pisces_SingleAttack.png" id="2_d8lwd"]
 
+[sub_resource type="Curve3D" id="Curve3D_do6j1"]
+_data = {
+"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.008, 0, -5),
+"tilts": PackedFloat32Array(0, 0)
+}
+point_count = 2
+
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_njobr"]
 radius = 0.3
 
 [node name="Single" type="Node3D"]
-script = ExtResource("1_18l5k")
+script = ExtResource("1_62kpd")
-Cooldown = 0.3
+Cooldown = 1.0
 _soundEffect = ExtResource("2_7lbn3")
-_projectileSpeed = 10.0
 
-[node name="RigidBody3D" type="RigidBody3D" parent="."]
+[node name="Center Shot" type="Path3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, -0.25)
+top_level = true
+curve = SubResource("Curve3D_do6j1")
+
+[node name="PathFollow3D" type="PathFollow3D" parent="Center Shot"]
+transform = Transform3D(-0.999998, 0, 0.00159994, 0, 1, 0, -0.00159994, 0, -0.999998, 0, 0, 0)
+loop = false
+tilt_enabled = false
+
+[node name="Hitbox" type="RigidBody3D" parent="Center Shot/PathFollow3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0)
 collision_layer = 34
 collision_mask = 34
 gravity_scale = 0.0
@@ -22,19 +39,12 @@ max_contacts_reported = 1000
 contact_monitor = true
 can_sleep = false
 
-[node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D"]
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Center Shot/PathFollow3D/Hitbox"]
-transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0.644825, 0)
+transform = Transform3D(0.5, 0, -7.10543e-15, 0, 0.5, 0, 7.10543e-15, 0, 0.5, 0, 0, 0)
 shape = SubResource("CylinderShape3D_njobr")
 
-[node name="Sprite3D" type="Sprite3D" parent="RigidBody3D/CollisionShape3D"]
+[node name="Sprite3D" type="Sprite3D" parent="Center Shot/PathFollow3D/Hitbox/CollisionShape3D"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.31565, 0.765425, 0.303541)
+transform = Transform3D(1, 0, -3.55271e-14, 0, 1, 0, 3.55271e-14, 0, 1, -0.299847, 0, 0.288742)
 centered = false
 axis = 1
 texture = ExtResource("2_d8lwd")
-
-[node name="TTL" type="Timer" parent="."]
-process_callback = 0
-wait_time = 0.8
-autostart = true
-
-[connection signal="timeout" from="TTL" to="." method="OnTimeToLiveTimeout"]

Player/Pisces/Attacks/SingleShot.cs

@@ -1,11 +0,0 @@
-using Godot;
-using System.Linq;
-
-public partial class SingleShot : Projectile
-{
-   public override void _PhysicsProcess(double delta)
-   {
-      var pellet = GetChildren().OfType<RigidBody3D>().Single();
-      pellet.Translate(new Vector3(0, 0, Speed * -(float)delta));
-   }
-}

Player/Pisces/P2PiscesWitch.tscn

@@ -1,39 +0,0 @@
-[gd_scene load_steps=7 format=3 uid="uid://dfanwejjy3iue"]
-
-[ext_resource type="Script" path="res://Player/Base/P2Controls.cs" id="1_0onpw"]
-[ext_resource type="PackedScene" uid="uid://cyn2wn6ffsnu7" path="res://Player/Pisces/Attacks/Single.tscn" id="2_285w6"]
-[ext_resource type="PackedScene" uid="uid://bq40xbqibrk1y" path="res://Player/Pisces/Attacks/ShotgunBullet.tscn" id="3_00thi"]
-[ext_resource type="PackedScene" uid="uid://yosw0j58nvrf" path="res://Player/Pisces/Models/fwitch.gltf" id="4_hwtlk"]
-
-[sub_resource type="BoxShape3D" id="BoxShape3D_gqlci"]
-size = Vector3(3.04879, 3.92906, 2.56521)
-
-[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_fqik1"]
-radius = 0.704872
-height = 1.67894
-
-[node name="PiscesP2" type="CharacterBody3D" groups=["Player"]]
-transform = Transform3D(0.33, 0, 0, 0, 0.33, 0, 0, 0, 0.33, 0, 0.533944, 0)
-motion_mode = 1
-script = ExtResource("1_0onpw")
-_fireProjectile = ExtResource("2_285w6")
-_altFireProjectile = ExtResource("3_00thi")
-
-[node name="Pivot" type="Node3D" parent="."]
-
-[node name="fwitch" parent="Pivot" instance=ExtResource("4_hwtlk")]
-
-[node name="Area3D" type="Area3D" parent="Pivot"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.75657e-15, 0, 0)
-collision_layer = 16
-collision_mask = 4100
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="Pivot/Area3D"]
-transform = Transform3D(0.999665, -0.0258978, -7.10543e-15, 0.0258978, 0.999665, 0, 0, 0, 1, -0.0242356, 2.05297, -0.302385)
-shape = SubResource("BoxShape3D_gqlci")
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.06805, -0.211049)
-shape = SubResource("CapsuleShape3D_fqik1")
-
-[connection signal="body_entered" from="Pivot/Area3D" to="." method="OnHit"]

Player/Pisces/Pisces.tscn

@@ -1,9 +1,9 @@
 [gd_scene load_steps=7 format=3 uid="uid://b38hcomu4tpm5"]
 
-[ext_resource type="Script" path="res://Player/Base/P1Controls.cs" id="1_13s3m"]
+[ext_resource type="Script" path="res://Player/Base/Character.cs" id="1_gp8nm"]
-[ext_resource type="PackedScene" uid="uid://cyn2wn6ffsnu7" path="res://Player/Pisces/Attacks/Single.tscn" id="2_y0wmm"]
+[ext_resource type="PackedScene" uid="uid://cyn2wn6ffsnu7" path="res://Player/Pisces/Attacks/Single.tscn" id="2_rsvhh"]
-[ext_resource type="PackedScene" uid="uid://bq40xbqibrk1y" path="res://Player/Pisces/Attacks/ShotgunBullet.tscn" id="3_p4fqi"]
+[ext_resource type="PackedScene" uid="uid://bq40xbqibrk1y" path="res://Player/Pisces/Attacks/ShotgunBullet.tscn" id="3_5m8tq"]
-[ext_resource type="PackedScene" uid="uid://yosw0j58nvrf" path="res://Player/Pisces/Models/fwitch.gltf" id="4_mtwuo"]
+[ext_resource type="PackedScene" uid="uid://yosw0j58nvrf" path="res://Player/Pisces/Models/fwitch.gltf" id="4_d60j6"]
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_xynge"]
 size = Vector3(3.04879, 3.92906, 2.56521)
@@ -12,16 +12,17 @@ size = Vector3(3.04879, 3.92906, 2.56521)
 radius = 0.704872
 height = 1.67894
 
-[node name="PiscesP1" type="CharacterBody3D" groups=["Player"]]
+[node name="Pisces" type="CharacterBody3D" groups=["Player"]]
 transform = Transform3D(0.33, 0, 0, 0, 0.33, 0, 0, 0, 0.33, 0, 0.332056, 0)
+collision_layer = 25
 motion_mode = 1
-script = ExtResource("1_13s3m")
+script = ExtResource("1_gp8nm")
-_fireProjectile = ExtResource("2_y0wmm")
+_fireProjectile = ExtResource("2_rsvhh")
-_altFireProjectile = ExtResource("3_p4fqi")
+_altFireProjectile = ExtResource("3_5m8tq")
 
 [node name="Pivot" type="Node3D" parent="."]
 
-[node name="fwitch" parent="Pivot" instance=ExtResource("4_mtwuo")]
+[node name="fwitch" parent="Pivot" instance=ExtResource("4_d60j6")]
 
 [node name="Area3D" type="Area3D" parent="Pivot"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.75657e-15, 0, 0)

Player/Sagittarius/Attacks/MegamiBeam.tscn

@@ -12,22 +12,23 @@ _data = {
 point_count = 2
 
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_bnunv"]
-radius = 0.419241
+height = 9.57027
+radius = 0.57027
 
 [node name="MegamiBeam" type="Node3D" node_paths=PackedStringArray("_pathFollow")]
 script = ExtResource("1_a146o")
 _pathFollow = NodePath("Path3D/PathFollow3D")
 _soundEffect = ExtResource("2_vvcho")
 Cooldown = 3.0
-_soundEffect = ExtResource("2_vvcho")
 _projectileSpeed = 3.0
+_soundEffect = ExtResource("2_vvcho")
 
 [node name="Path3D" type="Path3D" parent="."]
 top_level = true
 curve = SubResource("Curve3D_7ok4f")
 
 [node name="PathFollow3D" type="PathFollow3D" parent="Path3D"]
-transform = Transform3D(-0.999999, 0, 0.000800044, 0, 1, 0, -0.000800044, 0, -0.999999, 0, 1, 0)
+transform = Transform3D(-0.999999, 0, 0.000800045, 0, 1, 0, -0.000800045, 0, -0.999999, 0, 1, 0)
 loop = false
 tilt_enabled = false
 

Player/Scorpio/Attacks/CutterShot.cs

@@ -2,24 +2,9 @@ using Godot;
 
 public partial class CutterShot : Projectile
 {
-   [Export]
-   private PathFollow3D _pathFollow;
    [Export]
    private Sprite3D _sprite;
 
-   public override void _Ready()
-   {
-      base._Ready();
-      _pathFollow = GetNode<PathFollow3D>("Path3D/PathFollow3D");
-   }
-
-   public override void _PhysicsProcess(double delta)
-   {
-      _pathFollow.Progress += 10f * (float)delta;
-      if (Mathf.IsEqualApprox(_pathFollow.ProgressRatio, 1.0f))
-         QueueFree();
-   }
-
    public override void _Process(double delta)
    {
       _sprite.RotateY(25);

Player/Scorpio/Attacks/CutterShot.tscn

@@ -14,13 +14,12 @@ point_count = 4
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_mgm2i"]
 height = 8.481
 
-[node name="CutterShot" type="Node3D" node_paths=PackedStringArray("_pathFollow", "_sprite")]
+[node name="CutterShot" type="Node3D" node_paths=PackedStringArray("_sprite")]
 script = ExtResource("1_inha4")
-_pathFollow = NodePath("Path3D/PathFollow3D")
+_sprite = NodePath("Path3D/PathFollow3D/RigidBody3D/CollisionShape3D/Sprite3D")
-_sprite = NodePath("Path3D/PathFollow3D/RigidBody3D/Sprite3D")
 Cooldown = 0.3
+_projectileSpeed = 3.0
 _soundEffect = ExtResource("2_u4aoe")
-_projectileSpeed = 0.1
 
 [node name="Path3D" type="Path3D" parent="."]
 top_level = true
@@ -44,16 +43,9 @@ can_sleep = false
 transform = Transform3D(0.999999, 0, 1.19209e-07, 0, 1, 0, -1.19209e-07, 0, 0.999999, 0, 0, 0)
 shape = SubResource("CylinderShape3D_mgm2i")
 
-[node name="Sprite3D" type="Sprite3D" parent="Path3D/PathFollow3D/RigidBody3D"]
+[node name="Sprite3D" type="Sprite3D" parent="Path3D/PathFollow3D/RigidBody3D/CollisionShape3D"]
 transform = Transform3D(0.156513, 0, 0.124514, 0, 0.2, 0, -0.124514, 0, 0.156513, 0, 0, 0)
 pixel_size = 0.03
 axis = 1
 double_sided = false
 texture = ExtResource("2_tqxh6")
-
-[node name="TTL" type="Timer" parent="."]
-process_callback = 0
-wait_time = 0.8
-autostart = true
-
-[connection signal="timeout" from="TTL" to="." method="OnTimeToLiveTimeout"]

Player/Scorpio/Attacks/CutterShotAltFire.tscn

@@ -14,13 +14,12 @@ point_count = 4
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_mgm2i"]
 height = 8.481
 
-[node name="CutterShot" type="Node3D" node_paths=PackedStringArray("_pathFollow", "_sprite")]
+[node name="CutterShot" type="Node3D" node_paths=PackedStringArray("_sprite")]
 script = ExtResource("1_7xtlh")
-_pathFollow = NodePath("Path3D/PathFollow3D")
 _sprite = NodePath("Path3D/PathFollow3D/RigidBody3D/CollisionShape3D/Sprite3D")
 Cooldown = 0.3
-_soundEffect = ExtResource("2_qmvk7")
 _projectileSpeed = 3.0
+_soundEffect = ExtResource("2_qmvk7")
 
 [node name="Path3D" type="Path3D" parent="."]
 top_level = true
@@ -50,10 +49,3 @@ pixel_size = 0.03
 axis = 1
 double_sided = false
 texture = ExtResource("2_6mabu")
-
-[node name="TTL" type="Timer" parent="."]
-process_callback = 0
-wait_time = 0.8
-autostart = true
-
-[connection signal="timeout" from="TTL" to="." method="OnTimeToLiveTimeout"]

Player/Scorpio/Models/ScorpioAnimated.tscn

@@ -58,9 +58,10 @@ _data = {
 }
 
 [node name="scoprion" type="Node3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.125745, 0)
 
 [node name="Cube" type="MeshInstance3D" parent="."]
-transform = Transform3D(0.0769273, 0, 0.0568499, 0, 0.082328, 0, -0.0293272, 0, 0.149121, 0, 0, 0)
+transform = Transform3D(0.0813447, 0, 0.0245918, 0, 0.082328, 0, -0.0126862, 0, 0.157684, 0, 0, 0)
 mesh = SubResource("ArrayMesh_lnvn0")
 skeleton = NodePath("")
 

Player/Scorpio/P2PlayerScorpio.tscn

@@ -1,37 +0,0 @@
-[gd_scene load_steps=7 format=3 uid="uid://cg6hdoeq70ke8"]
-
-[ext_resource type="Script" path="res://Player/Base/P2Controls.cs" id="1_auboe"]
-[ext_resource type="PackedScene" uid="uid://cxnek5wgpxbft" path="res://Player/Scorpio/Attacks/CutterShot.tscn" id="2_iw8b0"]
-[ext_resource type="PackedScene" uid="uid://cwt4rum7tvyvb" path="res://Player/Scorpio/Attacks/CutterShotAltFire.tscn" id="3_61xde"]
-[ext_resource type="PackedScene" uid="uid://dyhimd6qec8fu" path="res://Player/Scorpio/ScorpioAnimated.tscn" id="4_c22td"]
-
-[sub_resource type="BoxShape3D" id="BoxShape3D_wqp0e"]
-size = Vector3(0.822782, 0.527059, 0.80108)
-
-[sub_resource type="BoxShape3D" id="BoxShape3D_f8aaj"]
-size = Vector3(0.822782, 0.527059, 0.80108)
-
-[node name="ScorpioP2" type="CharacterBody3D" groups=["Player"]]
-motion_mode = 1
-script = ExtResource("1_auboe")
-_fireProjectile = ExtResource("2_iw8b0")
-_altFireProjectile = ExtResource("3_61xde")
-
-[node name="Pivot" type="Node3D" parent="."]
-
-[node name="scoprion" parent="Pivot" instance=ExtResource("4_c22td")]
-
-[node name="Area3D" type="Area3D" parent="Pivot"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.75657e-15, 0, 0)
-collision_layer = 16
-collision_mask = 4100
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="Pivot/Area3D"]
-transform = Transform3D(0.999665, -0.0258978, -7.10543e-15, 0.0258978, 0.999665, 0, 0, 0, 1, 0, 0, 0)
-shape = SubResource("BoxShape3D_wqp0e")
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0761452, 0)
-shape = SubResource("BoxShape3D_f8aaj")
-
-[connection signal="body_entered" from="Pivot/Area3D" to="." method="OnHit"]

Player/Scorpio/Scorpio.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=7 format=3 uid="uid://iempdafdn6ct"]
 
-[ext_resource type="Script" path="res://Player/Base/P1Controls.cs" id="1_o7l70"]
+[ext_resource type="Script" path="res://Player/Base/Character.cs" id="1_gw30u"]
-[ext_resource type="PackedScene" uid="uid://dyhimd6qec8fu" path="res://Player/Scorpio/ScorpioAnimated.tscn" id="2_pahgr"]
+[ext_resource type="PackedScene" uid="uid://dyhimd6qec8fu" path="res://Player/Scorpio/Models/ScorpioAnimated.tscn" id="2_pahgr"]
 [ext_resource type="PackedScene" uid="uid://cxnek5wgpxbft" path="res://Player/Scorpio/Attacks/CutterShot.tscn" id="2_uayjr"]
 [ext_resource type="PackedScene" uid="uid://cwt4rum7tvyvb" path="res://Player/Scorpio/Attacks/CutterShotAltFire.tscn" id="3_tw078"]
 
@@ -11,19 +11,18 @@ size = Vector3(0.822782, 0.881451, 0.80108)
 [sub_resource type="BoxShape3D" id="BoxShape3D_f8aaj"]
 size = Vector3(0.822782, 0.853857, 0.80108)
 
-[node name="ScorpioP1" type="CharacterBody3D" groups=["Player"]]
+[node name="Scorpio" type="CharacterBody3D" groups=["Player"]]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.55696, 0)
+collision_layer = 9
 motion_mode = 1
 slide_on_ceiling = false
-script = ExtResource("1_o7l70")
+script = ExtResource("1_gw30u")
 _fireProjectile = ExtResource("2_uayjr")
 _altFireProjectile = ExtResource("3_tw078")
 
 [node name="Pivot" type="Node3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.496155, 0)
 
-[node name="scoprion" parent="Pivot" instance=ExtResource("2_pahgr")]
-
 [node name="Area3D" type="Area3D" parent="Pivot"]
 collision_layer = 16
 collision_mask = 4100
@@ -31,8 +30,10 @@ collision_mask = 4100
 [node name="CollisionShape3D" type="CollisionShape3D" parent="Pivot/Area3D"]
 shape = SubResource("BoxShape3D_wqp0e")
 
+[node name="scoprion" parent="Pivot" instance=ExtResource("2_pahgr")]
+
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.315199, 0)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.506071, 0)
 shape = SubResource("BoxShape3D_f8aaj")
 
 [connection signal="body_entered" from="Pivot/Area3D" to="." method="OnHit"]

UI/CharacterSelectUpdateService.cs

@@ -7,96 +7,49 @@ public partial class CharacterSelectUpdateService : Control
    {
       base._Ready();
    }
-   public void OnCapricornP1Selected()
+   public void OnCapricornSelected(Player player)
    {
-      var allPortraits = GetNode<Control>("P1").GetChildren().OfType<TextureRect>();
+      var allPortraits = GetNode<Control>($"P{player.PlayerNumber}").GetChildren().OfType<TextureRect>();
       foreach (var bg in allPortraits)
          bg.Hide();
 
-      var node = GetNode<TextureRect>("P1/CapBG");
+      var node = GetNode<TextureRect>($"P{player.PlayerNumber}/CapBG");
       node.Show();
    }
 
-   public void OnPiscesP1Selected()
+   public void OnPiscesSelected(Player player)
    {
-      var allPortraits = GetNode<Control>("P1").GetChildren().OfType<TextureRect>();
+      var allPortraits = GetNode<Control>($"P{player.PlayerNumber}").GetChildren().OfType<TextureRect>();
       foreach (var bg in allPortraits)
          bg.Hide();
 
-      var node = GetNode<TextureRect>("P1/PiscesBG");
+      var node = GetNode<TextureRect>($"P{player.PlayerNumber}/PiscesBG");
       node.Show();
    }
 
-   public void OnSagP1Selected()
+   public void OnSagittariusSelected(Player player)
    {
-      var allPortraits = GetNode<Control>("P1").GetChildren().OfType<TextureRect>();
+      var allPortraits = GetNode<Control>($"P{player.PlayerNumber}").GetChildren().OfType<TextureRect>();
       foreach (var bg in allPortraits)
          bg.Hide();
 
-      var node = GetNode<TextureRect>("P1/SagBG");
+      var node = GetNode<TextureRect>($"P{player.PlayerNumber}/SagBG");
       node.Show();
    }
 
-   public void OnScorpioP1Selected()
+   public void OnScorpioSelected(Player player)
    {
-      var allPortraits = GetNode<Control>("P1").GetChildren().OfType<TextureRect>();
+      var allPortraits = GetNode<Control>($"P{player.PlayerNumber}").GetChildren().OfType<TextureRect>();
       foreach (var bg in allPortraits)
          bg.Hide();
 
-      var node = GetNode<TextureRect>("P1/ScorpioBG");
+      var node = GetNode<TextureRect>($"P{player.PlayerNumber}/ScorpioBG");
       node.Show();
    }
 
-   public void OnCapricornP2Selected()
+   public void OnPlayerGameOver(Player player)
    {
-      var allPortraits = GetNode<Control>("P2").GetChildren().OfType<TextureRect>();
+      var allPortraits = GetNode<Control>($"P{player.PlayerNumber}").GetChildren().OfType<TextureRect>();
-      foreach (var bg in allPortraits)
-         bg.Hide();
-
-      var node = GetNode<TextureRect>("P2/CapBG");
-      node.Show();
-   }
-
-   public void OnPiscesP2Selected()
-   {
-      var allPortraits = GetNode<Control>("P2").GetChildren().OfType<TextureRect>();
-      foreach (var bg in allPortraits)
-         bg.Hide();
-
-      var node = GetNode<TextureRect>("P2/PiscesBG");
-      node.Show();
-   }
-
-   public void OnSagP2Selected()
-   {
-      var allPortraits = GetNode<Control>("P2").GetChildren().OfType<TextureRect>();
-      foreach (var bg in allPortraits)
-         bg.Hide();
-
-      var node = GetNode<TextureRect>("P2/SagBG");
-      node.Show();
-   }
-
-   public void OnScorpioP2Selected()
-   {
-      var allPortraits = GetNode<Control>("P2").GetChildren().OfType<TextureRect>();
-      foreach (var bg in allPortraits)
-         bg.Hide();
-
-      var node = GetNode<TextureRect>("P2/ScorpioBG");
-      node.Show();
-   }
-
-   public void OnP1GameOver()
-   {
-      var allPortraits = GetNode<Control>("P1").GetChildren().OfType<TextureRect>();
-      foreach (var bg in allPortraits)
-         bg.Hide();
-   }
-
-   public void OnP2GameOver()
-   {
-      var allPortraits = GetNode<Control>("P2").GetChildren().OfType<TextureRect>();
       foreach (var bg in allPortraits)
          bg.Hide();
    }

UI/GameOverService.cs

@@ -0,0 +1,32 @@
+using Godot;
+using Godot.Collections;
+
+public partial class GameOverService : Control
+{
+   [Signal]
+   public delegate void ReloadGameEventHandler();
+
+   private GameManager _gameManager;
+
+   public override void _EnterTree()
+   {
+      _gameManager = GetTree().Root.GetNode<GameManager>("Main/GameManager");
+   }
+
+   public void OnGameOver(Array<Player> players)
+   {
+      Show();
+      var bgmPlayer = GetTree().Root.GetNode<BGMPlayer>("BgmPlayer");
+      bgmPlayer.SetBGMFromFilepath("Audio/BGM/GameOverTheme.wav");
+      bgmPlayer.PlayBGM();
+      foreach (var player in players)
+      {
+         if (Input.IsActionJustPressed(player.PlayerInput.Fire()))
+         {
+            Hide(); 
+            _gameManager.IsGameOverScreenOn = false;
+            EmitSignal(SignalName.ReloadGame);
+         }
+      }
+   }
+}

UI/StageGUI.cs

@@ -1,41 +1,32 @@
 using Godot;
+using Godot.Collections;
 using System.Linq;
 
 public partial class StageGUI : Control
 {
    [Signal]
-   public delegate void OnCharacterSelectionMadeEventHandler(PlayerManager player);
+   public delegate void OnCharacterSelectionMadeEventHandler(Character player);
    [Signal]
-   public delegate void CapricornP1SelectedEventHandler();
+   public delegate void CapricornSelectedEventHandler(Player player);
    [Signal]
-   public delegate void CapricornP2SelectedEventHandler();
+   public delegate void PiscesSelectedEventHandler(Player player);
    [Signal]
-   public delegate void PiscesP1SelectedEventHandler();
+   public delegate void SagittariusSelectedEventHandler(Player player);
    [Signal]
-   public delegate void PiscesP2SelectedEventHandler();
+   public delegate void ScorpioSelectedEventHandler(Player player);
    [Signal]
-   public delegate void SagP1SelectedEventHandler();
+   public delegate void OnPlayerGameOverEventHandler(Player player);
    [Signal]
-   public delegate void SagP2SelectedEventHandler();
+   public delegate void OnGameOverEventHandler(Array<Player> players);
-   [Signal]
-   public delegate void ScorpioP1SelectedEventHandler();
-   [Signal]
-   public delegate void ScorpioP2SelectedEventHandler();
-   [Signal]
-   public delegate void OnP1GameOverEventHandler();
-   [Signal]
-   public delegate void OnP2GameOverEventHandler();
-   [Signal]
-   public delegate void OnGameOverEventHandler();
 
    private GameManager _gameManager;
 
-   public override void _Ready()
+   public override void _EnterTree()
    {
       _gameManager = GetTree().Root.GetNode<GameManager>("Main/GameManager");
    }
 
-   public void OnCharacterSelect(PlayerManager player)
+   public void OnCharacterSelect(Player player)
    {
       if (player.GameOver)
          return;
@@ -46,109 +37,59 @@ public partial class StageGUI : Control
 
    public override void _Process(double delta)
    {
-      if (_gameManager.Players.ElementAt(0).IsSelectingCharacter)
+      var playersSelecting = _gameManager.Players.Where(x => x.IsSelectingCharacter);
+      foreach (var player in playersSelecting)
       {
-         if (Input.IsActionJustPressed("p1_right"))
+         if (Input.IsActionJustPressed(player.PlayerInput.Right()))
          {
-            _gameManager.SetToNextCharacter(_gameManager.Players.ElementAt(0));
+            _gameManager.SetToNextCharacter(player);
-            ChangeBG(_gameManager.Players.ElementAt(0));
+            ChangeBG(player);
          }
-         if (Input.IsActionJustPressed("p1_left"))
+         if (Input.IsActionJustPressed(player.PlayerInput.Left()))
          {
-            _gameManager.SetToPreviousCharacter(_gameManager.Players.ElementAt(0));
+            _gameManager.SetToPreviousCharacter(player);
-            ChangeBG(_gameManager.Players.ElementAt(0));
+            ChangeBG(player);
          }
 
-         if (Input.IsActionJustPressed("p1_fire"))
+         if (Input.IsActionJustPressed(player.PlayerInput.Fire()))
          {
             GD.Print("Selected character");
-            _gameManager.Players.ElementAt(0).IsSelectingCharacter = false;
+            player.IsSelectingCharacter = false;
-            EmitSignal(SignalName.OnCharacterSelectionMade, _gameManager.Players.ElementAt(0));
+            EmitSignal(SignalName.OnCharacterSelectionMade, player);
             GetTree().Paused = false;
          }
       }
 
-      if (_gameManager.Players.Count() == 2 && _gameManager.Players.ElementAt(0).IsSelectingCharacter)
+      foreach (var player in _gameManager.Players)
       {
-         if (Input.IsActionJustPressed("p2_right"))
+         if (player.GameOver)
-         {
+            EmitSignal(SignalName.OnPlayerGameOver, player);
-            _gameManager.SetToNextCharacter(_gameManager.Players.ElementAt(1));
-            ChangeBG(_gameManager.Players.ElementAt(1));
-         }
-         if (Input.IsActionJustPressed("p2_left"))
-         {
-            _gameManager.SetToPreviousCharacter(_gameManager.Players.ElementAt(1));
-            ChangeBG(_gameManager.Players.ElementAt(1));
-         }
-
-         if (Input.IsActionJustPressed("p2_fire"))
-         {
-            GD.Print("Selected character");
-            _gameManager.Players.ElementAt(1).IsSelectingCharacter = false;
-            EmitSignal(SignalName.OnCharacterSelectionMade, _gameManager.Players.ElementAt(1));
-            GetTree().Paused = false;
-         }
       }
 
-      if (_gameManager.Players.ElementAt(0).GameOver)
+      if (!_gameManager.IsGameOverScreenOn && _gameManager.Players.All(x => x.GameOver))
-         EmitSignal(SignalName.OnP1GameOver);
-      if (_gameManager.Players.Count() == 2 && _gameManager.Players.ElementAt(0).GameOver)
-         EmitSignal(SignalName.OnP1GameOver);
-
-      if (_gameManager.Players.All(x => x.GameOver))
       {
-         EmitSignal(SignalName.OnGameOver);
+         EmitSignal(SignalName.OnGameOver, new Array<Player>(_gameManager.Players));
-         GetNode<Control>("GameOver").Show();
-         var bgmPlayer = GetTree().Root.GetNode<BGMPlayer>("BgmPlayer");
-         bgmPlayer.SetBGMFromFilepath("Audio/BGM/GameOverTheme.wav");
-         bgmPlayer.PlayBGM();
       }
    }
 
-   private void ChangeBG(PlayerManager player)
+   private void ChangeBG(Player player)
    {
-      var name = player.CharactersLeftOnStage.ElementAt(player._characterIndex).Name;
+      var name = player.CharactersLeftOnStage.ElementAt(player.CharacterIndex).Name;
       GD.Print(name);
       switch (name)
       {
-         case "CapricornP1":
+         case "Capricorn":
-            EmitSignal(SignalName.CapricornP1Selected);
+            EmitSignal(SignalName.CapricornSelected, player);
             break;
-         case "CapricornP2":
+         case "Scorpio":
-            EmitSignal(SignalName.CapricornP2Selected);
+            EmitSignal(SignalName.ScorpioSelected, player);
             break;
-         case "ScorpioP1":
+         case "Pisces":
-            EmitSignal(SignalName.ScorpioP1Selected);
+            EmitSignal(SignalName.PiscesSelected, player);
             break;
-         case "ScorpioP2":
+         case "Sagittarius":
-            EmitSignal(SignalName.ScorpioP2Selected);
+            EmitSignal(SignalName.SagittariusSelected, player);
-            break;
-         case "PiscesP1":
-            EmitSignal(SignalName.PiscesP1Selected);
-            break;
-         case "PiscesP2":
-            EmitSignal(SignalName.PiscesP2Selected);
-            break;
-         case "MegamiP1":
-            EmitSignal(SignalName.SagP1Selected);
-            break;
-         case "MegamiP2":
-            EmitSignal(SignalName.SagP2Selected);
-            break;
-         default:
             break;
       }
    }
-
-   private void OnFirstPlayerCharacterSelect()
-   {
-      var player = _gameManager.Players.ElementAt(0);
-      OnCharacterSelect(player);
-   }
-
-   private void OnSecondPlayerCharacterSelect()
-   {
-      var player = _gameManager.Players.ElementAt(1);
-      OnCharacterSelect(player);
-   }
 }

UI/StageGUI.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=9 format=3 uid="uid://dq1gtd55p04do"]
+[gd_scene load_steps=8 format=3 uid="uid://dq1gtd55p04do"]
 
 [ext_resource type="Script" path="res://UI/StageGUI.cs" id="1_wr2m0"]
 [ext_resource type="Texture2D" uid="uid://d18xmfbg47qpi" path="res://Textures/Portraits/blank-background.png" id="2_rh3al"]
@@ -7,7 +7,6 @@
 [ext_resource type="Texture2D" uid="uid://1pgw8he4k5va" path="res://Textures/Portraits/pisces-bg-char.png" id="5_y2ln6"]
 [ext_resource type="Texture2D" uid="uid://bacwvejc4hcou" path="res://Textures/Portraits/sag-bg-char.png" id="6_iltal"]
 [ext_resource type="Texture2D" uid="uid://o7uu4efxf36e" path="res://Textures/Portraits/scorpio-bg-char.png" id="7_tgrf5"]
-[ext_resource type="Texture2D" uid="uid://dveeywi80ux2l" path="res://UI/Game_Over.jpg" id="8_o0pnh"]
 
 [node name="StageGUI" type="Control"]
 process_mode = 3
@@ -189,26 +188,3 @@ offset_bottom = 540.0
 grow_horizontal = 0
 grow_vertical = 2
 texture = ExtResource("7_tgrf5")
-
-[node name="GameOver" type="Control" parent="."]
-visible = false
-anchors_preset = 0
-offset_right = 40.0
-offset_bottom = 40.0
-
-[node name="GameOverScreen" type="TextureRect" parent="GameOver"]
-layout_mode = 0
-offset_right = 40.0
-offset_bottom = 40.0
-texture = ExtResource("8_o0pnh")
-
-[connection signal="CapricornP1Selected" from="." to="CharacterSelect" method="OnCapricornP1Selected"]
-[connection signal="CapricornP2Selected" from="." to="CharacterSelect" method="OnCapricornP2Selected"]
-[connection signal="OnP1GameOver" from="." to="CharacterSelect" method="OnP1GameOver"]
-[connection signal="OnP2GameOver" from="." to="CharacterSelect" method="OnP2GameOver"]
-[connection signal="PiscesP1Selected" from="." to="CharacterSelect" method="OnPiscesP1Selected"]
-[connection signal="PiscesP2Selected" from="." to="CharacterSelect" method="OnPiscesP2Selected"]
-[connection signal="SagP1Selected" from="." to="CharacterSelect" method="OnSagP1Selected"]
-[connection signal="SagP2Selected" from="." to="CharacterSelect" method="OnSagP2Selected"]
-[connection signal="ScorpioP1Selected" from="." to="CharacterSelect" method="OnScorpioP1Selected"]
-[connection signal="ScorpioP2Selected" from="." to="CharacterSelect" method="OnScorpioP2Selected"]