diff --git a/teleporter.gd b/teleporter.gd index c243711..9a245aa 100644 --- a/teleporter.gd +++ b/teleporter.gd @@ -28,15 +28,20 @@ func _physics_process(delta: float) -> void: pass func _on_contact(body) -> void: + if not enabled: + return + #get_tree().call_group("TELEPORTERS","disable") for teleporter in get_tree().get_nodes_in_group("TELEPORTERS"): - if teleporter != self: - if teleporter.paired_teleporter == paired_teleporter and enabled: - %Player2D.get_node("Camera2D").position_smoothing_enabled = false - if %Player2D.teleport_cooldown > 0: - return - body.set_position(teleporter.global_position) - %Player2D.on_teleport() - disable() - await get_tree().create_timer(cooldown).timeout - enable() + if teleporter == self: + continue + + if teleporter.paired_teleporter == paired_teleporter: + %Player2D.get_node("Camera2D").position_smoothing_enabled = false + if %Player2D.teleport_cooldown > 0: + return + body.set_position(teleporter.global_position) + %Player2D.on_teleport() + disable() + await get_tree().create_timer(cooldown).timeout + enable() diff --git a/world.tscn b/world.tscn index 2bc3750..8aae566 100644 --- a/world.tscn +++ b/world.tscn @@ -1355,11 +1355,11 @@ modulate = Color(1, 1, 1, 1) position = Vector2(53, -303.27414) [node name="Teleporter" parent="QuadrantC" unique_id=672497775 instance=ExtResource("4_gbfbk")] -position = Vector2(-65, -356.44577) +position = Vector2(-67, -352.50696) paired_teleporter = "C1" [node name="Teleporter2" parent="QuadrantC" unique_id=1657885766 instance=ExtResource("4_gbfbk")] -position = Vector2(-961, -131.94382) +position = Vector2(-961, -132.92844) paired_teleporter = "C3" [node name="Block" parent="QuadrantC" unique_id=1060735363 instance=ExtResource("2_036b0")] @@ -1425,36 +1425,36 @@ position = Vector2(-322, -128.00523) [node name="Block45" parent="QuadrantC" unique_id=1209323393 instance=ExtResource("2_036b0")] position = Vector2(-370, -300.32016) -[node name="Block46" parent="QuadrantC" unique_id=1245640277 instance=ExtResource("2_036b0")] -position = Vector2(-370, -314.10535) - -[node name="Block47" parent="QuadrantC" unique_id=150619654 instance=ExtResource("2_036b0")] -position = Vector2(-402, -300.32016) - -[node name="Block48" parent="QuadrantC" unique_id=430380623 instance=ExtResource("2_036b0")] -position = Vector2(-403, -315.09) - -[node name="Block49" parent="QuadrantC" unique_id=612009100 instance=ExtResource("2_036b0")] -position = Vector2(-560, -300.32016) - -[node name="Block50" parent="QuadrantC" unique_id=1973610367 instance=ExtResource("2_036b0")] -position = Vector2(-560, -314.10535) - -[node name="Block51" parent="QuadrantC" unique_id=791222372 instance=ExtResource("2_036b0")] -position = Vector2(-592, -300.32016) - -[node name="Block52" parent="QuadrantC" unique_id=622670780 instance=ExtResource("2_036b0")] -position = Vector2(-593, -315.09) - [node name="Block53" parent="QuadrantC" unique_id=309240966 instance=ExtResource("2_036b0")] position = Vector2(-838, -520.88324) +[node name="Block46" parent="QuadrantC" unique_id=1245640277 instance=ExtResource("2_036b0")] +position = Vector2(-370, -314.10535) + [node name="Block54" parent="QuadrantC" unique_id=1513232438 instance=ExtResource("2_036b0")] position = Vector2(-838, -534.66846) +[node name="Block49" parent="QuadrantC" unique_id=612009100 instance=ExtResource("2_036b0")] +position = Vector2(-560, -300.32016) + +[node name="Block47" parent="QuadrantC" unique_id=150619654 instance=ExtResource("2_036b0")] +position = Vector2(-402, -300.32016) + +[node name="Block50" parent="QuadrantC" unique_id=1973610367 instance=ExtResource("2_036b0")] +position = Vector2(-560, -314.10535) + [node name="Block55" parent="QuadrantC" unique_id=1693597001 instance=ExtResource("2_036b0")] position = Vector2(-870, -520.88324) +[node name="Block51" parent="QuadrantC" unique_id=791222372 instance=ExtResource("2_036b0")] +position = Vector2(-592, -300.32016) + +[node name="Block48" parent="QuadrantC" unique_id=430380623 instance=ExtResource("2_036b0")] +position = Vector2(-403, -315.09) + +[node name="Block52" parent="QuadrantC" unique_id=622670780 instance=ExtResource("2_036b0")] +position = Vector2(-593, -315.09) + [node name="Block56" parent="QuadrantC" unique_id=1720574496 instance=ExtResource("2_036b0")] position = Vector2(-871, -535.6531) @@ -1470,6 +1470,18 @@ position = Vector2(-1070, -462.78848) [node name="Block60" parent="QuadrantC" unique_id=876678248 instance=ExtResource("2_036b0")] position = Vector2(-1071, -477.55832) +[node name="Block95" parent="QuadrantC" unique_id=1276827863 instance=ExtResource("2_036b0")] +position = Vector2(-50, -334.7831) + +[node name="Block96" parent="QuadrantC" unique_id=1906981054 instance=ExtResource("2_036b0")] +position = Vector2(-50, -348.56833) + +[node name="Block97" parent="QuadrantC" unique_id=1555384249 instance=ExtResource("2_036b0")] +position = Vector2(-82, -334.7831) + +[node name="Block98" parent="QuadrantC" unique_id=760466353 instance=ExtResource("2_036b0")] +position = Vector2(-83, -349.55295) + [node name="Block61" parent="QuadrantC" unique_id=1679544876 instance=ExtResource("2_036b0")] position = Vector2(-946, -345.61435) @@ -1576,7 +1588,7 @@ position = Vector2(-1050, -1097.892) position = Vector2(-491, -118.15868) [node name="Teleporter3" parent="QuadrantC" unique_id=514093193 instance=ExtResource("4_gbfbk")] -position = Vector2(-715, -133.91315) +position = Vector2(-715, -134.89789) paired_teleporter = "C2" [node name="Block14" parent="QuadrantC" unique_id=25815394 instance=ExtResource("2_036b0")] @@ -1646,26 +1658,12 @@ paired_teleporter = "C7" position = Vector2(-523, -749.3236) [node name="Teleporter5" parent="QuadrantC" unique_id=1450932853 instance=ExtResource("4_gbfbk")] -position = Vector2(-306, -129.97452) +position = Vector2(-306, -130.95914) paired_teleporter = "C4" [node name="Block16" parent="QuadrantC" unique_id=1112314894 instance=ExtResource("2_036b0")] position = Vector2(-306, -113.23539) -[node name="Teleporter9" parent="QuadrantC" unique_id=2083407478 instance=ExtResource("4_gbfbk")] -position = Vector2(-576, -317.05927) -paired_teleporter = "C5" - -[node name="Block20" parent="QuadrantC" unique_id=1507035532 instance=ExtResource("2_036b0")] -position = Vector2(-576, -300.32013) - -[node name="Teleporter10" parent="QuadrantC" unique_id=1039511867 instance=ExtResource("4_gbfbk")] -position = Vector2(-386, -317.05927) -paired_teleporter = "C5" - -[node name="Block21" parent="QuadrantC" unique_id=1090742592 instance=ExtResource("2_036b0")] -position = Vector2(-386, -300.32013) - [node name="Teleporter4" parent="QuadrantC" unique_id=1638253534 instance=ExtResource("4_gbfbk")] position = Vector2(-630, -1092.9688) paired_teleporter = "C6" @@ -1680,11 +1678,25 @@ paired_teleporter = "C9" [node name="Block23" parent="QuadrantC" unique_id=634060816 instance=ExtResource("2_036b0")] position = Vector2(-630, -1155.0021) +[node name="Teleporter9" parent="QuadrantC" unique_id=2083407478 instance=ExtResource("4_gbfbk")] +position = Vector2(-576, -318.04388) +paired_teleporter = "C5" + +[node name="Teleporter10" parent="QuadrantC" unique_id=1039511867 instance=ExtResource("4_gbfbk")] +position = Vector2(-386, -318.04388) +paired_teleporter = "C5" + +[node name="Block20" parent="QuadrantC" unique_id=1507035532 instance=ExtResource("2_036b0")] +position = Vector2(-576, -300.32013) + [node name="HiddenSpike" parent="QuadrantC" unique_id=947724428 instance=ExtResource("28_k83mh")] visible = true position = Vector2(-97, -391.89328) rotation = -3.1415925 +[node name="Block21" parent="QuadrantC" unique_id=1090742592 instance=ExtResource("2_036b0")] +position = Vector2(-386, -300.32013) + [node name="HiddenSpike2" parent="QuadrantC" unique_id=363082019 instance=ExtResource("28_k83mh")] visible = true position = Vector2(-68, -391.89328) @@ -2481,9 +2493,18 @@ position = Vector2(-619, -477.55838) position = Vector2(-367, -477.55832) [node name="HiddenTeleporter" parent="QuadrantC" unique_id=1585223156 groups=["Hidden"] instance=ExtResource("4_gbfbk")] -position = Vector2(-491, -133.91316) +position = Vector2(-491, -134.89789) paired_teleporter = "C1" +[node name="LongerBlock8" parent="QuadrantC" unique_id=988254324 instance=ExtResource("6_dwbse")] +position = Vector2(-890, -37.416832) + +[node name="LongerBlock9" parent="QuadrantC" unique_id=415765863 instance=ExtResource("6_dwbse")] +position = Vector2(-592, 20.67791) + +[node name="LongerBlock10" parent="QuadrantC" unique_id=1760950741 instance=ExtResource("6_dwbse")] +position = Vector2(-289, -34.462864) + [node name="Pharaoh6" parent="." unique_id=740205336 instance=ExtResource("15_hiqwa")] position = Vector2(8168, -681.3824)