Fixed bug that crashed game after doing yoga, also fixed bug where Return...

Fixed bug that crashed game after doing yoga, also fixed bug where Return buttons register items in inventory

.import/soap drawer closed.png-1097952895ea9e503201531ad4b7c894.md5

-source_md5="26d19b29c538dc5645ae370cf593b02a"
-dest_md5="9c4d40f6a7f21cbcacb6b244c953c92f"
+source_md5="f12d57b567d0ed8eabff4dc03ef4de99"
+dest_md5="083decc8759afff563e298a70a3c47c7"
 

.import/soap drawer open.png-2b0a5a5f2602eca491d1980ab6d47710.md5

-source_md5="b2060a704dbf0cc494ccda572bfa9a27"
-dest_md5="8f9ffbde11607574ffc49f49e76a836a"
+source_md5="8376987867d8d50df18dc10345b0545e"
+dest_md5="c0b070ba20c6f4fe1c90885e8927df35"
 

.import/soap.png-93c3e5ae993592d84ef303c214def992.md5

-source_md5="3128396862967a2f59f89ff673b48e42"
-dest_md5="05446937f9ba5b8a4dec06a51deb04a3"
+source_md5="c4c872c0b30747cc96f164268330244f"
+dest_md5="6d598f5d2b62eff24d91e5bf7addd501"
 

Event Handler.gd

@@ -443,6 +443,7 @@ func _return_fridge(): # returning from fridge view
 func _open_cabinet(): # looking inside kitchen cabinet
 	zoom_in()
 	inventoryUI.show()
+	deselect.show()
 	kitchen.hide()
 	insideCabinet.show()
 

Laundry - Notepad.tscn

@@ -187,7 +187,7 @@ __meta__ = {
 }
 
 [node name="Drawer" type="StaticBody2D" parent="."]
-position = Vector2( 465.504, 296.38 )
+position = Vector2( 475.004, 294.88 )
 scale = Vector2( 0.829244, 0.829244 )
 input_pickable = true
 script = ExtResource( 5 )
@@ -223,7 +223,7 @@ __meta__ = {
 }
 
 [node name="Soap" type="StaticBody2D" parent="."]
-position = Vector2( 405.991, 268.913 )
+position = Vector2( 405.594, 271.096 )
 scale = Vector2( 0.7, 0.7 )
 input_pickable = true
 script = ExtResource( 5 )
@@ -258,6 +258,7 @@ scale = Vector2( 0.106733, 0.106733 )
 polygon = PoolVector2Array( 278, -462.1, 362, -344.2, 362, -339, 370.1, 410, 359, 410, -268, 416, -268, 404, -270, -347, -264.4, -347, -189, -462.1, -189, -470, 278, -470 )
 
 [node name="Sprite" type="Sprite" parent="Soap/Hitbox"]
+position = Vector2( 13.2793, -63.74 )
 texture = ExtResource( 3 )
 
 [node name="Sprite2" type="Sprite" parent="Soap/Hitbox"]

Main rooms/Living room.tscn

@@ -217,6 +217,7 @@ polygon = PoolVector2Array( 215.815, 42.251, 178.165, 99.8634, 121.254, 119.48,
 position = Vector2( -9.64429, -3.69516 )
 scale = Vector2( -0.98, 0.965 )
 frames = SubResource( 6 )
+frame = 1
 speed_scale = 0.3
 playing = true
 

Multi.tscn

@@ -167,11 +167,17 @@ visible = false
 script = ExtResource( 4 )
 items = [ NodePath("Laundry door"), NodePath("Groceries"), NodePath("Stool"), NodePath("Noise") ]
 
+[node name="Sprite2" parent="Laundry area/Noise/Hitbox" index="0"]
+frame = 0
+
 [node name="Kitchen" parent="." instance=ExtResource( 8 )]
 visible = false
 script = ExtResource( 4 )
 items = [ NodePath("Fridge"), NodePath("Cabinet"), NodePath("Stool"), NodePath("Granola bar"), NodePath("Sink"), NodePath("Noise") ]
 
+[node name="Sprite2" parent="Kitchen/Noise/Hitbox" index="0"]
+frame = 0
+
 [node name="Fridge" parent="." instance=ExtResource( 17 )]
 visible = false
 script = ExtResource( 4 )
@@ -195,7 +201,7 @@ items = [ NodePath("Lab Note - Cabinet"), NodePath("Scissors"), NodePath("Nana\'
 [node name="Living room" parent="." instance=ExtResource( 27 )]
 visible = false
 script = ExtResource( 4 )
-items = [ NodePath("Balcony door"), NodePath("Plants"), NodePath("Lab notes"), NodePath("Yoga mat"), NodePath("Front door"), NodePath("Noise") ]
+items = [ NodePath("Balcony door"), NodePath("Plants"), NodePath("Lab notes"), NodePath("Yoga mat"), NodePath("Front door"), NodePath("Noise"), NodePath("Yoga mat2") ]
 
 [node name="Living room - Notepad" parent="." instance=ExtResource( 32 )]
 visible = false
@@ -207,6 +213,9 @@ visible = false
 script = ExtResource( 4 )
 items = [ NodePath("Door to neighbor"), NodePath("Door to Moxie"), NodePath("Trash chute"), NodePath("Neighbor doorbell"), NodePath("Noise") ]
 
+[node name="Sprite2" parent="Hallway/Noise/Hitbox" index="0"]
+frame = 0
+
 [node name="Balcony" parent="." instance=ExtResource( 24 )]
 visible = false
 script = ExtResource( 4 )
@@ -217,6 +226,9 @@ visible = false
 script = ExtResource( 4 )
 items = [ NodePath("Ladder"), NodePath("Neighbor to balcony"), NodePath("Neighbor"), NodePath("Reptile memorabilia"), NodePath("Toolbox"), NodePath("Screwdriver"), NodePath("Neighbor to hallway"), NodePath("Dialogue arrow"), NodePath("Noise") ]
 
+[node name="Sprite3" parent="Neighbor\'s room/Noise/Hitbox" index="0"]
+frame = 0
+
 [node name="Neighbor\'s balcony" parent="." instance=ExtResource( 23 )]
 visible = false
 script = ExtResource( 4 )

Scripts/Dialogue control/Dialogue Contro - Living room notepad.gd

@@ -163,6 +163,11 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
 									return "I need to clean the roots!"
 								else:
 									return "There's nothing in there! It still needs a nice bed to sit on."
+							"Water":
+								if soilIn and plantIn and soilCover:
+									return "I need to water the leaves, not the soil."
+								elif soilIn and plantIn and !soilCover:
+									return "Wait, the roots are still exposed!"	
 							_:
 								return "I don't think that's the place for that."
 				_:

Scripts/Dialogue control/Dialogue control - Laundry area.gd

@@ -13,7 +13,7 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
 					#emit_signal("notebook_laundry")
 					#return eventHandler._enter_notebook_laundry()
 				"Dirty clothes", "Laundry detergent":
-					return "I'm not sure how to start this. What did my therapist say again..?"
+					return "I'm not sure how to start this. What did my therapist say again..? Maybe if I wrote down the steps..."
 				"Cleaning materials":
 					return "I don't think this needs cleaning... There are way messier rooms. Trust me."
 				"Oil":

Scripts/Dialogue control/Dialogue control - Laundry notepad.gd

@@ -81,7 +81,7 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
 						soap = true
 						return "Soap loaded."
 					else:
-						return "I don't have anywhere to put it."
+						return "I don't have anywhere to put it. I should put it in its little compartment."
 				_:
 					return "That doesn't really make sense."
 		"Clothes":

Scripts/Movement scripts/Return_cabinet.gd

@@ -12,3 +12,5 @@ func passEvent(handler):
 func mouseInteraction():
 	emit_signal("returnCabinet")
 
+func objInteraction(selected):
+	mouseInteraction()

Scripts/Movement scripts/Return_laptop.gd

@@ -14,3 +14,5 @@ func passEvent(handler):
 	connect("laptop", handler,"_out_desk")
 	pass
 
+func objInteraction(selected):
+	mouseInteraction()

Scripts/Movement scripts/Return_laundry_notepad.gd

@@ -11,3 +11,5 @@ func passEvent(handler):
 func mouseInteraction():
 	emit_signal("returnLaundry")
 
+func objInteraction(selected):
+	mouseInteraction()

Scripts/Movement scripts/Return_plant_notepad.gd

@@ -11,3 +11,6 @@ func passEvent(handler):
 func mouseInteraction():
 	emit_signal("returnPlant")
 
+func objInteraction(selected):
+	mouseInteraction()
+

Scripts/Yoga mat.gd

@@ -2,6 +2,7 @@ extends "res://Item.gd"
 onready var yoga = false
 signal finished
 signal lab
+onready var doneYoga = false
 # Called when the node enters the scene tree for the first time.
 func _ready():
 	pass # Replace with function body.
@@ -19,6 +20,9 @@ func objInteraction(selected): # when an object is used on it
 			get_parent().get_node("Yoga mat2").visible = true
 			emit_signal("finished", "Do something relaxing")
 			emit_signal("lab")
+			doneYoga = true
+		elif doneYoga:
+			dialogueBox.text = flavorText
 		else:
 			dialogueBox.text = "Why is the Living Room so crowded? It's like a jungle in here! I can barely move..."
 	elif typeof(flavor) != 0: #checks if there's coded flavor text for this interaction

export_presets.cfg

@@ -7,7 +7,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter=""
-export_path="../Exports/To Do (Break Down).exe"
+export_path="../Exports/test copy.exe"
 script_export_mode=1
 script_encryption_key=""