More tweaks but broke the enemy script

This commit is contained in:
derek
2024-12-03 13:27:44 -06:00
parent 299257e0d9
commit ad11da38f8
23 changed files with 194 additions and 86 deletions

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=112 format=4 uid="uid://6agmt1hqlhww"]
[gd_scene load_steps=113 format=4 uid="uid://6agmt1hqlhww"]
[ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_sbpvn"]
[ext_resource type="PackedScene" uid="uid://brl0bsqjl5dg3" path="res://assets/mac_10.tscn" id="2_fn4vb"]
@@ -24,6 +24,7 @@
[ext_resource type="PackedScene" uid="uid://cnfc8rtk6l1d8" path="res://assets/crate1.tscn" id="12_30nle"]
[ext_resource type="PackedScene" uid="uid://dt4t2a48204v1" path="res://assets/spikes_1.tscn" id="12_w4dk0"]
[ext_resource type="Script" path="res://scripts/room_manager.gd" id="13_84vop"]
[ext_resource type="PackedScene" uid="uid://bessq6hl7qsh8" path="res://assets/stats.tscn" id="13_gu6tc"]
[ext_resource type="PackedScene" uid="uid://cgo4qyul7ix5p" path="res://assets/ladder.tscn" id="13_qu8oi"]
[ext_resource type="PackedScene" uid="uid://cdpxctwwi12j" path="res://assets/ladder_collision_check.tscn" id="14_gijx0"]
[ext_resource type="PackedScene" uid="uid://b3t8fra7evqfb" path="res://assets/Models/building_1.tscn" id="15_ds1t8"]
@@ -1160,6 +1161,9 @@ shape = SubResource("ConcavePolygonShape3D_eyfj3")
[node name="Spikes 1" parent="NavigationRegion3D" instance=ExtResource("12_w4dk0")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -27.1833, -5.75175, 34.3513)
[node name="Stats" parent="NavigationRegion3D" instance=ExtResource("13_gu6tc")]
transform = Transform3D(0.0198257, 0, 0.999803, 0, 1, 0, -0.999803, 0, 0.0198257, -3.96477, 2.13145, 11.1771)
[node name="Room1" type="Node" parent="."]
script = ExtResource("13_84vop")
room_lockdown = true

View File

@@ -1,8 +1,7 @@
[gd_scene load_steps=20 format=4 uid="uid://bdy5isxqwbjq8"]
[gd_scene load_steps=19 format=4 uid="uid://bdy5isxqwbjq8"]
[ext_resource type="Script" path="res://scripts/broken_object_spawn.gd" id="1_3nyc3"]
[ext_resource type="AudioStream" uid="uid://bn4y63ws8jscs" path="res://assets/Audio/glass-break-two-thick-glasses-SBA-300121605.wav" id="1_vmlqu"]
[ext_resource type="Script" path="res://scripts/rigidbody_generic.gd" id="2_hod7s"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_3phni"]
resource_name = "bottle1"
@@ -203,7 +202,6 @@ sound = NodePath("Piece 1/BrokenSound")
[node name="Piece 1" type="RigidBody3D" parent="." groups=["scene_rigidbody"]]
collision_layer = 32
collision_mask = 125
script = ExtResource("2_hod7s")
[node name="bottle1_broken_cell" type="MeshInstance3D" parent="Piece 1" groups=["scene_rigidbody"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.066139, 0.324223, -0.067418)
@@ -220,7 +218,6 @@ stream = ExtResource("1_vmlqu")
[node name="Piece 2" type="RigidBody3D" parent="." groups=["scene_rigidbody"]]
collision_layer = 32
collision_mask = 125
script = ExtResource("2_hod7s")
[node name="bottle1_broken_cell_001" type="MeshInstance3D" parent="Piece 2" groups=["scene_rigidbody"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00347066, -0.310987, 0.106893)
@@ -234,7 +231,6 @@ shape = SubResource("ConvexPolygonShape3D_2ytqg")
[node name="Piece 3" type="RigidBody3D" parent="." groups=["scene_rigidbody"]]
collision_layer = 32
collision_mask = 125
script = ExtResource("2_hod7s")
[node name="bottle1_broken_cell_002" type="MeshInstance3D" parent="Piece 3" groups=["scene_rigidbody"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0177096, 0.440996, 0.0680487)
@@ -248,7 +244,6 @@ shape = SubResource("ConvexPolygonShape3D_78sq8")
[node name="Piece 4" type="RigidBody3D" parent="." groups=["scene_rigidbody"]]
collision_layer = 32
collision_mask = 125
script = ExtResource("2_hod7s")
[node name="bottle1_broken_cell_003" type="MeshInstance3D" parent="Piece 4" groups=["scene_rigidbody"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.000561402, -0.247355, -0.010017)
@@ -262,7 +257,6 @@ shape = SubResource("ConvexPolygonShape3D_xqauf")
[node name="Piece 5" type="RigidBody3D" parent="." groups=["scene_rigidbody"]]
collision_layer = 32
collision_mask = 125
script = ExtResource("2_hod7s")
[node name="bottle1_broken_cell_004" type="MeshInstance3D" parent="Piece 5" groups=["scene_rigidbody"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.030646, 0.558282, -0.0404844)

View File

@@ -108,7 +108,7 @@ _data = {
[sub_resource type="SphereShape3D" id="SphereShape3D_8rss4"]
radius = 2.0
[node name="Crown" type="Node3D" groups=["persist"]]
[node name="Crown" type="Node3D"]
script = ExtResource("1_imbjk")
[node name="Cylinder" type="MeshInstance3D" parent="."]

View File

@@ -171,7 +171,7 @@ script = ExtResource("7_pnp4a")
[node name="BulletRay" type="RayCast3D" parent="Head/Recoil/Camera3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.487738)
target_position = Vector3(0, 0, -200)
collision_mask = 105
collision_mask = 233
collide_with_areas = true
script = ExtResource("10_ektr6")

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=76 format=4 uid="uid://djr7vnr1hcx82"]
[gd_scene load_steps=75 format=4 uid="uid://djr7vnr1hcx82"]
[ext_resource type="Script" path="res://scripts/spider.gd" id="1_7e7fe"]
[ext_resource type="Texture2D" uid="uid://dmyn4eq2r12ue" path="res://assets/Models/spider1.albedoRAW.png" id="1_di6b8"]
@@ -816,9 +816,6 @@ _surfaces = [{
[sub_resource type="BoxShape3D" id="BoxShape3D_xxx55"]
size = Vector3(0.816284, 0.725159, 0.75531)
[sub_resource type="SphereShape3D" id="SphereShape3D_v8dp4"]
radius = 0.201
[node name="spider" type="CharacterBody3D" groups=["enemy", "persist"]]
collision_layer = 8
collision_mask = 9
@@ -1013,10 +1010,6 @@ mesh = SubResource("ArrayMesh_v85cv")
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0258179, 1.03281, 0.00894165)
shape = SubResource("BoxShape3D_xxx55")
[node name="CollisionShape3D2" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.33052, 0.429336)
shape = SubResource("SphereShape3D_v8dp4")
[node name="NavigationAgent3D" type="NavigationAgent3D" parent="."]
path_height_offset = 0.5
avoidance_enabled = true

24
assets/stats.tscn Normal file
View File

@@ -0,0 +1,24 @@
[gd_scene load_steps=3 format=3 uid="uid://bessq6hl7qsh8"]
[ext_resource type="Script" path="res://scripts/stat_display.gd" id="1_q47is"]
[ext_resource type="FontFile" uid="uid://d2h2tjhxiv5wo" path="res://assets/fonts/White On Black.ttf" id="2_mtulh"]
[node name="Stats" type="Node3D"]
script = ExtResource("1_q47is")
[node name="Kills" type="Label3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.423311, 0)
text = "Test"
font = ExtResource("2_mtulh")
horizontal_alignment = 0
[node name="Deaths" type="Label3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.218421, 0)
text = "Test"
font = ExtResource("2_mtulh")
horizontal_alignment = 0
[node name="Shots Fired" type="Label3D" parent="."]
text = "Test"
font = ExtResource("2_mtulh")
horizontal_alignment = 0

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=10 format=3 uid="uid://rcixv0spjpvw"]
[gd_scene load_steps=10 format=3 uid="uid://lq83kek13sfy"]
[ext_resource type="Script" path="res://scripts/tracker_marker.gd" id="1_pi8qa"]