Merge branch 'main' of ssh://git.egg:2222/NanoYagi/JumpRopeOldTech

This commit is contained in:
yagigreg committed 2026-10-18 00:57:35 -05:00
commit c8ad334936
21 files changed
+296 -22

No files matched your search

+93 -9
View File
@@ -20,6 +20,9 @@
[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"]
[node name="World" type="Node2D" unique_id=1327991900]
process_mode = 1
@@ -27,24 +30,48 @@ 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(-4844.9995, 356.44568)
rotation = 0.0005533503
[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(2861, -19.693142)
[node name="LongerBlock8" parent="StartingArea" unique_id=74356311 instance=ExtResource("6_dwbse")]
position = Vector2(3174, -424.38696)
[node name="LongerBlock11" parent="StartingArea" unique_id=624436532 instance=ExtResource("6_dwbse")]
position = Vector2(3539, -1049.644)
[node name="LongerBlock9" parent="StartingArea" unique_id=1224082804 instance=ExtResource("6_dwbse")]
position = Vector2(3872, -1049.644)
[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(2808, -27.570404)
[node name="Pharaoh5" parent="StartingArea" unique_id=2064737854 instance=ExtResource("15_hiqwa")]
position = Vector2(3089, -430.29498)
[node name="Tutorial" type="Node2D" parent="." unique_id=1391494772]
[node name="Block2" parent="Tutorial" unique_id=878186522 instance=ExtResource("2_036b0")]
@@ -438,6 +465,8 @@ script = ExtResource("14_70uel")
[node name="Dialogue" parent="CanvasLayer" unique_id=1025022375 instance=ExtResource("19_26xuy")]
unique_name_in_owner = true
position = Vector2(55, 111.266205)
rotation = 4.9367074e-05
offset_left = 228.0
offset_top = 499.0
offset_right = 231.0
@@ -447,7 +476,7 @@ offset_bottom = 491.0
position = Vector2(192, 177.23824)
[node name="Pharaoh2" parent="." unique_id=1541178727 instance=ExtResource("15_hiqwa")]
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
@@ -503,4 +532,59 @@ 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(-734, -663.65857)
[node name="HiddenVerticalLongBlock" parent="." unique_id=550983536 instance=ExtResource("20_26xuy")]
visible = true
position = Vector2(-1553, -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)
[connection signal="toggled" from="CanvasLayer/MusicButton" to="CanvasLayer/MusicButton" method="_on_toggled"]