goodbye collisions

This commit is contained in:
2023-09-07 20:03:22 -07:00
parent 4b840bbe7f
commit 833ad3209e
37 changed files with 410 additions and 299 deletions

View File

@@ -1,8 +1,9 @@
[gd_scene load_steps=6 format=3 uid="uid://bq40xbqibrk1y"]
[gd_scene load_steps=7 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"]
[sub_resource type="Curve3D" id="Curve3D_h8ghr"]
_data = {
@@ -12,28 +13,32 @@ _data = {
point_count = 2
[sub_resource type="CylinderShape3D" id="CylinderShape3D_ebbqv"]
height = 13.6565
radius = 0.3
[node name="ShotgunBullet" type="Node3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.73894, 0)
script = ExtResource("1_ivbjp")
Cooldown = 1.0
_soundEffect = ExtResource("2_oxtlx")
[node name="Center Shot" type="Path3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.25)
[node name="Center Shot" type="Path3D" parent="." node_paths=PackedStringArray("_hitBox")]
transform = Transform3D(0.999968, 0, -0.00802843, 0, 1, 0, 0.00802843, 0, 0.999968, -0.0325268, 0, -0.821681)
top_level = true
curve = SubResource("Curve3D_h8ghr")
script = ExtResource("1_ivbjp")
Cooldown = 0.5
_projectileSpeed = 3.0
_soundEffect = ExtResource("2_oxtlx")
_onHitSfx = ExtResource("4_2g102")
_hitBox = NodePath("PathFollow3D/Hitbox")
[node name="PathFollow3D" type="PathFollow3D" parent="Center Shot"]
transform = Transform3D(-0.999998, 0, 0.00159994, 0, 1, 0, -0.00159994, 0, -0.999998, 0, 0, 0)
transform = Transform3D(0.999998, 0, -0.0016, 0, 1, 0, 0.0016, 0, 0.999998, 0, 0, 0)
loop = false
tilt_enabled = false
[node name="Hitbox" type="RigidBody3D" parent="Center Shot/PathFollow3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00512208, 0, 0.096)
collision_layer = 34
collision_mask = 34
collision_layer = 0
collision_mask = 0
gravity_scale = 0.0
continuous_cd = true
max_contacts_reported = 1000
@@ -48,20 +53,26 @@ shape = SubResource("CylinderShape3D_ebbqv")
axis = 1
texture = ExtResource("2_a612r")
[node name="Left Shot" type="Path3D" parent="."]
transform = Transform3D(0.984808, 0, 0.173648, 0, 1, 0, -0.173648, 0, 0.984808, -0.462206, 0, -0.1)
[node name="Left Shot" type="Path3D" parent="." node_paths=PackedStringArray("_hitBox")]
transform = Transform3D(0.970524, 0, 0.241007, 0, 1, 0, -0.241007, 0, 0.970524, -0.444877, 0, -0.564578)
top_level = true
curve = SubResource("Curve3D_h8ghr")
script = ExtResource("1_ivbjp")
Cooldown = 0.5
_projectileSpeed = 3.0
_soundEffect = ExtResource("2_oxtlx")
_onHitSfx = ExtResource("4_2g102")
_hitBox = NodePath("PathFollow3D/Hitbox")
[node name="PathFollow3D" type="PathFollow3D" parent="Left Shot"]
transform = Transform3D(-0.999998, 0, 0.00159994, 0, 1, 0, -0.00159994, 0, -0.999998, 0, 0, 0)
transform = Transform3D(0.999998, 0, -0.0016, 0, 1, 0, 0.0016, 0, 0.999998, 0, 0, 0)
loop = false
tilt_enabled = false
[node name="Hitbox" type="RigidBody3D" parent="Left Shot/PathFollow3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.03827, 0, 0.0309103)
collision_layer = 34
collision_mask = 34
collision_layer = 0
collision_mask = 0
gravity_scale = 0.0
continuous_cd = true
max_contacts_reported = 1000
@@ -76,20 +87,26 @@ shape = SubResource("CylinderShape3D_ebbqv")
axis = 1
texture = ExtResource("2_a612r")
[node name="Right Shot" type="Path3D" parent="."]
transform = Transform3D(0.984808, 0, -0.173648, 0, 1, 0, 0.173648, 0, 0.984808, 0.426491, 0, 0)
[node name="Right Shot" type="Path3D" parent="." node_paths=PackedStringArray("_hitBox")]
transform = Transform3D(0.95246, 0, -0.304665, 0, 1, 0, 0.304665, 0, 0.95246, 0.441688, 0, -0.681987)
top_level = true
curve = SubResource("Curve3D_h8ghr")
script = ExtResource("1_ivbjp")
Cooldown = 0.5
_projectileSpeed = 3.0
_soundEffect = ExtResource("2_oxtlx")
_onHitSfx = ExtResource("4_2g102")
_hitBox = NodePath("PathFollow3D/Hitbox")
[node name="PathFollow3D" type="PathFollow3D" parent="Right Shot"]
transform = Transform3D(-0.999998, 0, 0.00159994, 0, 1, 0, -0.00159994, 0, -0.999998, 0, 0, 0)
transform = Transform3D(0.999998, 0, -0.0016, 0, 1, 0, 0.0016, 0, 0.999998, 0, 0, 0)
loop = false
tilt_enabled = false
[node name="Hitbox" type="RigidBody3D" parent="Right Shot/PathFollow3D"]
transform = Transform3D(-1, 0, -0.00159994, 0, 1, 0, 0.00159994, 0, -1, -0.06, 0, 0.096)
collision_layer = 34
collision_mask = 34
collision_layer = 0
collision_mask = 0
gravity_scale = 0.0
continuous_cd = true
max_contacts_reported = 1000
@@ -103,3 +120,7 @@ shape = SubResource("CylinderShape3D_ebbqv")
[node name="Sprite3D" type="Sprite3D" parent="Right Shot/PathFollow3D/Hitbox/CollisionShape3D"]
axis = 1
texture = ExtResource("2_a612r")
[connection signal="body_entered" from="Center Shot/PathFollow3D/Hitbox" to="Center Shot" method="OnProjectileHit"]
[connection signal="body_entered" from="Left Shot/PathFollow3D/Hitbox" to="Left Shot" method="OnProjectileHit"]
[connection signal="body_entered" from="Right Shot/PathFollow3D/Hitbox" to="Right Shot" method="OnProjectileHit"]

View File

@@ -1,8 +1,9 @@
[gd_scene load_steps=6 format=3 uid="uid://cyn2wn6ffsnu7"]
[gd_scene load_steps=7 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 = {
@@ -12,30 +13,33 @@ _data = {
point_count = 2
[sub_resource type="CylinderShape3D" id="CylinderShape3D_njobr"]
height = 11.931
radius = 0.3
[node name="Single" type="Node3D"]
script = ExtResource("1_62kpd")
Cooldown = 1.0
_soundEffect = ExtResource("2_7lbn3")
[node name="Center Shot" type="Path3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, -0.25)
[node name="Center Shot" type="Path3D" parent="." node_paths=PackedStringArray("_hitBox")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, -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")
[node name="PathFollow3D" type="PathFollow3D" parent="Center Shot"]
transform = Transform3D(-0.999998, 0, 0.00159994, 0, 1, 0, -0.00159994, 0, -0.999998, 0, 0, 0)
transform = Transform3D(0.999998, 0, -0.0016, 0, 1, 0, 0.0016, 0, 0.999998, 0, 0, 0)
loop = false
tilt_enabled = false
[node name="Hitbox" type="RigidBody3D" parent="Center Shot/PathFollow3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0)
collision_layer = 34
collision_mask = 34
collision_layer = 0
collision_mask = 0
gravity_scale = 0.0
continuous_cd = true
max_contacts_reported = 1000
max_contacts_reported = 1
contact_monitor = true
can_sleep = false
@@ -48,3 +52,5 @@ transform = Transform3D(1, 0, -3.55271e-14, 0, 1, 0, 3.55271e-14, 0, 1, -0.29984
centered = false
axis = 1
texture = ExtResource("2_d8lwd")
[connection signal="body_entered" from="Center Shot/PathFollow3D/Hitbox" to="Center Shot" method="OnProjectileHit"]

View File

@@ -14,7 +14,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.332056, 0)
collision_layer = 25
collision_layer = 0
collision_mask = 0
motion_mode = 1
script = ExtResource("1_gp8nm")
_fireProjectile = ExtResource("2_rsvhh")
@@ -26,8 +27,8 @@ _altFireProjectile = ExtResource("3_5m8tq")
[node name="Area3D" type="Area3D" parent="Pivot"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.75657e-15, 0, 0)
collision_layer = 16
collision_mask = 4100
collision_layer = 0
collision_mask = 0
[node name="CollisionShape3D" type="CollisionShape3D" parent="Pivot/Area3D"]
transform = Transform3D(0.999665, -0.0258978, -7.10543e-15, 0.0258978, 0.999665, 0, 0, 0, 1, 0.0162379, 2.20309, -0.302385)