diff --git a/Levels/Final Levels/AnimatedFinal.tscn b/Levels/Final Levels/AnimatedFinal.tscn index 8c57af0..7703cb3 100644 --- a/Levels/Final Levels/AnimatedFinal.tscn +++ b/Levels/Final Levels/AnimatedFinal.tscn @@ -26,10 +26,12 @@ [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_0v0c6"] resource_name = "Material.001" +transparency = 1 cull_mode = 2 shading_mode = 0 vertex_color_use_as_albedo = true albedo_texture = ExtResource("1_oofbv") +heightmap_enabled = true [sub_resource type="ArrayMesh" id="ArrayMesh_jcbwo"] _surfaces = [{ @@ -1420,27 +1422,27 @@ mesh = SubResource("ArrayMesh_5pdhi") skeleton = NodePath("") [node name="Plane_007" type="MeshInstance3D" parent="."] -transform = Transform3D(-0.00377867, 0, -0.698766, 0, 1.04657, 0, 1.03857, 0, -0.00254234, 2.07265, 0.0936406, -10.5126) +transform = Transform3D(-0.00377916, 0, -0.698766, 0, 1.04657, 0, 1.03857, 0, -0.00254267, 2.07265, 0.0936406, -10.5126) mesh = SubResource("ArrayMesh_e3acl") skeleton = NodePath("") [node name="Plane_008" type="MeshInstance3D" parent="."] -transform = Transform3D(-0.00729461, 0, -1.6545, 0, 2.00609, 0, 2.00494, 0, -0.00601961, 5.70975, 0.0936406, -8.83716) +transform = Transform3D(-0.00729558, 0, -1.6545, 0, 2.00609, 0, 2.00494, 0, -0.0060204, 5.70975, 0.0936406, -8.83716) mesh = SubResource("ArrayMesh_7xb3t") skeleton = NodePath("") [node name="Plane_009" type="MeshInstance3D" parent="."] -transform = Transform3D(-0.00628783, 0, -0.910888, 0, 1.74576, 0, 1.72822, 0, -0.00331411, -1.12223, 0.0936406, -8.56601) +transform = Transform3D(-0.00628865, 0, -0.910888, 0, 1.74576, 0, 1.72822, 0, -0.00331454, -1.12223, 0.0936406, -8.56601) mesh = SubResource("ArrayMesh_hffpl") skeleton = NodePath("") [node name="Plane_010" type="MeshInstance3D" parent="."] -transform = Transform3D(0.996693, 0, -1.16924, 0, 1.5364, 0, 1.16924, 0, 0.996693, -10.1032, 0.0936406, -6.11157) +transform = Transform3D(0.996694, 0, -1.16924, 0, 1.5364, 0, 1.16924, 0, 0.996694, -10.1032, 0.0936406, -6.11157) mesh = SubResource("ArrayMesh_q55ea") skeleton = NodePath("") [node name="Plane_011" type="MeshInstance3D" parent="."] -transform = Transform3D(0.839755, 0, -1.64877, 0, 1.61483, 0, 0.98513, 0, 1.40546, -5.09668, 0.0936406, -10.7682) +transform = Transform3D(0.839756, 0, -1.64877, 0, 1.61483, 0, 0.985134, 0, 1.40546, -5.09668, 0.0936406, -10.7682) mesh = SubResource("ArrayMesh_jepii") skeleton = NodePath("") @@ -1450,32 +1452,32 @@ mesh = SubResource("ArrayMesh_m64ug") skeleton = NodePath("") [node name="Plane_013" type="MeshInstance3D" parent="."] -transform = Transform3D(-0.805689, 0, 0.822407, 0, 1.1513, 0, -0.822407, 0, -0.805689, 6.57162, 0.550828, 8.08738) +transform = Transform3D(-0.80569, 0, 0.822408, 0, 1.1513, 0, -0.822408, 0, -0.80569, 6.57162, 0.550828, 8.08738) mesh = SubResource("ArrayMesh_o5ifk") skeleton = NodePath("") [node name="Plane_014" type="MeshInstance3D" parent="."] -transform = Transform3D(0.847765, 0, 0.00547653, 0, 1.07735, 0, -0.00552891, 0, 0.839733, -2.15445, 0.108412, -7.12627) +transform = Transform3D(0.847765, 0, 0.00547652, 0, 1.07735, 0, -0.0055289, 0, 0.839733, -2.15445, 0.108412, -7.12627) mesh = SubResource("ArrayMesh_uaau6") skeleton = NodePath("") [node name="Plane_015" type="MeshInstance3D" parent="."] -transform = Transform3D(-0.61563, 0, 0.628404, 0, 0.879712, 0, -0.628404, 0, -0.61563, 7.96881, 0.0936406, 5.10934) +transform = Transform3D(-0.61563, 0, 0.628405, 0, 0.879712, 0, -0.628405, 0, -0.61563, 7.96881, 0.0936406, 5.10934) mesh = SubResource("ArrayMesh_72amh") skeleton = NodePath("") [node name="Plane_016" type="MeshInstance3D" parent="."] -transform = Transform3D(0.426115, 0, 0.919471, 0, 1.36642, 0, -1.25668, 0, 0.311775, -2.31715, 0.0936406, 9.9053) +transform = Transform3D(0.426113, 0, 0.919471, 0, 1.36642, 0, -1.25667, 0, 0.311774, -2.31715, 0.0936406, 9.9053) mesh = SubResource("ArrayMesh_u3atd") skeleton = NodePath("") [node name="Plane_017" type="MeshInstance3D" parent="."] -transform = Transform3D(0.548436, 0, 0.836587, 0, 1.18259, 0, -1.61742, 0, 0.283671, -8.88136, 0.0936406, 7.99206) +transform = Transform3D(0.548434, 0, 0.836587, 0, 1.18259, 0, -1.61742, 0, 0.28367, -8.88136, 0.0936406, 7.99206) mesh = SubResource("ArrayMesh_03cjj") skeleton = NodePath("") [node name="Plane_018" type="MeshInstance3D" parent="."] -transform = Transform3D(0.229545, 0, 0.676961, 0, 0.71482, 0, -0.676961, 0, 0.229545, -6.35837, 0.0936406, 7.19496) +transform = Transform3D(0.229544, 0, 0.676962, 0, 0.71482, 0, -0.676962, 0, 0.229544, -6.35837, 0.0936406, 7.19496) mesh = SubResource("ArrayMesh_2jxy6") skeleton = NodePath("") @@ -1500,7 +1502,7 @@ mesh = SubResource("ArrayMesh_og6cu") skeleton = NodePath("") [node name="Plane_023" type="MeshInstance3D" parent="."] -transform = Transform3D(0.408436, -0.0138221, 1.8297, 0.0145542, 1.98837, 0.00434011, -1.02222, 0.0227873, 0.731133, 2.36517, 0.234488, -8.05808) +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) mesh = SubResource("ArrayMesh_ammp5") skeleton = NodePath("") diff --git a/Levels/Final Levels/CloudScroll.gdshader b/Levels/Final Levels/CloudScroll.gdshader new file mode 100644 index 0000000..34d7944 --- /dev/null +++ b/Levels/Final Levels/CloudScroll.gdshader @@ -0,0 +1,9 @@ +shader_type canvas_item; + +uniform vec2 motion = vec2(0.0); +uniform float scale = 1.0; +uniform vec2 offset = vec2(0.0); + +void vertex(){ + UV = (VERTEX + offset + TIME * motion) * TEXTURE_PIXEL_SIZE * (1.0/scale); +} \ No newline at end of file diff --git a/Scenes/Characters/PlayerScorpio.tscn b/Scenes/Characters/PlayerScorpio.tscn index 45a9970..505c757 100644 --- a/Scenes/Characters/PlayerScorpio.tscn +++ b/Scenes/Characters/PlayerScorpio.tscn @@ -1,15 +1,18 @@ -[gd_scene load_steps=5 format=3 uid="uid://iempdafdn6ct"] +[gd_scene load_steps=6 format=3 uid="uid://iempdafdn6ct"] [ext_resource type="Script" path="res://Scripts/Player1.cs" id="1_mn5ui"] [ext_resource type="PackedScene" uid="uid://dyhimd6qec8fu" path="res://Scenes/Characters/ScorpioAnimated.tscn" id="2_pahgr"] [ext_resource type="PackedScene" uid="uid://cxnek5wgpxbft" path="res://Scenes/Weapons/CutterShot.tscn" id="2_uayjr"] +[ext_resource type="PackedScene" uid="uid://cwt4rum7tvyvb" path="res://Scenes/Weapons/CutterShotAltFire.tscn" id="3_tw078"] [sub_resource type="BoxShape3D" id="BoxShape3D_f8aaj"] size = Vector3(0.822782, 0.527059, 0.80108) [node name="PlayerScorpio" type="CharacterBody3D" groups=["Player"]] script = ExtResource("1_mn5ui") +_speed = 3.0 _fireProjectile = ExtResource("2_uayjr") +_altFireProjectile = ExtResource("3_tw078") [node name="Pivot" type="Node3D" parent="."] diff --git a/Scenes/GameManager.tscn b/Scenes/GameManager.tscn index 4d92c01..fef6323 100644 --- a/Scenes/GameManager.tscn +++ b/Scenes/GameManager.tscn @@ -6,7 +6,7 @@ [ext_resource type="PackedScene" uid="uid://dq1gtd55p04do" path="res://Scenes/StageGUI.tscn" id="5_gsh7q"] [ext_resource type="Script" path="res://Scripts/SpawnPoint.cs" id="7_4n1rc"] -[node name="GameManager" type="Node"] +[node name="GameManager" type="Node3D"] script = ExtResource("1_ya2kt") _p1Characters = [ExtResource("2_am26u"), ExtResource("3_e5mhu")] _p2Characters = [ExtResource("2_am26u"), ExtResource("3_e5mhu")] diff --git a/Scenes/HPComponent.tscn b/Scenes/HPComponent.tscn index 7fd50f5..3d569a4 100644 --- a/Scenes/HPComponent.tscn +++ b/Scenes/HPComponent.tscn @@ -2,5 +2,6 @@ [ext_resource type="Script" path="res://Scripts/HealthPoints.cs" id="1_ocdf1"] -[node name="HP Component" type="Node"] +[node name="HP Component" type="Node2D"] script = ExtResource("1_ocdf1") +MaximumHP = null diff --git a/Scenes/Main.tscn b/Scenes/Main.tscn index 1c9df05..0091685 100644 --- a/Scenes/Main.tscn +++ b/Scenes/Main.tscn @@ -13,7 +13,7 @@ [ext_resource type="PackedScene" uid="uid://0hdnmilwrsq6" path="res://Scenes/Levels/Level9.tscn" id="10_imcyj"] [ext_resource type="PackedScene" uid="uid://cxj6yeddshy16" path="res://Scenes/GameManager.tscn" id="11_wiyvp"] -[node name="Main" type="Node"] +[node name="Main" type="Node3D"] script = ExtResource("1_g4hua") Levels = Array[PackedScene]([ExtResource("2_cqnvi"), ExtResource("3_2qwg5"), ExtResource("4_8bgmu"), ExtResource("5_6rnhl"), ExtResource("6_krvi4"), ExtResource("7_or04k"), ExtResource("8_407wt"), ExtResource("9_q0hjs"), ExtResource("10_imcyj")]) GameManager = ExtResource("11_wiyvp") diff --git a/Scenes/MeleeEnemyOrb.tscn b/Scenes/MeleeEnemyOrb.tscn index f780cc3..b2332ac 100644 --- a/Scenes/MeleeEnemyOrb.tscn +++ b/Scenes/MeleeEnemyOrb.tscn @@ -15,6 +15,7 @@ size = Vector3(0.470892, 0.604331, 0.423598) collision_layer = 0 collision_mask = 0 script = ExtResource("1_50och") +_speed = 3.0 [node name="CollisionShape3D" type="CollisionShape3D" parent="CharacterBody3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0840461, 0.475385, 0.143401) @@ -23,7 +24,7 @@ shape = SubResource("BoxShape3D_1nq5h") [node name="meleeenemy - Updated" parent="CharacterBody3D" instance=ExtResource("1_0pxgq")] [node name="Area3D" type="Area3D" parent="CharacterBody3D"] -collision_layer = 0 +collision_layer = 4096 collision_mask = 2 [node name="CollisionShape3D" type="CollisionShape3D" parent="CharacterBody3D/Area3D"] diff --git a/Scenes/TestEnemy.tscn b/Scenes/TestEnemy.tscn index d30ac27..522fdc7 100644 --- a/Scenes/TestEnemy.tscn +++ b/Scenes/TestEnemy.tscn @@ -2,7 +2,7 @@ [ext_resource type="ArrayMesh" uid="uid://d3u564wle888o" path="res://Models/TestModels/Ness/nesspoly.obj" id="1_jhe4l"] [ext_resource type="Script" path="res://Scripts/TestEnemy.cs" id="1_m03um"] -[ext_resource type="PackedScene" uid="uid://rlxnnw4yay7e" path="res://Scenes/EnemyBullet.tscn" id="2_h68e2"] +[ext_resource type="PackedScene" uid="uid://rlxnnw4yay7e" path="res://Scenes/Weapons/EnemyBullet.tscn" id="2_h68e2"] [ext_resource type="Script" path="res://Scripts/FireAtPlayer.cs" id="3_dhmfs"] [sub_resource type="Curve3D" id="Curve3D_dgatw"] diff --git a/Scenes/TestLevel.tscn b/Scenes/TestLevel.tscn index c9b630d..47dcd1d 100644 --- a/Scenes/TestLevel.tscn +++ b/Scenes/TestLevel.tscn @@ -1,11 +1,9 @@ -[gd_scene load_steps=14 format=3 uid="uid://dy3d4e6qegyjg"] +[gd_scene load_steps=12 format=3 uid="uid://dy3d4e6qegyjg"] [ext_resource type="Script" path="res://Scripts/TestLevel.cs" id="1_blhn0"] [ext_resource type="PackedScene" uid="uid://b38hcomu4tpm5" path="res://Scenes/Characters/PiscesWitch.tscn" id="1_fwf6c"] [ext_resource type="PackedScene" uid="uid://bckd04543occ5" path="res://Levels/levelTEST.gltf" id="2_afl3s"] [ext_resource type="PackedScene" uid="uid://dkjdt7uq3a4j3" path="res://Scenes/TestEnemy.tscn" id="3_ds7vi"] -[ext_resource type="PackedScene" uid="uid://si4byubqnng4" path="res://Scenes/TestBullet.tscn" id="3_lmb02"] -[ext_resource type="PackedScene" uid="uid://bq40xbqibrk1y" path="res://Scenes/ShotgunBullet.tscn" id="4_t522c"] [sub_resource type="BoxShape3D" id="BoxShape3D_iokol"] size = Vector3(77.2254, 10, 63.5656) @@ -44,11 +42,9 @@ size = 45.0 [node name="DebugCamera" type="Camera3D" parent="."] transform = Transform3D(1, 0, 0, 0, 0.821149, 0.570714, 0, -0.570714, 0.821149, -0.36148, 22.6449, 10.8421) -[node name="Fish Witch" parent="." groups=["Player"] instance=ExtResource("1_fwf6c")] +[node name="Fish Witch" parent="." instance=ExtResource("1_fwf6c")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4.64605, -18.4987) _speed = 10.0 -_fireProjectile = ExtResource("3_lmb02") -_altFireProjectile = ExtResource("4_t522c") [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] transform = Transform3D(-0.931845, -0.0850834, 0.35274, -0.0909281, 0.995857, -1.47234e-08, -0.351279, -0.032074, -0.935721, -3.58319, 8.01249, 0.163277) diff --git a/Scenes/Weapons/CutterShot.tscn b/Scenes/Weapons/CutterShot.tscn index ec4a95f..2864d23 100644 --- a/Scenes/Weapons/CutterShot.tscn +++ b/Scenes/Weapons/CutterShot.tscn @@ -5,37 +5,41 @@ [sub_resource type="Curve3D" id="Curve3D_5hmi4"] _data = { -"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8.263, 0, -5.291, 0, 0, 0, 0, 0, 0, 12.9507, -0.0301971, -16.7842, 0, 0, 0, 0, 0, 0, 10.6218, 0.010376, -28.3706, 0, 0, 0, 0, 0, 0, -56.3763, 0.0437164, -72.8457), -"tilts": PackedFloat32Array(0, 0, 0, 0, 0) +"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 2.502, 1, -3.145, 0, 0, 0, 0, 0, 0, 2.033, 1, -6, 0, 0, 0, 0, 0, 0, -5, 1, -8), +"tilts": PackedFloat32Array(0, 0, 0, 0) } -point_count = 5 +point_count = 4 [sub_resource type="CylinderShape3D" id="CylinderShape3D_mgm2i"] -radius = 0.949669 +height = 8.481 +radius = 0.3 -[node name="CutterShot" type="Node3D"] +[node name="CutterShot" type="Node3D" node_paths=PackedStringArray("_pathFollow", "_sprite")] +script = ExtResource("1_inha4") +_pathFollow = NodePath("Path3D/PathFollow3D") +_sprite = NodePath("Path3D/PathFollow3D/Area3D/Sprite3D") +Cooldown = 0.3 +_projectileSpeed = 0.1 [node name="Path3D" type="Path3D" parent="."] +top_level = true curve = SubResource("Curve3D_5hmi4") [node name="PathFollow3D" type="PathFollow3D" parent="Path3D"] -transform = Transform3D(0.539247, 0, -0.842147, 0, 1, 0, 0.842147, 0, 0.539247, 0, 0, 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="RigidBody3D" type="RigidBody3D" parent="Path3D/PathFollow3D"] -transform = Transform3D(0.539247, 0, 0.842147, 0, 1, 0, -0.842147, 0, 0.539247, 0, 0, 0) -collision_layer = 34 -collision_mask = 34 -gravity_scale = 0.0 -continuous_cd = true -max_contacts_reported = 1000 -contact_monitor = true -can_sleep = false -script = ExtResource("1_inha4") +[node name="Area3D" type="Area3D" parent="Path3D/PathFollow3D"] +collision_layer = 2 +collision_mask = 0 -[node name="CollisionShape3D" type="CollisionShape3D" parent="Path3D/PathFollow3D/RigidBody3D"] +[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) shape = SubResource("CylinderShape3D_mgm2i") -[node name="Sprite3D" type="Sprite3D" parent="Path3D/PathFollow3D/RigidBody3D"] -transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) +[node name="Sprite3D" type="Sprite3D" parent="Path3D/PathFollow3D/Area3D"] +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") diff --git a/Scenes/Weapons/CutterShotAltFire.tscn b/Scenes/Weapons/CutterShotAltFire.tscn new file mode 100644 index 0000000..a18763b --- /dev/null +++ b/Scenes/Weapons/CutterShotAltFire.tscn @@ -0,0 +1,45 @@ +[gd_scene load_steps=5 format=3 uid="uid://cwt4rum7tvyvb"] + +[ext_resource type="Script" path="res://Scripts/CutterShot.cs" id="1_7xtlh"] +[ext_resource type="Texture2D" uid="uid://brjwf2sf3s170" path="res://Textures/Projectiles/cutter.png" id="2_a0jul"] + +[sub_resource type="Curve3D" id="Curve3D_5hmi4"] +_data = { +"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, -2.502, 1, -3.145, 0, 0, 0, 0, 0, 0, -2.033, 1, -6, 0, 0, 0, 0, 0, 0, 5, 1, -8), +"tilts": PackedFloat32Array(0, 0, 0, 0) +} +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") +Cooldown = 0.3 +_projectileSpeed = 0.1 + +[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) +loop = false +tilt_enabled = false + +[node name="Area3D" type="Area3D" parent="Path3D/PathFollow3D"] +collision_layer = 2 +collision_mask = 0 + +[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) +shape = SubResource("CylinderShape3D_mgm2i") + +[node name="Sprite3D" type="Sprite3D" parent="Path3D/PathFollow3D/Area3D"] +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") diff --git a/Scenes/Weapons/EnemyBullet.tscn b/Scenes/Weapons/EnemyBullet.tscn index b6d5c74..ece74d0 100644 --- a/Scenes/Weapons/EnemyBullet.tscn +++ b/Scenes/Weapons/EnemyBullet.tscn @@ -15,6 +15,7 @@ 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/SingleShot.tscn b/Scenes/Weapons/SingleShot.tscn index 9b76a72..11b459f 100644 --- a/Scenes/Weapons/SingleShot.tscn +++ b/Scenes/Weapons/SingleShot.tscn @@ -14,8 +14,6 @@ material = SubResource("StandardMaterial3D_phgri") [node name="SingleShot" type="Node3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.538645, 0) script = ExtResource("1_f6dfa") -Cooldown = 0.5 -_projectileSpeed = 15.0 [node name="RigidBody3D" type="RigidBody3D" parent="."] collision_layer = 34 diff --git a/Scripts/CutterShot.cs b/Scripts/CutterShot.cs index 21712de..ff265f2 100644 --- a/Scripts/CutterShot.cs +++ b/Scripts/CutterShot.cs @@ -4,9 +4,23 @@ public partial class CutterShot : Projectile { [Export] private PathFollow3D _pathFollow; + [Export] + private Sprite3D _sprite; + + public override void _Ready() + { + _pathFollow = GetNode("Path3D/PathFollow3D"); + } public override void _PhysicsProcess(double delta) { - _pathFollow.Progress += Speed * (float)delta; + _pathFollow.Progress += 10f * (float)delta; + if (Mathf.IsEqualApprox(_pathFollow.ProgressRatio, 1.0f)) + QueueFree(); + } + + public override void _Process(double delta) + { + _sprite.RotateY(25); } } diff --git a/Scripts/Player1.cs b/Scripts/Player1.cs index ab49910..0c28743 100644 --- a/Scripts/Player1.cs +++ b/Scripts/Player1.cs @@ -66,7 +66,7 @@ public partial class Player1 : Character private async void Fire() { var projectile = _fireProjectile.Instantiate(); - projectile.Position = Position + new Vector3(0f, 1f, -1f); + projectile.Position = Position; 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 + new Vector3(0f, 1f, -1f); + projectile.Position = Position; GetParent().AddChild(projectile); CanShoot = false; await ToSignal(GetTree().CreateTimer(projectile.Cooldown), "timeout"); diff --git a/Scripts/Projectile.cs b/Scripts/Projectile.cs index 3d5e356..c732f4c 100644 --- a/Scripts/Projectile.cs +++ b/Scripts/Projectile.cs @@ -6,7 +6,7 @@ public partial class Projectile : Node3D public double Cooldown { get; protected set; } [Export] - private float _projectileSpeed = 100f; + private float _projectileSpeed = 1f; public override void _Ready() {