diff --git a/godot/assets/meat_creek/side_tunnel_1.tscn b/godot/assets/meat_creek/side_tunnel_1.tscn index 6bbe349..3175227 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.22 +ambient_light_energy = 2.0 ambient_light_sky_contribution = 0.0 fog_enabled = true fog_color = Color( 0.0117647, 0.0156863, 0.0156863, 1 ) @@ -296,45 +296,47 @@ 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="shader" parent="." index="7" instance=ExtResource( 7 )] +[node name="blackboxes" type="Spatial" parent="." index="7"] -[node name="creek_cage" parent="." index="8" instance=ExtResource( 9 )] +[node name="black_box0" parent="blackboxes" index="0" instance=ExtResource( 19 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -41.0261, 1.80736, -111.427 ) -[node name="elevator" parent="." index="9" instance=ExtResource( 10 )] +[node name="black_box1" parent="blackboxes" index="1" instance=ExtResource( 19 )] +transform = Transform( -0.287692, -0.333414, 0.897813, -0.488515, 0.857409, 0.161872, -0.823764, -0.392025, -0.409548, 27.5249, 2.89185, -81.1085 ) +id = 1 + +[node name="black_box2" parent="blackboxes" index="2" instance=ExtResource( 19 )] +transform = Transform( 0.428225, -0.113891, 0.896467, -0.148051, 0.96978, 0.193927, -0.891463, -0.215767, 0.398423, 44.7662, 0.738013, -12.0992 ) +id = 2 + +[node name="black_box3" parent="blackboxes" index="3" instance=ExtResource( 19 )] +transform = Transform( 0.867158, -0.382308, -0.319182, 0.448321, 0.878331, 0.165962, 0.216898, -0.287011, 0.933049, -67.3523, 1.59831, -21.1349 ) +id = 3 + +[node name="black_box4" parent="blackboxes" index="4" instance=ExtResource( 19 )] +transform = Transform( 0.900076, -0.435734, 0, 0.430268, 0.888784, -0.1579, 0.0688022, 0.142122, 0.987455, -1.60433, 2.16359, 17.6124 ) +id = 4 + +[node name="shader" parent="." index="8" instance=ExtResource( 7 )] + +[node name="creek_cage" parent="." index="9" instance=ExtResource( 9 )] + +[node name="elevator" parent="." index="10" instance=ExtResource( 10 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0735546, -123.027, -41.1766 ) -[node name="SignalGenerator" parent="." index="10" instance=ExtResource( 12 )] +[node name="SignalGenerator" parent="." index="11" instance=ExtResource( 12 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.489914, -122.635, -41.5684 ) stream = ExtResource( 16 ) max_db = 6.0 max_distance = 200.0 -[node name="upper_shelf" parent="." index="11" instance=ExtResource( 13 )] +[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="black_box0" parent="." index="12" instance=ExtResource( 19 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -41.0261, 1.80736, -111.427 ) +[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="black_box1" parent="." index="13" instance=ExtResource( 19 )] -transform = Transform( -0.222825, 0, 0.974859, 0, 1, 0, -0.974859, 0, -0.222825, -35.7068, 1.76987, -64.4388 ) -id = 1 - -[node name="black_box2" parent="." index="14" instance=ExtResource( 19 )] -transform = Transform( 0.473566, 0, -0.880759, 0, 1, 0, 0.880759, 0, 0.473566, 44.7662, 0.822734, -12.0992 ) -id = 2 - -[node name="black_box3" parent="." index="15" instance=ExtResource( 19 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -35.0576, 3.21833, 30.1744 ) -id = 3 - -[node name="black_box4" parent="." index="16" instance=ExtResource( 19 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.60433, -122.797, -43.5648 ) -id = 4 - -[node name="obelisk" parent="." index="17" instance=ExtResource( 20 )] -transform = Transform( -0.0547934, 0, 0.998498, 0, 1, 0, -0.998498, 0, -0.0547934, 66.6986, 6.79926, -61.306 ) - -[node name="AmbientSounds" type="Node" parent="." index="18"] +[node name="AmbientSounds" type="Node" parent="." index="14"] [node name="WaterSound" type="AudioStreamPlayer" parent="AmbientSounds" index="0"] stream = ExtResource( 14 ) diff --git a/godot/assets/models/AnimationPlayer.gd b/godot/assets/models/AnimationPlayer.gd index 3ea6aca..8b13789 100644 --- a/godot/assets/models/AnimationPlayer.gd +++ b/godot/assets/models/AnimationPlayer.gd @@ -1,4 +1 @@ -extends AnimationPlayer -func _ready() -> void: - self.play("SphereAction-loop") diff --git a/godot/assets/models/meat_planet.tscn b/godot/assets/models/meat_planet.tscn index f651b16..5770cce 100644 --- a/godot/assets/models/meat_planet.tscn +++ b/godot/assets/models/meat_planet.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://assets/models/meat_planet.glb" type="PackedScene" id=1] [ext_resource path="res://assets/models/PlanetMaterial.material" type="Material" id=2] -[ext_resource path="res://assets/models/AnimationPlayer.gd" type="Script" id=3] [sub_resource type="Animation" id=2] resource_name = "SphereAction-loop" @@ -19,7 +18,7 @@ tracks/0/keys = PoolRealArray( 0, 1, -0.0390858, -0.0390858, 0.0390858, -0.02069 [node name="meat_planet" instance=ExtResource( 1 )] [node name="Sphere" parent="." index="0"] -transform = Transform( 1.94466, -0.236818, -0.0859438, 0.240179, 1.94466, 0.0760474, 0.0760474, -0.0859438, 1.95755, -0.0390858, -0.0390858, 0.0390858 ) +transform = Transform( 1.94466, -0.236818, -0.0859437, 0.240179, 1.94466, 0.0760473, 0.0760473, -0.0859437, 1.95755, -0.0390858, -0.0390858, 0.0390858 ) material_override = ExtResource( 2 ) material/0 = ExtResource( 2 ) @@ -27,4 +26,3 @@ material/0 = ExtResource( 2 ) autoplay = "SphereAction-loop" playback_speed = 0.5 anims/SphereAction-loop = SubResource( 2 ) -script = ExtResource( 3 ) diff --git a/godot/player/player.tscn b/godot/player/player.tscn index 005c8c9..a7f51f9 100644 --- a/godot/player/player.tscn +++ b/godot/player/player.tscn @@ -232,7 +232,7 @@ script = ExtResource( 19 ) [node name="Footsteps" type="AudioStreamPlayer" parent="MovementSoundsAnimations"] stream = ExtResource( 17 ) -volume_db = -15.0 +volume_db = -12.0 [node name="Timer" type="Timer" parent="MovementSoundsAnimations/Footsteps"] one_shot = true diff --git a/godot/project.godot b/godot/project.godot index 655e150..a8f14a5 100644 --- a/godot/project.godot +++ b/godot/project.godot @@ -91,7 +91,6 @@ SavedDialogueProgress="*res://saved_dialogue_progress.gd" [display] -window/size/resizable=false window/size/fullscreen=true [editor_plugins] diff --git a/godot/screens/PauseScreen.tscn b/godot/screens/PauseScreen.tscn index b347aa4..1a5f62e 100644 --- a/godot/screens/PauseScreen.tscn +++ b/godot/screens/PauseScreen.tscn @@ -9,10 +9,13 @@ pause_mode = 2 anchor_right = 1.0 anchor_bottom = 1.0 +focus_mode = 1 +mouse_filter = 1 theme = ExtResource( 4 ) script = ExtResource( 3 ) [node name="pauseBackground" type="TextureRect" parent="."] +pause_mode = 2 anchor_right = 1.0 anchor_bottom = 1.0 texture = ExtResource( 1 ) @@ -22,9 +25,11 @@ stretch_mode = 1 pause_mode = 2 anchor_right = 1.0 anchor_bottom = 1.0 +mouse_filter = 1 theme = ExtResource( 2 ) [node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"] +pause_mode = 2 margin_left = 408.0 margin_top = 193.0 margin_right = 616.0 @@ -33,36 +38,46 @@ theme = ExtResource( 4 ) custom_constants/separation = 10 [node name="Spacer" type="Control" parent="CenterContainer/VBoxContainer"] +pause_mode = 2 margin_right = 208.0 margin_bottom = 30.0 rect_min_size = Vector2( 1, 30 ) +mouse_filter = 1 [node name="ResumeButton" type="Button" parent="CenterContainer/VBoxContainer"] +pause_mode = 2 margin_top = 40.0 margin_right = 208.0 margin_bottom = 76.0 rect_min_size = Vector2( 208, 36 ) +mouse_filter = 1 text = "Resume" [node name="MainMenuButton" type="Button" parent="CenterContainer/VBoxContainer"] +pause_mode = 2 margin_top = 86.0 margin_right = 208.0 margin_bottom = 122.0 rect_min_size = Vector2( 208, 36 ) +mouse_filter = 1 text = "Main Menu" [node name="ControlsButton" type="Button" parent="CenterContainer/VBoxContainer"] +pause_mode = 2 margin_top = 132.0 margin_right = 208.0 margin_bottom = 168.0 rect_min_size = Vector2( 208, 36 ) +mouse_filter = 1 text = "Controls" [node name="QuitButton" type="Button" parent="CenterContainer/VBoxContainer"] +pause_mode = 2 margin_top = 178.0 margin_right = 208.0 margin_bottom = 214.0 rect_min_size = Vector2( 208, 36 ) +mouse_filter = 1 text = "Quit" [connection signal="pressed" from="CenterContainer/VBoxContainer/ResumeButton" to="." method="_on_ResumeButton_pressed"]