Minor flavor text edits, made inventory icons a bit smaller

Event Handler.gd

@@ -85,9 +85,9 @@ func _start_lab(): # trying the lab the first time, adds the new quests
 	if !quests.hasQuest("Eat") and !quests.hasQuest("Do laundry"):
 		_start_cutscene_2b()
 		quests.add("Clean bathroom")
-		quests.add("Repot plants")
 		quests.add("Figure out what's making that noise & get rid of it")
 		quests.add("Feed Banana")
+		quests.add("Repot plants")
 		quests.add("Do Lab")
 		newQuests = true
 		movementHandle.finishTutorial()
@@ -291,6 +291,7 @@ func _living_to_hallway(): # moving from living room to hallway, if there's a re
 		livingRoom.hide()
 		hallway.show()
 		canFrontDoor = true
+		dialogue.text = "What is that noise? Sounds like my neighbor's trying to break down their walls."
 	else: 
 		dialogue.text = "You know, my philosophy has always been, 'If there's no reason to leave my apartment, why leave?'"
 	

Laundry - Notepad.tscn

@@ -19,16 +19,16 @@ load_path = "res://.import/laundry door open.png-4b5301b83ad58821eec5d9f14596c64
 [sub_resource type="RectangleShape2D" id=2]
 extents = Vector2( 18.1476, 15.0675 )
 
-[sub_resource type="RectangleShape2D" id=8]
+[sub_resource type="RectangleShape2D" id=3]
 extents = Vector2( 24.0534, 14.1028 )
 
-[sub_resource type="RectangleShape2D" id=3]
+[sub_resource type="RectangleShape2D" id=4]
 extents = Vector2( 18.1476, 4.25272 )
 
-[sub_resource type="RectangleShape2D" id=4]
+[sub_resource type="RectangleShape2D" id=5]
 extents = Vector2( 10.1799, 3.6851 )
 
-[sub_resource type="RectangleShape2D" id=5]
+[sub_resource type="RectangleShape2D" id=6]
 extents = Vector2( 6.41233, 8.96647 )
 
 [sub_resource type="RectangleShape2D" id=7]
@@ -118,7 +118,7 @@ interactable = true
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Clothes"]
 position = Vector2( 1.07745, 4.57318 )
 scale = Vector2( 5, 5 )
-shape = SubResource( 8 )
+shape = SubResource( 3 )
 
 [node name="Sprite" type="Sprite" parent="Clothes/CollisionShape2D"]
 position = Vector2( -0.830688, -5.5271 )
@@ -151,7 +151,7 @@ interactable = true
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Buttons"]
 position = Vector2( 1.07745, 0.955444 )
 scale = Vector2( 5, 5 )
-shape = SubResource( 3 )
+shape = SubResource( 4 )
 
 [node name="Sprite" type="Sprite" parent="Buttons/CollisionShape2D"]
 visible = false
@@ -185,7 +185,7 @@ interactable = true
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Drawer"]
 position = Vector2( -2.33716, 0.955444 )
 scale = Vector2( 5, 5 )
-shape = SubResource( 4 )
+shape = SubResource( 5 )
 
 [node name="Sprite" type="Sprite" parent="Drawer/CollisionShape2D"]
 visible = false
@@ -219,7 +219,7 @@ interactable = true
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Soap"]
 position = Vector2( 2.21564, -2.45926 )
 scale = Vector2( 5, 5 )
-shape = SubResource( 5 )
+shape = SubResource( 6 )
 
 [node name="Sprite" type="Sprite" parent="Soap/CollisionShape2D"]
 position = Vector2( -1.2373, 0.66748 )

Main rooms/Balcony.tscn

@@ -4,28 +4,61 @@
 [ext_resource path="res://Item.gd" type="Script" id=2]
 [ext_resource path="res://assets/Thesis Clickables/pot.png" type="Texture" id=3]
 [ext_resource path="res://assets/Thesis Clickables/nana.png" type="Texture" id=4]
-[ext_resource path="res://Scripts/Dialogue control/Dialogue Contro - Living room notepad.gd" type="Script" id=5]
 [ext_resource path="res://Scripts/Movement scripts/Door to living room.gd" type="Script" id=6]
 [ext_resource path="res://Scripts/Other plants.gd" type="Script" id=7]
 [ext_resource path="res://assets/Thesis Clickables/plants.png" type="Texture" id=8]
 
-[sub_resource type="RectangleShape2D" id=1]
+[sub_resource type="GDScript" id=1]
+script/source = "extends Control
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	pass # Replace with function body.
+
+func interaction(selected, clicked): #selected = item in inventory, clicked = item in environment 
+	match clicked:
+		\"Laundry basket\":
+			match selected:
+				\"Shirt\", \"Towel\", \"Pants\", \"Sando\":
+					return \"Into the basket you go.\"
+
+					
+		\"Placeholder 2\":
+			match selected:
+				\"Placeholder 1\":
+					return \"Using Placeholder 1 on 2\"
+				\"Placeholder 3\":
+					return \"Using Placeholder 3 on 2\"
+					
+		\"Placeholder 3\":
+			match selected:
+				\"Placeholder 1\":
+					return \"Using Placeholder 1 on 3\"
+				\"Placeholder 2\":
+					return \"Using Placeholder 1 on 3\"
+	
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+#func _process(delta):
+#	pass
+"
+
+[sub_resource type="RectangleShape2D" id=2]
 extents = Vector2( 19.9228, 36.7719 )
 
-[sub_resource type="RectangleShape2D" id=6]
+[sub_resource type="RectangleShape2D" id=3]
 extents = Vector2( 19.9228, 32.1977 )
 
-[sub_resource type="RectangleShape2D" id=2]
+[sub_resource type="RectangleShape2D" id=4]
 extents = Vector2( 15.6685, 16.4124 )
 
-[sub_resource type="RectangleShape2D" id=3]
+[sub_resource type="RectangleShape2D" id=5]
 extents = Vector2( 34.6417, 40.1913 )
 
-[sub_resource type="StreamTexture" id=4]
+[sub_resource type="StreamTexture" id=6]
 flags = 4
 load_path = "res://.import/Balcony door.png-b1c8d05a5eb532517313dc4785195288.stex"
 
-[sub_resource type="RectangleShape2D" id=5]
+[sub_resource type="RectangleShape2D" id=7]
 extents = Vector2( 15.6685, 16.4124 )
 
 [node name="Node2D" type="Node2D"]
@@ -35,7 +68,7 @@ extents = Vector2( 15.6685, 16.4124 )
 [node name="Dialogue control" type="Control" parent="."]
 margin_right = 40.0
 margin_bottom = 40.0
-script = ExtResource( 5 )
+script = SubResource( 1 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -54,7 +87,7 @@ flavorText = "Great listeners! Terrible conversationalists."
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Other plants"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
-shape = SubResource( 1 )
+shape = SubResource( 2 )
 
 [node name="Sprite" type="Sprite" parent="Other plants/CollisionShape2D"]
 position = Vector2( 0.449585, 0.542709 )
@@ -73,7 +106,7 @@ __meta__ = {
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Repotted plants"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
-shape = SubResource( 6 )
+shape = SubResource( 3 )
 
 [node name="Sprite" type="Sprite" parent="Repotted plants/CollisionShape2D"]
 position = Vector2( 0.127625, 0.542709 )
@@ -94,7 +127,7 @@ flavorText = "A pant plot-- I mean... a plant pot."
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Pot"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
-shape = SubResource( 2 )
+shape = SubResource( 4 )
 
 [node name="Sprite" type="Sprite" parent="Pot/CollisionShape2D"]
 position = Vector2( -0.00619507, -0.0649719 )
@@ -115,12 +148,12 @@ flavorText = "Clicked"
 [node name="CollisionShape2D" 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="Door to living room/CollisionShape2D"]
 position = Vector2( 0.574005, 0.358818 )
 scale = Vector2( 0.343423, 0.403654 )
-texture = SubResource( 4 )
+texture = SubResource( 6 )
 
 [node name="Nana" type="StaticBody2D" parent="."]
 position = Vector2( 240.299, 200.173 )
@@ -136,7 +169,7 @@ flavorText = "That's enough shenanigans from you for today."
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Nana"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
-shape = SubResource( 5 )
+shape = SubResource( 7 )
 
 [node name="Sprite" type="Sprite" parent="Nana/CollisionShape2D"]
 position = Vector2( -0.00619507, -0.0649719 )

Main rooms/Bathroom.tscn

@@ -303,7 +303,7 @@ __meta__ = {
 "_edit_group_": true
 }
 retrievable = true
-flavorText = "Ew."
+flavorText = "Ew. I should bring this out."
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Trash"]
 shape = SubResource( 11 )

Main rooms/Kitchen.tscn

@@ -106,7 +106,7 @@ __meta__ = {
 "_edit_group_": true
 }
 interactable = true
-flavorText = "Nana needs her food, but the cabinet is jammed! Why is everything in my house falling apart? I need some tools to get this cabinet open. Maybe I can go out and find some?"
+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"]
 position = Vector2( 7.28166, -20.2055 )

Main rooms/Living room - Notepad.tscn

@@ -7,26 +7,26 @@
 [ext_resource path="res://assets/Thesis Clickables/pot.png" type="Texture" id=12]
 [ext_resource path="res://assets/Thesis Clickables/placeholder.png" type="Texture" id=13]
 
-[sub_resource type="RectangleShape2D" id=3]
+[sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 20.5876, 32.5145 )
 
-[sub_resource type="RectangleShape2D" id=6]
+[sub_resource type="RectangleShape2D" id=2]
 extents = Vector2( 26.4732, 26.6968 )
 
-[sub_resource type="RectangleShape2D" id=8]
+[sub_resource type="RectangleShape2D" id=3]
 extents = Vector2( 19.9646, 20.1882 )
 
-[sub_resource type="StreamTexture" id=9]
+[sub_resource type="StreamTexture" id=4]
 flags = 4
 load_path = "res://.import/placeholder.png-8b1c9447dca72ebf4053074879f48883.stex"
 
-[sub_resource type="RectangleShape2D" id=7]
+[sub_resource type="RectangleShape2D" id=5]
 extents = Vector2( 19.9646, 20.1882 )
 
-[sub_resource type="RectangleShape2D" id=10]
+[sub_resource type="RectangleShape2D" id=6]
 extents = Vector2( 15.414, 13.6335 )
 
-[sub_resource type="StreamTexture" id=11]
+[sub_resource type="StreamTexture" id=7]
 flags = 4
 load_path = "res://.import/return arrow.png-ba7c2fea6c5a220a249845f29bbe9177.stex"
 
@@ -56,7 +56,7 @@ flavorText = "Click plant"
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Plant"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
-shape = SubResource( 3 )
+shape = SubResource( 1 )
 
 [node name="Sprite" type="Sprite" parent="Plant/CollisionShape2D"]
 position = Vector2( -0.42981, 1.07585 )
@@ -77,7 +77,7 @@ flavorText = "Click pot"
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Pot"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
-shape = SubResource( 6 )
+shape = SubResource( 2 )
 
 [node name="Sprite" type="Sprite" parent="Pot/CollisionShape2D"]
 position = Vector2( -0.42984, 0.692932 )
@@ -98,12 +98,12 @@ flavorText = "Click soil"
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Soil"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
-shape = SubResource( 8 )
+shape = SubResource( 3 )
 
 [node name="Sprite" type="Sprite" parent="Soil/CollisionShape2D"]
 position = Vector2( -0.238403, 0.501556 )
 scale = Vector2( 0.186433, 0.186433 )
-texture = SubResource( 9 )
+texture = SubResource( 4 )
 
 [node name="Water" type="StaticBody2D" parent="."]
 position = Vector2( 902.649, 207.978 )
@@ -119,7 +119,7 @@ flavorText = "Click water"
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Water"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
-shape = SubResource( 7 )
+shape = SubResource( 5 )
 
 [node name="Sprite" type="Sprite" parent="Water/CollisionShape2D"]
 position = Vector2( -0.238403, 0.501556 )
@@ -139,12 +139,12 @@ interactable = true
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Return"]
 position = Vector2( -2.89487, 2.65125 )
 scale = Vector2( 5, 5 )
-shape = SubResource( 10 )
+shape = SubResource( 6 )
 
 [node name="Sprite" type="Sprite" parent="Return/CollisionShape2D"]
 position = Vector2( -1.10974, 0.0285645 )
 scale = Vector2( 0.0338674, 0.0338674 )
-texture = SubResource( 11 )
+texture = SubResource( 7 )
 
 [node name="Label" type="Label" parent="Return"]
 visible = false

Main rooms/Living room.tscn

@@ -89,7 +89,7 @@ __meta__ = {
 "_edit_group_": true
 }
 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!"
+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"]
 position = Vector2( -16.8367, -2.11676 )

Multi.tscn

@@ -265,16 +265,16 @@ position = Vector2( 144.013, 197.335 )
 shape = SubResource( 4 )
 
 [node name="Inventory" type="ItemList" parent="UI"]
-margin_left = -201.361
-margin_top = 128.912
-margin_right = 394.639
-margin_bottom = 204.912
+margin_left = -201.0
+margin_top = 124.0
+margin_right = 395.0
+margin_bottom = 205.0
 rect_pivot_offset = Vector2( 5, 0 )
 custom_constants/hseparation = 10
 max_columns = 8
 same_column_width = true
 icon_mode = 0
-fixed_icon_size = Vector2( 60, 60 )
+fixed_icon_size = Vector2( 50, 50 )
 script = ExtResource( 3 )
 __meta__ = {
 "_edit_use_anchors_": false

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

@@ -6,6 +6,11 @@ onready var plantIn = false
 onready var cleanRoots = false
 onready var soilCover = false
 
+onready var plant = get_parent().get_node("Plant")
+onready var pot = get_parent().get_node("Pot")
+onready var soil = get_parent().get_node("Soil")
+onready var water = get_parent().get_node("Water")
+
 signal finished
 # Called when the node enters the scene tree for the first time.
 func _ready():
@@ -41,12 +46,17 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
 				"Pick up":
 					if holding == "":
 						holding = "Plant"
-						return "Hup."
+						plant.position.y -= 10
+						if cleanRoots:
+							return "Hup."
+						else:
+							return "Got it. Roots are still a little dirty."
 					else:
 						return "I'm already holding something."
 				"Put down":
 					if holding == clicked:
 						holding = ""
+						plant.position.y += 10
 						return "Put down."
 					else:
 						return "Wrong thing!"
@@ -56,9 +66,11 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
 					else:
 						if potClean and soilIn and cleanRoots and soilCover and holding == "Water":	
 							emit_signal("finished")
-							return "Hydration"
+							return "Hydration! Time to bring these outside for some sunlight."
 						elif holding == "Soil" and plantIn:
 							return "I need to put it in the pot, not on the leaves!"
+						elif holding == "Water" and !soilCover:
+							return "Wait, the roots are still exposed!"
 						else:
 							return "That doesn't really make any sense"
 				_:
@@ -80,6 +92,7 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
 				"Pick up":
 					if potClean and holding == "":
 						holding = "Pot"
+						pot.position.y -= 10
 						return "Hup"
 					elif !potClean:
 						return "I'm not touching that!"
@@ -88,6 +101,7 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
 				"Put down":
 					if holding == clicked:
 						holding = ""
+						pot.position.y += 10
 						return "Put down."
 					else:
 						return "Wrong thing!"
@@ -100,6 +114,7 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
 								if !soilIn and potClean:
 									holding = ""
 									soilIn = true
+									soil += 10
 									return "Soil in pot, just need to cover it up now"
 								elif !potClean: # trying to put soil in dirty pot
 									return "I don't know what's in there"
@@ -107,13 +122,14 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
 									soilCover = true
 									plantIn = true
 									holding = ""
+									soil += 10
 									return "Now that's nice and covered"
 								else: # putting soil in already-filled pot
 									return "That's enough soil"
 							"Plant":
 								if soilIn and cleanRoots: # putting plant in the new pot
 									holding = ""
-									get_parent().get_node("Plant").position = Vector2(547.85,149.965)
+									get_parent().get_node("Plant").position = Vector2(547.85,144.965)
 									get_parent().get_node("Plant").scale = Vector2(1.3, 0.9)
 									#original: (276.321, 282.901)
 									#new: (547.85,149.965)
@@ -121,7 +137,7 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
 								elif !cleanRoots:
 									return "I need to clean the roots!"
 								else:
-									return "There's nothing in there!"
+									return "There's nothing in there! It still needs a nice bed to sit on."
 							_:
 								return "I don't think that's the place for that."
 				_:
@@ -135,12 +151,14 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
 				"Pick up":
 					if holding == "":
 						holding = "Soil"
+						soil.position.y -= 10
 						return "Hup."
 					else:
 						return "I'm already holding something."
 				"Put down":
 					if holding == clicked:
 						holding = ""
+						soil.position.y += 10
 						return "Put down."
 					else:
 						return "Wrong thing!"
@@ -160,12 +178,14 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
 				"Pick up":
 					if holding == "":
 						holding = "Water"
+						water.position.y -= 10
 						return "Hup."
 					else:
 						return "I'm already holding something."
 				"Put down":
 					if holding == clicked:
 						holding = ""
+						water.position.y += 10
 						return "Put down."
 					else:
 						return "Wrong thing!"

Scripts/Dialogue control/Dialogue control - Kitchen.gd

@@ -6,10 +6,10 @@ func _ready():
 
 func interaction(selected, clicked): #selected = item in inventory, clicked = item in environment 
 	match clicked:
-		"Placeholder A":
+		"Cabinet":
 			match selected:
-				"Placeholder 1":
-					return "Using Placeholder 1 on A"
+				"Oil":
+					return "It's not really rusty, I think the whole hinge is broken. I'll need to unscrew the whole thing to get the door off!"
 				"Placeholder 2":
 					return "Using Placeholder 2 on A"
 				"Placeholder 3":

Scripts/Movement scripts/Front door.gd

@@ -15,7 +15,7 @@ func passEvent(handler):
 func mouseInteraction():
 	emit_signal("enter")
 	if first: # generates this dialogue when the player goes to the hallway for the first time
-		dialogueBox.text = "What is that noise? Sounds like my neighbor's trying to break down their walls."
+
 		first = false
 		#maybe have it repeat until they remove the noise? or would that be repetitive
 	pass

Scripts/Plants.gd

@@ -12,7 +12,7 @@ func passEvent(handler):
 func mouseInteraction():
 	.mouseInteraction()
 	if !quests.hasQuest("Feed Banana"):
-		flavorText = "I need to take care of these plants, but I don't know where to start.."
+		flavorText = "I need to water and repot these plants, but I don't know where to start.."
 	else:
 		flavorText = "Plants later. Banana first. I don't even wanna know how long she's been trapped out here, poor thing..."
 		

export_presets.cfg

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