Merge remote-tracking branch 'origin/main' into quests
This commit is contained in:
commit
fa9ec1e5cd
39 files changed
+557
-33
No files matched your search
+118
-4
@@ -11,6 +11,7 @@
|
||||
[ext_resource type="PackedScene" uid="uid://biot4cuwgohvo" path="res://longer_block.tscn" id="6_dwbse"]
|
||||
[ext_resource type="PackedScene" uid="uid://kstmxoa4dx55" path="res://coin.tscn" id="8_ioo17"]
|
||||
[ext_resource type="PackedScene" uid="uid://b1e1nx60ng3tq" path="res://disk.tscn" id="10_2u3nc"]
|
||||
[ext_resource type="PackedScene" uid="uid://dbk4f76ux6dsv" path="res://wallspike.tscn" id="10_hiqwa"]
|
||||
[ext_resource type="Texture2D" uid="uid://s3h6tpypoee0" path="res://art/music_button.png" id="12_2o6r5"]
|
||||
[ext_resource type="PackedScene" uid="uid://c8m4d77hcr0pj" path="res://spike.tscn" id="12_k3n1d"]
|
||||
[ext_resource type="Texture2D" uid="uid://dxgnkftqtyt53" path="res://art/music_button_disabled.png" id="13_70uel"]
|
||||
@@ -18,7 +19,7 @@
|
||||
[ext_resource type="PackedScene" uid="uid://dr8h8xij3qw2h" path="res://pharaoh.tscn" id="15_hiqwa"]
|
||||
|
||||
[node name="World" type="Node2D" unique_id=1327991900]
|
||||
process_mode = 3
|
||||
process_mode = 1
|
||||
scale = Vector2(1, 1.0155824)
|
||||
|
||||
[node name="Player2D" parent="." unique_id=889851478 instance=ExtResource("1_aqk2v")]
|
||||
@@ -65,6 +66,42 @@ position = Vector2(55, 99.45031)
|
||||
[node name="Spike" parent="Tutorial" unique_id=1505280758 instance=ExtResource("12_k3n1d")]
|
||||
position = Vector2(162, 184.13078)
|
||||
|
||||
[node name="Spike2" parent="Tutorial" unique_id=1739014101 instance=ExtResource("12_k3n1d")]
|
||||
position = Vector2(1022, 613.44116)
|
||||
|
||||
[node name="Spike3" parent="Tutorial" unique_id=222112916 instance=ExtResource("12_k3n1d")]
|
||||
position = Vector2(1501, 384.0161)
|
||||
|
||||
[node name="Spike4" parent="Tutorial" unique_id=1697727112 instance=ExtResource("12_k3n1d")]
|
||||
position = Vector2(1068, 613.44116)
|
||||
|
||||
[node name="Spike5" parent="Tutorial" unique_id=923024047 instance=ExtResource("12_k3n1d")]
|
||||
position = Vector2(1040, 382.04678)
|
||||
|
||||
[node name="Spike6" parent="Tutorial" unique_id=2099746763 instance=ExtResource("12_k3n1d")]
|
||||
position = Vector2(1117, 612.4564)
|
||||
|
||||
[node name="Spike7" parent="Tutorial" unique_id=1331198453 instance=ExtResource("12_k3n1d")]
|
||||
position = Vector2(1132, 612.4564)
|
||||
|
||||
[node name="Spike8" parent="Tutorial" unique_id=2015311321 instance=ExtResource("12_k3n1d")]
|
||||
position = Vector2(1210, 384.01608)
|
||||
|
||||
[node name="Spike9" parent="Tutorial" unique_id=1362495288 instance=ExtResource("12_k3n1d")]
|
||||
position = Vector2(1515, 384.01605)
|
||||
|
||||
[node name="Spike10" parent="Tutorial" unique_id=1398183079 instance=ExtResource("12_k3n1d")]
|
||||
position = Vector2(1528, 383.03143)
|
||||
|
||||
[node name="Spike11" parent="Tutorial" unique_id=887004075 instance=ExtResource("12_k3n1d")]
|
||||
position = Vector2(1225, 612.4564)
|
||||
|
||||
[node name="Spike12" parent="Tutorial" unique_id=756448867 instance=ExtResource("12_k3n1d")]
|
||||
position = Vector2(1256, 612.4564)
|
||||
|
||||
[node name="Spike13" parent="Tutorial" unique_id=2050689217 instance=ExtResource("12_k3n1d")]
|
||||
position = Vector2(1271, 612.4564)
|
||||
|
||||
[node name="Teleporter1" parent="Tutorial" unique_id=1201409437 instance=ExtResource("4_gbfbk")]
|
||||
position = Vector2(149, 91.57307)
|
||||
paired_teleporter = "A"
|
||||
@@ -87,13 +124,16 @@ position = Vector2(55, 118)
|
||||
[node name="LongBlock" parent="Tutorial" unique_id=658573725 instance=ExtResource("3_dwbse")]
|
||||
position = Vector2(166, 200)
|
||||
|
||||
[node name="LongBlock2" parent="Tutorial" unique_id=968475020 instance=ExtResource("3_dwbse")]
|
||||
position = Vector2(166, 200)
|
||||
|
||||
[node name="VerticalLongBlock" parent="Tutorial" unique_id=925152188 instance=ExtResource("4_pkg7o")]
|
||||
position = Vector2(250, 141)
|
||||
|
||||
[node name="Coin5" parent="Tutorial" unique_id=874141343 instance=ExtResource("8_ioo17")]
|
||||
position = Vector2(800, 373.18488)
|
||||
|
||||
[node name="Coin6" parent="Tutorial" unique_id=1739014101 instance=ExtResource("8_ioo17")]
|
||||
[node name="Coin6" parent="Tutorial" unique_id=1373208400 instance=ExtResource("8_ioo17")]
|
||||
position = Vector2(840, 373.18488)
|
||||
|
||||
[node name="Coin7" parent="Tutorial" unique_id=1551757221 instance=ExtResource("8_ioo17")]
|
||||
@@ -114,6 +154,15 @@ position = Vector2(1091, 300.32028)
|
||||
[node name="Coin15" parent="Tutorial" unique_id=1955593631 instance=ExtResource("8_ioo17")]
|
||||
position = Vector2(1131, 300.32028)
|
||||
|
||||
[node name="Coin21" parent="Tutorial" unique_id=1426969338 instance=ExtResource("8_ioo17")]
|
||||
position = Vector2(1303, 510.05212)
|
||||
|
||||
[node name="Coin22" parent="Tutorial" unique_id=1260076605 instance=ExtResource("8_ioo17")]
|
||||
position = Vector2(1343, 510.05212)
|
||||
|
||||
[node name="Coin20" parent="Tutorial" unique_id=1867738373 instance=ExtResource("8_ioo17")]
|
||||
position = Vector2(1132, 459.83466)
|
||||
|
||||
[node name="Coin16" parent="Tutorial" unique_id=206832709 instance=ExtResource("8_ioo17")]
|
||||
position = Vector2(1166, 300.32028)
|
||||
|
||||
@@ -126,6 +175,12 @@ position = Vector2(1325, 181.17682)
|
||||
[node name="Coin19" parent="Tutorial" unique_id=59058959 instance=ExtResource("8_ioo17")]
|
||||
position = Vector2(1364, 144.74452)
|
||||
|
||||
[node name="Coin23" parent="Tutorial" unique_id=767620055 instance=ExtResource("8_ioo17")]
|
||||
position = Vector2(1652, 237.30225)
|
||||
|
||||
[node name="Coin24" parent="Tutorial" unique_id=1386372245 instance=ExtResource("8_ioo17")]
|
||||
position = Vector2(1692, -166.40698)
|
||||
|
||||
[node name="Coin11" parent="Tutorial" unique_id=857910277 instance=ExtResource("8_ioo17")]
|
||||
position = Vector2(691, 373.18488)
|
||||
|
||||
@@ -150,6 +205,17 @@ position = Vector2(0, -85.66513)
|
||||
position = Vector2(213, 95.511696)
|
||||
disk_num = 1
|
||||
|
||||
[node name="WallSpike" parent="Tutorial" unique_id=287086441 instance=ExtResource("10_hiqwa")]
|
||||
position = Vector2(1325, 629.1956)
|
||||
|
||||
[node name="WallSpike2" parent="Tutorial" unique_id=234787573 instance=ExtResource("10_hiqwa")]
|
||||
position = Vector2(973, 630.18024)
|
||||
rotation = 4.712389
|
||||
|
||||
[node name="WallSpike3" parent="Tutorial" unique_id=419913773 instance=ExtResource("10_hiqwa")]
|
||||
position = Vector2(1679, 181.17683)
|
||||
rotation = 4.712389
|
||||
|
||||
[node name="ZoeLevel" type="Node2D" parent="." unique_id=980267417]
|
||||
|
||||
[node name="LongBlock4" parent="ZoeLevel" unique_id=469408536 instance=ExtResource("6_dwbse")]
|
||||
@@ -161,18 +227,65 @@ position = Vector2(880, 399)
|
||||
[node name="LongBlock6" parent="ZoeLevel" unique_id=1328813509 instance=ExtResource("6_dwbse")]
|
||||
position = Vector2(1368, 401)
|
||||
|
||||
[node name="LongBlock7" parent="ZoeLevel" unique_id=1016724328 instance=ExtResource("6_dwbse")]
|
||||
position = Vector2(1149, 629.44025)
|
||||
|
||||
[node name="Block" parent="ZoeLevel" unique_id=878186522 instance=ExtResource("2_036b0")]
|
||||
position = Vector2(55, 118)
|
||||
|
||||
[node name="LongBlock" parent="ZoeLevel" unique_id=1035095840 instance=ExtResource("3_dwbse")]
|
||||
position = Vector2(166, 200)
|
||||
position = Vector2(950, 505.12885)
|
||||
|
||||
[node name="VerticalLongBlock" parent="ZoeLevel" unique_id=1984351408 instance=ExtResource("4_pkg7o")]
|
||||
position = Vector2(250, 141)
|
||||
position = Vector2(1695, 192.9927)
|
||||
|
||||
[node name="VerticalLongBlock2" parent="ZoeLevel" unique_id=485343370 instance=ExtResource("4_pkg7o")]
|
||||
position = Vector2(1695, 81.72651)
|
||||
|
||||
[node name="VerticalLongBlock3" parent="ZoeLevel" unique_id=977741022 instance=ExtResource("4_pkg7o")]
|
||||
position = Vector2(1589, 139.82124)
|
||||
|
||||
[node name="VerticalLongBlock4" parent="ZoeLevel" unique_id=923671040 instance=ExtResource("4_pkg7o")]
|
||||
position = Vector2(1589, 29.539703)
|
||||
|
||||
[node name="Spike" parent="ZoeLevel" unique_id=741914042 instance=ExtResource("12_k3n1d")]
|
||||
position = Vector2(954, 520.88336)
|
||||
rotation = 3.1415927
|
||||
|
||||
[node name="Spike4" parent="ZoeLevel" unique_id=1430493985 instance=ExtResource("12_k3n1d")]
|
||||
position = Vector2(1827, 418.47906)
|
||||
rotation = 3.1415927
|
||||
|
||||
[node name="Spike5" parent="ZoeLevel" unique_id=1849441610 instance=ExtResource("12_k3n1d")]
|
||||
position = Vector2(1812, 418.47906)
|
||||
rotation = 3.1415927
|
||||
|
||||
[node name="Spike6" parent="ZoeLevel" unique_id=102008874 instance=ExtResource("12_k3n1d")]
|
||||
position = Vector2(1797, 418.47906)
|
||||
rotation = 3.1415927
|
||||
|
||||
[node name="Spike7" parent="ZoeLevel" unique_id=1200843252 instance=ExtResource("12_k3n1d")]
|
||||
position = Vector2(1871, 418.4791)
|
||||
rotation = 3.1415927
|
||||
|
||||
[node name="LongBlock2" parent="ZoeLevel" unique_id=1003210040 instance=ExtResource("3_dwbse")]
|
||||
position = Vector2(1299, 539.5918)
|
||||
|
||||
[node name="Spike2" parent="ZoeLevel" unique_id=1503247741 instance=ExtResource("12_k3n1d")]
|
||||
position = Vector2(1303, 555.3463)
|
||||
rotation = 3.1415927
|
||||
|
||||
[node name="LongBlock3" parent="ZoeLevel" unique_id=483038350 instance=ExtResource("3_dwbse")]
|
||||
position = Vector2(1837, 628.21094)
|
||||
|
||||
[node name="Spike3" parent="ZoeLevel" unique_id=1550792049 instance=ExtResource("12_k3n1d")]
|
||||
position = Vector2(1841, 643.96545)
|
||||
rotation = 3.1415927
|
||||
|
||||
[node name="CanvasLayer" type="CanvasLayer" parent="." unique_id=1637221343]
|
||||
|
||||
[node name="RichTextLabel2" type="RichTextLabel" parent="CanvasLayer" unique_id=1254950785]
|
||||
visible = false
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
@@ -183,6 +296,7 @@ text = "FPS:"
|
||||
script = ExtResource("2_dwbse")
|
||||
|
||||
[node name="RichTextLabel3" type="RichTextLabel" parent="CanvasLayer" unique_id=63830958]
|
||||
visible = false
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
|
||||
Reference in new issue
Block a user