Animated one last cutscene

.import/banana over.png-bd7be1a3ce9b1058a9b7d4818ec0c344.md5

+source_md5="e37a2dc282b2d51a255960579212688f"
+dest_md5="52c4577a4e1e279867835e6de4916df4"
+

.import/banana under.png-a0db591b9435d1b6994b3965b1d4f49b.md5

+source_md5="840db0847cb7d92548337fd325cba368"
+dest_md5="df78b0b689effe17dc4e478c763c6014"
+

.import/bedroom.png-d12c4315f056ea918ffcf5e8f151e639.md5

+source_md5="418ba88459fb2731f68856fca5ba058a"
+dest_md5="530a363e386ff7277342ccb2c5579cfe"
+

Cutscenes/Cutscene 0.tscn

@@ -1026,7 +1026,6 @@ visible = false
 position = Vector2( -155.066, -121.643 )
 scale = Vector2( 0.440033, 0.428372 )
 frames = SubResource( 12 )
-frame = 1
 speed_scale = 0.7
 playing = true
 
@@ -1059,7 +1058,6 @@ visible = false
 position = Vector2( 445.291, 229.994 )
 scale = Vector2( 0.5, 0.5 )
 frames = SubResource( 12 )
-frame = 1
 speed_scale = 0.7
 playing = true
 
@@ -1085,7 +1083,6 @@ __meta__ = {
 position = Vector2( 463.814, 231.124 )
 scale = Vector2( 0.5, 0.5 )
 frames = SubResource( 12 )
-frame = 1
 speed_scale = 0.7
 playing = true
 
@@ -1110,6 +1107,7 @@ __meta__ = {
 position = Vector2( 26.6041, -1.41309 )
 scale = Vector2( 0.45, 0.45 )
 frames = SubResource( 12 )
+frame = 1
 speed_scale = 0.7
 playing = true
 
@@ -1134,6 +1132,7 @@ visible = false
 position = Vector2( 404.26, 40.9534 )
 scale = Vector2( 0.45, 0.45 )
 frames = SubResource( 12 )
+frame = 1
 speed_scale = 0.7
 playing = true
 
@@ -1180,10 +1179,12 @@ visible = false
 position = Vector2( 198.027, 81.9656 )
 scale = Vector2( 0.45, 0.45 )
 frames = SubResource( 12 )
+frame = 1
 speed_scale = 0.7
 playing = true
 
 [node name="7" type="Sprite" parent="."]
+visible = false
 position = Vector2( 511.896, 299.9 )
 texture = ExtResource( 8 )
 
@@ -1216,6 +1217,5 @@ visible = false
 position = Vector2( 415.246, 39.4551 )
 scale = Vector2( 0.45, 0.45 )
 frames = SubResource( 12 )
-frame = 1
 speed_scale = 0.7
 playing = true

Cutscenes/Cutscene 2.gd

@@ -22,7 +22,7 @@ func getShot():
 	else:
 		shotName = "Shot " + str(sceneProgress + 1)
 	print(shotName)
-	if sceneProgress <= 17:
+	if (sceneProgress+1) != 18:
 		anim.play(shotName)
 	match (sceneProgress + 1):
 		7, 8, 9, 10, 12:
@@ -42,7 +42,7 @@ func getShot():
 			sceneProgress = 0
 			get_parent().queue_free() # dont need that scene anymore
 			tracking = false
-			print("Deleting scene 1")
+			print("Deleting scene 2")
 		_:
 			sceneProgress += 1
 			sceneDecimal = 0

Cutscenes/Cutscene 3.gd

 extends StaticBody2D
 onready var sceneProgress = 0
+onready var anim = get_parent().get_node("Animator")
 onready var dialogueBox = get_parent().get_node("Dialogue")
-onready var tracking = false
+export(bool) var tracking = false
 
 # Called when the node enters the scene tree for the first time.
 func _ready():
@@ -11,25 +12,61 @@ func _input(event): # executes when clicked on
 	if event is InputEventMouseButton:
 		if event.button_index == BUTTON_LEFT and event.pressed:
 			if tracking:
-				dialogueBox.text = getDialogue()
+				getShot()
 
-func getDialogue():
+func getShot():
 	match sceneProgress:
 		0:
 			sceneProgress += 1
-			return "Dialogue 2"
+			anim.play("Shot 1")
 		1:
 			sceneProgress += 1
-			return "Dialogue 3"
+			anim.play("Shot 2")
 		2:
 			sceneProgress += 1
-			return "Dialogue 4"
+			anim.play("Shot 2.1")
 		3:
-			#sceneProgress = 0
-			#get_parent().queue_free() # dont need that scene anymore
+			sceneProgress += 1
+			anim.play("Shot 3")
+		4:
+			sceneProgress += 1
+			anim.play("Shot 3.1")
+		5:
+			sceneProgress += 1
+			anim.play("Shot 4")
+		6:
+			sceneProgress += 1
+			anim.play("Shot 5")
+		7:
+			sceneProgress += 1
+			anim.play("Shot 6")
+		8:
+			sceneProgress += 1
+			anim.play("Shot 7")
+		9:
+			sceneProgress += 1
+			anim.play("Shot 8")
+		10:
+			sceneProgress += 1
+			anim.play("Shot 9")
+		11:
+			sceneProgress = 0
+			print("Deleting final cutscene")
+			var save_data = File.new()
+			var curTime = OS.get_time()
+			var timestamp = "[" + str(curTime.hour) + ":" + str(curTime.minute) + ":" + str(curTime.second) + "]"
+			if !save_data.file_exists("user://data.save"):
+				save_data.open("user://data.save",File.WRITE)
+				save_data.store_string("FINISHED! " + timestamp)
+				print("Created file")
+			else:
+				save_data.open("user://data.save",File.READ_WRITE)
+				save_data.seek_end()
+				save_data.store_string("FINISHED! " + timestamp)
+			save_data.close()
+			get_parent().queue_free() # dont need that scene anymore
 			tracking = false
-			return "Congrats, you win!"
-			
 
 func start():
 	tracking = true
+	getShot()

Main rooms/Balcony.tscn

@@ -3,7 +3,7 @@
 [ext_resource path="res://assets/Thesis Clickables/other plants.png" type="Texture" id=1]
 [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://assets/Thesis Clickables/banana over.png" type="Texture" id=4]
 [ext_resource path="res://assets/Backgrounds/balcony_moxie.jpg" type="Texture" 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]
@@ -60,7 +60,7 @@ load_path = "res://.import/Balcony door.png-b1c8d05a5eb532517313dc4785195288.ste
 extents = Vector2( 15.1887, 16.2857 )
 
 [sub_resource type="RectangleShape2D" id=7]
-extents = Vector2( 15.6685, 16.4124 )
+extents = Vector2( 15.6685, 15.1283 )
 
 [node name="Node2D3" type="Node2D"]
 
@@ -175,22 +175,28 @@ shape = SubResource( 6 )
 disabled = true
 
 [node name="Nana" type="StaticBody2D" parent="."]
-position = Vector2( 424.28, 298.754 )
+position = Vector2( 433.53, 291.186 )
 scale = Vector2( 0.829244, 0.829244 )
 input_pickable = true
 script = ExtResource( 2 )
-__meta__ = {
-"_edit_group_": true
-}
 retrievable = true
 flavorText = "That's enough shenanigans from you for today."
 
-[node name="Hitbox" type="CollisionShape2D" parent="Nana"]
-position = Vector2( -16.8367, -2.11676 )
+[node name="h" type="CollisionShape2D" parent="Nana"]
+visible = false
+position = Vector2( -8.78824, 72.4761 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 7 )
+disabled = true
+
+[node name="Hitbox" type="CollisionPolygon2D" parent="Nana"]
+position = Vector2( -13.8022, 80.7049 )
+scale = Vector2( 0.365757, 0.365757 )
+polygon = PoolVector2Array( 33.6, -168, 34.4, -168, 36.4, -171, 41.3, -171, 44.5, -167.8, 44.5, -165.6, 44.1, -164.5, 49.5, -167.2, 49.5, -164.1, 52.5, -162.1, 52.5, -158.8, 45.5, -154.9, 45.5, -152, 48.2, -150, 48.9, -150, 57.9, -156, 62.1, -156, 90.3, -162, 97.6, -162, 105.5, -161.2, 116.5, -164.7, 116.5, -162.4, 121.5, -160.4, 121.5, -153, 119.8, -153, 99.7, -116, 98.4, -116, 88.4, -104, 85.9, -104, 65.5, -99.4, 57.5, -92.1, 66.4, -81, 69.8, -81, 75.8, -79, 87.3, -79, 94.3, -92, 98.8, -92, 101.8, -85, 104.9, -85, 108.4, -87.3, 110.5, -86.2, 110.5, -84.5, 113.7, -78, 110.2, -78, 106.9, -75.9, 113.5, -73.4, 113.5, -66.6, 107.8, -64.7, 110.5, -58, 107.2, -58, 100.8, -52.6, 98.5, -53.7, 98.5, -54.9, 93.8, -58, 81.5, -58, 59.5, -59, 59.5, -60.5, 47.5, -63.4, 47.5, -65, 35.2, -74, 8.5, -56.9, 8.5, -54.4, 3.5, -46.4, 3.5, -43.7, -4.5, -16.7, -4.5, 2.7, -1.5, 11.7, -1.5, 18.2, -2.8, 26, -4.3, 26, -15.4, 50, 6.5, 56.5, 6.5, 58.2, 12.9, 64.5, 11.8, 67, 10.6, 67, 8.60001, 70, 4.39999, 70, -0.5, 69.3, -0.5, 70.3, 4.5, 76.3, 4.5, 78.8, 0.300003, 83, -3.39999, 83, -8.39999, 77, -9.5, 77, -9.5, 78, -6.8, 87, -9.8, 87, -15.2, 91.3, -17.5, 90.3, -17.5, 88.5, -25.8, 72, -36.5, 62.6, -36.5, 74, -35.6, 101, -26.1, 123, -9.60001, 141, -7.2, 141, 21.5, 148.5, 21.5, 150.2, 25.5, 154.2, 25.5, 158.5, 23.7, 162, 22, 162, 9.10001, 170, -9.7, 170, -23.5, 167.7, -23.5, 166.5, -43.5, 161.6, -43.5, 160.3, -59.5, 153.3, -59.5, 152, -73.5, 142, -73.5, 140.6, -94.5, 107.6, -94.5, 104, -103.5, 72.3, -103.5, 65, -105.5, 18, -104.4, 18, -103.5, 2, -105, 2, -121.5, 11.4, -121.5, 8.2, -125.5, 6.2, -125.5, 4.10001, -127.4, 5.3, -129.5, 4.2, -129.5, 2.5, -136.8, -7.8, -135.7, -10, -134.2, -10, -124.2, -18, -120.6, -18, -107.5, -21.5, -107.5, -25.3, -98, -61, -96.6, -61, -86.6, -77, -71.5, -77, -71.5, -75.1, -67.4, -72.8, -41.1, -91, -39, -91, 4.5, -113.2, 2.3, -139, 4.8, -139, 20.5, -151, 20.5, -155, 17.9, -165, 21, -165, 24.5, -167.1, 24.5, -172.2, 26.5, -173.2, 26.5, -174.5, 29.5, -175.3 )
+__meta__ = {
+"_edit_group_": true
+}
 
 [node name="Sprite" type="Sprite" parent="Nana/Hitbox"]
-position = Vector2( -0.00619507, -0.0649719 )
-scale = Vector2( 0.155235, 0.155235 )
+scale = Vector2( 1, 1 )
 texture = ExtResource( 4 )

Scripts/Sink.gd

@@ -25,7 +25,7 @@ func objInteraction(selected):
 			dialogueBox.text = "Tap water's pretty clean around these parts."
 	elif inventory.get_item_text(selected) == "Tabo":
 		if clean:
-			inventory.add_item("Tabo with water", load("res://.import/placeholder item.png-cd6e4c1231156687d87915032ec4361d.stex"))
+			inventory.add_item("Tabo with water", load("res://.import/tabo (with water).png-3eb7036eb5e151adbbfd6e3d610a078e.stex"))
 		# replace this with a sprite of the tabo with water later
 			inventory.remove_item(selected)
 			dialogueBox.text = "Hydration."

assets/Backgrounds/bedroom.png.import

+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/bedroom.png-d12c4315f056ea918ffcf5e8f151e639.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/Backgrounds/bedroom.png"
+dest_files=[ "res://.import/bedroom.png-d12c4315f056ea918ffcf5e8f151e639.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/banana over.png.import

+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/banana over.png-bd7be1a3ce9b1058a9b7d4818ec0c344.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/Thesis Clickables/banana over.png"
+dest_files=[ "res://.import/banana over.png-bd7be1a3ce9b1058a9b7d4818ec0c344.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/banana under.png.import

+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/banana under.png-a0db591b9435d1b6994b3965b1d4f49b.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/Thesis Clickables/banana under.png"
+dest_files=[ "res://.import/banana under.png-a0db591b9435d1b6994b3965b1d4f49b.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