diff --git a/GameJam2023.csproj b/GameJam2023.csproj index 233308f..c5d4913 100644 --- a/GameJam2023.csproj +++ b/GameJam2023.csproj @@ -1,4 +1,4 @@ - + net6.0 true diff --git a/GameJam2023.csproj.old b/GameJam2023.csproj.old new file mode 100644 index 0000000..233308f --- /dev/null +++ b/GameJam2023.csproj.old @@ -0,0 +1,10 @@ + + + net6.0 + true + + + + + + \ No newline at end of file diff --git a/GameJam2023.csproj.old.1 b/GameJam2023.csproj.old.1 new file mode 100644 index 0000000..c5d4913 --- /dev/null +++ b/GameJam2023.csproj.old.1 @@ -0,0 +1,10 @@ + + + net6.0 + true + + + + + + \ No newline at end of file diff --git a/GameJam2023.csproj.old.2 b/GameJam2023.csproj.old.2 new file mode 100644 index 0000000..233308f --- /dev/null +++ b/GameJam2023.csproj.old.2 @@ -0,0 +1,10 @@ + + + net6.0 + true + + + + + + \ No newline at end of file diff --git a/Scenes/Characters/PiscesWitch.tscn b/Scenes/Characters/PiscesWitch.tscn index 0a1609e..a909716 100644 --- a/Scenes/Characters/PiscesWitch.tscn +++ b/Scenes/Characters/PiscesWitch.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=7 format=3 uid="uid://b38hcomu4tpm5"] [ext_resource type="Script" path="res://Scripts/Player1.cs" id="1_6cdju"] -[ext_resource type="PackedScene" uid="uid://si4byubqnng4" path="res://Scenes/Weapons/SingleShot.tscn" id="2_xt4q8"] +[ext_resource type="PackedScene" uid="uid://cyn2wn6ffsnu7" path="res://Scenes/Weapons/Single.tscn" id="2_1c3c8"] [ext_resource type="PackedScene" uid="uid://bq40xbqibrk1y" path="res://Scenes/Weapons/ShotgunBullet.tscn" id="3_4eh4a"] [ext_resource type="PackedScene" uid="uid://yosw0j58nvrf" path="res://Models/Characters/fwitch.gltf" id="4_mtwuo"] @@ -16,7 +16,8 @@ height = 1.67894 [node name="Pisces" type="CharacterBody3D" groups=["Player"]] transform = Transform3D(0.33, 0, 0, 0, 0.33, 0, 0, 0, 0.33, 0, 0, 0) script = ExtResource("1_6cdju") -_fireProjectile = ExtResource("2_xt4q8") +_speed = 3.0 +_fireProjectile = ExtResource("2_1c3c8") _altFireProjectile = ExtResource("3_4eh4a") [node name="Pivot" type="Node3D" parent="."] diff --git a/Scenes/ExitPortal.tscn b/Scenes/ExitPortal.tscn index 7d7387a..bcf93ae 100644 --- a/Scenes/ExitPortal.tscn +++ b/Scenes/ExitPortal.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=5 format=3 uid="uid://jgf7k1r35km1"] +[gd_scene load_steps=7 format=3 uid="uid://jgf7k1r35km1"] [ext_resource type="PackedScene" uid="uid://0tegxun85rq" path="res://Textures/Models/exitprotal.gltf" id="1_jebs8"] +[ext_resource type="Script" path="res://Scripts/AreaExit.cs" id="2_4y188"] [sub_resource type="Animation" id="Animation_t7yyb"] length = 0.001 @@ -87,11 +88,24 @@ _data = { "Spin": SubResource("Animation_y78yk") } +[sub_resource type="CylinderShape3D" id="CylinderShape3D_v7qe0"] +height = 3.34825 +radius = 1.79103 + [node name="Exit Portal" instance=ExtResource("1_jebs8")] transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, 0, 0) +script = ExtResource("2_4y188") [node name="AnimationPlayer" type="AnimationPlayer" parent="." index="3"] autoplay = "Spin" libraries = { "": SubResource("AnimationLibrary_fkf2e") } + +[node name="Area3D" type="Area3D" parent="." index="4"] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D" index="0"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.11619) +shape = SubResource("CylinderShape3D_v7qe0") + +[connection signal="body_entered" from="Area3D" to="." method="OnExitEntered"] diff --git a/Scenes/Levels/Level1.tscn b/Scenes/Levels/Level1.tscn index a911af6..d98b1aa 100644 --- a/Scenes/Levels/Level1.tscn +++ b/Scenes/Levels/Level1.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=7 format=3 uid="uid://dqv03pua4j8ga"] +[gd_scene load_steps=8 format=3 uid="uid://dqv03pua4j8ga"] [ext_resource type="Script" path="res://Scripts/AreaExit.cs" id="1_owv8t"] [ext_resource type="PackedScene" uid="uid://dg3k3cvfyaqx1" path="res://Levels/Final Levels/STAGE 1.gltf" id="5_7416y"] [ext_resource type="PackedScene" uid="uid://bt5rolsyjmx55" path="res://Scenes/MeleeEnemyOrb.tscn" id="5_dqbra"] [ext_resource type="PackedScene" uid="uid://jgf7k1r35km1" path="res://Scenes/ExitPortal.tscn" id="6_gegi6"] +[ext_resource type="PackedScene" uid="uid://dahp73fwld24h" path="res://Scenes/RangedEnemy.tscn" id="6_jck5a"] [ext_resource type="Script" path="res://Scripts/SpawnPoint.cs" id="9_8v1uu"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_kv6vl"] @@ -36,4 +37,10 @@ script = ExtResource("9_8v1uu") [node name="STAGE 1" parent="." instance=ExtResource("5_7416y")] +[node name="Node3D" parent="." instance=ExtResource("6_jck5a")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3, 0, 0) + +[node name="Camera3D" type="Camera3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.20212, 7.07432) + [connection signal="body_entered" from="Area3D2" to="." method="OnExitEntered"] diff --git a/Scenes/Levels/Level2.tscn b/Scenes/Levels/Level2.tscn index 963d088..0fe1962 100644 --- a/Scenes/Levels/Level2.tscn +++ b/Scenes/Levels/Level2.tscn @@ -1,6 +1,5 @@ -[gd_scene load_steps=6 format=3 uid="uid://basequfmpg04f"] +[gd_scene load_steps=5 format=3 uid="uid://basequfmpg04f"] -[ext_resource type="Script" path="res://Scripts/AreaExit.cs" id="1_u04pt"] [ext_resource type="PackedScene" uid="uid://jgf7k1r35km1" path="res://Scenes/ExitPortal.tscn" id="2_sq8bv"] [ext_resource type="PackedScene" uid="uid://cv33g1wyltecc" path="res://Levels/Final Levels/STAGE 2.gltf" id="4_kiw1e"] [ext_resource type="Script" path="res://Scripts/SpawnPoint.cs" id="5_dg8k3"] @@ -9,8 +8,6 @@ radius = 0.957319 [node name="Level2" type="Node3D" groups=["Level"]] -script = ExtResource("1_u04pt") -_levelIndex = 1 [node name="Area3D2" type="Area3D" parent="." groups=["Level"]] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.43759, 0, -2.42354) @@ -19,6 +16,7 @@ collision_mask = 16 [node name="Exit Portal" parent="Area3D2" instance=ExtResource("2_sq8bv")] transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, 0, -2.53252) +_levelIndex = 1 [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D2"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -2.51823) diff --git a/Scenes/Levels/Level3.tscn b/Scenes/Levels/Level3.tscn index 492012e..ebd2cb1 100644 --- a/Scenes/Levels/Level3.tscn +++ b/Scenes/Levels/Level3.tscn @@ -1,17 +1,13 @@ -[gd_scene load_steps=7 format=3 uid="uid://btl5fdyjewnwc"] +[gd_scene load_steps=5 format=3 uid="uid://btl5fdyjewnwc"] -[ext_resource type="Script" path="res://Scripts/AreaExit.cs" id="1_1tnw5"] [ext_resource type="PackedScene" uid="uid://dwd2hlxhkcfpp" path="res://Levels/Models/STAGE 3.blend" id="1_blsh8"] [ext_resource type="PackedScene" uid="uid://jgf7k1r35km1" path="res://Scenes/ExitPortal.tscn" id="3_2t766"] -[ext_resource type="Script" path="res://Scripts/SpawnPoint.cs" id="4_t5mi5"] [ext_resource type="Script" path="res://Scripts/SpawnPoint.cs" id="5_kc2wt"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_j26hn"] radius = 0.957319 [node name="Level3" type="Node3D" groups=["Level"]] -script = ExtResource("1_1tnw5") -_levelIndex = 2 [node name="STAGE 3" parent="." instance=ExtResource("1_blsh8")] @@ -22,6 +18,7 @@ collision_mask = 16 [node name="Exit Portal" parent="Area3D2" instance=ExtResource("3_2t766")] transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, 0, -2.53252) +_levelIndex = 2 [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D2"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -2.51823) @@ -29,7 +26,7 @@ shape = SubResource("CylinderShape3D_j26hn") [node name="P1_SpawnPoint" type="Marker3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.503964, 0.123258, 5.51333) -script = ExtResource("4_t5mi5") +script = ExtResource("5_kc2wt") [node name="P2_SpawnPoint" type="Marker3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.3999, 0.123258, 5.51333) diff --git a/Scenes/Levels/Level4.tscn b/Scenes/Levels/Level4.tscn index b58701f..df538b3 100644 --- a/Scenes/Levels/Level4.tscn +++ b/Scenes/Levels/Level4.tscn @@ -1,17 +1,13 @@ -[gd_scene load_steps=7 format=3 uid="uid://ctvkevnc0wxka"] +[gd_scene load_steps=5 format=3 uid="uid://ctvkevnc0wxka"] [ext_resource type="PackedScene" uid="uid://c33ymduovqqw" path="res://Levels/Models/STAGE 4.blend" id="1_qu6ym"] -[ext_resource type="Script" path="res://Scripts/AreaExit.cs" id="1_sqfsi"] [ext_resource type="PackedScene" uid="uid://jgf7k1r35km1" path="res://Scenes/ExitPortal.tscn" id="3_wflo5"] -[ext_resource type="Script" path="res://Scripts/SpawnPoint.cs" id="4_hoql1"] [ext_resource type="Script" path="res://Scripts/SpawnPoint.cs" id="5_tx78o"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_8lqmd"] radius = 0.957319 [node name="Level4" type="Node3D" groups=["Level"]] -script = ExtResource("1_sqfsi") -_levelIndex = 3 [node name="STAGE 4" parent="." instance=ExtResource("1_qu6ym")] @@ -22,6 +18,7 @@ collision_mask = 16 [node name="Exit Portal" parent="Area3D2" instance=ExtResource("3_wflo5")] transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, 0, -2.53252) +_levelIndex = 3 [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D2"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -2.51823) @@ -29,7 +26,7 @@ shape = SubResource("CylinderShape3D_8lqmd") [node name="P1_SpawnPoint" type="Marker3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.503964, 0.123258, 5.51333) -script = ExtResource("4_hoql1") +script = ExtResource("5_tx78o") [node name="P2_SpawnPoint" type="Marker3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.65542, 0.123258, 5.51333) diff --git a/Scenes/Levels/Level5.tscn b/Scenes/Levels/Level5.tscn index 137319f..de05f91 100644 --- a/Scenes/Levels/Level5.tscn +++ b/Scenes/Levels/Level5.tscn @@ -1,17 +1,13 @@ -[gd_scene load_steps=7 format=3 uid="uid://col60npvg7wr1"] +[gd_scene load_steps=5 format=3 uid="uid://col60npvg7wr1"] [ext_resource type="PackedScene" uid="uid://cthfld06b4dng" path="res://Levels/Models/STAGE 5.blend" id="1_fagdb"] -[ext_resource type="Script" path="res://Scripts/AreaExit.cs" id="1_qbafj"] [ext_resource type="PackedScene" uid="uid://jgf7k1r35km1" path="res://Scenes/ExitPortal.tscn" id="3_ehcts"] -[ext_resource type="Script" path="res://Scripts/SpawnPoint.cs" id="4_a5c54"] [ext_resource type="Script" path="res://Scripts/SpawnPoint.cs" id="5_2mfmm"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_a8pxa"] radius = 0.957319 [node name="Level5" type="Node3D" groups=["Level"]] -script = ExtResource("1_qbafj") -_levelIndex = 4 [node name="STAGE 5" parent="." instance=ExtResource("1_fagdb")] @@ -22,6 +18,7 @@ collision_mask = 16 [node name="Exit Portal" parent="Area3D2" instance=ExtResource("3_ehcts")] transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, 0, -2.53252) +_levelIndex = 4 [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D2"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -2.51823) @@ -29,7 +26,7 @@ shape = SubResource("CylinderShape3D_a8pxa") [node name="P1_SpawnPoint" type="Marker3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.503964, 0.123258, 5.51333) -script = ExtResource("4_a5c54") +script = ExtResource("5_2mfmm") [node name="P2_SpawnPoint" type="Marker3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.16798, 0.123258, 5.51333) diff --git a/Scenes/Levels/Level6.tscn b/Scenes/Levels/Level6.tscn index 7e78e41..d7b784c 100644 --- a/Scenes/Levels/Level6.tscn +++ b/Scenes/Levels/Level6.tscn @@ -1,17 +1,13 @@ -[gd_scene load_steps=7 format=3 uid="uid://8ukphol1isp2"] +[gd_scene load_steps=5 format=3 uid="uid://8ukphol1isp2"] [ext_resource type="PackedScene" uid="uid://bc3wjl3ibs5q7" path="res://Levels/Models/STAGE 6.blend" id="1_q1cka"] -[ext_resource type="Script" path="res://Scripts/AreaExit.cs" id="1_qlv44"] [ext_resource type="PackedScene" uid="uid://jgf7k1r35km1" path="res://Scenes/ExitPortal.tscn" id="3_0wdh0"] -[ext_resource type="Script" path="res://Scripts/SpawnPoint.cs" id="4_awoco"] [ext_resource type="Script" path="res://Scripts/SpawnPoint.cs" id="5_tba4e"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_wu0in"] radius = 0.957319 [node name="Level6" type="Node3D" groups=["Level"]] -script = ExtResource("1_qlv44") -_levelIndex = 5 [node name="STAGE 6" parent="." instance=ExtResource("1_q1cka")] @@ -22,6 +18,7 @@ collision_mask = 16 [node name="Exit Portal" parent="Area3D2" instance=ExtResource("3_0wdh0")] transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, 0, -2.53252) +_levelIndex = 5 [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D2"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -2.51823) @@ -29,7 +26,7 @@ shape = SubResource("CylinderShape3D_wu0in") [node name="P1_SpawnPoint" type="Marker3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.503964, 0.123258, 5.51333) -script = ExtResource("4_awoco") +script = ExtResource("5_tba4e") [node name="P2_SpawnPoint" type="Marker3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.10805, 0.123258, 5.51333) diff --git a/Scenes/Levels/Level7.tscn b/Scenes/Levels/Level7.tscn index 72295a6..54e2495 100644 --- a/Scenes/Levels/Level7.tscn +++ b/Scenes/Levels/Level7.tscn @@ -1,17 +1,13 @@ -[gd_scene load_steps=7 format=3 uid="uid://bsq7edeueqyjg"] +[gd_scene load_steps=5 format=3 uid="uid://bsq7edeueqyjg"] [ext_resource type="PackedScene" uid="uid://biurk21cl5wxw" path="res://Levels/Models/STAGE 7.blend" id="1_dc67b"] -[ext_resource type="Script" path="res://Scripts/AreaExit.cs" id="1_fio4n"] [ext_resource type="PackedScene" uid="uid://jgf7k1r35km1" path="res://Scenes/ExitPortal.tscn" id="3_sjnhq"] -[ext_resource type="Script" path="res://Scripts/SpawnPoint.cs" id="4_kxyoc"] [ext_resource type="Script" path="res://Scripts/SpawnPoint.cs" id="5_5gfi0"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_a56hv"] radius = 0.957319 [node name="Level7" type="Node3D" groups=["Level"]] -script = ExtResource("1_fio4n") -_levelIndex = 6 [node name="STAGE 7" parent="." instance=ExtResource("1_dc67b")] @@ -22,6 +18,7 @@ collision_mask = 16 [node name="Exit Portal" parent="Area3D2" instance=ExtResource("3_sjnhq")] transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, 0, -2.53252) +_levelIndex = 6 [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D2"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -2.51823) @@ -29,7 +26,7 @@ shape = SubResource("CylinderShape3D_a56hv") [node name="P1_SpawnPoint" type="Marker3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.503964, 0.123258, 5.51333) -script = ExtResource("4_kxyoc") +script = ExtResource("5_5gfi0") [node name="P2_SpawnPoint" type="Marker3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.6401, 0.123258, 5.51333) diff --git a/Scenes/Levels/Level8.tscn b/Scenes/Levels/Level8.tscn index 80dbc51..11db03d 100644 --- a/Scenes/Levels/Level8.tscn +++ b/Scenes/Levels/Level8.tscn @@ -1,17 +1,13 @@ -[gd_scene load_steps=7 format=3 uid="uid://c4xcka4ekuur8"] +[gd_scene load_steps=5 format=3 uid="uid://c4xcka4ekuur8"] -[ext_resource type="Script" path="res://Scripts/AreaExit.cs" id="1_mo03n"] [ext_resource type="PackedScene" uid="uid://dibismvgu8151" path="res://Levels/Models/STAGE 8.blend" id="1_wd00s"] [ext_resource type="PackedScene" uid="uid://jgf7k1r35km1" path="res://Scenes/ExitPortal.tscn" id="3_44edv"] -[ext_resource type="Script" path="res://Scripts/SpawnPoint.cs" id="4_rdu0b"] [ext_resource type="Script" path="res://Scripts/SpawnPoint.cs" id="5_76jfi"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_3ne7n"] radius = 0.957319 [node name="Level8" type="Node3D" groups=["Level"]] -script = ExtResource("1_mo03n") -_levelIndex = 7 [node name="STAGE 8" parent="." instance=ExtResource("1_wd00s")] @@ -22,6 +18,7 @@ collision_mask = 16 [node name="Exit Portal" parent="Area3D2" instance=ExtResource("3_44edv")] transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, 0, -2.53252) +_levelIndex = 7 [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D2"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -2.51823) @@ -29,7 +26,7 @@ shape = SubResource("CylinderShape3D_3ne7n") [node name="P1_SpawnPoint" type="Marker3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.503964, 0.123258, 5.51333) -script = ExtResource("4_rdu0b") +script = ExtResource("5_76jfi") [node name="P2_SpawnPoint" type="Marker3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.60971, 0.123258, 5.51333) diff --git a/Scenes/Levels/Level9.tscn b/Scenes/Levels/Level9.tscn index b2fb593..94be534 100644 --- a/Scenes/Levels/Level9.tscn +++ b/Scenes/Levels/Level9.tscn @@ -1,5 +1,6 @@ -[gd_scene load_steps=9 format=3 uid="uid://0hdnmilwrsq6"] +[gd_scene load_steps=10 format=3 uid="uid://0hdnmilwrsq6"] +[ext_resource type="Script" path="res://Scripts/FinalLevel.cs" id="1_sy7dk"] [ext_resource type="Script" path="res://Scripts/HealthbarProgress.cs" id="2_53ar2"] [ext_resource type="Script" path="res://Scripts/SpawnPoint.cs" id="3_xr71f"] [ext_resource type="PackedScene" uid="uid://brbshysbgd47q" path="res://Scenes/god_circuit.tscn" id="4_vmhpd"] @@ -7,54 +8,14 @@ [ext_resource type="PackedScene" uid="uid://b0chkusc2bo2v" path="res://Levels/Final Levels/AnimatedFinal.tscn" id="6_8beqh"] [ext_resource type="PackedScene" uid="uid://b1j0g6ikmnibm" path="res://Scenes/HPComponent.tscn" id="7_nvq88"] -[sub_resource type="LabelSettings" id="LabelSettings_8edkl"] -font_color = Color(0, 0, 0, 1) - [sub_resource type="BoxShape3D" id="BoxShape3D_slhvd"] size = Vector3(2.65272, 5.04315, 1.02395) +[sub_resource type="LabelSettings" id="LabelSettings_cs88m"] +font_color = Color(0, 0, 0, 1) + [node name="Level9" type="Node3D" groups=["Level"]] - -[node name="Control" type="Control" parent="."] -visible = false -layout_mode = 3 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 - -[node name="TextureProgressBar" type="TextureProgressBar" parent="Control"] -top_level = true -z_index = 1 -layout_mode = 1 -anchors_preset = 10 -anchor_right = 1.0 -offset_left = 4.0 -offset_top = 44.0 -offset_right = 4.0 -offset_bottom = 73.0 -grow_horizontal = 2 -max_value = 2e+09 -value = 2e+09 -nine_patch_stretch = true -texture_progress = ExtResource("5_jjg8p") -script = ExtResource("2_53ar2") - -[node name="Label" type="Label" parent="Control"] -top_level = true -z_index = 1 -layout_mode = 1 -anchors_preset = 5 -anchor_left = 0.5 -anchor_right = 0.5 -offset_left = -43.0 -offset_right = 43.0 -offset_bottom = 26.0 -grow_horizontal = 2 -text = "God Circuit -" -label_settings = SubResource("LabelSettings_8edkl") +script = ExtResource("1_sy7dk") [node name="P1_SpawnPoint" type="Marker3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.503964, 0.123258, 5.51333) @@ -77,8 +38,45 @@ shape = SubResource("BoxShape3D_slhvd") [node name="HP Component" parent="God Circuit" node_paths=PackedStringArray("_healthBar") instance=ExtResource("7_nvq88")] MaximumHP = 2000000000 -_healthBar = NodePath("../../Control/TextureProgressBar") +_healthBar = NodePath("") [node name="FINAL STAGE" parent="." instance=ExtResource("6_8beqh")] +[node name="FinalBossGUI" type="Control" parent="." groups=["BossGUI"]] +visible = false +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 + +[node name="TextureProgressBar" type="TextureProgressBar" parent="FinalBossGUI"] +layout_mode = 1 +anchors_preset = 10 +anchor_right = 1.0 +offset_left = 383.0 +offset_top = 44.0 +offset_right = -491.0 +offset_bottom = 73.0 +grow_horizontal = 2 +max_value = 1e+09 +value = 1e+09 +nine_patch_stretch = true +texture_progress = ExtResource("5_jjg8p") +script = ExtResource("2_53ar2") + +[node name="Label" type="Label" parent="FinalBossGUI"] +layout_mode = 1 +anchors_preset = 5 +anchor_left = 0.5 +anchor_right = 0.5 +offset_left = -43.0 +offset_right = 43.0 +offset_bottom = 26.0 +grow_horizontal = 2 +text = "God Circuit +" +label_settings = SubResource("LabelSettings_cs88m") + [connection signal="body_entered" from="God Circuit/Area3D" to="God Circuit" method="OnHit"] diff --git a/Scenes/RangedEnemy.tscn b/Scenes/RangedEnemy.tscn index 5499dd4..dd20ef0 100644 --- a/Scenes/RangedEnemy.tscn +++ b/Scenes/RangedEnemy.tscn @@ -1,7 +1,22 @@ -[gd_scene load_steps=2 format=3 uid="uid://dahp73fwld24h"] +[gd_scene load_steps=4 format=3 uid="uid://dahp73fwld24h"] +[ext_resource type="Script" path="res://Scripts/RangedEnemy.cs" id="1_1t8ms"] [ext_resource type="PackedScene" uid="uid://dotxb4dc15l4k" path="res://Models/Enemies/ranged enemy.glb" id="1_aj5wt"] -[node name="Node3D" type="Node3D"] +[sub_resource type="BoxShape3D" id="BoxShape3D_dm3u7"] +size = Vector3(1.15368, 2.18529, 0.924281) -[node name="ranged enemy" parent="." instance=ExtResource("1_aj5wt")] +[node name="RangedEnemy" type="Node3D"] +script = ExtResource("1_1t8ms") + +[node name="Area3D" type="Area3D" parent="."] +collision_layer = 0 +collision_mask = 2 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.094986, 0.430939, 0) +shape = SubResource("BoxShape3D_dm3u7") + +[node name="ranged enemy" parent="Area3D" instance=ExtResource("1_aj5wt")] + +[connection signal="body_entered" from="Area3D" to="." method="OnHit"] diff --git a/Scenes/Weapons/CutterShot.tscn b/Scenes/Weapons/CutterShot.tscn index 2864d23..068cdef 100644 --- a/Scenes/Weapons/CutterShot.tscn +++ b/Scenes/Weapons/CutterShot.tscn @@ -12,12 +12,11 @@ point_count = 4 [sub_resource type="CylinderShape3D" id="CylinderShape3D_mgm2i"] height = 8.481 -radius = 0.3 [node name="CutterShot" type="Node3D" node_paths=PackedStringArray("_pathFollow", "_sprite")] script = ExtResource("1_inha4") _pathFollow = NodePath("Path3D/PathFollow3D") -_sprite = NodePath("Path3D/PathFollow3D/Area3D/Sprite3D") +_sprite = NodePath("Path3D/PathFollow3D/RigidBody3D/Sprite3D") Cooldown = 0.3 _projectileSpeed = 0.1 @@ -26,20 +25,32 @@ top_level = true curve = SubResource("Curve3D_5hmi4") [node name="PathFollow3D" type="PathFollow3D" parent="Path3D"] -transform = Transform3D(0.782564, 0, -0.622568, 0, 1, 0, 0.622568, 0, 0.782564, 0, 1, 0) +transform = Transform3D(-0.782564, 0, 0.622568, 0, 1, 0, -0.622568, 0, -0.782564, 0, 1, 0) loop = false tilt_enabled = false -[node name="Area3D" type="Area3D" parent="Path3D/PathFollow3D"] +[node name="RigidBody3D" type="RigidBody3D" parent="Path3D/PathFollow3D"] collision_layer = 2 collision_mask = 0 +gravity_scale = 0.0 +continuous_cd = true +max_contacts_reported = 100 +contact_monitor = true +can_sleep = false -[node name="CollisionShape3D" type="CollisionShape3D" parent="Path3D/PathFollow3D/Area3D"] -transform = Transform3D(0.999999, 0, 8.9407e-08, 0, 1, 0, -8.9407e-08, 0, 0.999999, 0, 0, 0) +[node name="CollisionShape3D" type="CollisionShape3D" parent="Path3D/PathFollow3D/RigidBody3D"] +transform = Transform3D(0.999999, 0, 1.19209e-07, 0, 1, 0, -1.19209e-07, 0, 0.999999, 0, 0, 0) shape = SubResource("CylinderShape3D_mgm2i") -[node name="Sprite3D" type="Sprite3D" parent="Path3D/PathFollow3D/Area3D"] +[node name="Sprite3D" type="Sprite3D" parent="Path3D/PathFollow3D/RigidBody3D"] transform = Transform3D(0.156513, 0, 0.124514, 0, 0.2, 0, -0.124514, 0, 0.156513, 0, 0, 0) axis = 1 double_sided = false texture = ExtResource("1_v8p6h") + +[node name="TTL" type="Timer" parent="."] +process_callback = 0 +wait_time = 0.8 +autostart = true + +[connection signal="timeout" from="TTL" to="." method="OnTimeToLiveTimeout"] diff --git a/Scenes/Weapons/CutterShotAltFire.tscn b/Scenes/Weapons/CutterShotAltFire.tscn index a18763b..afd74c7 100644 --- a/Scenes/Weapons/CutterShotAltFire.tscn +++ b/Scenes/Weapons/CutterShotAltFire.tscn @@ -12,34 +12,45 @@ point_count = 4 [sub_resource type="CylinderShape3D" id="CylinderShape3D_mgm2i"] height = 8.481 -radius = 0.3 [node name="CutterShot" type="Node3D" node_paths=PackedStringArray("_pathFollow", "_sprite")] script = ExtResource("1_7xtlh") _pathFollow = NodePath("Path3D/PathFollow3D") -_sprite = NodePath("Path3D/PathFollow3D/Area3D/Sprite3D") +_sprite = NodePath("Path3D/PathFollow3D/RigidBody3D/Sprite3D") Cooldown = 0.3 -_projectileSpeed = 0.1 +_projectileSpeed = 3.0 [node name="Path3D" type="Path3D" parent="."] top_level = true curve = SubResource("Curve3D_5hmi4") [node name="PathFollow3D" type="PathFollow3D" parent="Path3D"] -transform = Transform3D(0.782564, 0, 0.622568, 0, 1, 0, -0.622568, 0, 0.782564, 0, 1, 0) +transform = Transform3D(-0.782564, 0, -0.622568, 0, 1, 0, 0.622568, 0, -0.782564, 0, 1, 0) loop = false tilt_enabled = false -[node name="Area3D" type="Area3D" parent="Path3D/PathFollow3D"] +[node name="RigidBody3D" type="RigidBody3D" parent="Path3D/PathFollow3D"] collision_layer = 2 collision_mask = 0 +gravity_scale = 0.0 +continuous_cd = true +max_contacts_reported = 100 +contact_monitor = true +can_sleep = false -[node name="CollisionShape3D" type="CollisionShape3D" parent="Path3D/PathFollow3D/Area3D"] -transform = Transform3D(0.999999, 0, 8.9407e-08, 0, 1, 0, -8.9407e-08, 0, 0.999999, 0, 0, 0) +[node name="CollisionShape3D" type="CollisionShape3D" parent="Path3D/PathFollow3D/RigidBody3D"] +transform = Transform3D(0.999999, 0, 5.96046e-08, 0, 1, 0, -5.96046e-08, 0, 0.999999, 0, 0, 0) shape = SubResource("CylinderShape3D_mgm2i") -[node name="Sprite3D" type="Sprite3D" parent="Path3D/PathFollow3D/Area3D"] +[node name="Sprite3D" type="Sprite3D" parent="Path3D/PathFollow3D/RigidBody3D"] transform = Transform3D(0.2, 0, 0, 0, 0.2, 0, 0, 0, 0.2, 0, 0, 0) axis = 1 double_sided = false texture = ExtResource("2_a0jul") + +[node name="TTL" type="Timer" parent="."] +process_callback = 0 +wait_time = 0.8 +autostart = true + +[connection signal="timeout" from="TTL" to="." method="OnTimeToLiveTimeout"] diff --git a/Scenes/Weapons/EnemyBullet.tscn b/Scenes/Weapons/EnemyBullet.tscn index ece74d0..b6d5c74 100644 --- a/Scenes/Weapons/EnemyBullet.tscn +++ b/Scenes/Weapons/EnemyBullet.tscn @@ -15,7 +15,6 @@ radius = 0.440093 [node name="TestBullet" type="Node3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.538645, 0) script = ExtResource("1_rv13r") -Cooldown = null _projectileSpeed = 20.0 [node name="RigidBody3D" type="RigidBody3D" parent="."] diff --git a/Scenes/Weapons/LB HEDRON.png b/Scenes/Weapons/LB HEDRON.png new file mode 100644 index 0000000..b42f6a4 Binary files /dev/null and b/Scenes/Weapons/LB HEDRON.png differ diff --git a/Scenes/Weapons/LB HEDRON.png.import b/Scenes/Weapons/LB HEDRON.png.import new file mode 100644 index 0000000..6b5ebb4 --- /dev/null +++ b/Scenes/Weapons/LB HEDRON.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://uatt2w2jsoan" +path.s3tc="res://.godot/imported/LB HEDRON.png-f20a599f24e3e8cd36a397be3e9d6d32.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://Scenes/Weapons/LB HEDRON.png" +dest_files=["res://.godot/imported/LB HEDRON.png-f20a599f24e3e8cd36a397be3e9d6d32.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +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=0 diff --git a/Scenes/Weapons/ShotgunBullet.tscn b/Scenes/Weapons/ShotgunBullet.tscn index da0437c..a527a60 100644 --- a/Scenes/Weapons/ShotgunBullet.tscn +++ b/Scenes/Weapons/ShotgunBullet.tscn @@ -21,7 +21,7 @@ _projectileSpeed = 15.0 [node name="RigidBody3D" type="RigidBody3D" parent="."] transform = Transform3D(0.99863, 0, -0.052336, 0, 1, 0, 0.052336, 0, 0.99863, -0.508974, 0, 0) collision_layer = 34 -collision_mask = 32 +collision_mask = 34 gravity_scale = 0.0 continuous_cd = true max_contacts_reported = 1000 @@ -38,7 +38,7 @@ texture = ExtResource("2_wjqcr") [node name="RigidBody3D2" type="RigidBody3D" parent="."] transform = Transform3D(0.99863, 0, 0.052336, 0, 1, 0, -0.052336, 0, 0.99863, 0.647, 0, 0) collision_layer = 34 -collision_mask = 32 +collision_mask = 34 gravity_scale = 0.0 continuous_cd = true max_contacts_reported = 1000 @@ -55,7 +55,7 @@ texture = ExtResource("2_wjqcr") [node name="RigidBody3D3" type="RigidBody3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.592052) collision_layer = 34 -collision_mask = 32 +collision_mask = 34 gravity_scale = 0.0 continuous_cd = true max_contacts_reported = 1000 diff --git a/Scenes/Weapons/Single.tscn b/Scenes/Weapons/Single.tscn new file mode 100644 index 0000000..4ff31f8 --- /dev/null +++ b/Scenes/Weapons/Single.tscn @@ -0,0 +1,27 @@ +[gd_scene load_steps=4 format=3 uid="uid://cyn2wn6ffsnu7"] + +[ext_resource type="Script" path="res://Scripts/SingleShot.cs" id="1_18l5k"] +[ext_resource type="Texture2D" uid="uid://uatt2w2jsoan" path="res://Scenes/Weapons/LB HEDRON.png" id="1_nmsa0"] + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_njobr"] +radius = 0.3 + +[node name="Single" type="Node3D"] +script = ExtResource("1_18l5k") +Cooldown = 0.3 +_projectileSpeed = 10.0 + +[node name="RigidBody3D" type="RigidBody3D" parent="."] +collision_layer = 2 +collision_mask = 0 +gravity_scale = 0.0 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.644825, 0) +shape = SubResource("CylinderShape3D_njobr") + +[node name="Sprite3D" type="Sprite3D" parent="RigidBody3D"] +transform = Transform3D(0.07, 0, 0, 0, 0.07, 0, 0, 0, 0.07, -0.244938, 1.29552, 0.266473) +centered = false +axis = 1 +texture = ExtResource("1_nmsa0") diff --git a/Scenes/Weapons/SingleShot.tscn b/Scenes/Weapons/SingleShot.tscn index 11b459f..706f172 100644 --- a/Scenes/Weapons/SingleShot.tscn +++ b/Scenes/Weapons/SingleShot.tscn @@ -1,22 +1,19 @@ -[gd_scene load_steps=6 format=3 uid="uid://si4byubqnng4"] +[gd_scene load_steps=4 format=3 uid="uid://bwkp1ff25acp1"] -[ext_resource type="Script" path="res://Scripts/TestBullet.cs" id="1_f6dfa"] +[ext_resource type="Script" path="res://Scripts/SingleShot.cs" id="1_a82kt"] [ext_resource type="Texture2D" uid="uid://borp7xvlfdcmq" path="res://Textures/Projectiles/bubble.png" id="2_1dg7p"] -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_phgri"] -albedo_color = Color(0.584314, 0.0352941, 0.141176, 1) - -[sub_resource type="SphereMesh" id="SphereMesh_wuk0e"] -material = SubResource("StandardMaterial3D_phgri") - [sub_resource type="CylinderShape3D" id="CylinderShape3D_3c0di"] [node name="SingleShot" type="Node3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.538645, 0) -script = ExtResource("1_f6dfa") +script = ExtResource("1_a82kt") +Cooldown = 0.3 [node name="RigidBody3D" type="RigidBody3D" parent="."] -collision_layer = 34 +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -1) +top_level = true +disable_mode = 2 +collision_layer = 0 collision_mask = 34 gravity_scale = 0.0 continuous_cd = true @@ -24,17 +21,12 @@ max_contacts_reported = 1000 contact_monitor = true can_sleep = false -[node name="MeshInstance3D" type="MeshInstance3D" parent="RigidBody3D"] -visible = false -mesh = SubResource("SphereMesh_wuk0e") -skeleton = NodePath("../..") - [node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0054872, -0.00215495, 0.0167444) shape = SubResource("CylinderShape3D_3c0di") [node name="Sprite3D" type="Sprite3D" parent="RigidBody3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00168204, -0.0587139, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.002, 1, 0) axis = 1 texture = ExtResource("2_1dg7p") @@ -42,5 +34,4 @@ texture = ExtResource("2_1dg7p") process_callback = 0 autostart = true -[connection signal="body_entered" from="RigidBody3D" to="." method="OnBulletHitObject"] [connection signal="timeout" from="TTL" to="." method="OnTimeToLiveTimeout"] diff --git a/Scripts/AreaExit.cs b/Scripts/AreaExit.cs index 5d0e68d..28b30be 100644 --- a/Scripts/AreaExit.cs +++ b/Scripts/AreaExit.cs @@ -5,11 +5,19 @@ public partial class AreaExit : Node3D [Export] private int _levelIndex; + private GameManager _gameManager; + + public override void _Ready() + { + _gameManager = GetTree().Root.GetNode("Main/GameManager"); + } + private void OnExitEntered(Node3D node) { - GD.Print("Exit reached"); - var main = GetTree().Root.GetNode
("/root/Main"); - main.LoadNextLevel(_levelIndex); + GD.Print("Exit reached"); + var main = GetTree().Root.GetNode
("/root/Main"); + main.LoadNextLevel(_levelIndex); + _gameManager.ResetPlayerPosition(); } } diff --git a/Scripts/FinalLevel.cs b/Scripts/FinalLevel.cs new file mode 100644 index 0000000..c4bb621 --- /dev/null +++ b/Scripts/FinalLevel.cs @@ -0,0 +1,10 @@ +using Godot; + +public partial class FinalLevel : Node3D +{ + public override void _Ready() + { + var finalBossGUI = GetTree().GetFirstNodeInGroup("BossGUI") as Control; + finalBossGUI.Show(); + } +} diff --git a/Scripts/GameManager.cs b/Scripts/GameManager.cs index e885c30..df937d5 100644 --- a/Scripts/GameManager.cs +++ b/Scripts/GameManager.cs @@ -38,14 +38,19 @@ public partial class GameManager : Node public void SetP1ToPreviousCharacter() => _p1CharacterIndex = _p1CharacterIndex == 0 ? _p1Characters.Count() : --_p1CharacterIndex; + public void ResetPlayerPosition() + { + var playerSpawnPoint = GetNode("P1SpawnPoint"); + playerSpawnPoint.SetPlayerPosition(_p1SelectedCharacter); + } + public void OnP1CharacterSelected() { GD.Print("Instancing..."); var selectedPlayer = _p1Characters[_p1CharacterIndex].Instantiate(); _p1SelectedCharacter = selectedPlayer as Character; GetTree().Root.AddChild(_p1SelectedCharacter); - var playerSpawnPoint = GetNode("P1SpawnPoint"); - playerSpawnPoint.SetPlayerPosition(_p1SelectedCharacter); + ResetPlayerPosition(); } public void RemoveP1Character() diff --git a/Scripts/MainMenu.cs b/Scripts/MainMenu.cs index 9133d04..39ee16c 100644 --- a/Scripts/MainMenu.cs +++ b/Scripts/MainMenu.cs @@ -30,7 +30,7 @@ public partial class MainMenu : Node2D if (animationName == "FirstLevel") { var main = GetTree().Root.GetNode
("/root/Main"); - main.LoadLevel(8); + main.LoadLevel(0); } } } diff --git a/Scripts/MeleeEnemy.cs b/Scripts/MeleeEnemy.cs index 0a17489..85459c0 100644 --- a/Scripts/MeleeEnemy.cs +++ b/Scripts/MeleeEnemy.cs @@ -14,12 +14,12 @@ public partial class MeleeEnemy : BasicEnemy var convertedPlayers = players.Select(x => (Node3D)x); var target = convertedPlayers.OrderBy(x => Position.DistanceTo(x.Position)).FirstOrDefault(); Position = Position.MoveToward(target.Position, _speed * (float)delta); - MoveAndSlide(); + //MoveAndSlide(); } } } -public partial class BasicEnemy : CharacterBody3D +public partial class BasicEnemy : Node3D { public void OnHit(Node3D node) { diff --git a/Scripts/Player1.cs b/Scripts/Player1.cs index 0c28743..fed7f53 100644 --- a/Scripts/Player1.cs +++ b/Scripts/Player1.cs @@ -23,7 +23,7 @@ public partial class Player1 : Character public override void _PhysicsProcess(double delta) { if (!_gameManager.IsP1SelectingCharacter) - { + { Velocity = CalculateCharacterMovement(delta); MoveAndSlide(); } @@ -66,7 +66,7 @@ public partial class Player1 : Character private async void Fire() { var projectile = _fireProjectile.Instantiate(); - projectile.Position = Position; + projectile.Position = Position + new Vector3(0f, 1f, 0f); GetParent().AddChild(projectile); CanShoot = false; await ToSignal(GetTree().CreateTimer(projectile.Cooldown), "timeout"); @@ -76,7 +76,7 @@ public partial class Player1 : Character private async void AltFire() { var projectile = _altFireProjectile.Instantiate(); - projectile.Position = Position; + projectile.Position = Position + new Vector3(0f, 1f, 0f); GetParent().AddChild(projectile); CanShoot = false; await ToSignal(GetTree().CreateTimer(projectile.Cooldown), "timeout"); diff --git a/Scripts/RangedEnemy.cs b/Scripts/RangedEnemy.cs new file mode 100644 index 0000000..0cdda3d --- /dev/null +++ b/Scripts/RangedEnemy.cs @@ -0,0 +1,3 @@ +public partial class RangedEnemy : BasicEnemy +{ +} diff --git a/Scripts/SingleShot.cs b/Scripts/SingleShot.cs new file mode 100644 index 0000000..9241b5a --- /dev/null +++ b/Scripts/SingleShot.cs @@ -0,0 +1,16 @@ +using Godot; +using System.Linq; + +public partial class SingleShot : Projectile +{ + public override void _PhysicsProcess(double delta) + { + var pellet = GetChildren().OfType().Single(); + pellet.Translate(new Vector3(0, 0, Speed * -(float)delta)); + } + + private void OnBulletHitObject(Node node) + { + QueueFree(); + } +} diff --git a/Scripts/TestBullet.cs b/Scripts/TestBullet.cs deleted file mode 100644 index 1db96f4..0000000 --- a/Scripts/TestBullet.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Godot; - -public partial class TestBullet : Projectile -{ - public override void _PhysicsProcess(double delta) - { - Translate(new Vector3(0, 0, Speed * -(float)delta)); - } - - private void OnBulletHitObject(Node node) - { - QueueFree(); - } -} diff --git a/project.godot b/project.godot index f6b60a5..bbe515f 100644 --- a/project.godot +++ b/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="GameJam2023" run/main_scene="res://Scenes/Main.tscn" -config/features=PackedStringArray("4.1", "C#", "Forward Plus") +config/features=PackedStringArray("4.0", "C#", "Forward Plus") run/physics_ticks_per_second=60 [autoload] @@ -61,13 +61,13 @@ p1_down={ } p1_fire={ "deadzone": 0.5, -"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"canceled":false,"pressed":false,"double_click":false,"script":null) +"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"pressed":false,"double_click":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":0,"pressure":0.0,"pressed":true,"script":null) ] } p1_altfire={ "deadzone": 0.5, -"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":2,"canceled":false,"pressed":false,"double_click":false,"script":null) +"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":2,"pressed":false,"double_click":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":1,"pressure":0.0,"pressed":true,"script":null) ] }