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

Fix game over

Browse Source
This commit is contained in:
Zenny
2023-09-06 17:41:53 -07:00
parent 5acfb9300c
commit aac5fbd297
14 changed files with 301 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Levels/ExitPortal.tscn
+2 -2
View File
@@ -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"
@@ -104,9 +103,10 @@ libraries = {
[node name="Area3D" type="Area3D" parent="." index="4"]
disable_mode = 2
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/Scenes/Level1.tscn
+1 -1
View File
@@ -60,4 +60,4 @@ 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"]
[connection signal="body_entered" from="Area3D2" to="Area3D2/Exit Portal" method="OnExitEntered"]
Levels/Scenes/Level2.tscn
+12 -17
View File
@@ -26,50 +26,45 @@ _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")
disabled = true
[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)
[connection signal="body_entered" from="Area3D2" to="." method="OnExitEntered"]
Levels/Scripts/AreaExit.cs
+3 -3
View File
@@ -16,11 +16,11 @@ public partial class AreaExit : Node3D
private void OnExitEntered(Node3D node)
{
if (node.GetParent() is Player player)
if (node is Character character)
{
_gameManager.RemoveCharacterAndAddToExit(player);
_gameManager.RemoveCharacterAndAddToExit(character.OwnerPlayer);
GD.Print($"Exit reached by {player.Name}");
GD.Print($"Exit reached by {character.Name}");
if (!_gameManager.Players.Any(x => x.CharactersLeftOnStage.Any()))
_gameManager.OnLevelClear();