From ed28a4bb70026ab6dd90bb5165a15f5dc019bdd8 Mon Sep 17 00:00:00 2001 From: Zenny Date: Sun, 10 Sep 2023 15:07:13 -0700 Subject: [PATCH] Bug fix --- Enemies/Attacks/EnemyBullet.tscn | 7 +- Enemies/RangedEnemy.tscn | 18 +++- Levels/Scenes/Level4.tscn | 6 -- Player/Capricorn/Attacks/CapricornLaser.tscn | 19 ++-- .../Attacks/CapricornLaserAltFire.tscn | 19 ++-- Player/Pisces/Attacks/ShotgunBullet.tscn | 92 +++---------------- Player/Pisces/Attacks/Single.tscn | 13 +-- Player/Sagittarius/Attacks/MegamiBeam.tscn | 13 +-- Player/Scorpio/Attacks/CutterShot.tscn | 13 +-- Player/Scorpio/Attacks/CutterShotAltFire.tscn | 13 +-- 10 files changed, 77 insertions(+), 136 deletions(-) diff --git a/Enemies/Attacks/EnemyBullet.tscn b/Enemies/Attacks/EnemyBullet.tscn index 12914f8..0a1b44b 100644 --- a/Enemies/Attacks/EnemyBullet.tscn +++ b/Enemies/Attacks/EnemyBullet.tscn @@ -1,20 +1,17 @@ -[gd_scene load_steps=6 format=3 uid="uid://rlxnnw4yay7e"] +[gd_scene load_steps=5 format=3 uid="uid://rlxnnw4yay7e"] [ext_resource type="Script" path="res://Enemies/Attacks/EnemyBullet.cs" id="1_rv13r"] [ext_resource type="Texture2D" uid="uid://dd71tdgrgic46" path="res://Textures/Projectiles/LB ORB.png" id="2_6l2aj"] [ext_resource type="AudioStream" uid="uid://cfj82os5p8i4p" path="res://Audio/SFX/shooting.wav" id="2_q6wdf"] -[ext_resource type="AudioStream" uid="uid://cat08h84wm5gm" path="res://Audio/SFX/ominous.wav" id="3_ov77l"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_e4v7f"] height = 2.31583 radius = 0.154574 -[node name="TestBullet" type="Node3D" node_paths=PackedStringArray("_hitBox")] +[node name="TestBullet" type="Node3D"] script = ExtResource("1_rv13r") Cooldown = 3.0 _soundEffect = ExtResource("2_q6wdf") -_onHitSfx = ExtResource("3_ov77l") -_hitBox = NodePath("RigidBody3D") [node name="RigidBody3D" type="RigidBody3D" parent="."] collision_layer = 0 diff --git a/Enemies/RangedEnemy.tscn b/Enemies/RangedEnemy.tscn index 184b512..7d76326 100644 --- a/Enemies/RangedEnemy.tscn +++ b/Enemies/RangedEnemy.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=59 format=3 uid="uid://dahp73fwld24h"] +[gd_scene load_steps=61 format=3 uid="uid://dahp73fwld24h"] [ext_resource type="Script" path="res://Enemies/Scripts/RangedEnemy.cs" id="1_01lvj"] [ext_resource type="PackedScene" uid="uid://rlxnnw4yay7e" path="res://Enemies/Attacks/EnemyBullet.tscn" id="3_qenx3"] @@ -891,10 +891,19 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_j7wsk") +[sub_resource type="Animation" id="Animation_201mc"] +resource_name = "OnHit" +length = 0.2 + +[sub_resource type="AnimationLibrary" id="AnimationLibrary_f1x7o"] +_data = { +"OnHit": SubResource("Animation_201mc") +} + [node name="CharacterBody" type="CharacterBody3D" 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 = 9 +collision_mask = 5 script = ExtResource("1_01lvj") _hp = NodePath("HP Component") @@ -1059,4 +1068,9 @@ skeleton = NodePath("") [node name="HP Component" parent="." instance=ExtResource("4_1vt55")] MaximumHP = 2 +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +libraries = { +"": SubResource("AnimationLibrary_f1x7o") +} + [connection signal="timeout" from="Timer" to="Timer" method="OnFireAtPlayer"] diff --git a/Levels/Scenes/Level4.tscn b/Levels/Scenes/Level4.tscn index 00b223c..c500c1f 100644 --- a/Levels/Scenes/Level4.tscn +++ b/Levels/Scenes/Level4.tscn @@ -947,10 +947,4 @@ libraries = { "": SubResource("AnimationLibrary_biich") } -[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 - [connection signal="body_entered" from="Area3D2" to="." method="OnExitEntered"] diff --git a/Player/Capricorn/Attacks/CapricornLaser.tscn b/Player/Capricorn/Attacks/CapricornLaser.tscn index dd20736..178fa78 100644 --- a/Player/Capricorn/Attacks/CapricornLaser.tscn +++ b/Player/Capricorn/Attacks/CapricornLaser.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=9 format=3 uid="uid://5ce7ky4o0q2e"] +[gd_scene load_steps=8 format=3 uid="uid://5ce7ky4o0q2e"] [ext_resource type="Texture2D" uid="uid://dha44dnvwhajo" path="res://Textures/Projectiles/Projectile_Capricorn.png" id="1_bvyt4"] [ext_resource type="Script" path="res://Player/Base/Projectile.cs" id="1_ovnwu"] [ext_resource type="AudioStream" uid="uid://bykwwct1not4e" path="res://Audio/SFX/capricorn laeser.wav" id="2_lofnw"] -[ext_resource type="AudioStream" uid="uid://cat08h84wm5gm" path="res://Audio/SFX/ominous.wav" id="3_h1ve3"] [sub_resource type="Curve3D" id="Curve3D_bch55"] _data = { @@ -29,16 +28,14 @@ radius = 0.3 [node name="Capricorn Laser" type="Node3D" groups=["Projectile"]] -[node name="Forward Shot" type="Path3D" parent="." node_paths=PackedStringArray("_hitBox")] +[node name="Forward Shot" type="Path3D" parent="."] transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 0.105376, 0.772365, 1.51984) top_level = true curve = SubResource("Curve3D_bch55") script = ExtResource("1_ovnwu") Cooldown = 1.0 -_projectileSpeed = 5.0 _soundEffect = ExtResource("2_lofnw") -_onHitSfx = ExtResource("3_h1ve3") -_hitBox = NodePath("PathFollow3D/Hitbox") +_projectileSpeed = 5.0 [node name="PathFollow3D" type="PathFollow3D" parent="Forward Shot"] transform = Transform3D(0.999997, 0, -0.00207308, 0, 1, 0, 0.00207308, 0, 0.999997, -0.00347188, 1, 0.533723) @@ -62,16 +59,14 @@ centered = false axis = 1 texture = ExtResource("1_bvyt4") -[node name="Backward Shot" type="Path3D" parent="." node_paths=PackedStringArray("_hitBox")] +[node name="Backward Shot" type="Path3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.13167, 0.772365, -1.69199) top_level = true curve = SubResource("Curve3D_ciqkc") script = ExtResource("1_ovnwu") Cooldown = 1.0 -_projectileSpeed = 5.0 _soundEffect = ExtResource("2_lofnw") -_onHitSfx = ExtResource("3_h1ve3") -_hitBox = NodePath("PathFollow3D/Hitbox") +_projectileSpeed = 5.0 [node name="PathFollow3D" type="PathFollow3D" parent="Backward Shot"] transform = Transform3D(0.999997, 0, -0.00207308, 0, 1, 0, 0.00207308, 0, 0.999997, -0.00347188, 1, 0.533723) @@ -95,5 +90,9 @@ centered = false axis = 1 texture = ExtResource("1_bvyt4") +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource("2_lofnw") +autoplay = true + [connection signal="body_entered" from="Forward Shot/PathFollow3D/Hitbox" to="Forward Shot" method="OnProjectileHit"] [connection signal="body_entered" from="Backward Shot/PathFollow3D/Hitbox" to="Backward Shot" method="OnProjectileHit"] diff --git a/Player/Capricorn/Attacks/CapricornLaserAltFire.tscn b/Player/Capricorn/Attacks/CapricornLaserAltFire.tscn index b894403..841ed3a 100644 --- a/Player/Capricorn/Attacks/CapricornLaserAltFire.tscn +++ b/Player/Capricorn/Attacks/CapricornLaserAltFire.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=9 format=3 uid="uid://cdsc35cj566q1"] +[gd_scene load_steps=8 format=3 uid="uid://cdsc35cj566q1"] [ext_resource type="Script" path="res://Player/Base/Projectile.cs" id="1_tbx8y"] [ext_resource type="Texture2D" uid="uid://dha44dnvwhajo" path="res://Textures/Projectiles/Projectile_Capricorn.png" id="2_8osg4"] [ext_resource type="AudioStream" uid="uid://bykwwct1not4e" path="res://Audio/SFX/capricorn laeser.wav" id="2_jeoco"] -[ext_resource type="AudioStream" uid="uid://cat08h84wm5gm" path="res://Audio/SFX/ominous.wav" id="3_r2jj5"] [sub_resource type="Curve3D" id="Curve3D_bch55"] _data = { @@ -29,16 +28,14 @@ radius = 0.3 [node name="Capricorn Laser Alt" type="Node3D" groups=["Projectile"]] -[node name="Forward Shot" type="Path3D" parent="." node_paths=PackedStringArray("_hitBox")] +[node name="Forward Shot" type="Path3D" parent="."] transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -1.5, 1, 0) top_level = true curve = SubResource("Curve3D_bch55") script = ExtResource("1_tbx8y") Cooldown = 1.0 -_projectileSpeed = 5.0 _soundEffect = ExtResource("2_jeoco") -_onHitSfx = ExtResource("3_r2jj5") -_hitBox = NodePath("PathFollow3D/HitBox") +_projectileSpeed = 5.0 [node name="PathFollow3D" type="PathFollow3D" parent="Forward Shot"] transform = Transform3D(0.999997, 0, -0.00207308, 0, 1, 0, 0.00207308, 0, 0.999997, -0.00347188, 1, 0.533723) @@ -62,16 +59,14 @@ centered = false axis = 1 texture = ExtResource("2_8osg4") -[node name="Backward Shot" type="Path3D" parent="." node_paths=PackedStringArray("_hitBox")] +[node name="Backward Shot" type="Path3D" parent="."] transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 1.5, 1, 0) top_level = true curve = SubResource("Curve3D_ciqkc") script = ExtResource("1_tbx8y") Cooldown = 1.0 -_projectileSpeed = 5.0 _soundEffect = ExtResource("2_jeoco") -_onHitSfx = ExtResource("3_r2jj5") -_hitBox = NodePath("PathFollow3D/HitBox") +_projectileSpeed = 5.0 [node name="PathFollow3D" type="PathFollow3D" parent="Backward Shot"] transform = Transform3D(0.999997, 0, -0.00207308, 0, 1, 0, 0.00207308, 0, 0.999997, -0.00347188, 1, 0.533723) @@ -97,5 +92,9 @@ centered = false axis = 1 texture = ExtResource("2_8osg4") +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource("2_jeoco") +autoplay = true + [connection signal="body_entered" from="Forward Shot/PathFollow3D/HitBox" to="Forward Shot" method="OnProjectileHit"] [connection signal="body_entered" from="Backward Shot/PathFollow3D/HitBox" to="Forward Shot" method="OnProjectileHit"] diff --git a/Player/Pisces/Attacks/ShotgunBullet.tscn b/Player/Pisces/Attacks/ShotgunBullet.tscn index b56ae00..006864a 100644 --- a/Player/Pisces/Attacks/ShotgunBullet.tscn +++ b/Player/Pisces/Attacks/ShotgunBullet.tscn @@ -1,10 +1,8 @@ -[gd_scene load_steps=11 format=3 uid="uid://bq40xbqibrk1y"] +[gd_scene load_steps=8 format=3 uid="uid://bq40xbqibrk1y"] [ext_resource type="Script" path="res://Player/Base/Projectile.cs" id="1_ivbjp"] [ext_resource type="Texture2D" uid="uid://crlvrwo2l11ja" path="res://Textures/Projectiles/Projectile_Pisces_MultiAttack.png" id="2_a612r"] [ext_resource type="AudioStream" uid="uid://cw1jlubd7wmw6" path="res://Audio/SFX/blue laser.wav" id="2_oxtlx"] -[ext_resource type="AudioStream" uid="uid://cat08h84wm5gm" path="res://Audio/SFX/ominous.wav" id="4_2g102"] -[ext_resource type="AudioStream" uid="uid://cgun34h06gvpv" path="res://Audio/SFX/misc1.wav" id="4_2jy1s"] [sub_resource type="Curve3D" id="Curve3D_h8ghr"] _data = { @@ -17,56 +15,13 @@ point_count = 2 height = 8.0 radius = 0.3 -[sub_resource type="Animation" id="Animation_88db4"] -length = 0.001 +[sub_resource type="CylinderShape3D" id="CylinderShape3D_w0f1l"] +height = 8.0 +radius = 0.3 -[sub_resource type="Animation" id="Animation_3fawr"] -resource_name = "ShotDissolve" -length = 0.25 -tracks/0/type = "method" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath(".") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0.25), -"transitions": PackedFloat32Array(1), -"values": [{ -"args": [], -"method": &"Delete" -}] -} -tracks/1/type = "value" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath("AudioStreamPlayer:stream") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [ExtResource("4_2jy1s")] -} -tracks/2/type = "value" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath("AudioStreamPlayer:playing") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [true] -} - -[sub_resource type="AnimationLibrary" id="AnimationLibrary_tv0mi"] -_data = { -"RESET": SubResource("Animation_88db4"), -"ShotDissolve": SubResource("Animation_3fawr") -} +[sub_resource type="CylinderShape3D" id="CylinderShape3D_jtulw"] +height = 8.0 +radius = 0.3 [node name="ShotgunBullet" type="Node3D" groups=["Projectile"]] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.73894, 0) @@ -102,15 +57,6 @@ shape = SubResource("CylinderShape3D_ebbqv") axis = 1 texture = ExtResource("2_a612r") -[node name="AnimationPlayer" type="AnimationPlayer" parent="Center Shot"] -libraries = { -"": SubResource("AnimationLibrary_tv0mi") -} - -[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="Center Shot"] -stream = ExtResource("4_2g102") -autoplay = true - [node name="Left Shot" type="Path3D" parent="."] transform = Transform3D(0.970524, 0, 0.241007, 0, 1, 0, -0.241007, 0, 0.970524, -0.444877, 0.758171, -0.564578) top_level = true @@ -131,25 +77,17 @@ collision_layer = 44 gravity_scale = 0.0 continuous_cd = true max_contacts_reported = 1 +contact_monitor = true can_sleep = false [node name="CollisionShape3D" type="CollisionShape3D" parent="Left Shot/PathFollow3D/Hitbox"] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) -shape = SubResource("CylinderShape3D_ebbqv") +shape = SubResource("CylinderShape3D_w0f1l") [node name="Sprite3D" type="Sprite3D" parent="Left Shot/PathFollow3D/Hitbox/CollisionShape3D"] axis = 1 texture = ExtResource("2_a612r") -[node name="AnimationPlayer" type="AnimationPlayer" parent="Left Shot"] -libraries = { -"": SubResource("AnimationLibrary_tv0mi") -} - -[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="Left Shot"] -stream = ExtResource("4_2jy1s") -autoplay = true - [node name="Right Shot" type="Path3D" parent="."] transform = Transform3D(0.95246, 0, -0.304665, 0, 1, 0, 0.304665, 0, 0.95246, 0.441688, 0.758171, -0.681987) top_level = true @@ -160,7 +98,7 @@ _soundEffect = ExtResource("2_oxtlx") _projectileSpeed = 2.0 [node name="PathFollow3D" type="PathFollow3D" parent="Right Shot"] -transform = Transform3D(0.999985, 0, -0.00533326, 0, 1, 0, 0.00533326, 0, 0.999985, 0, 0, 0) +transform = Transform3D(0.999985, 0, -0.00533325, 0, 1, 0, 0.00533325, 0, 0.999985, 0, 0, 0) loop = false tilt_enabled = false @@ -170,22 +108,18 @@ collision_layer = 44 gravity_scale = 0.0 continuous_cd = true max_contacts_reported = 1 +contact_monitor = true can_sleep = false [node name="CollisionShape3D" type="CollisionShape3D" parent="Right Shot/PathFollow3D/Hitbox"] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, -0.00941685, 0, -0.0539098) -shape = SubResource("CylinderShape3D_ebbqv") +shape = SubResource("CylinderShape3D_jtulw") [node name="Sprite3D" type="Sprite3D" parent="Right Shot/PathFollow3D/Hitbox/CollisionShape3D"] axis = 1 texture = ExtResource("2_a612r") -[node name="AnimationPlayer" type="AnimationPlayer" parent="Right Shot"] -libraries = { -"": SubResource("AnimationLibrary_tv0mi") -} - -[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="Right Shot"] +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] stream = ExtResource("2_oxtlx") autoplay = true diff --git a/Player/Pisces/Attacks/Single.tscn b/Player/Pisces/Attacks/Single.tscn index 1c9af24..7125ac8 100644 --- a/Player/Pisces/Attacks/Single.tscn +++ b/Player/Pisces/Attacks/Single.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=7 format=3 uid="uid://cyn2wn6ffsnu7"] +[gd_scene load_steps=6 format=3 uid="uid://cyn2wn6ffsnu7"] [ext_resource type="Script" path="res://Player/Base/Projectile.cs" id="1_62kpd"] [ext_resource type="AudioStream" uid="uid://cw1jlubd7wmw6" path="res://Audio/SFX/blue laser.wav" id="2_7lbn3"] [ext_resource type="Texture2D" uid="uid://kecmkchurnin" path="res://Textures/Projectiles/Projectile_Pisces_SingleAttack.png" id="2_d8lwd"] -[ext_resource type="AudioStream" uid="uid://cat08h84wm5gm" path="res://Audio/SFX/ominous.wav" id="3_xqtbw"] [sub_resource type="Curve3D" id="Curve3D_do6j1"] _data = { @@ -18,16 +17,14 @@ radius = 0.3 [node name="Single" type="Node3D"] -[node name="Center Shot" type="Path3D" parent="." node_paths=PackedStringArray("_hitBox")] +[node name="Center Shot" type="Path3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.10168, -0.620083) top_level = true curve = SubResource("Curve3D_do6j1") script = ExtResource("1_62kpd") Cooldown = 0.5 -_projectileSpeed = 3.0 _soundEffect = ExtResource("2_7lbn3") -_onHitSfx = ExtResource("3_xqtbw") -_hitBox = NodePath("PathFollow3D/Hitbox") +_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) @@ -53,4 +50,8 @@ centered = false axis = 1 texture = ExtResource("2_d8lwd") +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource("2_7lbn3") +autoplay = true + [connection signal="body_entered" from="Center Shot/PathFollow3D/Hitbox" to="Center Shot" method="OnProjectileHit"] diff --git a/Player/Sagittarius/Attacks/MegamiBeam.tscn b/Player/Sagittarius/Attacks/MegamiBeam.tscn index 0f390d1..1b06b1d 100644 --- a/Player/Sagittarius/Attacks/MegamiBeam.tscn +++ b/Player/Sagittarius/Attacks/MegamiBeam.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=7 format=3 uid="uid://criqb4bokctlr"] +[gd_scene load_steps=6 format=3 uid="uid://criqb4bokctlr"] [ext_resource type="Script" path="res://Player/Base/Projectile.cs" id="1_6e1or"] [ext_resource type="Texture2D" uid="uid://cferkvvp0rjht" path="res://Textures/Projectiles/Projectile_Sagittarius.png" id="1_57flt"] [ext_resource type="AudioStream" uid="uid://m8mvw8acs5sk" path="res://Audio/SFX/Green Wave.wav" id="2_vvcho"] -[ext_resource type="AudioStream" uid="uid://cat08h84wm5gm" path="res://Audio/SFX/ominous.wav" id="3_12vsu"] [sub_resource type="Curve3D" id="Curve3D_7ok4f"] _data = { @@ -18,16 +17,14 @@ radius = 0.57027 [node name="MegamiBeam" type="Node3D" groups=["Projectile"]] -[node name="Path3D" type="Path3D" parent="." node_paths=PackedStringArray("_hitBox")] +[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 -_projectileSpeed = 3.0 _soundEffect = ExtResource("2_vvcho") -_onHitSfx = ExtResource("3_12vsu") -_hitBox = NodePath("PathFollow3D/Beam") +_projectileSpeed = 3.0 HasRotation = true [node name="PathFollow3D" type="PathFollow3D" parent="Path3D"] @@ -54,4 +51,8 @@ transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -0.003 axis = 1 texture = ExtResource("1_57flt") +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource("2_vvcho") +autoplay = true + [connection signal="body_entered" from="Path3D/PathFollow3D/Beam" to="Path3D" method="OnProjectileHit"] diff --git a/Player/Scorpio/Attacks/CutterShot.tscn b/Player/Scorpio/Attacks/CutterShot.tscn index 7e33bed..2de7424 100644 --- a/Player/Scorpio/Attacks/CutterShot.tscn +++ b/Player/Scorpio/Attacks/CutterShot.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=7 format=3 uid="uid://cxnek5wgpxbft"] +[gd_scene load_steps=6 format=3 uid="uid://cxnek5wgpxbft"] [ext_resource type="Script" path="res://Player/Scorpio/Attacks/CutterShot.cs" id="1_inha4"] [ext_resource type="Texture2D" uid="uid://cdryxdasvun4r" path="res://Textures/Projectiles/Projectile_Scorpio.png" id="2_tqxh6"] [ext_resource type="AudioStream" uid="uid://ce40y3hln3twm" path="res://Audio/SFX/grass cutter.wav" id="2_u4aoe"] -[ext_resource type="AudioStream" uid="uid://cat08h84wm5gm" path="res://Audio/SFX/ominous.wav" id="3_32sc2"] [sub_resource type="Curve3D" id="Curve3D_i1cv2"] _data = { @@ -18,16 +17,14 @@ radius = 0.304769 [node name="CutterShot" type="Node3D" groups=["Projectile"]] -[node name="Path3D" type="Path3D" parent="." node_paths=PackedStringArray("_sprite", "_hitBox")] +[node name="Path3D" type="Path3D" parent="." node_paths=PackedStringArray("_sprite")] top_level = true curve = SubResource("Curve3D_i1cv2") script = ExtResource("1_inha4") _sprite = NodePath("PathFollow3D/RigidBody3D/CollisionShape3D/Sprite3D") Cooldown = 0.7 -_projectileSpeed = 4.0 _soundEffect = ExtResource("2_u4aoe") -_onHitSfx = ExtResource("3_32sc2") -_hitBox = NodePath("PathFollow3D/RigidBody3D") +_projectileSpeed = 4.0 [node name="PathFollow3D" type="PathFollow3D" parent="Path3D"] transform = Transform3D(0.95152, 0.00128605, -0.30758, 1.16415e-10, 0.999991, 0.00418113, 0.307582, -0.00397844, 0.951511, 0, 1, 0) @@ -54,4 +51,8 @@ axis = 1 double_sided = false texture = ExtResource("2_tqxh6") +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource("2_u4aoe") +autoplay = true + [connection signal="body_entered" from="Path3D/PathFollow3D/RigidBody3D" to="Path3D" method="OnProjectileHit"] diff --git a/Player/Scorpio/Attacks/CutterShotAltFire.tscn b/Player/Scorpio/Attacks/CutterShotAltFire.tscn index 39f4173..4388683 100644 --- a/Player/Scorpio/Attacks/CutterShotAltFire.tscn +++ b/Player/Scorpio/Attacks/CutterShotAltFire.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=7 format=3 uid="uid://cwt4rum7tvyvb"] +[gd_scene load_steps=6 format=3 uid="uid://cwt4rum7tvyvb"] [ext_resource type="Script" path="res://Player/Scorpio/Attacks/CutterShot.cs" id="1_7xtlh"] [ext_resource type="Texture2D" uid="uid://cdryxdasvun4r" path="res://Textures/Projectiles/Projectile_Scorpio.png" id="2_6mabu"] [ext_resource type="AudioStream" uid="uid://ce40y3hln3twm" path="res://Audio/SFX/grass cutter.wav" id="2_qmvk7"] -[ext_resource type="AudioStream" uid="uid://cat08h84wm5gm" path="res://Audio/SFX/ominous.wav" id="3_v1t2f"] [sub_resource type="Curve3D" id="Curve3D_ocip8"] _data = { @@ -18,16 +17,14 @@ radius = 0.272422 [node name="CutterAlt" type="Node3D" groups=["Projectile"]] -[node name="CutterShot" type="Path3D" parent="." node_paths=PackedStringArray("_sprite", "_hitBox")] +[node name="CutterShot" type="Path3D" parent="." node_paths=PackedStringArray("_sprite")] top_level = true curve = SubResource("Curve3D_ocip8") script = ExtResource("1_7xtlh") _sprite = NodePath("PathFollow3D/RigidBody3D/CollisionShape3D/Sprite3D") Cooldown = 0.7 -_projectileSpeed = 4.0 _soundEffect = ExtResource("2_qmvk7") -_onHitSfx = ExtResource("3_v1t2f") -_hitBox = NodePath("PathFollow3D/RigidBody3D") +_projectileSpeed = 4.0 [node name="PathFollow3D" type="PathFollow3D" parent="CutterShot"] transform = Transform3D(0.951515, -0.00127716, 0.307596, 1.16415e-10, 0.999991, 0.00415203, -0.307599, -0.00395073, 0.951506, 0, 1, 0) @@ -54,4 +51,8 @@ axis = 1 double_sided = false texture = ExtResource("2_6mabu") +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource("2_qmvk7") +autoplay = true + [connection signal="body_entered" from="CutterShot/PathFollow3D/RigidBody3D" to="CutterShot" method="OnProjectileHit"]