Merge branch 'main' of https://git.nanoyagi.com/NanoYagi/JumpRopeOldTech
ci/woodpecker/push/woodpecker Pipeline was successful

This commit is contained in:
zozieee committed 2026-10-18 10:52:48 -05:00
commit 019976f997
66 files changed
+1312 -78

No files matched your search

+183 -14
View File
@@ -18,7 +18,14 @@
[ext_resource type="Script" uid="uid://d3rx82psovcpp" path="res://music_button.gd" id="14_70uel"]
[ext_resource type="Script" uid="uid://oyyhhy1gemg0" path="res://objectives_label.gd" id="14_ikiii"]
[ext_resource type="PackedScene" uid="uid://dr8h8xij3qw2h" path="res://pharaoh.tscn" id="15_hiqwa"]
[ext_resource type="PackedScene" uid="uid://bla1cfndgad0" path="res://Dialogue.tscn" id="19_26xuy"]
[ext_resource type="PackedScene" uid="uid://bcu7ftukipiyy" path="res://OldComputer.tscn" id="19_cbp6q"]
[ext_resource type="PackedScene" uid="uid://b5ssjxl1l3fx0" path="res://hidden_vertical_long_block.tscn" id="20_26xuy"]
[ext_resource type="PackedScene" uid="uid://ch0417iiviaxb" path="res://hidden_horizontal_long_block.tscn" id="21_bc84e"]
[ext_resource type="PackedScene" uid="uid://be757jqlv785s" path="res://hidden_coin.tscn" id="22_wukud"]
[ext_resource type="PackedScene" uid="uid://bnkbkfto83owf" path="res://sign.tscn" id="24_wjb0r"]
[ext_resource type="PackedScene" uid="uid://byfgwmvln8ukh" path="res://vertical_block.tscn" id="25_mc2jv"]
[ext_resource type="PackedScene" uid="uid://dt43trxumfv0i" path="res://hidden_sign.tscn" id="26_bo7i5"]
[node name="World" type="Node2D" unique_id=1327991900]
process_mode = 1
@@ -26,24 +33,49 @@ scale = Vector2(1, 1.0155824)
[node name="Player2D" parent="." unique_id=889851478 instance=ExtResource("1_aqk2v")]
unique_name_in_owner = true
position = Vector2(-1004, -1335.1945)
position = Vector2(-4838.9995, 356.4457)
rotation = 0.0005533503
safe_margin = 0.08
[node name="StartingArea" type="Node2D" parent="." unique_id=130240736]
position = Vector2(-842, -1300.7314)
position = Vector2(-4673, 390.9087)
[node name="LongerBlock" parent="StartingArea" unique_id=426800863 instance=ExtResource("6_dwbse")]
[node name="LongerBlock" parent="StartingArea" unique_id=1619185575 instance=ExtResource("6_dwbse")]
position = Vector2(-17, -17.72377)
[node name="LongerBlock3" parent="StartingArea" unique_id=1122236775 instance=ExtResource("6_dwbse")]
position = Vector2(-193, -179.20744)
rotation = 1.5707964
[node name="LongerBlock2" parent="StartingArea" unique_id=426800863 instance=ExtResource("6_dwbse")]
position = Vector2(650, -17.72377)
[node name="LongerBlock2" parent="StartingArea" unique_id=75325542 instance=ExtResource("6_dwbse")]
position = Vector2(-17, -79.75723)
[node name="LongerBlock5" parent="StartingArea" unique_id=1844119708 instance=ExtResource("6_dwbse")]
position = Vector2(1657, -18.708487)
[node name="LongerBlock7" parent="StartingArea" unique_id=2057011049 instance=ExtResource("6_dwbse")]
position = Vector2(2804, -19.693142)
[node name="LongerBlock8" parent="StartingArea" unique_id=74356311 instance=ExtResource("6_dwbse")]
position = Vector2(3174, -397.80124)
[node name="LongerBlock11" parent="StartingArea" unique_id=624436532 instance=ExtResource("6_dwbse")]
position = Vector2(3390, -1028.9663)
[node name="LongerBlock9" parent="StartingArea" unique_id=1224082804 instance=ExtResource("6_dwbse")]
position = Vector2(3723, -1028.9663)
[node name="Pharaoh" parent="StartingArea" unique_id=1201409437 instance=ExtResource("15_hiqwa")]
position = Vector2(-62, -24.616333)
[node name="Pharaoh2" parent="StartingArea" unique_id=472779826 instance=ExtResource("15_hiqwa")]
position = Vector2(615, -24.616425)
[node name="Pharaoh3" parent="StartingArea" unique_id=1148075738 instance=ExtResource("15_hiqwa")]
position = Vector2(1609, -26.585724)
[node name="Pharaoh4" parent="StartingArea" unique_id=764966940 instance=ExtResource("15_hiqwa")]
position = Vector2(2751, -27.570404)
[node name="Pharaoh5" parent="StartingArea" unique_id=2064737854 instance=ExtResource("15_hiqwa")]
position = Vector2(3089, -403.70926)
[node name="Tutorial" type="Node2D" parent="." unique_id=1391494772]
[node name="Block2" parent="Tutorial" unique_id=878186522 instance=ExtResource("2_036b0")]
@@ -422,8 +454,10 @@ script = ExtResource("3_wse8f")
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
offset_top = 605.0
offset_bottom = 274.0
offset_left = 11.0
offset_top = 9.0
offset_right = -1086.0
offset_bottom = -575.0
grow_horizontal = 2
grow_vertical = 2
bbcode_enabled = true
@@ -450,17 +484,31 @@ texture_pressed = ExtResource("13_70uel")
texture_disabled = ExtResource("13_70uel")
script = ExtResource("14_70uel")
[node name="Pharaoh" parent="." unique_id=44054531 instance=ExtResource("15_hiqwa")]
[node name="Dialogue" parent="CanvasLayer" unique_id=1025022375 instance=ExtResource("19_26xuy")]
unique_name_in_owner = true
position = Vector2(192, 177.23824)
offset_left = 3.9999995
offset_top = 550.99994
offset_right = 268.38086
offset_bottom = -7.640442
rotation = 4.9367074e-05
scale = Vector2(0.8267815, 0.8267815)
stretch_mode = 5
[node name="Pharaoh" parent="." unique_id=44054531 instance=ExtResource("15_hiqwa")]
position = Vector2(192, 193.97743)
[node name="Pharaoh2" parent="." unique_id=1541178727 instance=ExtResource("15_hiqwa")]
unique_name_in_owner = true
position = Vector2(6338, -58.09474)
position = Vector2(6338, -42.34024)
[node name="OldComputer" parent="." unique_id=1951254108 instance=ExtResource("19_cbp6q")]
unique_name_in_owner = true
[node name="Sign9" parent="." unique_id=573430453 instance=ExtResource("24_wjb0r")]
position = Vector2(-1387, -14.769852)
scale = Vector2(1, 0.98465663)
sign_text = "HOLDING DOWN WILL MEDITATE"
text_dismiss_timer = 4
[node name="Block" parent="." unique_id=226580978 instance=ExtResource("2_036b0")]
position = Vector2(6637, -253.12886)
@@ -512,4 +560,125 @@ position = Vector2(7732, -109.12882)
[node name="VerticalLongBlock6" parent="." unique_id=200846556 instance=ExtResource("4_pkg7o")]
position = Vector2(7865, -18.128824)
[node name="Pharaoh4" parent="." unique_id=439750165 instance=ExtResource("15_hiqwa")]
position = Vector2(4097, 175.26888)
[node name="Pharaoh3" parent="." unique_id=998592579 instance=ExtResource("15_hiqwa")]
position = Vector2(-883, -642.9808)
[node name="HiddenVerticalLongBlock" parent="." unique_id=550983536 instance=ExtResource("20_26xuy")]
visible = true
position = Vector2(-1625, -449.00342)
rotation = 0.0
[node name="HiddenVerticalLongBlock11" parent="." unique_id=1548779318 instance=ExtResource("20_26xuy")]
visible = true
position = Vector2(-1806, -161.48367)
rotation = 0.0
[node name="HiddenVerticalLongBlock12" parent="." unique_id=225495194 instance=ExtResource("20_26xuy")]
visible = true
position = Vector2(-2003, -321.98273)
rotation = 0.0
[node name="HiddenVerticalLongBlock2" parent="." unique_id=671573231 instance=ExtResource("20_26xuy")]
visible = true
position = Vector2(-4696, 435.21823)
[node name="HiddenHorizontalLongBlock" parent="." unique_id=252771458 instance=ExtResource("21_bc84e")]
position = Vector2(-4647, 485.43573)
[node name="Coin" parent="." unique_id=1292877109 instance=ExtResource("22_wukud")]
position = Vector2(-4646, 447.03412)
[node name="HiddenVerticalLongBlock3" parent="." unique_id=9509488 instance=ExtResource("20_26xuy")]
position = Vector2(249, -709.93744)
[node name="HiddenVerticalLongBlock4" parent="." unique_id=1392186992 instance=ExtResource("20_26xuy")]
position = Vector2(249, -600.64056)
[node name="HiddenVerticalLongBlock5" parent="." unique_id=1233145931 instance=ExtResource("20_26xuy")]
position = Vector2(248, -822.1883)
[node name="HiddenVerticalLongBlock6" parent="." unique_id=1910226562 instance=ExtResource("20_26xuy")]
position = Vector2(248, -932.46985)
[node name="HiddenVerticalLongBlock7" parent="." unique_id=808086224 instance=ExtResource("20_26xuy")]
position = Vector2(248, -1149.0942)
[node name="HiddenVerticalLongBlock8" parent="." unique_id=1783201320 instance=ExtResource("20_26xuy")]
position = Vector2(248, -1039.7974)
[node name="HiddenVerticalLongBlock9" parent="." unique_id=1967440515 instance=ExtResource("20_26xuy")]
position = Vector2(247, -1261.3452)
[node name="HiddenVerticalLongBlock10" parent="." unique_id=170869907 instance=ExtResource("20_26xuy")]
position = Vector2(247, -1371.6267)
[node name="Sign" parent="." unique_id=916197061 instance=ExtResource("24_wjb0r")]
position = Vector2(-4799, 365.30762)
sign_text = "JUMP WITH A"
[node name="Sign2" parent="." unique_id=1141422640 instance=ExtResource("24_wjb0r")]
position = Vector2(-3949, 364.32294)
sign_text = "YOU CAN JUMP AGAIN IN THE AIR"
[node name="Sign3" parent="." unique_id=692258908 instance=ExtResource("24_wjb0r")]
position = Vector2(-2941, 365.30762)
sign_text = "DASH WITH SHIFT WHILE MOVING IN A DIRECTION"
[node name="Sign4" parent="." unique_id=335524344 instance=ExtResource("24_wjb0r")]
position = Vector2(-1789, 364.32297)
sign_text = "TOUCHING A FLOOR, WALL, OR EVEN CEILING WILL REFRESH YOUR AIR JUMP"
[node name="Sign5" parent="." unique_id=349011535 instance=ExtResource("24_wjb0r")]
position = Vector2(-2908, 365.30762)
sign_text = "DASH CAN BE USED EVEN AFTER JUMPING"
text_dismiss_timer = 4
[node name="Sign6" parent="." unique_id=1820216223 instance=ExtResource("24_wjb0r")]
position = Vector2(-3918, 364.32297)
sign_text = "THE CRYSTAL FADES WHEN YOU HAVE NO JUMPS REMAINING"
text_dismiss_timer = 4
[node name="Sign7" parent="." unique_id=381974434 instance=ExtResource("24_wjb0r")]
position = Vector2(-4771, 365.30762)
sign_text = "HOLD A TO JUMP FURTHER"
text_dismiss_timer = 3
[node name="Block12" parent="." unique_id=888208031 instance=ExtResource("25_mc2jv")]
position = Vector2(-1660, 5.9079437)
[node name="Block13" parent="." unique_id=501875762 instance=ExtResource("25_mc2jv")]
position = Vector2(-1660, 20.677792)
[node name="Sign8" parent="." unique_id=460763419 instance=ExtResource("24_wjb0r")]
position = Vector2(-2876, 364.32297)
sign_text = "THE OTHER CRYSTAL WILL GO OUT WHEN NO DASHES REMAIN"
text_dismiss_timer = 4
[node name="HiddenSign" parent="." unique_id=1914486910 instance=ExtResource("26_bo7i5")]
position = Vector2(-1351, -14.769848)
sign_text = "MEDITATING REVEALS SECRETS"
text_dismiss_timer = 4
[node name="Sign10" parent="." unique_id=600787286 instance=ExtResource("24_wjb0r")]
position = Vector2(-1349, -644.9501)
sign_text = "PORTALS WORK AS EXPECTED"
[node name="Teleporter" parent="." unique_id=1261295038 instance=ExtResource("4_gbfbk")]
position = Vector2(-1295, -668.58185)
paired_teleporter = "C"
[node name="Teleporter2" parent="." unique_id=392920399 instance=ExtResource("4_gbfbk")]
position = Vector2(-1171, -669.5665)
paired_teleporter = "C"
[node name="Sign11" parent="." unique_id=933599424 instance=ExtResource("24_wjb0r")]
position = Vector2(-1115, -644.9501)
sign_text = "COINS AREN'T REAL"
[node name="HiddenCoin" parent="." unique_id=1654988120 instance=ExtResource("22_wukud")]
position = Vector2(-1063, -662.6739)
[connection signal="toggled" from="CanvasLayer/MusicButton" to="CanvasLayer/MusicButton" method="_on_toggled"]