diff --git a/Enemies/Attacks/EnemyBullet.tscn b/Enemies/Attacks/EnemyBullet.tscn index 423fc3e..b4cc600 100644 --- a/Enemies/Attacks/EnemyBullet.tscn +++ b/Enemies/Attacks/EnemyBullet.tscn @@ -11,7 +11,7 @@ _data = { point_count = 2 [sub_resource type="CylinderShape3D" id="CylinderShape3D_e4v7f"] -height = 15.359 +height = 7.0 radius = 0.154574 [node name="EnemyBullet" type="Path3D"] @@ -26,7 +26,7 @@ tilt_enabled = false [node name="RigidBody3D" type="RigidBody3D" parent="PathFollow3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 0) collision_layer = 0 -collision_mask = 3 +collision_mask = 2 gravity_scale = 0.0 continuous_cd = true max_contacts_reported = 10 diff --git a/Enemies/MeleeEnemy.tscn b/Enemies/MeleeEnemy.tscn index eea893b..60946c5 100644 --- a/Enemies/MeleeEnemy.tscn +++ b/Enemies/MeleeEnemy.tscn @@ -1176,16 +1176,14 @@ _data = { [node name="Melee Enemy" type="RigidBody3D" node_paths=PackedStringArray("_hp") groups=["Enemy"]] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.251952, 0) +disable_mode = 2 collision_layer = 0 -collision_mask = 69 -axis_lock_angular_x = true -axis_lock_angular_z = true +collision_mask = 33 gravity_scale = 0.0 +continuous_cd = true max_contacts_reported = 20 contact_monitor = true can_sleep = false -freeze = true -freeze_mode = 1 script = ExtResource("1_50och") _hp = NodePath("HP Component") @@ -1194,7 +1192,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0840461, 0.475385, 0.143401 shape = SubResource("BoxShape3D_1nq5h") [node name="MeleeEnemy" type="Node3D" parent="CollisionShape3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0840461, -0.010569, -0.143401) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0840461, -0.612543, -0.143401) [node name="Icosphere001" type="MeshInstance3D" parent="CollisionShape3D/MeleeEnemy"] transform = Transform3D(0.850843, 0, 0, 0, 0.850843, 0, 0, 0, 0.850843, 0.0805536, 0.468312, 0.158035) @@ -1255,4 +1253,13 @@ libraries = { [node name="HP Component" parent="." instance=ExtResource("2_1leby")] MaximumHP = 1 -[connection signal="body_entered" from="." to="." method="OnPlayerHit"] +[node name="Area3D" type="Area3D" parent="."] +collision_layer = 0 +collision_mask = 68 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0840461, 0.475385, 0.143401) +shape = SubResource("BoxShape3D_1nq5h") + +[connection signal="body_entered" from="Area3D" to="." method="OnEnemyHit"] +[connection signal="body_entered" from="Area3D" to="." method="OnPlayerHit"] diff --git a/Enemies/RangedEnemy.tscn b/Enemies/RangedEnemy.tscn index 3e4a9c2..6250693 100644 --- a/Enemies/RangedEnemy.tscn +++ b/Enemies/RangedEnemy.tscn @@ -894,7 +894,7 @@ shadow_mesh = SubResource("ArrayMesh_j7wsk") [node name="RangedEnemy" type="RigidBody3D" node_paths=PackedStringArray("_hp") groups=["Enemy"]] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.257979, 0) collision_layer = 0 -collision_mask = 69 +collision_mask = 68 gravity_scale = 0.0 max_contacts_reported = 20 contact_monitor = true @@ -905,6 +905,7 @@ script = ExtResource("1_01lvj") _hp = NodePath("HP Component") [node name="Timer" type="Timer" parent="." node_paths=PackedStringArray("_enemy")] +wait_time = 0.75 autostart = true script = ExtResource("3_qt2md") _enemy = NodePath("..") diff --git a/Enemies/Scripts/BasicEnemy.cs b/Enemies/Scripts/BasicEnemy.cs index 5b2f182..4e1cbfb 100644 --- a/Enemies/Scripts/BasicEnemy.cs +++ b/Enemies/Scripts/BasicEnemy.cs @@ -14,6 +14,9 @@ public partial class BasicEnemy : Node3D public void OnEnemyHit(Node3D node) { + if (node is Character) + return; + _hp.TakeDamage(1); if (_hp.CurrentHP <= 0) diff --git a/GameLogic/GameManager.cs b/GameLogic/GameManager.cs index d556d9e..c0c963d 100644 --- a/GameLogic/GameManager.cs +++ b/GameLogic/GameManager.cs @@ -61,15 +61,16 @@ public partial class GameManager : Node public void OnCharacterSelected(Player player) { - player.SelectedCharacter = null; var sfxPlayer = GetTree().Root.GetNode("Main/SFXPlayer"); var audioStream = ResourceLoader.Load("Audio/SFX/Select.wav"); sfxPlayer.Stream = audioStream; sfxPlayer.Play(); - GD.Print(player.Name); if (player.CharactersLeftOnStage.Any()) { - player.SelectedCharacter = player.CharactersLeftOnStage[player.CharacterIndex]; + 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); } @@ -79,12 +80,10 @@ public partial class GameManager : Node { ResetPlayerPosition(player); - player.CharactersLeftOnStage.Remove(player.SelectedCharacter); + player.CharactersLeftOnStage.RemoveAt(player.CharacterIndex); if (player.SelectedCharacter is not null) GetTree().Root.RemoveChild(player.SelectedCharacter); - GD.Print(player.CharactersLeftOnStage.Select(x => x.Name).ToArray()); - player.CharacterIndex = 0; if (player.CharactersLeftOnStage.Any()) EmitSignal(SignalName.ReselectCharacter, player); @@ -99,7 +98,7 @@ public partial class GameManager : Node public void RemoveCharacterAndAddToExit(Player player) { ResetPlayerPosition(player); - player.CharactersExited.Add(player.SelectedCharacter); + player.CharactersExited.Add(player.CharactersLeftOnStage.ElementAt(player.CharacterIndex)); RemoveCharacter(player); } diff --git a/GameLogic/GameManager.tscn b/GameLogic/GameManager.tscn index e27cb68..40583b6 100644 --- a/GameLogic/GameManager.tscn +++ b/GameLogic/GameManager.tscn @@ -17,12 +17,6 @@ script = ExtResource("1_ya2kt") PlayerScenes = Array[PackedScene]([ExtResource("4_3fl70"), ExtResource("3_y1wkr")]) -[node name="Camera3D" type="Camera3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, -0.527878, 10.966, 6.61121) -projection = 1 -current = true -size = 10.8546 - [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] transform = Transform3D(1, 0, 0, 0, -0.504317, 0.863519, 0, -0.863519, -0.504317, 0, 19.9508, 0) visible = false diff --git a/GameLogic/Main.tscn b/GameLogic/Main.tscn index c91b958..8c6810e 100644 --- a/GameLogic/Main.tscn +++ b/GameLogic/Main.tscn @@ -1,7 +1,16 @@ -[gd_scene load_steps=8 format=3 uid="uid://vwrw05ob2caq"] +[gd_scene load_steps=17 format=3 uid="uid://vwrw05ob2caq"] [ext_resource type="Script" path="res://GameLogic/Main.cs" id="1_g4hua"] +[ext_resource type="PackedScene" uid="uid://btl5fdyjewnwc" path="res://Levels/Scenes/Level3.tscn" id="2_0yhby"] +[ext_resource type="PackedScene" uid="uid://dqv03pua4j8ga" path="res://Levels/Scenes/Level1.tscn" id="2_jq3qe"] [ext_resource type="PackedScene" uid="uid://b12gq4yqc3d8i" path="res://UI/MainMenu.tscn" id="2_kvovw"] +[ext_resource type="PackedScene" uid="uid://basequfmpg04f" path="res://Levels/Scenes/Level2.tscn" id="3_nhrqr"] +[ext_resource type="PackedScene" uid="uid://ctvkevnc0wxka" path="res://Levels/Scenes/Level4.tscn" id="5_xj47l"] +[ext_resource type="PackedScene" uid="uid://col60npvg7wr1" path="res://Levels/Scenes/Level5.tscn" id="6_xmedq"] +[ext_resource type="PackedScene" uid="uid://8ukphol1isp2" path="res://Levels/Scenes/Level6.tscn" id="7_58n7x"] +[ext_resource type="PackedScene" uid="uid://bsq7edeueqyjg" path="res://Levels/Scenes/Level7.tscn" id="8_pcp3p"] +[ext_resource type="PackedScene" uid="uid://c4xcka4ekuur8" path="res://Levels/Scenes/Level8.tscn" id="9_n1hja"] +[ext_resource type="PackedScene" uid="uid://djwln4at4ho44" path="res://Levels/Scenes/Level9.tscn" id="10_rs7ve"] [ext_resource type="PackedScene" uid="uid://0hdnmilwrsq6" path="res://Levels/Scenes/Level10.tscn" id="11_o275c"] [ext_resource type="PackedScene" uid="uid://cxj6yeddshy16" path="res://GameLogic/GameManager.tscn" id="11_wiyvp"] [ext_resource type="PackedScene" uid="uid://cvvjbka5nf52j" path="res://UI/SceneTransition.tscn" id="14_ai16y"] @@ -14,7 +23,7 @@ font_color = Color(0, 1, 0, 1) [node name="Main" type="Node3D" node_paths=PackedStringArray("_fpsCounter")] script = ExtResource("1_g4hua") -Levels = Array[PackedScene]([ExtResource("11_o275c")]) +Levels = Array[PackedScene]([ExtResource("6_xmedq"), ExtResource("2_jq3qe"), ExtResource("3_nhrqr"), ExtResource("5_xj47l"), ExtResource("2_0yhby"), ExtResource("7_58n7x"), ExtResource("8_pcp3p"), ExtResource("9_n1hja"), ExtResource("10_rs7ve"), ExtResource("11_o275c")]) GameManager = ExtResource("11_wiyvp") _fpsCounter = NodePath("FPS Counter") @@ -39,3 +48,9 @@ offset_bottom = 42.0 text = "FPS " label_settings = SubResource("LabelSettings_ucjnc") + +[node name="Camera3D" type="Camera3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, -0.527878, 10.966, 6.61121) +projection = 1 +current = true +size = 10.8546 diff --git a/Levels/STAGE 5_aztec.png b/Levels/STAGE 5_aztec.png new file mode 100644 index 0000000..aa09d3b Binary files /dev/null and b/Levels/STAGE 5_aztec.png differ diff --git a/Levels/STAGE 5_aztec.png.import b/Levels/STAGE 5_aztec.png.import new file mode 100644 index 0000000..1c22082 --- /dev/null +++ b/Levels/STAGE 5_aztec.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://x445g44huk0k" +path="res://.godot/imported/STAGE 5_aztec.png-4b5a91f709adb3f366329cf40c601225.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Levels/STAGE 5_aztec.png" +dest_files=["res://.godot/imported/STAGE 5_aztec.png-4b5a91f709adb3f366329cf40c601225.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Levels/Scenes/Level2.tscn b/Levels/Scenes/Level2.tscn index 1bd7fc0..fa96998 100644 --- a/Levels/Scenes/Level2.tscn +++ b/Levels/Scenes/Level2.tscn @@ -22,7 +22,7 @@ size = Vector3(5, 20, 27.822) size = Vector3(1, 1.0878, 0.909629) [sub_resource type="BoxShape3D" id="BoxShape3D_3fmyi"] -size = Vector3(1.01672, 1.53478, 5.31772) +size = Vector3(1.01672, 1.53478, 5.06912) [sub_resource type="BoxShape3D" id="BoxShape3D_d3tdv"] size = Vector3(1.01556, 1.80238, 7.12857) @@ -31,7 +31,7 @@ size = Vector3(1.01556, 1.80238, 7.12857) size = Vector3(2.51995, 1.80782, 1) [sub_resource type="BoxShape3D" id="BoxShape3D_ccgpo"] -size = Vector3(1.81712, 1.43756, 8.27492) +size = Vector3(1.57333, 1.43756, 8.27492) [node name="Level2" type="Node3D" groups=["Level"]] process_mode = 3 @@ -101,7 +101,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.510721, 0.196356, -3.73385 shape = SubResource("BoxShape3D_15sb2") [node name="CollisionShape3D6" type="CollisionShape3D" parent="Collisions"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.539914, 0, 0.307289) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.539914, 0, 0.409884) shape = SubResource("BoxShape3D_3fmyi") [node name="CollisionShape3D7" type="CollisionShape3D" parent="Collisions"] diff --git a/Levels/Scenes/Level3.tscn b/Levels/Scenes/Level3.tscn index b7d146c..d60b047 100644 --- a/Levels/Scenes/Level3.tscn +++ b/Levels/Scenes/Level3.tscn @@ -411,6 +411,7 @@ size = Vector3(1.31359, 2.38677, 1.56842) [node name="Level3" type="Node3D" groups=["Level"]] process_mode = 3 +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.100843, 0, 0) script = ExtResource("1_1xwm7") [node name="STAGE 3" type="Node3D" parent="."] @@ -450,22 +451,22 @@ libraries = { transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.380475, 0) [node name="RangedEnemy" parent="Enemies" instance=ExtResource("5_8b1ug")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.88431, 0, -5.01806) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.66723, 0, -5.01806) [node name="RangedEnemy2" parent="Enemies" instance=ExtResource("5_8b1ug")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.92009, 0, -3.45365) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.70301, 0, -3.45365) [node name="RangedEnemy3" parent="Enemies" instance=ExtResource("5_8b1ug")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.9633, 0, -2.02987) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.74622, 0, -2.02987) [node name="RangedEnemy4" parent="Enemies" instance=ExtResource("5_8b1ug")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.04326, 0, -0.934418) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.82618, 0, -0.934418) [node name="MeleeEnemyOrb" parent="Enemies" instance=ExtResource("6_b7xn3")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.08149, 0, 0.325685) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.86441, 0, 0.325685) [node name="MeleeEnemyOrb2" parent="Enemies" instance=ExtResource("6_b7xn3")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.14518, 0, 1.65492) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.9281, 0, 1.65492) [node name="RangedEnemy5" parent="Enemies" instance=ExtResource("5_8b1ug")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.99163, 0, -3.39695) diff --git a/Levels/Scenes/Level4.tscn b/Levels/Scenes/Level4.tscn index c1c302b..710bf3a 100644 --- a/Levels/Scenes/Level4.tscn +++ b/Levels/Scenes/Level4.tscn @@ -35,7 +35,7 @@ size = Vector3(5, 20, 27.822) size = Vector3(5, 20, 27.822) [sub_resource type="BoxShape3D" id="BoxShape3D_5qrun"] -size = Vector3(3.244, 10, 3.17) +size = Vector3(3.244, 5.0593, 3.17) [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_5mnb2"] resource_name = "Material.001" @@ -45,6 +45,7 @@ alpha_antialiasing_mode = 0 cull_mode = 2 vertex_color_use_as_albedo = true albedo_color = Color(0, 0, 0, 1) +metallic = 1.0 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_0yy7f"] resource_name = "Material.003" @@ -57,7 +58,6 @@ resource_name = "Material.022" cull_mode = 2 vertex_color_use_as_albedo = true albedo_color = Color(0, 0, 0, 1) -roughness = 0.5 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_vnp6j"] resource_name = "Material.025" @@ -70,7 +70,6 @@ resource_name = "Material.024" cull_mode = 2 vertex_color_use_as_albedo = true albedo_color = Color(0, 0, 0, 1) -roughness = 0.5 [sub_resource type="ArrayMesh" id="ArrayMesh_innp1"] _surfaces = [{ @@ -224,12 +223,14 @@ shadow_mesh = SubResource("ArrayMesh_iabwd") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_yff5r"] resource_name = "Material.005" +transparency = 1 cull_mode = 2 vertex_color_use_as_albedo = true albedo_texture = ExtResource("6_u54xf") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_lq31e"] resource_name = "Material.006" +transparency = 1 cull_mode = 2 vertex_color_use_as_albedo = true albedo_texture = ExtResource("7_e155e") @@ -237,12 +238,14 @@ roughness = 0.5 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_kg8cv"] resource_name = "Material.007" +transparency = 1 cull_mode = 2 vertex_color_use_as_albedo = true albedo_texture = ExtResource("8_pv0jt") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_qocbi"] resource_name = "Material.008" +transparency = 1 cull_mode = 2 vertex_color_use_as_albedo = true albedo_texture = ExtResource("9_57fec") @@ -250,6 +253,7 @@ roughness = 0.5 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_cxkmp"] resource_name = "Material.009" +transparency = 1 cull_mode = 2 vertex_color_use_as_albedo = true albedo_texture = ExtResource("10_5awpo") @@ -257,6 +261,7 @@ roughness = 0.5 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_oci18"] resource_name = "Material.010" +transparency = 1 cull_mode = 2 vertex_color_use_as_albedo = true albedo_texture = ExtResource("11_lecpt") @@ -264,9 +269,7 @@ roughness = 0.5 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_inn1i"] resource_name = "Material.011" -transparency = 2 -alpha_scissor_threshold = 0.5 -alpha_antialiasing_mode = 0 +transparency = 1 cull_mode = 2 vertex_color_use_as_albedo = true albedo_texture = ExtResource("12_dmqnu") @@ -274,6 +277,7 @@ roughness = 0.5 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_l3r5c"] resource_name = "Material.012" +transparency = 1 cull_mode = 2 vertex_color_use_as_albedo = true albedo_texture = ExtResource("13_p4lg5") @@ -281,6 +285,7 @@ roughness = 0.5 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_4lt6h"] resource_name = "Material.013" +transparency = 1 cull_mode = 2 vertex_color_use_as_albedo = true albedo_texture = ExtResource("14_vy0xd") @@ -288,6 +293,7 @@ roughness = 0.5 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_xf2r3"] resource_name = "Material.014" +transparency = 1 cull_mode = 2 vertex_color_use_as_albedo = true albedo_texture = ExtResource("15_w5cbh") @@ -295,6 +301,7 @@ roughness = 0.5 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_x4m66"] resource_name = "Material.015" +transparency = 1 cull_mode = 2 vertex_color_use_as_albedo = true albedo_texture = ExtResource("9_57fec") @@ -302,9 +309,7 @@ roughness = 0.5 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ogq2g"] resource_name = "Material.016" -transparency = 2 -alpha_scissor_threshold = 0.5 -alpha_antialiasing_mode = 0 +transparency = 1 cull_mode = 2 vertex_color_use_as_albedo = true albedo_texture = ExtResource("16_2qqmx") @@ -312,6 +317,7 @@ roughness = 0.5 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_m3vpq"] resource_name = "Material.017" +transparency = 1 cull_mode = 2 vertex_color_use_as_albedo = true albedo_texture = ExtResource("17_3idst") @@ -803,7 +809,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.505, -0.358024, 1.095) script = ExtResource("1_gkcpw") [node name="Enemies" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.7046, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.341564, -0.707, -0.316941) [node name="MeleeEnemyOrb" parent="Enemies" instance=ExtResource("4_np1us")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.13385, 0, 0.371333) @@ -864,64 +870,73 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1.22039) collision_mask = 0 [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.01032, 2.71587, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.03, 2.71587, 0) shape = SubResource("BoxShape3D_7qgo5") [node name="CollisionShape3D2" type="CollisionShape3D" parent="StaticBody3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.81573, 0, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8.61537, 0, 0) shape = SubResource("BoxShape3D_ooasb") [node name="CollisionShape3D3" type="CollisionShape3D" parent="StaticBody3D"] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 2.43488, -8.5122) +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 2.43488, -6.81151) shape = SubResource("BoxShape3D_aaw7g") [node name="CollisionShape3D4" type="CollisionShape3D" parent="StaticBody3D"] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 9.03101) +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 12.1027) shape = SubResource("BoxShape3D_omips") [node name="CollisionShape3D5" type="CollisionShape3D" parent="StaticBody3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.93058, -2.24614, -4.79498) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.37433, -2.24614, -3.56982) shape = SubResource("BoxShape3D_5qrun") [node name="CollisionShape3D6" type="CollisionShape3D" parent="StaticBody3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.67572, -2.24614, -4.79498) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.23197, -2.24614, -3.56982) shape = SubResource("BoxShape3D_5qrun") +[node name="Exit Portal" parent="." instance=ExtResource("3_wflo5")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.481772, -0.12655, -4.85299) + +[node name="Camera3D" type="Camera3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, -0.527878, 10.966, 6.61121) +projection = 1 +current = true +size = 10.8546 + [node name="STAGE 4 final" type="Node3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.135092, 1.13298) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.847963, -0.287248, 2.28422) [node name="Plane" type="MeshInstance3D" parent="STAGE 4 final"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0966516, 0, -1.18466) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.50716, 0.15796, -2.3124) mesh = SubResource("ArrayMesh_rd6yo") skeleton = NodePath("") [node name="Circle" type="MeshInstance3D" parent="STAGE 4 final"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.152571, 0.124069, 0.00191349) +transform = Transform3D(-0.449436, 0, -0.893313, 0, 1, 0, 0.893313, 0, -0.449436, 0.257937, 0.28203, -1.12583) mesh = SubResource("ArrayMesh_1b6jf") skeleton = NodePath("") [node name="Plane_001" type="MeshInstance3D" parent="STAGE 4 final"] -transform = Transform3D(0.937709, 0, 0, 0, 1, 0, 0, 0, 1, -0.0912335, 0.0786147, 0.00649853) +transform = Transform3D(-0.42144, 0, 0.893313, 0, 1, 0, -0.837667, 0, -0.449436, 0.319275, 0.236575, -1.12124) mesh = SubResource("ArrayMesh_c4efb") skeleton = NodePath("") [node name="oxface" type="MeshInstance3D" parent="STAGE 4 final"] -transform = Transform3D(0.690153, 0, 0, 0, 0.690153, 0, 0, 0, 0.690153, 4.10002, 1.59775, -6.14638) +transform = Transform3D(-0.310179, 0, -0.616522, 0, 0.690153, 0, 0.616522, 0, -0.310179, 4.51053, 1.75571, -7.27413) mesh = SubResource("ArrayMesh_oeul8") skeleton = NodePath("") [node name="horsehead" type="MeshInstance3D" parent="STAGE 4 final"] -transform = Transform3D(0.746961, 0, 0, 0, 0.746961, 0, 0, 0, 0.746961, -4.28265, 1.57514, -6.14861) +transform = Transform3D(-0.335711, 0, 0.66727, 0, 0.746961, 0, -0.66727, 0, -0.335711, -3.87214, 1.7331, -7.27635) mesh = SubResource("ArrayMesh_igw1j") skeleton = NodePath("") [node name="Circle_001" type="MeshInstance3D" parent="STAGE 4 final"] -transform = Transform3D(-4.74551, 0, 0, 0, -4.74551, 0, 0, 0, -4.74551, -0.0650039, 0.026309, -0.0410134) +transform = Transform3D(2.1328, 0, -4.23922, 0, -4.74551, 0, 4.23922, 0, 2.1328, 0.345504, 0.184269, -1.16876) mesh = SubResource("ArrayMesh_ox0hg") skeleton = NodePath("") [node name="Circle_002" type="MeshInstance3D" parent="STAGE 4 final"] -transform = Transform3D(-4.74551, 0, 0, 0, -4.74551, 0, 0, 0, -4.74551, -0.165268, 0.0788137, 0.00132829) +transform = Transform3D(2.1328, 0, 4.23922, 0, -4.74551, 0, -4.23922, 0, 2.1328, 0.245241, 0.236774, -1.12641) mesh = SubResource("ArrayMesh_pcbqa") skeleton = NodePath("") @@ -930,6 +945,3 @@ autoplay = "Animation" libraries = { "": SubResource("AnimationLibrary_biich") } - -[node name="Exit Portal" parent="." instance=ExtResource("3_wflo5")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.174136, -4.61389) diff --git a/Levels/Scenes/Level5.tscn b/Levels/Scenes/Level5.tscn index faf1ad5..50330dc 100644 --- a/Levels/Scenes/Level5.tscn +++ b/Levels/Scenes/Level5.tscn @@ -10,6 +10,8 @@ [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_eopsn"] resource_name = "Material.001" +render_priority = -2 +transparency = 1 cull_mode = 2 vertex_color_use_as_albedo = true albedo_color = Color(0.113325, 0.00405969, 0, 1) @@ -46,6 +48,7 @@ shadow_mesh = SubResource("ArrayMesh_rp4mn") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_xq05x"] resource_name = "Material.003" +render_priority = 1 transparency = 2 alpha_scissor_threshold = 0.5 alpha_antialiasing_mode = 0 @@ -56,12 +59,14 @@ roughness = 0.0 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_0k6c8"] resource_name = "Material.005" +render_priority = 1 cull_mode = 2 vertex_color_use_as_albedo = true albedo_texture = ExtResource("4_m08uc") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_khnvm"] resource_name = "Material.007" +render_priority = 1 cull_mode = 2 vertex_color_use_as_albedo = true albedo_texture = ExtResource("4_m08uc") @@ -179,61 +184,54 @@ data = PackedVector3Array(0.7287, -0.3656, 0.6157, -0.7287, 1.0631, -0.6925, 0.7 [sub_resource type="ConcavePolygonShape3D" id="ConcavePolygonShape3D_66hl2"] data = PackedVector3Array(0.7287, -0.3656, 0.6157, -0.7287, 1.0631, -0.6925, 0.7287, 1.0631, -0.6925, 0.7287, -0.3656, 0.6157, -0.7287, -0.3656, 0.6157, -0.7287, 1.0631, -0.6925, -0.7287, 1.0631, -0.6925, 0.8004, 1.1722, -0.7568, 0.7287, 1.0631, -0.6925, -0.7287, 1.0631, -0.6925, -0.8004, 1.1722, -0.7568, 0.8004, 1.1722, -0.7568, -0.8179, -0.4449, -0.9723, 0.7829, 1.1243, -0.9723, -0.8179, 1.1243, -0.9723, -0.8179, -0.4449, -0.9723, 0.7829, -0.4449, -0.9723, 0.7829, 1.1243, -0.9723, 0.8576, 1.1333, -0.7568, 0.8576, 1.1722, -0.8918, 0.8576, 1.1333, -0.8918, 0.8576, 1.1333, -0.7568, 0.8576, 1.1722, -0.7568, 0.8576, 1.1722, -0.8918, -0.8179, -0.4765, -0.9723, 0.8004, -0.4675, 0.709, 0.7829, -0.4765, -0.9723, -0.8179, -0.4765, -0.9723, -0.8004, -0.4675, 0.709, 0.8004, -0.4675, 0.709, 0.7287, 1.0631, -0.6925, 0.8576, 1.1722, -0.7568, 0.8576, 1.1333, -0.7568, 0.7287, 1.0631, -0.6925, 0.8004, 1.1722, -0.7568, 0.8576, 1.1722, -0.7568, -0.8832, -0.4359, 0.68, -0.8832, 1.1333, -0.8918, -0.8832, 1.1333, -0.7568, -0.8832, -0.4359, 0.68, -0.8832, -0.4359, -0.8918, -0.8832, 1.1333, -0.8918, -0.8179, -0.4765, -0.9723, -0.8832, -0.4675, 0.709, -0.8004, -0.4675, 0.709, -0.8179, -0.4765, -0.9723, -0.8832, -0.4675, -0.8918, -0.8832, -0.4675, 0.709, -0.8179, -0.4449, -0.9723, -0.8832, -0.4675, -0.8918, -0.8179, -0.4765, -0.9723, -0.8179, -0.4449, -0.9723, -0.8832, -0.4359, -0.8918, -0.8832, -0.4675, -0.8918, -0.7287, -0.3656, 0.6157, -0.8832, 1.1333, -0.7568, -0.7287, 1.0631, -0.6925, -0.7287, -0.3656, 0.6157, -0.8832, -0.4359, 0.68, -0.8832, 1.1333, -0.7568, 0.8576, -0.4359, -0.8918, 0.8576, 1.1333, -0.7568, 0.8576, 1.1333, -0.8918, 0.8576, -0.4359, -0.8918, 0.8576, -0.4359, 0.68, 0.8576, 1.1333, -0.7568, 0.7829, -0.4449, -0.9723, 0.8576, 1.1333, -0.8918, 0.7829, 1.1243, -0.9723, 0.7829, -0.4449, -0.9723, 0.8576, -0.4359, -0.8918, 0.8576, 1.1333, -0.8918, 0.7287, -0.3656, 0.6157, 0.8576, -0.4675, 0.709, 0.8004, -0.4675, 0.709, 0.7287, -0.3656, 0.6157, 0.8576, -0.4359, 0.68, 0.8576, -0.4675, 0.709, 0.8004, -0.4675, 0.709, 0.8576, -0.4675, -0.8918, 0.7829, -0.4765, -0.9723, 0.8004, -0.4675, 0.709, 0.8576, -0.4675, 0.709, 0.8576, -0.4675, -0.8918, -0.8004, 1.1722, -0.7568, -0.8832, 1.1722, -0.8918, -0.8004, 1.1722, -0.8918, -0.8004, 1.1722, -0.7568, -0.8832, 1.1722, -0.7568, -0.8832, 1.1722, -0.8918, 0.8004, 1.1722, -0.8918, 0.8576, 1.1722, -0.7568, 0.8004, 1.1722, -0.7568, 0.8004, 1.1722, -0.8918, 0.8576, 1.1722, -0.8918, 0.8576, 1.1722, -0.7568, 0.8004, 1.1722, -0.8918, -0.8004, 1.1722, -0.7568, -0.8004, 1.1722, -0.8918, 0.8004, 1.1722, -0.8918, 0.8004, 1.1722, -0.7568, -0.8004, 1.1722, -0.7568, 0.7829, 1.1243, -0.9723, -0.8004, 1.1722, -0.8918, -0.8179, 1.1243, -0.9723, 0.7829, 1.1243, -0.9723, 0.8004, 1.1722, -0.8918, -0.8004, 1.1722, -0.8918, -0.8179, 1.1243, -0.9723, -0.8832, 1.1722, -0.8918, -0.8832, 1.1333, -0.8918, -0.8179, 1.1243, -0.9723, -0.8004, 1.1722, -0.8918, -0.8832, 1.1722, -0.8918, 0.8576, 1.1333, -0.8918, 0.8004, 1.1722, -0.8918, 0.7829, 1.1243, -0.9723, 0.8576, 1.1333, -0.8918, 0.8576, 1.1722, -0.8918, 0.8004, 1.1722, -0.8918, -0.8832, 1.1333, -0.8918, -0.8832, 1.1722, -0.7568, -0.8832, 1.1333, -0.7568, -0.8832, 1.1333, -0.8918, -0.8832, 1.1722, -0.8918, -0.8832, 1.1722, -0.7568, -0.8832, 1.1333, -0.7568, -0.8004, 1.1722, -0.7568, -0.7287, 1.0631, -0.6925, -0.8832, 1.1333, -0.7568, -0.8832, 1.1722, -0.7568, -0.8004, 1.1722, -0.7568, 0.7287, 1.0631, -0.6925, 0.8576, -0.4359, 0.68, 0.7287, -0.3656, 0.6157, 0.7287, 1.0631, -0.6925, 0.8576, 1.1333, -0.7568, 0.8576, -0.4359, 0.68, 0.7829, -0.4765, -0.9723, 0.8576, -0.4359, -0.8918, 0.7829, -0.4449, -0.9723, 0.7829, -0.4765, -0.9723, 0.8576, -0.4675, -0.8918, 0.8576, -0.4359, -0.8918, 0.8576, -0.4675, -0.8918, 0.8576, -0.4359, 0.68, 0.8576, -0.4359, -0.8918, 0.8576, -0.4675, -0.8918, 0.8576, -0.4675, 0.709, 0.8576, -0.4359, 0.68, -0.8004, -0.4675, 0.709, -0.8832, -0.4359, 0.68, -0.7287, -0.3656, 0.6157, -0.8004, -0.4675, 0.709, -0.8832, -0.4675, 0.709, -0.8832, -0.4359, 0.68, -0.8179, 1.1243, -0.9723, -0.8832, -0.4359, -0.8918, -0.8179, -0.4449, -0.9723, -0.8179, 1.1243, -0.9723, -0.8832, 1.1333, -0.8918, -0.8832, -0.4359, -0.8918, -0.8832, -0.4675, 0.709, -0.8832, -0.4359, -0.8918, -0.8832, -0.4359, 0.68, -0.8832, -0.4675, 0.709, -0.8832, -0.4675, -0.8918, -0.8832, -0.4359, -0.8918, 0.8004, -0.4675, 0.709, -0.7287, -0.3656, 0.6157, 0.7287, -0.3656, 0.6157, 0.8004, -0.4675, 0.709, -0.8004, -0.4675, 0.709, -0.7287, -0.3656, 0.6157, -0.8179, -0.4765, -0.9723, 0.7829, -0.4449, -0.9723, -0.8179, -0.4449, -0.9723, -0.8179, -0.4765, -0.9723, 0.7829, -0.4765, -0.9723, 0.7829, -0.4449, -0.9723, -0.6885, 1.0044, -0.6543, 0.7562, 1.1075, -0.715, 0.6885, 1.0044, -0.6543, -0.6885, 1.0044, -0.6543, -0.7562, 1.1075, -0.715, 0.7562, 1.1075, -0.715, -0.7728, -0.4203, -0.9186, 0.7397, 1.0622, -0.9186, -0.7728, 1.0622, -0.9186, -0.7728, -0.4203, -0.9186, 0.7397, -0.4203, -0.9186, 0.7397, 1.0622, -0.9186, 0.8102, 1.0707, -0.715, 0.8102, 1.1075, -0.8425, 0.8102, 1.0707, -0.8425, 0.8102, 1.0707, -0.715, 0.8102, 1.1075, -0.715, 0.8102, 1.1075, -0.8425, 0.6885, -0.3454, 0.5817, -0.6885, 1.0044, -0.6543, 0.6885, 1.0044, -0.6543, 0.6885, -0.3454, 0.5817, -0.6885, -0.3454, 0.5817, -0.6885, 1.0044, -0.6543, -0.7728, -0.4502, -0.9186, 0.7562, -0.4417, 0.6699, 0.7397, -0.4502, -0.9186, -0.7728, -0.4502, -0.9186, -0.7562, -0.4417, 0.6699, 0.7562, -0.4417, 0.6699, 0.6885, 1.0044, -0.6543, 0.8102, 1.1075, -0.715, 0.8102, 1.0707, -0.715, 0.6885, 1.0044, -0.6543, 0.7562, 1.1075, -0.715, 0.8102, 1.1075, -0.715, -0.8344, -0.4118, 0.6425, -0.8344, 1.0707, -0.8425, -0.8344, 1.0707, -0.715, -0.8344, -0.4118, 0.6425, -0.8344, -0.4118, -0.8425, -0.8344, 1.0707, -0.8425, -0.7728, -0.4502, -0.9186, -0.8344, -0.4417, 0.6699, -0.7562, -0.4417, 0.6699, -0.7728, -0.4502, -0.9186, -0.8344, -0.4417, -0.8425, -0.8344, -0.4417, 0.6699, -0.7728, -0.4203, -0.9186, -0.8344, -0.4417, -0.8425, -0.7728, -0.4502, -0.9186, -0.7728, -0.4203, -0.9186, -0.8344, -0.4118, -0.8425, -0.8344, -0.4417, -0.8425, -0.6885, -0.3454, 0.5817, -0.8344, 1.0707, -0.715, -0.6885, 1.0044, -0.6543, -0.6885, -0.3454, 0.5817, -0.8344, -0.4118, 0.6425, -0.8344, 1.0707, -0.715, 0.8102, -0.4118, -0.8425, 0.8102, 1.0707, -0.715, 0.8102, 1.0707, -0.8425, 0.8102, -0.4118, -0.8425, 0.8102, -0.4118, 0.6425, 0.8102, 1.0707, -0.715, 0.7397, -0.4203, -0.9186, 0.8102, 1.0707, -0.8425, 0.7397, 1.0622, -0.9186, 0.7397, -0.4203, -0.9186, 0.8102, -0.4118, -0.8425, 0.8102, 1.0707, -0.8425, 0.6885, -0.3454, 0.5817, 0.8102, -0.4417, 0.6699, 0.7562, -0.4417, 0.6699, 0.6885, -0.3454, 0.5817, 0.8102, -0.4118, 0.6425, 0.8102, -0.4417, 0.6699, 0.7562, -0.4417, 0.6699, 0.8102, -0.4417, -0.8425, 0.7397, -0.4502, -0.9186, 0.7562, -0.4417, 0.6699, 0.8102, -0.4417, 0.6699, 0.8102, -0.4417, -0.8425, -0.7562, 1.1075, -0.715, -0.8344, 1.1075, -0.8425, -0.7562, 1.1075, -0.8425, -0.7562, 1.1075, -0.715, -0.8344, 1.1075, -0.715, -0.8344, 1.1075, -0.8425, 0.7562, 1.1075, -0.8425, 0.8102, 1.1075, -0.715, 0.7562, 1.1075, -0.715, 0.7562, 1.1075, -0.8425, 0.8102, 1.1075, -0.8425, 0.8102, 1.1075, -0.715, 0.7562, 1.1075, -0.8425, -0.7562, 1.1075, -0.715, -0.7562, 1.1075, -0.8425, 0.7562, 1.1075, -0.8425, 0.7562, 1.1075, -0.715, -0.7562, 1.1075, -0.715, 0.7397, 1.0622, -0.9186, -0.7562, 1.1075, -0.8425, -0.7728, 1.0622, -0.9186, 0.7397, 1.0622, -0.9186, 0.7562, 1.1075, -0.8425, -0.7562, 1.1075, -0.8425, -0.7728, 1.0622, -0.9186, -0.8344, 1.1075, -0.8425, -0.8344, 1.0707, -0.8425, -0.7728, 1.0622, -0.9186, -0.7562, 1.1075, -0.8425, -0.8344, 1.1075, -0.8425, 0.8102, 1.0707, -0.8425, 0.7562, 1.1075, -0.8425, 0.7397, 1.0622, -0.9186, 0.8102, 1.0707, -0.8425, 0.8102, 1.1075, -0.8425, 0.7562, 1.1075, -0.8425, -0.8344, 1.0707, -0.8425, -0.8344, 1.1075, -0.715, -0.8344, 1.0707, -0.715, -0.8344, 1.0707, -0.8425, -0.8344, 1.1075, -0.8425, -0.8344, 1.1075, -0.715, -0.8344, 1.0707, -0.715, -0.7562, 1.1075, -0.715, -0.6885, 1.0044, -0.6543, -0.8344, 1.0707, -0.715, -0.8344, 1.1075, -0.715, -0.7562, 1.1075, -0.715, 0.6885, 1.0044, -0.6543, 0.8102, -0.4118, 0.6425, 0.6885, -0.3454, 0.5817, 0.6885, 1.0044, -0.6543, 0.8102, 1.0707, -0.715, 0.8102, -0.4118, 0.6425, 0.7397, -0.4502, -0.9186, 0.8102, -0.4118, -0.8425, 0.7397, -0.4203, -0.9186, 0.7397, -0.4502, -0.9186, 0.8102, -0.4417, -0.8425, 0.8102, -0.4118, -0.8425, 0.8102, -0.4417, -0.8425, 0.8102, -0.4118, 0.6425, 0.8102, -0.4118, -0.8425, 0.8102, -0.4417, -0.8425, 0.8102, -0.4417, 0.6699, 0.8102, -0.4118, 0.6425, -0.7562, -0.4417, 0.6699, -0.8344, -0.4118, 0.6425, -0.6885, -0.3454, 0.5817, -0.7562, -0.4417, 0.6699, -0.8344, -0.4417, 0.6699, -0.8344, -0.4118, 0.6425, -0.7728, 1.0622, -0.9186, -0.8344, -0.4118, -0.8425, -0.7728, -0.4203, -0.9186, -0.7728, 1.0622, -0.9186, -0.8344, 1.0707, -0.8425, -0.8344, -0.4118, -0.8425, -0.8344, -0.4417, 0.6699, -0.8344, -0.4118, -0.8425, -0.8344, -0.4118, 0.6425, -0.8344, -0.4417, 0.6699, -0.8344, -0.4417, -0.8425, -0.8344, -0.4118, -0.8425, 0.7562, -0.4417, 0.6699, -0.6885, -0.3454, 0.5817, 0.6885, -0.3454, 0.5817, 0.7562, -0.4417, 0.6699, -0.7562, -0.4417, 0.6699, -0.6885, -0.3454, 0.5817, -0.7728, -0.4502, -0.9186, 0.7397, -0.4203, -0.9186, -0.7728, -0.4203, -0.9186, -0.7728, -0.4502, -0.9186, 0.7397, -0.4502, -0.9186, 0.7397, -0.4203, -0.9186) -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_f2uxh"] -resource_name = "Material.002" -transparency = 4 -cull_mode = 2 -vertex_color_use_as_albedo = true -albedo_texture = ExtResource("5_gnoxf") -roughness = 0.5 - -[sub_resource type="ArrayMesh" id="ArrayMesh_u7du7"] -_surfaces = [{ -"aabb": AABB(-1, 0, -1, 2, 1e-05, 2.00001), -"format": 4097, -"index_count": 6, -"index_data": PackedByteArray(0, 0, 3, 0, 1, 0, 0, 0, 2, 0, 3, 0), -"name": "Material.002", -"primitive": 3, -"vertex_count": 4, -"vertex_data": PackedByteArray(0, 0, 128, 191, 0, 0, 0, 0, 0, 0, 128, 63, 0, 0, 128, 63, 0, 0, 0, 0, 0, 0, 128, 63, 0, 0, 128, 191, 0, 0, 0, 0, 0, 0, 128, 191, 0, 0, 128, 63, 0, 0, 0, 0, 0, 0, 128, 191) -}] -blend_shape_mode = 0 - -[sub_resource type="ArrayMesh" id="ArrayMesh_3uuxc"] -resource_name = "STAGE 5_Plane001" -_surfaces = [{ -"aabb": AABB(-1, 0, -1, 2, 1e-05, 2.00001), -"attribute_data": PackedByteArray(0, 0, 0, 0, 0, 0, 128, 63, 0, 0, 128, 63, 0, 0, 128, 63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 63, 0, 0, 0, 0), -"format": 4119, -"index_count": 6, -"index_data": PackedByteArray(0, 0, 3, 0, 1, 0, 0, 0, 2, 0, 3, 0), -"material": SubResource("StandardMaterial3D_f2uxh"), -"name": "Material.002", -"primitive": 3, -"vertex_count": 4, -"vertex_data": PackedByteArray(0, 0, 128, 191, 0, 0, 0, 0, 0, 0, 128, 63, 255, 127, 255, 255, 255, 255, 255, 191, 0, 0, 128, 63, 0, 0, 0, 0, 0, 0, 128, 63, 255, 127, 255, 255, 255, 255, 255, 191, 0, 0, 128, 191, 0, 0, 0, 0, 0, 0, 128, 191, 255, 127, 255, 255, 255, 255, 255, 191, 0, 0, 128, 63, 0, 0, 0, 0, 0, 0, 128, 191, 255, 127, 255, 255, 255, 255, 255, 191) -}] -blend_shape_mode = 0 -shadow_mesh = SubResource("ArrayMesh_u7du7") - [sub_resource type="Animation" id="Animation_soln3"] resource_name = "Animation" length = 33.5 loop_mode = 1 -tracks/0/type = "rotation_3d" -tracks/0/imported = true +tracks/0/type = "value" +tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath("Plane001") +tracks/0/path = NodePath("MeshInstance3D:rotation") tracks/0/interp = 1 tracks/0/loop_wrap = true -tracks/0/keys = PackedFloat32Array(0, 1, 0, -0.348703, 0, 0.937233, 0.0333333, 1, 0, -0.348703, 0, 0.937233, 0.0666667, 1, 0, -0.346258, 0, 0.938139, 0.1, 1, 0, -0.342995, 0, 0.939337, 0.233333, 1, 0, -0.329902, 0, 0.944015, 0.533333, 1, 0, -0.300213, 0, 0.953872, 0.7, 1, 0, -0.28359, 0, 0.958946, 0.833333, 1, 0, -0.270229, 0, 0.962796, 1.1, 1, 0, -0.243355, 0, 0.969937, 1.63333, 1, 0, -0.189062, 0, 0.981965, 1.93333, 1, 0, -0.158255, 0, 0.987398, 2.03333, 1, 0, -0.14795, 0, 0.988995, 2.23333, 1, 0, -0.127292, 0, 0.991865, 2.53333, 1, 0, -0.0962054, 0, 0.995362, 3.03333, 1, 0, -0.0441997, 0, 0.999023, 3.2, 1, 0, -0.0268308, 0, 0.99964, 3.23333, 1, 0, -0.0233559, 0, 0.999727, 3.33333, 1, 0, -0.0129296, 0, 0.999916, 3.4, 1, 0, -0.00597786, 0, 0.999982, 3.43333, 1, 0, -0.00250188, 0, 0.999997, 3.46667, 1, 0, 0.000974133, 0, 1, 3.5, 1, 0, 0.00445016, 0, 0.99999, 3.93333, 1, 0, 0.049618, 0, 0.998768, 4.16667, 1, 0, 0.0739031, 0, 0.997266, 4.26667, 1, 0, 0.0842985, 0, 0.996441, 4.3, 1, 0, 0.0877616, 0, 0.996142, 4.36667, 1, 0, 0.0946846, 0, 0.995507, 4.43333, 1, 0, 0.101603, 0, 0.994825, 4.46667, 1, 0, 0.10506, 0, 0.994466, 4.73333, 1, 0, 0.13267, 0, 0.99116, 4.86667, 1, 0, 0.146438, 0, 0.98922, 5.13333, 1, 0, 0.173887, 0, 0.984766, 5.7, 1, 0, 0.231741, 0, 0.972778, 6.26667, 1, 0, 0.288787, 0, 0.957393, 6.56667, 1, 0, 0.318592, 0, 0.947892, 6.76667, 1, 0, 0.338291, 0, 0.941042, 6.8, 1, 0, 0.34156, 0, 0.93986, 6.9, 1, 0, 0.351342, 0, 0.936247, 7.33333, 1, 0, 0.393276, 0, 0.91942, 7.6, 1, 0, 0.418688, 0, 0.90813, 8.26667, 1, 0, 0.480759, 0, 0.876853, 8.43333, 1, 0, 0.495926, 0, 0.868365, 8.7, 1, 0, 0.519879, 0, 0.85424, 9.03333, 1, 0, 0.549252, 0, 0.835657, 9.2, 1, 0, 0.563692, 0, 0.825985, 9.26667, 1, 0, 0.569421, 0, 0.822046, 9.3, 1, 0, 0.572275, 0, 0.820062, 9.6, 1, 0, 0.597646, 0, 0.80176, 9.63333, 1, 0, 0.600429, 0, 0.799678, 9.7, 1, 0, 0.605974, 0, 0.795485, 9.73333, 1, 0, 0.608735, 0, 0.793373, 9.93333, 1, 0, 0.625148, 0, 0.780506, 9.96667, 1, 0, 0.627858, 0, 0.778328, 10.1667, 1, 0, 0.643953, 0, 0.765065, 11.0667, 1, 0, 0.712817, 0, 0.70135, 11.1667, 1, 0, 0.720092, 0, 0.693879, 11.3667, 1, 0, 0.734406, 0, 0.678711, 11.4, 1, 0, 0.73676, 0, 0.676154, 12.0333, 1, 0, 0.779778, 0, 0.626057, 12.3333, 1, 0, 0.798979, 0, 0.601359, 13.8667, 1, 0, 0.884533, 0, 0.466478, 13.9333, 1, 0, 0.887754, 0, 0.460317, 13.9667, 1, 0, 0.889349, 0, 0.457229, 14.4, 1, 0, 0.909096, 0, 0.416588, 15.1, 1, 0, 0.937057, 0, 0.349176, 15.2, 1, 0, 0.940647, 0, 0.339386, 15.4667, 1, 0, 0.94972, 0, 0.3131, 15.6, 1, 0, 0.953982, 0, 0.299866, 15.8667, 1, 0, 0.96195, 0, 0.273225, 16.4333, 1, 0, 0.976407, 0, 0.215937, 16.4667, 1, 0, 0.977152, 0, 0.212542, 16.6667, 1, 0, 0.981372, 0, 0.192117, 16.9667, 1, 0, 0.986901, 0, 0.161327, 17.1667, 1, 0, 0.990051, 0, 0.14071, 17.2333, 1, 0, 0.991005, 0, 0.133824, 17.5333, 1, 0, 0.994706, 0, 0.102761, 17.7, 1, 0, 0.996342, 0, 0.0854583, 17.9, 1, 0, 0.997907, 0, 0.0646615, 18.1667, 1, 0, 0.999319, 0, 0.0368902, 18.2333, 1, 0, 0.999552, 0, 0.0299419, 18.5333, 1, 0, 0.999999, 0, -0.00133772, 18.5667, 1, 0, -0.999988, 0, 0.00481382, 18.7, 1, 0, -0.999825, 0, 0.0187168, 18.8, 1, 0, -0.999575, 0, 0.0291417, 19.0333, 1, 0, -0.99857, 0, 0.0534525, 19.3667, 1, 0, -0.99611, 0, 0.0881237, 19.5333, 1, 0, -0.994428, 0, 0.105422, 19.8667, 1, 0, -0.990163, 0, 0.139918, 20.0333, 1, 0, -0.987582, 0, 0.157105, 20.3333, 1, 0, -0.982185, 0, 0.187919, 20.7, 1, 0, -0.974283, 0, 0.225327, 21.0667, 1, 0, -0.964958, 0, 0.262406, 21.6667, 1, 0, -0.946662, 0, 0.322229, 21.8, 1, 0, -0.94209, 0, 0.33536, 21.9, 1, 0, -0.938542, 0, 0.345166, 22.4333, 1, 0, -0.917904, 0, 0.396803, 22.5, 1, 0, -0.915123, 0, 0.403175, 22.6, 1, 0, -0.910869, 0, 0.412696, 23.0667, 1, 0, -0.889715, 0, 0.456517, 23.2667, 1, 0, -0.880001, 0, 0.474972, 23.4, 1, 0, -0.873312, 0, 0.487161, 23.5, 1, 0, -0.868184, 0, 0.496242, 24.0333, 1, 0, -0.839257, 0, 0.543735, 24.5333, 1, 0, -0.809779, 0, 0.586735, 24.6667, 1, 0, -0.801543, 0, 0.597937, 25.3667, 1, 0, -0.7558, 0, 0.654803, 25.6, 1, 0, -0.739645, 0, 0.672997, 25.9333, 1, 0, -0.71581, 0, 0.698296, 26.1, 1, 0, -0.703566, 0, 0.71063, 26.6667, 1, 0, -0.660369, 0, 0.750941, 26.7, 1, 0, -0.657755, 0, 0.753232, 27.0333, 1, 0, -0.63118, 0, 0.775636, 27.2, 1, 0, -0.617605, 0, 0.786488, 28.1667, 1, 0, -0.535323, 0, 0.844648, 28.3667, 1, 0, -0.517591, 0, 0.855628, 28.5667, 1, 0, -0.499635, 0, 0.866236, 28.9333, 1, 0, -0.466157, 0, 0.884702, 28.9667, 1, 0, -0.463078, 0, 0.886317, 29.0667, 1, 0, -0.453811, 0, 0.891098, 29.2, 1, 0, -0.441377, 0, 0.897322, 29.6, 1, 0, -0.403575, 0, 0.914947, 30.5333, 1, 0, -0.312755, 0, 0.949834, 30.6, 1, 0, -0.306144, 0, 0.951985, 30.6333, 1, 0, -0.302833, 0, 0.953044, 30.7667, 1, 0, -0.289553, 0, 0.957162, 30.8667, 1, 0, -0.279556, 0, 0.960129, 31, 1, 0, -0.26618, 0, 0.963923, 31.1, 1, 0, -0.256114, 0, 0.966647, 31.1333, 1, 0, -0.252752, 0, 0.967531, 31.2333, 1, 0, -0.24265, 0, 0.970114, 31.8, 1, 0, -0.184933, 0, 0.982751, 32.1, 1, 0, -0.154103, 0, 0.988055, 32.2333, 1, 0, -0.14035, 0, 0.990102, 32.6667, 1, 0, -0.0954813, 0, 0.995431, 32.7667, 1, 0, -0.0850962, 0, 0.996373, 32.9, 1, 0, -0.0712346, 0, 0.99746, 33.1, 1, 0, -0.0504178, 0, 0.998728, 33.5, 1, 0, -0.00872664, 0, 0.999962) +tracks/0/keys = { +"times": PackedFloat32Array(0, 33.5), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector3(0, 0, 0), Vector3(0, 6.26573, 0)] +} + +[sub_resource type="Animation" id="Animation_skih0"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("MeshInstance3D:rotation") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector3(0, 0, 0)] +} [sub_resource type="AnimationLibrary" id="AnimationLibrary_qy8bi"] _data = { -"Animation": SubResource("Animation_soln3") +"Animation": SubResource("Animation_soln3"), +"RESET": SubResource("Animation_skih0") } +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_bp50s"] +render_priority = -1 +transparency = 1 +blend_mode = 1 +cull_mode = 2 +albedo_texture = ExtResource("5_gnoxf") + +[sub_resource type="PlaneMesh" id="PlaneMesh_7cbda"] +size = Vector2(10, 10) + [sub_resource type="BoxShape3D" id="BoxShape3D_lhf45"] size = Vector3(5, 20, 27.822) @@ -410,17 +408,17 @@ collision_mask = 0 [node name="CollisionShape3D" type="CollisionShape3D" parent="STAGE 5/Cube013/StaticBody3D"] shape = SubResource("ConcavePolygonShape3D_66hl2") -[node name="Plane001" type="MeshInstance3D" parent="STAGE 5"] -transform = Transform3D(3.40745, 0, -2.94289, 0, 4.50237, 0, 2.94289, 0, 3.40745, -0.530053, 0.000655174, 0.530374) -mesh = SubResource("ArrayMesh_3uuxc") -skeleton = NodePath("") - [node name="AnimationPlayer" type="AnimationPlayer" parent="STAGE 5"] autoplay = "Animation" libraries = { "": SubResource("AnimationLibrary_qy8bi") } +[node name="MeshInstance3D" type="MeshInstance3D" parent="STAGE 5"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.442326, 0.00725079, 0.355072) +material_override = SubResource("StandardMaterial3D_bp50s") +mesh = SubResource("PlaneMesh_7cbda") + [node name="StaticBody3D" type="StaticBody3D" parent="."] collision_mask = 0 diff --git a/Player/Base/Player.cs b/Player/Base/Player.cs index c8419a2..2f8c19a 100644 --- a/Player/Base/Player.cs +++ b/Player/Base/Player.cs @@ -1,5 +1,6 @@ using Godot; using Godot.Collections; +using System.Collections.Generic; public partial class Player : Node3D { @@ -15,8 +16,8 @@ public partial class Player : Node3D [Export] public int PlayerNumber; - public Array CharactersLeftOnStage = new Array(); - public Array CharactersExited = new Array(); + public List CharactersLeftOnStage = new List(); + public List CharactersExited = new List(); public Character SelectedCharacter; @@ -30,9 +31,7 @@ public partial class Player : Node3D { foreach (var character in PlayableCharacterScenes) { - var instance = (Character)character.Instantiate(); - instance.Initialize(this); - CharactersLeftOnStage.Add(instance); + CharactersLeftOnStage.Add(character); } } } diff --git a/Player/Capricorn/Capricorn.tscn b/Player/Capricorn/Capricorn.tscn index 86b5436..23f527d 100644 --- a/Player/Capricorn/Capricorn.tscn +++ b/Player/Capricorn/Capricorn.tscn @@ -221,7 +221,7 @@ motion_mode = 1 script = ExtResource("1_aqn5t") _fireProjectile = ExtResource("2_e6qos") _altFireProjectile = ExtResource("3_wbhxk") -_speed = 1.5 +_speed = 1.7 [node name="Pivot" type="Node3D" parent="."] diff --git a/Player/Pisces/Attacks/Single.tscn b/Player/Pisces/Attacks/Single.tscn index 5b77130..135d384 100644 --- a/Player/Pisces/Attacks/Single.tscn +++ b/Player/Pisces/Attacks/Single.tscn @@ -27,7 +27,7 @@ _soundEffect = ExtResource("2_7lbn3") _projectileSpeed = 3.0 [node name="PathFollow3D" type="PathFollow3D" parent="Center Shot"] -transform = Transform3D(0.999998, 0, -0.0016, 0, 1, 0, 0.0016, 0, 0.999998, 0, 0, 0) +transform = Transform3D(0.999999, 0, 0, 0, 1, 0, 0, 0, 0.999999, 0, 0, 0) loop = false tilt_enabled = false diff --git a/Player/Sagittarius/Attacks/MegamiBeam.tscn b/Player/Sagittarius/Attacks/MegamiBeam.tscn index ef9903b..5e1c073 100644 --- a/Player/Sagittarius/Attacks/MegamiBeam.tscn +++ b/Player/Sagittarius/Attacks/MegamiBeam.tscn @@ -6,7 +6,7 @@ [sub_resource type="Curve3D" id="Curve3D_7ok4f"] _data = { -"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 0, 0, 0, 2, -3, 0, 0, 0, 0, 0, 0, 0, 1, -5), +"points": PackedVector3Array(0, 0, 0, 0, 0, 0, -0.0230103, 0.941895, -0.379715, 0, 0, 0, 0, 0, 0, 0, 2, -3, 0, 0, 0, 0, 0, 0, 0, 1, -5), "tilts": PackedFloat32Array(0, 0, 0) } point_count = 3 @@ -16,19 +16,19 @@ height = 3.3177 radius = 0.57027 [node name="MegamiBeam" type="Node3D" groups=["Projectile"]] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.000150919) [node name="Path3D" type="Path3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0430247, 0.484383) top_level = true curve = SubResource("Curve3D_7ok4f") script = ExtResource("1_6e1or") Cooldown = 2.0 _soundEffect = ExtResource("2_vvcho") -_projectileSpeed = 3.0 +_projectileSpeed = 2.0 HasRotation = true [node name="PathFollow3D" type="PathFollow3D" parent="Path3D"] -transform = Transform3D(0.999993, 0, 0, 0, 0.999995, 0, 0, 0, 0.999999, 0, 1, -1) +transform = Transform3D(0.999993, 0, 0, 0, 0.999995, 0, 0, 0, 0.999999, -0.0230103, 0.941895, -0.379715) rotation_mode = 0 loop = false tilt_enabled = false @@ -48,7 +48,7 @@ transform = Transform3D(0.5, 0, 8.73115e-11, 0, 0.5, 0, -8.73115e-11, 0, 0.5, 0. shape = SubResource("CylinderShape3D_bnunv") [node name="Sprite3D2" type="Sprite3D" parent="Path3D/PathFollow3D/Beam"] -transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -0.00355998, -0.119854, 0.205225) +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 1.42109e-14, -1, -0.00355998, -0.119854, 0.205225) axis = 1 texture = ExtResource("1_57flt") diff --git a/Player/Sagittarius/Attacks/MegamiBeamAltFire.tscn b/Player/Sagittarius/Attacks/MegamiBeamAltFire.tscn new file mode 100644 index 0000000..3374c90 --- /dev/null +++ b/Player/Sagittarius/Attacks/MegamiBeamAltFire.tscn @@ -0,0 +1,58 @@ +[gd_scene load_steps=6 format=3 uid="uid://bmqcck4srfd1u"] + +[ext_resource type="Script" path="res://Player/Base/Projectile.cs" id="1_c33ey"] +[ext_resource type="AudioStream" uid="uid://m8mvw8acs5sk" path="res://Audio/SFX/Green Wave.wav" id="2_wafm2"] +[ext_resource type="Texture2D" uid="uid://cferkvvp0rjht" path="res://Textures/Projectiles/Projectile_Sagittarius.png" id="3_mg23b"] + +[sub_resource type="Curve3D" id="Curve3D_7ok4f"] +_data = { +"points": PackedVector3Array(0, 0, 0, 0, 0, 0, -0.023, 1, -0.38, 0, 0, 0, 0, 0, 0, 0, 1, -3), +"tilts": PackedFloat32Array(0, 0) +} +point_count = 2 + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_bnunv"] +height = 3.3177 +radius = 0.57027 + +[node name="MegamiBeam" type="Node3D" groups=["Projectile"]] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.000150919) + +[node name="Path3D" type="Path3D" parent="."] +top_level = true +curve = SubResource("Curve3D_7ok4f") +script = ExtResource("1_c33ey") +Cooldown = 0.5 +_soundEffect = ExtResource("2_wafm2") +_projectileSpeed = 3.0 +HasRotation = true + +[node name="PathFollow3D" type="PathFollow3D" parent="Path3D"] +transform = Transform3D(0.999993, 0, 0, 0, 0.999995, 0, 0, 0, 0.999999, -0.023, 1, -0.38) +rotation_mode = 0 +loop = false +tilt_enabled = false + +[node name="Beam" type="RigidBody3D" parent="Path3D/PathFollow3D"] +transform = Transform3D(1, 0, 0, 0, -1, -1.50996e-07, 0, 1.50996e-07, -1, 0, 0, 0) +collision_layer = 44 +gravity_scale = 0.0 +continuous_cd = true +max_contacts_reported = 1000 +contact_monitor = true +can_sleep = false + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Path3D/PathFollow3D/Beam"] +transform = Transform3D(0.5, 0, 8.73115e-11, 0, 0.5, 0, -8.73115e-11, 0, 0.5, 0.000155393, 0, 0.194262) +shape = SubResource("CylinderShape3D_bnunv") + +[node name="Sprite3D2" type="Sprite3D" parent="Path3D/PathFollow3D/Beam"] +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 1.42109e-14, -1, -0.00355998, -0.119854, 0.205225) +axis = 1 +texture = ExtResource("3_mg23b") + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource("2_wafm2") +autoplay = true + +[connection signal="body_entered" from="Path3D/PathFollow3D/Beam" to="Path3D" method="OnProjectileHit"] diff --git a/Player/Sagittarius/Sagittarius.tscn b/Player/Sagittarius/Sagittarius.tscn index 9abf87b..4e37604 100644 --- a/Player/Sagittarius/Sagittarius.tscn +++ b/Player/Sagittarius/Sagittarius.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=27 format=3 uid="uid://bgkqfamdiwrrw"] +[gd_scene load_steps=28 format=3 uid="uid://bgkqfamdiwrrw"] [ext_resource type="Script" path="res://Player/Base/Character.cs" id="1_s1hsr"] [ext_resource type="PackedScene" uid="uid://criqb4bokctlr" path="res://Player/Sagittarius/Attacks/MegamiBeam.tscn" id="2_c3ma7"] +[ext_resource type="PackedScene" uid="uid://bmqcck4srfd1u" path="res://Player/Sagittarius/Attacks/MegamiBeamAltFire.tscn" id="3_lj2w4"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ru85r"] resource_name = "Material.006" @@ -608,7 +609,7 @@ motion_mode = 1 wall_min_slide_angle = 3.14159 script = ExtResource("1_s1hsr") _fireProjectile = ExtResource("2_c3ma7") -_altFireProjectile = ExtResource("2_c3ma7") +_altFireProjectile = ExtResource("3_lj2w4") _speed = 2.25 [node name="Pivot" type="Node3D" parent="."] diff --git a/Player/Sagittarius/TestShader.gdshader b/Player/Sagittarius/TestShader.gdshader deleted file mode 100644 index e69de29..0000000 diff --git a/UI/StageGUI.cs b/UI/StageGUI.cs index 4802866..ef2f94a 100644 --- a/UI/StageGUI.cs +++ b/UI/StageGUI.cs @@ -74,7 +74,8 @@ public partial class StageGUI : Control private void ChangeBG(Player player) { - var name = player.CharactersLeftOnStage.ElementAt(player.CharacterIndex).Name; + var instance = player.CharactersLeftOnStage.ElementAt(player.CharacterIndex).Instantiate(); + var name = instance.Name; GD.Print(name); switch (name) {