From 5427050fb5aba385e70298db6f3daf9aa149fcbe Mon Sep 17 00:00:00 2001 From: dukegoobler <76922012+vengefulcartographer@users.noreply.github.com> Date: Thu, 29 Dec 2022 21:19:58 -0700 Subject: [PATCH] pause screen fix again fixed a mouse capture issue with the overlays in Player plus other tweaks --- godot/assets/meat_creek/Dolly.gd | 6 ++ .../meat_creek/moving_creek_platform.gd | 0 godot/assets/meat_creek/side_tunnel_1.tscn | 66 +++++++++---------- godot/effects/SinkBlock.tscn | 1 + godot/player/OnFootPhysics.gd | 2 +- godot/player/player.tscn | 7 +- godot/screens/PauseScreen.tscn | 16 ++--- 7 files changed, 54 insertions(+), 44 deletions(-) create mode 100644 godot/assets/meat_creek/Dolly.gd create mode 100644 godot/assets/meat_creek/moving_creek_platform.gd diff --git a/godot/assets/meat_creek/Dolly.gd b/godot/assets/meat_creek/Dolly.gd new file mode 100644 index 0000000..830fd8c --- /dev/null +++ b/godot/assets/meat_creek/Dolly.gd @@ -0,0 +1,6 @@ +extends PathFollow + +var platform_speed = 10 + +func _physics_process(delta): + self.offset += delta * platform_speed diff --git a/godot/assets/meat_creek/moving_creek_platform.gd b/godot/assets/meat_creek/moving_creek_platform.gd new file mode 100644 index 0000000..e69de29 diff --git a/godot/assets/meat_creek/side_tunnel_1.tscn b/godot/assets/meat_creek/side_tunnel_1.tscn index 3175227..064bd8a 100644 --- a/godot/assets/meat_creek/side_tunnel_1.tscn +++ b/godot/assets/meat_creek/side_tunnel_1.tscn @@ -62,7 +62,7 @@ glow_bloom = 1.0 autoplay = "Canvas001" [node name="Player" parent="." index="2" instance=ExtResource( 2 )] -transform = Transform( 0.0716538, 0, 0.99743, 0, 1, 0, -0.99743, 0, 0.0716538, -70.375, 15.7962, -106.953 ) +transform = Transform( -0.647561, 0, -0.762014, 0, 1, 0, 0.762014, 0, -0.647561, -70.375, 4.37653, -106.953 ) [node name="LessFogWorldEnvironment" parent="." index="3" instance=ExtResource( 3 )] environment = SubResource( 3 ) @@ -75,63 +75,63 @@ transform = Transform( 80, 0, 0, 0, 3.87358, 0, 0, 0, 80, 0, -3.3489, -43.3626 ) [node name="creek_platform" parent="platforms" index="0" instance=ExtResource( 6 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -55.8201, 0.216419, -98.2347 ) -[node name="creek_platform2" parent="platforms" index="1" instance=ExtResource( 6 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -50.4167, 0.216419, -98.2347 ) - -[node name="creek_platform3" parent="platforms" index="2" instance=ExtResource( 6 )] +[node name="creek_platform3" parent="platforms" index="1" instance=ExtResource( 6 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -45.5517, 0.216419, -98.2347 ) -[node name="creek_platform4" parent="platforms" index="3" instance=ExtResource( 6 )] +[node name="creek_platform4" parent="platforms" index="2" instance=ExtResource( 6 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 16.5243, 0.216419, -81.1974 ) -[node name="creek_platform5" parent="platforms" index="4" instance=ExtResource( 6 )] +[node name="creek_platform5" parent="platforms" index="3" instance=ExtResource( 6 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 17.8115, 0.216419, -86.1008 ) -[node name="creek_platform6" parent="platforms" index="5" instance=ExtResource( 6 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 20.6247, 0.216419, -91.0137 ) +[node name="creek_platform7" parent="platforms" index="4" instance=ExtResource( 6 )] +transform = Transform( 0.916258, 0, -0.400589, 0, 1, 0, 0.400589, 0, 0.916258, 23.1251, 0.216419, -95.1053 ) -[node name="creek_platform7" parent="platforms" index="6" instance=ExtResource( 6 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 23.1251, 0.216419, -95.1053 ) - -[node name="creek_platform8" parent="platforms" index="7" instance=ExtResource( 6 )] +[node name="creek_platform8" parent="platforms" index="5" instance=ExtResource( 6 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 25.3465, 0.216419, -98.9231 ) -[node name="creek_platform9" parent="platforms" index="8" instance=ExtResource( 6 )] +[node name="creek_platform9" parent="platforms" index="6" instance=ExtResource( 6 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -26.9717, 0.216419, -53.8558 ) -[node name="creek_platform10" parent="platforms" index="9" instance=ExtResource( 6 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -26.9717, 0.216419, -47.8731 ) - -[node name="creek_platform12" parent="platforms" index="10" instance=ExtResource( 6 )] +[node name="creek_platform12" parent="platforms" index="7" instance=ExtResource( 6 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -26.9717, 0.216419, -43.2397 ) -[node name="creek_platform11" parent="platforms" index="11" instance=ExtResource( 6 )] +[node name="creek_platform11" parent="platforms" index="8" instance=ExtResource( 6 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -47.8536, 0.216419, -36.2421 ) -[node name="creek_platform13" parent="platforms" index="12" instance=ExtResource( 6 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -52.7107, 0.216419, -33.378 ) - -[node name="creek_platform14" parent="platforms" index="13" instance=ExtResource( 6 )] +[node name="creek_platform14" parent="platforms" index="9" instance=ExtResource( 6 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -58.4389, 0.216419, -31.9906 ) -[node name="creek_platform15" parent="platforms" index="14" instance=ExtResource( 6 )] +[node name="creek_platform15" parent="platforms" index="10" instance=ExtResource( 6 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -46.5247, 0.216419, -8.02865 ) -[node name="creek_platform16" parent="platforms" index="15" instance=ExtResource( 6 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -51.3312, 0.216419, -8.51924 ) - -[node name="creek_platform17" parent="platforms" index="16" instance=ExtResource( 6 )] +[node name="creek_platform17" parent="platforms" index="11" instance=ExtResource( 6 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -56.3389, 0.216419, -8.99764 ) -[node name="creek_platform18" parent="platforms" index="17" instance=ExtResource( 6 )] +[node name="creek_platform18" parent="platforms" index="12" instance=ExtResource( 6 )] transform = Transform( 0.65383, 0, 0.756641, 0, 1, 0, -0.756641, 0, 0.65383, 25.1841, 0.216419, -4.06886 ) -[node name="creek_platform19" parent="platforms" index="18" instance=ExtResource( 6 )] -transform = Transform( 0.65383, 0, 0.756641, 0, 1, 0, -0.756641, 0, 0.65383, 21.6703, 0.216419, -0.752861 ) - -[node name="creek_platform20" parent="platforms" index="19" instance=ExtResource( 6 )] +[node name="creek_platform20" parent="platforms" index="13" instance=ExtResource( 6 )] transform = Transform( 0.65383, 0, 0.756641, 0, 1, 0, -0.756641, 0, 0.65383, 18.0342, 0.216419, 2.72338 ) +[node name="creek_platform2" parent="platforms" index="14" instance=ExtResource( 6 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -50.4167, 0.216419, -98.2347 ) + +[node name="creek_platform6" parent="platforms" index="15" instance=ExtResource( 6 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 20.6247, 0.216419, -91.0137 ) + +[node name="creek_platform10" parent="platforms" index="16" instance=ExtResource( 6 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -26.9717, 0.216419, -47.8731 ) + +[node name="creek_platform13" parent="platforms" index="17" instance=ExtResource( 6 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -52.7107, 0.216419, -33.378 ) + +[node name="creek_platform16" parent="platforms" index="18" instance=ExtResource( 6 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -51.3312, 0.216419, -8.51924 ) + +[node name="creek_platform19" parent="platforms" index="19" instance=ExtResource( 6 )] +transform = Transform( 0.65383, 0, 0.756641, 0, 1, 0, -0.756641, 0, 0.65383, 21.6703, 0.216419, -0.752861 ) + [node name="decorations" type="Spatial" parent="." index="6"] [node name="tentacle_cluster_1" type="Spatial" parent="decorations" index="0"] diff --git a/godot/effects/SinkBlock.tscn b/godot/effects/SinkBlock.tscn index e8ccc8c..0a0e7de 100644 --- a/godot/effects/SinkBlock.tscn +++ b/godot/effects/SinkBlock.tscn @@ -60,6 +60,7 @@ shader_param/texture_albedo = ExtResource( 3 ) [sub_resource type="BoxShape" id=4] [node name="SinkBlock" type="MeshInstance"] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.316939, 0 ) mesh = SubResource( 3 ) material/0 = SubResource( 7 ) script = ExtResource( 2 ) diff --git a/godot/player/OnFootPhysics.gd b/godot/player/OnFootPhysics.gd index 6e5278b..958598d 100644 --- a/godot/player/OnFootPhysics.gd +++ b/godot/player/OnFootPhysics.gd @@ -16,7 +16,7 @@ export var jump_power: float = 50 # Controls the base speeds of walking and sprinting export var sprint_factor: float = 3.5 -export var walk_factor: float = 1.5 +export var walk_factor: float = 2.0 "public" var velocity: Vector3 = Vector3.ZERO # Value changed by code only to add slow down or speed up effects diff --git a/godot/player/player.tscn b/godot/player/player.tscn index a7f51f9..470e731 100644 --- a/godot/player/player.tscn +++ b/godot/player/player.tscn @@ -259,10 +259,14 @@ anims/jump_landing = SubResource( 11 ) [node name="Overlay" type="CanvasLayer" parent="."] 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 ) anchor_right = 1.0 anchor_bottom = 1.0 +mouse_filter = 2 texture = ExtResource( 13 ) stretch_mode = 1 @@ -270,12 +274,11 @@ stretch_mode = 1 anims/RESET = SubResource( 6 ) anims/opacity = SubResource( 7 ) -[node name="PauseScreen" parent="Overlay" instance=ExtResource( 20 )] - [node name="WaterScreen" type="ColorRect" parent="Overlay"] material = SubResource( 13 ) anchor_right = 1.0 anchor_bottom = 1.0 +mouse_filter = 2 color = Color( 1, 1, 1, 0 ) [node name="ObjectiveTracker" type="Node" parent="."] diff --git a/godot/screens/PauseScreen.tscn b/godot/screens/PauseScreen.tscn index 6a2b059..d130d01 100644 --- a/godot/screens/PauseScreen.tscn +++ b/godot/screens/PauseScreen.tscn @@ -14,7 +14,6 @@ theme = ExtResource( 4 ) script = ExtResource( 3 ) [node name="pauseBackground" type="TextureRect" parent="."] -pause_mode = 2 anchor_right = 1.0 anchor_bottom = 1.0 margin_right = 56.0 @@ -23,14 +22,12 @@ texture = ExtResource( 1 ) stretch_mode = 1 [node name="CenterContainer" type="CenterContainer" parent="."] -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 @@ -39,45 +36,48 @@ 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 ) +focus_neighbour_top = NodePath("../QuitButton") +focus_neighbour_bottom = NodePath("../MainMenuButton") 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 ) +focus_neighbour_top = NodePath("../ResumeButton") +focus_neighbour_bottom = NodePath("../ControlsButton") 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 ) +focus_neighbour_top = NodePath("../MainMenuButton") +focus_neighbour_bottom = NodePath("../QuitButton") 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 ) +focus_neighbour_top = NodePath("../ControlsButton") +focus_neighbour_bottom = NodePath("../ResumeButton") mouse_filter = 1 text = "Quit"