GameJammer/GameJam2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
Zenny
2023-09-06 14:43:12 -07:00
parent f8cca640a6
commit d536aa2014
41 changed files with 2747 additions and 1011 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
GameLogic/GameManager.cs
View File

@@ -8,15 +8,12 @@ public partial class GameManager : Node
[Signal]
public delegate void OnGameOverEventHandler();
[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 Array<Controls> P2CharactersOut = new Array<Controls>();
public IEnumerable<PlayerManager> Players = new List<PlayerManager>();
public IEnumerable<Player> Players = new List<Player>();
private int _levelIndex;
@@ -26,116 +23,83 @@ public partial class GameManager : Node
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();
GD.Print(player.CharactersLeftOnStage.ElementAt(player._characterIndex));
player.CharacterIndex = (++player.CharacterIndex) % player.CharactersLeftOnStage.Count();
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(names);
GD.Print(player.Name);
if (player.CharactersLeftOnStage.Any())
{
var selectedCharacter = player.CharactersLeftOnStage[player._characterIndex];
player.SelectedCharacter = selectedCharacter;
player.SelectedCharacter = player.CharactersLeftOnStage[player.CharacterIndex];
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 (Players.ElementAt(0).CharactersLeftOnStage.Any())
EmitSignal(SignalName.ReselectCharacter, Players.ElementAt(0));
if (!P1CharactersOut.Any() && !Players.ElementAt(0).CharactersLeftOnStage.Any())
SetGameOver(Players.ElementAt(0), true);
if (Players.Count() == 2 && !P2CharactersOut.Any() && !Players.ElementAt(1).CharactersLeftOnStage.Any())
SetGameOver(Players.ElementAt(1), true);
if (!player.CharactersExited.Any() && !player.CharactersLeftOnStage.Any())
SetGameOver(player, 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());
Players.ElementAt(1)._characterIndex = 0;
if (Players.ElementAt(1).CharactersLeftOnStage.Any())
EmitSignal(SignalName.ReselectCharacter, Players.ElementAt(1));
player.CharacterIndex = 0;
if (player.CharactersLeftOnStage.Any())
EmitSignal(SignalName.ReselectCharacter, player);
}
public void RemoveCharacterAndAddToExit(P1Controls character)
{
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)
public void SetGameOver(Player player, bool isGameOver)
{
player.GameOver = isGameOver;
if (isGameOver)
@@ -145,25 +109,17 @@ public partial class GameManager : Node
public void OnLevelClear()
{
Players.ElementAt(0).CharactersLeftOnStage.AddRange(P1CharactersOut);
if (Players.Count() == 2)
Players.ElementAt(1).CharactersLeftOnStage.AddRange(P2CharactersOut);
P1CharactersOut.Clear();
if (Players.Count() == 2)
P2CharactersOut.Clear();
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);
foreach (var player in Players)
{
player.CharactersLeftOnStage.AddRange(player.CharactersExited);
player.CharactersExited.Clear();
player.CharacterIndex = 0;
GetTree().Root.RemoveChild(player.SelectedCharacter);
}
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++);

14
GameLogic/GameManager.tscn
View File

@@ -17,8 +17,22 @@ 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
[connection signal="ReselectCharacter" from="." to="StageGUI" method="OnCharacterSelect"]
[connection signal="OnCharacterSelectionMade" from="StageGUI" to="." method="OnCharacterSelected"]