derekdz/fps_project_1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tweaked bullet and pick up method

Browse Source
This commit is contained in:
Derek
2024-11-04 19:58:51 -06:00
parent 6a36a53746
commit 818b25417a
6 changed files with 56 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
assets/blockout_2.tscn
View File

@@ -759,7 +759,6 @@ health_drop_enabled = false
[node name="Player" parent="." instance=ExtResource("9_3usor")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.137423, 1.78365, 12.8627)
AUDIO = false
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource("Environment_b2qms")

2
assets/casing_2.tscn
View File

@@ -10,7 +10,7 @@ height = 0.121962
radius = 0.0314789
[node name="casing_2" type="RigidBody3D" groups=["scene_rigidbody", "spawned"]]
collision_layer = 32
collision_layer = 0
collision_mask = 37
mass = 0.1
continuous_cd = true

6
assets/die_particles.tscn
View File

@@ -4,7 +4,7 @@
[ext_resource type="AudioStream" uid="uid://wd061pl0d7rl" path="res://assets/Audio/deep-low-explosion-SBA-300054677.wav" id="2_ddmln"]
[ext_resource type="Texture2D" uid="uid://dmyn4eq2r12ue" path="res://assets/Models/spider1.albedoRAW.png" id="3_81mhs"]
[ext_resource type="Texture2D" uid="uid://dqhke14ulten2" path="res://assets/Models/spider1.roughnessRAW.png" id="4_ahnbu"]
[ext_resource type="Texture2D" uid="uid://r7awur11yerj" path="res://assets/Models/spider1.gunbarrel.albedo.png" id="4_pb8pm"]
[ext_resource type="Texture2D" uid="uid://b4s3w1qnqcmgq" path="res://assets/Models/spider1.gunbarrel.albedo.png" id="4_pb8pm"]
[ext_resource type="Texture2D" uid="uid://c54kwbix1mo58" path="res://assets/Models/spider1.turret.png" id="5_hogev"]
[ext_resource type="Texture2D" uid="uid://cvi0upsh0e1mu" path="res://assets/Models/spider1.turret.roughness1.png" id="6_0fxbp"]
@@ -257,7 +257,7 @@ points = PackedVector3Array(0.0373867, 0.506736, 0.264769, -0.356717, -0.359168,
script = ExtResource("1_frf2k")
audio_explode = NodePath("Audio/Die")
[node name="RigidBody3D" type="RigidBody3D" parent="." groups=["scene_rigidbody"]]
[node name="RigidBody3D" type="RigidBody3D" parent="." groups=["moveable", "scene_rigidbody"]]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00161432, 1.77527, -0.0469466)
collision_layer = 32
collision_mask = 37
@@ -288,7 +288,7 @@ draw_pass_1 = SubResource("BoxMesh_00qq1")
stream = ExtResource("2_ddmln")
volume_db = 10.0
[node name="body" type="RigidBody3D" parent="." groups=["scene_rigidbody"]]
[node name="body" type="RigidBody3D" parent="." groups=["moveable", "scene_rigidbody"]]
collision_layer = 32
collision_mask = 37
mass = 30.0

6
assets/player.tscn
View File

@@ -1,7 +1,6 @@
[gd_scene load_steps=26 format=3 uid="uid://drwae3loscbw7"]
[gd_scene load_steps=25 format=3 uid="uid://drwae3loscbw7"]
[ext_resource type="Script" path="res://scripts/player.gd" id="1_x7wms"]
[ext_resource type="PackedScene" uid="uid://dcmno6wafk5hg" path="res://assets/dead_player.tscn" id="2_4hoys"]
[ext_resource type="Script" path="res://scripts/recoil.gd" id="3_405jc"]
[ext_resource type="FontFile" uid="uid://d2h2tjhxiv5wo" path="res://assets/fonts/White On Black.ttf" id="3_mbuvp"]
[ext_resource type="Script" path="res://scripts/AmmoCounter.gd" id="4_8cy44"]
@@ -69,7 +68,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.11359, 0)
collision_layer = 6
collision_mask = 11
script = ExtResource("1_x7wms")
dead_player = ExtResource("2_4hoys")
SENSITIVITY = 0.008
BOB_AMP = 0.085
weapon_holder = NodePath("Head/Recoil/Camera3D/WeaponHolder")
@@ -166,7 +164,7 @@ texture = ExtResource("6_5m60e")
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.462246)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.487738)
target_position = Vector3(0, 0, -200)
collision_mask = 5
collide_with_areas = true