overworld tweaks, moved unused bgm oggs to refuse folder. Added ambient proximity sounds to Overworld, created neccessary Audio Buses, added ambient sound to Altar.

This commit is contained in:
Pal
2025-09-13 02:15:21 -07:00
parent f7b14dee4f
commit a4d475c07b
34 changed files with 530 additions and 160 deletions

View File

@@ -0,0 +1,21 @@
[gd_resource type="AudioBusLayout" format=3 uid="uid://c2mk6c27y0mdf"]
[resource]
bus/1/name = &"AMBIENT"
bus/1/solo = false
bus/1/mute = false
bus/1/bypass_fx = false
bus/1/volume_db = 0.0
bus/1/send = &"Master"
bus/2/name = &"SFX"
bus/2/solo = false
bus/2/mute = false
bus/2/bypass_fx = false
bus/2/volume_db = 0.0
bus/2/send = &"Master"
bus/3/name = &"MUSIC"
bus/3/solo = false
bus/3/mute = false
bus/3/bypass_fx = false
bus/3/volume_db = 0.0
bus/3/send = &"Master"

View File

@@ -0,0 +1,19 @@
[remap]
importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://hmx3puq627vt"
path="res://.godot/imported/CrossingTheGate.ogg-928288dfb5c09b4bfb32624fa16625df.oggvorbisstr"
[deps]
source_file="res://src/Unused and Old/CrossingTheGate.ogg"
dest_files=["res://.godot/imported/CrossingTheGate.ogg-928288dfb5c09b4bfb32624fa16625df.oggvorbisstr"]
[params]
loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4

View File

@@ -0,0 +1,19 @@
[remap]
importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://4e3nl0kd2vi8"
path="res://.godot/imported/Droney.ogg-f844419b0508cb66adc758c97ec21dcb.oggvorbisstr"
[deps]
source_file="res://src/Unused and Old/Droney.ogg"
dest_files=["res://.godot/imported/Droney.ogg-f844419b0508cb66adc758c97ec21dcb.oggvorbisstr"]
[params]
loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4

View File

@@ -0,0 +1,19 @@
[remap]
importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://8srjhvr3ktjv"
path="res://.godot/imported/TarWinds.ogg-ec9634d7fbb4157da8084068a6761eee.oggvorbisstr"
[deps]
source_file="res://src/Unused and Old/TarWinds.ogg"
dest_files=["res://.godot/imported/TarWinds.ogg-ec9634d7fbb4157da8084068a6761eee.oggvorbisstr"]
[params]
loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4

View File

@@ -0,0 +1,19 @@
[remap]
importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://8fvgiyyje2px"
path="res://.godot/imported/UselessImmuneSystem.ogg-4b373f2a435c102bba2fec78bea9df03.oggvorbisstr"
[deps]
source_file="res://src/Unused and Old/UselessImmuneSystem.ogg"
dest_files=["res://.godot/imported/UselessImmuneSystem.ogg-4b373f2a435c102bba2fec78bea9df03.oggvorbisstr"]
[params]
loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4

Binary file not shown.

View File

@@ -0,0 +1,24 @@
[remap]
importer="wav"
type="AudioStreamWAV"
uid="uid://ddii3pi8x75xc"
path="res://.godot/imported/amb_beach.wav-046e4f838e50e43a1aba1a754b92aad6.sample"
[deps]
source_file="res://src/audio/AMB/amb_beach.wav"
dest_files=["res://.godot/imported/amb_beach.wav-046e4f838e50e43a1aba1a754b92aad6.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=3
edit/loop_begin=0
edit/loop_end=-1
compress/mode=2

Binary file not shown.

View File

@@ -0,0 +1,24 @@
[remap]
importer="wav"
type="AudioStreamWAV"
uid="uid://ym4ur8a2qxhp"
path="res://.godot/imported/amb_perlin.wav-ba6da0d5591f392e4aca7d2f85c4dfc2.sample"
[deps]
source_file="res://src/audio/AMB/amb_perlin.wav"
dest_files=["res://.godot/imported/amb_perlin.wav-ba6da0d5591f392e4aca7d2f85c4dfc2.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=3
edit/loop_begin=0
edit/loop_end=-1
compress/mode=2

Binary file not shown.

View File

@@ -0,0 +1,24 @@
[remap]
importer="wav"
type="AudioStreamWAV"
uid="uid://b7wxddjx3qw5o"
path="res://.godot/imported/amb_white_noise.wav-d316dd05afe429f6bcdda594285ad718.sample"
[deps]
source_file="res://src/audio/AMB/amb_white_noise.wav"
dest_files=["res://.godot/imported/amb_white_noise.wav-d316dd05afe429f6bcdda594285ad718.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=3
edit/loop_begin=0
edit/loop_end=-1
compress/mode=2

View File

@@ -0,0 +1,24 @@
[remap]
importer="wav"
type="AudioStreamWAV"
uid="uid://bmiitw4fcs68e"
path="res://.godot/imported/amb_wind_loop_altar.wav-e766e3db29faa01ad6dbaa8cb18d7de6.sample"
[deps]
source_file="res://src/audio/AMB/amb_wind_loop_altar.wav"
dest_files=["res://.godot/imported/amb_wind_loop_altar.wav-e766e3db29faa01ad6dbaa8cb18d7de6.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=3
edit/loop_begin=0
edit/loop_end=-1
compress/mode=2

View File

@@ -12,19 +12,19 @@ public partial class AudioManager : Node
public override void _Ready() public override void _Ready()
{ {
_audioPlayer = new AudioStreamPlayer(); _audioPlayer = new AudioStreamPlayer();
AddChild(_audioPlayer); AddChild(_audioPlayer);
_sfxDictionary = new Dictionary<SoundEffect, AudioStream>(); _sfxDictionary = new Dictionary<SoundEffect, AudioStream>();
var soundEffects = Enum.GetValues(typeof(SoundEffect)); var soundEffects = Enum.GetValues(typeof(SoundEffect));
foreach (var effect in soundEffects) foreach (var effect in soundEffects)
_sfxDictionary.Add((SoundEffect)effect, GD.Load<AudioStream>(sfxPath + effect + ".ogg")); _sfxDictionary.Add((SoundEffect)effect, GD.Load<AudioStream>(sfxPath + effect + ".ogg"));
} }
public void Play(SoundEffect soundEffect) public void Play(SoundEffect soundEffect)
{ {
_sfxDictionary.TryGetValue(soundEffect, out var stream); _sfxDictionary.TryGetValue(soundEffect, out var stream);
_audioPlayer.Stream = stream; _audioPlayer.Stream = stream;
_audioPlayer.Play(); _audioPlayer.Play();
} }
} }
public enum SoundEffect public enum SoundEffect

View File

@@ -1,4 +1,4 @@
using Godot; using Godot;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Zennysoft.Game.Implementation; using Zennysoft.Game.Implementation;
@@ -13,16 +13,16 @@ public partial class BGMPlayer : DimmableAudioStreamPlayer
public override void _Ready() public override void _Ready()
{ {
_bgmDictionary = new Dictionary<BackgroundMusic, AudioStream>(); _bgmDictionary = new Dictionary<BackgroundMusic, AudioStream>();
var backgroundMusic = Enum.GetValues(typeof(BackgroundMusic)); var backgroundMusic = Enum.GetValues(typeof(BackgroundMusic));
foreach (var bgm in backgroundMusic) foreach (var bgm in backgroundMusic)
_bgmDictionary.Add((BackgroundMusic)bgm, GD.Load<AudioStream>(_bgmPath + bgm + ".ogg")); _bgmDictionary.Add((BackgroundMusic)bgm, GD.Load<AudioStream>(_bgmPath + bgm + ".ogg"));
} }
public void Play(BackgroundMusic backgroundMusic) public void Play(BackgroundMusic backgroundMusic)
{ {
_bgmDictionary.TryGetValue(backgroundMusic, out var stream); _bgmDictionary.TryGetValue(backgroundMusic, out var stream);
Stream = stream; Stream = stream;
FadeIn(); FadeIn();
} }
} }

View File

@@ -1,19 +0,0 @@
[remap]
importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://hmx3puq627vt"
path="res://.godot/imported/CrossingTheGate.ogg-dfd4ce3206d9ee6b0a1f1da97040ab2c.oggvorbisstr"
[deps]
source_file="res://src/audio/bgm/CrossingTheGate.ogg"
dest_files=["res://.godot/imported/CrossingTheGate.ogg-dfd4ce3206d9ee6b0a1f1da97040ab2c.oggvorbisstr"]
[params]
loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4

View File

@@ -1,19 +0,0 @@
[remap]
importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://4e3nl0kd2vi8"
path="res://.godot/imported/Droney.ogg-0f41265ddc94509ffa7f651092b5fcf7.oggvorbisstr"
[deps]
source_file="res://src/audio/bgm/Droney.ogg"
dest_files=["res://.godot/imported/Droney.ogg-0f41265ddc94509ffa7f651092b5fcf7.oggvorbisstr"]
[params]
loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4

View File

@@ -1,19 +0,0 @@
[remap]
importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://8srjhvr3ktjv"
path="res://.godot/imported/TarWinds.ogg-c17a89e4c879691e6b1fd2ddb5c001cf.oggvorbisstr"
[deps]
source_file="res://src/audio/bgm/TarWinds.ogg"
dest_files=["res://.godot/imported/TarWinds.ogg-c17a89e4c879691e6b1fd2ddb5c001cf.oggvorbisstr"]
[params]
loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4

View File

@@ -1,19 +0,0 @@
[remap]
importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://8fvgiyyje2px"
path="res://.godot/imported/UselessImmuneSystem.ogg-7d06f59d898dd1f07c1a3559cd1d8f52.oggvorbisstr"
[deps]
source_file="res://src/audio/bgm/UselessImmuneSystem.ogg"
dest_files=["res://.godot/imported/UselessImmuneSystem.ogg-7d06f59d898dd1f07c1a3559cd1d8f52.oggvorbisstr"]
[params]
loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=70 format=4 uid="uid://dl6h1djc27ddl"] [gd_scene load_steps=71 format=4 uid="uid://dl6h1djc27ddl"]
[ext_resource type="Script" uid="uid://c1nhqlem1ew3m" path="res://src/map/dungeon/code/Floor0.cs" id="1_db2o3"] [ext_resource type="Script" uid="uid://c1nhqlem1ew3m" path="res://src/map/dungeon/code/Floor0.cs" id="1_db2o3"]
[ext_resource type="Texture2D" uid="uid://b27ksiyfefb33" path="res://src/map/dungeon/models/Set A/02. Altar/02_ALTAR_FLOOR_ZER0_VER_outside_desert.png" id="2_xh2ej"] [ext_resource type="Texture2D" uid="uid://b27ksiyfefb33" path="res://src/map/dungeon/models/Set A/02. Altar/02_ALTAR_FLOOR_ZER0_VER_outside_desert.png" id="2_xh2ej"]
@@ -28,6 +28,7 @@
[ext_resource type="PackedScene" uid="uid://d0pl1n1jf77jm" path="res://src/items/effect/EffectItem.tscn" id="24_t3xa0"] [ext_resource type="PackedScene" uid="uid://d0pl1n1jf77jm" path="res://src/items/effect/EffectItem.tscn" id="24_t3xa0"]
[ext_resource type="Resource" uid="uid://bptg6eybj5dxk" path="res://src/items/effect/resources/DevicRecall.tres" id="25_qqc7i"] [ext_resource type="Resource" uid="uid://bptg6eybj5dxk" path="res://src/items/effect/resources/DevicRecall.tres" id="25_qqc7i"]
[ext_resource type="Shader" uid="uid://c4a68uhm5o2h4" path="res://src/map/map shaders/Altar Sky Environment.gdshader" id="28_ojbcg"] [ext_resource type="Shader" uid="uid://c4a68uhm5o2h4" path="res://src/map/map shaders/Altar Sky Environment.gdshader" id="28_ojbcg"]
[ext_resource type="AudioStream" uid="uid://bmiitw4fcs68e" path="res://src/audio/AMB/amb_wind_loop_altar.wav" id="29_6iwuh"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_8ib2a"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_8ib2a"]
resource_name = "DESERT" resource_name = "DESERT"
@@ -675,18 +676,18 @@ size = Vector3(2.97754, 2.34912, 3.79205)
[sub_resource type="ShaderMaterial" id="ShaderMaterial_6iwuh"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_6iwuh"]
shader = ExtResource("28_ojbcg") shader = ExtResource("28_ojbcg")
shader_parameter/day_top_color = Color(0.373526, 0.694577, 0.910347, 1) shader_parameter/day_top_color = Color(0.110511, 0.211694, 0.207729, 1)
shader_parameter/day_bottom_color = Color(0.422159, 0.591529, 0.751304, 1) shader_parameter/day_bottom_color = Color(0.330221, 0.542076, 0.605553, 1)
shader_parameter/sunset_top_color = Color(0.375928, 0.529835, 0.733631, 1) shader_parameter/sunset_top_color = Color(0.375928, 0.529835, 0.733631, 1)
shader_parameter/sunset_bottom_color = Color(0, 0.263846, 0.458067, 1) shader_parameter/sunset_bottom_color = Color(0, 0.263846, 0.458067, 1)
shader_parameter/night_top_color = Color(0.02, 0, 0.04, 1) shader_parameter/night_top_color = Color(0.02, 0, 0.04, 1)
shader_parameter/night_bottom_color = Color(0.1, 0, 0.2, 1) shader_parameter/night_bottom_color = Color(0.1, 0, 0.2, 1)
shader_parameter/horizon_color = Color(0, 0.7, 0.8, 1) shader_parameter/horizon_color = Color(0, 0.7, 0.8, 1)
shader_parameter/horizon_blur = 0.25 shader_parameter/horizon_blur = 0.25
shader_parameter/sun_color = Color(0.977718, 0.99354, 0.912952, 1) shader_parameter/sun_color = Color(0.900585, 0.632559, 0.334535, 1)
shader_parameter/sun_sunset_color = Color(0.941993, 0.448101, 0.355316, 1) shader_parameter/sun_sunset_color = Color(0.806005, 0, 0.0992685, 1)
shader_parameter/sun_size = 0.336 shader_parameter/sun_size = 0.062
shader_parameter/sun_blur = 0.74 shader_parameter/sun_blur = 0.214
shader_parameter/moon_color = Color(1, 0.95, 0.7, 1) shader_parameter/moon_color = Color(1, 0.95, 0.7, 1)
shader_parameter/moon_size = 0.06 shader_parameter/moon_size = 0.06
shader_parameter/moon_blur = 0.1 shader_parameter/moon_blur = 0.1
@@ -714,21 +715,28 @@ background_mode = 2
sky = SubResource("Sky_gbv4o") sky = SubResource("Sky_gbv4o")
ambient_light_source = 1 ambient_light_source = 1
reflected_light_source = 1 reflected_light_source = 1
sdfgi_use_occlusion = true
sdfgi_read_sky_light = false
sdfgi_min_cell_size = 0.01
sdfgi_cascade0_distance = 0.64
sdfgi_max_distance = 10.24
glow_enabled = true glow_enabled = true
glow_intensity = 0.94 glow_intensity = 0.51
glow_strength = 0.38 glow_strength = 0.26
glow_bloom = 1.0 glow_bloom = 1.0
glow_blend_mode = 0 glow_blend_mode = 0
fog_density = 0.0565 fog_density = 0.0565
fog_height = -47.63 fog_height = -47.63
fog_height_density = 0.2481 fog_height_density = 0.2481
volumetric_fog_density = 0.0078 volumetric_fog_enabled = true
volumetric_fog_density = 0.02
volumetric_fog_albedo = Color(0.439054, 0.435171, 0.424614, 1)
[sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_ojbcg"] [sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_ojbcg"]
auto_exposure_enabled = true auto_exposure_enabled = true
dof_blur_far_enabled = true dof_blur_far_enabled = true
dof_blur_far_distance = 38.16 dof_blur_far_distance = 29.84
dof_blur_amount = 0.03 dof_blur_amount = 0.06
[node name="Floor0" type="Node3D"] [node name="Floor0" type="Node3D"]
script = ExtResource("1_db2o3") script = ExtResource("1_db2o3")
@@ -842,7 +850,7 @@ debug_color = Color(0.937255, 0, 0.623529, 1)
[node name="PlayerSpawnPoint" type="Marker3D" parent="Spawn Points"] [node name="PlayerSpawnPoint" type="Marker3D" parent="Spawn Points"]
unique_name_in_owner = true unique_name_in_owner = true
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 3.625, -2.89376, -1.035) transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 37.3951, -2.89376, -1.035)
[node name="ExitSpawnPoint" type="Marker3D" parent="Spawn Points"] [node name="ExitSpawnPoint" type="Marker3D" parent="Spawn Points"]
unique_name_in_owner = true unique_name_in_owner = true
@@ -897,9 +905,15 @@ Stats = ExtResource("18_ntxe5")
environment = SubResource("Environment_c86uk") environment = SubResource("Environment_c86uk")
camera_attributes = SubResource("CameraAttributesPractical_ojbcg") camera_attributes = SubResource("CameraAttributesPractical_ojbcg")
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
stream = ExtResource("29_6iwuh")
volume_db = -8.0
autoplay = true
bus = &"AMBIENT"
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
transform = Transform3D(0.906308, 0.192522, 0.37622, 0, -0.890213, 0.455545, 0.422618, -0.412864, -0.806807, 0, 50.5013, -89.3095) transform = Transform3D(-0.472551, -0.312957, -0.823865, -8.17251e-08, -0.934826, 0.355107, -0.881304, 0.167806, 0.441753, 0, 50.5013, -89.3095)
light_color = Color(0.895215, 0.840514, 0.805904, 1) light_color = Color(0.741575, 0.674356, 0.615845, 1)
light_energy = 5.08 light_energy = 3.762
shadow_enabled = true shadow_enabled = true
shadow_blur = 2.832 shadow_blur = 2.832

View File

@@ -4321,36 +4321,36 @@ script = ExtResource("1_0h3lb")
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.327652, -16.1644, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.327652, -16.1644, 0)
[node name="2_001" type="MeshInstance3D" parent="Model/BELL ANIMATIONS"] [node name="2_001" type="MeshInstance3D" parent="Model/BELL ANIMATIONS"]
transform = Transform3D(0.420615, 6.34463e-08, 1.54222e-09, -6.34552e-08, 0.420245, 0.0176409, -1.12013e-09, 0.0176409, -0.420245, -130.9, 19.1732, 28.0257) transform = Transform3D(0.420615, 5.73701e-08, 1.44133e-08, -5.84288e-08, 0.386956, 0.164869, -9.2275e-09, 0.164869, -0.386956, -130.9, 19.1732, 28.0257)
layers = 524288 layers = 524288
mesh = SubResource("ArrayMesh_kw6od") mesh = SubResource("ArrayMesh_kw6od")
skeleton = NodePath("") skeleton = NodePath("")
[node name="2_002" type="MeshInstance3D" parent="Model/BELL ANIMATIONS"] [node name="2_002" type="MeshInstance3D" parent="Model/BELL ANIMATIONS"]
transform = Transform3D(0.420615, 6.28241e-08, 5.00295e-09, -6.29205e-08, 0.416704, 0.0572271, -3.59114e-09, 0.0572271, -0.416704, -133.608, 19.3244, 6.98554) transform = Transform3D(0.420615, 5.78354e-08, -1.39003e-08, -5.87984e-08, 0.389404, -0.159001, 8.99407e-09, -0.159001, -0.389404, -133.608, 19.3244, 6.98554)
layers = 524288 layers = 524288
mesh = SubResource("ArrayMesh_mug6s") mesh = SubResource("ArrayMesh_mug6s")
skeleton = NodePath("") skeleton = NodePath("")
[node name="2_003" type="MeshInstance3D" parent="Model/BELL ANIMATIONS"] [node name="2_003" type="MeshInstance3D" parent="Model/BELL ANIMATIONS"]
transform = Transform3D(0.420615, 6.34463e-08, 1.54222e-09, -6.34552e-08, 0.420245, 0.0176409, -1.12013e-09, 0.0176409, -0.420245, -130.9, 19.1732, 6.86731) transform = Transform3D(0.420615, 5.73701e-08, 1.44133e-08, -5.84288e-08, 0.386956, 0.164869, -9.2275e-09, 0.164869, -0.386956, -130.9, 19.1732, 6.86731)
layers = 524288 layers = 524288
mesh = SubResource("ArrayMesh_xx38s") mesh = SubResource("ArrayMesh_xx38s")
skeleton = NodePath("") skeleton = NodePath("")
[node name="2_004" type="MeshInstance3D" parent="Model/BELL ANIMATIONS"] [node name="2_004" type="MeshInstance3D" parent="Model/BELL ANIMATIONS"]
transform = Transform3D(0.420615, 6.28241e-08, 5.00295e-09, -6.29205e-08, 0.416704, 0.0572271, -3.59114e-09, 0.0572271, -0.416704, -133.608, 19.3244, 28.144) transform = Transform3D(0.420615, 5.78354e-08, -1.39003e-08, -5.87984e-08, 0.389404, -0.159001, 8.99407e-09, -0.159001, -0.389404, -133.608, 19.3244, 28.144)
layers = 524288 layers = 524288
mesh = SubResource("ArrayMesh_ct7uo") mesh = SubResource("ArrayMesh_ct7uo")
skeleton = NodePath("") skeleton = NodePath("")
[node name="2_005" type="MeshInstance3D" parent="Model/BELL ANIMATIONS"] [node name="2_005" type="MeshInstance3D" parent="Model/BELL ANIMATIONS"]
transform = Transform3D(0.420615, 6.34463e-08, 1.54222e-09, -6.34552e-08, 0.420245, 0.0176409, -1.12013e-09, 0.0176409, -0.420245, -130.9, 19.1732, 28.0257) transform = Transform3D(0.420615, 5.73701e-08, 1.44133e-08, -5.84288e-08, 0.386956, 0.164869, -9.2275e-09, 0.164869, -0.386956, -130.9, 19.1732, 28.0257)
mesh = SubResource("ArrayMesh_2l4dv") mesh = SubResource("ArrayMesh_2l4dv")
skeleton = NodePath("") skeleton = NodePath("")
[node name="2_006" type="MeshInstance3D" parent="Model/BELL ANIMATIONS"] [node name="2_006" type="MeshInstance3D" parent="Model/BELL ANIMATIONS"]
transform = Transform3D(0.420615, 6.34463e-08, 1.54222e-09, -6.34552e-08, 0.420245, 0.0176409, -1.12013e-09, 0.0176409, -0.420245, -130.9, 19.1732, 28.0257) transform = Transform3D(0.420615, 5.73701e-08, 1.44133e-08, -5.84288e-08, 0.386956, 0.164869, -9.2275e-09, 0.164869, -0.386956, -130.9, 19.1732, 28.0257)
mesh = SubResource("ArrayMesh_k0kv6") mesh = SubResource("ArrayMesh_k0kv6")
skeleton = NodePath("") skeleton = NodePath("")
@@ -4862,14 +4862,14 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -52.6848, 0, 16.939)
[node name="PlayerSpawn" type="Marker3D" parent="Spawn Points"] [node name="PlayerSpawn" type="Marker3D" parent="Spawn Points"]
unique_name_in_owner = true unique_name_in_owner = true
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -50.9524, -2.22131, 0.329851) transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 1.72795, -2.29748, 0.329851)
[node name="ItemDatabase" parent="Spawn Points" instance=ExtResource("23_gov56")] [node name="ItemDatabase" parent="Spawn Points" instance=ExtResource("23_gov56")]
unique_name_in_owner = true unique_name_in_owner = true
[node name="ItemSpawnPoint" type="Marker3D" parent="Spawn Points"] [node name="ItemSpawnPoint" type="Marker3D" parent="Spawn Points"]
unique_name_in_owner = true unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -115.98, -2.05432, -6.6322) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -108.001, -2.05432, 2.0026)
[node name="Room" type="Node3D" parent="."] [node name="Room" type="Node3D" parent="."]
@@ -4888,22 +4888,22 @@ shape = SubResource("BoxShape3D_pkvyy")
[node name="Horse Head Statue" parent="Room" instance=ExtResource("24_r1rk5")] [node name="Horse Head Statue" parent="Room" instance=ExtResource("24_r1rk5")]
unique_name_in_owner = true unique_name_in_owner = true
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -102.157, -2.30863, 13.0139) transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -102.157, -2.30863, 13.0139)
visible = false
[node name="Horse Head Active" parent="Room" instance=ExtResource("25_a482y")] [node name="Horse Head Active" parent="Room" instance=ExtResource("25_a482y")]
unique_name_in_owner = true unique_name_in_owner = true
transform = Transform3D(-6.55671e-09, 0, -0.15, 0, 0.15, 0, 0.15, 0, -6.55671e-09, -102.157, -0.510939, 13.0139) transform = Transform3D(-6.55671e-09, 0, -0.15, 0, 0.15, 0, 0.15, 0, -6.55671e-09, -102.157, -0.510939, 13.0139)
visible = false
PrimaryAttackElementalType = 0 PrimaryAttackElementalType = 0
PrimaryAttackElementalDamageBonus = 1.0 PrimaryAttackElementalDamageBonus = 1.0
[node name="Ox Face Statue" parent="Room" instance=ExtResource("26_futcf")] [node name="Ox Face Statue" parent="Room" instance=ExtResource("26_futcf")]
unique_name_in_owner = true unique_name_in_owner = true
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -101.555, -2.30863, 21.5833) transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -101.555, -2.30863, 21.5833)
visible = false
[node name="OxFace Active" parent="Room" instance=ExtResource("27_g6y6v")] [node name="OxFace Active" parent="Room" instance=ExtResource("27_g6y6v")]
unique_name_in_owner = true unique_name_in_owner = true
transform = Transform3D(-6.55671e-09, 0, -0.15, 0, 0.15, 0, 0.15, 0, -6.55671e-09, -101.703, -0.479859, 22.0955) transform = Transform3D(-6.55671e-09, 0, -0.15, 0, 0.15, 0, 0.15, 0, -6.55671e-09, -101.703, -0.479859, 22.0955)
visible = false
[node name="Exit" type="Area3D" parent="Room"] [node name="Exit" type="Area3D" parent="Room"]
unique_name_in_owner = true unique_name_in_owner = true

View File

@@ -1,8 +1,9 @@
[gd_scene load_steps=15 format=3 uid="uid://dttk7gis5ibge"] [gd_scene load_steps=18 format=3 uid="uid://dttk7gis5ibge"]
[ext_resource type="Script" uid="uid://dwt6302nsf4vq" path="res://src/map/dungeon/code/DungeonFloor.cs" id="1_7ld5y"] [ext_resource type="Script" uid="uid://dwt6302nsf4vq" path="res://src/map/dungeon/code/DungeonFloor.cs" id="1_7ld5y"]
[ext_resource type="PackedScene" uid="uid://dcyriq5bejtdj" path="res://src/map/dungeon/models/Set B/30. Void Room/30_A2_VOID_ROOM_VER.2.glb" id="2_pauwa"] [ext_resource type="PackedScene" uid="uid://dcyriq5bejtdj" path="res://src/map/dungeon/models/Set B/30. Void Room/30_A2_VOID_ROOM_VER.2.glb" id="2_pauwa"]
[ext_resource type="Shader" uid="uid://ucyntjbf812l" path="res://src/map/map shaders/VOIDSHADE.gdshader" id="3_gtn7m"] [ext_resource type="Shader" uid="uid://ucyntjbf812l" path="res://src/map/map shaders/VOIDSHADE.gdshader" id="3_gtn7m"]
[ext_resource type="FastNoiseLite" uid="uid://c7mj06ydprexd" path="res://src/map/map shaders/noise void.tres" id="4_gtn7m"]
[ext_resource type="Shader" uid="uid://dra2fnoyyinii" path="res://src/map/map shaders/VOID GLASS.gdshader" id="4_rvyv7"] [ext_resource type="Shader" uid="uid://dra2fnoyyinii" path="res://src/map/map shaders/VOID GLASS.gdshader" id="4_rvyv7"]
[ext_resource type="Shader" uid="uid://bpkmgenx50vof" path="res://src/map/map shaders/VOID PORTAL.gdshader" id="5_euvyt"] [ext_resource type="Shader" uid="uid://bpkmgenx50vof" path="res://src/map/map shaders/VOID PORTAL.gdshader" id="5_euvyt"]
@@ -10,17 +11,11 @@
offsets = PackedFloat32Array(0, 0.698113, 1) offsets = PackedFloat32Array(0, 0.698113, 1)
colors = PackedColorArray(0, 0, 0, 1, 0.0561842, 4.84917e-06, 0.295905, 1, 0.571195, 0.036639, 0.618598, 1) colors = PackedColorArray(0, 0, 0, 1, 0.0561842, 4.84917e-06, 0.295905, 1, 0.571195, 0.036639, 0.618598, 1)
[sub_resource type="FastNoiseLite" id="FastNoiseLite_lfwp0"]
noise_type = 2
seed = 1
frequency = 0.0264
domain_warp_enabled = true
[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_qiet4"] [sub_resource type="NoiseTexture2D" id="NoiseTexture2D_qiet4"]
seamless = true seamless = true
seamless_blend_skirt = 0.279 seamless_blend_skirt = 0.279
color_ramp = SubResource("Gradient_hths4") color_ramp = SubResource("Gradient_hths4")
noise = SubResource("FastNoiseLite_lfwp0") noise = ExtResource("4_gtn7m")
[sub_resource type="ShaderMaterial" id="ShaderMaterial_dt448"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_dt448"]
render_priority = 0 render_priority = 0
@@ -46,6 +41,19 @@ shader_parameter/roughness = 0.454
shader_parameter/normal_strength = 1.0 shader_parameter/normal_strength = 1.0
shader_parameter/edge_color = Color(0, 0, 0, 1) shader_parameter/edge_color = Color(0, 0, 0, 1)
[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_rvyv7"]
color_ramp = SubResource("Gradient_hths4")
noise = ExtResource("4_gtn7m")
[sub_resource type="ShaderMaterial" id="ShaderMaterial_euvyt"]
render_priority = 0
shader = ExtResource("3_gtn7m")
shader_parameter/warp_ScreenSpace = true
shader_parameter/texture_albedo = SubResource("NoiseTexture2D_rvyv7")
[sub_resource type="PlaneMesh" id="PlaneMesh_hths4"]
material = SubResource("ShaderMaterial_euvyt")
[sub_resource type="ShaderMaterial" id="ShaderMaterial_8na0g"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_8na0g"]
render_priority = 0 render_priority = 0
shader = ExtResource("5_euvyt") shader = ExtResource("5_euvyt")
@@ -72,6 +80,11 @@ surface_material_override/0 = SubResource("ShaderMaterial_dt448")
[node name="WALKWAY" parent="Model/30_A2_VOID_ROOM_VER_3" index="1"] [node name="WALKWAY" parent="Model/30_A2_VOID_ROOM_VER_3" index="1"]
surface_material_override/0 = SubResource("ShaderMaterial_rialp") surface_material_override/0 = SubResource("ShaderMaterial_rialp")
[node name="Doorway" type="MeshInstance3D" parent="Model/30_A2_VOID_ROOM_VER_3"]
transform = Transform3D(2.035, 0, 0, 0, -8.89527e-08, 2.035, 0, -2.035, -8.89527e-08, -12.0001, 2.4173, 18.0276)
mesh = SubResource("PlaneMesh_hths4")
skeleton = NodePath("../../..")
[node name="Collision" type="Node3D" parent="."] [node name="Collision" type="Node3D" parent="."]
[node name="Doors" type="Node3D" parent="."] [node name="Doors" type="Node3D" parent="."]

View File

@@ -1,14 +1,22 @@
shader_type spatial; shader_type spatial;
render_mode specular_schlick_ggx;
void vertex() { uniform sampler2D env_texture;
// Called for every vertex the material is visible on. uniform vec3 metal_color_gold = vec3(1.0, 0.843, 0.0);
} uniform vec3 metal_color_silver = vec3(0.75, 0.75, 0.75);
uniform bool use_gold = true;
uniform float roughness : hint_range(0.0, 1.0) = 0.1;
uniform float metallic : hint_range(0.0, 1.0) = 1.0;
void fragment() { void fragment() {
// Called for every pixel the material is visible on. vec3 metal_color = use_gold ? metal_color_gold : metal_color_silver;
} ALBEDO = metal_color;
METALLIC = metallic;
ROUGHNESS = roughness;
//void light() { vec3 view_dir = normalize(-NORMAL);
// // Called for every pixel for every light affecting the material. vec2 env_uv = vec2(0.5 + 0.5 * view_dir.x, 0.5 - 0.5 * view_dir.y);
// // Uncomment to replace the default light processing function with this one. vec3 env_reflection = texture(env_texture, env_uv).rgb;
//}
EMISSION = env_reflection * 0.5;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 44 KiB

View File

@@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://02j4vggafyp3"
path="res://.godot/imported/dsrt.jpg-fbcad860b4cc3e93fbb211916fb8a05e.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://src/map/map shaders/dsrt.jpg"
dest_files=["res://.godot/imported/dsrt.jpg-fbcad860b4cc3e93fbb211916fb8a05e.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
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

View File

@@ -0,0 +1,7 @@
[gd_resource type="FastNoiseLite" format=3 uid="uid://c7mj06ydprexd"]
[resource]
noise_type = 2
seed = 1
frequency = 0.0264
domain_warp_enabled = true

Binary file not shown.

Before

Width:  |  Height:  |  Size: 234 KiB

File diff suppressed because one or more lines are too long

View File

@@ -21,7 +21,7 @@ Dialogue = ExtResource("2_x0dcb")
[node name="Sprite" type="Sprite3D" parent="."] [node name="Sprite" type="Sprite3D" parent="."]
unique_name_in_owner = true unique_name_in_owner = true
transform = Transform3D(0.895, 0, 0, 0, 0.895, 0, 0, 0, 0.895, 0, 0.1, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 0)
gi_mode = 0 gi_mode = 0
billboard = 2 billboard = 2
shaded = true shaded = true

View File

@@ -382,11 +382,12 @@ autostart = true
[node name="OmniLight3D" type="OmniLight3D" parent="Lights"] [node name="OmniLight3D" type="OmniLight3D" parent="Lights"]
transform = Transform3D(0.999997, 0, 0.00260054, 0, 1, 0, -0.00260054, 0, 0.999997, 0.0645475, 1.59919, 0.55925) transform = Transform3D(0.999997, 0, 0.00260054, 0, 1, 0, -0.00260054, 0, 0.999997, 0.0645475, 1.59919, 0.55925)
visible = false
light_energy = 2.0 light_energy = 2.0
light_indirect_energy = 2.0 light_indirect_energy = 2.0
omni_range = 10.0 light_bake_mode = 1
omni_attenuation = 2.0 shadow_enabled = true
omni_range = 4.571
omni_attenuation = 1.176
[node name="Animation" type="Node3D" parent="."] [node name="Animation" type="Node3D" parent="."]
@@ -410,9 +411,12 @@ flip_v = true
[node name="Camera" type="Node3D" parent="."] [node name="Camera" type="Node3D" parent="."]
[node name="Camera3D" type="Camera3D" parent="Camera"] [node name="Camera3D" type="Camera3D" parent="Camera"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.003, 1.4569, 0.482136) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.003, 1.277, 0.462)
cull_mask = 1048569 cull_mask = 1048569
doppler_tracking = 1
fov = 65.9
near = 0.001 near = 0.001
far = 9000.0
[node name="player_model" type="Node3D" parent="Camera"] [node name="player_model" type="Node3D" parent="Camera"]
transform = Transform3D(-0.015, 0, -2.26494e-09, 0, 0.015, 0, 2.26494e-09, 0, -0.015, 0, -0.268445, 0.826517) transform = Transform3D(-0.015, 0, -2.26494e-09, 0, 0.015, 0, 2.26494e-09, 0, -0.015, 0, -0.268445, 0.826517)