Merge branch 'main' into disk_3_zone

world.tscn

@@ -43,6 +43,7 @@ scale = Vector2(1, 1.0155824)
 
 [node name="Player2D" parent="." unique_id=889851478 instance=ExtResource("1_aqk2v")]
 unique_name_in_owner = true
+visible = false
 position = Vector2(-4833.9995, 356.4457)
 rotation = 0.0005533503
 safe_margin = 0.08
@@ -398,7 +399,7 @@ position = Vector2(0, -58.094738)
 position = Vector2(0, -85.66513)
 
 [node name="Disk" parent="Tutorial" unique_id=514380026 instance=ExtResource("10_2u3nc")]
-position = Vector2(213, 95.511696)
+position = Vector2(55, 95.511696)
 disk_num = 1
 
 [node name="Disk2" parent="Tutorial" unique_id=369042906 instance=ExtResource("10_2u3nc")]
@@ -406,7 +407,7 @@ position = Vector2(8512, -893.08356)
 disk_num = 2
 
 [node name="Disk4" parent="Tutorial" unique_id=1193788903 instance=ExtResource("10_2u3nc")]
-position = Vector2(293, 182.16148)
+position = Vector2(9593, -1262.3298)
 disk_num = 4
 
 [node name="WallSpike" parent="Tutorial" unique_id=287086441 instance=ExtResource("10_hiqwa")]
@@ -444,6 +445,7 @@ position = Vector2(1368, 401)
 position = Vector2(1149, 629.44025)
 
 [node name="CanvasLayer" type="CanvasLayer" parent="." unique_id=1637221343]
+visible = false
 
 [node name="RichTextLabel2" type="RichTextLabel" parent="CanvasLayer" unique_id=1254950785]
 visible = false
@@ -476,19 +478,21 @@ offset_left = 8.0
 offset_top = 7.0
 offset_right = 232.0
 offset_bottom = 263.0
+scale = Vector2(0.7, 0.7)
 texture = ExtResource("15_gggvi")
 
 [node name="Objectives" type="RichTextLabel" parent="CanvasLayer" unique_id=528356873]
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-offset_left = 15.0
+offset_left = 13.999998
-offset_top = 26.000002
+offset_top = 24.000004
-offset_right = -1041.8196
+offset_right = -1042.8196
-offset_bottom = -456.13553
+offset_bottom = -458.13553
 grow_horizontal = 2
 grow_vertical = 2
 rotation = 0.0011968275
+scale = Vector2(0.7, 0.7)
 theme_override_colors/default_color = Color(0, 0, 0, 1)
 theme_override_fonts/normal_font = ExtResource("15_jjr1n")
 theme_override_font_sizes/normal_font_size = 21
@@ -1342,7 +1346,7 @@ position = Vector2(-189, -645.93475)
 sign_text = "TAKE A LEAP"
 
 [node name="Block20" parent="." unique_id=1489084043 instance=ExtResource("34_w44yn")]
-position = Vector2(-4844, 263.888)
+position = Vector2(-4844, 264.87265)
 
 [node name="VerticalLongBlock9" parent="." unique_id=1737292270 instance=ExtResource("4_pkg7o")]
 position = Vector2(-4866, 311.15155)
@@ -2317,4 +2321,148 @@ position = Vector2(-367, -477.55832)
 position = Vector2(-495, -165.42218)
 paired_teleporter = "C1"
 
+[node name="Pharaoh6" parent="." unique_id=740205336 instance=ExtResource("15_hiqwa")]
+position = Vector2(8168, -681.3824)
+
+[node name="LongBlock3" parent="." unique_id=2087959873 instance=ExtResource("3_dwbse")]
+position = Vector2(8799, -782.802)
+
+[node name="Spike5" parent="." unique_id=857268531 instance=ExtResource("27_4h6ng")]
+position = Vector2(8815, -799.5412)
+
+[node name="LongBlock10" parent="." unique_id=1667227424 instance=ExtResource("3_dwbse")]
+position = Vector2(9058, -844.8354)
+
+[node name="Spike6" parent="." unique_id=587961476 instance=ExtResource("27_4h6ng")]
+position = Vector2(9075, -860.5899)
+
+[node name="VerticalLongBlock11" parent="." unique_id=572679691 instance=ExtResource("4_pkg7o")]
+position = Vector2(8901, -954.13226)
+
+[node name="WallSpike33" parent="." unique_id=1697394087 instance=ExtResource("10_hiqwa")]
+position = Vector2(8886.003, -904.8687)
+rotation = -1.5707964
+
+[node name="WallSpike34" parent="." unique_id=277062201 instance=ExtResource("10_hiqwa")]
+position = Vector2(8886.003, -919.63873)
+rotation = -1.5707964
+
+[node name="WallSpike35" parent="." unique_id=1647664702 instance=ExtResource("10_hiqwa")]
+position = Vector2(8886.999, -934.4085)
+rotation = -1.5707964
+
+[node name="WallSpike36" parent="." unique_id=1014448770 instance=ExtResource("10_hiqwa")]
+position = Vector2(8885.999, -949.1783)
+rotation = -1.5707964
+
+[node name="WallSpike37" parent="." unique_id=884440370 instance=ExtResource("10_hiqwa")]
+position = Vector2(8885.999, -962.96344)
+rotation = -1.5707964
+
+[node name="WallSpike38" parent="." unique_id=1005786496 instance=ExtResource("10_hiqwa")]
+position = Vector2(8887, -976.7486)
+rotation = -1.5707964
+
+[node name="WallSpike39" parent="." unique_id=1927233709 instance=ExtResource("10_hiqwa")]
+position = Vector2(8887, -990.534)
+rotation = -1.5707964
+
+[node name="WallSpike40" parent="." unique_id=1994438170 instance=ExtResource("10_hiqwa")]
+position = Vector2(8886.999, -1000.38043)
+rotation = -1.5707964
+
+[node name="LongBlock11" parent="." unique_id=318496705 instance=ExtResource("3_dwbse")]
+position = Vector2(9052, -1002.38043)
+
+[node name="Spike7" parent="." unique_id=1740444962 instance=ExtResource("27_4h6ng")]
+position = Vector2(9033.002, -985.6412)
+rotation = -3.1358476
+
+[node name="Spike8" parent="." unique_id=1897720218 instance=ExtResource("12_k3n1d")]
+position = Vector2(9077, -985.6413)
+rotation = -3.1415927
+
+[node name="Spike9" parent="." unique_id=75569086 instance=ExtResource("12_k3n1d")]
+position = Vector2(9091, -986.626)
+rotation = -3.1415927
+
+[node name="Spike10" parent="." unique_id=1619039863 instance=ExtResource("12_k3n1d")]
+position = Vector2(9101, -986.626)
+rotation = -3.1415927
+
+[node name="Pharaoh7" parent="." unique_id=836892538 instance=ExtResource("15_hiqwa")]
+position = Vector2(9052, -1009.2731)
+
+[node name="Block21" parent="." unique_id=801100312 instance=ExtResource("2_036b0")]
+position = Vector2(9205, -1068.3524)
+
+[node name="Block22" parent="." unique_id=1710553386 instance=ExtResource("2_036b0")]
+position = Vector2(9134, -1124.4779)
+
+[node name="Block23" parent="." unique_id=432395270 instance=ExtResource("2_036b0")]
+position = Vector2(9205, -1171.7413)
+
+[node name="LongerBlock" parent="." unique_id=512187383 instance=ExtResource("6_dwbse")]
+position = Vector2(9468, -1226.8822)
+
+[node name="LongerBlock2" parent="." unique_id=1425088296 instance=ExtResource("6_dwbse")]
+position = Vector2(9468, -1299.7467)
+
+[node name="Spike11" parent="." unique_id=1710195239 instance=ExtResource("27_4h6ng")]
+position = Vector2(9385, -1243.6213)
+
+[node name="Spike12" parent="." unique_id=1044461511 instance=ExtResource("27_4h6ng")]
+position = Vector2(9533, -1243.6213)
+
+[node name="Spike13" parent="." unique_id=840093208 instance=ExtResource("27_4h6ng")]
+position = Vector2(9459, -1283.0076)
+rotation = -3.1415927
+
+[node name="Spike14" parent="." unique_id=512607128 instance=ExtResource("27_4h6ng")]
+position = Vector2(9385, -1283.0076)
+rotation = -3.1415927
+
+[node name="Spike15" parent="." unique_id=650644435 instance=ExtResource("27_4h6ng")]
+position = Vector2(9533, -1283.0076)
+rotation = -3.1415927
+
+[node name="Spike16" parent="." unique_id=1234857021 instance=ExtResource("12_k3n1d")]
+position = Vector2(9205, -1085.0916)
+
+[node name="Spike17" parent="." unique_id=2101663207 instance=ExtResource("12_k3n1d")]
+position = Vector2(9133, -1142.2017)
+
+[node name="Spike18" parent="." unique_id=1381634177 instance=ExtResource("12_k3n1d")]
+position = Vector2(9205, -1188.4806)
+
+[node name="WallSpike41" parent="." unique_id=1222362444 instance=ExtResource("10_hiqwa")]
+position = Vector2(9149, -1125.4625)
+
+[node name="WallSpike42" parent="." unique_id=752486855 instance=ExtResource("10_hiqwa")]
+position = Vector2(9189, -1170.7567)
+rotation = -1.5707964
+
+[node name="WallSpike43" parent="." unique_id=1254641241 instance=ExtResource("10_hiqwa")]
+position = Vector2(9189, -1067.3678)
+rotation = -1.5707964
+
+[node name="Teleporter3" parent="." unique_id=1481896867 instance=ExtResource("4_gbfbk")]
+position = Vector2(9392, -1180.6033)
+paired_teleporter = "oops"
+
+[node name="Teleporter4" parent="." unique_id=1289530845 instance=ExtResource("4_gbfbk")]
+position = Vector2(9074, -893.08356)
+
+[node name="Block24" parent="." unique_id=1804912669 instance=ExtResource("25_mc2jv")]
+position = Vector2(9629, -1239.6827)
+
+[node name="Block25" parent="." unique_id=1870568605 instance=ExtResource("25_mc2jv")]
+position = Vector2(9629, -1287.9309)
+
+[node name="Block26" parent="." unique_id=433893664 instance=ExtResource("25_mc2jv")]
+position = Vector2(9629, -1255.4371)
+
+[node name="Block27" parent="." unique_id=1307818222 instance=ExtResource("25_mc2jv")]
+position = Vector2(9629, -1271.1918)
+
 [connection signal="toggled" from="CanvasLayer/MusicButton" to="CanvasLayer/MusicButton" method="_on_toggled"]