diff --git a/Enemies/GodCircuit.tscn b/Enemies/GodCircuit.tscn index d444498..a826b4d 100644 --- a/Enemies/GodCircuit.tscn +++ b/Enemies/GodCircuit.tscn @@ -200,6 +200,7 @@ resource_name = "Material.001" cull_mode = 2 vertex_color_use_as_albedo = true albedo_texture = ExtResource("2_2fhjk") +metallic_specular = 0.0 [sub_resource type="ArrayMesh" id="ArrayMesh_f3cka"] _surfaces = [{ @@ -235,11 +236,10 @@ shadow_mesh = SubResource("ArrayMesh_f3cka") render_priority = 0 shader = ExtResource("3_05w5o") -[node name="God Circuit" type="Node3D" node_paths=PackedStringArray("_animationPlayer", "_attackTimer")] +[node name="God Circuit" type="Node3D" node_paths=PackedStringArray("_animationPlayer")] transform = Transform3D(1, 0, 0, 0, 0.877012, 0.480468, 0, -0.480468, 0.877012, 0, 1.29734, 0) script = ExtResource("1_gyfww") _animationPlayer = NodePath("AnimationPlayer") -_attackTimer = NodePath("") [node name="AnimationPlayer" type="AnimationPlayer" parent="."] libraries = { diff --git a/Enemies/HealthPoints.cs b/Enemies/HealthPoints.cs index 737e783..674ded3 100644 --- a/Enemies/HealthPoints.cs +++ b/Enemies/HealthPoints.cs @@ -9,12 +9,12 @@ public partial class HealthPoints : Node public override void _Ready() { - CurrentHP = MaximumHP; + CurrentHP = MaximumHP; } public void TakeDamage(long damage) { - CurrentHP -= damage; - GD.Print(CurrentHP); + CurrentHP -= damage; + GD.Print(CurrentHP); } } diff --git a/Enemies/Scripts/GodCircuit.cs b/Enemies/Scripts/GodCircuit.cs index fd3d9e3..416dfee 100644 --- a/Enemies/Scripts/GodCircuit.cs +++ b/Enemies/Scripts/GodCircuit.cs @@ -18,45 +18,45 @@ public partial class GodCircuit : Node3D private void OnHit(Node3D node) { - if (node is Character character && character.HasMethod(Character.MethodName.OnHit)) - { - GD.Print("Player hit: " + character.Name); - character.Call(Character.MethodName.OnHit, node); - } - else - { - var hpComponent = GetNode("HP Component"); - if (hpComponent.CurrentHP > 0) - { - GD.Print("Hit"); - _animationPlayer.Play("OnHit"); - hpComponent.TakeDamage(800000); - EmitSignal(SignalName.OnEnemyBossHit, hpComponent.CurrentHP); + if (node is Character character && character.HasMethod(Character.MethodName.OnHit)) + { + GD.Print("Player hit: " + character.Name); + character.Call(Character.MethodName.OnHit, node); + } + else + { + var hpComponent = GetNode("HP Component"); + if (hpComponent.CurrentHP > 0) + { + GD.Print("Hit"); + _animationPlayer.Play("OnHit"); + hpComponent.TakeDamage(800000); + EmitSignal(SignalName.OnEnemyBossHit, hpComponent.CurrentHP); - if (hpComponent.CurrentHP <= 0) - { - EmitSignal(SignalName.DestroyRemainingOrbs); - _animationPlayer.Play("OnDeath"); - _animationPlayer.AnimationFinished += OnGameFinished; - } - } - } + if (hpComponent.CurrentHP <= 0) + { + EmitSignal(SignalName.DestroyRemainingOrbs); + _animationPlayer.Play("OnDeath"); + _animationPlayer.AnimationFinished += OnGameFinished; + } + } + } } private void OnBossOrbDestroyed() { - var hpComponent = GetNode("HP Component"); - _animationPlayer.Play("OnHit"); - hpComponent.TakeDamage(30000000); - EmitSignal(SignalName.OnEnemyBossHit, hpComponent.CurrentHP); + var hpComponent = GetNode("HP Component"); + _animationPlayer.Play("OnHit"); + hpComponent.TakeDamage(30000000); + EmitSignal(SignalName.OnEnemyBossHit, hpComponent.CurrentHP); - if (hpComponent.CurrentHP <= 0) - hpComponent.CurrentHP = 1; + if (hpComponent.CurrentHP <= 0) + hpComponent.CurrentHP = 1; } private void OnGameFinished(StringName animationName) { - QueueFree(); - EmitSignal(SignalName.OnGameEnding); + QueueFree(); + EmitSignal(SignalName.OnGameEnding); } } diff --git a/GameLogic/GameManager.cs b/GameLogic/GameManager.cs index 05e0ada..072c3c7 100644 --- a/GameLogic/GameManager.cs +++ b/GameLogic/GameManager.cs @@ -23,133 +23,133 @@ public partial class GameManager : Node public override void _Ready() { - var main = GetTree().Root.GetNode
("/root/Main"); - for (var i = 0; i < main.NumberOfPlayers; i++) - { - var player = PlayerScenes[i].Instantiate(); - Players = Players.Append((Player)player); - GetTree().Root.AddChild(player); - } + var main = GetTree().Root.GetNode
("/root/Main"); + for (var i = 0; i < main.NumberOfPlayers; i++) + { + var player = PlayerScenes[i].Instantiate(); + Players = Players.Append((Player)player); + GetTree().Root.AddChild(player); + } } public void OnAllEnemiesDefeated() { - OnLevelClear(); + OnLevelClear(); } public void OnHandleCharacterSelectUI(Player player) { - EmitSignal(SignalName.ReselectCharacter, player); + EmitSignal(SignalName.ReselectCharacter, 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(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(Player player) { - player.SpawnPoint.SetPlayerPosition(player.SelectedCharacter); - GD.Print(player.CharactersLeftOnStage.ElementAt(player.CharacterIndex)); + player.SpawnPoint.SetPlayerPosition(player.SelectedCharacter); + GD.Print(player.CharactersLeftOnStage.ElementAt(player.CharacterIndex)); } public void OnCharacterSelected(Player player) { - var sfxPlayer = GetTree().Root.GetNode("Main/SFXPlayer"); - var audioStream = ResourceLoader.Load("Audio/SFX/Select.wav"); - sfxPlayer.Stream = audioStream; - sfxPlayer.Play(); - if (player.CharactersLeftOnStage.Any()) - { - var character = player.CharactersLeftOnStage[player.CharacterIndex]; - var instance = (Character)character.Instantiate(); - instance.Initialize(player); - player.SelectedCharacter = instance; - player.SpawnPoint.SetPlayerPosition(player.SelectedCharacter); - GetTree().Root.AddChild(player.SelectedCharacter); - } + var sfxPlayer = GetTree().Root.GetNode("Main/SFXPlayer"); + var audioStream = ResourceLoader.Load("Audio/SFX/Select.wav"); + sfxPlayer.Stream = audioStream; + sfxPlayer.Play(); + if (player.CharactersLeftOnStage.Any()) + { + var character = player.CharactersLeftOnStage[player.CharacterIndex]; + var instance = (Character)character.Instantiate(); + instance.Initialize(player); + player.SelectedCharacter = instance; + player.SpawnPoint.SetPlayerPosition(player.SelectedCharacter); + GetTree().Root.AddChild(player.SelectedCharacter); + } } public void RemoveCharacter(Player player) { - ResetPlayerPosition(player); + ResetPlayerPosition(player); - player.CharactersLeftOnStage.RemoveAt(player.CharacterIndex); - if (player.SelectedCharacter is not null) - GetTree().Root.RemoveChild(player.SelectedCharacter); + player.CharactersLeftOnStage.RemoveAt(player.CharacterIndex); + if (player.SelectedCharacter is not null) + GetTree().Root.RemoveChild(player.SelectedCharacter); - player.CharacterIndex = 0; - if (player.CharactersLeftOnStage.Any()) - EmitSignal(SignalName.ReselectCharacter, player); + player.CharacterIndex = 0; + if (player.CharactersLeftOnStage.Any()) + EmitSignal(SignalName.ReselectCharacter, player); - if (!player.CharactersExited.Any() && !player.CharactersLeftOnStage.Any()) - SetGameOver(player, true); + if (!player.CharactersExited.Any() && !player.CharactersLeftOnStage.Any()) + SetGameOver(player, true); - if (Players.All(x => !x.CharactersLeftOnStage.Any()) && Players.Any(x => x.CharactersExited.Any())) - OnLevelClear(); + if (Players.All(x => !x.CharactersLeftOnStage.Any()) && Players.Any(x => x.CharactersExited.Any())) + OnLevelClear(); } public void RemoveCharacterAndAddToExit(Player player) { - ResetPlayerPosition(player); - player.CharactersExited.Add(player.CharactersLeftOnStage.ElementAt(player.CharacterIndex)); - RemoveCharacter(player); + ResetPlayerPosition(player); + player.CharactersExited.Add(player.CharactersLeftOnStage.ElementAt(player.CharacterIndex)); + RemoveCharacter(player); } public void SetGameOver(Player player, bool isGameOver) { - player.GameOver = isGameOver; - if (isGameOver) - EmitSignal(SignalName.OnPlayerGameOver); - GD.Print($"Game over for {player.Name}"); + player.GameOver = isGameOver; + if (isGameOver) + EmitSignal(SignalName.OnPlayerGameOver); + GD.Print($"Game over for {player.Name}"); } public void ReloadGameScene() { - GD.Print("Reloading scene"); - var players = GetTree().Root.GetChildren().OfType(); - foreach (var player in players) - player.QueueFree(); - var levels = GetTree().Root.GetChildren().OfType(); - foreach (var level in levels) - level.QueueFree(); - GetTree().ReloadCurrentScene(); + GD.Print("Reloading scene"); + var players = GetTree().Root.GetChildren().OfType(); + foreach (var player in players) + player.QueueFree(); + var levels = GetTree().Root.GetChildren().OfType(); + foreach (var level in levels) + level.QueueFree(); + GetTree().ReloadCurrentScene(); } public void OnLevelClear() { - var enemies = GetTree().GetNodesInGroup("Enemy").Where(x => !x.IsQueuedForDeletion()); - foreach (var enemy in enemies) - enemy.QueueFree(); + var enemies = GetTree().GetNodesInGroup("Enemy").Where(x => !x.IsQueuedForDeletion()); + foreach (var enemy in enemies) + enemy.QueueFree(); - var playerCharacters = GetTree().GetNodesInGroup("Player"); + var playerCharacters = GetTree().GetNodesInGroup("Player"); - EmitSignal(SignalName.ClearPlayerBG, 0); - EmitSignal(SignalName.ClearPlayerBG, 1); + EmitSignal(SignalName.ClearPlayerBG, 0); + EmitSignal(SignalName.ClearPlayerBG, 1); - foreach (var player in Players) - { - player.CharactersLeftOnStage.AddRange(player.CharactersExited); - player.CharactersExited.Clear(); - player.CharacterIndex = 0; - } + foreach (var player in Players) + { + player.CharactersLeftOnStage.AddRange(player.CharactersExited); + player.CharactersExited.Clear(); + player.CharacterIndex = 0; + } - foreach (var character in playerCharacters) - character.GetParent().RemoveChild(character); + foreach (var character in playerCharacters) + character.GetParent().RemoveChild(character); - var projectiles = GetTree().GetNodesInGroup("Projectile").Where(x => !x.IsQueuedForDeletion()); - foreach (var projectile in projectiles) - projectile.QueueFree(); + var projectiles = GetTree().GetNodesInGroup("Projectile").Where(x => !x.IsQueuedForDeletion()); + foreach (var projectile in projectiles) + projectile.QueueFree(); - var main = GetTree().Root.GetNode
("/root/Main"); - _levelIndex++; - main.LoadNextLevel(_levelIndex); + var main = GetTree().Root.GetNode
("/root/Main"); + _levelIndex++; + main.LoadNextLevel(_levelIndex); } } diff --git a/GameLogic/Main.cs b/GameLogic/Main.cs index 5bbeb55..81a63bc 100644 --- a/GameLogic/Main.cs +++ b/GameLogic/Main.cs @@ -15,59 +15,59 @@ public partial class Main : Node public override void _Process(double delta) { - _fpsCounter.Text = $"FPS: {Engine.GetFramesPerSecond()}"; + _fpsCounter.Text = $"FPS: {Engine.GetFramesPerSecond()}"; } public void LoadLevel(int indexToLoad, int numberOfPlayers) { - var sceneToLoad = Levels.ElementAt(indexToLoad); - CallDeferred(nameof(DeferredGoToScene), sceneToLoad); + var sceneToLoad = Levels.ElementAt(indexToLoad); + CallDeferred(nameof(DeferredGoToScene), sceneToLoad); - NumberOfPlayers = numberOfPlayers; + NumberOfPlayers = numberOfPlayers; - var gameManager = GameManager.Instantiate(); - AddChild(gameManager); - var gameManagerInstance = (GameManager)gameManager; + var gameManager = GameManager.Instantiate(); + AddChild(gameManager); + var gameManagerInstance = (GameManager)gameManager; - var bgmPlayer = GetTree().Root.GetNode("BgmPlayer"); - bgmPlayer.ProcessMode = ProcessModeEnum.Always; - bgmPlayer.SetBGMFromFilepath("Audio/BGM/An-Imitation-of-Heaven.ogg"); - bgmPlayer.PlayBGM(); + var bgmPlayer = GetTree().Root.GetNode("BgmPlayer"); + bgmPlayer.ProcessMode = ProcessModeEnum.Always; + bgmPlayer.SetBGMFromFilepath("Audio/BGM/An-Imitation-of-Heaven.ogg"); + bgmPlayer.PlayBGM(); - var animationNode = GetNode("SceneTransition/AnimationPlayer"); - animationNode.Play($"Level{indexToLoad + 1}"); - animationNode.AnimationFinished += EnableCharacterSelect; + var animationNode = GetNode("SceneTransition/AnimationPlayer"); + animationNode.Play($"Level{indexToLoad + 1}"); + animationNode.AnimationFinished += EnableCharacterSelect; } public void LoadNextLevel(int currentSceneIndex) { - if (currentSceneIndex < Levels.Count()) - { - var currentScene = Levels.ToList().ElementAt(currentSceneIndex); - CallDeferred(nameof(DeferredGoToScene), Levels.ElementAt(currentSceneIndex)); - var animationNode = GetNode("SceneTransition/AnimationPlayer"); - animationNode.Play($"Level{currentSceneIndex + 1}"); - animationNode.AnimationFinished += EnableCharacterSelect; - } + if (currentSceneIndex < Levels.Count()) + { + var currentScene = Levels.ToList().ElementAt(currentSceneIndex); + CallDeferred(nameof(DeferredGoToScene), Levels.ElementAt(currentSceneIndex)); + var animationNode = GetNode("SceneTransition/AnimationPlayer"); + animationNode.Play($"Level{currentSceneIndex + 1}"); + animationNode.AnimationFinished += EnableCharacterSelect; + } } private void DeferredGoToScene(PackedScene sceneToAdd) { - if (GetTree().GetFirstNodeInGroup("Level") != null) - GetTree().GetFirstNodeInGroup("Level").QueueFree(); - var nextScene = GD.Load(sceneToAdd.ResourcePath); - var newScene = nextScene.Instantiate(); - GetTree().Root.AddChild(newScene); + if (GetTree().GetFirstNodeInGroup("Level") != null) + GetTree().GetFirstNodeInGroup("Level").QueueFree(); + var nextScene = GD.Load(sceneToAdd.ResourcePath); + var newScene = nextScene.Instantiate(); + GetTree().Root.AddChild(newScene); } private void EnableCharacterSelect(StringName animationName) { - GD.Print("On animation finished: Enable characters"); - var gameManagerInstance = GetNode("GameManager"); - foreach (var player in gameManagerInstance.Players) - gameManagerInstance.OnHandleCharacterSelectUI(player); - GetTree().Paused = true; - var animationNode = GetNode("SceneTransition/AnimationPlayer"); - animationNode.AnimationFinished -= EnableCharacterSelect; + GD.Print("On animation finished: Enable characters"); + var gameManagerInstance = GetNode("GameManager"); + foreach (var player in gameManagerInstance.Players) + gameManagerInstance.OnHandleCharacterSelectUI(player); + GetTree().Paused = true; + var animationNode = GetNode("SceneTransition/AnimationPlayer"); + animationNode.AnimationFinished -= EnableCharacterSelect; } } diff --git a/Levels/Scenes/Level1.tscn b/Levels/Scenes/Level1.tscn index 0fa1f58..19f6c6c 100644 --- a/Levels/Scenes/Level1.tscn +++ b/Levels/Scenes/Level1.tscn @@ -1151,22 +1151,22 @@ script = ExtResource("1_k32xj") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.729415, 0, -0.194958) [node name="RangedEnemy" parent="Enemies" instance=ExtResource("2_fyxib")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.85078, 0, -0.0949185) +transform = Transform3D(-0.999987, 0, 0.00518369, 0, 1, 0, -0.00518369, 0, -0.999987, 1.8807, 0, -2.50554) [node name="RangedEnemy2" parent="Enemies" instance=ExtResource("2_fyxib")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.44161, 0, -1.74858) +transform = Transform3D(-0.999987, 0, 0.00518369, 0, 1, 0, -0.00518369, 0, -0.999987, 0.462973, 0, -0.859208) [node name="RangedEnemy3" parent="Enemies" instance=ExtResource("2_fyxib")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.12335, 0, -2.33267) +transform = Transform3D(-0.999987, 0, 0.00518369, 0, 1, 0, -0.00518369, 0, -0.999987, 4.14164, 0, -0.256041) [node name="RangedEnemy4" parent="Enemies" instance=ExtResource("2_fyxib")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.65446, 0.0400391, -2.44977) +transform = Transform3D(-0.999987, 0, 0.00518369, 0, 1, 0, -0.00518369, 0, -0.999987, -4.63666, 0.0400391, -0.184444) [node name="RangedEnemy5" parent="Enemies" instance=ExtResource("2_fyxib")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.08228, 0, -0.694794) +transform = Transform3D(-0.999987, 0, 0.00518369, 0, 1, 0, -0.00518369, 0, -0.999987, -3.05541, 0, -1.93125) [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) +transform = Transform3D(-0.999987, 0, 0.00518369, 0, 1, 0, -0.00518369, 0, -0.999987, -4.75447, 0, -2.10955) [node name="StaticBody3D" type="StaticBody3D" parent="."] collision_mask = 0 diff --git a/Levels/Scenes/Level10.tscn b/Levels/Scenes/Level10.tscn index 3d88a03..573ba81 100644 --- a/Levels/Scenes/Level10.tscn +++ b/Levels/Scenes/Level10.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=125 format=3 uid="uid://0hdnmilwrsq6"] +[gd_scene load_steps=152 format=3 uid="uid://0hdnmilwrsq6"] [ext_resource type="Script" path="res://Levels/Scripts/FinalLevel.cs" id="1_sy7dk"] [ext_resource type="Material" uid="uid://04v0ve8qhqkv" path="res://Video/CloudScrollMaterial.tres" id="2_2sumr"] @@ -40,6 +40,22 @@ [ext_resource type="Script" path="res://Levels/Scenes/BossOrb.cs" id="34_ditjx"] [ext_resource type="PackedScene" uid="uid://cql4evq5281n4" path="res://Levels/Scripts/PyramidAttack.tscn" id="34_kwn8s"] +[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_hdhsy"] +sky_top_color = Color(1, 1, 1, 1) +sky_horizon_color = Color(0.75, 0.75, 0.75, 1) +sky_energy_multiplier = 2.9 +ground_bottom_color = Color(0, 0, 0, 1) +ground_horizon_color = Color(0.75, 0.75, 0.75, 1) + +[sub_resource type="Sky" id="Sky_5p3t0"] +sky_material = SubResource("ProceduralSkyMaterial_hdhsy") + +[sub_resource type="Environment" id="Environment_irs6p"] +background_mode = 2 +sky = SubResource("Sky_5p3t0") +tonemap_mode = 2 +glow_enabled = true + [sub_resource type="ArrayMesh" id="ArrayMesh_jcbwo"] _surfaces = [{ "aabb": AABB(-5.99352, 0, -5.99352, 10.8702, 1e-05, 12.5161), @@ -122,6 +138,10 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_x0j26") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_uuft2"] +transparency = 1 +albedo_texture = ExtResource("4_12nt1") + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_3h323"] resource_name = "Material.018" transparency = 2 @@ -162,6 +182,10 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_wv6d1") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_sxvv8"] +transparency = 1 +albedo_texture = ExtResource("5_k8ot3") + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_hrqiq"] resource_name = "Material.020" transparency = 2 @@ -202,6 +226,10 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_nd1nu") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_hi8rh"] +transparency = 1 +albedo_texture = ExtResource("6_5cu7q") + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ssuch"] resource_name = "Material.009" transparency = 2 @@ -242,6 +270,10 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_ykoqw") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_at5gw"] +transparency = 1 +albedo_texture = ExtResource("7_ma5fs") + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_0tjtp"] resource_name = "Material.013" cull_mode = 2 @@ -279,6 +311,10 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_3v6l8") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ipjtq"] +transparency = 1 +albedo_texture = ExtResource("8_nilin") + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_gw3x2"] resource_name = "Material.012" transparency = 2 @@ -319,6 +355,10 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_ed1am") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_x5h2p"] +transparency = 1 +albedo_texture = ExtResource("9_cqu35") + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_pdco4"] resource_name = "Material.014" transparency = 2 @@ -359,6 +399,10 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_1rvr0") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_nwkjv"] +transparency = 1 +albedo_texture = ExtResource("10_6hncy") + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ceilb"] resource_name = "Material.017" transparency = 2 @@ -399,6 +443,10 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_lngf1") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_iucbo"] +transparency = 1 +albedo_texture = ExtResource("11_tq1it") + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_aeutl"] resource_name = "Material.015" transparency = 2 @@ -439,6 +487,10 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_pmbhn") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_satv7"] +transparency = 1 +albedo_texture = ExtResource("12_wsgqg") + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_e7p56"] resource_name = "Material.016" transparency = 2 @@ -479,6 +531,10 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_nd1v5") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_e4460"] +transparency = 1 +albedo_texture = ExtResource("13_f8xl1") + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_584xu"] resource_name = "Material.006" transparency = 2 @@ -519,6 +575,10 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_3bme6") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_e5602"] +transparency = 1 +albedo_texture = ExtResource("14_w2kd4") + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_2k3hx"] resource_name = "Material.005" transparency = 2 @@ -558,6 +618,10 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_wkxcw") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ifinj"] +transparency = 1 +albedo_texture = ExtResource("15_s28hr") + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_4qf66"] resource_name = "Material.007" transparency = 2 @@ -598,6 +662,14 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_p24ph") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_8emtn"] +transparency = 1 +albedo_texture = ExtResource("16_75508") + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_malkk"] +transparency = 1 +albedo_texture = ExtResource("17_2j1fn") + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_xaxyh"] resource_name = "Material.004" transparency = 2 @@ -639,6 +711,11 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_nicq7") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_62ota"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_3klqc"] +albedo_texture = ExtResource("18_75mk6") + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ifn8h"] resource_name = "Material.003" transparency = 2 @@ -679,6 +756,15 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_w30hu") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_6xsl2"] +transparency = 1 +albedo_color = Color(0, 0, 0, 1) +albedo_texture = ExtResource("18_75mk6") +metallic_specular = 0.0 + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_0cgf3"] +albedo_texture = ExtResource("19_fokwc") + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_5nf0m"] resource_name = "Material.002" transparency = 4 @@ -717,6 +803,9 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_d3m38") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_55sfs"] +transparency = 1 + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_7bj8f"] resource_name = "Material.011" transparency = 2 @@ -757,6 +846,14 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_p8inn") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_vduif"] +transparency = 1 +albedo_texture = ExtResource("20_02wdq") + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_opsem"] +transparency = 1 +albedo_texture = ExtResource("21_pn3un") + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_e1n70"] resource_name = "Material.024" transparency = 2 @@ -837,6 +934,10 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_c3y84") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_qjd1n"] +transparency = 1 +albedo_texture = ExtResource("22_h5oyc") + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_prkx8"] resource_name = "Material.022" transparency = 2 @@ -877,6 +978,10 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_besci") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_6og7m"] +transparency = 1 +albedo_texture = ExtResource("23_qjhvx") + [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_8k8td"] resource_name = "Material.023" transparency = 2 @@ -917,6 +1022,10 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_kpilu") +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_hrk61"] +transparency = 1 +albedo_texture = ExtResource("24_no4m6") + [sub_resource type="Animation" id="Animation_s03e6"] resource_name = "Animation" length = 34.2083 @@ -1488,120 +1597,171 @@ _data = { process_mode = 3 script = ExtResource("1_sy7dk") +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +environment = SubResource("Environment_irs6p") + [node name="FINAL STAGE" type="Node3D" parent="."] [node name="Plane2" type="MeshInstance3D" parent="FINAL STAGE"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.157619, 0) +transform = Transform3D(1.05, 0, 0, 0, 1.05, 0, 0, 0, 1.05, 0, -0.157619, 0) mesh = SubResource("ArrayMesh_1cd5a") [node name="MeshInstance3D" type="MeshInstance3D" parent="FINAL STAGE"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.490494, -0.153552, 0.221301) +transform = Transform3D(1.05, 0, 0, 0, 1.05, 0, 0, 0, 1.05, -0.490494, -0.153552, 0.221301) mesh = SubResource("PlaneMesh_4a7et") [node name="Plane_001" type="MeshInstance3D" parent="FINAL STAGE"] transform = Transform3D(1.76127, 0, 0, 0, 1.31527, 0, 0, 0, 1.32888, -9.8024, 0.0936406, 1.09295) +transparency = 0.87 +lod_bias = 0.001 mesh = SubResource("ArrayMesh_jj1lx") skeleton = NodePath("") +surface_material_override/0 = SubResource("StandardMaterial3D_uuft2") [node name="Plane_002" type="MeshInstance3D" parent="FINAL STAGE"] transform = Transform3D(1.70598, 0, 0, 0, 1.32727, 0, 0, 0, 1.12196, 5.21738, -0.170723, 8.07196) +transparency = 0.9 mesh = SubResource("ArrayMesh_6sa8k") skeleton = NodePath("") +surface_material_override/0 = SubResource("StandardMaterial3D_sxvv8") [node name="Plane_003" type="MeshInstance3D" parent="FINAL STAGE"] transform = Transform3D(1.4161, 0, 0, 0, 1.1281, 0, 0, 0, 1.13659, 6.57477, 0.080187, 3.00044) +transparency = 0.92 mesh = SubResource("ArrayMesh_if341") skeleton = NodePath("") +surface_material_override/0 = SubResource("StandardMaterial3D_hi8rh") [node name="Plane_006" type="MeshInstance3D" parent="FINAL STAGE"] transform = Transform3D(0.782305, 0, 0, 0, 0.782305, 0, 0, 0, 0.782305, 7.25218, 0.0936406, -2.70961) +transparency = 0.88 mesh = SubResource("ArrayMesh_5pdhi") skeleton = NodePath("") +surface_material_override/0 = SubResource("StandardMaterial3D_at5gw") [node name="Plane_007" type="MeshInstance3D" parent="FINAL STAGE"] -transform = Transform3D(-0.00377916, 0, -0.698766, 0, 1.04657, 0, 1.03857, 0, -0.00254267, 2.07265, 0.0936406, -10.5126) +transform = Transform3D(-0.00267086, 0, -0.493997, 0, 0.74, 0, 0.733995, 0, -0.00179756, 2.07265, 0.0936406, -10.5126) +transparency = 0.84 mesh = SubResource("ArrayMesh_e3acl") skeleton = NodePath("") +surface_material_override/0 = SubResource("StandardMaterial3D_ipjtq") [node name="Plane_008" type="MeshInstance3D" parent="FINAL STAGE"] transform = Transform3D(-0.00729558, 0, -1.6545, 0, 2.00609, 0, 2.00494, 0, -0.0060204, 5.70975, 0.0936406, -8.83716) +transparency = 0.93 mesh = SubResource("ArrayMesh_7xb3t") skeleton = NodePath("") +surface_material_override/0 = SubResource("StandardMaterial3D_x5h2p") [node name="Plane_009" type="MeshInstance3D" parent="FINAL STAGE"] -transform = Transform3D(-0.00628865, 0, -0.910888, 0, 1.74576, 0, 1.72822, 0, -0.00331454, -1.12223, 0.0936406, -8.56601) +transform = Transform3D(-0.00414093, 0, -0.599996, 0, 1.149, 0, 1.13799, 0, -0.00218327, -1.12123, 0.0936406, -8.84041) +transparency = 0.94 mesh = SubResource("ArrayMesh_hffpl") skeleton = NodePath("") +surface_material_override/0 = SubResource("StandardMaterial3D_nwkjv") [node name="Plane_010" type="MeshInstance3D" parent="FINAL STAGE"] transform = Transform3D(0.996694, 0, -1.16924, 0, 1.5364, 0, 1.16924, 0, 0.996694, -10.1032, 0.0936406, -6.11157) +transparency = 0.88 mesh = SubResource("ArrayMesh_q55ea") skeleton = NodePath("") +surface_material_override/0 = SubResource("StandardMaterial3D_iucbo") [node name="Plane_011" type="MeshInstance3D" parent="FINAL STAGE"] transform = Transform3D(0.839756, 0, -1.64877, 0, 1.61483, 0, 0.985134, 0, 1.40546, -5.09668, 0.0936406, -10.7682) +transparency = 0.93 mesh = SubResource("ArrayMesh_jepii") skeleton = NodePath("") +surface_material_override/0 = SubResource("StandardMaterial3D_satv7") [node name="Plane_012" type="MeshInstance3D" parent="FINAL STAGE"] transform = Transform3D(0.325048, 0, -0.381319, 0, 0.501059, 0, 0.381319, 0, 0.325048, -8.94753, 0.0936406, -9.6698) +transparency = 0.88 mesh = SubResource("ArrayMesh_m64ug") skeleton = NodePath("") +surface_material_override/0 = SubResource("StandardMaterial3D_e4460") [node name="Plane_013" type="MeshInstance3D" parent="FINAL STAGE"] transform = Transform3D(-0.80569, 0, 0.822408, 0, 1.1513, 0, -0.822408, 0, -0.80569, 6.57162, 0.550828, 8.08738) +transparency = 0.83 mesh = SubResource("ArrayMesh_o5ifk") skeleton = NodePath("") +surface_material_override/0 = SubResource("StandardMaterial3D_e5602") [node name="Plane_014" type="MeshInstance3D" parent="FINAL STAGE"] transform = Transform3D(0.847765, 0, 0.00547652, 0, 1.07735, 0, -0.0055289, 0, 0.839733, -2.15445, 0.108412, -7.12627) +transparency = 0.92 mesh = SubResource("ArrayMesh_uaau6") skeleton = NodePath("") +surface_material_override/0 = SubResource("StandardMaterial3D_ifinj") [node name="Plane_015" type="MeshInstance3D" parent="FINAL STAGE"] -transform = Transform3D(-0.61563, 0, 0.628405, 0, 0.879712, 0, -0.628405, 0, -0.61563, 7.96881, 0.0936406, 5.10934) +transform = Transform3D(-0.500363, 0, 0.510746, 0, 0.715, 0, -0.510746, 0, -0.500363, 7.96881, 0.0936406, 5.10934) +transparency = 0.92 mesh = SubResource("ArrayMesh_72amh") skeleton = NodePath("") +surface_material_override/0 = SubResource("StandardMaterial3D_8emtn") [node name="Plane_016" type="MeshInstance3D" parent="FINAL STAGE"] -transform = Transform3D(0.426113, 0, 0.919471, 0, 1.36642, 0, -1.25667, 0, 0.311774, -2.31715, 0.0936406, 9.9053) +transform = Transform3D(0.252723, 0, 0.545494, 0, 0.81, 0, -0.745319, 0, 0.184966, -2.31715, 0.0936406, 9.9053) +material_override = SubResource("StandardMaterial3D_malkk") +transparency = 0.9 mesh = SubResource("ArrayMesh_u3atd") skeleton = NodePath("") +surface_material_override/0 = SubResource("StandardMaterial3D_62ota") [node name="Plane_017" type="MeshInstance3D" parent="FINAL STAGE"] transform = Transform3D(0.548434, 0, 0.836587, 0, 1.18259, 0, -1.61742, 0, 0.28367, -8.88136, 0.0936406, 7.99206) +material_override = SubResource("StandardMaterial3D_3klqc") +transparency = 0.88 +cast_shadow = 0 mesh = SubResource("ArrayMesh_03cjj") skeleton = NodePath("") +surface_material_override/0 = SubResource("StandardMaterial3D_6xsl2") [node name="Plane_018" type="MeshInstance3D" parent="FINAL STAGE"] transform = Transform3D(0.229544, 0, 0.676962, 0, 0.71482, 0, -0.676962, 0, 0.229544, -6.35837, 0.0936406, 7.19496) +material_override = SubResource("StandardMaterial3D_0cgf3") +transparency = 0.71 mesh = SubResource("ArrayMesh_2jxy6") skeleton = NodePath("") +surface_material_override/0 = SubResource("StandardMaterial3D_55sfs") [node name="Plane_019" type="MeshInstance3D" parent="FINAL STAGE"] transform = Transform3D(0.609319, 0, 0, 0, 1.00247, 0, 0, 0, 1.00301, 7.71373, -0.0781053, -4.8116) +transparency = 0.9 mesh = SubResource("ArrayMesh_xqoh3") skeleton = NodePath("") +surface_material_override/0 = SubResource("StandardMaterial3D_vduif") [node name="Plane_020" type="MeshInstance3D" parent="FINAL STAGE"] -transform = Transform3D(0.854489, 0, 0, 0, 0.854489, 0, 0, 0, 0.854489, -9.65187, 0.0223779, 4.51508) +transform = Transform3D(0.709, 0, 0, 0, 0.709, 0, 0, 0, 0.709, -9.65187, 0.0223779, 4.51508) +material_override = SubResource("StandardMaterial3D_opsem") +transparency = 0.78 +cast_shadow = 0 mesh = SubResource("ArrayMesh_u43pa") skeleton = NodePath("") [node name="Plane_021" type="MeshInstance3D" parent="FINAL STAGE"] -transform = Transform3D(1.64617, 0, 0, 0, 1, 0, 0, 0, 1.02218, -11.9204, 0.152895, -1.42975) +transform = Transform3D(1.446, 0, 0, 0, 0.878, 0, 0, 0, 0.898, -11.9204, 0.152895, -1.42975) +transparency = 0.87 mesh = SubResource("ArrayMesh_d75vr") skeleton = NodePath("") +surface_material_override/0 = SubResource("StandardMaterial3D_qjd1n") [node name="Plane_022" type="MeshInstance3D" parent="FINAL STAGE"] transform = Transform3D(1.13978, 0, 0, 0, 1.13978, 0, 0, 0, 1.13978, -7.62331, 0.184806, -3.66903) +transparency = 0.89 mesh = SubResource("ArrayMesh_og6cu") skeleton = NodePath("") +surface_material_override/0 = SubResource("StandardMaterial3D_6og7m") [node name="Plane_023" type="MeshInstance3D" parent="FINAL STAGE"] transform = Transform3D(0.408435, -0.0138221, 1.8297, 0.0145542, 1.98837, 0.0043401, -1.02222, 0.0227874, 0.731131, 2.36517, 0.234488, -8.05808) +transparency = 0.87 mesh = SubResource("ArrayMesh_ammp5") skeleton = NodePath("") +surface_material_override/0 = SubResource("StandardMaterial3D_hrk61") [node name="AnimationPlayer" type="AnimationPlayer" parent="FINAL STAGE"] autoplay = "Animation" @@ -1809,11 +1969,7 @@ shape = SubResource("CylinderShape3D_los3u") [node name="HP Component" parent="BossOrbs/Hedron" instance=ExtResource("7_nvq88")] MaximumHP = 2000000 -[connection signal="DestroyRemainingOrbs" from="God Circuit" to="BossOrbs/Pyramid" method="DestroySelf"] -[connection signal="DestroyRemainingOrbs" from="God Circuit" to="BossOrbs/Orb" method="DestroySelf"] -[connection signal="DestroyRemainingOrbs" from="God Circuit" to="BossOrbs/Hedron" method="DestroySelf"] [connection signal="OnEnemyBossHit" from="God Circuit" to="Boss GUI/TextureProgressBar" method="UpdateBar"] -[connection signal="OnGameEnding" from="God Circuit" to="GameEnding" method="OnGameEnding"] [connection signal="body_entered" from="AttackZone" to="BossOrbs/Pyramid" method="OnFire"] [connection signal="OnBossOrbExploded" from="BossOrbs/Pyramid" to="God Circuit" method="OnBossOrbDestroyed"] [connection signal="body_entered" from="BossOrbs/Pyramid" to="BossOrbs/Pyramid" method="OnOrbHit"] diff --git a/Levels/Scenes/Level2.tscn b/Levels/Scenes/Level2.tscn index e5e8bd1..4dc8ea6 100644 --- a/Levels/Scenes/Level2.tscn +++ b/Levels/Scenes/Level2.tscn @@ -79,6 +79,7 @@ shader = ExtResource("7_ro80p") shader_parameter/direction_and_speed = Vector2(0.15, 0.1) shader_parameter/scale = Vector2(3, 3) shader_parameter/flip = false +shader_parameter/alphaSet = 0.0 shader_parameter/albedo = ExtResource("6_dr818") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_txi3a"] @@ -247,22 +248,38 @@ script = ExtResource("1_rkcp4") [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.25446, -5.12032) +transform = Transform3D(-0.998469, 0, -0.0553162, 0, 1, 0, 0.0553162, 0, -0.998469, -5.12309, 0.25446, -5.13122) [node name="RangedEnemy2" parent="Enemies" instance=ExtResource("3_hfsy3")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.35919, 0.25446, -3.66653) +transform = Transform3D(-0.998469, 0, -0.0553162, 0, 1, 0, 0.0553162, 0, -0.998469, -5.16237, 0.25446, -3.67743) [node name="RangedEnemy3" parent="Enemies" instance=ExtResource("3_hfsy3")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.333, 0.25446, -1.64955) +transform = Transform3D(-0.998469, 0, -0.0553162, 0, 1, 0, 0.0553162, 0, -0.998469, -5.13619, 0.25446, -1.66045) [node name="RangedEnemy4" parent="Enemies" instance=ExtResource("3_hfsy3")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.47707, 0.25446, 0.275753) +transform = Transform3D(-0.998469, 0, -0.0553162, 0, 1, 0, 0.0553162, 0, -0.998469, -5.28025, 0.25446, 0.264849) [node name="RangedEnemy5" parent="Enemies" instance=ExtResource("3_hfsy3")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.49938, -0.477953, 0.0400016) +transform = Transform3D(-0.998469, 0, -0.0553162, 0, 1, 0, 0.0553162, 0, -0.998469, -3.30257, -0.477953, 0.0290978) [node name="RangedEnemy6" parent="Enemies" instance=ExtResource("3_hfsy3")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.11107, -0.486121, -0.798224) +transform = Transform3D(-0.998469, 0, -0.0553162, 0, 1, 0, 0.0553162, 0, -0.998469, -1.91425, -0.486121, -0.809128) + +[node name="MeleeEnemyOrb5" parent="Enemies" node_paths=PackedStringArray("_hp") instance=ExtResource("4_3lkwt")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.77102, -0.499194, -7.39594) +_hp = NodePath("../MeleeEnemyOrb/HP Component") + +[node name="MeleeEnemyOrb5" parent="Enemies/MeleeEnemyOrb5" node_paths=PackedStringArray("_hp") instance=ExtResource("4_3lkwt")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.203964, -0.499194, 9.24329) +_hp = NodePath("../../MeleeEnemyOrb/HP Component") + +[node name="MeleeEnemyOrb6" parent="Enemies/MeleeEnemyOrb5" node_paths=PackedStringArray("_hp") instance=ExtResource("4_3lkwt")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.17125, -0.499194, 9.21708) +_hp = NodePath("../../MeleeEnemyOrb2/HP Component") + +[node name="MeleeEnemyOrb6" parent="Enemies" node_paths=PackedStringArray("_hp") instance=ExtResource("4_3lkwt")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.14623, -0.499194, -7.42214) +_hp = NodePath("../MeleeEnemyOrb2/HP Component") [node name="MeleeEnemyOrb" parent="Enemies" instance=ExtResource("4_3lkwt")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.34221, -0.75971, -2.23892) @@ -277,10 +294,10 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.27673, -0.75971, -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.521506, -1.78045) +transform = Transform3D(-0.998469, 0, -0.0553162, 0, 1, 0, 0.0553162, 0, -0.998469, 4.32002, -0.521506, -1.79135) [node name="RangedEnemy8" parent="Enemies" instance=ExtResource("3_hfsy3")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.2018, -0.521506, -0.0385171) +transform = Transform3D(-0.998469, 0, -0.0553162, 0, 1, 0, 0.0553162, 0, -0.998469, 4.39861, -0.521506, -0.0494209) [node name="Collisions" type="StaticBody3D" parent="."] collision_mask = 0 diff --git a/Levels/Scenes/Level4.tscn b/Levels/Scenes/Level4.tscn index 12ed995..6bc4e3c 100644 --- a/Levels/Scenes/Level4.tscn +++ b/Levels/Scenes/Level4.tscn @@ -890,37 +890,37 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.69921, -9.53674e-07, 2.9449 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.14077, 0, 0.536548) [node name="RangedEnemy" parent="Enemies" instance=ExtResource("5_dwr6w")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.17727, 9.53674e-07, 1.7005) +transform = Transform3D(-0.99964, 0, -0.02684, 0, 1, 0, 0.02684, 0, -0.99964, -2.95027, 9.53674e-07, 1.69441) [node name="MeleeEnemyOrb5" parent="Enemies" instance=ExtResource("4_np1us")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.90128, 0, 0.427487) [node name="RangedEnemy2" parent="Enemies" instance=ExtResource("5_dwr6w")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.93202, -9.53674e-07, 1.65812) +transform = Transform3D(-0.99964, 0, -0.02684, 0, 1, 0, 0.02684, 0, -0.99964, 3.15902, -9.53674e-07, 1.65203) [node name="RangedEnemy3" parent="Enemies" instance=ExtResource("5_dwr6w")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.12011, 0, -1.44085) +transform = Transform3D(-0.99964, 0, -0.02684, 0, 1, 0, 0.02684, 0, -0.99964, 3.34711, 0, -1.44694) [node name="RangedEnemy4" parent="Enemies" instance=ExtResource("5_dwr6w")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.21587, 1.90735e-06, -1.45039) +transform = Transform3D(-0.99964, 0, -0.02684, 0, 1, 0, 0.02684, 0, -0.99964, 4.44287, 1.90735e-06, -1.45648) [node name="RangedEnemy5" parent="Enemies" instance=ExtResource("5_dwr6w")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.89703, 0.0507913, -1.83458) +transform = Transform3D(-0.99964, 0, -0.02684, 0, 1, 0, 0.02684, 0, -0.99964, -4.67003, 0.0507913, -1.84067) [node name="RangedEnemy6" parent="Enemies" instance=ExtResource("5_dwr6w")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.79418, 0, -1.72954) +transform = Transform3D(-0.99964, 0, -0.02684, 0, 1, 0, 0.02684, 0, -0.99964, -3.56718, 0, -1.73563) [node name="RangedEnemy7" parent="Enemies" instance=ExtResource("5_dwr6w")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.13646, 1.5342, -3.19075) +transform = Transform3D(-0.99964, 0, -0.02684, 0, 1, 0, 0.02684, 0, -0.99964, -3.90946, 1.5342, -3.19684) [node name="RangedEnemy8" parent="Enemies" instance=ExtResource("5_dwr6w")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.2607, 1.5342, -3.48004) +transform = Transform3D(-0.99964, 0, -0.02684, 0, 1, 0, 0.02684, 0, -0.99964, -3.0337, 1.5342, -3.48614) [node name="RangedEnemy9" parent="Enemies" instance=ExtResource("5_dwr6w")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.80107, 1.5342, -3.09648) +transform = Transform3D(-0.99964, 0, -0.02684, 0, 1, 0, 0.02684, 0, -0.99964, 3.02807, 1.5342, -3.10257) [node name="RangedEnemy10" parent="Enemies" instance=ExtResource("5_dwr6w")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.6085, 1.5342, -3.40501) +transform = Transform3D(-0.99964, 0, -0.02684, 0, 1, 0, 0.02684, 0, -0.99964, 3.8355, 1.5342, -3.4111) [node name="StaticBody3D" type="StaticBody3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1.22039) diff --git a/Levels/Scenes/Level5.tscn b/Levels/Scenes/Level5.tscn index 50330dc..2baf172 100644 --- a/Levels/Scenes/Level5.tscn +++ b/Levels/Scenes/Level5.tscn @@ -447,10 +447,10 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.02877, 0, -3.9926) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.880343, 0, -3.96708) [node name="RangedEnemy" parent="Enemies" instance=ExtResource("7_nkdkc")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.34288, -0.540624, -4.86023) +transform = Transform3D(-0.999979, 0, -0.00651006, 0, 1, 0, 0.00651006, 0, -0.999979, 2.25543, -0.540624, -5.07379) [node name="RangedEnemy2" parent="Enemies" instance=ExtResource("7_nkdkc")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.26165, -0.540624, -4.82196) +transform = Transform3D(-0.999979, 0, -0.00651006, 0, 1, 0, 0.00651006, 0, -0.999979, -3.12051, -0.540624, -5.05003) [node name="Melee Enemy3" parent="Enemies" instance=ExtResource("6_bvlpe")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.82783, 0, -2.23182) @@ -459,19 +459,19 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.82783, 0, -2.23182) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.71768, 0, -2.14251) [node name="RangedEnemy3" parent="Enemies" instance=ExtResource("7_nkdkc")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.86281, -0.540624, -0.113782) +transform = Transform3D(-0.999979, 0, -0.00651006, 0, 1, 0, 0.00651006, 0, -0.999979, 1.88885, -0.540624, -1.15556) [node name="RangedEnemy4" parent="Enemies" instance=ExtResource("7_nkdkc")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.13477, -0.540624, 0.232252) +transform = Transform3D(-0.999979, 0, -0.00651006, 0, 1, 0, 0.00651006, 0, -0.999979, 4.162, -0.540624, -0.626571) [node name="RangedEnemy5" parent="Enemies" instance=ExtResource("7_nkdkc")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.508544, -0.540624, -1.13693) +transform = Transform3D(-0.999979, 0, -0.00651006, 0, 1, 0, 0.00651006, 0, -0.999979, -0.420066, -0.540624, -1.97878) [node name="RangedEnemy6" parent="Enemies" instance=ExtResource("7_nkdkc")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.87485, -0.540624, -0.0802793) +transform = Transform3D(-0.999979, 0, -0.00651006, 0, 1, 0, 0.00651006, 0, -0.999979, -2.84921, -0.540624, -1.18296) [node name="RangedEnemy7" parent="Enemies" instance=ExtResource("7_nkdkc")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.1221, -0.540624, 0.381076) +transform = Transform3D(-0.999979, 0, -0.00651006, 0, 1, 0, 0.00651006, 0, -0.999979, -5.09629, -0.540624, -0.695893) [node name="Melee Enemy5" parent="Enemies" instance=ExtResource("6_bvlpe")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.38085, 0, 2.36044) diff --git a/Levels/Scenes/Level6.tscn b/Levels/Scenes/Level6.tscn index 330bdca..daa39e2 100644 --- a/Levels/Scenes/Level6.tscn +++ b/Levels/Scenes/Level6.tscn @@ -373,6 +373,22 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.98928, -0.440327, -5.37495 [node name="Melee Enemy2" parent="Enemies" instance=ExtResource("8_pcfp7")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.658211, -0.481392, -5.30212) +[node name="Melee Enemy8" parent="Enemies" node_paths=PackedStringArray("_hp") instance=ExtResource("8_pcfp7")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.69063, 1.9592, 6.59267) +_hp = NodePath("../Melee Enemy3/HP Component") + +[node name="Melee Enemy5" parent="Enemies" node_paths=PackedStringArray("_hp") instance=ExtResource("8_pcfp7")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.54344, -0.422286, 3.85762) +_hp = NodePath("../Melee Enemy3/HP Component") + +[node name="Melee Enemy6" parent="Enemies" node_paths=PackedStringArray("_hp") instance=ExtResource("8_pcfp7")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.40446, -0.556523, 5.1222) +_hp = NodePath("../Melee Enemy3/HP Component") + +[node name="Melee Enemy7" parent="Enemies" node_paths=PackedStringArray("_hp") instance=ExtResource("8_pcfp7")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.41915, -0.415115, 3.75957) +_hp = NodePath("../Melee Enemy3/HP Component") + [node name="Melee Enemy3" parent="Enemies" instance=ExtResource("8_pcfp7")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.75905, -0.356384, -3.9141) @@ -380,28 +396,28 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.75905, -0.356384, -3.9141) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.78719, -0.325428, -2.71366) [node name="RangedEnemy" parent="Enemies" instance=ExtResource("9_upafh")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.06266, -0.291706, -3.81094) +transform = Transform3D(-0.999746, 0, 0.0225302, 0, 1, 0, -0.0225302, 0, -0.999746, -5.06266, -0.291706, -3.81094) [node name="RangedEnemy2" parent="Enemies" instance=ExtResource("9_upafh")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.02515, -0.282636, -2.63863) [node name="RangedEnemy3" parent="Enemies" instance=ExtResource("9_upafh")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.19223, 1.53048, -0.614206) +transform = Transform3D(-0.999197, 0, 0.0400621, 0, 1, 0, -0.0400621, 0, -0.999197, -3.19223, 1.53048, -0.614206) [node name="RangedEnemy4" parent="Enemies" instance=ExtResource("9_upafh")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.19223, 1.53071, 1.78455) +transform = Transform3D(-0.999197, 0, 0.0400621, 0, 1, 0, -0.0400621, 0, -0.999197, -3.19223, 1.53071, 1.78455) [node name="RangedEnemy5" parent="Enemies" instance=ExtResource("9_upafh")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.61478, 1.56024, 1.27111) +transform = Transform3D(-0.999968, 0, -0.00802833, 0, 1, 0, 0.00802833, 0, -0.999968, 2.61478, 1.56024, 1.27111) [node name="RangedEnemy6" parent="Enemies" instance=ExtResource("9_upafh")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.62754, 1.56001, -0.655549) +transform = Transform3D(-0.999968, 0, -0.00802833, 0, 1, 0, 0.00802833, 0, -0.999968, 2.62754, 1.56001, -0.655549) [node name="RangedEnemy7" parent="Enemies" instance=ExtResource("9_upafh")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.62754, 1.56047, -2.65876) +transform = Transform3D(-0.999968, 0, -0.00802833, 0, 1, 0, 0.00802833, 0, -0.999968, 2.62754, 1.56047, -2.65876) [node name="RangedEnemy8" parent="Enemies" instance=ExtResource("9_upafh")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.55098, 1.56001, -4.86613) +transform = Transform3D(-0.999968, 0, -0.00802833, 0, 1, 0, 0.00802833, 0, -0.999968, 2.55098, 1.56001, -4.86613) [node name="Exit Portal" parent="." instance=ExtResource("3_ehcts")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.16047, 0, -5.04704) diff --git a/Levels/Scenes/Level7.tscn b/Levels/Scenes/Level7.tscn index 7bd67cf..c696b07 100644 --- a/Levels/Scenes/Level7.tscn +++ b/Levels/Scenes/Level7.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=16 format=3 uid="uid://bsq7edeueqyjg"] +[gd_scene load_steps=19 format=3 uid="uid://bsq7edeueqyjg"] [ext_resource type="Script" path="res://Levels/Scripts/Level.cs" id="1_wqwee"] [ext_resource type="PackedScene" uid="uid://bgf5byqt71kir" path="res://Levels/Models/Stage7/Stage7.tscn" id="2_21i6n"] @@ -8,6 +8,21 @@ [ext_resource type="Shader" path="res://Levels/Scenes/FallingLeaves.gdshader" id="6_biibx"] [ext_resource type="Texture2D" uid="uid://jb30lo7r5ev4" path="res://Textures/rose petal 1.png" id="7_it0x1"] +[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_q3vsp"] +sky_top_color = Color(1, 1, 1, 1) +sky_horizon_color = Color(0.75, 0.75, 0.75, 1) +ground_bottom_color = Color(0, 0, 0, 1) +ground_horizon_color = Color(0.75, 0.75, 0.75, 1) + +[sub_resource type="Sky" id="Sky_dy0fx"] +sky_material = SubResource("ProceduralSkyMaterial_q3vsp") + +[sub_resource type="Environment" id="Environment_4qh5g"] +background_mode = 2 +sky = SubResource("Sky_dy0fx") +tonemap_mode = 2 +glow_enabled = true + [sub_resource type="ShaderMaterial" id="ShaderMaterial_qgv5j"] shader = ExtResource("6_biibx") shader_parameter/dimensions = Vector2(1152, 648) @@ -51,6 +66,9 @@ size = Vector3(4.32001, 3, 4.24331) process_mode = 3 script = ExtResource("1_wqwee") +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +environment = SubResource("Environment_4qh5g") + [node name="Container" type="Control" parent="."] use_parent_material = true layout_mode = 3 @@ -127,23 +145,39 @@ transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 3.3865 [node name="Melee Enemy" parent="Enemies" instance=ExtResource("4_i8hlv")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.55692, 0, 1.39133) +[node name="Melee Enemy7" parent="Enemies" node_paths=PackedStringArray("_hp") instance=ExtResource("4_i8hlv")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.22017, 1.90735e-06, -0.12995) +_hp = NodePath("../Melee Enemy2/HP Component") + +[node name="Melee Enemy6" parent="Enemies" node_paths=PackedStringArray("_hp") instance=ExtResource("4_i8hlv")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.22475, 1.90735e-06, -1.13099) +_hp = NodePath("../Melee Enemy2/HP Component") + +[node name="Melee Enemy8" parent="Enemies" node_paths=PackedStringArray("_hp") instance=ExtResource("4_i8hlv")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.31128, 0.142259, -0.157732) +_hp = NodePath("../Melee Enemy3/HP Component") + [node name="Melee Enemy2" parent="Enemies" instance=ExtResource("4_i8hlv")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.06656, 0, 1.27775) +[node name="Melee Enemy9" parent="Enemies" node_paths=PackedStringArray("_hp") instance=ExtResource("4_i8hlv")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.347677, -0.16304, -0.110985) +_hp = NodePath("../Melee Enemy3/HP Component") + [node name="Melee Enemy3" parent="Enemies" instance=ExtResource("4_i8hlv")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.737402, 0, -0.439096) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.501566, 0, -1.0495) [node name="RangedEnemy3" parent="Enemies" instance=ExtResource("3_k38yu")] -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 2.87835, 0.552559, -4.46606) +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 3.4767, 0.552559, -5.29714) [node name="RangedEnemy4" parent="Enemies" instance=ExtResource("3_k38yu")] -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 1.43271, 0.54106, -4.59394) +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 2.03106, 0.54106, -5.33924) [node name="RangedEnemy5" parent="Enemies" instance=ExtResource("3_k38yu")] -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -3.62257, 0.525391, -4.57564) +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -3.62257, 0.525391, -5.43964) [node name="RangedEnemy6" parent="Enemies" instance=ExtResource("3_k38yu")] -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -5.3436, 0.564535, -4.33553) +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -5.3436, 0.564535, -5.44139) [node name="Melee Enemy4" parent="Enemies" instance=ExtResource("4_i8hlv")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.7193, 0, -6.27177) diff --git a/Levels/Scenes/Level8.tscn b/Levels/Scenes/Level8.tscn index c8c8f9b..b3b7c79 100644 --- a/Levels/Scenes/Level8.tscn +++ b/Levels/Scenes/Level8.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=14 format=3 uid="uid://c4xcka4ekuur8"] +[gd_scene load_steps=17 format=3 uid="uid://c4xcka4ekuur8"] [ext_resource type="Script" path="res://Levels/Scripts/Level.cs" id="1_jc6qp"] [ext_resource type="PackedScene" uid="uid://b6ciyf30f07ll" path="res://Levels/Models/Stage8/STAGE 8.glb" id="2_wcvbl"] @@ -6,6 +6,28 @@ [ext_resource type="PackedScene" uid="uid://bt5rolsyjmx55" path="res://Enemies/MeleeEnemy.tscn" id="3_t8wes"] [ext_resource type="PackedScene" uid="uid://dahp73fwld24h" path="res://Enemies/RangedEnemy.tscn" id="4_off4x"] +[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_2vg1n"] +sky_top_color = Color(1, 1, 1, 1) +sky_horizon_color = Color(0.75, 0.75, 0.75, 1) +ground_bottom_color = Color(0, 0, 0, 1) +ground_horizon_color = Color(0.75, 0.75, 0.75, 1) + +[sub_resource type="Sky" id="Sky_7vt0r"] +sky_material = SubResource("ProceduralSkyMaterial_2vg1n") + +[sub_resource type="Environment" id="Environment_wfdua"] +background_mode = 2 +sky = SubResource("Sky_7vt0r") +tonemap_mode = 2 +fog_light_energy = 0.83 +fog_density = 0.0414 +fog_sky_affect = 0.0 +fog_height = -37.65 +adjustment_enabled = true +adjustment_brightness = 1.21 +adjustment_contrast = 1.42 +adjustment_saturation = 0.83 + [sub_resource type="BoxShape3D" id="BoxShape3D_3n0wx"] size = Vector3(5, 20, 27.822) @@ -34,6 +56,9 @@ size = Vector3(1, 2.48491, 2.18519) process_mode = 3 script = ExtResource("1_jc6qp") +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +environment = SubResource("Environment_wfdua") + [node name="STAGE 8" parent="." instance=ExtResource("2_wcvbl")] [node name="Collisions" type="StaticBody3D" parent="."] @@ -81,19 +106,19 @@ shape = SubResource("BoxShape3D_vmmcb") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.43249, 0, 1.37801) [node name="RangedEnemy" parent="Enemies" instance=ExtResource("4_off4x")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.37175, 0, 0.203655) +transform = Transform3D(-0.999839, 0, -0.0179411, 0, 1, 0, 0.0179411, 0, -0.999839, -4.37175, 0, 0.203655) [node name="Melee Enemy2" parent="Enemies" instance=ExtResource("3_t8wes")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.20868, 0, 2.53211) [node name="RangedEnemy2" parent="Enemies" instance=ExtResource("4_off4x")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.56526, 0, 2.77508) +transform = Transform3D(-0.999839, 0, -0.0179411, 0, 1, 0, 0.0179411, 0, -0.999839, 3.56526, 0, 2.77508) [node name="RangedEnemy3" parent="Enemies" instance=ExtResource("4_off4x")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.18762, 0, -5.24291) +transform = Transform3D(-0.999839, 0, -0.0179411, 0, 1, 0, 0.0179411, 0, -0.999839, 4.18762, 0, -5.24291) [node name="RangedEnemy4" parent="Enemies" instance=ExtResource("4_off4x")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.14115, 0, -5.28341) +transform = Transform3D(-0.999839, 0, -0.0179411, 0, 1, 0, 0.0179411, 0, -0.999839, -5.14115, 0, -5.28341) [node name="Melee Enemy3" parent="Enemies" instance=ExtResource("3_t8wes")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.22214, 0, -4.33178) @@ -102,13 +127,13 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.22214, 0, -4.33178) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.70358, 0, -4.35202) [node name="RangedEnemy5" parent="Enemies" instance=ExtResource("4_off4x")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.97917, 0, -2.71198) +transform = Transform3D(-0.999839, 0, -0.0179411, 0, 1, 0, 0.0179411, 0, -0.999839, -4.97917, 0, -2.71198) [node name="Melee Enemy5" parent="Enemies" instance=ExtResource("3_t8wes")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.14006, 0, -0.70748) [node name="RangedEnemy6" parent="Enemies" instance=ExtResource("4_off4x")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.26155, 0, -1.57812) +transform = Transform3D(-0.999839, 0, -0.0179411, 0, 1, 0, 0.0179411, 0, -0.999839, 3.26155, 0, -1.57812) [node name="Exit Portal" parent="." instance=ExtResource("3_44edv")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.54331, 0, -4.41291) diff --git a/Levels/Scenes/Level9.tscn b/Levels/Scenes/Level9.tscn index 3f1aa54..5e97d7e 100644 --- a/Levels/Scenes/Level9.tscn +++ b/Levels/Scenes/Level9.tscn @@ -429,6 +429,18 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.102972, 0) mesh = SubResource("ArrayMesh_aecmk") skeleton = NodePath("") +[node name="Melee Enemy2" parent="STAGE 9/Plane" node_paths=PackedStringArray("_hp") instance=ExtResource("6_he4fx")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.50991, 0, 1.92293) +_hp = NodePath("../../../Melee Enemy2/HP Component") + +[node name="Melee Enemy2" parent="STAGE 9/Plane/Melee Enemy2" node_paths=PackedStringArray("_hp") instance=ExtResource("6_he4fx")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.932325, -0.367979, -6.01649) +_hp = NodePath("../../../../Melee Enemy2/HP Component") + +[node name="Melee Enemy2" parent="STAGE 9/Plane/Melee Enemy2/Melee Enemy2" node_paths=PackedStringArray("_hp") instance=ExtResource("6_he4fx")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.05054, -0.367979, -0.683629) +_hp = NodePath("../../../../../Melee Enemy2/HP Component") + [node name="Cube" type="MeshInstance3D" parent="STAGE 9"] transform = Transform3D(-1.88868, 0, -9.70661e-08, 0, 1, 0, 6.1541e-07, 0, -0.297894, 2.97173, 0.129772, -3.56831) mesh = SubResource("ArrayMesh_0boqi") @@ -502,6 +514,7 @@ skeleton = NodePath("") [node name="BezierCurve_001" type="MeshInstance3D" parent="STAGE 9"] transform = Transform3D(1.0435, 0, 0, 0, 1.33801, 0, 0, 0, 1.0435, 2.25921, 0.499229, 3.46223) +visible = false mesh = SubResource("ArrayMesh_j10w7") skeleton = NodePath("") @@ -568,23 +581,31 @@ libraries = { [node name="Enemies" type="Node3D" parent="."] -[node name="RangedEnemy" parent="Enemies" instance=ExtResource("5_g2lk8")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.15118, 0.257979, -2.952) - [node name="Melee Enemy" parent="." instance=ExtResource("6_he4fx")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.07774, 0.251952, 1.13652) [node name="Melee Enemy2" parent="." instance=ExtResource("6_he4fx")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.59927, 0, 2.47846) +[node name="RangedEnemy4" parent="." instance=ExtResource("5_g2lk8")] +transform = Transform3D(-0.999999, 0, -0.00116936, 0, 1, 0, 0.00116936, 0, -0.999999, -1.48224, -0.0960431, -2.952) + [node name="RangedEnemy" parent="." instance=ExtResource("5_g2lk8")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.88274, 0, -1.93627) +transform = Transform3D(-0.999999, 0, -0.00116936, 0, 1, 0, 0.00116936, 0, -0.999999, 1.88274, 0, -1.93627) + +[node name="RangedEnemy6" parent="." node_paths=PackedStringArray("_hp") instance=ExtResource("5_g2lk8")] +transform = Transform3D(-0.999999, 0, -0.00116936, 0, 1, 0, 0.00116936, 0, -0.999999, -4.88238, -0.396447, -4.21396) +_hp = NodePath("../RangedEnemy2/HP Component") + +[node name="RangedEnemy5" parent="." node_paths=PackedStringArray("_hp") instance=ExtResource("5_g2lk8")] +transform = Transform3D(-0.999999, 0, -0.00116936, 0, 1, 0, 0.00116936, 0, -0.999999, -4.78224, -0.264298, 0.6371) +_hp = NodePath("../RangedEnemy2/HP Component") [node name="RangedEnemy2" parent="." instance=ExtResource("5_g2lk8")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.526673, -0.132149, -3.13367) +transform = Transform3D(-0.999999, 0, -0.00116936, 0, 1, 0, 0.00116936, 0, -0.999999, 0.526673, -0.132149, -3.13367) [node name="RangedEnemy3" parent="." instance=ExtResource("5_g2lk8")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.307606, -0.298673, -3.61058) +transform = Transform3D(-0.999999, 0, -0.00116936, 0, 1, 0, 0.00116936, 0, -0.999999, -0.307606, -0.298673, -3.61058) [node name="Exit Portal" parent="." instance=ExtResource("7_h6fqi")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.469687, 0, -5.16503) diff --git a/Levels/Scripts/FinalLevel.cs b/Levels/Scripts/FinalLevel.cs index ee9782f..6b416b8 100644 --- a/Levels/Scripts/FinalLevel.cs +++ b/Levels/Scripts/FinalLevel.cs @@ -4,8 +4,8 @@ public partial class FinalLevel : Node3D { public override void _Ready() { - var bgmPlayer = GetTree().Root.GetNode("BgmPlayer"); - bgmPlayer.SetBGMFromFilepath("Audio/BGM/BossTheme.ogg"); - bgmPlayer.PlayBGM(); + var bgmPlayer = GetTree().Root.GetNode("BgmPlayer"); + bgmPlayer.SetBGMFromFilepath("Audio/BGM/BossTheme.ogg"); + bgmPlayer.PlayBGM(); } } diff --git a/Levels/Scripts/Level.cs b/Levels/Scripts/Level.cs index 6f52aa5..376f92c 100644 --- a/Levels/Scripts/Level.cs +++ b/Levels/Scripts/Level.cs @@ -1,4 +1,4 @@ -using Godot; +using Godot; using System.Collections.Generic; using System.Linq; @@ -9,18 +9,18 @@ public partial class Level : Node3D public override void _EnterTree() { - _gameManager = GetTree().Root.GetNode("Main/GameManager"); - _enemies = GetNode("Enemies").GetChildren().OfType().ToList(); + _gameManager = GetTree().Root.GetNode("Main/GameManager"); + _enemies = GetNode("Enemies").GetChildren().OfType().ToList(); } public void OnEnemyDefeated(BasicEnemy enemy) { - if (_enemies.Contains(enemy)) - { - GD.Print("On enemy defeated " + enemy.Name); - _enemies.Remove(enemy); - if (!_enemies.Any()) - _gameManager.OnAllEnemiesDefeated(); - } + if (_enemies.Contains(enemy)) + { + GD.Print("On enemy defeated " + enemy.Name); + _enemies.Remove(enemy); + if (!_enemies.Any()) + _gameManager.OnAllEnemiesDefeated(); + } } } diff --git a/Player/Base/Player.cs b/Player/Base/Player.cs index 2f8c19a..160f4fe 100644 --- a/Player/Base/Player.cs +++ b/Player/Base/Player.cs @@ -1,4 +1,4 @@ -using Godot; +using Godot; using Godot.Collections; using System.Collections.Generic; @@ -29,9 +29,9 @@ public partial class Player : Node3D public override void _Ready() { - foreach (var character in PlayableCharacterScenes) - { - CharactersLeftOnStage.Add(character); - } + foreach (var character in PlayableCharacterScenes) + { + CharactersLeftOnStage.Add(character); + } } } diff --git a/Player/Base/SpawnPoint.cs b/Player/Base/SpawnPoint.cs index 7453862..ba98aea 100644 --- a/Player/Base/SpawnPoint.cs +++ b/Player/Base/SpawnPoint.cs @@ -4,7 +4,7 @@ public partial class SpawnPoint : Marker3D { public void SetPlayerPosition(Character character) { - GD.Print("Moving character to spawn point"); - character.Position = Position; + GD.Print("Moving character to spawn point"); + character.Position = Position; } } diff --git a/Textures/Shaders/ScrollShader.gdshader b/Textures/Shaders/ScrollShader.gdshader index d8b8115..85cba27 100644 --- a/Textures/Shaders/ScrollShader.gdshader +++ b/Textures/Shaders/ScrollShader.gdshader @@ -1,11 +1,11 @@ shader_type spatial; render_mode blend_mul; -uniform vec2 direction_and_speed = vec2(0.25, 0.00); +uniform vec2 direction_and_speed = vec2(0.25, 0.25); uniform vec2 scale = vec2(1.0); -uniform bool flip = false; +uniform bool flip = true; uniform sampler2D albedo: hint_default_transparent; -uniform float alphaSet = 1.0; +uniform float alphaSet = 0.0; void fragment() { vec2 uv = UV * scale - direction_and_speed * TIME; diff --git a/UI/MainMenu.cs b/UI/MainMenu.cs index 1234fb3..097303a 100644 --- a/UI/MainMenu.cs +++ b/UI/MainMenu.cs @@ -12,48 +12,48 @@ public partial class MainMenu : Node2D public override void _Ready() { - GetParent().GetNode("MainMenu/UIAnimations/LoreSplash").Show(); - _animationPlayer = GetTree().Root.GetNode("/root/Main/MainMenu/UIAnimations/AnimationPlayer"); - _animationPlayer.Play("IntroLore"); - var bgmPlayer = GetTree().Root.GetNode("BgmPlayer"); - bgmPlayer.SetBGMFromFilepath("Audio/BGM/TitleTheme.ogg"); - bgmPlayer.PlayBGM(); - _player1Input = new Player1Input(); - _player2Input = new Player2Input(); - _animationPlayer.AnimationFinished += OnIntroAnimationFinished; + GetParent().GetNode("MainMenu/UIAnimations/LoreSplash").Show(); + _animationPlayer = GetTree().Root.GetNode("/root/Main/MainMenu/UIAnimations/AnimationPlayer"); + _animationPlayer.Play("IntroLore"); + var bgmPlayer = GetTree().Root.GetNode("BgmPlayer"); + bgmPlayer.SetBGMFromFilepath("Audio/BGM/TitleTheme.ogg"); + bgmPlayer.PlayBGM(); + _player1Input = new Player1Input(); + _player2Input = new Player2Input(); + _animationPlayer.AnimationFinished += OnIntroAnimationFinished; } public override void _UnhandledInput(InputEvent @event) { - if (_animationPlayer.IsPlaying() && (Input.IsActionJustPressed(_player1Input.Fire()) || Input.IsActionJustPressed(_player2Input.Fire()))) - { - _animationPlayer.Seek(10); - GetNode("NewGame/1Player").GrabFocus(); - } + if (_animationPlayer.IsPlaying() && (Input.IsActionJustPressed(_player1Input.Fire()) || Input.IsActionJustPressed(_player2Input.Fire()))) + { + _animationPlayer.Seek(10); + GetNode("NewGame/1Player").GrabFocus(); + } } public void OnIntroAnimationFinished(StringName animationName) { - GetNode("NewGame/1Player").GrabFocus(); + GetNode("NewGame/1Player").GrabFocus(); } private void OneSinglePlayerPressed() { - Hide(); - var main = GetTree().Root.GetNode
("/root/Main"); - main.LoadLevel(0, 1); + Hide(); + var main = GetTree().Root.GetNode
("/root/Main"); + main.LoadLevel(0, 1); } private void OnTwoPlayerPressed() { - Hide(); - var main = GetTree().Root.GetNode
("/root/Main"); - main.LoadLevel(0, 2); + Hide(); + var main = GetTree().Root.GetNode
("/root/Main"); + main.LoadLevel(0, 2); } private void OnQuitButtonPressed() { - GetTree().Quit(); + GetTree().Quit(); } } diff --git a/Video/CloudScrollMaterial.tres b/Video/CloudScrollMaterial.tres index 4a20217..3552b50 100644 --- a/Video/CloudScrollMaterial.tres +++ b/Video/CloudScrollMaterial.tres @@ -3,4 +3,6 @@ [ext_resource type="Texture2D" uid="uid://cr0gri4qbssrl" path="res://Levels/Models/Stage10/FINAL STAGE_clouds.png" id="1_puyp5"] [resource] +depth_draw_mode = 1 +shading_mode = 0 albedo_texture = ExtResource("1_puyp5") diff --git a/project.godot b/project.godot index fd09a83..f4aaedf 100644 --- a/project.godot +++ b/project.godot @@ -178,7 +178,11 @@ p2_altfire={ textures/canvas_textures/default_texture_filter=0 textures/lossless_compression/force_png=true reflections/sky_reflections/texture_array_reflections=false +shading/overrides/force_vertex_shading=true +shading/overrides/force_lambert_over_burley=true +textures/default_filters/use_nearest_mipmap_filter=true textures/default_filters/anisotropic_filtering_level=0 environment/ssao/quality=0 environment/ssil/quality=0 +anti_aliasing/screen_space_roughness_limiter/enabled=false environment/glow/upscale_mode=0