goodbye collisions

2023-09-07 20:03:22 -07:00
parent 4b840bbe7f
commit 833ad3209e
37 changed files with 410 additions and 299 deletions
--- a/Levels/DoorShader.tres
+++ b/Levels/DoorShader.tres
@@ -1,8 +0,0 @@
-[gd_resource type="ShaderMaterial" load_steps=2 format=3 uid="uid://blksoavfhtf06"]
-
-[ext_resource type="Shader" path="res://Levels/Scenes/Door.gdshader" id="1_by6f6"]
-
-[resource]
-render_priority = 1
-shader = ExtResource("1_by6f6")
-shader_parameter/albedo = null
--- a/Levels/ExitPortal.tscn
+++ b/Levels/ExitPortal.tscn
@@ -102,8 +102,8 @@ libraries = {
 }

 [node name="Area3D" type="Area3D" parent="." index="4"]
-collision_layer = 8
-collision_mask = 8
+collision_layer = 0
+collision_mask = 0
 script = ExtResource("2_4y188")

 [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D" index="0"]
--- a/Levels/Models/Stage2/stage_2Collisions.tscn
+++ b/Levels/Models/Stage2/stage_2Collisions.tscn
@@ -19,6 +19,8 @@ cast_shadow = 0
 cast_shadow = 0

 [node name="StaticBody3D" type="StaticBody3D" parent="Cube" index="0"]
+collision_layer = 0
+collision_mask = 0

 [node name="CollisionShape3D" type="CollisionShape3D" parent="Cube/StaticBody3D" index="0"]
 shape = SubResource("ConcavePolygonShape3D_sdbt6")
@@ -27,6 +29,8 @@ shape = SubResource("ConcavePolygonShape3D_sdbt6")
 cast_shadow = 0

 [node name="StaticBody3D" type="StaticBody3D" parent="Cube002" index="0"]
+collision_layer = 0
+collision_mask = 0

 [node name="CollisionShape3D" type="CollisionShape3D" parent="Cube002/StaticBody3D" index="0"]
 shape = SubResource("ConcavePolygonShape3D_giapi")
--- a/Levels/Scenes/Level1.tscn
+++ b/Levels/Scenes/Level1.tscn
@@ -30,7 +30,7 @@ script = ExtResource("1_k32xj")
 transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, -0.568617, 0, -3.01859)
 disable_mode = 2
 collision_layer = 0
-collision_mask = 16
+collision_mask = 0

 [node name="Exit Portal" parent="Area3D2" instance=ExtResource("6_gegi6")]
 transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, 0.599727, -1.96144)
@@ -41,15 +41,6 @@ shape = SubResource("CylinderShape3D_kv6vl")

 [node name="STAGE 1" parent="." instance=ExtResource("6_60jd6")]

-[node name="Camera3D" type="Camera3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.37194, 6.02102)
-
-[node name="Camera3D2" 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
-
 [node name="Enemies" type="Node3D" parent="."]

 [node name="MeleeEnemyOrb" parent="Enemies" instance=ExtResource("4_7eukt")]
@@ -73,12 +64,9 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.08228, 0, -0.694794)
 [node name="RangedEnemy6" parent="Enemies" instance=ExtResource("2_fyxib")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.78224, 0, -0.525299)

-[node name="Camera3D3" 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
-size = 10.8546
-
 [node name="StaticBody3D" type="StaticBody3D" parent="."]
+collision_layer = 0
+collision_mask = 0

 [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.52066, 2.71587, 0)
--- a/Levels/Scenes/Level10.tscn
+++ b/Levels/Scenes/Level10.tscn
@@ -75,6 +75,8 @@ MaximumHP = 10000000
 _healthBar = NodePath("../../FinalBossGUI/TextureProgressBar")

 [node name="StaticBody3D" type="StaticBody3D" parent="."]
+collision_layer = 0
+collision_mask = 0

 [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.52066, 2.71587, 0)
--- a/Levels/Scenes/Level2.tscn
+++ b/Levels/Scenes/Level2.tscn
@@ -29,7 +29,7 @@ script = ExtResource("1_rkcp4")
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.43759, 0, -2.42354)
 disable_mode = 2
 collision_layer = 0
-collision_mask = 16
+collision_mask = 0

 [node name="Exit Portal" parent="Area3D2" instance=ExtResource("2_sq8bv")]
 transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, -0.0428823, 0, 3.24448)
@@ -79,6 +79,8 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.12321, -0.521506, -1.78045)
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.2018, -0.521506, -0.0385171)

 [node name="StaticBody3D" type="StaticBody3D" parent="."]
+collision_layer = 0
+collision_mask = 0

 [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.52066, 2.71587, 0)
--- a/Levels/Scenes/Level3.tscn
+++ b/Levels/Scenes/Level3.tscn
@@ -1,14 +1,14 @@
-[gd_scene load_steps=43 format=3 uid="uid://btl5fdyjewnwc"]
+[gd_scene load_steps=44 format=3 uid="uid://btl5fdyjewnwc"]

 [ext_resource type="Script" path="res://Levels/Scripts/Level3.cs" id="1_wxr87"]
 [ext_resource type="PackedScene" uid="uid://jgf7k1r35km1" path="res://Levels/ExitPortal.tscn" id="3_2t766"]
 [ext_resource type="Texture2D" uid="uid://cjtoysyxjtkmy" path="res://Levels/Models/Stage3/STAGE 3_LIon Marquee_2320x920.png" id="3_4jiij"]
 [ext_resource type="Texture2D" uid="uid://cpku414yrxoil" path="res://Levels/Models/Stage3/STAGE 3_hell.png" id="3_gsb68"]
 [ext_resource type="Texture2D" uid="uid://vdkesbxukpqs" path="res://Levels/Models/Stage3/STAGE 3_1000_F_118943936_75dpkeRbB60RZZzrWsFPL7BC2dxGUdtR.png" id="4_qilgn"]
-[ext_resource type="Material" uid="uid://blksoavfhtf06" path="res://Levels/DoorShader.tres" id="5_1a65w"]
 [ext_resource type="PackedScene" uid="uid://dahp73fwld24h" path="res://Enemies/RangedEnemy.tscn" id="5_8b1ug"]
 [ext_resource type="Texture2D" uid="uid://33cgwfy7mqcg" path="res://Levels/Models/Stage3/STAGE 3_LIon Marquee_2320x920_2.png" id="5_kwy6o"]
 [ext_resource type="PackedScene" uid="uid://bt5rolsyjmx55" path="res://Enemies/MeleeEnemy.tscn" id="6_b7xn3"]
+[ext_resource type="Shader" path="res://Levels/Scenes/Door.gdshader" id="9_05wf0"]

 [sub_resource type="CylinderShape3D" id="CylinderShape3D_j26hn"]
 radius = 0.957319
@@ -349,6 +349,11 @@ _surfaces = [{
 blend_shape_mode = 0
 shadow_mesh = SubResource("ArrayMesh_sjtoo")

+[sub_resource type="ShaderMaterial" id="ShaderMaterial_d6sjv"]
+render_priority = 1
+shader = ExtResource("9_05wf0")
+shader_parameter/albedo = null
+
 [sub_resource type="Animation" id="Animation_uk6to"]
 resource_name = "HitFlash"
 length = 0.2
@@ -362,7 +367,7 @@ tracks/0/keys = {
 "times": PackedFloat32Array(0, 0.2),
 "transitions": PackedFloat32Array(1, 1),
 "update": 1,
-"values": [null, ExtResource("5_1a65w")]
+"values": [null, SubResource("ShaderMaterial_d6sjv")]
 }
 tracks/1/type = "value"
 tracks/1/imported = false
@@ -422,7 +427,7 @@ AnimationPlayer = NodePath("Door/AnimationPlayer")
 transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, 0.993156, -1.67434)
 disable_mode = 2
 collision_layer = 0
-collision_mask = 16
+collision_mask = 0

 [node name="Exit Portal" parent="Area3D2" instance=ExtResource("3_2t766")]
 transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, -0.786783, -1.06704, -4.22407)
@@ -435,6 +440,8 @@ shape = SubResource("CylinderShape3D_j26hn")
 transform = Transform3D(1.09, 0, 0, 0, 1.09, 0, 0, 0, 1.09, 0, 0, -0.528128)

 [node name="Cube002@StaticBody3D" type="StaticBody3D" parent="STAGE 3"]
+collision_layer = 0
+collision_mask = 0

 [node name="CollisionShape3D" type="CollisionShape3D" parent="STAGE 3/Cube002@StaticBody3D"]
 shape = SubResource("ConcavePolygonShape3D_amx5s")
@@ -453,6 +460,9 @@ mesh = SubResource("ArrayMesh_ae5pk")
 skeleton = NodePath("")

 [node name="StaticBody3D" type="StaticBody3D" parent="STAGE 3/Cube"]
+disable_mode = 1
+collision_layer = 0
+collision_mask = 0

 [node name="CollisionShape3D" type="CollisionShape3D" parent="STAGE 3/Cube/StaticBody3D"]
 shape = SubResource("ConcavePolygonShape3D_qdpti")
@@ -464,6 +474,8 @@ mesh = SubResource("ArrayMesh_6dg1r")
 skeleton = NodePath("")

 [node name="StaticBody3D" type="StaticBody3D" parent="STAGE 3/Cube001"]
+collision_layer = 0
+collision_mask = 0

 [node name="CollisionShape3D" type="CollisionShape3D" parent="STAGE 3/Cube001/StaticBody3D"]
 shape = SubResource("ConcavePolygonShape3D_cctvu")
@@ -480,12 +492,6 @@ libraries = {
 "": SubResource("AnimationLibrary_ohisj")
 }

-[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
-
 [node name="Enemies" type="Node3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.380475, 0)

@@ -568,6 +574,8 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.40391, 0, 0.157687)
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.4263, 0, 1.29951)

 [node name="StaticBody3D" type="StaticBody3D" parent="."]
+collision_layer = 0
+collision_mask = 0

 [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.42651, 2.71587, 0)
@@ -598,6 +606,8 @@ libraries = {

 [node name="StaticBody3D" type="StaticBody3D" parent="Door"]
 transform = Transform3D(0.727802, 7.58209e-08, 2.11147e-07, -1.0934e-07, -0.634404, 0.60469, -3.80919e-06, 9.32367, 9.78183, 0.407569, 0.378925, -7.67854)
+collision_layer = 0
+collision_mask = 0

 [node name="CollisionShape3D5" type="CollisionShape3D" parent="Door/StaticBody3D"]
 transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.571146, 0.810928, 0.294388)
@@ -605,7 +615,8 @@ shape = SubResource("BoxShape3D_yew2s")

 [node name="Door Hitbox" type="Area3D" parent="Door/StaticBody3D"]
 transform = Transform3D(1, -2.84217e-14, -1.27055e-21, 2.84217e-14, 1, 2.98023e-08, 4.26326e-14, 2.98023e-08, 1, 5.0822e-21, -1.19209e-07, -3.55271e-15)
-collision_mask = 2
+collision_layer = 0
+collision_mask = 0

 [node name="CollisionShape3D5" type="CollisionShape3D" parent="Door/StaticBody3D/Door Hitbox"]
 transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.571146, 0.810928, 0.294388)
--- a/Levels/Scenes/Level4.tscn
+++ b/Levels/Scenes/Level4.tscn
@@ -786,7 +786,7 @@ script = ExtResource("1_gkcpw")
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.174136, -1.52969)
 disable_mode = 2
 collision_layer = 0
-collision_mask = 16
+collision_mask = 0

 [node name="Exit Portal" parent="Area3D2" instance=ExtResource("3_wflo5")]
 transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, 0, -2.53252)
@@ -900,6 +900,8 @@ libraries = {

 [node name="StaticBody3D" type="StaticBody3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1.22039)
+collision_layer = 0
+collision_mask = 0

 [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.01032, 2.71587, 0)
--- a/Levels/Scenes/Level5.tscn
+++ b/Levels/Scenes/Level5.tscn
@@ -25,7 +25,7 @@ process_mode = 3
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.94617, 0, -1.55156)
 disable_mode = 2
 collision_layer = 0
-collision_mask = 16
+collision_mask = 0

 [node name="Exit Portal" parent="Area3D2" instance=ExtResource("3_0wdh0")]
 transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, 0, -2.53252)
@@ -37,6 +37,8 @@ shape = SubResource("CylinderShape3D_wu0in")
 [node name="STAGE 6" parent="." instance=ExtResource("3_ajkvk")]

 [node name="StaticBody3D" type="StaticBody3D" parent="."]
+collision_layer = 0
+collision_mask = 0

 [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.52066, 2.71587, 0)
--- a/Levels/Scenes/Level6.tscn
+++ b/Levels/Scenes/Level6.tscn
@@ -27,7 +27,7 @@ script = ExtResource("1_o0w6s")
 transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, -0.0656219, 0, -3.04094)
 disable_mode = 2
 collision_layer = 0
-collision_mask = 16
+collision_mask = 0

 [node name="Exit Portal" parent="Area3D2" instance=ExtResource("3_ehcts")]
 transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, 0, -2.53252)
@@ -39,6 +39,8 @@ shape = SubResource("CylinderShape3D_a8pxa")
 [node name="STAGE 5" parent="." instance=ExtResource("3_yun3r")]

 [node name="StaticBody3D" type="StaticBody3D" parent="."]
+collision_layer = 0
+collision_mask = 0

 [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.52066, 2.71587, 0)
--- a/Levels/Scenes/Level7.tscn
+++ b/Levels/Scenes/Level7.tscn
@@ -25,7 +25,7 @@ process_mode = 3
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.484857, 0.090312, -2.51937)
 disable_mode = 2
 collision_layer = 0
-collision_mask = 16
+collision_mask = 0

 [node name="Exit Portal" parent="Area3D2" instance=ExtResource("3_sjnhq")]
 transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, 0.0799288, -1.92508)
@@ -37,13 +37,9 @@ shape = SubResource("CylinderShape3D_a56hv")
 [node name="STAGE 7" parent="." instance=ExtResource("2_21i6n")]
 transform = Transform3D(1.04, 0, 0, 0, 1.04, 0, 0, 0, 1.04, -0.601425, 0, 0)

-[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
-
 [node name="StaticBody3D" type="StaticBody3D" parent="."]
+collision_layer = 0
+collision_mask = 0

 [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.80235, 2.71587, 0)
--- a/Levels/Scenes/Level8.tscn
+++ b/Levels/Scenes/Level8.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=9 format=3 uid="uid://c4xcka4ekuur8"]
+[gd_scene load_steps=8 format=3 uid="uid://c4xcka4ekuur8"]

 [ext_resource type="PackedScene" uid="uid://b6ciyf30f07ll" path="res://Levels/Models/Stage8/STAGE 8.glb" id="2_wcvbl"]
 [ext_resource type="PackedScene" uid="uid://jgf7k1r35km1" path="res://Levels/ExitPortal.tscn" id="3_44edv"]
@@ -6,8 +6,6 @@
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_3ne7n"]
 radius = 0.957319

-[sub_resource type="SpriteFrames" id="SpriteFrames_16emx"]
-
 [sub_resource type="BoxShape3D" id="BoxShape3D_3n0wx"]
 size = Vector3(5, 20, 27.822)

@@ -27,7 +25,7 @@ process_mode = 3
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1.47544)
 disable_mode = 2
 collision_layer = 0
-collision_mask = 16
+collision_mask = 0

 [node name="Exit Portal" parent="Area3D2" instance=ExtResource("3_44edv")]
 transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, 0, -2.53252)
@@ -36,12 +34,11 @@ transform = Transform3D(0.7, 0, 0, 0, 0.7, 0, 0, 0, 0.7, 0, 0, -2.53252)
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.17404, -2.51823)
 shape = SubResource("CylinderShape3D_3ne7n")

-[node name="AnimatedSprite3D" type="AnimatedSprite3D" parent="."]
-sprite_frames = SubResource("SpriteFrames_16emx")
-
 [node name="STAGE 8" parent="." instance=ExtResource("2_wcvbl")]

 [node name="StaticBody3D" type="StaticBody3D" parent="."]
+collision_layer = 0
+collision_mask = 0

 [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.52066, 2.71587, 0)
--- a/Levels/Scenes/Level9.tscn
+++ b/Levels/Scenes/Level9.tscn
@@ -19,6 +19,8 @@ size = Vector3(5, 20, 27.822)
 [node name="STAGE 9" parent="." instance=ExtResource("1_ami18")]

 [node name="StaticBody3D" type="StaticBody3D" parent="."]
+collision_layer = 0
+collision_mask = 0

 [node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.52066, 2.71587, 0)