GameJammer/GameJam2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix various issues

Browse Source
This commit is contained in:
Zenny
2023-09-12 09:35:00 -07:00
parent a5d36734ef
commit 37180e2def
21 changed files with 247 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Levels/Scenes/Level2.tscn
View File

@@ -22,7 +22,7 @@ size = Vector3(5, 20, 27.822)
size = Vector3(1, 1.0878, 0.909629)
[sub_resource type="BoxShape3D" id="BoxShape3D_3fmyi"]
size = Vector3(1.01672, 1.53478, 5.31772)
size = Vector3(1.01672, 1.53478, 5.06912)
[sub_resource type="BoxShape3D" id="BoxShape3D_d3tdv"]
size = Vector3(1.01556, 1.80238, 7.12857)
@@ -31,7 +31,7 @@ size = Vector3(1.01556, 1.80238, 7.12857)
size = Vector3(2.51995, 1.80782, 1)
[sub_resource type="BoxShape3D" id="BoxShape3D_ccgpo"]
size = Vector3(1.81712, 1.43756, 8.27492)
size = Vector3(1.57333, 1.43756, 8.27492)
[node name="Level2" type="Node3D" groups=["Level"]]
process_mode = 3
@@ -101,7 +101,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.510721, 0.196356, -3.73385
shape = SubResource("BoxShape3D_15sb2")
[node name="CollisionShape3D6" type="CollisionShape3D" parent="Collisions"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.539914, 0, 0.307289)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.539914, 0, 0.409884)
shape = SubResource("BoxShape3D_3fmyi")
[node name="CollisionShape3D7" type="CollisionShape3D" parent="Collisions"]

13
Levels/Scenes/Level3.tscn
View File

@@ -411,6 +411,7 @@ size = Vector3(1.31359, 2.38677, 1.56842)
[node name="Level3" type="Node3D" groups=["Level"]]
process_mode = 3
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.100843, 0, 0)
script = ExtResource("1_1xwm7")
[node name="STAGE 3" type="Node3D" parent="."]
@@ -450,22 +451,22 @@ libraries = {
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.380475, 0)
[node name="RangedEnemy" parent="Enemies" instance=ExtResource("5_8b1ug")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.88431, 0, -5.01806)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.66723, 0, -5.01806)
[node name="RangedEnemy2" parent="Enemies" instance=ExtResource("5_8b1ug")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.92009, 0, -3.45365)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.70301, 0, -3.45365)
[node name="RangedEnemy3" parent="Enemies" instance=ExtResource("5_8b1ug")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.9633, 0, -2.02987)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.74622, 0, -2.02987)
[node name="RangedEnemy4" parent="Enemies" instance=ExtResource("5_8b1ug")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.04326, 0, -0.934418)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.82618, 0, -0.934418)
[node name="MeleeEnemyOrb" parent="Enemies" instance=ExtResource("6_b7xn3")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.08149, 0, 0.325685)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.86441, 0, 0.325685)
[node name="MeleeEnemyOrb2" parent="Enemies" instance=ExtResource("6_b7xn3")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.14518, 0, 1.65492)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.9281, 0, 1.65492)
[node name="RangedEnemy5" parent="Enemies" instance=ExtResource("5_8b1ug")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.99163, 0, -3.39695)

66
Levels/Scenes/Level4.tscn
View File

@@ -35,7 +35,7 @@ size = Vector3(5, 20, 27.822)
size = Vector3(5, 20, 27.822)
[sub_resource type="BoxShape3D" id="BoxShape3D_5qrun"]
size = Vector3(3.244, 10, 3.17)
size = Vector3(3.244, 5.0593, 3.17)
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_5mnb2"]
resource_name = "Material.001"
@@ -45,6 +45,7 @@ alpha_antialiasing_mode = 0
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_color = Color(0, 0, 0, 1)
metallic = 1.0
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_0yy7f"]
resource_name = "Material.003"
@@ -57,7 +58,6 @@ resource_name = "Material.022"
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_color = Color(0, 0, 0, 1)
roughness = 0.5
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_vnp6j"]
resource_name = "Material.025"
@@ -70,7 +70,6 @@ resource_name = "Material.024"
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_color = Color(0, 0, 0, 1)
roughness = 0.5
[sub_resource type="ArrayMesh" id="ArrayMesh_innp1"]
_surfaces = [{
@@ -224,12 +223,14 @@ shadow_mesh = SubResource("ArrayMesh_iabwd")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_yff5r"]
resource_name = "Material.005"
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("6_u54xf")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_lq31e"]
resource_name = "Material.006"
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("7_e155e")
@@ -237,12 +238,14 @@ roughness = 0.5
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_kg8cv"]
resource_name = "Material.007"
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("8_pv0jt")
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_qocbi"]
resource_name = "Material.008"
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("9_57fec")
@@ -250,6 +253,7 @@ roughness = 0.5
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_cxkmp"]
resource_name = "Material.009"
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("10_5awpo")
@@ -257,6 +261,7 @@ roughness = 0.5
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_oci18"]
resource_name = "Material.010"
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("11_lecpt")
@@ -264,9 +269,7 @@ roughness = 0.5
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_inn1i"]
resource_name = "Material.011"
transparency = 2
alpha_scissor_threshold = 0.5
alpha_antialiasing_mode = 0
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("12_dmqnu")
@@ -274,6 +277,7 @@ roughness = 0.5
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_l3r5c"]
resource_name = "Material.012"
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("13_p4lg5")
@@ -281,6 +285,7 @@ roughness = 0.5
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_4lt6h"]
resource_name = "Material.013"
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("14_vy0xd")
@@ -288,6 +293,7 @@ roughness = 0.5
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_xf2r3"]
resource_name = "Material.014"
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("15_w5cbh")
@@ -295,6 +301,7 @@ roughness = 0.5
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_x4m66"]
resource_name = "Material.015"
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("9_57fec")
@@ -302,9 +309,7 @@ roughness = 0.5
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ogq2g"]
resource_name = "Material.016"
transparency = 2
alpha_scissor_threshold = 0.5
alpha_antialiasing_mode = 0
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("16_2qqmx")
@@ -312,6 +317,7 @@ roughness = 0.5
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_m3vpq"]
resource_name = "Material.017"
transparency = 1
cull_mode = 2
vertex_color_use_as_albedo = true
albedo_texture = ExtResource("17_3idst")
@@ -803,7 +809,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.505, -0.358024, 1.095)
script = ExtResource("1_gkcpw")
[node name="Enemies" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.7046, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.341564, -0.707, -0.316941)
[node name="MeleeEnemyOrb" parent="Enemies" instance=ExtResource("4_np1us")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.13385, 0, 0.371333)
@@ -864,64 +870,73 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -1.22039)
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)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.03, 2.71587, 0)
shape = SubResource("BoxShape3D_7qgo5")
[node name="CollisionShape3D2" type="CollisionShape3D" parent="StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.81573, 0, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8.61537, 0, 0)
shape = SubResource("BoxShape3D_ooasb")
[node name="CollisionShape3D3" type="CollisionShape3D" parent="StaticBody3D"]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 2.43488, -8.5122)
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 2.43488, -6.81151)
shape = SubResource("BoxShape3D_aaw7g")
[node name="CollisionShape3D4" type="CollisionShape3D" parent="StaticBody3D"]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 9.03101)
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 12.1027)
shape = SubResource("BoxShape3D_omips")
[node name="CollisionShape3D5" type="CollisionShape3D" parent="StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.93058, -2.24614, -4.79498)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.37433, -2.24614, -3.56982)
shape = SubResource("BoxShape3D_5qrun")
[node name="CollisionShape3D6" type="CollisionShape3D" parent="StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.67572, -2.24614, -4.79498)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.23197, -2.24614, -3.56982)
shape = SubResource("BoxShape3D_5qrun")
[node name="Exit Portal" parent="." instance=ExtResource("3_wflo5")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.481772, -0.12655, -4.85299)
[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="STAGE 4 final" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.135092, 1.13298)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.847963, -0.287248, 2.28422)
[node name="Plane" type="MeshInstance3D" parent="STAGE 4 final"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0966516, 0, -1.18466)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.50716, 0.15796, -2.3124)
mesh = SubResource("ArrayMesh_rd6yo")
skeleton = NodePath("")
[node name="Circle" type="MeshInstance3D" parent="STAGE 4 final"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.152571, 0.124069, 0.00191349)
transform = Transform3D(-0.449436, 0, -0.893313, 0, 1, 0, 0.893313, 0, -0.449436, 0.257937, 0.28203, -1.12583)
mesh = SubResource("ArrayMesh_1b6jf")
skeleton = NodePath("")
[node name="Plane_001" type="MeshInstance3D" parent="STAGE 4 final"]
transform = Transform3D(0.937709, 0, 0, 0, 1, 0, 0, 0, 1, -0.0912335, 0.0786147, 0.00649853)
transform = Transform3D(-0.42144, 0, 0.893313, 0, 1, 0, -0.837667, 0, -0.449436, 0.319275, 0.236575, -1.12124)
mesh = SubResource("ArrayMesh_c4efb")
skeleton = NodePath("")
[node name="oxface" type="MeshInstance3D" parent="STAGE 4 final"]
transform = Transform3D(0.690153, 0, 0, 0, 0.690153, 0, 0, 0, 0.690153, 4.10002, 1.59775, -6.14638)
transform = Transform3D(-0.310179, 0, -0.616522, 0, 0.690153, 0, 0.616522, 0, -0.310179, 4.51053, 1.75571, -7.27413)
mesh = SubResource("ArrayMesh_oeul8")
skeleton = NodePath("")
[node name="horsehead" type="MeshInstance3D" parent="STAGE 4 final"]
transform = Transform3D(0.746961, 0, 0, 0, 0.746961, 0, 0, 0, 0.746961, -4.28265, 1.57514, -6.14861)
transform = Transform3D(-0.335711, 0, 0.66727, 0, 0.746961, 0, -0.66727, 0, -0.335711, -3.87214, 1.7331, -7.27635)
mesh = SubResource("ArrayMesh_igw1j")
skeleton = NodePath("")
[node name="Circle_001" type="MeshInstance3D" parent="STAGE 4 final"]
transform = Transform3D(-4.74551, 0, 0, 0, -4.74551, 0, 0, 0, -4.74551, -0.0650039, 0.026309, -0.0410134)
transform = Transform3D(2.1328, 0, -4.23922, 0, -4.74551, 0, 4.23922, 0, 2.1328, 0.345504, 0.184269, -1.16876)
mesh = SubResource("ArrayMesh_ox0hg")
skeleton = NodePath("")
[node name="Circle_002" type="MeshInstance3D" parent="STAGE 4 final"]
transform = Transform3D(-4.74551, 0, 0, 0, -4.74551, 0, 0, 0, -4.74551, -0.165268, 0.0788137, 0.00132829)
transform = Transform3D(2.1328, 0, 4.23922, 0, -4.74551, 0, -4.23922, 0, 2.1328, 0.245241, 0.236774, -1.12641)
mesh = SubResource("ArrayMesh_pcbqa")
skeleton = NodePath("")
@@ -930,6 +945,3 @@ autoplay = "Animation"
libraries = {
"": SubResource("AnimationLibrary_biich")
}
[node name="Exit Portal" parent="." instance=ExtResource("3_wflo5")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.174136, -4.61389)

94
Levels/Scenes/Level5.tscn
View File

File diff suppressed because one or more lines are too long