diff --git a/levels/ghost_ship/level/corridor_2/corridor_2.tscn b/levels/ghost_ship/level/corridor_2/corridor_2.tscn index 5f33bc4..ecdefda 100644 --- a/levels/ghost_ship/level/corridor_2/corridor_2.tscn +++ b/levels/ghost_ship/level/corridor_2/corridor_2.tscn @@ -21,7 +21,7 @@ [ext_resource type="ArrayMesh" uid="uid://c785n3j3aq4sf" path="res://assets/level/wall/wall_1.mesh" id="17_ka7sa"] [ext_resource type="Material" uid="uid://c1vy4bkwb1g5m" path="res://assets/materials/grunk_overlays/lowrez_overlay.material" id="17_wqkax"] [ext_resource type="PackedScene" uid="uid://drm5dspi48pf5" path="res://src/props/crate_long/phys_crate_long.tscn" id="19_j48oc"] -[ext_resource type="PackedScene" uid="uid://kctp5erogwcb" path="res://src/world/mechanics/listener/listener.tscn" id="22_arxka"] +[ext_resource type="PackedScene" uid="uid://kctp5erogwcb" path="res://src/world/mechanics/listener/gunk_listener.tscn" id="22_arxka"] [ext_resource type="ArrayMesh" uid="uid://d0sdsir1hqnbu" path="res://assets/level/wall/wall_4.mesh" id="23_7ox1u"] [ext_resource type="PackedScene" uid="uid://dgeg3kkogm71m" path="res://src/world/mechanics/alarm/gunk_alarm.tscn" id="23_osdhu"] [ext_resource type="PackedScene" uid="uid://2yqi5u5eo025" path="res://src/world/gunk_node/grunk_nodule.tscn" id="24_6qtqj"] diff --git a/levels/ghost_ship/level/crew_quarters/crew_quarters.tscn b/levels/ghost_ship/level/crew_quarters/crew_quarters.tscn index f506ec5..8c3114e 100644 --- a/levels/ghost_ship/level/crew_quarters/crew_quarters.tscn +++ b/levels/ghost_ship/level/crew_quarters/crew_quarters.tscn @@ -9,7 +9,7 @@ [ext_resource type="PackedScene" uid="uid://30o8ltnnxpxo" path="res://src/effects/floating_dust.tscn" id="7_smsfc"] [ext_resource type="ArrayMesh" uid="uid://b17naqcl4ie21" path="res://assets/level/floor/floor_1.mesh" id="8_vt83f"] [ext_resource type="ArrayMesh" uid="uid://dbgk0kdg1vufk" path="res://assets/level/ceiling/ceiling_1.mesh" id="9_ga3kk"] -[ext_resource type="PackedScene" uid="uid://kctp5erogwcb" path="res://src/world/mechanics/listener/listener.tscn" id="10_4ybca"] +[ext_resource type="PackedScene" uid="uid://kctp5erogwcb" path="res://src/world/mechanics/listener/gunk_listener.tscn" id="10_4ybca"] [ext_resource type="PackedScene" uid="uid://ctm84yms40858" path="res://src/props/railing/railing.tscn" id="10_b82y2"] [ext_resource type="PackedScene" uid="uid://bttust5ohud8e" path="res://src/world/mechanics/relay/gunk_relay.tscn" id="11_ct7ya"] [ext_resource type="PackedScene" uid="uid://c55n6h3ydi32e" path="res://src/props/sofa/phys_sofa.tscn" id="11_vt83f"] diff --git a/levels/testing/mechanic_test/mechanic_test.tscn b/levels/testing/mechanic_test/mechanic_test.tscn index 75a9e51..dc618b3 100644 --- a/levels/testing/mechanic_test/mechanic_test.tscn +++ b/levels/testing/mechanic_test/mechanic_test.tscn @@ -12,7 +12,7 @@ [ext_resource type="PackedScene" uid="uid://cfqirm2o3uo4k" path="res://levels/testing/mechanic_test/prop_test.tscn" id="10_xrfi2"] [ext_resource type="PackedScene" uid="uid://dbabcsp38wmid" path="res://levels/testing/mechanic_test/item_test.tscn" id="11_8natv"] [ext_resource type="ArrayMesh" uid="uid://dpr5cgq743f4s" path="res://assets/level/floor/floor_9x9.mesh" id="13_aix42"] -[ext_resource type="PackedScene" uid="uid://kctp5erogwcb" path="res://src/world/mechanics/listener/listener.tscn" id="13_awnx0"] +[ext_resource type="PackedScene" uid="uid://kctp5erogwcb" path="res://src/world/mechanics/listener/gunk_listener.tscn" id="13_awnx0"] [ext_resource type="PackedScene" uid="uid://c8vbjgol5nenc" path="res://src/world/grunk_beast/beast_spawner/floor_spawner.tscn" id="13_cgmn0"] [ext_resource type="PackedScene" uid="uid://5vh7mnjavlle" path="res://src/world/grunk_beast/beast_spawner/transient_floor_spawner.tscn" id="15_6frcc"] [ext_resource type="PackedScene" uid="uid://drm5dspi48pf5" path="res://src/props/crate_long/phys_crate_long.tscn" id="15_aix42"] diff --git a/levels/testing/mechanic_test/signal_test.tscn b/levels/testing/mechanic_test/signal_test.tscn index f26281e..ea60b34 100644 --- a/levels/testing/mechanic_test/signal_test.tscn +++ b/levels/testing/mechanic_test/signal_test.tscn @@ -7,7 +7,7 @@ [ext_resource type="PackedScene" uid="uid://bttust5ohud8e" path="res://src/world/mechanics/relay/gunk_relay.tscn" id="9_d4a3d"] [ext_resource type="PackedScene" uid="uid://dgeg3kkogm71m" path="res://src/world/mechanics/alarm/gunk_alarm.tscn" id="10_l8xa5"] [ext_resource type="PackedScene" uid="uid://d0j20q65wnqsr" path="res://src/world/mechanics/heart/gunk_heart.tscn" id="11_tfbib"] -[ext_resource type="PackedScene" uid="uid://kctp5erogwcb" path="res://src/world/mechanics/listener/listener.tscn" id="12_e8utx"] +[ext_resource type="PackedScene" uid="uid://kctp5erogwcb" path="res://src/world/mechanics/listener/gunk_listener.tscn" id="12_e8utx"] [sub_resource type="ArrayMesh" id="ArrayMesh_ix0jw"] _surfaces = [{ diff --git a/src/world/mechanics/listener/listener.gd b/src/world/mechanics/listener/gunk_listener.gd similarity index 100% rename from src/world/mechanics/listener/listener.gd rename to src/world/mechanics/listener/gunk_listener.gd diff --git a/src/world/mechanics/listener/listener.gd.uid b/src/world/mechanics/listener/gunk_listener.gd.uid similarity index 100% rename from src/world/mechanics/listener/listener.gd.uid rename to src/world/mechanics/listener/gunk_listener.gd.uid diff --git a/src/world/mechanics/listener/listener.tscn b/src/world/mechanics/listener/gunk_listener.tscn similarity index 60% rename from src/world/mechanics/listener/listener.tscn rename to src/world/mechanics/listener/gunk_listener.tscn index 9a88cb2..fefe2ea 100644 --- a/src/world/mechanics/listener/listener.tscn +++ b/src/world/mechanics/listener/gunk_listener.tscn @@ -1,13 +1,134 @@ -[gd_scene load_steps=17 format=3 uid="uid://kctp5erogwcb"] +[gd_scene load_steps=31 format=3 uid="uid://kctp5erogwcb"] -[ext_resource type="Script" uid="uid://bde7cglaqobkd" path="res://src/world/mechanics/listener/listener.gd" id="1_htscg"] +[ext_resource type="Script" uid="uid://bde7cglaqobkd" path="res://src/world/mechanics/listener/gunk_listener.gd" id="1_htscg"] [ext_resource type="Script" uid="uid://cfsiyhhrcua6o" path="res://src/world/game_sound/game_sound_listener.gd" id="2_htscg"] [ext_resource type="PackedScene" uid="uid://c2c0ooj1re3dk" path="res://src/world/mechanics/listener/listener_model.tscn" id="3_r42ft"] +[ext_resource type="Shader" uid="uid://ckxc0ngd37rtk" path="res://src/shaders/gunk/gunk.gdshader" id="4_gt631"] +[ext_resource type="FastNoiseLite" uid="uid://cnlvdtx68giv6" path="res://assets/materials/gunk_noise.tres" id="5_gg3ey"] [ext_resource type="Texture2D" uid="uid://bl1aniu87mioa" path="res://assets/particles/light_02.png" id="7_pp7wn"] [sub_resource type="SphereShape3D" id="SphereShape3D_2ibh1"] radius = 1.0 +[sub_resource type="NoiseTexture3D" id="NoiseTexture3D_2roq2"] +width = 256 +height = 256 +depth = 32 +seamless = true +seamless_blend_skirt = 0.5 +noise = ExtResource("5_gg3ey") + +[sub_resource type="FastNoiseLite" id="FastNoiseLite_7fplw"] +frequency = 0.0703 + +[sub_resource type="NoiseTexture3D" id="NoiseTexture3D_omayi"] +width = 32 +height = 32 +depth = 128 +noise = SubResource("FastNoiseLite_7fplw") + +[sub_resource type="Gradient" id="Gradient_ih22n"] +offsets = PackedFloat32Array(0, 0.001, 0.05) +colors = PackedColorArray(0, 0, 0, 1, 0.25098, 0.878431, 1, 1, 0, 0, 0, 1) + +[sub_resource type="GradientTexture2D" id="GradientTexture2D_v2pcm"] +gradient = SubResource("Gradient_ih22n") +fill = 1 +fill_from = Vector2(0.5, 0.5) + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_4io3x"] +resource_local_to_scene = true +render_priority = 0 +shader = ExtResource("4_gt631") +shader_parameter/gunk_noise = SubResource("NoiseTexture3D_2roq2") +shader_parameter/color_1 = Color(0, 0.03, 0.1, 1) +shader_parameter/color_2 = Color(0, 0.1, 0.3, 1) +shader_parameter/emission_color = Color(0.25, 0.88, 1, 1) +shader_parameter/uv_scale = Vector2(2, 2) +shader_parameter/pan_speed = Vector2(0, 0) +shader_parameter/time_scale = 0.2 +shader_parameter/pixellation = 128.0 +shader_parameter/time_pixellation = 30.0 +shader_parameter/roughness = 0.15 +shader_parameter/specular_contribution = 0.8 +shader_parameter/emission_strength = 0.02 +shader_parameter/bump_strength = 10.0 +shader_parameter/fresnel_color = Color(0.25, 0.88, 1, 1) +shader_parameter/fresnel_power = 4.0 +shader_parameter/fresnel_intensity = 0.0 +shader_parameter/iridescence_color = Color(1, 1, 1, 1) +shader_parameter/iridescence_power = 4.0 +shader_parameter/iridescence_intensity = 0.0 +shader_parameter/overlay_emission = SubResource("GradientTexture2D_v2pcm") +shader_parameter/overlay_emission_scale = 0.02 +shader_parameter/jitter_magnitude = 0.4 +shader_parameter/jitter_time_scale = 0.1 +shader_parameter/jitter_noise = SubResource("NoiseTexture3D_omayi") +shader_parameter/vertex_inflation = 0.0 +shader_parameter/inflation_pixellation = 10.0 + +[sub_resource type="NoiseTexture3D" id="NoiseTexture3D_pp7wn"] +width = 256 +height = 256 +depth = 32 +seamless = true +seamless_blend_skirt = 0.5 +noise = ExtResource("5_gg3ey") + +[sub_resource type="FastNoiseLite" id="FastNoiseLite_c5snp"] +frequency = 0.0703 + +[sub_resource type="NoiseTexture3D" id="NoiseTexture3D_q7kpl"] +width = 32 +height = 32 +depth = 128 +noise = SubResource("FastNoiseLite_c5snp") + +[sub_resource type="Gradient" id="Gradient_mkgnp"] +resource_local_to_scene = true +offsets = PackedFloat32Array(0, 0.001, 0.002, 0.003, 0.004, 0.005, 0.006, 0.007, 0.008) +colors = PackedColorArray(0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0, 0, 1) + +[sub_resource type="GradientTexture2D" id="GradientTexture2D_l8xpq"] +resource_local_to_scene = true +gradient = SubResource("Gradient_mkgnp") +width = 32 +height = 32 +fill = 1 +fill_from = Vector2(0.5, 0.5) +fill_to = Vector2(1, 1) + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_n7js6"] +resource_local_to_scene = true +render_priority = 0 +shader = ExtResource("4_gt631") +shader_parameter/gunk_noise = SubResource("NoiseTexture3D_pp7wn") +shader_parameter/color_1 = Color(0, 0.03, 0.1, 1) +shader_parameter/color_2 = Color(0, 0.1, 0.3, 1) +shader_parameter/emission_color = Color(0.66, 0.943333, 1, 1) +shader_parameter/uv_scale = Vector2(2, 2) +shader_parameter/pan_speed = Vector2(0, 0) +shader_parameter/time_scale = 0.2 +shader_parameter/pixellation = 128.0 +shader_parameter/time_pixellation = 30.0 +shader_parameter/roughness = 0.15 +shader_parameter/specular_contribution = 0.8 +shader_parameter/emission_strength = 0.2 +shader_parameter/bump_strength = 10.0 +shader_parameter/fresnel_color = Color(0.25, 0.88, 1, 1) +shader_parameter/fresnel_power = 4.0 +shader_parameter/fresnel_intensity = 0.0 +shader_parameter/iridescence_color = Color(1, 1, 1, 1) +shader_parameter/iridescence_power = 4.0 +shader_parameter/iridescence_intensity = 0.0 +shader_parameter/overlay_emission = SubResource("GradientTexture2D_l8xpq") +shader_parameter/overlay_emission_scale = 6.0 +shader_parameter/jitter_magnitude = 0.4 +shader_parameter/jitter_time_scale = 0.1 +shader_parameter/jitter_noise = SubResource("NoiseTexture3D_q7kpl") +shader_parameter/vertex_inflation = 0.0 +shader_parameter/inflation_pixellation = 10.0 + [sub_resource type="Curve" id="Curve_pp7wn"] _limits = [0.0, 0.3, 0.0, 1.0] _data = [Vector2(0, 0), 0.0, 1.51554, 0, 0, Vector2(0.101629, 0.115028), 0.436038, 0.436038, 0, 0, Vector2(0.421742, 0.0779494), 0.21293, 0.21293, 0, 0, Vector2(1, 0), -0.0537925, 0.0, 0, 0] @@ -65,7 +186,7 @@ radius = 0.125 height = 0.1 radius = 0.175 -[node name="Listener" type="StaticBody3D" groups=["Persistent"]] +[node name="GunkListener" type="StaticBody3D" groups=["Persistent"]] collision_layer = 36 collision_mask = 0 script = ExtResource("1_htscg") @@ -130,10 +251,14 @@ bones/38/rotation = Quaternion(0.247978, -1.26717e-07, -3.12779e-07, 0.968766) bones/39/rotation = Quaternion(0.148338, 2.72959e-08, 3.46469e-07, 0.988937) bones/40/rotation = Quaternion(0.237284, 5.07144e-06, -1.68211e-06, 0.97144) +[node name="Listener" parent="ListenerModel/Armature/Skeleton3D" index="0"] +surface_material_override/0 = SubResource("ShaderMaterial_4io3x") +surface_material_override/1 = SubResource("ShaderMaterial_n7js6") + [node name="PhysicalBoneSimulator3D" type="PhysicalBoneSimulator3D" parent="ListenerModel/Armature/Skeleton3D" index="6"] [node name="PhysicalBone3D" type="PhysicalBone3D" parent="ListenerModel/Armature/Skeleton3D/PhysicalBoneSimulator3D"] -transform = Transform3D(0.323524, 1.2631e-06, 1.20741, -3.57116e-07, 1.25, -1.21197e-06, -1.20741, -3.12658e-08, 0.323524, -4.8128e-06, 0.800007, -1.25657e-06) +transform = Transform3D(0.323527, 1.2631e-06, 1.20741, -3.57116e-07, 1.25, -1.21197e-06, -1.20741, -3.12629e-08, 0.323527, -4.8128e-06, 0.800007, -1.25658e-06) joint_offset = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.38539e-08, -5.72204e-06, 3.9816e-06) body_offset = Transform3D(1.25, 3.57626e-07, -3.57628e-07, -3.57627e-07, 1.25, -1.22189e-06, 3.57628e-07, 1.22189e-06, 1.25, -2.98139e-08, 7.15256e-06, -4.97699e-06) bone_name = "Stem5" @@ -158,7 +283,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.14, 0) shape = SubResource("CylinderShape3D_dqq13") [node name="CollisionShape3D2" type="CollisionShape3D" parent="."] -transform = Transform3D(0.258814, 1.01046e-06, 0.96591, -2.85687e-07, 0.999981, -9.69562e-07, -0.965905, -2.50121e-08, 0.258815, -3.61278e-06, 0.875006, -1.01113e-06) +transform = Transform3D(0.258816, 1.01046e-06, 0.965909, -2.85686e-07, 0.999981, -9.69562e-07, -0.965904, -2.50099e-08, 0.258817, -3.61278e-06, 0.875006, -1.01114e-06) shape = SubResource("CylinderShape3D_r42ft") [node name="CooldownTimer" type="Timer" parent="."]