Oops big commit

2023-09-06 01:32:54 -07:00
parent ed4ebfafac
commit f180d4cacd
88 changed files with 13233 additions and 1274 deletions
--- a/Scenes/Weapons/CapricornLaser.tscn
+++ b/Scenes/Weapons/CapricornLaser.tscn
@@ -1,18 +1,21 @@
-[gd_scene load_steps=4 format=3 uid="uid://5ce7ky4o0q2e"]
+[gd_scene load_steps=5 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://Scripts/CapricornLaserShot.cs" id="1_nkyy8"]
+[ext_resource type="AudioStream" uid="uid://bykwwct1not4e" path="res://Audio/SFX/capricorn laeser.wav" id="2_lofnw"]

 [sub_resource type="CylinderShape3D" id="CylinderShape3D_bnunv"]
+height = 7.40727
 radius = 0.419241

 [node name="CapricornLaser" type="Node3D"]
 script = ExtResource("1_nkyy8")
-_projectileSpeed = 1.5
+_soundEffect = ExtResource("2_lofnw")
+_projectileSpeed = 3.0

 [node name="Forward Shot" type="RigidBody3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.5)
-collision_layer = 34
+collision_layer = 0
 collision_mask = 34
 gravity_scale = 0.0
 continuous_cd = true
@@ -32,7 +35,7 @@ texture = ExtResource("1_bvyt4")

 [node name="BackwardShot" type="RigidBody3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0.5)
-collision_layer = 34
+collision_layer = 0
 collision_mask = 34
 gravity_scale = 0.0
 continuous_cd = true
--- a/Scenes/Weapons/CapricornLaserAltFire.tscn
+++ b/Scenes/Weapons/CapricornLaserAltFire.tscn
@@ -1,15 +1,18 @@
-[gd_scene load_steps=4 format=3 uid="uid://cdsc35cj566q1"]
+[gd_scene load_steps=5 format=3 uid="uid://cdsc35cj566q1"]

 [ext_resource type="Script" path="res://Scripts/CapricornLaserShot.cs" id="1_8lywi"]
 [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"]

 [sub_resource type="CylinderShape3D" id="CylinderShape3D_bnunv"]
+height = 8.32444
 radius = 0.419241

 [node name="CapricornLaser" type="Node3D"]
 transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.242816, 0, 0)
 script = ExtResource("1_8lywi")
-_projectileSpeed = 1.5
+_soundEffect = ExtResource("2_jeoco")
+_projectileSpeed = 3.0

 [node name="Forward Shot" type="RigidBody3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.5)
--- a/Scenes/Weapons/CutterShot.tscn
+++ b/Scenes/Weapons/CutterShot.tscn
@@ -1,7 +1,8 @@
-[gd_scene load_steps=5 format=3 uid="uid://cxnek5wgpxbft"]
+[gd_scene load_steps=6 format=3 uid="uid://cxnek5wgpxbft"]

 [ext_resource type="Script" path="res://Scripts/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"]

 [sub_resource type="Curve3D" id="Curve3D_5hmi4"]
 _data = {
@@ -18,6 +19,7 @@ script = ExtResource("1_inha4")
 _pathFollow = NodePath("Path3D/PathFollow3D")
 _sprite = NodePath("Path3D/PathFollow3D/RigidBody3D/Sprite3D")
 Cooldown = 0.3
+_soundEffect = ExtResource("2_u4aoe")
 _projectileSpeed = 0.1

 [node name="Path3D" type="Path3D" parent="."]
--- a/Scenes/Weapons/CutterShotAltFire.tscn
+++ b/Scenes/Weapons/CutterShotAltFire.tscn
@@ -1,7 +1,8 @@
-[gd_scene load_steps=5 format=3 uid="uid://cwt4rum7tvyvb"]
+[gd_scene load_steps=6 format=3 uid="uid://cwt4rum7tvyvb"]

 [ext_resource type="Script" path="res://Scripts/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"]

 [sub_resource type="Curve3D" id="Curve3D_5hmi4"]
 _data = {
@@ -18,6 +19,7 @@ script = ExtResource("1_7xtlh")
 _pathFollow = NodePath("Path3D/PathFollow3D")
 _sprite = NodePath("Path3D/PathFollow3D/RigidBody3D/CollisionShape3D/Sprite3D")
 Cooldown = 0.3
+_soundEffect = ExtResource("2_qmvk7")
 _projectileSpeed = 3.0

 [node name="Path3D" type="Path3D" parent="."]
--- a/Scenes/Weapons/EnemyBullet.tscn
+++ b/Scenes/Weapons/EnemyBullet.tscn
@@ -17,7 +17,7 @@ script = ExtResource("1_rv13r")
 _projectileSpeed = 3.0

 [node name="RigidBody3D" type="RigidBody3D" parent="."]
-collision_layer = 4100
+collision_layer = 4
 collision_mask = 0
 gravity_scale = 0.0
 custom_integrator = true
--- a/Scenes/Weapons/MegamiBeam.tscn
+++ b/Scenes/Weapons/MegamiBeam.tscn
@@ -1,19 +1,38 @@
-[gd_scene load_steps=4 format=3 uid="uid://criqb4bokctlr"]
+[gd_scene load_steps=6 format=3 uid="uid://criqb4bokctlr"]

 [ext_resource type="Texture2D" uid="uid://cferkvvp0rjht" path="res://Textures/Projectiles/Projectile_Sagittarius.png" id="1_57flt"]
 [ext_resource type="Script" path="res://Scripts/MegamiBeamShot.cs" id="1_a146o"]
+[ext_resource type="AudioStream" uid="uid://m8mvw8acs5sk" path="res://Audio/SFX/Green Wave.wav" id="2_vvcho"]
+
+[sub_resource type="Curve3D" id="Curve3D_7ok4f"]
+_data = {
+"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0.008, 1, -10),
+"tilts": PackedFloat32Array(0, 0)
+}
+point_count = 2

 [sub_resource type="CylinderShape3D" id="CylinderShape3D_bnunv"]
 radius = 0.419241

-[node name="MegamiBeam" type="Node3D"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.375737)
+[node name="MegamiBeam" type="Node3D" node_paths=PackedStringArray("_pathFollow")]
 script = ExtResource("1_a146o")
+_pathFollow = NodePath("Path3D/PathFollow3D")
+_soundEffect = ExtResource("2_vvcho")
 Cooldown = 3.0
-_projectileSpeed = 10.0
+_soundEffect = ExtResource("2_vvcho")
+_projectileSpeed = 3.0

-[node name="Beam" type="RigidBody3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.5)
+[node name="Path3D" type="Path3D" parent="."]
+top_level = true
+curve = SubResource("Curve3D_7ok4f")
+
+[node name="PathFollow3D" type="PathFollow3D" parent="Path3D"]
+transform = Transform3D(-0.999999, 0, 0.000800044, 0, 1, 0, -0.000800044, 0, -0.999999, 0, 1, 0)
+loop = false
+tilt_enabled = false
+
+[node name="Beam" type="RigidBody3D" parent="Path3D/PathFollow3D"]
+transform = Transform3D(-1, 0, -8.74229e-08, 0, 1, 0, 8.74229e-08, 0, -1, 0, 0, 0)
 collision_layer = 34
 collision_mask = 34
 gravity_scale = 0.0
@@ -22,12 +41,11 @@ max_contacts_reported = 1000
 contact_monitor = true
 can_sleep = false

-[node name="CollisionShape3D" type="CollisionShape3D" parent="Beam"]
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Path3D/PathFollow3D/Beam"]
 transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0)
 shape = SubResource("CylinderShape3D_bnunv")

-[node name="Sprite3D2" type="Sprite3D" parent="Beam"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.33, 0, 0.5)
-centered = false
+[node name="Sprite3D2" type="Sprite3D" parent="Path3D/PathFollow3D/Beam"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00355998, 0, 0.140453)
 axis = 1
 texture = ExtResource("1_57flt")
--- a/Scenes/Weapons/ShotgunBullet.tscn
+++ b/Scenes/Weapons/ShotgunBullet.tscn
@@ -1,7 +1,8 @@
-[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://Scripts/ShotgunBullet.cs" id="1_0khuu"]
 [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"]

 [sub_resource type="CylinderShape3D" id="CylinderShape3D_eme14"]
 radius = 0.3
@@ -16,6 +17,7 @@ radius = 0.3
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.73894, 0)
 script = ExtResource("1_0khuu")
 Cooldown = 0.5
+_soundEffect = ExtResource("2_oxtlx")
 _projectileSpeed = 15.0

 [node name="RigidBody3D" type="RigidBody3D" parent="."]
--- a/Scenes/Weapons/Single.tscn
+++ b/Scenes/Weapons/Single.tscn
@@ -1,6 +1,7 @@
-[gd_scene load_steps=4 format=3 uid="uid://cyn2wn6ffsnu7"]
+[gd_scene load_steps=5 format=3 uid="uid://cyn2wn6ffsnu7"]

 [ext_resource type="Script" path="res://Scripts/SingleShot.cs" id="1_18l5k"]
+[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"]

 [sub_resource type="CylinderShape3D" id="CylinderShape3D_njobr"]
@@ -9,6 +10,7 @@ radius = 0.3
 [node name="Single" type="Node3D"]
 script = ExtResource("1_18l5k")
 Cooldown = 0.3
+_soundEffect = ExtResource("2_7lbn3")
 _projectileSpeed = 10.0

 [node name="RigidBody3D" type="RigidBody3D" parent="."]
--- a/Scenes/Weapons/SingleShot.tscn
+++ b/Scenes/Weapons/SingleShot.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=4 format=3 uid="uid://bwkp1ff25acp1"]
+[gd_scene load_steps=4 format=3 uid="uid://cishm1jtcbqaw"]

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