Merge branch 'master' into 'fix'

# Conflicts:
#   Main rooms/Balcony.tscn
#   Main rooms/Neighbor's balcony.tscn
#   Special views/Desk.tscn

Main rooms/Balcony.tscn

@@ -49,9 +49,6 @@ extents = Vector2( 19.9228, 46.1471 )
 [sub_resource type="RectangleShape2D" id=3]
 extents = Vector2( 19.9228, 32.1977 )
 
-[sub_resource type="RectangleShape2D" id=4]
-extents = Vector2( 15.6685, 16.4124 )
-
 [sub_resource type="RectangleShape2D" id=5]
 extents = Vector2( 34.6417, 58.7324 )
 
@@ -59,6 +56,12 @@ extents = Vector2( 34.6417, 58.7324 )
 flags = 4
 load_path = "res://.import/Balcony door.png-b1c8d05a5eb532517313dc4785195288.stex"
 
+[sub_resource type="RectangleShape2D" id=2]
+extents = Vector2( 19.9228, 51.7686 )
+
+[sub_resource type="RectangleShape2D" id=4]
+extents = Vector2( 15.6685, 16.4124 )
+
 [sub_resource type="RectangleShape2D" id=7]
 extents = Vector2( 15.6685, 16.4124 )
 
@@ -67,6 +70,9 @@ extents = Vector2( 15.6685, 16.4124 )
 [node name="BG" type="Sprite" parent="."]
 position = Vector2( 515.248, 303.008 )
 texture = ExtResource( 5 )
+__meta__ = {
+"_edit_lock_": true
+}
 
 [node name="Dialogue control" type="Control" parent="."]
 margin_right = 40.0
@@ -80,17 +86,14 @@ __meta__ = {
 position = Vector2( 283.344, 247.965 )
 scale = Vector2( 0.829244, 0.829244 )
 input_pickable = true
-script = ExtResource( 7 )
 __meta__ = {
 "_edit_group_": true
 }
-interactable = true
-flavorText = "Great listeners! Terrible conversationalists."
 
 [node name="Hitbox" type="CollisionShape2D" parent="Other plants"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
-shape = SubResource( 2 )
+shape = SubResource( 3 )
 
 [node name="Sprite" type="Sprite" parent="Other plants/Hitbox"]
 visible = false
@@ -98,19 +101,21 @@ position = Vector2( 0.449585, 0.542709 )
 scale = Vector2( 0.201615, 0.377395 )
 texture = ExtResource( 1 )
 
-[node name="Repotted plants" type="StaticBody2D" parent="."]
-visible = false
-position = Vector2( 932.003, 339.541 )
+[node name="Door to living room" type="StaticBody2D" parent="."]
+position = Vector2( 99.5567, 249.292 )
 scale = Vector2( 0.829244, 0.829244 )
 input_pickable = true
+script = ExtResource( 6 )
 __meta__ = {
 "_edit_group_": true
 }
+interactable = true
+flavorText = "Clicked"
 
 [node name="Hitbox" type="CollisionShape2D" parent="Repotted plants"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
-shape = SubResource( 3 )
+shape = SubResource( 5 )
 
 [node name="Sprite" type="Sprite" parent="Repotted plants/Hitbox"]
 position = Vector2( 0.127625, 0.542709 )
@@ -121,17 +126,17 @@ texture = ExtResource( 8 )
 position = Vector2( 293.251, 463.181 )
 scale = Vector2( 0.829244, 0.829244 )
 input_pickable = true
-script = ExtResource( 2 )
+script = ExtResource( 7 )
 __meta__ = {
 "_edit_group_": true
 }
-retrievable = true
-flavorText = "A pant plot-- I mean... a plant pot."
+interactable = true
+flavorText = "Great listeners! Terrible conversationalists."
 
 [node name="Hitbox" type="CollisionShape2D" parent="Pot"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
-shape = SubResource( 4 )
+shape = SubResource( 2 )
 
 [node name="Sprite" type="Sprite" parent="Pot/Hitbox"]
 position = Vector2( -0.00619507, -0.0649719 )
@@ -149,7 +154,7 @@ flavorText = "Clicked"
 [node name="Hitbox" type="CollisionShape2D" parent="Door to living room"]
 position = Vector2( -36.0011, -20.0035 )
 scale = Vector2( 5, 5 )
-shape = SubResource( 5 )
+shape = SubResource( 4 )
 
 [node name="Sprite" type="Sprite" parent="Door to living room/Hitbox"]
 visible = false

Main rooms/Neighbor's balcony.tscn

@@ -24,6 +24,7 @@ load_path = "res://.import/Balcony door.png-b1c8d05a5eb532517313dc4785195288.ste
 [node name="Node2D" type="Node2D"]
 
 [node name="BG" type="Sprite" parent="."]
+visible = false
 position = Vector2( 507.812, 301.124 )
 texture = ExtResource( 7 )
 
@@ -52,7 +53,6 @@ scale = Vector2( 5, 5 )
 shape = SubResource( 1 )
 
 [node name="Sprite" type="Sprite" parent="Other balcony/Hitbox"]
-visible = false
 position = Vector2( -0.399353, -0.500828 )
 scale = Vector2( 0.455877, 0.455877 )
 texture = ExtResource( 3 )
@@ -74,7 +74,6 @@ scale = Vector2( 5, 5 )
 shape = SubResource( 2 )
 
 [node name="Sprite" type="Sprite" parent="Nana from afar/Hitbox"]
-visible = false
 position = Vector2( -0.158181, -0.0184715 )
 scale = Vector2( 0.101337, 0.101337 )
 texture = ExtResource( 1 )
@@ -94,7 +93,6 @@ scale = Vector2( 5, 5 )
 shape = SubResource( 3 )
 
 [node name="Sprite" type="Sprite" parent="Balcony to neighbor\'s room/Hitbox"]
-visible = false
 position = Vector2( 0.304169, 0.207489 )
 scale = Vector2( 0.231109, 0.325438 )
 texture = SubResource( 4 )

Special views/Desk.tscn

@@ -6,7 +6,7 @@
 [ext_resource path="res://Scripts/Movement scripts/Return_laptop.gd" type="Script" id=4]
 
 [sub_resource type="RectangleShape2D" id=1]
-extents = Vector2( 75.6539, 65.9696 )
+extents = Vector2( 203.178, 171.455 )
 
 [sub_resource type="RectangleShape2D" id=2]
 extents = Vector2( 17.4279, 15.7667 )
@@ -30,8 +30,8 @@ __meta__ = {
 }
 
 [node name="Laptop" type="StaticBody2D" parent="."]
-position = Vector2( 618.26, 300.409 )
-scale = Vector2( 0.829244, 0.829244 )
+position = Vector2( 561.114, 281.36 )
+scale = Vector2( 0.3, 0.3 )
 input_pickable = true
 script = ExtResource( 3 )
 __meta__ = {