Commit e8080159 authored by Julia Santos's avatar Julia Santos

Please work and dont break things

parent 88061fa9
...@@ -32,6 +32,7 @@ onready var groceries = false #if groceries were put away ...@@ -32,6 +32,7 @@ onready var groceries = false #if groceries were put away
onready var newQuests = false onready var newQuests = false
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
onready var labNotes = 0 onready var labNotes = 0
onready var clothes = 0
#items in the rooms that need access to the event handler #items in the rooms that need access to the event handler
export(Array, NodePath) onready var eventItems export(Array, NodePath) onready var eventItems
...@@ -104,7 +105,12 @@ func _add_lab_note(): # when a new lab note is retrieved ...@@ -104,7 +105,12 @@ func _add_lab_note(): # when a new lab note is retrieved
func get_lab_notes(): # returns how many lab notes the player has found func get_lab_notes(): # returns how many lab notes the player has found
return labNotes return labNotes
func _add_clothes():
clothes = clothes + 1
print("Clothes: " + str(clothes))
func get_clothes():
return clothes
# ----------------- 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
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
[ext_resource path="res://assets/Placeholder BGs/room zoom out.png" type="Texture" id=1] [ext_resource path="res://assets/Placeholder BGs/room zoom out.png" type="Texture" id=1]
[ext_resource path="res://assets/placeholder item.png" type="Texture" id=2] [ext_resource path="res://assets/placeholder item.png" type="Texture" id=2]
[ext_resource path="res://Item.gd" type="Script" id=3]
[ext_resource path="res://Scripts/Dialogue control/Dialogue control - Test Room 1.gd" type="Script" id=4] [ext_resource path="res://Scripts/Dialogue control/Dialogue control - Test Room 1.gd" type="Script" id=4]
[ext_resource path="res://assets/Thesis Clickables/trail 1.png" type="Texture" id=5] [ext_resource path="res://assets/Thesis Clickables/trail 1.png" type="Texture" id=5]
[ext_resource path="res://assets/Thesis Clickables/trail 2.png" type="Texture" id=6] [ext_resource path="res://assets/Thesis Clickables/trail 2.png" type="Texture" id=6]
...@@ -12,6 +11,7 @@ ...@@ -12,6 +11,7 @@
[ext_resource path="res://Scripts/Movement scripts/Bathroom door.gd" type="Script" id=10] [ext_resource path="res://Scripts/Movement scripts/Bathroom door.gd" type="Script" id=10]
[ext_resource path="res://Scripts/Laptop.gd" type="Script" id=11] [ext_resource path="res://Scripts/Laptop.gd" type="Script" id=11]
[ext_resource path="res://Scripts/Terrarium.gd" type="Script" id=12] [ext_resource path="res://Scripts/Terrarium.gd" type="Script" id=12]
[ext_resource path="res://Scripts/Clothes trail.gd" type="Script" id=13]
[sub_resource type="RectangleShape2D" id=1] [sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 14.2862, 14.7497 ) extents = Vector2( 14.2862, 14.7497 )
...@@ -26,11 +26,6 @@ load_path = "res://.import/placeholder item.png-cd6e4c1231156687d87915032ec4361d ...@@ -26,11 +26,6 @@ load_path = "res://.import/placeholder item.png-cd6e4c1231156687d87915032ec4361d
[sub_resource type="RectangleShape2D" id=4] [sub_resource type="RectangleShape2D" id=4]
extents = Vector2( 16.0697, 9.41678 ) extents = Vector2( 16.0697, 9.41678 )
[sub_resource type="RectangleShape2D" id=5]
extents = Vector2( 16.2181, 10.3281 )
[sub_resource type="RectangleShape2D" id=6]
[sub_resource type="RectangleShape2D" id=7] [sub_resource type="RectangleShape2D" id=7]
extents = Vector2( 16.0423, 12.4535 ) extents = Vector2( 16.0423, 12.4535 )
...@@ -45,6 +40,11 @@ extents = Vector2( 16.729, 28.1565 ) ...@@ -45,6 +40,11 @@ extents = Vector2( 16.729, 28.1565 )
flags = 4 flags = 4
load_path = "res://.import/trail 3.png-9960f4c5b964f5aca36ca6c97e309a5d.stex" load_path = "res://.import/trail 3.png-9960f4c5b964f5aca36ca6c97e309a5d.stex"
[sub_resource type="RectangleShape2D" id=5]
extents = Vector2( 16.2181, 10.3281 )
[sub_resource type="RectangleShape2D" id=6]
[sub_resource type="RectangleShape2D" id=11] [sub_resource type="RectangleShape2D" id=11]
[sub_resource type="StreamTexture" id=12] [sub_resource type="StreamTexture" id=12]
...@@ -135,48 +135,6 @@ position = Vector2( -0.2771, -3.84143 ) ...@@ -135,48 +135,6 @@ position = Vector2( -0.2771, -3.84143 )
scale = Vector2( 0.033227, 0.0334515 ) scale = Vector2( 0.033227, 0.0334515 )
texture = ExtResource( 8 ) texture = ExtResource( 8 )
[node name="Pants" type="StaticBody2D" parent="."]
position = Vector2( 94.5713, 491.212 )
scale = Vector2( 0.8, 0.8 )
input_pickable = true
script = ExtResource( 3 )
__meta__ = {
"_edit_group_": true
}
retrievable = true
flavorText = "A deconstructed pile of clothes"
[node name="CollisionShape2D" type="CollisionShape2D" parent="Pants"]
position = Vector2( -2.31012, 0.749359 )
rotation = 3.57443
scale = Vector2( 5, 5 )
shape = SubResource( 5 )
[node name="Sprite" type="Sprite" parent="Pants/CollisionShape2D"]
position = Vector2( 0.911179, -3.52747 )
scale = Vector2( 0.0395079, 0.0395079 )
texture = ExtResource( 6 )
[node name="Shirt" type="StaticBody2D" parent="."]
position = Vector2( 230.393, 406.988 )
input_pickable = true
script = ExtResource( 3 )
__meta__ = {
"_edit_group_": true
}
retrievable = true
flavorText = "A deconstructed pile of clothes"
[node name="CollisionShape2D" type="CollisionShape2D" parent="Shirt"]
position = Vector2( -1.78223, 0.549072 )
scale = Vector2( 5, 5 )
shape = SubResource( 6 )
[node name="Sprite" type="Sprite" parent="Shirt/CollisionShape2D"]
position = Vector2( -0.277301, -0.137165 )
scale = Vector2( 0.0197574, 0.0197574 )
texture = ExtResource( 5 )
[node name="Laptop" type="StaticBody2D" parent="."] [node name="Laptop" type="StaticBody2D" parent="."]
position = Vector2( -254.782, 349.28 ) position = Vector2( -254.782, 349.28 )
rotation = -0.445059 rotation = -0.445059
...@@ -220,17 +178,59 @@ position = Vector2( -0.277301, -0.137165 ) ...@@ -220,17 +178,59 @@ position = Vector2( -0.277301, -0.137165 )
scale = Vector2( 0.0197574, 0.0197574 ) scale = Vector2( 0.0197574, 0.0197574 )
texture = SubResource( 10 ) texture = SubResource( 10 )
[node name="Pants" type="StaticBody2D" parent="."]
position = Vector2( 94.5713, 491.212 )
scale = Vector2( 0.8, 0.8 )
input_pickable = true
script = ExtResource( 13 )
__meta__ = {
"_edit_group_": true
}
retrievable = true
flavorText = "A deconstructed pile of clothes."
[node name="CollisionShape2D" type="CollisionShape2D" parent="Pants"]
position = Vector2( -2.31012, 0.749359 )
rotation = 3.57443
scale = Vector2( 5, 5 )
shape = SubResource( 5 )
[node name="Sprite" type="Sprite" parent="Pants/CollisionShape2D"]
position = Vector2( 0.911179, -3.52747 )
scale = Vector2( 0.0395079, 0.0395079 )
texture = ExtResource( 6 )
[node name="Shirt" type="StaticBody2D" parent="."]
position = Vector2( 230.393, 406.988 )
input_pickable = true
script = ExtResource( 13 )
__meta__ = {
"_edit_group_": true
}
retrievable = true
flavorText = "A deconstructed pile of clothes."
[node name="CollisionShape2D" type="CollisionShape2D" parent="Shirt"]
position = Vector2( -1.78223, 0.549072 )
scale = Vector2( 5, 5 )
shape = SubResource( 6 )
[node name="Sprite" type="Sprite" parent="Shirt/CollisionShape2D"]
position = Vector2( -0.277301, -0.137165 )
scale = Vector2( 0.0197574, 0.0197574 )
texture = ExtResource( 5 )
[node name="Sando" type="StaticBody2D" parent="."] [node name="Sando" type="StaticBody2D" parent="."]
position = Vector2( -234.577, 395.301 ) position = Vector2( -234.577, 395.301 )
rotation = -3.0456 rotation = -3.0456
scale = Vector2( 0.9, 0.9 ) scale = Vector2( 0.9, 0.9 )
input_pickable = true input_pickable = true
script = ExtResource( 3 ) script = ExtResource( 13 )
__meta__ = { __meta__ = {
"_edit_group_": true "_edit_group_": true
} }
retrievable = true retrievable = true
flavorText = "If I hide my work under my laundry, it'll disappear. Haha no." flavorText = "A deconstructed pile of clothes."
[node name="CollisionShape2D" type="CollisionShape2D" parent="Sando"] [node name="CollisionShape2D" type="CollisionShape2D" parent="Sando"]
position = Vector2( -3.5491, 1.06189 ) position = Vector2( -3.5491, 1.06189 )
...@@ -246,12 +246,12 @@ texture = SubResource( 12 ) ...@@ -246,12 +246,12 @@ texture = SubResource( 12 )
position = Vector2( -67.9803, 464.817 ) position = Vector2( -67.9803, 464.817 )
rotation = 2.74191 rotation = 2.74191
input_pickable = true input_pickable = true
script = ExtResource( 3 ) script = ExtResource( 13 )
__meta__ = { __meta__ = {
"_edit_group_": true "_edit_group_": true
} }
retrievable = true retrievable = true
flavorText = "Augh my back." flavorText = "A deconstructed pile of clothes."
[node name="CollisionShape2D" type="CollisionShape2D" parent="Towel"] [node name="CollisionShape2D" type="CollisionShape2D" parent="Towel"]
position = Vector2( -3.5491, 1.06189 ) position = Vector2( -3.5491, 1.06189 )
......
...@@ -132,7 +132,7 @@ items = [ NodePath("Nana from afar"), NodePath("Other balcony"), NodePath("Balco ...@@ -132,7 +132,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"), NodePath("../Desk/Laptop"), NodePath("../Bedroom/Terrarium"), NodePath("../Bathroom/Lab Note - Bathroom"), NodePath("../Inside cabinet/Lab notes"), NodePath("../Living room/Lab notes") ] 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"), NodePath("../Bedroom/Pants"), NodePath("../Bedroom/Shirt"), NodePath("../Bedroom/Sando"), NodePath("../Bedroom/Towel") ]
[node name="Moxie" type="Sprite" parent="."] [node name="Moxie" type="Sprite" parent="."]
position = Vector2( 214.135, 386.725 ) position = Vector2( 214.135, 386.725 )
......
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_clothes")
func pickup():
if (eventHandler.get_clothes() == 0):
dialogueBox.text = flavorText
inventory.add_item("Dirty clothes", get_parent().get_node("Pile of clothes/CollisionShape2D/Sprite").get_texture())
queue_free()
inventory.unselect_all()
emit_signal("retrieved")
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