From b315a90720542e97141ba7fc12261e5e6a50e465 Mon Sep 17 00:00:00 2001 From: Zenny Date: Mon, 4 Sep 2023 16:11:05 -0700 Subject: [PATCH] I am doing a CHAOS check in. showing support for one another. I need SIX jacks to post, not share, this message to show you are always there to kill chaos if someone needs it. let's go gentlemen... --- Scenes/Levels/Level1.tscn | 15 ++++++++++----- Scripts/AreaExit.cs | 6 +----- Scripts/BasicEnemy.cs | 6 ++---- Scripts/GameManager.cs | 35 +++++++++++++++++++++++------------ Scripts/Level.cs | 29 +++++++++++++++++++++++++++++ Scripts/Main.cs | 6 +++++- Scripts/MainMenu.cs | 1 - Scripts/StageGUI.cs | 2 +- 8 files changed, 71 insertions(+), 29 deletions(-) diff --git a/Scenes/Levels/Level1.tscn b/Scenes/Levels/Level1.tscn index 190d8e8..2c707b3 100644 --- a/Scenes/Levels/Level1.tscn +++ b/Scenes/Levels/Level1.tscn @@ -1,15 +1,17 @@ [gd_scene load_steps=6 format=3 uid="uid://dqv03pua4j8ga"] -[ext_resource type="Script" path="res://Scripts/AreaExit.cs" id="1_owv8t"] +[ext_resource type="Script" path="res://Scripts/Level.cs" id="1_mbqlj"] +[ext_resource type="PackedScene" uid="uid://bt5rolsyjmx55" path="res://Scenes/MeleeEnemyOrb.tscn" id="5_dqbra"] [ext_resource type="PackedScene" uid="uid://bnn68u04ktmas" path="res://Levels/Final Levels/Stage1/Stage1Fix.tscn" id="6_60jd6"] [ext_resource type="PackedScene" uid="uid://jgf7k1r35km1" path="res://Scenes/ExitPortal.tscn" id="6_gegi6"] -[ext_resource type="PackedScene" uid="uid://dahp73fwld24h" path="res://Scenes/RangedEnemy.tscn" id="6_jck5a"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_kv6vl"] radius = 0.957319 [node name="Level1" type="Node3D" groups=["Level"]] -script = ExtResource("1_owv8t") +script = ExtResource("1_mbqlj") +_enemyScenes = Array[PackedScene]([ExtResource("5_dqbra")]) +_spawnPoints = Array[Marker3D]([null]) [node name="Area3D2" type="Area3D" parent="." groups=["Level"]] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.568617, 0, -1.72171) @@ -25,7 +27,10 @@ shape = SubResource("CylinderShape3D_kv6vl") [node name="STAGE 1" parent="." instance=ExtResource("6_60jd6")] -[node name="RangedEnemy" parent="." instance=ExtResource("6_jck5a")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3, 0, 0) +[node name="EnemySpawnLocations" type="Node3D" parent="."] + +[node name="Spawn1" type="Marker3D" parent="EnemySpawnLocations"] +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -3.17988, 0, 0) +gizmo_extents = 1.0 [connection signal="body_entered" from="Area3D2" to="." method="OnExitEntered"] diff --git a/Scripts/AreaExit.cs b/Scripts/AreaExit.cs index fa9cdcd..4447a98 100644 --- a/Scripts/AreaExit.cs +++ b/Scripts/AreaExit.cs @@ -21,11 +21,7 @@ public partial class AreaExit : Node3D if (node.GetType() == typeof(Character2)) _gameManager.RemoveCharacterAndAddToExit((Character2)node); - var main = GetTree().Root.GetNode
("/root/Main"); - if (!_gameManager.Players.ElementAt(0).CharactersLeftOnStage.Any()) - { + if (!_gameManager.Players.Any(x => x.CharactersLeftOnStage.Any())) _gameManager.OnLevelClear(); - main.LoadNextLevel(_levelIndex); - } } } diff --git a/Scripts/BasicEnemy.cs b/Scripts/BasicEnemy.cs index 50d5c42..f013bcf 100644 --- a/Scripts/BasicEnemy.cs +++ b/Scripts/BasicEnemy.cs @@ -11,10 +11,8 @@ public partial class BasicEnemy : Node3D public void OnEnemyHit(Node3D node) { + var currentLevel = (Level)GetTree().GetFirstNodeInGroup("Level"); + currentLevel.OnEnemyDefeated((Node3D)GetParent()); QueueFree(); - if (_gameManager.CheckAllEnemiesDefeated()) - { - _gameManager.OnAllEnemiesDefeated(); - } } } diff --git a/Scripts/GameManager.cs b/Scripts/GameManager.cs index 73ee49b..665cffe 100644 --- a/Scripts/GameManager.cs +++ b/Scripts/GameManager.cs @@ -20,11 +20,14 @@ public partial class GameManager : Node public IEnumerable Players = new List(); + private int _levelIndex; + public override void _Ready() { - foreach (var playerScene in PlayerScenes) + var main = GetTree().Root.GetNode
("/root/Main"); + for (var i = 0; i < main.NumberOfPlayers; i++) { - var player = playerScene.Instantiate(); + var player = PlayerScenes[i].Instantiate(); Players = Players.Append((Player)player); GetTree().Root.AddChild(player); } @@ -34,15 +37,11 @@ public partial class GameManager : Node { GD.Print("All enemies defeated"); P1CharactersOut.AddRange(Players.ElementAt(0).CharactersLeftOnStage); - P2CharactersOut.AddRange(Players.ElementAt(1).CharactersLeftOnStage); + if (Players.Count() == 2) + P2CharactersOut.AddRange(Players.ElementAt(1).CharactersLeftOnStage); OnLevelClear(); } - public bool CheckAllEnemiesDefeated() - { - return !GetTree().GetNodesInGroup("Enemy").Any(); - } - public void OnHandleCharacterSelectUI(Player player) { EmitSignal(SignalName.ReselectCharacter, player); @@ -115,15 +114,27 @@ public partial class GameManager : Node public void OnLevelClear() { Players.ElementAt(0).CharactersLeftOnStage.AddRange(P1CharactersOut); - Players.ElementAt(1).CharactersLeftOnStage.AddRange(P2CharactersOut); + if (Players.Count() == 2) + Players.ElementAt(1).CharactersLeftOnStage.AddRange(P2CharactersOut); P1CharactersOut.Clear(); - P2CharactersOut.Clear(); + if (Players.Count() == 2) + P2CharactersOut.Clear(); Players.ElementAt(0)._characterIndex = 0; - Players.ElementAt(1)._characterIndex = 0; + if (Players.Count() == 2) + Players.ElementAt(1)._characterIndex = 0; - EmitSignal(SignalName.ReselectCharacter, Players.ElementAt(0)); + var players = GetTree().GetNodesInGroup("Player"); + foreach (var player in players) + GetTree().Root.RemoveChild(player); + + var main = GetTree().Root.GetNode
("/root/Main"); + + main.LoadNextLevel(_levelIndex++); + + foreach (var player in Players) + EmitSignal(SignalName.ReselectCharacter, player); } public bool IsGameOver => _gameOver; diff --git a/Scripts/Level.cs b/Scripts/Level.cs index 1dd127d..94d003c 100644 --- a/Scripts/Level.cs +++ b/Scripts/Level.cs @@ -1,6 +1,35 @@ using Godot; +using Godot.Collections; +using System.Linq; public partial class Level : Node3D { + [Export] + private Array _enemyScenes; + [Export] + private Array _spawnPoints; + private Array _enemies = new Array(); + + private GameManager _gameManager; + + public override void _Ready() + { + _gameManager = GetTree().Root.GetNode("Main/GameManager"); + for (var i = 0; i < _enemyScenes.Count; i++) + { + var enemy = _enemyScenes[i].Instantiate(); + var convertedNode = (Node3D)enemy; + GetTree().Root.AddChild(convertedNode); + _enemies.Add(convertedNode); + //convertedNode.Transform = _spawnPoints[i].Transform; + } + } + + public void OnEnemyDefeated(Node3D enemyDefeated) + { + _enemies.Remove(enemyDefeated); + if (!_enemies.Any()) + _gameManager.OnAllEnemiesDefeated(); + } } diff --git a/Scripts/Main.cs b/Scripts/Main.cs index bacef21..5287e29 100644 --- a/Scripts/Main.cs +++ b/Scripts/Main.cs @@ -9,16 +9,20 @@ public partial class Main : Node [Export] public PackedScene GameManager; + public int NumberOfPlayers = 0; + public void LoadLevel(int indexToLoad, int numberOfPlayers) { var sceneToLoad = Levels.ElementAt(indexToLoad); CallDeferred(nameof(DeferredGoToScene), sceneToLoad); + + NumberOfPlayers = numberOfPlayers; + var gameManager = GameManager.Instantiate(); AddChild(gameManager); var gameManagerInstance = (GameManager)gameManager; gameManagerInstance.OnHandleCharacterSelectUI(gameManagerInstance.Players.ElementAt(0)); - if (numberOfPlayers == 2) gameManagerInstance.OnHandleCharacterSelectUI(gameManagerInstance.Players.ElementAt(1)); } diff --git a/Scripts/MainMenu.cs b/Scripts/MainMenu.cs index f68fa90..c86661a 100644 --- a/Scripts/MainMenu.cs +++ b/Scripts/MainMenu.cs @@ -1,5 +1,4 @@ using Godot; -using System.Linq; public partial class MainMenu : Node2D { diff --git a/Scripts/StageGUI.cs b/Scripts/StageGUI.cs index c43b0ab..2dad73d 100644 --- a/Scripts/StageGUI.cs +++ b/Scripts/StageGUI.cs @@ -57,7 +57,7 @@ public partial class StageGUI : Control } } - if (player == _gameManager.Players.ElementAt(1)) + if (_gameManager.Players.Count() == 2 && player == _gameManager.Players.ElementAt(1)) { if (Input.IsActionJustPressed("p2_right")) _gameManager.SetToNextCharacter(_gameManager.Players.ElementAt(1));