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

Minor tweaks and bug fixes

Browse Source
This commit is contained in:
derek
2024-11-06 16:47:18 -06:00
parent fc00ce0fb2
commit fa054ad3ed
16 changed files with 203 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/LevelBlockouts/blockout_2.exr
View File

Binary file not shown.

BIN
assets/LevelBlockouts/blockout_2.lmbake
View File

Binary file not shown.

BIN
assets/LowPolyCharacterStandIN.fbx Normal file
View File

Binary file not shown.

37
assets/LowPolyCharacterStandIN.fbx.import Normal file
View File

@@ -0,0 +1,37 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://b31egfvqogf8q"
path="res://.godot/imported/LowPolyCharacterStandIN.fbx-b23bcb7f7725b175c0ca2a6745e01958.scn"
[deps]
source_file="res://assets/LowPolyCharacterStandIN.fbx"
dest_files=["res://.godot/imported/LowPolyCharacterStandIN.fbx-b23bcb7f7725b175c0ca2a6745e01958.scn"]
[params]
nodes/root_type=""
nodes/root_name=""
nodes/apply_root_scale=true
nodes/root_scale=1.0
nodes/import_as_skeleton_bones=false
meshes/ensure_tangents=true
meshes/generate_lods=true
meshes/create_shadow_meshes=true
meshes/light_baking=1
meshes/lightmap_texel_size=0.2
meshes/force_disable_compression=false
skins/use_named_skins=true
animation/import=true
animation/fps=30
animation/trimming=true
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
_subresources={}
fbx/importer=0
fbx/allow_geometry_helper_nodes=false
fbx/embedded_image_handling=1

1
assets/blockout_2.tscn
View File

@@ -53,6 +53,7 @@ ssr_enabled = true
ssao_enabled = true
ssil_enabled = true
sdfgi_enabled = true
sdfgi_use_occlusion = true
glow_enabled = true
glow_bloom = 0.75
fog_enabled = true

16
assets/dead_mask.tscn Normal file
View File

@@ -0,0 +1,16 @@
[gd_scene load_steps=3 format=3 uid="uid://h115ha7c1pwt"]
[sub_resource type="SphereMesh" id="SphereMesh_yu0ox"]
flip_faces = true
radius = 10.0
height = 20.0
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_b8pc5"]
shading_mode = 0
albedo_color = Color(0, 0, 0, 1)
[node name="DeadMask" type="Node3D"]
[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
mesh = SubResource("SphereMesh_yu0ox")
surface_material_override/0 = SubResource("StandardMaterial3D_b8pc5")

48
assets/low_poly_character.tscn Normal file
View File

@@ -0,0 +1,48 @@
[gd_scene load_steps=2 format=3 uid="uid://bjqgj37w2hb1n"]
[ext_resource type="PackedScene" uid="uid://b31egfvqogf8q" path="res://assets/LowPolyCharacterStandIN.fbx" id="1_s7v6w"]
[node name="LowPolyCharacter" instance=ExtResource("1_s7v6w")]
[node name="Armature_001" parent="master" index="0"]
transform = Transform3D(0.16854, 0, 0, 0, 0.16854, 0, 0, 0, 0.16854, 0, 0, 0.00780432)
[node name="Skeleton3D" parent="master/Armature_001" index="0"]
bones/0/rotation = Quaternion(0.0617007, 0.726546, 0.678461, 0.089526)
bones/1/rotation = Quaternion(-0.0979707, 0.0058756, 0.0410021, 0.994327)
bones/2/rotation = Quaternion(0.127253, 0.194328, 0.0015416, 0.972647)
bones/3/rotation = Quaternion(-0.0920795, -0.105161, -0.0159327, 0.990055)
bones/5/rotation = Quaternion(-0.0535025, 0.00478525, -0.821572, 0.567569)
bones/6/rotation = Quaternion(-0.157648, 0.137913, -0.409256, 0.888052)
bones/7/rotation = Quaternion(0.10833, -0.000317462, 0.0132422, 0.994027)
bones/8/rotation = Quaternion(0.00638424, -0.172195, -0.0205284, 0.984828)
bones/9/rotation = Quaternion(0.533072, -0.429371, -0.459589, 0.565909)
bones/10/rotation = Quaternion(-0.227511, -0.0261567, 0.195813, 0.953526)
bones/14/rotation = Quaternion(0.156062, 0.563653, -0.290805, 0.757214)
bones/15/rotation = Quaternion(0.06091, 0.00149227, -0.352923, 0.933667)
bones/21/rotation = Quaternion(0.0160193, 0.129811, 0.801401, 0.583651)
bones/22/rotation = Quaternion(-0.000627575, 0.106117, 0.433074, 0.89509)
bones/23/rotation = Quaternion(0.0433801, 0.00117895, -0.0131933, 0.998971)
bones/24/rotation = Quaternion(-0.174376, -0.0967061, -0.205852, 0.958053)
bones/25/rotation = Quaternion(0.604932, 0.241163, 0.414988, 0.63536)
bones/26/rotation = Quaternion(-0.328522, 0.0308196, 0.0165846, 0.943848)
bones/27/rotation = Quaternion(-0.17122, 0.0195941, -0.118969, 0.977827)
bones/29/rotation = Quaternion(-0.234752, 0.561213, -0.087328, 0.788864)
bones/30/rotation = Quaternion(-0.108064, -0.656131, 0.382175, 0.641682)
bones/31/rotation = Quaternion(0.0603665, -0.00825539, 0.454546, 0.888637)
bones/33/rotation = Quaternion(0.0837504, 0.444358, 0.317351, 0.833559)
bones/34/rotation = Quaternion(-0.303395, -0.468303, 0.0375835, 0.828994)
bones/35/rotation = Quaternion(-0.108959, 0.00716584, 0.250647, 0.961901)
bones/37/rotation = Quaternion(0.105261, 0.334155, 0.934953, -0.0558973)
bones/38/rotation = Quaternion(-0.198492, 0.000536952, -0.0379676, 0.979367)
bones/39/rotation = Quaternion(0.553603, -0.0416147, 0.0985794, 0.825878)
bones/40/rotation = Quaternion(0.256495, -9.18717e-05, -0.0249709, 0.966223)
bones/42/rotation = Quaternion(0.114534, -0.17366, 0.978093, 0.00757465)
bones/43/rotation = Quaternion(-0.188272, -0.000538123, 0.0360127, 0.981456)
bones/44/rotation = Quaternion(0.542933, 0.0453644, -0.0118207, 0.838466)
bones/45/rotation = Quaternion(0.541546, 2.25582e-07, 4.08634e-07, 0.840671)
bones/47/rotation = Quaternion(-0.0284467, -0.18766, 0.977665, -0.0902524)
bones/51/rotation = Quaternion(0.0459282, 0.327364, 0.943285, 0.0305956)
[node name="AnimationPlayer" parent="." index="1"]
autoplay = "Armature_001|Armature_001Action"

26
assets/mac_10.tscn
View File

@@ -401,7 +401,7 @@ _data = {
"swap_out": SubResource("Animation_i5303")
}
[node name="mac10" node_paths=PackedStringArray("flare_light", "anim_player", "barrel_raycast", "casing_ejector", "mag_ejector", "audio_fire", "audio_empty", "audio_reload") instance=ExtResource("1_nb4p5")]
[node name="mac10" node_paths=PackedStringArray("r_hand_location", "l_hand_location", "flare_light", "anim_player", "barrel_raycast", "casing_ejector", "mag_ejector", "audio_fire", "audio_empty", "audio_reload") instance=ExtResource("1_nb4p5")]
script = ExtResource("2_tskiy")
gun_name = "Mac 10"
fov_zoom_amt = 0.995
@@ -409,6 +409,8 @@ recoil_amount = Vector3(0.02, 0.05, 0.05)
max_ammo = 20
bullet_damage = 2
bullet_speed = 1500
r_hand_location = NodePath("mac10/RHandLocation")
l_hand_location = NodePath("mac10/mag/LHandLocation")
flare_light = NodePath("mac10/flare")
bullet = ExtResource("3_xr8co")
bullet_fake = ExtResource("3_heo3y")
@@ -426,7 +428,10 @@ audio_reload = NodePath("Audio/Reload")
[node name="mac10" parent="." index="0"]
transform = Transform3D(-1.086e-06, 0, -0.3, 0, 0.3, 0, 0.3, 0, -1.086e-06, 0, 0, 0)
[node name="SpotLight3D" type="SpotLight3D" parent="mac10" index="0"]
[node name="RHandLocation" type="Node3D" parent="mac10" index="0"]
transform = Transform3D(-1.20667e-05, 0, 3.33333, 0, 3.33333, 0, -3.33333, 0, -1.20667e-05, 0.255734, -0.514002, -9.25759e-07)
[node name="SpotLight3D" type="SpotLight3D" parent="mac10" index="1"]
transform = Transform3D(-6.79394e-06, 0, 1.87678, 0, 1.87678, 0, -1.87677, 0, -6.79392e-06, -1.63231, 0, 5.90892e-06)
light_color = Color(0.965385, 0.844179, 0.572893, 1)
light_energy = 0.0
@@ -437,10 +442,10 @@ spot_range = 20.0
spot_angle = 60.0
spot_angle_attenuation = 0.353554
[node name="RayCastMag" type="RayCast3D" parent="mac10" index="1"]
[node name="RayCastMag" type="RayCast3D" parent="mac10" index="2"]
transform = Transform3D(2.1023, 0, 2.72848e-12, 0, 2.10229, 0, -5.45697e-12, 0, 2.10229, 0.234, -0.99, 0.006)
[node name="flare" parent="mac10" index="3"]
[node name="flare" parent="mac10" index="4"]
transform = Transform3D(0.71471, 9.09495e-13, -6.77626e-20, 0, -1.9745e-08, -0.451714, -1.36424e-12, 0.451713, -1.97451e-08, -2.78547, 0.0225526, 4.16584e-06)
visible = false
transparency = 1.0
@@ -452,21 +457,24 @@ cast_shadow = 0
mesh = SubResource("ArrayMesh_2s7rn")
skeleton = NodePath("")
[node name="mag" parent="mac10" index="4"]
[node name="mag" parent="mac10" index="5"]
transform = Transform3D(1, 0, 1.36424e-12, 0, 1, 0, -1.36424e-12, 0, 1, 0.183094, -0.254586, -0.000640768)
[node name="RayCastBarrel" type="RayCast3D" parent="mac10" index="5"]
[node name="LHandLocation" type="Node3D" parent="mac10/mag" index="0"]
transform = Transform3D(-1.20667e-05, 0, 3.33333, 0, 3.33333, 0, -3.33333, 0, -1.20667e-05, 0.0226869, -1.27721, 0.000640023)
[node name="RayCastBarrel" type="RayCast3D" parent="mac10" index="6"]
transform = Transform3D(-0.0050006, -0.00706674, 1.87676, 0.00197077, 1.87676, 0.00707202, -1.87677, 0.00198961, -0.00499312, -1.40167, 0.0234654, 0.0108915)
target_position = Vector3(0, 0, -0.1)
[node name="RayCastCasing" type="RayCast3D" parent="mac10" index="6"]
[node name="RayCastCasing" type="RayCast3D" parent="mac10" index="7"]
transform = Transform3D(-0.00171201, 5.61171e-05, 1.87678, 0.567942, 1.78878, 0.000464575, -1.78878, 0.567941, -0.00164872, 0.38, 0.169931, -0.210019)
target_position = Vector3(1, 0, 0)
[node name="Trigger" parent="mac10" index="7"]
[node name="Trigger" parent="mac10" index="8"]
transform = Transform3D(0.978226, 0.207541, 0, -0.207541, 0.978226, 0, 0, 0, 1, -0.13807, -0.230628, 0.00528617)
[node name="armStandin" type="MeshInstance3D" parent="mac10" index="8"]
[node name="armStandin" type="MeshInstance3D" parent="mac10" index="9"]
transform = Transform3D(-1.20667e-05, 0, 3.33333, 0, 3.33333, 0, -3.33333, 0, -1.20667e-05, 1.48458, -0.467889, 0.0751227)
visible = false
mesh = SubResource("BoxMesh_3phrt")

6
assets/revolver_1.tscn
View File

@@ -1064,7 +1064,7 @@ _data = {
"swap_out": SubResource("Animation_nvmxj")
}
[node name="revolver1" node_paths=PackedStringArray("chamber", "casing0", "casing1", "casing2", "casing3", "casing4", "casing5", "casing_spawn0", "casing_spawn1", "casing_spawn2", "casing_spawn3", "casing_spawn4", "casing_spawn5", "bullet0", "bullet1", "bullet2", "bullet3", "bullet4", "bullet5", "anim_player", "barrel_raycast", "audio_fire", "audio_empty", "audio_reload") instance=ExtResource("1_i5f84")]
[node name="revolver1" node_paths=PackedStringArray("r_hand_location", "chamber", "casing0", "casing1", "casing2", "casing3", "casing4", "casing5", "casing_spawn0", "casing_spawn1", "casing_spawn2", "casing_spawn3", "casing_spawn4", "casing_spawn5", "bullet0", "bullet1", "bullet2", "bullet3", "bullet4", "bullet5", "anim_player", "barrel_raycast", "audio_fire", "audio_empty", "audio_reload") instance=ExtResource("1_i5f84")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0718293, 0)
script = ExtResource("2_7rsti")
gun_name = ".44 Galore"
@@ -1076,6 +1076,7 @@ bullet_force_mod = 10
bullet_speed = 1500
bullet_drop = 0.0
random_spread_amt = 0.1
r_hand_location = NodePath("revolver1/RHandLocation")
chamber = NodePath("revolver1/Chamber")
bullet = ExtResource("3_tru5y")
bullethole = ExtResource("4_ubqgq")
@@ -1204,6 +1205,9 @@ spot_range = 7.0
spot_angle = 70.0
spot_angle_attenuation = 0.353554
[node name="RHandLocation" type="Node3D" parent="revolver1" index="6"]
transform = Transform3D(-1.20667e-05, -3.33333, 0, 3.33333, -1.20667e-05, 0, 0, 0, 3.33333, 0.270288, 9.78444e-07, 0.555667)
[node name="AnimationPlayer" type="AnimationPlayer" parent="." index="1"]
libraries = {
"": SubResource("AnimationLibrary_2kb78")