From 3b1f933e3d0550c59f165ddd3f7f216b1bb15727 Mon Sep 17 00:00:00 2001 From: karl Date: Wed, 8 Jan 2020 16:02:04 +0100 Subject: [PATCH] Fix pipe color delay --- .../FactoryMachines/FactoryGameplay.tscn | 132 +++++++++--------- .../Interactables/FactoryMachines/PipeGame.gd | 11 +- Level/Interactables/Pipes/ForkPipe.tscn | 2 +- Level/Interactables/Pipes/PipeScript.gd | 2 +- Level/PathTestWorld.tscn | 47 +++---- 5 files changed, 91 insertions(+), 103 deletions(-) diff --git a/Level/Interactables/FactoryMachines/FactoryGameplay.tscn b/Level/Interactables/FactoryMachines/FactoryGameplay.tscn index 098f353..14fef59 100644 --- a/Level/Interactables/FactoryMachines/FactoryGameplay.tscn +++ b/Level/Interactables/FactoryMachines/FactoryGameplay.tscn @@ -71,7 +71,7 @@ mesh = SubResource( 3 ) material/0 = SubResource( 4 ) [node name="ExitCast" type="RayCast" parent="IO Boxes/Output1"] -transform = Transform( -4.37114e-008, 1, 0, -1, -4.37114e-008, 0, 0, 0, 1, -1.00011, 0.341612, -0.167214 ) +transform = Transform( -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, -1.00011, 0.341612, -0.167214 ) enabled = true cast_to = Vector3( 0, -0.5, 0 ) collision_mask = 3 @@ -83,7 +83,7 @@ mesh = SubResource( 3 ) material/0 = SubResource( 4 ) [node name="ExitCast" type="RayCast" parent="IO Boxes/Output2"] -transform = Transform( -4.37114e-008, 1, 0, -1, -4.37114e-008, 0, 0, 0, 1, -1.00011, 0.341612, 0.0168505 ) +transform = Transform( -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, -1.00011, 0.341612, 0.0168505 ) enabled = true cast_to = Vector3( 0, -0.5, 0 ) collision_mask = 3 @@ -95,7 +95,7 @@ mesh = SubResource( 3 ) material/0 = SubResource( 4 ) [node name="ExitCast" type="RayCast" parent="IO Boxes/Output3"] -transform = Transform( -4.37114e-008, 1, 0, -1, -4.37114e-008, 0, 0, 0, 1, -0.922591, 0.341612, 0.145537 ) +transform = Transform( -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, -0.922591, 0.341612, 0.145537 ) enabled = true cast_to = Vector3( 0, -0.5, 0 ) collision_mask = 3 @@ -104,168 +104,168 @@ collision_mask = 3 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0 ) [node name="Pipe1_1" parent="Pipes" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -2.35, 1.25, -0.8 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -2.35, 1.25, -0.8 ) mesh_path = NodePath("../Pipe1_1/Mesh") color_cast_left = NodePath("../Pipe1_1/ColorCast") [node name="Pipe2_1" parent="Pipes" instance=ExtResource( 3 )] editor/display_folded = true -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -1.95, 1.25, -0.8 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -1.95, 1.25, -0.8 ) mesh_path = NodePath("../Pipe2_1/Mesh") color_cast_left = NodePath("../Pipe2_1/ColorCast") [node name="Pipe3_1" parent="Pipes" instance=ExtResource( 3 )] editor/display_folded = true -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -1.55, 1.25, -0.8 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -1.55, 1.25, -0.8 ) mesh_path = NodePath("../Pipe3_1/Mesh") color_cast_left = NodePath("../Pipe3_1/ColorCast") [node name="Pipe4_1" parent="Pipes" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -2.35, 1.25, -0.4 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -2.35, 1.25, -0.4 ) mesh_path = NodePath("../Pipe4_1/Mesh") color_cast_left = NodePath("../Pipe4_1/ColorCast") [node name="Pipe5_1" parent="Pipes" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -2.35, 1.25, 0 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -2.35, 1.25, 0 ) mesh_path = NodePath("../Pipe5_1/Mesh") color_cast_left = NodePath("../Pipe5_1/ColorCast") [node name="Pipe6_1" parent="Pipes" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -1.95, 1.25, 0 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -1.95, 1.25, 0 ) mesh_path = NodePath("../Pipe6_1/Mesh") color_cast_left = NodePath("../Pipe6_1/ColorCast") [node name="Fork1_1" parent="Pipes" instance=ExtResource( 4 )] -transform = Transform( 1.91069e-015, 4.37114e-008, 1, 1, -4.37114e-008, 0, 4.37114e-008, 1, -4.37114e-008, -1.55, 1.25, 0 ) +transform = Transform( 1.91069e-15, 4.37114e-08, 1, 1, -4.37114e-08, 0, 4.37114e-08, 1, -4.37114e-08, -1.55, 1.25, 0 ) x_rot = 90 [node name="Pipe7_1" parent="Pipes" instance=ExtResource( 5 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-008, 1, 0, -1, -4.37114e-008, -1.55, 1.65, 0 ) +transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, -1.55, 1.65, 0 ) mesh_path = NodePath("../Pipe7_1/Mesh") color_cast_left = NodePath("../Pipe7_1/ColorCast") [node name="Pipe8_1" parent="Pipes" instance=ExtResource( 5 )] editor/display_folded = true -transform = Transform( -4.37114e-008, 1, 0, -1, -4.37114e-008, 0, 0, 0, 1, -1.55, 1.25, 0.4 ) +transform = Transform( -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, -1.55, 1.25, 0.4 ) mesh_path = NodePath("../Pipe8_1/Mesh") color_cast_left = NodePath("../Pipe8_1/ColorCast") [node name="Pipe9_1" parent="Pipes" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -1.15, 1.25, 0.4 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -1.15, 1.25, 0.4 ) mesh_path = NodePath("../Pipe9_1/Mesh") color_cast_left = NodePath("../Pipe9_1/ColorCast") [node name="Pipe10_1" parent="Pipes" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -2.35, 1.25, 0.4 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -2.35, 1.25, 0.4 ) mesh_path = NodePath("../Pipe10_1/Mesh") color_cast_left = NodePath("../Pipe10_1/ColorCast") [node name="Fork2_1" parent="Pipes" instance=ExtResource( 4 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -1.95, 1.25, 0.4 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -1.95, 1.25, 0.4 ) x_rot = -90 [node name="Pipe11_1" parent="Pipes" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -2.35, 1.25, 0.8 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -2.35, 1.25, 0.8 ) mesh_path = NodePath("../Pipe11_1/Mesh") color_cast_left = NodePath("../Pipe11_1/ColorCast") [node name="Pipe12_1" parent="Pipes" instance=ExtResource( 6 )] -transform = Transform( 1.91069e-015, -4.37114e-008, 1, -1, -4.37114e-008, 0, 4.37114e-008, -1, -4.37114e-008, -1.95, 1.25, 0.8 ) +transform = Transform( 1.91069e-15, -4.37114e-08, 1, -1, -4.37114e-08, 0, 4.37114e-08, -1, -4.37114e-08, -1.95, 1.25, 0.8 ) mesh_path = NodePath("../Pipe12_1/Mesh") color_cast_left = NodePath("../Pipe12_1/ColorCastLeft") [node name="Fork3_1" parent="Pipes" instance=ExtResource( 4 )] -transform = Transform( 1.91069e-015, 4.37114e-008, 1, 1, -4.37114e-008, 0, 4.37114e-008, 1, -4.37114e-008, -1.55, 1.25, 0.8 ) +transform = Transform( 1.91069e-15, 4.37114e-08, 1, 1, -4.37114e-08, 0, 4.37114e-08, 1, -4.37114e-08, -1.55, 1.25, 0.8 ) x_rot = 90 [node name="Pipe13_1" parent="Pipes" instance=ExtResource( 5 )] -transform = Transform( -4.37114e-008, 1, 0, -1, -4.37114e-008, 0, 0, 0, 1, -1.55, 1.25, 1.2 ) +transform = Transform( -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, -1.55, 1.25, 1.2 ) mesh_path = NodePath("../Pipe13_1/Mesh") color_cast_left = NodePath("../Pipe13_1/ColorCast") [node name="Pipe14_1" parent="Pipes" instance=ExtResource( 5 )] -transform = Transform( 1.91069e-015, -4.37114e-008, 1, -1, -4.37114e-008, 0, 4.37114e-008, -1, -4.37114e-008, -1.15, 1.25, 1.2 ) +transform = Transform( 1.91069e-15, -4.37114e-08, 1, -1, -4.37114e-08, 0, 4.37114e-08, -1, -4.37114e-08, -1.15, 1.25, 1.2 ) mesh_path = NodePath("../Pipe14_1/Mesh") color_cast_left = NodePath("../Pipe14_1/ColorCast") [node name="Pipe15_1" parent="Pipes" instance=ExtResource( 5 )] -transform = Transform( 4.37114e-008, 1, -8.74228e-008, 1, -4.37114e-008, 0, -3.82137e-015, -8.74228e-008, -1, -1.15, 1.25, 0.8 ) +transform = Transform( 4.37114e-08, 1, -8.74228e-08, 1, -4.37114e-08, 0, -3.82137e-15, -8.74228e-08, -1, -1.15, 1.25, 0.8 ) mesh_path = NodePath("../Pipe15_1/Mesh") color_cast_left = NodePath("../Pipe15_1/ColorCast") [node name="Fork4_1" parent="Pipes" instance=ExtResource( 4 )] -transform = Transform( 1.91069e-015, -4.37114e-008, 1, -1, -4.37114e-008, 0, 4.37114e-008, -1, -4.37114e-008, -0.75, 1.25, 0.8 ) +transform = Transform( 1.91069e-15, -4.37114e-08, 1, -1, -4.37114e-08, 0, 4.37114e-08, -1, -4.37114e-08, -0.75, 1.25, 0.8 ) x_rot = -90 [node name="Pipe16_1" parent="Pipes" instance=ExtResource( 5 )] -transform = Transform( -4.37114e-008, 1, 4.37114e-008, 0, -4.37114e-008, 1, 1, 4.37114e-008, 1.91069e-015, -0.75, 1.65, 0.8 ) +transform = Transform( -4.37114e-08, 1, 4.37114e-08, 0, -4.37114e-08, 1, 1, 4.37114e-08, 1.91069e-15, -0.75, 1.65, 0.8 ) mesh_path = NodePath("../Pipe16_1/Mesh") color_cast_left = NodePath("../Pipe16_1/ColorCast") [node name="Pipe17_1" parent="Pipes" instance=ExtResource( 3 )] -transform = Transform( 4.37114e-008, -3.82137e-015, 1, -8.74228e-008, -1, 0, 1, -8.74228e-008, -4.37114e-008, -0.35, 1.65, 0.8 ) +transform = Transform( 4.37114e-08, -3.82137e-15, 1, -8.74228e-08, -1, 0, 1, -8.74228e-08, -4.37114e-08, -0.35, 1.65, 0.8 ) mesh_path = NodePath("../Pipe17_1/Mesh") color_cast_left = NodePath("../Pipe17_1/ColorCast") [node name="Pipe18_1" parent="Pipes" instance=ExtResource( 5 )] -transform = Transform( -4.37114e-008, -1, -4.37114e-008, 0, -4.37114e-008, 1, -1, 4.37114e-008, 1.91069e-015, -1.55, 1.65, 0.8 ) +transform = Transform( -4.37114e-08, -1, -4.37114e-08, 0, -4.37114e-08, 1, -1, 4.37114e-08, 1.91069e-15, -1.55, 1.65, 0.8 ) mesh_path = NodePath("../Pipe18_1/Mesh") color_cast_left = NodePath("../Pipe18_1/ColorCast") [node name="Pipe19_1" parent="Pipes" instance=ExtResource( 5 )] -transform = Transform( 1.91069e-015, 4.37114e-008, -1, 1, -4.37114e-008, 0, -4.37114e-008, -1, -4.37114e-008, -1.95, 1.65, 0.8 ) +transform = Transform( 1.91069e-15, 4.37114e-08, -1, 1, -4.37114e-08, 0, -4.37114e-08, -1, -4.37114e-08, -1.95, 1.65, 0.8 ) mesh_path = NodePath("../Pipe19_1/Mesh") color_cast_left = NodePath("../Pipe19_1/ColorCast") [node name="Pipe20_1" parent="Pipes" instance=ExtResource( 6 )] -transform = Transform( 1, -8.74228e-008, -8.74228e-008, -8.74228e-008, -1, 0, -8.74228e-008, 7.64274e-015, -1, -1.95, 1.65, 0.4 ) +transform = Transform( 1, -8.74228e-08, -8.74228e-08, -8.74228e-08, -1, 0, -8.74228e-08, 7.64274e-15, -1, -1.95, 1.65, 0.4 ) mesh_path = NodePath("../Pipe20_1/Mesh") color_cast_left = NodePath("../Pipe20_1/ColorCastLeft") [node name="Pipe21_1" parent="Pipes" instance=ExtResource( 3 )] -transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, -1.95, 1.65, 0 ) +transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -1.95, 1.65, 0 ) mesh_path = NodePath("../Pipe21_1/Mesh") color_cast_left = NodePath("../Pipe21_1/ColorCast") [node name="Fork5_1" parent="Pipes" instance=ExtResource( 4 )] -transform = Transform( 1, 8.74228e-008, -8.74228e-008, 8.74228e-008, -1, 0, -8.74228e-008, -7.64274e-015, -1, -1.95, 1.65, -0.4 ) +transform = Transform( 1, 8.74228e-08, -8.74228e-08, 8.74228e-08, -1, 0, -8.74228e-08, -7.64274e-15, -1, -1.95, 1.65, -0.4 ) mesh_path = NodePath("../Fork5_1/Mesh") color_cast_left = NodePath("../Fork5_1/ColorCast") z_rot = -90 [node name="Pipe22_1" parent="Pipes" instance=ExtResource( 6 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -1.95, 1.25, -0.4 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -1.95, 1.25, -0.4 ) mesh_path = NodePath("../Pipe22_1/Mesh") color_cast_left = NodePath("../Pipe22_1/ColorCastLeft") [node name="Pipe23_1" parent="Pipes" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -1.55, 1.25, -0.4 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -1.55, 1.25, -0.4 ) mesh_path = NodePath("../Pipe23_1/Mesh") color_cast_left = NodePath("../Pipe23_1/ColorCast") [node name="Fork6_1" parent="Pipes" instance=ExtResource( 4 )] -transform = Transform( 1.91069e-015, -4.37114e-008, 1, -1, -4.37114e-008, 0, 4.37114e-008, -1, -4.37114e-008, -1.15, 1.25, -0.4 ) +transform = Transform( 1.91069e-15, -4.37114e-08, 1, -1, -4.37114e-08, 0, 4.37114e-08, -1, -4.37114e-08, -1.15, 1.25, -0.4 ) x_rot = 180 [node name="Pipe24_1" parent="Pipes" instance=ExtResource( 6 )] -transform = Transform( 1.91069e-015, 4.37114e-008, 1, 1, -4.37114e-008, 0, 4.37114e-008, 1, -4.37114e-008, -1.15, 1.25, -0.8 ) +transform = Transform( 1.91069e-15, 4.37114e-08, 1, 1, -4.37114e-08, 0, 4.37114e-08, 1, -4.37114e-08, -1.15, 1.25, -0.8 ) mesh_path = NodePath("../Pipe24_1/Mesh") color_cast_left = NodePath("../Pipe24_1/ColorCastLeft") [node name="Pipe25_1" parent="Pipes" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -0.75, 1.25, -0.8 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.75, 1.25, -0.8 ) mesh_path = NodePath("../Pipe25_1/Mesh") color_cast_left = NodePath("../Pipe25_1/ColorCast") [node name="Fork7_1" parent="Pipes" instance=ExtResource( 4 )] -transform = Transform( 1.91069e-015, 4.37114e-008, 1, 1, -4.37114e-008, 0, 4.37114e-008, 1, -4.37114e-008, -0.35, 1.25, -0.8 ) +transform = Transform( 1.91069e-15, 4.37114e-08, 1, 1, -4.37114e-08, 0, 4.37114e-08, 1, -4.37114e-08, -0.35, 1.25, -0.8 ) mesh_path = NodePath("../Fork7_1/Mesh") color_cast_left = NodePath("../Fork7_1/ColorCast") x_rot = 90 [node name="Pipe26_1" parent="Pipes" instance=ExtResource( 5 )] editor/display_folded = true -transform = Transform( -1, 8.74228e-008, 3.82137e-015, 0, -4.37114e-008, 1, 8.74228e-008, 1, 4.37114e-008, -0.35, 1.65, -0.8 ) +transform = Transform( -1, 8.74228e-08, 3.82137e-15, 0, -4.37114e-08, 1, 8.74228e-08, 1, 4.37114e-08, -0.35, 1.65, -0.8 ) mesh_path = NodePath("../Pipe26_1/Mesh") color_cast_left = NodePath("../Pipe26_1/ColorCast") @@ -275,28 +275,28 @@ mesh_path = NodePath("../Pipe27_1/Mesh") color_cast_left = NodePath("../Pipe27_1/ColorCast") [node name="Pipe28_1" parent="Pipes" instance=ExtResource( 5 )] -transform = Transform( -1, 8.74228e-008, 0, -8.74228e-008, -1, 0, 0, 0, 1, -0.35, 1.65, 0 ) +transform = Transform( -1, 8.74228e-08, 0, -8.74228e-08, -1, 0, 0, 0, 1, -0.35, 1.65, 0 ) mesh_path = NodePath("../Pipe28_1/Mesh") color_cast_left = NodePath("../Pipe28_1/ColorCast") [node name="Pipe29_1" parent="Pipes" instance=ExtResource( 5 )] editor/display_folded = true -transform = Transform( -4.37114e-008, 1, 0, -1, -4.37114e-008, 0, 0, 0, 1, -0.35, 1.25, -0.4 ) +transform = Transform( -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, -0.35, 1.25, -0.4 ) mesh_path = NodePath("../Pipe29_1/Mesh") color_cast_left = NodePath("../Pipe29_1/ColorCast") [node name="Fork8_1" parent="Pipes" instance=ExtResource( 4 )] -transform = Transform( 1.91069e-015, -4.37114e-008, 1, -1, -4.37114e-008, 0, 4.37114e-008, -1, -4.37114e-008, 0.05, 1.25, -0.4 ) +transform = Transform( 1.91069e-15, -4.37114e-08, 1, -1, -4.37114e-08, 0, 4.37114e-08, -1, -4.37114e-08, 0.05, 1.25, -0.4 ) x_rot = -90 [node name="Pipe30_1" parent="Pipes" instance=ExtResource( 5 )] editor/display_folded = true -transform = Transform( 4.37114e-008, 1, 8.74228e-008, 1, -4.37114e-008, 0, 3.82137e-015, 8.74228e-008, -1, 0.05, 1.25, -0.8 ) +transform = Transform( 4.37114e-08, 1, 8.74228e-08, 1, -4.37114e-08, 0, 3.82137e-15, 8.74228e-08, -1, 0.05, 1.25, -0.8 ) mesh_path = NodePath("../Pipe30_1/Mesh") color_cast_left = NodePath("../Pipe30_1/ColorCast") [node name="Pipe31_1" parent="Pipes" instance=ExtResource( 5 )] -transform = Transform( -1, 8.74228e-008, 3.82137e-015, 0, -4.37114e-008, 1, 8.74228e-008, 1, 4.37114e-008, 0.05, 1.65, -0.4 ) +transform = Transform( -1, 8.74228e-08, 3.82137e-15, 0, -4.37114e-08, 1, 8.74228e-08, 1, 4.37114e-08, 0.05, 1.65, -0.4 ) mesh_path = NodePath("../Pipe31_1/Mesh") color_cast_left = NodePath("../Pipe31_1/ColorCast") @@ -307,69 +307,69 @@ color_cast_left = NodePath("../Pipe32_1/ColorCast") [node name="Pipe33_1" parent="Pipes" instance=ExtResource( 5 )] editor/display_folded = true -transform = Transform( -4.37114e-008, 1, 0, -1, -4.37114e-008, 0, 0, 0, 1, -1.15, 1.25, 0 ) +transform = Transform( -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, -1.15, 1.25, 0 ) mesh_path = NodePath("../Pipe33_1/Mesh") color_cast_left = NodePath("../Pipe33_1/ColorCast") [node name="Pipe34_1" parent="Pipes" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -0.75, 1.25, 0 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.75, 1.25, 0 ) mesh_path = NodePath("../Pipe34_1/Mesh") color_cast_left = NodePath("../Pipe34_1/ColorCast") [node name="Pipe35_1" parent="Pipes" instance=ExtResource( 6 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -0.35, 1.25, 0 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.35, 1.25, 0 ) mesh_path = NodePath("../Pipe35_1/Mesh") color_cast_left = NodePath("../Pipe35_1/ColorCastLeft") [node name="Pipe36_1" parent="Pipes" instance=ExtResource( 6 )] -transform = Transform( 4.37114e-008, -1, -8.74228e-008, -1, -4.37114e-008, 0, -3.82137e-015, 8.74228e-008, -1, -1.55, 1.65, -0.4 ) +transform = Transform( 4.37114e-08, -1, -8.74228e-08, -1, -4.37114e-08, 0, -3.82137e-15, 8.74228e-08, -1, -1.55, 1.65, -0.4 ) mesh_path = NodePath("../Pipe36_1/Mesh") color_cast_left = NodePath("../Pipe36_1/ColorCastLeft") [node name="Pipe37_1" parent="Pipes" instance=ExtResource( 5 )] -transform = Transform( 4.37114e-008, 1, -8.74228e-008, 1, -4.37114e-008, 0, -3.82137e-015, -8.74228e-008, -1, -1.55, 1.65, -0.8 ) +transform = Transform( 4.37114e-08, 1, -8.74228e-08, 1, -4.37114e-08, 0, -3.82137e-15, -8.74228e-08, -1, -1.55, 1.65, -0.8 ) mesh_path = NodePath("../Pipe37_1/Mesh") color_cast_left = NodePath("../Pipe37_1/ColorCast") [node name="Pipe38_1" parent="Pipes" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -1.15, 1.65, -0.8 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -1.15, 1.65, -0.8 ) mesh_path = NodePath("../Pipe38_1/Mesh") color_cast_left = NodePath("../Pipe38_1/ColorCast") [node name="Fork9_1" parent="Pipes" instance=ExtResource( 4 )] -transform = Transform( 1.91069e-015, 4.37114e-008, 1, 1, -4.37114e-008, 0, 4.37114e-008, 1, -4.37114e-008, -0.75, 1.65, -0.8 ) +transform = Transform( 1.91069e-15, 4.37114e-08, 1, 1, -4.37114e-08, 0, 4.37114e-08, 1, -4.37114e-08, -0.75, 1.65, -0.8 ) x_rot = 180 [node name="Pipe39_1" parent="Pipes" instance=ExtResource( 5 )] editor/display_folded = true -transform = Transform( 4.37114e-008, 1, -8.74228e-008, 1, -4.37114e-008, 0, -3.82137e-015, -8.74228e-008, -1, -0.75, 1.65, -1.2 ) +transform = Transform( 4.37114e-08, 1, -8.74228e-08, 1, -4.37114e-08, 0, -3.82137e-15, -8.74228e-08, -1, -0.75, 1.65, -1.2 ) mesh_path = NodePath("../Pipe39_1/Mesh") color_cast_left = NodePath("../Pipe39_1/ColorCast") [node name="Pipe40_1" parent="Pipes" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -0.35, 1.65, -1.2 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.35, 1.65, -1.2 ) mesh_path = NodePath("../Pipe40_1/Mesh") color_cast_left = NodePath("../Pipe40_1/ColorCast") [node name="Pipe41_1" parent="Pipes" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 0.05, 1.65, -1.2 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0.05, 1.65, -1.2 ) mesh_path = NodePath("../Pipe41_1/Mesh") color_cast_left = NodePath("../Pipe41_1/ColorCast") [node name="Pipe42_1" parent="Pipes" instance=ExtResource( 5 )] editor/display_folded = true -transform = Transform( 1.91069e-015, 4.37114e-008, 1, 1, -4.37114e-008, 0, 4.37114e-008, 1, -4.37114e-008, 0.45, 1.65, -1.2 ) +transform = Transform( 1.91069e-15, 4.37114e-08, 1, 1, -4.37114e-08, 0, 4.37114e-08, 1, -4.37114e-08, 0.45, 1.65, -1.2 ) mesh_path = NodePath("../Pipe42_1/Mesh") color_cast_left = NodePath("../Pipe42_1/ColorCast") [node name="Pipe43_1" parent="Pipes" instance=ExtResource( 5 )] editor/display_folded = true -transform = Transform( -1, 8.74228e-008, 0, -8.74228e-008, -1, 0, 0, 0, 1, 0.45, 1.65, -0.8 ) +transform = Transform( -1, 8.74228e-08, 0, -8.74228e-08, -1, 0, 0, 0, 1, 0.45, 1.65, -0.8 ) mesh_path = NodePath("../Pipe43_1/Mesh") color_cast_left = NodePath("../Pipe43_1/ColorCast") [node name="Pipe44_1" parent="Pipes" instance=ExtResource( 6 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 0.45, 1.25, -0.8 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0.45, 1.25, -0.8 ) mesh_path = NodePath("../Pipe44_1/Mesh") color_cast_left = NodePath("../Pipe44_1/ColorCastLeft") @@ -385,64 +385,64 @@ color_cast_left = NodePath("../Pipe46_1/ColorCast") [node name="Pipe47_1" parent="Pipes" instance=ExtResource( 5 )] editor/display_folded = true -transform = Transform( -4.37114e-008, 1, 0, -1, -4.37114e-008, 0, 0, 0, 1, -0.75, 1.65, 0.4 ) +transform = Transform( -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, -0.75, 1.65, 0.4 ) mesh_path = NodePath("../Pipe47_1/Mesh") color_cast_left = NodePath("../Pipe47_1/ColorCast") [node name="Pipe48_1" parent="Pipes" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -0.35, 1.65, 0.4 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.35, 1.65, 0.4 ) mesh_path = NodePath("../Pipe48_1/Mesh") color_cast_left = NodePath("../Pipe48_1/ColorCast") [node name="Pipe49_1" parent="Pipes" instance=ExtResource( 6 )] -transform = Transform( 1.91069e-015, 4.37114e-008, 1, 1, -4.37114e-008, 0, 4.37114e-008, 1, -4.37114e-008, -0.75, 1.25, 0.4 ) +transform = Transform( 1.91069e-15, 4.37114e-08, 1, 1, -4.37114e-08, 0, 4.37114e-08, 1, -4.37114e-08, -0.75, 1.25, 0.4 ) mesh_path = NodePath("../Pipe49_1/Mesh") color_cast_left = NodePath("../Pipe49_1/ColorCastLeft") [node name="Pipe50_1" parent="Pipes" instance=ExtResource( 3 )] -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, -0.35, 1.25, 0.4 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.35, 1.25, 0.4 ) mesh_path = NodePath("../Pipe50_1/Mesh") color_cast_left = NodePath("../Pipe50_1/ColorCast") [node name="Pipe51_1" parent="Pipes" instance=ExtResource( 5 )] editor/display_folded = true -transform = Transform( 1.91069e-015, -4.37114e-008, 1, -1, -4.37114e-008, 0, 4.37114e-008, -1, -4.37114e-008, 0.05, 1.25, 0.4 ) +transform = Transform( 1.91069e-15, -4.37114e-08, 1, -1, -4.37114e-08, 0, 4.37114e-08, -1, -4.37114e-08, 0.05, 1.25, 0.4 ) mesh_path = NodePath("../Pipe51_1/Mesh") color_cast_left = NodePath("../Pipe51_1/ColorCast") [node name="Pipe52_1" parent="Pipes" instance=ExtResource( 6 )] -transform = Transform( 1.91069e-015, 4.37114e-008, 1, 1, -4.37114e-008, 0, 4.37114e-008, 1, -4.37114e-008, 0.05, 1.25, 0 ) +transform = Transform( 1.91069e-15, 4.37114e-08, 1, 1, -4.37114e-08, 0, 4.37114e-08, 1, -4.37114e-08, 0.05, 1.25, 0 ) mesh_path = NodePath("../Pipe52_1/Mesh") color_cast_left = NodePath("../Pipe52_1/ColorCastLeft") [node name="Pipe53_1" parent="Pipes" instance=ExtResource( 3 )] editor/display_folded = true -transform = Transform( -4.37114e-008, 0, 1, 0, 1, 0, -1, 0, -4.37114e-008, 0.45, 1.25, 0 ) +transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0.45, 1.25, 0 ) mesh_path = NodePath("../Pipe53_1/Mesh") color_cast_left = NodePath("../Pipe53_1/ColorCast") [node name="Pipe54_1" parent="Pipes" instance=ExtResource( 6 )] -transform = Transform( -4.37114e-008, -1, 0, 1, -4.37114e-008, 0, 0, 0, 1, 0.05, 1.65, 0.4 ) +transform = Transform( -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0, 1, 0.05, 1.65, 0.4 ) mesh_path = NodePath("../Pipe54_1/Mesh") color_cast_left = NodePath("../Pipe54_1/ColorCastLeft") [node name="Pipe55_1" parent="Pipes" instance=ExtResource( 6 )] -transform = Transform( 1.91069e-015, -4.37114e-008, 1, -1, -4.37114e-008, 0, 4.37114e-008, -1, -4.37114e-008, 0.05, 1.65, 0.8 ) +transform = Transform( 1.91069e-15, -4.37114e-08, 1, -1, -4.37114e-08, 0, 4.37114e-08, -1, -4.37114e-08, 0.05, 1.65, 0.8 ) mesh_path = NodePath("../Pipe55_1/Mesh") color_cast_left = NodePath("../Pipe55_1/ColorCastLeft") [node name="Pipe56_1" parent="Pipes" instance=ExtResource( 5 )] -transform = Transform( 4.37114e-008, 3.82137e-015, 1, 8.74228e-008, -1, 0, 1, 8.74228e-008, -4.37114e-008, 0.45, 1.65, 0.8 ) +transform = Transform( 4.37114e-08, 3.82137e-15, 1, 8.74228e-08, -1, 0, 1, 8.74228e-08, -4.37114e-08, 0.45, 1.65, 0.8 ) mesh_path = NodePath("../Pipe56_1/Mesh") color_cast_left = NodePath("../Pipe56_1/ColorCast") [node name="Pipe57_1" parent="Pipes" instance=ExtResource( 5 )] -transform = Transform( -4.37114e-008, 1, -4.37114e-008, 0, -4.37114e-008, -1, -1, -4.37114e-008, 1.91069e-015, 0.45, 1.25, 0.8 ) +transform = Transform( -4.37114e-08, 1, -4.37114e-08, 0, -4.37114e-08, -1, -1, -4.37114e-08, 1.91069e-15, 0.45, 1.25, 0.8 ) mesh_path = NodePath("../Pipe57_1/Mesh") color_cast_left = NodePath("../Pipe57_1/ColorCast") [node name="Lever" parent="." instance=ExtResource( 7 )] -transform = Transform( 1, 0, 0, 0, -4.37114e-008, 1, 0, -1, -4.37114e-008, 2.35, 1.1, 0 ) +transform = Transform( 1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 2.35, 1.1, 0 ) is_machine_start = true [node name="Lights" type="Spatial" parent="."] diff --git a/Level/Interactables/FactoryMachines/PipeGame.gd b/Level/Interactables/FactoryMachines/PipeGame.gd index 7134caf..c0ca1fb 100644 --- a/Level/Interactables/FactoryMachines/PipeGame.gd +++ b/Level/Interactables/FactoryMachines/PipeGame.gd @@ -22,6 +22,7 @@ var _lights : Array var _all_colors : Array var _rng = RandomNumberGenerator.new() var _is_running = false +var _colors_should_be_updated = false # constant variables const OUT_BOX_DEFAULT_COLOR = Color(0.4, 0.4, 0.4, 1) @@ -41,19 +42,14 @@ func _ready(): var inputs = get_tree().get_nodes_in_group("InputBoxes") var counter = 0 for i in inputs: - i.lever.connect("flow_changed", self, "_update_pipe_colors") i.content_color = _all_colors[counter] i.load_content_color() counter+=1 - - var forks = get_tree().get_nodes_in_group("PipeForks") - for f in forks: - f.connect("flow_changed", self, "_update_pipe_colors") -func _update_pipe_colors(): +func _physics_process(delta: float) -> void: var pipes = get_tree().get_nodes_in_group("Pipes") - + for p in pipes: p.update_content_color(_all_colors) @@ -71,7 +67,6 @@ func _update_pipe_colors(): _is_running = false _reset_out_boxes() print("Game Won!") - func _col_compare(var col1, var col2): diff --git a/Level/Interactables/Pipes/ForkPipe.tscn b/Level/Interactables/Pipes/ForkPipe.tscn index 853cbb4..d0f4bcd 100644 --- a/Level/Interactables/Pipes/ForkPipe.tscn +++ b/Level/Interactables/Pipes/ForkPipe.tscn @@ -37,9 +37,9 @@ surfaces/0 = { [sub_resource type="BoxShape" id=3] [node name="Spatial" type="StaticBody" groups=[ -"Pipes", "Touchables", "PipeForks", +"Pipes", ]] collision_layer = 7 collision_mask = 7 diff --git a/Level/Interactables/Pipes/PipeScript.gd b/Level/Interactables/Pipes/PipeScript.gd index 744f66a..bebaf4c 100644 --- a/Level/Interactables/Pipes/PipeScript.gd +++ b/Level/Interactables/Pipes/PipeScript.gd @@ -102,7 +102,7 @@ func update_content_color(var _all_colors: Array): _mesh.material_override = material material.albedo_color = content_color else: - if can_turn and content_color == NULL_COLOR: + if can_turn: _mesh.material_override = fork_material else: _mesh.material_override = null diff --git a/Level/PathTestWorld.tscn b/Level/PathTestWorld.tscn index 2cf480e..9029732 100644 --- a/Level/PathTestWorld.tscn +++ b/Level/PathTestWorld.tscn @@ -1,13 +1,11 @@ -[gd_scene load_steps=16 format=2] +[gd_scene load_steps=14 format=2] [ext_resource path="res://Characters/Player/Player.tscn" type="PackedScene" id=1] -[ext_resource path="res://Characters/Util/PathNavigatorForNPC.tscn" type="PackedScene" id=2] -[ext_resource path="res://Characters/Meldewesen/Meldewesen.tscn" type="PackedScene" id=3] -[ext_resource path="res://Util/NodeGroupNotifier.tscn" type="PackedScene" id=4] -[ext_resource path="res://Level/Interactables/Key/Key.tscn" type="PackedScene" id=5] -[ext_resource path="res://Level/Interactables/Keycard/Keycard.tscn" type="PackedScene" id=6] -[ext_resource path="res://Level/Interactables/Door/Door.tscn" type="PackedScene" id=7] -[ext_resource path="res://Level/Interactables/FactoryMachines/FactoryGameplay.tscn" type="PackedScene" id=8] +[ext_resource path="res://Util/NodeGroupNotifier.tscn" type="PackedScene" id=2] +[ext_resource path="res://Level/Interactables/Key/Key.tscn" type="PackedScene" id=3] +[ext_resource path="res://Level/Interactables/Keycard/Keycard.tscn" type="PackedScene" id=4] +[ext_resource path="res://Level/Interactables/Door/Door.tscn" type="PackedScene" id=5] +[ext_resource path="res://Level/Interactables/FactoryMachines/FactoryGameplay.tscn" type="PackedScene" id=6] [sub_resource type="NavigationMesh" id=1] vertices = PoolVector3Array( -1.9, 0.4, -2.2, 0.200001, 0.4, -2.5, 0.200001, 0.4, -8.5, -8.5, 0.4, -0.0999994, -2.5, 0.4, -0.0999994, -1.9, 0.4, -2.2, -1.9, 0.4, -2.2, 0.200001, 0.4, -8.5, -8.5, 0.4, -8.5, -8.5, 0.4, -0.0999994, 0.200001, 0.4, -8.5, 0.200001, 0.4, -2.5, 2, 0.4, -2.2, 2, 0.4, -2.2, 2.6, 0.4, -0.0999994, 8.6, 0.4, -0.0999994, 2, 0.4, -2.2, 8.6, 0.4, -0.0999994, 8.6, 0.4, -8.5, 0.200001, 0.4, -8.5, -1.3, 0.4, 3.8, 0.200001, 0.4, 3.8, 0.200001, 0.4, 2.6, -2.2, 0.4, 2, -8.5, 0.4, 8.6, -2.2, 0.4, 8.6, -2.5, 0.4, 5, -2.5, 0.4, 5, -1.3, 0.4, 3.8, -2.2, 0.4, 2, -2.5, 0.4, 5, -2.2, 0.4, 2, -2.5, 0.4, -0.0999994, -8.5, 0.4, -0.0999994, -8.5, 0.4, 8.6, 0.200001, 0.4, 2.6, 0.200001, 0.4, 3.8, 1.4, 0.4, 3.8, 2.3, 0.4, 2, 2.6, 0.4, 5, 2.3, 0.4, 8.6, 8.6, 0.4, 8.6, 2.3, 0.4, 2, 1.4, 0.4, 3.8, 2.6, 0.4, 5, 2.6, 0.4, -0.0999994, 2.3, 0.4, 2, 2.6, 0.4, 5, 8.6, 0.4, 8.6, 8.6, 0.4, -0.0999994 ) @@ -74,45 +72,40 @@ material/0 = null shape = SubResource( 6 ) [node name="GroundBody" type="StaticBody" parent="NavigationMeshInstance"] +collision_layer = 3 +collision_mask = 3 [node name="CollisionShape" type="CollisionShape" parent="NavigationMeshInstance/GroundBody"] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 0 ) shape = SubResource( 7 ) -[node name="MeldewesenNavigator" parent="." instance=ExtResource( 2 )] -speed = 3.0 -body_nodepath = NodePath("../MeldewesenNavigator/Meldewesen") - -[node name="Meldewesen" parent="MeldewesenNavigator" instance=ExtResource( 3 )] -_visibility_path = NodePath("../../MeldewesenNavigator/Meldewesen/Visibility") - -[node name="NodeGroupNotifier" parent="." instance=ExtResource( 4 )] +[node name="NodeGroupNotifier" parent="." instance=ExtResource( 2 )] group_name = "Navigator" node_to_send = NodePath("..") [node name="Key" parent="." groups=[ "Collectibles", -] instance=ExtResource( 5 )] +] instance=ExtResource( 3 )] transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -6.8315, 0.73042, 8.99112 ) key_id = 1 [node name="Keycard" parent="." groups=[ "Collectibles", -] instance=ExtResource( 6 )] -transform = Transform( -1, 0, -8.74228e-008, 0, 1, 0, 8.74228e-008, 0, -1, -6.84089, 0.700821, 8.67166 ) +] instance=ExtResource( 4 )] +transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -6.84089, 0.700821, 8.67166 ) card_lvl = 1 -[node name="Door" parent="." instance=ExtResource( 7 )] -transform = Transform( -2.18557e-008, 0, 0.5, 0, 0.5, 0, -0.5, 0, -2.18557e-008, -10, 1, 10 ) +[node name="Door" parent="." instance=ExtResource( 5 )] +transform = Transform( -2.18557e-08, 0, 0.5, 0, 0.5, 0, -0.5, 0, -2.18557e-08, -10, 1, 10 ) -[node name="Door2" parent="." instance=ExtResource( 7 )] -transform = Transform( -2.18557e-008, 0, 0.5, 0, 0.5, 0, -0.5, 0, -2.18557e-008, -10, 1, 8 ) +[node name="Door2" parent="." instance=ExtResource( 5 )] +transform = Transform( -2.18557e-08, 0, 0.5, 0, 0.5, 0, -0.5, 0, -2.18557e-08, -10, 1, 8 ) door_lvl = 1 -[node name="Door3" parent="." instance=ExtResource( 7 )] -transform = Transform( -2.18557e-008, 0, 0.5, 0, 0.5, 0, -0.5, 0, -2.18557e-008, -10, 1, 6 ) +[node name="Door3" parent="." instance=ExtResource( 5 )] +transform = Transform( -2.18557e-08, 0, 0.5, 0, 0.5, 0, -0.5, 0, -2.18557e-08, -10, 1, 6 ) card_door = true door_lvl = 1 -[node name="Gameplay?" parent="." instance=ExtResource( 8 )] -transform = Transform( -4.37114e-008, -1, 4.37114e-008, 0, -4.37114e-008, -1, 1, -4.37114e-008, 1.91069e-015, 7, 2, 2 ) +[node name="Gameplay?" parent="." instance=ExtResource( 6 )] +transform = Transform( -4.37114e-08, -1, 4.37114e-08, 0, -4.37114e-08, -1, 1, -4.37114e-08, 1.91069e-15, 7, 2, 2 )