Merge branch 'main' of http://git.nanoyagi.com/NanoYagi/JumpRopeOldTech

world.tscn

@@ -18,6 +18,7 @@
 [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"]
@@ -31,6 +32,7 @@ scale = Vector2(1, 1.0155824)
 unique_name_in_owner = true
 position = Vector2(-4844.9995, 356.44568)
 rotation = 0.0005533503
+safe_margin = 0.08
 
 [node name="StartingArea" type="Node2D" parent="." unique_id=130240736]
 position = Vector2(-4673, 390.9087)
@@ -433,8 +435,9 @@ script = ExtResource("3_wse8f")
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-offset_top = 605.0
-offset_bottom = 274.0
+offset_top = 586.0
+offset_right = -1097.0
+offset_bottom = 2.0
 grow_horizontal = 2
 grow_vertical = 2
 bbcode_enabled = true
@@ -461,13 +464,18 @@ 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(55, 111.266205)
+offset_left = 228.0
+offset_top = 499.0
+offset_right = 231.0
+offset_bottom = 491.0
 rotation = 4.9367074e-05
 
+[node name="Pharaoh" parent="." unique_id=44054531 instance=ExtResource("15_hiqwa")]
+position = Vector2(192, 177.23824)
+
 [node name="Pharaoh2" parent="." unique_id=1541178727 instance=ExtResource("15_hiqwa")]
-unique_name_in_owner = true
 position = Vector2(6338, -42.34024)
 
 [node name="OldComputer" parent="." unique_id=1951254108 instance=ExtResource("19_cbp6q")]