Merge branch 'FixHitBox' into 'master'

Fix hit box See merge request breakdown/Reyes-Santos-Tsai-Thesis!8

Merge branch 'FixHitBox' into 'master'
Fix hit box See merge request breakdown/Reyes-Santos-Tsai-Thesis!8
1fac9f39 · Julia Santos · 8d75baa6 · 8778258e · 1fac9f39 · 1fac9f39
Commit 1fac9f39 authored Jan 16, 2022 by Julia Santos
18 changed files
--- a/Item.gd
+++ b/Item.gd
@@ -22,7 +22,7 @@ onready var texture # the texture of the items's sprite, for passing to inventor
 # https://padamthapa.com/blog/how-to-detect-click-inside-staticbody2d-in-godot/
 func _ready():
-	texture = get_node("CollisionShape2D/Sprite").get_texture()
+	texture = get_node("Hitbox/Sprite").get_texture()
 func passUI(inv, dia, que, pa): #passes the inventory and dialogue box from the parent scene to the item in the instanced scene
 	inventory = inv

--- a/Laundry - Notepad.tscn
+++ b/Laundry - Notepad.tscn
@@ -81,12 +81,12 @@ __meta__ = {
 }
 interactable = true
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Washing machine door"]
+[node name="Hitbox" type="CollisionShape2D" parent="Washing machine door"]
 position = Vector2( 1.07745, 4.57318 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 2 )
-[node name="Sprite" type="Sprite" parent="Washing machine door/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Washing machine door/Hitbox"]
 visible = false
 position = Vector2( -9.19508, -2.97264 )
 scale = Vector2( 0.200696, 0.200696 )
@@ -115,12 +115,12 @@ __meta__ = {
 }
 interactable = true
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Clothes"]
+[node name="Hitbox" type="CollisionShape2D" parent="Clothes"]
 position = Vector2( 1.07745, 4.57318 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 3 )
-[node name="Sprite" type="Sprite" parent="Clothes/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Clothes/Hitbox"]
 position = Vector2( -0.830688, -5.5271 )
 scale = Vector2( 0.051844, 0.051844 )
 texture = ExtResource( 9 )
@@ -148,12 +148,12 @@ __meta__ = {
 }
 interactable = true
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Buttons"]
+[node name="Hitbox" type="CollisionShape2D" parent="Buttons"]
 position = Vector2( 1.07745, 0.955444 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 4 )
-[node name="Sprite" type="Sprite" parent="Buttons/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Buttons/Hitbox"]
 visible = false
 position = Vector2( -9.19508, -2.97264 )
 scale = Vector2( 0.200696, 0.200696 )
@@ -182,12 +182,12 @@ __meta__ = {
 }
 interactable = true
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Drawer"]
+[node name="Hitbox" type="CollisionShape2D" parent="Drawer"]
 position = Vector2( -2.33716, 0.955444 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 5 )
-[node name="Sprite" type="Sprite" parent="Drawer/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Drawer/Hitbox"]
 visible = false
 position = Vector2( -14.4847, -7.3775 )
 scale = Vector2( 0.199722, 0.199722 )
@@ -216,17 +216,17 @@ __meta__ = {
 }
 interactable = true
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Soap"]
+[node name="Hitbox" type="CollisionShape2D" parent="Soap"]
 position = Vector2( 2.21564, -2.45926 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 6 )
-[node name="Sprite" type="Sprite" parent="Soap/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Soap/Hitbox"]
 position = Vector2( -1.2373, 0.66748 )
 scale = Vector2( 0.0213467, 0.0213467 )
 texture = ExtResource( 3 )
-[node name="Sprite2" type="Sprite" parent="Soap/CollisionShape2D"]
+[node name="Sprite2" type="Sprite" parent="Soap/Hitbox"]
 visible = false
 position = Vector2( 7.78718, 0.237717 )
 scale = Vector2( 0.0226359, 0.0226359 )
@@ -255,12 +255,12 @@ __meta__ = {
 }
 interactable = true
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Return"]
+[node name="Hitbox" type="CollisionShape2D" parent="Return"]
 position = Vector2( -2.89487, 2.65125 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 7 )
-[node name="Sprite" type="Sprite" parent="Return/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Return/Hitbox"]
 position = Vector2( -1.10974, 0.0285645 )
 scale = Vector2( 0.0338674, 0.0338674 )
 texture = ExtResource( 11 )

--- a/Main rooms/Balcony.tscn
+++ b/Main rooms/Balcony.tscn
@@ -43,31 +43,33 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
 #	pass
 "
-[sub_resource type="RectangleShape2D" id=2]
-extents = Vector2( 19.9228, 36.7719 )
 [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, 40.1913 )
+extents = Vector2( 34.6417, 55.6661 )
 [sub_resource type="StreamTexture" id=6]
 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 )
 [node name="Node2D" type="Node2D"]
 [node name="BG" type="Sprite" parent="."]
-visible = false
+position = Vector2( 512.248, 303.008 )
-position = Vector2( 515.248, 303.008 )
 texture = ExtResource( 5 )
+__meta__ = {
+"_edit_lock_": true
+}
 [node name="Dialogue control" type="Control" parent="."]
 margin_right = 40.0
@@ -77,90 +79,92 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
-[node name="Other plants" type="StaticBody2D" parent="."]
+[node name="Repotted plants" type="StaticBody2D" parent="."]
-position = Vector2( 797.184, 280.808 )
+visible = false
+position = Vector2( 932.003, 339.541 )
 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="CollisionShape2D" type="CollisionShape2D" parent="Other plants"]
+[node name="Hitbox" type="CollisionShape2D" parent="Repotted 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/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Repotted plants/Hitbox"]
-position = Vector2( 0.449585, 0.542709 )
+position = Vector2( 0.127625, 0.542709 )
-scale = Vector2( 0.201615, 0.377395 )
+scale = Vector2( 0.201615, 0.325884 )
-texture = ExtResource( 1 )
+texture = ExtResource( 8 )
-[node name="Repotted plants" type="StaticBody2D" parent="."]
+[node name="Door to living room" type="StaticBody2D" parent="."]
-visible = false
+position = Vector2( 99.5567, 249.292 )
-position = Vector2( 932.003, 339.541 )
 scale = Vector2( 0.829244, 0.829244 )
 input_pickable = true
+script = ExtResource( 6 )
 __meta__ = {
 "_edit_group_": true
 }
+interactable = true
+flavorText = "Clicked"
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Repotted plants"]
+[node name="Hitbox" type="CollisionShape2D" parent="Door to living room"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
-shape = SubResource( 3 )
+shape = SubResource( 5 )
-[node name="Sprite" type="Sprite" parent="Repotted plants/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Door to living room/Hitbox"]
-position = Vector2( 0.127625, 0.542709 )
+visible = false
-scale = Vector2( 0.201615, 0.325884 )
+position = Vector2( 0.574005, 0.358818 )
-texture = ExtResource( 8 )
+scale = Vector2( 0.343423, 0.403654 )
+texture = SubResource( 6 )
-[node name="Pot" type="StaticBody2D" parent="."]
+[node name="Other plants" type="StaticBody2D" parent="."]
-position = Vector2( 732.928, 428.219 )
+position = Vector2( 270.631, 268.094 )
 scale = Vector2( 0.829244, 0.829244 )
 input_pickable = true
-script = ExtResource( 2 )
+script = ExtResource( 7 )
 __meta__ = {
 "_edit_group_": true
 }
-retrievable = true
+interactable = true
-flavorText = "A pant plot-- I mean... a plant pot."
+flavorText = "Great listeners! Terrible conversationalists."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Pot"]
+[node name="Hitbox" type="CollisionShape2D" parent="Other plants"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
-shape = SubResource( 4 )
+shape = SubResource( 2 )
-[node name="Sprite" type="Sprite" parent="Pot/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Other plants/Hitbox"]
-position = Vector2( -0.00619507, -0.0649719 )
+visible = false
-scale = Vector2( 0.155235, 0.155235 )
+position = Vector2( 0.449585, 0.542709 )
-texture = ExtResource( 3 )
+scale = Vector2( 0.201615, 0.377395 )
+texture = ExtResource( 1 )
-[node name="Door to living room" type="StaticBody2D" parent="."]
+[node name="Pot" type="StaticBody2D" parent="."]
-position = Vector2( 507.45, 233.4 )
+position = Vector2( 300.667, 452.587 )
 scale = Vector2( 0.829244, 0.829244 )
 input_pickable = true
-script = ExtResource( 6 )
+script = ExtResource( 2 )
 __meta__ = {
 "_edit_group_": true
 }
-interactable = true
+retrievable = true
-flavorText = "Clicked"
+flavorText = "A pant plot-- I mean... a plant pot."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Door to living room"]
+[node name="Hitbox" type="CollisionShape2D" parent="Pot"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
-shape = SubResource( 5 )
+shape = SubResource( 4 )
-[node name="Sprite" type="Sprite" parent="Door to living room/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Pot/Hitbox"]
-position = Vector2( 0.574005, 0.358818 )
+position = Vector2( -0.00619507, -0.0649719 )
-scale = Vector2( 0.343423, 0.403654 )
+scale = Vector2( 0.155235, 0.155235 )
-texture = SubResource( 6 )
+texture = ExtResource( 3 )
 [node name="Nana" type="StaticBody2D" parent="."]
-position = Vector2( 240.299, 200.173 )
+position = Vector2( 208.515, 529.666 )
 scale = Vector2( 0.829244, 0.829244 )
 input_pickable = true
 script = ExtResource( 2 )
@@ -170,12 +174,12 @@ __meta__ = {
 retrievable = true
 flavorText = "That's enough shenanigans from you for today."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Nana"]
+[node name="Hitbox" type="CollisionShape2D" parent="Nana"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 7 )
-[node name="Sprite" type="Sprite" parent="Nana/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Nana/Hitbox"]
 position = Vector2( -0.00619507, -0.0649719 )
 scale = Vector2( 0.155235, 0.155235 )
 texture = ExtResource( 4 )
--- a/Main rooms/Bathroom.tscn
+++ b/Main rooms/Bathroom.tscn
@@ -72,16 +72,16 @@ __meta__ = {
 interactable = true
 flavorText = "Fun to write on. I should wipe this down, though."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Mirror"]
+[node name="Hitbox" type="CollisionShape2D" parent="Mirror"]
 shape = SubResource( 1 )
-[node name="Sprite" type="Sprite" parent="Mirror/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Mirror/Hitbox"]
 visible = false
 position = Vector2( 1.57028, 0.94989 )
 scale = Vector2( 1.58, 1.405 )
 texture = ExtResource( 3 )
-[node name="Label" type="Label" parent="Mirror/CollisionShape2D"]
+[node name="Label" type="Label" parent="Mirror/Hitbox"]
 visible = false
 margin_left = 5.0
 margin_top = -5.0
@@ -103,15 +103,15 @@ __meta__ = {
 retrievable = true
 flavorText = "My lab notes! I wonder how it got there."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Lab Note - Bathroom"]
+[node name="Hitbox" type="CollisionShape2D" parent="Lab Note - Bathroom"]
 shape = SubResource( 2 )
-[node name="Sprite" type="Sprite" parent="Lab Note - Bathroom/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Lab Note - Bathroom/Hitbox"]
 position = Vector2( 0.996033, 0.311905 )
 scale = Vector2( 0.55, 0.56 )
 texture = ExtResource( 5 )
-[node name="Label" type="Label" parent="Lab Note - Bathroom/CollisionShape2D"]
+[node name="Label" type="Label" parent="Lab Note - Bathroom/Hitbox"]
 margin_left = -27.3409
 margin_top = -29.3945
 margin_right = 106.659
@@ -131,16 +131,16 @@ __meta__ = {
 interactable = true
 flavorText = "Toilet. A little clogged. No way am I sticking my hand in that."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Toilet"]
+[node name="Hitbox" type="CollisionShape2D" parent="Toilet"]
 shape = SubResource( 3 )
-[node name="Sprite" type="Sprite" parent="Toilet/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Toilet/Hitbox"]
 visible = false
 position = Vector2( 0.102173, -0.612312 )
 scale = Vector2( 0.9, 1.31 )
 texture = ExtResource( 3 )
-[node name="Label" type="Label" parent="Toilet/CollisionShape2D"]
+[node name="Label" type="Label" parent="Toilet/Hitbox"]
 visible = false
 margin_left = -26.1833
 margin_top = -55.8979
@@ -161,17 +161,17 @@ __meta__ = {
 interactable = true
 flavorText = "Sink. Stinky. Sinky. Do I have anything to clean this up with?"
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Sink"]
+[node name="Hitbox" type="CollisionShape2D" parent="Sink"]
 position = Vector2( -59.2163, 0 )
 shape = SubResource( 4 )
-[node name="Sprite" type="Sprite" parent="Sink/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Sink/Hitbox"]
 visible = false
 position = Vector2( 3.69189, -1.25027 )
 scale = Vector2( 1.37044, 0.93 )
 texture = ExtResource( 3 )
-[node name="Label" type="Label" parent="Sink/CollisionShape2D"]
+[node name="Label" type="Label" parent="Sink/Hitbox"]
 visible = false
 margin_left = -17.9594
 margin_top = -48.8978
@@ -192,11 +192,11 @@ __meta__ = {
 }
 interactable = true
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Door - to Bedroom"]
+[node name="Hitbox" type="CollisionShape2D" parent="Door - to Bedroom"]
 position = Vector2( 30, 65 )
 shape = SubResource( 5 )
-[node name="Sprite" type="Sprite" parent="Door - to Bedroom/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Door - to Bedroom/Hitbox"]
 visible = false
 texture = ExtResource( 3 )
@@ -210,15 +210,15 @@ __meta__ = {
 retrievable = true
 flavorText = "Smells like rubber."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Plunger"]
+[node name="Hitbox" type="CollisionShape2D" parent="Plunger"]
 shape = SubResource( 6 )
-[node name="Sprite" type="Sprite" parent="Plunger/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Plunger/Hitbox"]
 position = Vector2( -3.22388, 0.0310059 )
 scale = Vector2( 0.15, 0.15 )
 texture = ExtResource( 13 )
-[node name="Label" type="Label" parent="Plunger/CollisionShape2D"]
+[node name="Label" type="Label" parent="Plunger/Hitbox"]
 visible = false
 margin_left = -27.4899
 margin_top = -58.0
@@ -239,10 +239,10 @@ __meta__ = {
 interactable = true
 flavorText = "Bobby pins and puddles. What was I doing in here?"
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Mess on floor"]
+[node name="Hitbox" type="CollisionShape2D" parent="Mess on floor"]
 shape = SubResource( 7 )
-[node name="Sprite" type="Sprite" parent="Mess on floor/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Mess on floor/Hitbox"]
 position = Vector2( -1.45947, -0.173828 )
 scale = Vector2( 2.00236, 0.457652 )
 texture = ExtResource( 9 )
@@ -257,15 +257,15 @@ __meta__ = {
 retrievable = true
 flavorText = "Good for holding my hair up or picking into small spaces."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Bobby pins"]
+[node name="Hitbox" type="CollisionShape2D" parent="Bobby pins"]
 shape = SubResource( 8 )
-[node name="Sprite" type="Sprite" parent="Bobby pins/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Bobby pins/Hitbox"]
 position = Vector2( -0.336975, -1.2963 )
 scale = Vector2( 0.835, 0.525 )
 texture = ExtResource( 5 )
-[node name="Label" type="Label" parent="Bobby pins/CollisionShape2D"]
+[node name="Label" type="Label" parent="Bobby pins/Hitbox"]
 margin_left = -41.6223
 margin_top = -33.2978
 margin_right = 37.3777
@@ -283,11 +283,11 @@ __meta__ = {
 "_edit_group_": true
 }
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Trash can"]
+[node name="Hitbox" type="CollisionShape2D" parent="Trash can"]
 shape = SubResource( 9 )
 disabled = true
-[node name="Sprite" type="Sprite" parent="Trash can/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Trash can/Hitbox"]
 visible = false
 position = Vector2( -3.94922, -2.52094 )
 scale = Vector2( 0.395, 0.565 )
@@ -315,15 +315,15 @@ __meta__ = {
 retrievable = true
 flavorText = "Ew. I should bring this out."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Trash"]
+[node name="Hitbox" type="CollisionShape2D" parent="Trash"]
 shape = SubResource( 11 )
-[node name="Sprite" type="Sprite" parent="Trash/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Trash/Hitbox"]
 position = Vector2( -0.581909, 0.846497 )
 scale = Vector2( 0.1, 0.1 )
 texture = ExtResource( 14 )
-[node name="Label" type="Label" parent="Trash/CollisionShape2D"]
+[node name="Label" type="Label" parent="Trash/Hitbox"]
 visible = false
 margin_left = -21.3268
 margin_top = -30.3065
@@ -344,15 +344,15 @@ __meta__ = {
 retrievable = true
 flavorText = "Hydration."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Tabo"]
+[node name="Hitbox" type="CollisionShape2D" parent="Tabo"]
 shape = SubResource( 12 )
-[node name="Sprite" type="Sprite" parent="Tabo/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Tabo/Hitbox"]
 position = Vector2( -0.112305, 2.77536 )
 scale = Vector2( 0.405, 0.37 )
 texture = ExtResource( 5 )
-[node name="Label" type="Label" parent="Tabo/CollisionShape2D"]
+[node name="Label" type="Label" parent="Tabo/Hitbox"]
 margin_left = -18.8519
 margin_top = 17.1214
 margin_right = 17.1481

--- a/Main rooms/Hallway.tscn
+++ b/Main rooms/Hallway.tscn
@@ -54,12 +54,12 @@ __meta__ = {
 interactable = true
 flavorText = "Trash banishing room."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Trash chute"]
+[node name="Hitbox" type="CollisionShape2D" parent="Trash chute"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 1 )
-[node name="Sprite" type="Sprite" parent="Trash chute/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Trash chute/Hitbox"]
 visible = false
 position = Vector2( 0.366638, -0.589844 )
 scale = Vector2( 0.150154, 0.149327 )
@@ -76,12 +76,12 @@ __meta__ = {
 interactable = true
 flavorText = "What is Brodie doing in there?! That sound is really ticking me off... Should I go inside?"
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Door to neighbor"]
+[node name="Hitbox" type="CollisionShape2D" parent="Door to neighbor"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 2 )
-[node name="Sprite" type="Sprite" parent="Door to neighbor/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Door to neighbor/Hitbox"]
 visible = false
 position = Vector2( 0.306274, 0.187698 )
 scale = Vector2( 0.223723, 0.351001 )
@@ -98,12 +98,12 @@ __meta__ = {
 interactable = true
 flavorText = "Brodie: Just come in, the door's open!"
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Neighbor doorbell"]
+[node name="Hitbox" type="CollisionShape2D" parent="Neighbor doorbell"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 3 )
-[node name="Sprite" type="Sprite" parent="Neighbor doorbell/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Neighbor doorbell/Hitbox"]
 visible = false
 position = Vector2( -0.0625, -0.0545654 )
 scale = Vector2( 0.0340353, 0.0623893 )
@@ -120,12 +120,12 @@ __meta__ = {
 interactable = true
 flavorText = "Door to apartment. Home sweet home."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Door to Moxie"]
+[node name="Hitbox" type="CollisionShape2D" parent="Door to Moxie"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 5 )
-[node name="Sprite" type="Sprite" parent="Door to Moxie/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Door to Moxie/Hitbox"]
 visible = false
 position = Vector2( -0.0918274, 0.410065 )
 scale = Vector2( 0.228055, 0.347284 )

--- a/Main rooms/Kitchen.tscn
+++ b/Main rooms/Kitchen.tscn
@@ -54,17 +54,17 @@ __meta__ = {
 retrievable = true
 flavorText = "Heavy-duty, all-purpose cleaning tools. Now in pastel pink."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Cleaning mat"]
+[node name="Hitbox" type="CollisionShape2D" parent="Cleaning mat"]
 position = Vector2( -2.0191, -0.715637 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 1 )
-[node name="Sprite" type="Sprite" parent="Cleaning mat/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Cleaning mat/Hitbox"]
 position = Vector2( -0.158181, -0.0184715 )
 scale = Vector2( 0.101337, 0.101337 )
 texture = ExtResource( 2 )
-[node name="Label" type="Label" parent="Cleaning mat/CollisionShape2D"]
+[node name="Label" type="Label" parent="Cleaning mat/Hitbox"]
 margin_left = -6.78024
 margin_top = -8.72287
 margin_right = 64.2198
@@ -86,12 +86,12 @@ __meta__ = {
 }
 interactable = true
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Fridge"]
+[node name="Hitbox" type="CollisionShape2D" parent="Fridge"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 2 )
-[node name="Sprite" type="Sprite" parent="Fridge/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Fridge/Hitbox"]
 visible = false
 position = Vector2( -0.158181, -0.0184715 )
 scale = Vector2( 0.101337, 0.101337 )
@@ -108,12 +108,12 @@ __meta__ = {
 interactable = true
 flavorText = "This cabinet is horribly jammed. I'll have to deal with it eventually since Banana's food is in there but.. I'll do that later."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Cabinet"]
+[node name="Hitbox" type="CollisionShape2D" parent="Cabinet"]
 position = Vector2( 7.28166, -20.2055 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 4 )
-[node name="Sprite" type="Sprite" parent="Cabinet/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Cabinet/Hitbox"]
 visible = false
 position = Vector2( -0.158181, -0.0184715 )
 scale = Vector2( 0.101337, 0.101337 )
@@ -130,12 +130,12 @@ __meta__ = {
 }
 flavorText = "A sturdy stool."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Stool"]
+[node name="Hitbox" type="CollisionShape2D" parent="Stool"]
 position = Vector2( 1.25211, 0.295086 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 6 )
-[node name="Sprite" type="Sprite" parent="Stool/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Stool/Hitbox"]
 visible = false
 position = Vector2( -0.158181, -0.0184715 )
 scale = Vector2( 0.101337, 0.101337 )
@@ -160,12 +160,12 @@ __meta__ = {
 interactable = true
 flavorText = "Crunchy. But not as filling. And very hard to open."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Granola bar"]
+[node name="Hitbox" type="CollisionShape2D" parent="Granola bar"]
 position = Vector2( -0.433167, 2.2196 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 7 )
-[node name="Sprite" type="Sprite" parent="Granola bar/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Granola bar/Hitbox"]
 position = Vector2( 0.141357, -0.408264 )
 scale = Vector2( 0.0905492, 0.088454 )
 texture = SubResource( 8 )
--- a/Main rooms/Laundry area.tscn
+++ b/Main rooms/Laundry area.tscn
@@ -51,13 +51,13 @@ script = ExtResource( 4 )
 interactable = true
 flavorText = "I can't get in there. These bags are in the way..."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Laundry door"]
+[node name="Hitbox" type="CollisionShape2D" parent="Laundry door"]
 position = Vector2( 5.806, -53.2112 )
 scale = Vector2( 5, 5 )
 z_index = -1
 shape = SubResource( 1 )
-[node name="Sprite" type="Sprite" parent="Laundry door/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Laundry door/Hitbox"]
 visible = false
 position = Vector2( -0.186829, 0.46521 )
 scale = Vector2( 0.163649, 0.163649 )
@@ -87,12 +87,12 @@ __meta__ = {
 interactable = true
 flavorText = "Gotta put these away before they go bad or I trip on them. But legs... Too short... Can't reach pantry shelves... Why did I put them so high up anyway?"
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Groceries"]
+[node name="Hitbox" type="CollisionShape2D" parent="Groceries"]
 position = Vector2( 4.11099, 2.53656 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 3 )
-[node name="Sprite" type="Sprite" parent="Groceries/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Groceries/Hitbox"]
 position = Vector2( -0.186829, 0.46521 )
 scale = Vector2( 0.163649, 0.163649 )
 texture = SubResource( 4 )
@@ -120,12 +120,12 @@ __meta__ = {
 retrievable = true
 flavorText = "A sturdy stool."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Stool"]
+[node name="Hitbox" type="CollisionShape2D" parent="Stool"]
 position = Vector2( 1.25211, 0.295086 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 5 )
-[node name="Sprite" type="Sprite" parent="Stool/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Stool/Hitbox"]
 visible = false
 position = Vector2( -0.158181, -0.0184715 )
 scale = Vector2( 0.101337, 0.101337 )

--- a/Main rooms/Living room - Notepad.tscn
+++ b/Main rooms/Living room - Notepad.tscn
@@ -53,12 +53,12 @@ __meta__ = {
 interactable = true
 flavorText = "Click plant"
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Plant"]
+[node name="Hitbox" type="CollisionShape2D" parent="Plant"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 1 )
-[node name="Sprite" type="Sprite" parent="Plant/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Plant/Hitbox"]
 position = Vector2( -0.42981, 1.07585 )
 scale = Vector2( 0.201448, 0.330516 )
 texture = ExtResource( 7 )
@@ -74,12 +74,12 @@ __meta__ = {
 interactable = true
 flavorText = "Click pot"
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Pot"]
+[node name="Hitbox" type="CollisionShape2D" parent="Pot"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 2 )
-[node name="Sprite" type="Sprite" parent="Pot/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Pot/Hitbox"]
 position = Vector2( -0.42984, 0.692932 )
 scale = Vector2( 0.264918, 0.264918 )
 texture = ExtResource( 12 )
@@ -95,12 +95,12 @@ __meta__ = {
 interactable = true
 flavorText = "Click soil"
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Soil"]
+[node name="Hitbox" type="CollisionShape2D" parent="Soil"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 3 )
-[node name="Sprite" type="Sprite" parent="Soil/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Soil/Hitbox"]
 position = Vector2( -0.238403, 0.501556 )
 scale = Vector2( 0.186433, 0.186433 )
 texture = SubResource( 4 )
@@ -116,12 +116,12 @@ __meta__ = {
 interactable = true
 flavorText = "Click water"
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Water"]
+[node name="Hitbox" type="CollisionShape2D" parent="Water"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 5 )
-[node name="Sprite" type="Sprite" parent="Water/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Water/Hitbox"]
 position = Vector2( -0.238403, 0.501556 )
 scale = Vector2( 0.186433, 0.186433 )
 texture = ExtResource( 13 )
@@ -136,12 +136,12 @@ __meta__ = {
 }
 interactable = true
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Return"]
+[node name="Hitbox" type="CollisionShape2D" parent="Return"]
 position = Vector2( -2.89487, 2.65125 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 6 )
-[node name="Sprite" type="Sprite" parent="Return/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Return/Hitbox"]
 position = Vector2( -1.10974, 0.0285645 )
 scale = Vector2( 0.0338674, 0.0338674 )
 texture = SubResource( 7 )

--- a/Main rooms/Living room.tscn
+++ b/Main rooms/Living room.tscn
@@ -53,12 +53,12 @@ script = ExtResource( 8 )
 interactable = true
 flavorText = "BANANA?? How did you even get out there?"
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Balcony door"]
+[node name="Hitbox" type="CollisionShape2D" parent="Balcony door"]
 position = Vector2( 205.173, -242.232 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 1 )
-[node name="Sprite" type="Sprite" parent="Balcony door/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Balcony door/Hitbox"]
 visible = false
 position = Vector2( 0.574005, 0.358818 )
 scale = Vector2( 0.343423, 0.403654 )
@@ -74,12 +74,12 @@ __meta__ = {
 }
 interactable = true
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Front door"]
+[node name="Hitbox" type="CollisionShape2D" parent="Front door"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 2 )
-[node name="Sprite" type="Sprite" parent="Front door/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Front door/Hitbox"]
 visible = false
 position = Vector2( 0.143784, -0.788452 )
 scale = Vector2( 0.264548, 0.403654 )
@@ -96,12 +96,12 @@ __meta__ = {
 interactable = true
 flavorText = "Plants don't complain. So you gotta check on them every now and then. These are in terrible condition though, they're so dry!"
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Plants"]
+[node name="Hitbox" type="CollisionShape2D" parent="Plants"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 3 )
-[node name="Sprite" type="Sprite" parent="Plants/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Plants/Hitbox"]
 position = Vector2( -0.42981, 1.07585 )
 scale = Vector2( 0.201448, 0.330516 )
 texture = ExtResource( 4 )
@@ -117,12 +117,12 @@ __meta__ = {
 interactable = true
 flavorText = "Yoga always calms me down. But I can't do that now, I have things to do!"
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Yoga mat"]
+[node name="Hitbox" type="CollisionShape2D" parent="Yoga mat"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 4 )
-[node name="Sprite" type="Sprite" parent="Yoga mat/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Yoga mat/Hitbox"]
 position = Vector2( -0.142975, 0.215393 )
 scale = Vector2( 0.13548, 0.301834 )
 texture = ExtResource( 2 )
@@ -138,12 +138,12 @@ __meta__ = {
 retrievable = true
 flavorText = "My lab notes! I wonder how it got there."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Lab notes"]
+[node name="Hitbox" type="CollisionShape2D" parent="Lab notes"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 5 )
-[node name="Sprite" type="Sprite" parent="Lab notes/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Lab notes/Hitbox"]
 position = Vector2( -0.716614, 0.78894 )
 scale = Vector2( 0.13548, 0.13548 )
 texture = ExtResource( 6 )
--- a/Main rooms/Neighbor's balcony.tscn
+++ b/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 )
@@ -46,13 +47,12 @@ __meta__ = {
 interactable = true
 flavorText = "Don't worry Nana! Mommy's coming! Hmmm... There's gotta be a way to get there. Maybe all the heist movies I've seen will finally come in handy ha ha ha!"
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Other balcony"]
+[node name="Hitbox" type="CollisionShape2D" parent="Other balcony"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 1 )
-[node name="Sprite" type="Sprite" parent="Other balcony/CollisionShape2D"]
+[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 )
@@ -68,13 +68,12 @@ __meta__ = {
 interactable = true
 flavorText = "I can see Banana from here. So near yet so far."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Nana from afar"]
+[node name="Hitbox" type="CollisionShape2D" parent="Nana from afar"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 2 )
-[node name="Sprite" type="Sprite" parent="Nana from afar/CollisionShape2D"]
+[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 )
@@ -88,13 +87,12 @@ __meta__ = {
 }
 interactable = true
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Balcony to neighbor\'s room"]
+[node name="Hitbox" type="CollisionShape2D" parent="Balcony to neighbor\'s room"]
 position = Vector2( -0.433167, 2.2196 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 3 )
-[node name="Sprite" type="Sprite" parent="Balcony to neighbor\'s room/CollisionShape2D"]
+[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 )
--- a/Main rooms/Neighbor's room.tscn
+++ b/Main rooms/Neighbor's room.tscn
@@ -72,12 +72,12 @@ __meta__ = {
 interactable = true
 flavorText = "THE LADDER. THAT CREAKING LADDER AND ITS CREAKING SOUND. Time to kill it-- I mean get rid of it... But how?"
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Ladder"]
+[node name="Hitbox" type="CollisionShape2D" parent="Ladder"]
 position = Vector2( -0.433167, 2.2196 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 1 )
-[node name="Sprite" type="Sprite" parent="Ladder/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Ladder/Hitbox"]
 visible = false
 position = Vector2( 0.178131, 0.0814972 )
 scale = Vector2( 0.101337, 0.344337 )
@@ -92,12 +92,12 @@ __meta__ = {
 }
 interactable = true
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Neighbor to balcony"]
+[node name="Hitbox" type="CollisionShape2D" parent="Neighbor to balcony"]
 position = Vector2( -0.433167, 2.2196 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 2 )
-[node name="Sprite" type="Sprite" parent="Neighbor to balcony/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Neighbor to balcony/Hitbox"]
 visible = false
 position = Vector2( 0.304169, 0.207489 )
 scale = Vector2( 0.231109, 0.325438 )
@@ -111,12 +111,12 @@ __meta__ = {
 "_edit_group_": true
 }
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Reptile memorabilia"]
+[node name="Hitbox" type="CollisionShape2D" parent="Reptile memorabilia"]
 position = Vector2( -0.433167, 2.2196 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 3 )
-[node name="Sprite" type="Sprite" parent="Reptile memorabilia/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Reptile memorabilia/Hitbox"]
 position = Vector2( 0.430153, 0.459473 )
 scale = Vector2( 0.21221, 0.0860532 )
 texture = ExtResource( 8 )
@@ -131,12 +131,12 @@ __meta__ = {
 interactable = true
 flavorText = "Lotsa reptile stickers. Oh hey a screwdriver!"
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Toolbox"]
+[node name="Hitbox" type="CollisionShape2D" parent="Toolbox"]
 position = Vector2( -0.433167, 2.2196 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 4 )
-[node name="Sprite" type="Sprite" parent="Toolbox/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Toolbox/Hitbox"]
 visible = false
 position = Vector2( 0.304199, -0.170502 )
 scale = Vector2( 0.146617, 0.1 )
@@ -153,12 +153,12 @@ __meta__ = {
 retrievable = true
 flavorText = "Neighbor's screwdriver. Has a lil' gecko sticker on the handle."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Screwdriver"]
+[node name="Hitbox" type="CollisionShape2D" parent="Screwdriver"]
 position = Vector2( -0.433167, 2.2196 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 5 )
-[node name="Sprite" type="Sprite" parent="Screwdriver/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Screwdriver/Hitbox"]
 position = Vector2( -0.0038681, -0.21283 )
 scale = Vector2( 0.0526986, 0.1 )
 texture = ExtResource( 11 )
@@ -173,12 +173,12 @@ __meta__ = {
 }
 interactable = true
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Neighbor to hallway"]
+[node name="Hitbox" type="CollisionShape2D" parent="Neighbor to hallway"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 6 )
-[node name="Sprite" type="Sprite" parent="Neighbor to hallway/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Neighbor to hallway/Hitbox"]
 visible = false
 position = Vector2( -0.00814819, -0.484581 )
 scale = Vector2( 0.208332, 0.403654 )
@@ -238,12 +238,12 @@ __meta__ = {
 interactable = true
 flavorText = "Brodie: Um... What are you doing?"
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Neighbor"]
+[node name="Hitbox" type="CollisionShape2D" parent="Neighbor"]
 position = Vector2( -0.433167, 2.2196 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 8 )
-[node name="Sprite" type="Sprite" parent="Neighbor/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Neighbor/Hitbox"]
 position = Vector2( 0.178162, -0.570938 )
 scale = Vector2( 0.138713, 0.295602 )
 texture = ExtResource( 5 )
@@ -257,12 +257,12 @@ input_pickable = true
 script = ExtResource( 12 )
 interactable = true
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Dialogue arrow"]
+[node name="Hitbox" type="CollisionShape2D" parent="Dialogue arrow"]
 position = Vector2( -3.95886, 13.9804 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 9 )
-[node name="Sprite" type="Sprite" parent="Dialogue arrow/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Dialogue arrow/Hitbox"]
 position = Vector2( 1.38672, 0.106689 )
 scale = Vector2( 0.0193524, 0.0195471 )
 texture = ExtResource( 13 )
--- a/Main rooms/Test room 1.tscn
+++ b/Main rooms/Test room 1.tscn
@@ -37,7 +37,7 @@ extents = Vector2( 5.396, 2.21099 )
 [sub_resource type="RectangleShape2D" id=7]
 extents = Vector2( 16.729, 28.1565 )
-[sub_resource type="StreamTexture" id=15]
+[sub_resource type="StreamTexture" id=8]
 flags = 4
 load_path = "res://.import/trail 3.png-9960f4c5b964f5aca36ca6c97e309a5d.stex"
@@ -78,11 +78,11 @@ z_index = -1
 script = ExtResource( 3 )
 tracking = true
-[node name="CollisionShape2D" type="CollisionShape2D" parent="BG"]
+[node name="Hitbox" type="CollisionShape2D" parent="BG"]
 z_index = -1
 shape = SubResource( 1 )
-[node name="Sprite" type="Sprite" parent="BG/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="BG/Hitbox"]
 z_index = -1
 texture = ExtResource( 14 )
@@ -96,12 +96,12 @@ __meta__ = {
 }
 interactable = true
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Laundry basket"]
+[node name="Hitbox" type="CollisionShape2D" parent="Laundry basket"]
 position = Vector2( -0.433167, 2.2196 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 2 )
-[node name="Sprite" type="Sprite" parent="Laundry basket/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Laundry basket/Hitbox"]
 visible = false
 position = Vector2( -0.158181, -0.0184715 )
 scale = Vector2( 0.101337, 0.101337 )
@@ -118,12 +118,12 @@ __meta__ = {
 interactable = true
 flavorText = "Hello, my little yellow daughter."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Terrarium"]
+[node name="Hitbox" type="CollisionShape2D" parent="Terrarium"]
 position = Vector2( -0.433167, 2.2196 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 3 )
-[node name="Sprite" type="Sprite" parent="Terrarium/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Terrarium/Hitbox"]
 position = Vector2( -0.158142, -0.0184937 )
 scale = Vector2( 0.222636, 0.101337 )
 texture = SubResource( 4 )
@@ -138,12 +138,12 @@ __meta__ = {
 }
 interactable = true
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Laptop"]
+[node name="Hitbox" type="CollisionShape2D" parent="Laptop"]
 position = Vector2( -16.4264, -2.27527 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 5 )
-[node name="Sprite" type="Sprite" parent="Laptop/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Laptop/Hitbox"]
 position = Vector2( 0.1427, 0.282715 )
 scale = Vector2( 0.03, 0.03 )
 texture = ExtResource( 1 )
@@ -158,12 +158,12 @@ __meta__ = {
 retrievable = true
 flavorText = "I would've called it to find it but I always put it on silent. And I only have one phone. Oh hey, an upload notif from that yoga dude."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Cellphone"]
+[node name="Hitbox" type="CollisionShape2D" parent="Cellphone"]
 position = Vector2( 0.842377, -0.977234 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 6 )
-[node name="Sprite" type="Sprite" parent="Cellphone/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Cellphone/Hitbox"]
 position = Vector2( 0.165253, -0.365967 )
 scale = Vector2( 0.03, 0.03 )
 texture = ExtResource( 8 )
@@ -179,7 +179,7 @@ __meta__ = {
 }
 interactable = true
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Bathroom door"]
+[node name="Hitbox" type="CollisionShape2D" parent="Bathroom door"]
 position = Vector2( -16.4264, -2.27527 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 7 )
@@ -187,11 +187,11 @@ __meta__ = {
 "_edit_group_": true
 }
-[node name="Sprite" type="Sprite" parent="Bathroom door/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Bathroom door/Hitbox"]
 visible = false
 position = Vector2( -0.277301, -0.137165 )
 scale = Vector2( 0.0197574, 0.0197574 )
-texture = SubResource( 15 )
+texture = SubResource( 8 )
 [node name="Pants" type="StaticBody2D" parent="."]
 position = Vector2( 99.5713, 491.212 )
@@ -204,13 +204,13 @@ __meta__ = {
 retrievable = true
 flavorText = "A deconstructed pile of clothes."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Pants"]
+[node name="Hitbox" type="CollisionShape2D" parent="Pants"]
 position = Vector2( -2.31012, 0.749359 )
 rotation = 3.57443
 scale = Vector2( 5, 5 )
 shape = SubResource( 9 )
-[node name="Sprite" type="Sprite" parent="Pants/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Pants/Hitbox"]
 position = Vector2( 0.911179, -3.52747 )
 scale = Vector2( 0.0395079, 0.0395079 )
 texture = ExtResource( 6 )
@@ -225,12 +225,12 @@ __meta__ = {
 retrievable = true
 flavorText = "A deconstructed pile of clothes."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Shirt"]
+[node name="Hitbox" type="CollisionShape2D" parent="Shirt"]
 position = Vector2( -1.78223, 0.549072 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 10 )
-[node name="Sprite" type="Sprite" parent="Shirt/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Shirt/Hitbox"]
 position = Vector2( -0.277301, -0.137165 )
 scale = Vector2( 0.0197574, 0.0197574 )
 texture = ExtResource( 5 )
@@ -247,12 +247,12 @@ __meta__ = {
 retrievable = true
 flavorText = "A deconstructed pile of clothes."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Sando"]
+[node name="Hitbox" type="CollisionShape2D" parent="Sando"]
 position = Vector2( -3.5491, 1.06189 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 11 )
-[node name="Sprite" type="Sprite" parent="Sando/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Sando/Hitbox"]
 position = Vector2( -0.277301, -0.137165 )
 scale = Vector2( 0.0197574, 0.0197574 )
 texture = SubResource( 12 )
@@ -268,12 +268,12 @@ __meta__ = {
 retrievable = true
 flavorText = "A deconstructed pile of clothes."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Towel"]
+[node name="Hitbox" type="CollisionShape2D" parent="Towel"]
 position = Vector2( -3.5491, 1.06189 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 13 )
-[node name="Sprite" type="Sprite" parent="Towel/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Towel/Hitbox"]
 position = Vector2( -0.218535, -1.57275 )
 scale = Vector2( 0.03, 0.03 )
 texture = SubResource( 14 )
--- a/Multi.tscn
+++ b/Multi.tscn
@@ -70,9 +70,6 @@ bg_color = Color( 0.145098, 0.145098, 0.164706, 1 )
 script = ExtResource( 4 )
 items = [ NodePath("Pants"), NodePath("Shirt"), NodePath("Sando"), NodePath("Towel"), NodePath("Laundry basket"), NodePath("Laptop"), NodePath("Cellphone"), NodePath("Bathroom door"), NodePath("Terrarium") ]
-[node name="Sprite" parent="Bedroom/BG/CollisionShape2D" index="0"]
-position = Vector2( 1.934, -0.980774 )
 [node name="Desk" parent="." instance=ExtResource( 26 )]
 visible = false
 script = ExtResource( 4 )

--- a/Scripts/Dialogue control/Dialogue control - Laundry notepad.gd
+++ b/Scripts/Dialogue control/Dialogue control - Laundry notepad.gd
@@ -53,8 +53,8 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
 					#get_parent().get_node(clicked +"/CollisionShape2D/Sprite").visible = false
 					drawer = false
 					if soap:
-						get_parent().get_node("Soap/CollisionShape2D/Sprite2").visible = false
+						get_parent().get_node("Soap/Hitbox/Sprite2").visible = false
-						get_parent().get_node("Soap/CollisionShape2D/Sprite").visible = true
+						get_parent().get_node("Soap/Hitbox/Sprite").visible = true
 					return "Closed"
 				_:
 					return "That doesn't really make sense."
@@ -64,8 +64,8 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
 					return "Vanilla flavored detergent. I mean, scented."
 				"Put in":
 					if drawer:
-						get_parent().get_node(clicked +"/CollisionShape2D/Sprite").visible = false
+						get_parent().get_node(clicked +"/Hitbox/Sprite").visible = false
-						get_parent().get_node(clicked +"/CollisionShape2D/Sprite2").visible = true
+						get_parent().get_node(clicked +"/Hitbox/Sprite2").visible = true
 						soap = true
 						return "Soap loaded."
 					else:

--- a/Special views/Desk.tscn
+++ b/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( 40.1362, 40.1913 )
+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( 427.772, 284.535 )
+position = Vector2( 561.114, 281.36 )
-scale = Vector2( 0.829244, 0.829244 )
+scale = Vector2( 0.3, 0.3 )
 input_pickable = true
 script = ExtResource( 3 )
 __meta__ = {
@@ -40,12 +40,12 @@ __meta__ = {
 interactable = true
 flavorText = "I... don't get it... I probably should've studied first huh? Where are my notes?"
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Laptop"]
+[node name="Hitbox" type="CollisionShape2D" parent="Laptop"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 1 )
-[node name="Sprite" type="Sprite" parent="Laptop/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Laptop/Hitbox"]
 position = Vector2( -0.573227, 0.64563 )
 scale = Vector2( 0.403654, 0.403654 )
 texture = ExtResource( 2 )
@@ -60,12 +60,12 @@ __meta__ = {
 }
 interactable = true
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Return"]
+[node name="Hitbox" type="CollisionShape2D" parent="Return"]
 position = Vector2( -2.31012, 0.749359 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 2 )
-[node name="Sprite" type="Sprite" parent="Return/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Return/Hitbox"]
 position = Vector2( -0.670166, 0.427979 )
 scale = Vector2( 0.0395079, 0.0395079 )
 texture = SubResource( 3 )
--- a/Special views/Fridge.tscn
+++ b/Special views/Fridge.tscn
@@ -67,12 +67,12 @@ __meta__ = {
 interactable = true
 flavorText = "Goes with anything. Almost as good as rice."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Bread"]
+[node name="Hitbox" type="CollisionShape2D" parent="Bread"]
 position = Vector2( -0.433167, 2.2196 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 1 )
-[node name="Sprite" type="Sprite" parent="Bread/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Bread/Hitbox"]
 position = Vector2( 0.29126, 1.03033 )
 scale = Vector2( 0.0327145, 0.0327145 )
 texture = ExtResource( 1 )
@@ -87,12 +87,12 @@ __meta__ = {
 interactable = true
 flavorText = "Tastes egg-celent on its own or on a sandwich. Hehe."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Egg"]
+[node name="Hitbox" type="CollisionShape2D" parent="Egg"]
 position = Vector2( -0.433167, 2.2196 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 2 )
-[node name="Sprite" type="Sprite" parent="Egg/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Egg/Hitbox"]
 position = Vector2( 0.59082, -0.168335 )
 scale = Vector2( 0.0381084, 0.0381084 )
 texture = ExtResource( 2 )
@@ -108,12 +108,12 @@ __meta__ = {
 interactable = true
 flavorText = "Crunchy. But not as filling. And very hard to open."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Granola bar"]
+[node name="Hitbox" type="CollisionShape2D" parent="Granola bar"]
 position = Vector2( -0.433167, 2.2196 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 3 )
-[node name="Sprite" type="Sprite" parent="Granola bar/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Granola bar/Hitbox"]
 position = Vector2( 0.141357, -0.408264 )
 scale = Vector2( 0.0905492, 0.088454 )
 texture = ExtResource( 6 )
@@ -128,12 +128,12 @@ __meta__ = {
 interactable = true
 flavorText = "Ready-to-eat, but I prefer them fried."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Vienna sausage"]
+[node name="Hitbox" type="CollisionShape2D" parent="Vienna sausage"]
 position = Vector2( -0.433167, 2.2196 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 3 )
-[node name="Sprite" type="Sprite" parent="Vienna sausage/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Vienna sausage/Hitbox"]
 position = Vector2( -0.158325, 0.281189 )
 scale = Vector2( 0.129505, 0.126509 )
 texture = ExtResource( 5 )
@@ -148,12 +148,12 @@ __meta__ = {
 }
 interactable = true
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Return"]
+[node name="Hitbox" type="CollisionShape2D" parent="Return"]
 position = Vector2( -2.31012, 0.749359 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 4 )
-[node name="Sprite" type="Sprite" parent="Return/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Return/Hitbox"]
 position = Vector2( -0.670166, 0.427979 )
 scale = Vector2( 0.0395079, 0.0395079 )
 texture = SubResource( 5 )
@@ -169,12 +169,12 @@ __meta__ = {
 }
 interactable = true
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Cook"]
+[node name="Hitbox" type="CollisionShape2D" parent="Cook"]
 position = Vector2( -14.9377, -2.05679 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 6 )
-[node name="Sprite" type="Sprite" parent="Cook/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Cook/Hitbox"]
 position = Vector2( 0.732666, -0.413818 )
 scale = Vector2( 0.0395079, 0.0395079 )
 texture = ExtResource( 11 )
@@ -190,12 +190,12 @@ __meta__ = {
 }
 interactable = true
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Eat"]
+[node name="Hitbox" type="CollisionShape2D" parent="Eat"]
 position = Vector2( -14.9377, -2.05679 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 6 )
-[node name="Sprite" type="Sprite" parent="Eat/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Eat/Hitbox"]
 position = Vector2( 0.732666, -0.413818 )
 scale = Vector2( 0.0395079, 0.0395079 )
 texture = ExtResource( 10 )
--- a/Special views/Inside cabinet.tscn
+++ b/Special views/Inside cabinet.tscn
@@ -48,12 +48,12 @@ __meta__ = {
 retrievable = true
 flavorText = "My lab notes! I wonder how it got there."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Lab notes"]
+[node name="Hitbox" type="CollisionShape2D" parent="Lab notes"]
 position = Vector2( -0.433167, 2.2196 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 1 )
-[node name="Sprite" type="Sprite" parent="Lab notes/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Lab notes/Hitbox"]
 position = Vector2( 0.178162, -0.0184937 )
 scale = Vector2( 0.101337, 0.101337 )
 texture = ExtResource( 1 )
@@ -68,12 +68,12 @@ __meta__ = {
 retrievable = true
 flavorText = "A shovel!"
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Shovel"]
+[node name="Hitbox" type="CollisionShape2D" parent="Shovel"]
 position = Vector2( 51.2236, 2.2196 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 2 )
-[node name="Sprite" type="Sprite" parent="Shovel/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Shovel/Hitbox"]
 position = Vector2( -0.326172, -0.0183716 )
 scale = Vector2( 0.04, 0.04 )
 texture = ExtResource( 8 )
@@ -88,12 +88,12 @@ __meta__ = {
 retrievable = true
 flavorText = "Sharp."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Scissors"]
+[node name="Hitbox" type="CollisionShape2D" parent="Scissors"]
 position = Vector2( -0.433167, 2.2196 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 1 )
-[node name="Sprite" type="Sprite" parent="Scissors/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Scissors/Hitbox"]
 position = Vector2( 0.178162, -0.0184937 )
 scale = Vector2( 0.101337, 0.101337 )
 texture = ExtResource( 4 )
@@ -109,12 +109,12 @@ __meta__ = {
 retrievable = true
 flavorText = "Finally, some food for Banana."
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Nana\'s food"]
+[node name="Hitbox" type="CollisionShape2D" parent="Nana\'s food"]
 position = Vector2( -0.433167, 2.2196 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 3 )
-[node name="Sprite" type="Sprite" parent="Nana\'s food/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Nana\'s food/Hitbox"]
 position = Vector2( 0.178162, -0.0184937 )
 scale = Vector2( 0.156774, 0.156774 )
 texture = ExtResource( 3 )
@@ -129,12 +129,12 @@ __meta__ = {
 }
 interactable = true
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Return"]
+[node name="Hitbox" type="CollisionShape2D" parent="Return"]
 position = Vector2( -2.31012, 0.749359 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 4 )
-[node name="Sprite" type="Sprite" parent="Return/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Return/Hitbox"]
 position = Vector2( -0.670166, 0.427979 )
 scale = Vector2( 0.0395079, 0.0395079 )
 texture = SubResource( 5 )
--- a/Special views/Laundry basket.tscn
+++ b/Special views/Laundry basket.tscn
@@ -37,12 +37,12 @@ __meta__ = {
 }
 retrievable = true
-[node name="CollisionShape2D" type="CollisionShape2D" parent="To do list"]
+[node name="Hitbox" type="CollisionShape2D" parent="To do list"]
 position = Vector2( -2.31012, 0.749359 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 1 )
-[node name="Sprite" type="Sprite" parent="To do list/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="To do list/Hitbox"]
 position = Vector2( 0.219727, -1.64844 )
 scale = Vector2( 0.0395079, 0.0395079 )
 texture = SubResource( 2 )
@@ -57,12 +57,12 @@ __meta__ = {
 }
 interactable = true
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Return"]
+[node name="Hitbox" type="CollisionShape2D" parent="Return"]
 position = Vector2( -2.31012, 0.749359 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 3 )
-[node name="Sprite" type="Sprite" parent="Return/CollisionShape2D"]
+[node name="Sprite" type="Sprite" parent="Return/Hitbox"]
 position = Vector2( -0.670166, 0.427979 )
 scale = Vector2( 0.0395079, 0.0395079 )
 texture = SubResource( 4 )