Made it so that cutscene clicks don't get tracked and fixed a few overlaps,...

Made it so that cutscene clicks don't get tracked and fixed a few overlaps, fixed some issues with Nana. Removed infinite Banana glitch.

Cutscenes/Cutscene 0.tscn

@@ -943,11 +943,11 @@ font_data = ExtResource( 7 )
 [node name="Node2D" type="Node2D"]
 
 [node name="Cutscene 0 panel" type="Panel" parent="."]
-visible = false
 margin_left = -15.0
 margin_top = -13.0
 margin_right = 1047.0
 margin_bottom = 628.0
+input_pass_on_modal_close_click = false
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -1026,6 +1026,7 @@ 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
 
@@ -1058,6 +1059,7 @@ 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
 
@@ -1083,6 +1085,7 @@ __meta__ = {
 position = Vector2( 463.814, 231.124 )
 scale = Vector2( 0.5, 0.5 )
 frames = SubResource( 12 )
+frame = 1
 speed_scale = 0.7
 playing = true
 
@@ -1107,7 +1110,6 @@ __meta__ = {
 position = Vector2( 26.6041, -1.41309 )
 scale = Vector2( 0.45, 0.45 )
 frames = SubResource( 12 )
-frame = 1
 speed_scale = 0.7
 playing = true
 
@@ -1132,7 +1134,6 @@ 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
 
@@ -1179,7 +1180,6 @@ 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
 
@@ -1217,5 +1217,6 @@ 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 1.tscn

-[gd_scene load_steps=27 format=2]
+[gd_scene load_steps=28 format=2]
 
 [ext_resource path="res://Cutscenes/Cutscene 1.gd" type="Script" id=1]
 [ext_resource path="res://assets/Thesis Clickables/clothes pile.png" type="Texture" id=2]
@@ -10,6 +10,9 @@
 [ext_resource path="res://assets/Cutscenes/01 - Notepad intro/3.png" type="Texture" id=8]
 [ext_resource path="res://assets/Cutscenes/01 - Notepad intro/2.png" type="Texture" id=9]
 
+[sub_resource type="StyleBoxFlat" id=18]
+bg_color = Color( 1, 1, 1, 1 )
+
 [sub_resource type="Animation" id=1]
 resource_name = "Shot 1"
 length = 1.3
@@ -781,11 +784,12 @@ font_data = SubResource( 10 )
 [node name="Node2D" type="Node2D"]
 
 [node name="Panel" type="Panel" parent="."]
-visible = false
 margin_left = -15.0
 margin_top = -13.0
 margin_right = 1047.0
 margin_bottom = 628.0
+input_pass_on_modal_close_click = false
+custom_styles/panel = SubResource( 18 )
 __meta__ = {
 "_edit_use_anchors_": false
 }

Cutscenes/Cutscene 3.tscn

-[gd_scene load_steps=69 format=2]
+[gd_scene load_steps=70 format=2]
 
 [ext_resource path="res://Cutscenes/Cutscene 3.gd" type="Script" id=1]
 [ext_resource path="res://assets/Thesis Clickables/arrow-white-down.png" type="Texture" id=2]
@@ -14,6 +14,9 @@
 [ext_resource path="res://assets/Cutscenes/03 - Finale/08.png" type="Texture" id=12]
 [ext_resource path="res://assets/Cutscenes/03 - Finale/09.png" type="Texture" id=13]
 
+[sub_resource type="StyleBoxFlat" id=56]
+bg_color = Color( 1, 1, 1, 1 )
+
 [sub_resource type="Animation" id=1]
 resource_name = "Shot 0"
 tracks/0/type = "value"
@@ -2503,11 +2506,12 @@ extents = Vector2( 515.38, 299.307 )
 [node name="Node2D" type="Node2D"]
 
 [node name="Panel" type="Panel" parent="."]
-visible = false
 margin_left = -15.0
 margin_top = -13.0
 margin_right = 1047.0
 margin_bottom = 628.0
+input_pass_on_modal_close_click = false
+custom_styles/panel = SubResource( 56 )
 __meta__ = {
 "_edit_use_anchors_": false
 }

Dialogue arrow.gd

@@ -17,6 +17,8 @@ func setScene(sname):
 	currentScene = sname
 	dim.show()
 	
+func objInteraction(selected):
+	mouseInteraction()
 
 func getDialogue(sceneName):
 	var dialogue

ItemList.gd

 extends ItemList
 onready var UI = get_parent().get_node("Inventory UI")
-
+onready var bobbyPins = false
 
 # Called when the node enters the scene tree for the first time.
 func _ready():
@@ -33,7 +33,10 @@ func remove_item(idx):
 func add_item(text, icon=null, selectable=true):
 	.add_item(text, icon)
 	UI.updateUI()
-	print("Adding item")
+	#print("Adding item")
+	if text == "Bobby pins":
+		bobbyPins = true
+		print("Took bobby pins")
 	
 func updateUI():
 	UI.updateUI()
@@ -49,3 +52,6 @@ func disable():
 func enable():
 	unselect_all()
 	UI.enableAll()
+
+func hadBobby():
+	return bobbyPins

Main rooms/Bathroom.tscn

@@ -208,7 +208,6 @@ flavorText = "Bobby pins and puddles. What was I doing in here?"
 shape = SubResource( 7 )
 
 [node name="Sprite" type="Sprite" parent="Mess on floor/Hitbox"]
-visible = false
 position = Vector2( -1.45947, -0.173828 )
 scale = Vector2( 2.00236, 0.457652 )
 texture = ExtResource( 9 )

Main rooms/Neighbor's room.tscn

-[gd_scene load_steps=25 format=2]
+[gd_scene load_steps=26 format=2]
 
 [ext_resource path="res://Scripts/Dialogue control/Dialogue Control - Neighbor's room.gd" type="Script" id=1]
 [ext_resource path="res://Item.gd" type="Script" id=2]
@@ -15,6 +15,7 @@
 [ext_resource path="res://assets/Thesis Clickables/right arrow.png" type="Texture" id=13]
 [ext_resource path="res://Scripts/Ladder.gd" type="Script" id=14]
 [ext_resource path="res://assets/Backgrounds/brodie room.jpg" type="Texture" id=15]
+[ext_resource path="res://assets/Thesis Clickables/banana over.png" type="Texture" id=16]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 17.9304, 34.6917 )
@@ -197,6 +198,7 @@ margin_right = 424.0
 margin_bottom = -238.0
 rect_pivot_offset = Vector2( 275.635, 160.503 )
 mouse_filter = 2
+input_pass_on_modal_close_click = false
 color = Color( 0, 0, 0, 0.556863 )
 __meta__ = {
 "_edit_use_anchors_": false
@@ -251,6 +253,13 @@ polygon = PoolVector2Array( 90, -509.8, 90, -503.7, 105, -461.7, 105, -447.7, 93
 [node name="Sprite" type="Sprite" parent="Neighbor/Hitbox"]
 texture = ExtResource( 5 )
 
+[node name="Nana" type="Sprite" parent="Neighbor/Hitbox"]
+visible = false
+position = Vector2( -19.2547, -65.4717 )
+rotation = -0.762709
+scale = Vector2( 0.830441, 0.830441 )
+texture = ExtResource( 16 )
+
 [node name="h" type="CollisionShape2D" parent="Neighbor"]
 visible = false
 position = Vector2( -0.433167, 2.2196 )

Main rooms/Test room 1.tscn

@@ -121,6 +121,13 @@ scale = Vector2( 5, 5 )
 shape = SubResource( 3 )
 
 [node name="Sprite" type="Sprite" parent="Terrarium/Hitbox"]
+visible = false
+position = Vector2( -0.566895, 0.525879 )
+rotation = -1.90415
+scale = Vector2( 0.0386466, 0.0386466 )
+texture = ExtResource( 15 )
+
+[node name="Nana" type="Sprite" parent="Terrarium/Hitbox"]
 position = Vector2( -0.566895, 0.525879 )
 rotation = -1.90415
 scale = Vector2( 0.0386466, 0.0386466 )

Multi.tscn

@@ -349,6 +349,7 @@ margin_left = -197.0
 margin_top = 115.0
 margin_right = -157.0
 margin_bottom = 155.0
+input_pass_on_modal_close_click = false
 script = ExtResource( 41 )
 __meta__ = {
 "_edit_use_anchors_": false
@@ -522,6 +523,7 @@ margin_top = -119.524
 margin_right = 531.0
 margin_bottom = 493.476
 rect_scale = Vector2( 0.1, 0.1 )
+input_pass_on_modal_close_click = false
 texture_normal = ExtResource( 9 )
 script = ExtResource( 10 )
 __meta__ = {
@@ -535,6 +537,7 @@ margin_top = -119.465
 margin_right = 1427.59
 margin_bottom = 509.535
 rect_scale = Vector2( 0.1, 0.1 )
+input_pass_on_modal_close_click = false
 texture_normal = ExtResource( 7 )
 script = ExtResource( 10 )
 __meta__ = {
@@ -598,6 +601,7 @@ __meta__ = {
 z_index = 2
 
 [node name="0" parent="Cutscenes" instance=ExtResource( 42 )]
+visible = false
 
 [node name="1" parent="Cutscenes" instance=ExtResource( 15 )]
 visible = false

Scripts/Mess on floor.gd

@@ -16,7 +16,7 @@ func passEvent(handler):
 func objInteraction(selected):
 	var flavor = control.interaction(inventory.get_item_text(selected), self.get_name())
 	if inventory.get_item_text(selected) == "Cleaning mat":  # using the cleaning materials on the mess
-		if inventory.hasItem("Bobby pins") == -1:  #if the bobby pins haven't been picked up yet
+		if !inventory.hadBobby():  #if the bobby pins haven't been picked up yet
 			dialogueBox.text = "Ow! I stepped on something!"
 		else: # if they have been picked up
 			if !clean: #if it hasnt been cleaned yet

Scripts/Neighbor.gd

@@ -18,7 +18,7 @@ func mouseInteraction():
 	else:
 		dialogueBox.text = "Brodie: Thank you for this I love her"
 		dialogueBox.playText()
-		inventory.add_item("Nana", load("res://.import/nana.png-3afacff9a6dfeb0ea38c0e651d0707be.stex"))
+		inventory.add_item("Nana", load("res://.import/banana over.png-bd7be1a3ce9b1058a9b7d4818ec0c344.stex"))
 		hasNana = false
 		move()
 
@@ -49,8 +49,10 @@ func doesHaveNana():
 func move():
 	if !hasNana:
 		position = Vector2(6.44,8.756)
+		get_node("Hitbox/Nana").hide()
 	else:
-		position = Vector2(326.341,8.756)
+		position = Vector2(383.758,-11.266)
+		get_node("Hitbox/Nana").show()
 
 func set_face(face):
 	match face:

Scripts/Terrarium.gd

@@ -12,7 +12,8 @@ func mouseInteraction():
 	if flavorText == "OMG! Where did Banana go??" and !hasBanana: # if it's the first interaction
 		flavorText = "Okay... if I were a lizard, where would I be?"
 	elif hasBanana:
-		inventory.add_item("Nana", load("res://.import/nana.png-3afacff9a6dfeb0ea38c0e651d0707be.stex"))
+		inventory.add_item("Nana", load("res://.import/banana over.png-bd7be1a3ce9b1058a9b7d4818ec0c344.stex"))
+		removeBanana()
 
 func passEvent(handler):
 	connect("fed", handler,"_remove_quest")
@@ -22,7 +23,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) == "Nana":
 		inventory.remove_item(selected)
-		hasBanana = true
+		addBanana()
 		dialogueBox.text = "That's enough shenanigans from you for today."
 		flavorText = "Hello, my little yellow daughter."
 	elif inventory.get_item_text(selected) == "Nana's food": # trying to feed Banana
@@ -37,3 +38,11 @@ func objInteraction(selected): # when an object is used on it
 	else:
 		dialogueBox.text = "No flavor text found" #can replace this later!
 	dialogueBox.playText()
+	
+func removeBanana():
+	hasBanana = false
+	get_node("Hitbox/Nana").visible = false
+	
+func addBanana():
+	hasBanana = true
+	get_node("Hitbox/Nana").visible = true