Commit c9b4d7d8 authored by Julia Santos's avatar Julia Santos

Clicking on the laptop after eating and doing laundry now deploys the post-lab attempt quests

parent 1b8cac91
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
[ext_resource path="res://Dialogue Contro - Living room.gd" type="Script" id=1] [ext_resource path="res://Dialogue Contro - Living room.gd" type="Script" id=1]
[ext_resource path="res://assets/Thesis Clickables/laptop.png" type="Texture" id=2] [ext_resource path="res://assets/Thesis Clickables/laptop.png" type="Texture" id=2]
[ext_resource path="res://Item.gd" type="Script" id=3] [ext_resource path="res://Desk_laptop.gd" type="Script" id=3]
[ext_resource path="res://Return_laptop.gd" type="Script" id=4] [ext_resource path="res://Return_laptop.gd" type="Script" id=4]
[sub_resource type="RectangleShape2D" id=1] [sub_resource type="RectangleShape2D" id=1]
...@@ -37,6 +37,8 @@ script = ExtResource( 3 ) ...@@ -37,6 +37,8 @@ script = ExtResource( 3 )
__meta__ = { __meta__ = {
"_edit_group_": true "_edit_group_": true
} }
interactable = true
flavorText = "I... don't get it... I probably should've studied first huh? Where are my notes?"
[node name="CollisionShape2D" type="CollisionShape2D" parent="Laptop"] [node name="CollisionShape2D" type="CollisionShape2D" parent="Laptop"]
position = Vector2( -16.8367, -2.11676 ) position = Vector2( -16.8367, -2.11676 )
...@@ -49,7 +51,7 @@ scale = Vector2( 0.403654, 0.403654 ) ...@@ -49,7 +51,7 @@ scale = Vector2( 0.403654, 0.403654 )
texture = ExtResource( 2 ) texture = ExtResource( 2 )
[node name="Return" type="StaticBody2D" parent="."] [node name="Return" type="StaticBody2D" parent="."]
position = Vector2( 100.642, 396.476 ) position = Vector2( 117.291, 400.044 )
scale = Vector2( 0.8, 0.8 ) scale = Vector2( 0.8, 0.8 )
input_pickable = true input_pickable = true
script = ExtResource( 4 ) script = ExtResource( 4 )
......
extends "res://Item.gd"
onready var labNotes = 0
signal finished_lab
signal start_lab
# Called when the node enters the scene tree for the first time.
func _ready():
pass # Replace with function body.
func passEvent(handler):
connect("start_lab", handler,"_start_lab")
connect("finished_lab", handler, "_finished_lab")
pass
func addNotes(): # when a new lab note is retrieved
labNotes = labNotes + 1
func getNotes(): # returns how many lab notes the player has found
return labNotes
func mouseInteraction():
.mouseInteraction()
emit_signal("start_lab")
...@@ -6,25 +6,13 @@ func _ready(): ...@@ -6,25 +6,13 @@ func _ready():
func interaction(selected, clicked): #selected = item in inventory, clicked = item in environment func interaction(selected, clicked): #selected = item in inventory, clicked = item in environment
match clicked: match clicked:
"Laundry basket": "Laptop":
match selected: match selected:
"Shirt", "Towel", "Pants", "Sando": "Lab Notes":
return "Into the basket you go." if (get_parent().get_node("Laptop").getNotes == 3):
return "Alright Lab. I've put you off long enough. But... Where do I start?"
else:
"Placeholder 2": return "I don't have everything yet.."
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. # Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta): #func _process(delta):
......
...@@ -30,11 +30,11 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it ...@@ -30,11 +30,11 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
"Look": "Look":
return "The door to the washing machine" return "The door to the washing machine"
"Open": "Open":
get_parent().get_node(clicked +"/CollisionShape2D/Sprite").visible = true #get_parent().get_node(clicked +"/CollisionShape2D/Sprite").visible = true
door = true door = true
return "Open." return "Open."
"Close": "Close":
get_parent().get_node(clicked +"/CollisionShape2D/Sprite").visible = false #get_parent().get_node(clicked +"/CollisionShape2D/Sprite").visible = false
door = false door = false
if clothes_in: if clothes_in:
clothes.hide() clothes.hide()
...@@ -48,11 +48,11 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it ...@@ -48,11 +48,11 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
"Look": "Look":
return "The little drawer for the soap" return "The little drawer for the soap"
"Open": "Open":
get_parent().get_node(clicked +"/CollisionShape2D/Sprite").visible = true #get_parent().get_node(clicked +"/CollisionShape2D/Sprite").visible = true
drawer = true drawer = true
return "Open." return "Open."
"Close": "Close":
get_parent().get_node(clicked +"/CollisionShape2D/Sprite").visible = false #get_parent().get_node(clicked +"/CollisionShape2D/Sprite").visible = false
drawer = false drawer = false
if soap: if soap:
get_parent().get_node("Soap/CollisionShape2D/Sprite2").visible = false get_parent().get_node("Soap/CollisionShape2D/Sprite2").visible = false
......
...@@ -29,6 +29,8 @@ onready var neighborsBalcony = get_parent().get_node("Neighbor's balcony") ...@@ -29,6 +29,8 @@ onready var neighborsBalcony = get_parent().get_node("Neighbor's balcony")
#functioning stuff #functioning stuff
onready var quests = notepad.get_node("Quests") onready var quests = notepad.get_node("Quests")
onready var groceries = false #if groceries were put away onready var groceries = false #if groceries were put away
onready var eat = false # if moxie has eaten the first time
onready var laundry = false #if laundry has been done
onready var lockedNotepad #if ur locked from certain areas bc u havent gotten the notebook yet onready var lockedNotepad #if ur locked from certain areas bc u havent gotten the notebook yet
#items in the rooms that need access to the event handler #items in the rooms that need access to the event handler
...@@ -61,6 +63,14 @@ func _groceries_put_away(): # when the groceries are put away ...@@ -61,6 +63,14 @@ func _groceries_put_away(): # when the groceries are put away
func _eaten(): # completing first "Eat" quest func _eaten(): # completing first "Eat" quest
quests.finishQuest("Eat") quests.finishQuest("Eat")
eat = true
func _start_lab():
if laundry and eat:
quests.add("Feed Nana")
quests.add("Clean bathroom")
quests.add("Take care of plants")
quests.add("Figure out what's making that noise")
# ----------------- Notebook puzzle events ----------------- # ----------------- Notebook puzzle events -----------------
func _enter_notebook_laundry(): # trying to engage in the notebook puzzle for doing laundry func _enter_notebook_laundry(): # trying to engage in the notebook puzzle for doing laundry
...@@ -86,6 +96,7 @@ func _enter_notebook_laundry(): # trying to engage in the notebook puzzle for do ...@@ -86,6 +96,7 @@ func _enter_notebook_laundry(): # trying to engage in the notebook puzzle for do
func _laundry_finished(): # finishing notebook puzzle for laundry func _laundry_finished(): # finishing notebook puzzle for laundry
print("Finished laundry") print("Finished laundry")
quests.finishQuest("Do laundry") quests.finishQuest("Do laundry")
laundry = true
func _return_laundry_notepad(): # exiting laundry notebook puzzle func _return_laundry_notepad(): # exiting laundry notebook puzzle
zoom_out() zoom_out()
...@@ -198,6 +209,7 @@ func _close_cabinet(): ...@@ -198,6 +209,7 @@ func _close_cabinet():
insideCabinet.hide() insideCabinet.hide()
func _in_desk(): func _in_desk():
if !lockedNotepad:
zoom_in() zoom_in()
inventory.show() inventory.show()
desk.show() desk.show()
...@@ -216,5 +228,4 @@ func connect_stools(): # connecting the two instances of the stool so that one d ...@@ -216,5 +228,4 @@ func connect_stools(): # connecting the two instances of the stool so that one d
# ----------------- Other ----------------- # ----------------- Other -----------------
func give_energy_bar(): # returns energy bar node func give_energy_bar(): # returns energy bar node
return energy return energy
#func is_special_view(): # whether or not the game is in a special screen that can't has designated enter/exit
# return specialView
...@@ -11,6 +11,4 @@ func mouseInteraction(): ...@@ -11,6 +11,4 @@ func mouseInteraction():
func passEvent(handler): func passEvent(handler):
connect("laptop", handler,"_in_desk") connect("laptop", handler,"_in_desk")
pass pass
# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta):
# pass
...@@ -133,7 +133,7 @@ items = [ NodePath("Nana from afar"), NodePath("Other balcony"), NodePath("Balco ...@@ -133,7 +133,7 @@ items = [ NodePath("Nana from afar"), NodePath("Other balcony"), NodePath("Balco
[node name="Event Handler" type="Node2D" parent="."] [node name="Event Handler" type="Node2D" parent="."]
position = Vector2( 460.602, 18.6417 ) position = Vector2( 460.602, 18.6417 )
script = ExtResource( 12 ) 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") ] 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") ]
[node name="Moxie" type="Sprite" parent="."] [node name="Moxie" type="Sprite" parent="."]
position = Vector2( 214.135, 386.725 ) position = Vector2( 214.135, 386.725 )
...@@ -201,13 +201,13 @@ __meta__ = { ...@@ -201,13 +201,13 @@ __meta__ = {
quests = PoolStringArray( "Do laundry" ) quests = PoolStringArray( "Do laundry" )
[node name="Words" type="ItemList" parent="UI/To do"] [node name="Words" type="ItemList" parent="UI/To do"]
visible = false
anchor_right = 0.267 anchor_right = 0.267
margin_left = 32.8016 margin_left = 32.8016
margin_top = 48.2599 margin_top = 48.2599
margin_right = 252.802 margin_right = 252.802
margin_bottom = 155.26 margin_bottom = 155.26
rect_clip_content = false rect_clip_content = false
mouse_filter = 2
custom_styles/bg = SubResource( 4 ) custom_styles/bg = SubResource( 4 )
custom_colors/font_color_selected = Color( 0, 0, 0, 1 ) custom_colors/font_color_selected = Color( 0, 0, 0, 1 )
custom_colors/font_color = Color( 0, 0, 0, 1 ) custom_colors/font_color = Color( 0, 0, 0, 1 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment