Compare commits
3 Commits
5aff65d384
...
b315a90720
| Author | SHA1 | Date | |
|---|---|---|---|
| b315a90720 | |||
| 4d0b0196e6 | |||
| 0be97870dc |
@@ -1,16 +1,17 @@
|
||||
[gd_scene load_steps=7 format=3 uid="uid://dqv03pua4j8ga"]
|
||||
[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)
|
||||
@@ -24,11 +25,12 @@ transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, 0, -2.53252)
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -2.51823)
|
||||
shape = SubResource("CylinderShape3D_kv6vl")
|
||||
|
||||
[node name="MeleeEnemyOrb" parent="." instance=ExtResource("5_dqbra")]
|
||||
|
||||
[node name="Node3D" parent="." instance=ExtResource("6_jck5a")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3, 0, 0)
|
||||
|
||||
[node name="STAGE 1" parent="." instance=ExtResource("6_60jd6")]
|
||||
|
||||
[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"]
|
||||
|
||||
@@ -9,13 +9,12 @@ size = Vector3(0.470892, 0.604331, 0.423598)
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_i1yvp"]
|
||||
size = Vector3(0.470892, 0.604331, 0.423598)
|
||||
|
||||
[node name="MeleeEnemyOrb" type="Node3D"]
|
||||
[node name="MeleeEnemyOrb" type="Node3D" groups=["Enemy"]]
|
||||
|
||||
[node name="CharacterBody3D" type="CharacterBody3D" parent="."]
|
||||
collision_layer = 4096
|
||||
collision_mask = 0
|
||||
script = ExtResource("1_50och")
|
||||
_speed = 0.5
|
||||
|
||||
[node name="CollisionShape3D" type="CollisionShape3D" parent="CharacterBody3D"]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0840461, 0.475385, 0.143401)
|
||||
@@ -31,4 +30,4 @@ collision_mask = 2
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0840461, 0.475385, 0.143401)
|
||||
shape = SubResource("BoxShape3D_i1yvp")
|
||||
|
||||
[connection signal="body_entered" from="CharacterBody3D/Area3D" to="CharacterBody3D" method="OnHit"]
|
||||
[connection signal="body_entered" from="CharacterBody3D/Area3D" to="CharacterBody3D" method="OnEnemyHit"]
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
[sub_resource type="BoxShape3D" id="BoxShape3D_dm3u7"]
|
||||
size = Vector3(0.849075, 2.18529, 0.924281)
|
||||
|
||||
[node name="RangedEnemy" type="Node3D"]
|
||||
[node name="RangedEnemy" type="Node3D" groups=["Enemy"]]
|
||||
script = ExtResource("1_01lvj")
|
||||
|
||||
[node name="Area3D" type="Area3D" parent="."]
|
||||
@@ -29,5 +29,5 @@ script = ExtResource("3_qt2md")
|
||||
_enemy = NodePath("../Area3D")
|
||||
_fireProjectile = ExtResource("3_qenx3")
|
||||
|
||||
[connection signal="body_entered" from="Area3D" to="." method="OnHit"]
|
||||
[connection signal="body_entered" from="Area3D" to="." method="OnEnemyHit"]
|
||||
[connection signal="timeout" from="Timer" to="Timer" method="OnFireAtPlayer"]
|
||||
|
||||
@@ -115,22 +115,3 @@ grow_vertical = 2
|
||||
scale = Vector2(0.3, 0.3)
|
||||
texture = ExtResource("1_id5nf")
|
||||
expand_mode = 1
|
||||
|
||||
[node name="Button" type="Button" parent="CharacterSelect"]
|
||||
layout_mode = 0
|
||||
offset_left = 64.0
|
||||
offset_top = 774.0
|
||||
offset_right = 336.0
|
||||
offset_bottom = 889.0
|
||||
text = "Character select"
|
||||
|
||||
[node name="Button2" type="Button" parent="CharacterSelect"]
|
||||
layout_mode = 0
|
||||
offset_left = 1589.0
|
||||
offset_top = 785.0
|
||||
offset_right = 1861.0
|
||||
offset_bottom = 900.0
|
||||
text = "Character select"
|
||||
|
||||
[connection signal="pressed" from="CharacterSelect/Button" to="." method="OnFirstPlayerCharacterSelect"]
|
||||
[connection signal="pressed" from="CharacterSelect/Button2" to="." method="OnSecondPlayerCharacterSelect"]
|
||||
|
||||
@@ -41,3 +41,8 @@ transform = Transform3D(0.08, 0, 0, 0, 0.08, 0, 0, 0, 0.08, -0.379318, 1.02602,
|
||||
centered = false
|
||||
axis = 1
|
||||
texture = ExtResource("2_6l2aj")
|
||||
|
||||
[node name="TTL" type="Timer" parent="."]
|
||||
process_callback = 0
|
||||
wait_time = 0.8
|
||||
autostart = true
|
||||
|
||||
@@ -29,3 +29,10 @@ transform = Transform3D(0.07, 0, 0, 0, 0.07, 0, 0, 0, 0.07, -0.244938, 1.29552,
|
||||
centered = false
|
||||
axis = 1
|
||||
texture = ExtResource("1_nmsa0")
|
||||
|
||||
[node name="TTL" type="Timer" parent="."]
|
||||
process_callback = 0
|
||||
wait_time = 0.8
|
||||
autostart = true
|
||||
|
||||
[connection signal="timeout" from="TTL" to="." method="OnTimeToLiveTimeout"]
|
||||
|
||||
@@ -32,6 +32,7 @@ texture = ExtResource("2_1dg7p")
|
||||
|
||||
[node name="TTL" type="Timer" parent="."]
|
||||
process_callback = 0
|
||||
wait_time = 0.2
|
||||
autostart = true
|
||||
|
||||
[connection signal="timeout" from="TTL" to="." method="OnTimeToLiveTimeout"]
|
||||
|
||||
@@ -21,10 +21,7 @@ public partial class AreaExit : Node3D
|
||||
if (node.GetType() == typeof(Character2))
|
||||
_gameManager.RemoveCharacterAndAddToExit((Character2)node);
|
||||
|
||||
var main = GetTree().Root.GetNode<Main>("/root/Main");
|
||||
if (!_gameManager.Players.ElementAt(0).CharactersLeftOnStage.Any())
|
||||
{
|
||||
main.LoadNextLevel(_levelIndex);
|
||||
}
|
||||
if (!_gameManager.Players.Any(x => x.CharactersLeftOnStage.Any()))
|
||||
_gameManager.OnLevelClear();
|
||||
}
|
||||
}
|
||||
|
||||
18
Scripts/BasicEnemy.cs
Normal file
18
Scripts/BasicEnemy.cs
Normal file
@@ -0,0 +1,18 @@
|
||||
using Godot;
|
||||
|
||||
public partial class BasicEnemy : Node3D
|
||||
{
|
||||
protected GameManager _gameManager;
|
||||
|
||||
public override void _Ready()
|
||||
{
|
||||
_gameManager = GetTree().Root.GetNode<GameManager>("Main/GameManager");
|
||||
}
|
||||
|
||||
public void OnEnemyHit(Node3D node)
|
||||
{
|
||||
var currentLevel = (Level)GetTree().GetFirstNodeInGroup("Level");
|
||||
currentLevel.OnEnemyDefeated((Node3D)GetParent());
|
||||
QueueFree();
|
||||
}
|
||||
}
|
||||
@@ -11,27 +11,37 @@ public partial class GameManager : Node
|
||||
public delegate void ReselectCharacterEventHandler(Player player);
|
||||
|
||||
private bool _gameOver = false;
|
||||
private int _characterIndex = 0;
|
||||
|
||||
[Export]
|
||||
private Array<PackedScene> PlayerScenes;
|
||||
|
||||
public Array<Character1> P1CharactersOut = new Array<Character1>();
|
||||
public Array<Character2> P2CharactersOut = new Array<Character2>();
|
||||
public Array<Character> P1CharactersOut = new Array<Character>();
|
||||
public Array<Character> P2CharactersOut = new Array<Character>();
|
||||
|
||||
public IEnumerable<Player> Players = new List<Player>();
|
||||
|
||||
private int _levelIndex;
|
||||
|
||||
public override void _Ready()
|
||||
{
|
||||
foreach (var playerScene in PlayerScenes)
|
||||
var main = GetTree().Root.GetNode<Main>("/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);
|
||||
}
|
||||
}
|
||||
|
||||
public void OnAllEnemiesDefeated()
|
||||
{
|
||||
GD.Print("All enemies defeated");
|
||||
P1CharactersOut.AddRange(Players.ElementAt(0).CharactersLeftOnStage);
|
||||
if (Players.Count() == 2)
|
||||
P2CharactersOut.AddRange(Players.ElementAt(1).CharactersLeftOnStage);
|
||||
OnLevelClear();
|
||||
}
|
||||
|
||||
public void OnHandleCharacterSelectUI(Player player)
|
||||
{
|
||||
EmitSignal(SignalName.ReselectCharacter, player);
|
||||
@@ -39,25 +49,27 @@ public partial class GameManager : Node
|
||||
|
||||
public void SetToNextCharacter(Player player)
|
||||
{
|
||||
_characterIndex = (++_characterIndex) % player.CharactersLeftOnStage.Count();
|
||||
GD.Print(player.CharactersLeftOnStage.ElementAt(_characterIndex));
|
||||
player._characterIndex = (++player._characterIndex) % player.CharactersLeftOnStage.Count();
|
||||
GD.Print(player.CharactersLeftOnStage.ElementAt(player._characterIndex));
|
||||
}
|
||||
|
||||
public void SetToPreviousCharacter(Player player)
|
||||
{
|
||||
_characterIndex = _characterIndex == 0 ? player.CharactersLeftOnStage.Count() - 1 : --_characterIndex;
|
||||
player._characterIndex = player._characterIndex == 0 ? player.CharactersLeftOnStage.Count() - 1 : --player._characterIndex;
|
||||
}
|
||||
|
||||
public void ResetPlayerPosition(Player player)
|
||||
{
|
||||
player.SpawnPoint.SetPlayerPosition(player.SelectedCharacter);
|
||||
GD.Print(player.CharactersLeftOnStage.ElementAt(_characterIndex));
|
||||
GD.Print(player.CharactersLeftOnStage.ElementAt(player._characterIndex));
|
||||
}
|
||||
|
||||
public void OnCharacterSelected(Player player)
|
||||
{
|
||||
GD.Print("Instancing...");
|
||||
var selectedCharacter = player.CharactersLeftOnStage[_characterIndex];
|
||||
var names = player.CharactersLeftOnStage.Select(x => x.Name).ToArray();
|
||||
GD.Print(names);
|
||||
var selectedCharacter = player.CharactersLeftOnStage[player._characterIndex];
|
||||
player.SelectedCharacter = selectedCharacter;
|
||||
GetTree().Root.AddChild(player.SelectedCharacter);
|
||||
player.SpawnPoint.SetPlayerPosition(player.SelectedCharacter);
|
||||
@@ -65,10 +77,10 @@ public partial class GameManager : Node
|
||||
|
||||
public void RemoveCharacter(Player player)
|
||||
{
|
||||
player.CharactersLeftOnStage.Remove(player.CharactersLeftOnStage.ElementAt(_characterIndex));
|
||||
player.CharactersLeftOnStage.Remove(player.CharactersLeftOnStage.ElementAt(player._characterIndex));
|
||||
player.SelectedCharacter?.QueueFree();
|
||||
_characterIndex = 0;
|
||||
if (player.CharactersLeftOnStage.Count() > 0)
|
||||
player._characterIndex = 0;
|
||||
if (player.CharactersLeftOnStage.Any())
|
||||
EmitSignal(SignalName.ReselectCharacter, player);
|
||||
}
|
||||
|
||||
@@ -77,7 +89,9 @@ public partial class GameManager : Node
|
||||
P1CharactersOut.Add(character);
|
||||
Players.ElementAt(0).CharactersLeftOnStage.Remove(character);
|
||||
GetTree().Root.RemoveChild(character);
|
||||
_characterIndex = 0;
|
||||
Players.ElementAt(0)._characterIndex = 0;
|
||||
if (Players.ElementAt(0).CharactersLeftOnStage.Any())
|
||||
EmitSignal(SignalName.ReselectCharacter, Players.ElementAt(0));
|
||||
}
|
||||
|
||||
public void RemoveCharacterAndAddToExit(Character2 character)
|
||||
@@ -85,7 +99,9 @@ public partial class GameManager : Node
|
||||
P2CharactersOut.Add(character);
|
||||
Players.ElementAt(1).CharactersLeftOnStage.Remove(character);
|
||||
GetTree().Root.RemoveChild(character);
|
||||
_characterIndex = 0;
|
||||
Players.ElementAt(1)._characterIndex = 0;
|
||||
if (Players.ElementAt(1).CharactersLeftOnStage.Any())
|
||||
EmitSignal(SignalName.ReselectCharacter, Players.ElementAt(1));
|
||||
}
|
||||
|
||||
public void SetGameOver(bool isGameOver)
|
||||
@@ -95,5 +111,31 @@ public partial class GameManager : Node
|
||||
EmitSignal(SignalName.OnGameOver);
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
var main = GetTree().Root.GetNode<Main>("/root/Main");
|
||||
|
||||
main.LoadNextLevel(_levelIndex++);
|
||||
|
||||
foreach (var player in Players)
|
||||
EmitSignal(SignalName.ReselectCharacter, player);
|
||||
}
|
||||
|
||||
public bool IsGameOver => _gameOver;
|
||||
}
|
||||
|
||||
35
Scripts/Level.cs
Normal file
35
Scripts/Level.cs
Normal file
@@ -0,0 +1,35 @@
|
||||
using Godot;
|
||||
using Godot.Collections;
|
||||
using System.Linq;
|
||||
|
||||
public partial class Level : Node3D
|
||||
{
|
||||
[Export]
|
||||
private Array<PackedScene> _enemyScenes;
|
||||
[Export]
|
||||
private Array<Node3D> _spawnPoints;
|
||||
|
||||
private Array<Node3D> _enemies = new Array<Node3D>();
|
||||
|
||||
private GameManager _gameManager;
|
||||
|
||||
public override void _Ready()
|
||||
{
|
||||
_gameManager = GetTree().Root.GetNode<GameManager>("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();
|
||||
}
|
||||
}
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
using Godot;
|
||||
using System.Linq;
|
||||
|
||||
public partial class MainMenu : Node2D
|
||||
{
|
||||
|
||||
@@ -17,18 +17,4 @@ public partial class MeleeEnemy : BasicEnemy
|
||||
LookAt(-target.Position, Vector3.Up);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public partial class BasicEnemy : Node3D
|
||||
{
|
||||
public void OnHit(Node3D node)
|
||||
{
|
||||
QueueFree();
|
||||
}
|
||||
|
||||
private void DebugOnHit()
|
||||
{
|
||||
var node = new Node3D();
|
||||
OnHit(node);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -15,6 +15,8 @@ public partial class Player : Node3D
|
||||
|
||||
public bool IsSelectingCharacter = false;
|
||||
|
||||
public int _characterIndex = 0;
|
||||
|
||||
public override void _Ready()
|
||||
{
|
||||
foreach (var character in PlayableCharacterScenes)
|
||||
|
||||
@@ -14,9 +14,4 @@ public partial class RangedEnemy : BasicEnemy
|
||||
area.LookAt(target.Position, Vector3.Up);
|
||||
}
|
||||
}
|
||||
public void OnHit(Node node)
|
||||
{
|
||||
GD.Print("Hit detected");
|
||||
QueueFree();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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));
|
||||
|
||||
Reference in New Issue
Block a user