Lab notes now stack, putting away groceries inserts Oil, Cleaning Materials,...

Lab notes now stack, putting away groceries inserts Oil, Cleaning Materials, and Laundry Detergent into inventory, and screwdriver now uses the correct texture.

.import/Oil.png-29f84e969418d0f4084115c5ce859866.md5

+source_md5="674765d17c76a8e0c4e41f21edfe5246"
+dest_md5="c4cb01fdf23e41626a85261143845eff"
+

.import/cleaning materials.png-9e1abb8a1d84afe3085c773f150c7347.md5

+source_md5="ed16e2008db951059f9f343a0debfb5b"
+dest_md5="6ab79a5e78f986cd86da323cca4263b0"
+

.import/laundry detergent.png-79948b488e3c228ce282a9186c4bcf0c.md5

+source_md5="bbf67bf0549f9ece1a3811b673663761"
+dest_md5="1e509b169d687c764496453b8657b5e0"
+

.import/mess on floor.png-a8c2b13159eb5cc9635fdb3046d82b86.md5

+source_md5="aaae12154ac6f061054109c92624e985"
+dest_md5="a0b16e37d0e9b1572820f50904395053"
+

.import/placeholder.png-8b1c9447dca72ebf4053074879f48883.md5

+source_md5="9a2d061fa21d126141dc27daaf662b9d"
+dest_md5="8214e4eb5b17230a94bb48c9e3a90f62"
+

Event Handler.gd

@@ -60,6 +60,23 @@ func _groceries_put_away(): # when the groceries are put away
 	fridge.get_node("Granola bar").show()
 	groceries = true
 	laundryArea.get_node("Laundry door").flavorText = "I think I'm still missing something..."
+	var oilImage = Image.new()
+	var oilTexture = ImageTexture.new()
+	oilImage.load("res://assets/Thesis Clickables/Oil.png")
+	oilTexture.create_from_image(oilImage)
+	inventory.add_item("Oil", oilTexture)
+
+	var cleanImage = Image.new()
+	var cleanTexture = ImageTexture.new()
+	cleanImage.load("res://assets/Thesis Clickables/cleaning materials.png")
+	cleanTexture.create_from_image(cleanImage)
+	inventory.add_item("Cleaning mat",cleanTexture)
+
+	var detergentImage = Image.new()
+	var detergentTexture = ImageTexture.new()
+	detergentImage.load("res://assets/Thesis Clickables/laundry detergent.png")
+	detergentTexture.create_from_image(detergentImage)
+	inventory.add_item("Laundry detergent",detergentTexture)
 
 func _eaten(): # completing first "Eat" quest
 	quests.finishQuest("Eat")
@@ -82,6 +99,7 @@ func _remove_quest(questName):
 	
 func _add_lab_note(): # when a new lab note is retrieved
 	labNotes = labNotes + 1
+	print("Lab notes: " + str(labNotes))
 
 func get_lab_notes(): # returns how many lab notes the player has found
 	return labNotes

Lab Note.gd

 extends "res://Item.gd"
 signal retrieved
+onready var eventHandler
 
 # Called when the node enters the scene tree for the first time.
 func _ready():
 	pass # Replace with function body.
 	
 func passEvent(handler):
+	eventHandler = handler
 	connect("retrieved", handler,"_add_lab_note")
 
 func pickup():
-	.pickup()
+	if (eventHandler.get_lab_notes() == 0):
+		dialogueBox.text = flavorText
+		inventory.add_item("Lab Notes", texture)
 	if get_name() == "Lab Note - Bathroom":
 		get_parent().get_node("Mirror").gotNote()
+	queue_free()
+	inventory.unselect_all()
 	emit_signal("retrieved")

Main rooms/Bathroom.tscn

-[gd_scene load_steps=18 format=2]
+[gd_scene load_steps=20 format=2]
 
 [ext_resource path="res://Scripts/Dialogue control/Dialogue Control - Bathroom.gd" type="Script" id=1]
 [ext_resource path="res://assets/room zoom out.png" type="Texture" id=2]
@@ -8,6 +8,7 @@
 [ext_resource path="res://Scripts/Movement scripts/Door - to Bedroom.gd" type="Script" id=6]
 [ext_resource path="res://Scripts/Mirror.gd" type="Script" id=7]
 [ext_resource path="res://Lab Note.gd" type="Script" id=8]
+[ext_resource path="res://assets/Thesis Clickables/mess on floor.png" type="Texture" id=9]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 156.074, 141.192 )
@@ -31,9 +32,12 @@ extents = Vector2( 38.6637, 100.122 )
 extents = Vector2( 82.0634, 51.3664 )
 
 [sub_resource type="RectangleShape2D" id=8]
-extents = Vector2( 35.5088, 57.7678 )
+extents = Vector2( 205.176, 46.6856 )
 
 [sub_resource type="RectangleShape2D" id=9]
+extents = Vector2( 35.5088, 57.7678 )
+
+[sub_resource type="RectangleShape2D" id=10]
 extents = Vector2( 39.2613, 32.3414 )
 
 [node name="Bathroom" type="Node2D"]
@@ -232,6 +236,24 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
+[node name="Mess on floor" type="StaticBody2D" parent="."]
+position = Vector2( 260.239, 535.191 )
+input_pickable = true
+script = ExtResource( 4 )
+__meta__ = {
+"_edit_group_": true
+}
+interactable = true
+flavorText = "Bobby pins and puddles. What was I doing in here?"
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Mess on floor"]
+shape = SubResource( 8 )
+
+[node name="Sprite" type="Sprite" parent="Mess on floor/CollisionShape2D"]
+position = Vector2( -1.45947, -0.173828 )
+scale = Vector2( 2.00236, 0.457652 )
+texture = ExtResource( 9 )
+
 [node name="Trash" type="StaticBody2D" parent="."]
 position = Vector2( 926.026, 491.279 )
 input_pickable = true
@@ -243,7 +265,7 @@ retrievable = true
 flavorText = "Ew."
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Trash"]
-shape = SubResource( 8 )
+shape = SubResource( 9 )
 
 [node name="Sprite" type="Sprite" parent="Trash/CollisionShape2D"]
 position = Vector2( -3.94922, -2.52094 )
@@ -271,7 +293,7 @@ retrievable = true
 flavorText = "Hydration."
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Tabo"]
-shape = SubResource( 9 )
+shape = SubResource( 10 )
 
 [node name="Sprite" type="Sprite" parent="Tabo/CollisionShape2D"]
 position = Vector2( -0.112305, 2.77536 )

Main rooms/Kitchen.tscn

@@ -36,6 +36,7 @@ scale = Vector2( 1.00091, 1.00091 )
 texture = ExtResource( 1 )
 
 [node name="Cleaning mat" type="StaticBody2D" parent="."]
+visible = false
 position = Vector2( 399.11, 292.916 )
 scale = Vector2( 0.829244, 0.829244 )
 input_pickable = true

Main rooms/Living room.tscn

-[gd_scene load_steps=15 format=2]
+[gd_scene load_steps=16 format=2]
 
 [ext_resource path="res://Scripts/Dialogue control/Dialogue Contro - Living room.gd" type="Script" id=1]
 [ext_resource path="res://assets/Thesis Clickables/yoga mat.png" type="Texture" id=2]
@@ -9,6 +9,7 @@
 [ext_resource path="res://assets/Thesis Clickables/front door.png" type="Texture" id=7]
 [ext_resource path="res://Scripts/Movement scripts/Balcony door.gd" type="Script" id=8]
 [ext_resource path="res://Scripts/Movement scripts/Front door.gd" type="Script" id=9]
+[ext_resource path="res://Lab note.gd" type="Script" id=10]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 34.6417, 40.1913 )
@@ -124,7 +125,7 @@ texture = ExtResource( 2 )
 position = Vector2( 953.401, 448.646 )
 scale = Vector2( 0.829244, 0.829244 )
 input_pickable = true
-script = ExtResource( 5 )
+script = ExtResource( 10 )
 __meta__ = {
 "_edit_group_": true
 }

Main rooms/Neighbor's room.tscn

@@ -10,6 +10,7 @@
 [ext_resource path="res://assets/Thesis Clickables/Reptile memorabilia.png" type="Texture" id=8]
 [ext_resource path="res://Scripts/Movement scripts/Neighbor to hallway.gd" type="Script" id=9]
 [ext_resource path="res://Scripts/Movement scripts/Neighbor to balcony.gd" type="Script" id=10]
+[ext_resource path="res://assets/Thesis Clickables/Screwdriver.png" type="Texture" id=11]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 10.2686, 34.6917 )
@@ -29,14 +30,10 @@ extents = Vector2( 15.1935, 10.447 )
 [sub_resource type="RectangleShape2D" id=6]
 extents = Vector2( 5.55923, 10.447 )
 
-[sub_resource type="StreamTexture" id=7]
-flags = 4
-load_path = "res://.import/Toolbox.png-aad5074879e9968712ed99f01d072f37.stex"
-
-[sub_resource type="RectangleShape2D" id=8]
+[sub_resource type="RectangleShape2D" id=7]
 extents = Vector2( 21.6967, 40.5453 )
 
-[sub_resource type="StreamTexture" id=9]
+[sub_resource type="StreamTexture" id=8]
 flags = 4
 load_path = "res://.import/front door.png-58881902b918df4a261fe60f02da2bc4.stex"
 
@@ -169,7 +166,7 @@ shape = SubResource( 6 )
 [node name="Sprite" type="Sprite" parent="Screwdriver/CollisionShape2D"]
 position = Vector2( -0.0038681, -0.21283 )
 scale = Vector2( 0.0526986, 0.1 )
-texture = SubResource( 7 )
+texture = ExtResource( 11 )
 
 [node name="Neighbor to hallway" type="StaticBody2D" parent="."]
 position = Vector2( -517.179, -42.3673 )
@@ -184,9 +181,9 @@ interactable = true
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Neighbor to hallway"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
-shape = SubResource( 8 )
+shape = SubResource( 7 )
 
 [node name="Sprite" type="Sprite" parent="Neighbor to hallway/CollisionShape2D"]
 position = Vector2( -0.00814819, -0.484581 )
 scale = Vector2( 0.208332, 0.403654 )
-texture = SubResource( 9 )
+texture = SubResource( 8 )

Multi.tscn

@@ -97,7 +97,7 @@ items = [ NodePath("Washing machine door"), NodePath("Drawer"), NodePath("Soap")
 [node name="Bathroom" parent="." instance=ExtResource( 20 )]
 visible = false
 script = ExtResource( 4 )
-items = [ NodePath("Mirror"), NodePath("Lab Note - Bathroom"), NodePath("Toilet"), NodePath("Sink"), NodePath("Door - to Bedroom"), NodePath("Plunger"), NodePath("Bobby Pins"), NodePath("Trash"), NodePath("Tabo") ]
+items = [ NodePath("Mirror"), NodePath("Lab Note - Bathroom"), NodePath("Toilet"), NodePath("Sink"), NodePath("Door - to Bedroom"), NodePath("Plunger"), NodePath("Bobby Pins"), NodePath("Trash"), NodePath("Tabo"), NodePath("Mess on floor") ]
 
 [node name="Inside cabinet" parent="." instance=ExtResource( 21 )]
 visible = false
@@ -132,7 +132,7 @@ items = [ NodePath("Nana from afar"), NodePath("Other balcony"), NodePath("Balco
 [node name="Event Handler" type="Node2D" parent="."]
 position = Vector2( 460.602, 18.6417 )
 script = ExtResource( 12 )
-eventItems = [ NodePath("../Laundry basket/To do list"), NodePath("../Bedroom/Laundry basket"), NodePath("../Laundry basket/Return"), NodePath("../Fridge/Return"), NodePath("../Kitchen/Fridge"), NodePath("../Laundry area/Groceries"), NodePath("../Fridge/Energy handler"), NodePath("../Laundry area/Dialogue control"), NodePath("../Laundry - Notepad/Return"), NodePath("../Laundry - Notepad/Dialogue control"), NodePath("../Bedroom/Bathroom door"), NodePath("../Bathroom/Door - to Bedroom"), NodePath("../Living room/Balcony door"), NodePath("../Balcony/Door to living room"), NodePath("../Living room/Front door"), NodePath("../Hallway/Door to Moxie"), NodePath("../Hallway/Door to neighbor"), NodePath("../Neighbor\'s room/Neighbor to hallway"), NodePath("../Neighbor\'s balcony/Balcony to neighbor\'s room"), NodePath("../Neighbor\'s room/Neighbor to balcony"), NodePath("../Bedroom/Laptop"), NodePath("../Desk/Return"), NodePath("../Inside cabinet/Return"), NodePath("../Kitchen/Cabinet"), NodePath("../Desk/Laptop"), NodePath("../Bedroom/Terrarium") ]
+eventItems = [ NodePath("../Laundry basket/To do list"), NodePath("../Bedroom/Laundry basket"), NodePath("../Laundry basket/Return"), NodePath("../Fridge/Return"), NodePath("../Kitchen/Fridge"), NodePath("../Laundry area/Groceries"), NodePath("../Fridge/Energy handler"), NodePath("../Laundry area/Dialogue control"), NodePath("../Laundry - Notepad/Return"), NodePath("../Laundry - Notepad/Dialogue control"), NodePath("../Bedroom/Bathroom door"), NodePath("../Bathroom/Door - to Bedroom"), NodePath("../Living room/Balcony door"), NodePath("../Balcony/Door to living room"), NodePath("../Living room/Front door"), NodePath("../Hallway/Door to Moxie"), NodePath("../Hallway/Door to neighbor"), NodePath("../Neighbor\'s room/Neighbor to hallway"), NodePath("../Neighbor\'s balcony/Balcony to neighbor\'s room"), NodePath("../Neighbor\'s room/Neighbor to balcony"), NodePath("../Bedroom/Laptop"), NodePath("../Desk/Return"), NodePath("../Inside cabinet/Return"), NodePath("../Kitchen/Cabinet"), NodePath("../Desk/Laptop"), NodePath("../Bedroom/Terrarium"), NodePath("../Bathroom/Lab Note - Bathroom"), NodePath("../Inside cabinet/Lab notes"), NodePath("../Living room/Lab notes") ]
 
 [node name="Moxie" type="Sprite" parent="."]
 position = Vector2( 214.135, 386.725 )

Special views/Inside cabinet.tscn

-[gd_scene load_steps=11 format=2]
+[gd_scene load_steps=12 format=2]
 
 [ext_resource path="res://assets/Thesis Clickables/Lab Notes.png" type="Texture" id=1]
 [ext_resource path="res://Item.gd" type="Script" id=2]
@@ -6,6 +6,7 @@
 [ext_resource path="res://assets/Thesis Clickables/scissors.png" type="Texture" id=4]
 [ext_resource path="res://Scripts/Dialogue control/Dialogue Control - Inside cabinet.gd" type="Script" id=5]
 [ext_resource path="res://Scripts/Movement scripts/Return_cabinet.gd" type="Script" id=6]
+[ext_resource path="res://Lab note.gd" type="Script" id=7]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 10.2686, 10.4499 )
@@ -36,7 +37,7 @@ __meta__ = {
 [node name="Lab notes" type="StaticBody2D" parent="."]
 position = Vector2( -312.57, -93.3011 )
 input_pickable = true
-script = ExtResource( 2 )
+script = ExtResource( 7 )
 __meta__ = {
 "_edit_group_": true
 }

assets/Thesis Clickables/Oil.png.import

+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Oil.png-29f84e969418d0f4084115c5ce859866.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/Thesis Clickables/Oil.png"
+dest_files=[ "res://.import/Oil.png-29f84e969418d0f4084115c5ce859866.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

assets/Thesis Clickables/cleaning materials.png.import

+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/cleaning materials.png-9e1abb8a1d84afe3085c773f150c7347.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/Thesis Clickables/cleaning materials.png"
+dest_files=[ "res://.import/cleaning materials.png-9e1abb8a1d84afe3085c773f150c7347.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

assets/Thesis Clickables/laundry detergent.png.import

+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/laundry detergent.png-79948b488e3c228ce282a9186c4bcf0c.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/Thesis Clickables/laundry detergent.png"
+dest_files=[ "res://.import/laundry detergent.png-79948b488e3c228ce282a9186c4bcf0c.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

assets/Thesis Clickables/mess on floor.png.import

+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/mess on floor.png-a8c2b13159eb5cc9635fdb3046d82b86.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/Thesis Clickables/mess on floor.png"
+dest_files=[ "res://.import/mess on floor.png-a8c2b13159eb5cc9635fdb3046d82b86.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

assets/Thesis Clickables/placeholder.png.import

+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/placeholder.png-8b1c9447dca72ebf4053074879f48883.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/Thesis Clickables/placeholder.png"
+dest_files=[ "res://.import/placeholder.png-8b1c9447dca72ebf4053074879f48883.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0