added oil drum

This commit is contained in:
derek
2024-12-09 16:57:35 -06:00
parent fee4abaa9d
commit 7ed9d2a774
19 changed files with 311 additions and 10 deletions

View File

@@ -0,0 +1,24 @@
[remap]
importer="wav"
type="AudioStreamWAV"
uid="uid://cjpvibojo13qv"
path="res://.godot/imported/clock-ticking-exact-looping-SBA-300062891.wav-318d65280ceb85b1dcef330429263b1a.sample"
[deps]
source_file="res://assets/Audio/clock-ticking-exact-looping-SBA-300062891.wav"
dest_files=["res://.godot/imported/clock-ticking-exact-looping-SBA-300062891.wav-318d65280ceb85b1dcef330429263b1a.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop_mode=2
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0

BIN
assets/Models/oilDrum.blend Normal file

Binary file not shown.

View File

@@ -0,0 +1,51 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://bk2lp6egq4lyu"
path="res://.godot/imported/oilDrum.blend-f18a9e23f6af7e35638093a41f9a3932.scn"
[deps]
source_file="res://assets/Models/oilDrum.blend"
dest_files=["res://.godot/imported/oilDrum.blend-f18a9e23f6af7e35638093a41f9a3932.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=false
animation/remove_immutable_tracks=true
animation/import_rest_as_RESET=false
import_script/path=""
_subresources={}
blender/nodes/visible=0
blender/nodes/active_collection_only=false
blender/nodes/punctual_lights=true
blender/nodes/cameras=true
blender/nodes/custom_properties=true
blender/nodes/modifiers=1
blender/meshes/colors=false
blender/meshes/uvs=true
blender/meshes/normals=true
blender/meshes/tangents=true
blender/meshes/skins=2
blender/meshes/export_bones_deforming_mesh_only=false
blender/materials/unpack_enabled=true
blender/materials/export_materials=1
blender/animation/limit_playback=true
blender/animation/always_sample=true
blender/animation/group_tracks=true

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 146 KiB

View File

@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://ch7jxw5ghkgij"
path.s3tc="res://.godot/imported/oildrum1.albedo.png-7ad778b73999c00f026940b17b9be98b.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://assets/Models/oildrum1.albedo.png"
dest_files=["res://.godot/imported/oildrum1.albedo.png-7ad778b73999c00f026940b17b9be98b.s3tc.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

View File

@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://coy85a3x5unp8"
path.s3tc="res://.godot/imported/oildrum1.metallic.png-f994de377401db29fdabc28a4f98e27d.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://assets/Models/oildrum1.metallic.png"
dest_files=["res://.godot/imported/oildrum1.metallic.png-f994de377401db29fdabc28a4f98e27d.s3tc.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

Binary file not shown.

After

Width:  |  Height:  |  Size: 134 KiB

View File

@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://ioiy6cm2ypl7"
path.s3tc="res://.godot/imported/oildrum1.normal.png-d903684e2161eb3e63ed6e11726968a0.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://assets/Models/oildrum1.normal.png"
dest_files=["res://.godot/imported/oildrum1.normal.png-d903684e2161eb3e63ed6e11726968a0.s3tc.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=1
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=1
roughness/src_normal="res://assets/Models/oildrum1.normal.png"
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

View File

@@ -0,0 +1,35 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dhm0fgqc3nx2t"
path.s3tc="res://.godot/imported/oildrum1.rough.png-43c77886a3f0388204ef7d3af08bd17d.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
[deps]
source_file="res://assets/Models/oildrum1.rough.png"
dest_files=["res://.godot/imported/oildrum1.rough.png-43c77886a3f0388204ef7d3af08bd17d.s3tc.ctex"]
[params]
compress/mode=2
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=true
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=0

74
assets/oildrum1.tscn Normal file

File diff suppressed because one or more lines are too long

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=30 format=3 uid="uid://drwae3loscbw7"] [gd_scene load_steps=31 format=3 uid="uid://drwae3loscbw7"]
[ext_resource type="Script" path="res://scripts/player.gd" id="1_x7wms"] [ext_resource type="Script" path="res://scripts/player.gd" id="1_x7wms"]
[ext_resource type="Script" path="res://scripts/recoil.gd" id="3_405jc"] [ext_resource type="Script" path="res://scripts/recoil.gd" id="3_405jc"]
@@ -7,6 +7,7 @@
[ext_resource type="AudioStream" uid="uid://bki17g7j4kqn4" path="res://assets/Audio/PickupSound Mixdown 3.wav" id="8_dwqsx"] [ext_resource type="AudioStream" uid="uid://bki17g7j4kqn4" path="res://assets/Audio/PickupSound Mixdown 3.wav" id="8_dwqsx"]
[ext_resource type="Script" path="res://scripts/bullet_ray.gd" id="10_ektr6"] [ext_resource type="Script" path="res://scripts/bullet_ray.gd" id="10_ektr6"]
[ext_resource type="AudioStream" uid="uid://dyd272r7n2ecd" path="res://assets/Audio/footsteps-shoes-jump-land-beach-sand-SBA-300118001.wav" id="10_tn0pn"] [ext_resource type="AudioStream" uid="uid://dyd272r7n2ecd" path="res://assets/Audio/footsteps-shoes-jump-land-beach-sand-SBA-300118001.wav" id="10_tn0pn"]
[ext_resource type="AudioStream" uid="uid://cjpvibojo13qv" path="res://assets/Audio/clock-ticking-exact-looping-SBA-300062891.wav" id="11_6k4fy"]
[ext_resource type="AudioStream" uid="uid://bl8yg1d3bsxs3" path="res://assets/Audio/constant-natural-strong-wind-looping-SBA-300062687.wav" id="11_he7p5"] [ext_resource type="AudioStream" uid="uid://bl8yg1d3bsxs3" path="res://assets/Audio/constant-natural-strong-wind-looping-SBA-300062687.wav" id="11_he7p5"]
[ext_resource type="AudioStream" uid="uid://cy150nsjqp7lt" path="res://assets/Audio/grunt-male-SBA-300282985.wav" id="12_f51u4"] [ext_resource type="AudioStream" uid="uid://cy150nsjqp7lt" path="res://assets/Audio/grunt-male-SBA-300282985.wav" id="12_f51u4"]
[ext_resource type="AudioStream" uid="uid://cwre1dq8gsvbg" path="res://assets/Audio/Foley Sports/Boxing/Gloves Block Intense.wav" id="12_qhd01"] [ext_resource type="AudioStream" uid="uid://cwre1dq8gsvbg" path="res://assets/Audio/Foley Sports/Boxing/Gloves Block Intense.wav" id="12_qhd01"]
@@ -211,6 +212,10 @@ shape = SubResource("SphereShape3D_xfie3")
[node name="PickupSound" type="AudioStreamPlayer" parent="Audio"] [node name="PickupSound" type="AudioStreamPlayer" parent="Audio"]
stream = ExtResource("8_dwqsx") stream = ExtResource("8_dwqsx")
[node name="ClockSound" type="AudioStreamPlayer" parent="Audio"]
stream = ExtResource("11_6k4fy")
bus = &"SFX"
[node name="LandSound" type="AudioStreamPlayer" parent="Audio"] [node name="LandSound" type="AudioStreamPlayer" parent="Audio"]
stream = ExtResource("10_tn0pn") stream = ExtResource("10_tn0pn")
volume_db = -5.0 volume_db = -5.0

View File

@@ -11,7 +11,7 @@ config_version=5
[application] [application]
config/name="First Person Test" config/name="First Person Test"
run/main_scene="res://assets/blockout_2.tscn" run/main_scene="res://scenes/asset_checker.tscn"
config/features=PackedStringArray("4.3", "Forward Plus") config/features=PackedStringArray("4.3", "Forward Plus")
config/icon="res://icon.svg" config/icon="res://icon.svg"

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=51 format=4 uid="uid://f7e0v1r6ra6c"] [gd_scene load_steps=52 format=4 uid="uid://f7e0v1r6ra6c"]
[ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_saj4q"] [ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_saj4q"]
[ext_resource type="PackedScene" uid="uid://b5eclfg0cmmal" path="res://assets/revolver_1.tscn" id="2_ntm2q"] [ext_resource type="PackedScene" uid="uid://b5eclfg0cmmal" path="res://assets/revolver_1.tscn" id="2_ntm2q"]
@@ -30,6 +30,7 @@
[ext_resource type="PackedScene" uid="uid://dyu46bns8mesv" path="res://assets/mac10_pickup.tscn" id="28_x7033"] [ext_resource type="PackedScene" uid="uid://dyu46bns8mesv" path="res://assets/mac10_pickup.tscn" id="28_x7033"]
[ext_resource type="PackedScene" uid="uid://cucqbjb8bcha5" path="res://assets/blunderbuss_pickup.tscn" id="29_kr1fy"] [ext_resource type="PackedScene" uid="uid://cucqbjb8bcha5" path="res://assets/blunderbuss_pickup.tscn" id="29_kr1fy"]
[ext_resource type="PackedScene" uid="uid://clu76sc4uoswn" path="res://assets/rocketlauncher_pickup.tscn" id="30_msqcq"] [ext_resource type="PackedScene" uid="uid://clu76sc4uoswn" path="res://assets/rocketlauncher_pickup.tscn" id="30_msqcq"]
[ext_resource type="PackedScene" uid="uid://dlhjacsike5a4" path="res://assets/oildrum1.tscn" id="31_jbe2q"]
[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_py8au"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_py8au"]
@@ -308,8 +309,8 @@ shadow_mesh = SubResource("ArrayMesh_7g1e1")
[node name="AssetChecker" type="Node3D" node_paths=PackedStringArray("player")] [node name="AssetChecker" type="Node3D" node_paths=PackedStringArray("player")]
script = ExtResource("1_saj4q") script = ExtResource("1_saj4q")
load_save = false
player = NodePath("Player") player = NodePath("Player")
gun_1 = ExtResource("2_ntm2q")
[node name="WorldEnvironment" type="WorldEnvironment" parent="."] [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
environment = SubResource("Environment_tngkl") environment = SubResource("Environment_tngkl")
@@ -534,3 +535,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 39.0626, 0.909491, 22.5097)
[node name="rocketlauncher1_pickup" parent="." instance=ExtResource("30_msqcq")] [node name="rocketlauncher1_pickup" parent="." instance=ExtResource("30_msqcq")]
transform = Transform3D(-0.136113, 0, 0.990693, 0, 1, 0, -0.990693, 0, -0.136113, 35.3662, 0.662383, 22.6891) transform = Transform3D(-0.136113, 0, 0.990693, 0, 1, 0, -0.990693, 0, -0.136113, 35.3662, 0.662383, 22.6891)
[node name="RigidBody3D" parent="." instance=ExtResource("31_jbe2q")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.3714, 1.04444, -2.16718)

View File

@@ -138,6 +138,7 @@ var controlled_elsewhere = false
@onready var hit_head: AudioStreamPlayer3D = $Audio/HitHead @onready var hit_head: AudioStreamPlayer3D = $Audio/HitHead
@onready var crouch_audio: AudioStreamPlayer3D = $Audio/Crouch @onready var crouch_audio: AudioStreamPlayer3D = $Audio/Crouch
@onready var hud: Control = $Head/Recoil/Camera3D/HUD @onready var hud: Control = $Head/Recoil/Camera3D/HUD
@onready var clock_sound: AudioStreamPlayer = $Audio/ClockSound
func _ready(): func _ready():
@@ -298,6 +299,7 @@ func _physics_process(delta):
Engine.time_scale = lerp(Engine.time_scale, SLOWSPEED, (delta * 50) / Engine.time_scale) Engine.time_scale = lerp(Engine.time_scale, SLOWSPEED, (delta * 50) / Engine.time_scale)
#gun.random_spread_amt = 0 #gun.random_spread_amt = 0
AudioServer.set_bus_effect_enabled(0,0,true) AudioServer.set_bus_effect_enabled(0,0,true)
clock_sound.play()
if sensitivity_shift == true: if sensitivity_shift == true:
SENSITIVITY = lerp(SENSITIVITY, SENSITIVITY * .998, (delta * 100) / Engine.time_scale) SENSITIVITY = lerp(SENSITIVITY, SENSITIVITY * .998, (delta * 100) / Engine.time_scale)
if remaining_stamina > 0: if remaining_stamina > 0:
@@ -307,6 +309,7 @@ func _physics_process(delta):
if !gamespeed_controlled: if !gamespeed_controlled:
Engine.time_scale = lerp(Engine.time_scale, 1.0, (delta * 50)/Engine.time_scale) Engine.time_scale = lerp(Engine.time_scale, 1.0, (delta * 50)/Engine.time_scale)
#gun.random_spread_amt = gun.random_spread_start #gun.random_spread_amt = gun.random_spread_start
clock_sound.stop()
AudioServer.set_bus_effect_enabled(0,0,false) AudioServer.set_bus_effect_enabled(0,0,false)
SENSITIVITY = start_sensitivity SENSITIVITY = start_sensitivity
if remaining_stamina < MAX_STAMINA and !Input.is_action_pressed("slow_down"): if remaining_stamina < MAX_STAMINA and !Input.is_action_pressed("slow_down"):