Guns and Reviving added - Other minor Bugfixes.

This commit is contained in:
Patrick 2024-12-19 17:41:41 +01:00
parent 8c90c4e744
commit 139e9a5134
11 changed files with 317 additions and 47 deletions

View file

@ -0,0 +1,23 @@
[gd_scene load_steps=4 format=3 uid="uid://bdxw7gc28nv6a"]
[ext_resource type="Script" path="res://scripts/entities/bullet.gd" id="1_di2ph"]
[sub_resource type="BoxMesh" id="BoxMesh_gbwh0"]
size = Vector3(0.1, 0.1, 0.2)
[sub_resource type="BoxShape3D" id="BoxShape3D_26n4t"]
size = Vector3(0.1, 0.1, 0.2)
[node name="Bullet" type="CharacterBody3D"]
script = ExtResource("1_di2ph")
[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
mesh = SubResource("BoxMesh_gbwh0")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
shape = SubResource("BoxShape3D_26n4t")
[node name="Timer" type="Timer" parent="."]
wait_time = 5.0
one_shot = true
autostart = true

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=4 format=3 uid="uid://dpdxe3muj2o26"]
[gd_scene load_steps=6 format=3 uid="uid://dpdxe3muj2o26"]
[ext_resource type="Script" path="res://scripts/entities/player.gd" id="1_r7f2r"]
@ -6,6 +6,12 @@
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_7frjr"]
[sub_resource type="BoxShape3D" id="BoxShape3D_flq6p"]
size = Vector3(3, 3, 3)
[sub_resource type="CapsuleMesh" id="CapsuleMesh_1sd1e"]
radius = 0.125
[node name="Player" type="CharacterBody3D"]
script = ExtResource("1_r7f2r")
@ -18,6 +24,16 @@ shape = SubResource("CapsuleShape3D_7frjr")
[node name="Camera3D" type="Camera3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0)
[node name="InteractDialog" type="Label" parent="."]
anchors_preset = 5
anchor_left = 0.5
anchor_right = 0.5
offset_left = -20.0
offset_right = 20.0
offset_bottom = 23.0
grow_horizontal = 2
size_flags_horizontal = 4
[node name="Label" type="Label" parent="."]
offset_right = 40.0
offset_bottom = 23.0
@ -28,3 +44,13 @@ pixel_size = 0.01
billboard = 1
no_depth_test = true
text = "SamplePlayer"
[node name="Area3D" type="Area3D" parent="."]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"]
shape = SubResource("BoxShape3D_flq6p")
[node name="Gun" type="MeshInstance3D" parent="."]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0.625, 0, -0.5)
visible = false
mesh = SubResource("CapsuleMesh_1sd1e")

View file

@ -0,0 +1,31 @@
[gd_scene load_steps=6 format=3 uid="uid://ctpubhh2gsccb"]
[ext_resource type="Script" path="res://scripts/maps/guncase.gd" id="1_dh5qf"]
[sub_resource type="BoxShape3D" id="BoxShape3D_g6om3"]
size = Vector3(2, 0.5, 0.5)
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_wgwuf"]
albedo_color = Color(0, 0.501961, 0, 1)
[sub_resource type="BoxMesh" id="BoxMesh_qtnys"]
material = SubResource("StandardMaterial3D_wgwuf")
size = Vector3(2, 0.5, 0.5)
[sub_resource type="BoxShape3D" id="BoxShape3D_emap1"]
size = Vector3(3, 1, 2)
[node name="Guncase" type="StaticBody3D"]
script = ExtResource("1_dh5qf")
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
shape = SubResource("BoxShape3D_g6om3")
[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
mesh = SubResource("BoxMesh_qtnys")
[node name="Area3D" type="Area3D" parent="."]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.25, 0)
shape = SubResource("BoxShape3D_emap1")

View file

@ -1,9 +1,10 @@
[gd_scene load_steps=9 format=3 uid="uid://cbyee7drds7qu"]
[gd_scene load_steps=10 format=3 uid="uid://cbyee7drds7qu"]
[ext_resource type="Script" path="res://scripts/maps/map.gd" id="1_4npcs"]
[ext_resource type="Script" path="res://scripts/maps/objectives/hungry.gd" id="2_qrp84"]
[ext_resource type="PackedScene" uid="uid://bsghm187n6ykx" path="res://scenes/objects/closet.tscn" id="2_yvpvm"]
[ext_resource type="PackedScene" uid="uid://cvnjpnvchvakj" path="res://scenes/entities/npc.tscn" id="3_x3gyc"]
[ext_resource type="PackedScene" uid="uid://ctpubhh2gsccb" path="res://scenes/maps/elements/guncase.tscn" id="5_k7k8h"]
[sub_resource type="Environment" id="Environment_pq0iv"]
@ -71,3 +72,6 @@ skeleton = NodePath("../..")
shape = SubResource("BoxShape3D_rnmx0")
[node name="Timer" type="Timer" parent="."]
[node name="Guncase" parent="." instance=ExtResource("5_k7k8h")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 24, 1, 0)