Fixed last custcene and made Nana disappear from the terrarium and balcony as needed

.import/0.png-24492bc91bf42242b8d007dd8c632a29.md5

+source_md5="6f3d5bc83f677d4009c6da903cef6c50"
+dest_md5="8c9c4123d6ee4bf4e409f54d3e92274d"
+

.import/5.png-e30c776cb2b5b08cbfeb2c072d4c9393.md5

+source_md5="25ea2d877aa25a58c45cc16ed101c4b7"
+dest_md5="988644182b402a58e129cbe9fe9abf6a"
+

.import/6.png-c9b83e1ec874460e04c4f21ef7dacb3e.md5

+source_md5="3b0ecf4a2964965c6d5e6fa284569ce3"
+dest_md5="1a22f3ae7f3ba67df2629c945a946940"
+

Cutscenes/Cutscene 1.gd

@@ -5,7 +5,7 @@ export(bool) var tracking = false
 
 # Called when the node enters the scene tree for the first time.
 func _ready():
-	pass # Replace with function body.
+	tracking = false
 
 func _input(event): # executes when clicked on
 	if event is InputEventMouseButton:
@@ -31,11 +31,16 @@ func getShot():
 			anim.play("Shot 4")
 			sceneProgress += 1
 		5:
+			anim.play("Shot 5")
+			sceneProgress += 1
+		6:
+			anim.play("Shot 6")
+			sceneProgress += 1
+		7:
 			sceneProgress = 0
 			get_parent().queue_free() # dont need that scene anymore
 			tracking = false
 			print("Deleting scene 1")
-			
 
 func start():
 	tracking = true

Cutscenes/Cutscene 2.gd

@@ -7,7 +7,7 @@ onready var sceneDecimal = 0
 
 # Called when the node enters the scene tree for the first time.
 func _ready():
-	pass # Replace with function body.
+	tracking = false
 
 func _input(event): # executes when clicked on
 	if event is InputEventMouseButton:
@@ -21,14 +21,12 @@ func getShot():
 		shotName = "Shot " + str(sceneProgress + 1) + "." + str(sceneDecimal)
 	else:
 		shotName = "Shot " + str(sceneProgress + 1)
-	print(shotName)
 	if (sceneProgress+1) != 18:
 		anim.play(shotName)
 	match (sceneProgress + 1):
 		7, 8, 9, 10, 12:
 			if sceneDecimal == 0:
 				sceneDecimal += 1
-				print("Adding decimal for 6, 7, etc")
 			else:
 				sceneDecimal = 0
 				sceneProgress += 1

Cutscenes/Cutscene 3.gd

@@ -6,7 +6,7 @@ export(bool) var tracking = false
 
 # Called when the node enters the scene tree for the first time.
 func _ready():
-	pass # Replace with function body.
+	tracking = false
 
 func _input(event): # executes when clicked on
 	if event is InputEventMouseButton:

Event Handler.gd

@@ -47,6 +47,7 @@ onready var cleaningMaterials = 0 # how many times the cleaning materials have b
 onready var canFrontDoor = false # whether or not Moxie has a reason to go to leave their apartment, and so go to the hallway
 onready var foundBanana = false # whether or not Moxie has spotted Banana in the balcony
 onready var plungerUsed = false # whether or not the plunger was used to travel between balconies
+onready var takenBanana = false
 
 #items in the rooms that need access to the event handler
 export(Array, NodePath) onready var eventItems
@@ -69,6 +70,8 @@ func _get_notebook(): # when To Do list is retrieved for the first time
 	movementHandle.enableMovement()
 	lockedNotepad = false
 	bedroom.get_node("Laundry basket").finished()
+	dialogue.text = "Found it! Guess I have unfinished business to deal with."
+	dialogue.playText()
 
 func _groceries_put_away(): # when the groceries are put away
 	kitchen.get_node("Granola bar").show()
@@ -150,11 +153,18 @@ func _balcony_outer_lock():
 		
 func getPlungered():
 	return plungerUsed
+
+func bananaTaken(): # when banana is taken from the balcony, hides her from neighbor's balcony
+	if !takenBanana:
+		neighborsBalcony.get_node("Nana from afar").queue_free()
+		takenBanana = true
+	
 # ----------------- Cutscene initiators ----------------- 
 func _start_cutscene_1():
 	inventory.unselect_all()
 	cutsceneHandler.get_node("1").show()
 	cutsceneHandler.get_node("1/Scene control").start()
+	dialogue.text = "Laundry time! Let's see if I can practice breaking things down."
 
 func _start_cutscene_2():
 	if !quests.hasQuest("Eat") and !quests.hasQuest("Do laundry"):
@@ -170,8 +180,9 @@ func _start_cutscene_2():
 		newQuests = true
 		movementHandle.finishTutorial()
 		get_parent().get_node("Desk/Laptop").start()
-		#change sprite for terrarium
+		bedroom.get_node("Terrarium").removeBanana()
 		bedroom.get_node("Terrarium").flavorText = "OMG! Where did Banana go??"
+		dialogue.text = "Alright, let's...try and get things done!"
 	
 func _start_cutscene_2b():
 	inventory.unselect_all()
@@ -216,7 +227,6 @@ func _laundry_finished(): # finishing notebook puzzle for laundry
 	quests.finishQuest("Do laundry")
 	inventory.remove_item_name("Dirty clothes")
 	inventory.remove_item_name("Laundry detergent")
-	
 
 func _return_laundry_notepad(): # exiting laundry notebook puzzle
 	zoom_out()

ItemList.gd

@@ -37,6 +37,8 @@ func add_item(text, icon=null, selectable=true):
 	if text == "Bobby pins":
 		bobbyPins = true
 		print("Took bobby pins")
+	elif text == "Nana":
+		get_parent().get_parent().get_node("Event Handler").bananaTaken()
 	
 func updateUI():
 	UI.updateUI()

Main rooms/Balcony.tscn

@@ -198,5 +198,4 @@ __meta__ = {
 }
 
 [node name="Sprite" type="Sprite" parent="Nana/Hitbox"]
-scale = Vector2( 1, 1 )
 texture = ExtResource( 4 )

Main rooms/Neighbor's balcony.tscn

 [gd_scene load_steps=12 format=2]
 
-[ext_resource path="res://assets/Thesis Clickables/nana from a distance.png" type="Texture" id=1]
+[ext_resource path="res://assets/Thesis Clickables/banana under.png" type="Texture" id=1]
 [ext_resource path="res://Scripts/Dialogue control/Dialogue Control - Neighbor's balcony.gd" type="Script" id=2]
 [ext_resource path="res://assets/Thesis Clickables/other balcony.png" type="Texture" id=3]
 [ext_resource path="res://Item.gd" type="Script" id=4]
@@ -62,20 +62,22 @@ position = Vector2( 455.988, 220.863 )
 scale = Vector2( 0.829244, 0.829244 )
 input_pickable = true
 script = ExtResource( 4 )
-__meta__ = {
-"_edit_group_": true
-}
 interactable = true
 flavorText = "I can see Banana from here. So near yet so far."
 
-[node name="Hitbox" type="CollisionShape2D" parent="Nana from afar"]
+[node name="h" type="CollisionShape2D" parent="Nana from afar"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 2 )
 
+[node name="Hitbox" type="CollisionPolygon2D" parent="Nana from afar"]
+position = Vector2( 15.5351, 43.8314 )
+rotation = -2.15723
+scale = Vector2( 0.278156, 0.278156 )
+polygon = PoolVector2Array( 60.2, -171.3, 118.5, -177, 118.5, -168.6, 134.2, -149.5, 128.8, -138, 127.7, -138, 108.3, -99.3, 124.5, -98.6, 124.5, -87.9, 123.2, -44, 111.7, -44, 37.9, -55.4, 24.6, -47.7, 5, 41.4, 29.3, 66.9, 24.1, 79, 20.4, 79, -9.60001, 107, -11, 107, -2.7, 124.1, 38.5, 140.2, 38.5, 176, 28.5, 176, -26.5, 187.3, -26.5, 180.4, -87.5, 153.5, -87.5, 147.3, -116.5, 89.4, -116.5, 82, -120.1, 19.9, -154.2, -4, -149.8, -18, -144.4, -18, -122.5, -31.6, -122.5, -33, -98.1, -91, -91.5, -91, -11.6, -123.1, 18.5, -182.3, 18.5, -187, 29.2, -192.7 )
+
 [node name="Sprite" type="Sprite" parent="Nana from afar/Hitbox"]
-position = Vector2( -0.158181, -0.0184715 )
-scale = Vector2( 0.101337, 0.101337 )
+rotation = -2.98023e-08
 texture = ExtResource( 1 )
 
 [node name="Balcony to neighbor\'s room" type="StaticBody2D" parent="."]

Main rooms/Test room 1.tscn

@@ -199,7 +199,7 @@ scale = Vector2( 0.0197574, 0.0197574 )
 texture = SubResource( 7 )
 
 [node name="Pants" type="StaticBody2D" parent="."]
-position = Vector2( 99.5713, 491.212 )
+position = Vector2( 128.755, 482.232 )
 scale = Vector2( 0.8, 0.8 )
 input_pickable = true
 script = ExtResource( 13 )
@@ -221,14 +221,14 @@ scale = Vector2( 0.0395079, 0.0395079 )
 texture = ExtResource( 6 )
 
 [node name="Shirt" type="StaticBody2D" parent="."]
-position = Vector2( 227.393, 409.988 )
+position = Vector2( 252.087, 439.172 )
 input_pickable = true
 script = ExtResource( 13 )
 __meta__ = {
 "_edit_group_": true
 }
 retrievable = true
-flavorText = "A deconstructed pile of clothes."
+flavorText = "All over the ground! Where did these come from?"
 
 [node name="Hitbox" type="CollisionShape2D" parent="Shirt"]
 position = Vector2( -1.78223, 0.549072 )
@@ -241,7 +241,7 @@ scale = Vector2( 0.0197574, 0.0197574 )
 texture = ExtResource( 5 )
 
 [node name="Sando" type="StaticBody2D" parent="."]
-position = Vector2( -209.019, 392.628 )
+position = Vector2( 382.518, 428.547 )
 rotation = -3.0456
 scale = Vector2( 0.9, 0.9 )
 input_pickable = true
@@ -250,7 +250,7 @@ __meta__ = {
 "_edit_group_": true
 }
 retrievable = true
-flavorText = "A deconstructed pile of clothes."
+flavorText = "Oops, must have taken this one out of the basket sometime last night."
 
 [node name="Hitbox" type="CollisionShape2D" parent="Sando"]
 position = Vector2( -3.5491, 1.06189 )
@@ -263,7 +263,7 @@ scale = Vector2( 0.0197574, 0.0197574 )
 texture = SubResource( 11 )
 
 [node name="Towel" type="StaticBody2D" parent="."]
-position = Vector2( -67.9803, 464.817 )
+position = Vector2( -39.9188, 486.144 )
 rotation = 2.74191
 input_pickable = true
 script = ExtResource( 13 )
@@ -271,7 +271,7 @@ __meta__ = {
 "_edit_group_": true
 }
 retrievable = true
-flavorText = "A deconstructed pile of clothes."
+flavorText = "Goodness, what was I doing last night?"
 
 [node name="Hitbox" type="CollisionShape2D" parent="Towel"]
 position = Vector2( -3.5491, 1.06189 )

Scripts/Movement scripts/Balcony door.gd

@@ -26,6 +26,7 @@ func objInteraction(selected): # when an object is used on it
 	var flavor = control.interaction(inventory.get_item_text(selected), self.get_name())
 	if inventory.get_item_text(selected) == "Bobby pins": # unlocking the door with a bobby pin
 		dialogueBox.text = "I can't believe that actually worked?!"
+		flavorText = ""
 		unlocked = true # can now go through the balcony door freely
 		inventory.remove_item(selected)
 	elif typeof(flavor) != 0: #checks if there's coded flavor text for this interaction
@@ -36,3 +37,4 @@ func objInteraction(selected): # when an object is used on it
 	
 func outerLock():
 	unlocked = true
+	flavorText = ""

assets/Cutscenes/01 - Notepad intro/0.png.import

+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/0.png-24492bc91bf42242b8d007dd8c632a29.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/Cutscenes/01 - Notepad intro/0.png"
+dest_files=[ "res://.import/0.png-24492bc91bf42242b8d007dd8c632a29.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/Cutscenes/01 - Notepad intro/5.png.import

+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/5.png-e30c776cb2b5b08cbfeb2c072d4c9393.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/Cutscenes/01 - Notepad intro/5.png"
+dest_files=[ "res://.import/5.png-e30c776cb2b5b08cbfeb2c072d4c9393.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/Cutscenes/01 - Notepad intro/6.png.import

+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/6.png-c9b83e1ec874460e04c4f21ef7dacb3e.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/Cutscenes/01 - Notepad intro/6.png"
+dest_files=[ "res://.import/6.png-c9b83e1ec874460e04c4f21ef7dacb3e.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