Merge branch 'main' of ssh://git.egg:2222/NanoYagi/JumpRopeOldTech
ci/woodpecker/push/woodpecker Pipeline was successful

This commit is contained in:
yagigreg committed 2026-10-18 21:42:05 -05:00
commit 6848bd3d79
7 files changed
+55 -102

No files matched your search

+4 -68
View File
@@ -37,6 +37,7 @@
[ext_resource type="PackedScene" uid="uid://b61sumdnt0qqh" path="res://hidden_horizontal_moving_block.tscn" id="35_6ah6f"]
[ext_resource type="PackedScene" uid="uid://7bjqgxckho" path="res://hidden_teleporter.tscn" id="36_g1i3r"]
[ext_resource type="PackedScene" uid="uid://c13khrhjy5nrj" path="res://saw.tscn" id="37_my276"]
[ext_resource type="PackedScene" uid="uid://bnuiagw3bblfh" path="res://hat_pickup.tscn" id="38_yx0jh"]
[node name="World" type="Node2D" unique_id=1327991900]
process_mode = 1
@@ -965,12 +966,6 @@ position = Vector2(1292, -1381.1807)
[node name="VerticalLongBlock11" parent="Pharaoh5" unique_id=1350323303 instance=ExtResource("4_pkg7o")]
position = Vector2(1071, -1562.1807)
[node name="VerticalLongBlock12" parent="Pharaoh5" unique_id=1650192814 instance=ExtResource("4_pkg7o")]
position = Vector2(1341, -1752.1807)
[node name="VerticalLongBlock13" parent="Pharaoh5" unique_id=1589057212 instance=ExtResource("4_pkg7o")]
position = Vector2(1045, -1927.1807)
[node name="WallSpike17" parent="Pharaoh5" unique_id=929086827 instance=ExtResource("10_hiqwa")]
position = Vector2(1307.0005, -1429.1807)
@@ -995,30 +990,6 @@ position = Vector2(1307.0005, -1345.4849)
[node name="WallSpike24" parent="Pharaoh5" unique_id=861870396 instance=ExtResource("10_hiqwa")]
position = Vector2(1307, -1331.6997)
[node name="WallSpike25" parent="Pharaoh5" unique_id=2053410851 instance=ExtResource("10_hiqwa")]
position = Vector2(1356.0005, -1800.1807)
[node name="WallSpike26" parent="Pharaoh5" unique_id=774929737 instance=ExtResource("10_hiqwa")]
position = Vector2(1356, -1786.3955)
[node name="WallSpike27" parent="Pharaoh5" unique_id=461707164 instance=ExtResource("10_hiqwa")]
position = Vector2(1356, -1772.6104)
[node name="WallSpike28" parent="Pharaoh5" unique_id=349586859 instance=ExtResource("10_hiqwa")]
position = Vector2(1356, -1757.8403)
[node name="WallSpike29" parent="Pharaoh5" unique_id=1700351156 instance=ExtResource("10_hiqwa")]
position = Vector2(1356.0005, -1744.0552)
[node name="WallSpike30" parent="Pharaoh5" unique_id=792756580 instance=ExtResource("10_hiqwa")]
position = Vector2(1356.0002, -1730.27)
[node name="WallSpike31" parent="Pharaoh5" unique_id=889320038 instance=ExtResource("10_hiqwa")]
position = Vector2(1356.0005, -1716.4849)
[node name="WallSpike32" parent="Pharaoh5" unique_id=1963981929 instance=ExtResource("10_hiqwa")]
position = Vector2(1356, -1702.6997)
[node name="WallSpike33" parent="Pharaoh5" unique_id=163857781 instance=ExtResource("10_hiqwa")]
position = Vector2(1092.0002, -1243.1807)
rotation = -1.5707964
@@ -1083,38 +1054,6 @@ rotation = -1.5707964
position = Vector2(1056, -1512.6997)
rotation = -1.5707964
[node name="WallSpike49" parent="Pharaoh5" unique_id=115452622 instance=ExtResource("10_hiqwa")]
position = Vector2(1030.0002, -1974.1807)
rotation = -1.5707964
[node name="WallSpike50" parent="Pharaoh5" unique_id=975041451 instance=ExtResource("10_hiqwa")]
position = Vector2(1030, -1960.3955)
rotation = -1.5707964
[node name="WallSpike51" parent="Pharaoh5" unique_id=1826095793 instance=ExtResource("10_hiqwa")]
position = Vector2(1030, -1946.6104)
rotation = -1.5707964
[node name="WallSpike52" parent="Pharaoh5" unique_id=1857545336 instance=ExtResource("10_hiqwa")]
position = Vector2(1030, -1932.1807)
rotation = -1.5707964
[node name="WallSpike53" parent="Pharaoh5" unique_id=1416419910 instance=ExtResource("10_hiqwa")]
position = Vector2(1030.0005, -1918.0552)
rotation = -1.5707964
[node name="WallSpike54" parent="Pharaoh5" unique_id=841503173 instance=ExtResource("10_hiqwa")]
position = Vector2(1030, -1904.27)
rotation = -1.5707964
[node name="WallSpike55" parent="Pharaoh5" unique_id=1070909624 instance=ExtResource("10_hiqwa")]
position = Vector2(1030.0002, -1890.4849)
rotation = -1.5707964
[node name="WallSpike56" parent="Pharaoh5" unique_id=1219841854 instance=ExtResource("10_hiqwa")]
position = Vector2(1030, -1876.6997)
rotation = -1.5707964
[node name="Spike3" parent="Pharaoh5" unique_id=139784319 instance=ExtResource("27_4h6ng")]
position = Vector2(816, -630.1806)
@@ -1215,7 +1154,7 @@ position = Vector2(1082, -631.1806)
position = Vector2(1319, -629.1806)
[node name="Teleporter" parent="Pharaoh5" unique_id=2120681134 instance=ExtResource("4_gbfbk")]
position = Vector2(1214, -2106.1807)
position = Vector2(1193, -1706.41)
paired_teleporter = "F"
[node name="Teleporter2" parent="Pharaoh5" unique_id=880918025 instance=ExtResource("4_gbfbk")]
@@ -2705,11 +2644,8 @@ position = Vector2(8321, -1772.382)
[node name="Saw5" parent="." unique_id=1680757565 instance=ExtResource("37_my276")]
position = Vector2(8520, -1950.6049)
[node name="Saw6" parent="." unique_id=1952059258 instance=ExtResource("37_my276")]
position = Vector2(8287, -2137.6895)
[node name="Saw7" parent="." unique_id=908772956 instance=ExtResource("37_my276")]
position = Vector2(8566, -2316.897)
[node name="HatPickup" parent="." unique_id=812970241 instance=ExtResource("38_yx0jh")]
position = Vector2(-4677, 352.50708)
[node name="DebugPortals" type="Node2D" parent="." unique_id=1727548024 groups=["Debug Mode Only"]]