diff --git a/godot/.import/tentacle_creak.ogg-77fd1a525e02a417edd932ab8ea07e8a.md5 b/godot/.import/tentacle_creak.ogg-77fd1a525e02a417edd932ab8ea07e8a.md5 new file mode 100644 index 0000000..12bc231 --- /dev/null +++ b/godot/.import/tentacle_creak.ogg-77fd1a525e02a417edd932ab8ea07e8a.md5 @@ -0,0 +1,3 @@ +source_md5="ac95412a3e5d10d96b640b194a08e0a3" +dest_md5="42dc367aa7ded7d3e5093ed2c788b712" + diff --git a/godot/.import/tentacle_creak.ogg-77fd1a525e02a417edd932ab8ea07e8a.oggstr b/godot/.import/tentacle_creak.ogg-77fd1a525e02a417edd932ab8ea07e8a.oggstr new file mode 100644 index 0000000..182023b Binary files /dev/null and b/godot/.import/tentacle_creak.ogg-77fd1a525e02a417edd932ab8ea07e8a.oggstr differ diff --git a/godot/.import/tentacle_creak.ogg-fded0118c90f93dc01b7248d9f46cb8f.md5 b/godot/.import/tentacle_creak.ogg-fded0118c90f93dc01b7248d9f46cb8f.md5 new file mode 100644 index 0000000..12bc231 --- /dev/null +++ b/godot/.import/tentacle_creak.ogg-fded0118c90f93dc01b7248d9f46cb8f.md5 @@ -0,0 +1,3 @@ +source_md5="ac95412a3e5d10d96b640b194a08e0a3" +dest_md5="42dc367aa7ded7d3e5093ed2c788b712" + diff --git a/godot/.import/tentacle_creak.ogg-fded0118c90f93dc01b7248d9f46cb8f.oggstr b/godot/.import/tentacle_creak.ogg-fded0118c90f93dc01b7248d9f46cb8f.oggstr new file mode 100644 index 0000000..182023b Binary files /dev/null and b/godot/.import/tentacle_creak.ogg-fded0118c90f93dc01b7248d9f46cb8f.oggstr differ diff --git a/godot/.import/tentacle_creak.wav-5dcf0a984875bd001e797a2f65c08a4b.md5 b/godot/.import/tentacle_creak.wav-5dcf0a984875bd001e797a2f65c08a4b.md5 new file mode 100644 index 0000000..0781c16 --- /dev/null +++ b/godot/.import/tentacle_creak.wav-5dcf0a984875bd001e797a2f65c08a4b.md5 @@ -0,0 +1,3 @@ +source_md5="7b12348c893913453445a1bac2971471" +dest_md5="2465021857237f17fb4ce551b8d3da4e" + diff --git a/godot/.import/tentacle_creak.wav-5dcf0a984875bd001e797a2f65c08a4b.sample b/godot/.import/tentacle_creak.wav-5dcf0a984875bd001e797a2f65c08a4b.sample new file mode 100644 index 0000000..452cac6 Binary files /dev/null and b/godot/.import/tentacle_creak.wav-5dcf0a984875bd001e797a2f65c08a4b.sample differ diff --git a/godot/.import/tentacle_creak.wav-6b88153908a8a49e1ba75730ca7a4a3c.md5 b/godot/.import/tentacle_creak.wav-6b88153908a8a49e1ba75730ca7a4a3c.md5 new file mode 100644 index 0000000..0781c16 --- /dev/null +++ b/godot/.import/tentacle_creak.wav-6b88153908a8a49e1ba75730ca7a4a3c.md5 @@ -0,0 +1,3 @@ +source_md5="7b12348c893913453445a1bac2971471" +dest_md5="2465021857237f17fb4ce551b8d3da4e" + diff --git a/godot/assets/audio/tentacle_creak.ogg b/godot/assets/audio/tentacle_creak.ogg new file mode 100644 index 0000000..2bb71d2 --- /dev/null +++ b/godot/assets/audio/tentacle_creak.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a6af2a0e1176822a32bc0307629b2d31e88ca0972baa551a30c481694c0fdc6 +size 41244 diff --git a/godot/assets/audio/tentacle_creak.ogg.import b/godot/assets/audio/tentacle_creak.ogg.import new file mode 100644 index 0000000..a07fa54 --- /dev/null +++ b/godot/assets/audio/tentacle_creak.ogg.import @@ -0,0 +1,15 @@ +[remap] + +importer="ogg_vorbis" +type="AudioStreamOGGVorbis" +path="res://.import/tentacle_creak.ogg-77fd1a525e02a417edd932ab8ea07e8a.oggstr" + +[deps] + +source_file="res://assets/audio/tentacle_creak.ogg" +dest_files=[ "res://.import/tentacle_creak.ogg-77fd1a525e02a417edd932ab8ea07e8a.oggstr" ] + +[params] + +loop=true +loop_offset=0 diff --git a/godot/assets/meat_creek/Dolly.gd b/godot/assets/meat_creek/Dolly.gd deleted file mode 100644 index 830fd8c..0000000 --- a/godot/assets/meat_creek/Dolly.gd +++ /dev/null @@ -1,6 +0,0 @@ -extends PathFollow - -var platform_speed = 10 - -func _physics_process(delta): - self.offset += delta * platform_speed diff --git a/godot/assets/meat_creek/side_tunnel_1.tscn b/godot/assets/meat_creek/side_tunnel_1.tscn index 064bd8a..3f45cad 100644 --- a/godot/assets/meat_creek/side_tunnel_1.tscn +++ b/godot/assets/meat_creek/side_tunnel_1.tscn @@ -30,7 +30,7 @@ panorama = ExtResource( 4 ) background_mode = 2 background_sky = SubResource( 2 ) ambient_light_color = Color( 0.329412, 0.231373, 0.231373, 1 ) -ambient_light_energy = 2.0 +ambient_light_energy = 1.5 ambient_light_sky_contribution = 0.0 fog_enabled = true fog_color = Color( 0.0117647, 0.0156863, 0.0156863, 1 ) @@ -296,6 +296,9 @@ transform = Transform( -0.449096, 0.167882, 0.254066, 0.12168, 0.619619, -0.0688 [node name="meat_tentacle_small2" parent="decorations/tentacle_cluster_8" index="4" instance=ExtResource( 21 )] transform = Transform( -0.451285, 0.168114, 0.250056, -0.00507374, 0.56347, -0.271243, -0.30563, -0.257587, -0.430144, -1.93217, -0.560821, -0.363808 ) +[node name="obelisk" parent="decorations" index="10" instance=ExtResource( 20 )] +transform = Transform( 1.75, 0, 0, 0, 1, 0, 0, 0, 1.25, 58.9486, 6.79926, -57.7791 ) + [node name="blackboxes" type="Spatial" parent="." index="7"] [node name="black_box0" parent="blackboxes" index="0" instance=ExtResource( 19 )] @@ -333,10 +336,7 @@ max_distance = 200.0 [node name="upper_shelf" parent="." index="12" instance=ExtResource( 13 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.09789, 0 ) -[node name="obelisk" parent="." index="13" instance=ExtResource( 20 )] -transform = Transform( 1.5, 0, 0, 0, 1, 0, 0, 0, 1, 66.6986, 6.79926, -61.306 ) - -[node name="AmbientSounds" type="Node" parent="." index="14"] +[node name="AmbientSounds" type="Node" parent="." index="13"] [node name="WaterSound" type="AudioStreamPlayer" parent="AmbientSounds" index="0"] stream = ExtResource( 14 ) diff --git a/godot/assets/models/Material_003.material.tmp b/godot/assets/models/Material_003.material.tmp new file mode 100644 index 0000000..4a23758 Binary files /dev/null and b/godot/assets/models/Material_003.material.tmp differ diff --git a/godot/assets/models/meat_tentacle.tscn b/godot/assets/models/meat_tentacle.tscn index 7085461..45b9ec4 100644 --- a/godot/assets/models/meat_tentacle.tscn +++ b/godot/assets/models/meat_tentacle.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://assets/models/meat_tentacle.glb" type="PackedScene" id=1] [ext_resource path="res://assets/models/MeatElevatorEntrance.material" type="Material" id=2] +[ext_resource path="res://assets/audio/tentacle_creak.ogg" type="AudioStream" id=3] [sub_resource type="Animation" id=3] resource_name = "ArmatureAction-loop" @@ -85,6 +86,20 @@ tracks/4/loop_wrap = true tracks/4/imported = false tracks/4/enabled = true tracks/4/keys = PoolRealArray( 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 ) +tracks/5/type = "audio" +tracks/5/path = NodePath("meat_tentacle_animation/creaking_sfx") +tracks/5/interp = 1 +tracks/5/loop_wrap = true +tracks/5/imported = false +tracks/5/enabled = true +tracks/5/keys = { +"clips": [ { +"end_offset": 0.0, +"start_offset": 0.0, +"stream": ExtResource( 3 ) +} ], +"times": PoolRealArray( 0 ) +} [sub_resource type="CapsuleShape" id=1] radius = 0.997672 @@ -108,6 +123,14 @@ autoplay = "ArmatureAction-loop" playback_speed = 0.5 anims/ArmatureAction-loop = SubResource( 4 ) +[node name="creaking_sfx" type="AudioStreamPlayer3D" parent="meat_tentacle_animation" index="0"] +stream = ExtResource( 3 ) +unit_db = 10.0 +unit_size = 7.0 +pitch_scale = 0.6 +autoplay = true +max_distance = 300.0 + [node name="StaticBody" type="StaticBody" parent="." index="3"] transform = Transform( 1.29603, 0.396787, 0.0456263, -0.180669, 2.84635, 0.327301, 0, -0.581511, 1.63319, -0.459882, 0, -0.0209413 ) diff --git a/godot/default_bus_layout.tres b/godot/default_bus_layout.tres new file mode 100644 index 0000000..eb4accc --- /dev/null +++ b/godot/default_bus_layout.tres @@ -0,0 +1,3 @@ +[gd_resource type="AudioBusLayout" format=2] + +[resource] diff --git a/godot/player/player.tscn b/godot/player/player.tscn index 470e731..f9fcbab 100644 --- a/godot/player/player.tscn +++ b/godot/player/player.tscn @@ -187,7 +187,11 @@ current = true [node name="Flashlight" parent="Smoothing/CameraController/Rotation/Camera" instance=ExtResource( 8 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.00211835, 0 ) +light_energy = 1.25 +light_specular = 0.0 light_cull_mask = 4294966783 +spot_range = 25.0 +spot_angle = 20.0 [node name="HighSpeedFOV" type="Node" parent="Smoothing/CameraController/Rotation/Camera"] script = ExtResource( 11 ) @@ -260,7 +264,6 @@ anims/jump_landing = SubResource( 11 ) script = ExtResource( 12 ) [node name="PauseScreen" parent="Overlay" instance=ExtResource( 20 )] -mouse_filter = 1 [node name="HurtScreen" type="TextureRect" parent="Overlay"] modulate = Color( 1, 1, 1, 0 ) diff --git a/godot/project.godot b/godot/project.godot index 5248249..fba7a19 100644 --- a/godot/project.godot +++ b/godot/project.godot @@ -94,7 +94,6 @@ config/icon="res://meat_madness_icon.png" Util="*res://util.gd" GlobalEventBus="*res://global_event_bus.gd" SavedDialogueProgress="*res://saved_dialogue_progress.gd" -DebugTools="*res://DebugTools.tscn" [display]