Bug fix

2023-09-10 15:07:13 -07:00
parent f0f02bbd17
commit ed28a4bb70
10 changed files with 77 additions and 136 deletions
--- 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

--- 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"]