Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
To Do Break Down
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
breakdown
To Do Break Down
Commits
c916c6b4
Commit
c916c6b4
authored
Mar 20, 2022
by
Julia Santos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Made it so that the items in the cabinet are visible from the kichen
parent
4f4d1d7c
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
45 additions
and
13 deletions
+45
-13
Event Handler.gd
Event Handler.gd
+3
-0
ItemList.gd
ItemList.gd
+2
-0
Lab Note.gd
Lab Note.gd
+2
-0
Kitchen.tscn
Main rooms/Kitchen.tscn
+32
-6
Multi.tscn
Multi.tscn
+2
-3
Inside cabinet.tscn
Special views/Inside cabinet.tscn
+4
-4
No files found.
Event Handler.gd
View file @
c916c6b4
...
@@ -429,6 +429,9 @@ func _open_cabinet(): # looking inside kitchen cabinet
...
@@ -429,6 +429,9 @@ func _open_cabinet(): # looking inside kitchen cabinet
kitchen.hide()
kitchen.hide()
insideCabinet.show()
insideCabinet.show()
func getCabinet(item):
kitchen.get_node("Cabinet/Hitbox/"+item).visible = false
func _close_cabinet(): # leaving kitchen cabinet
func _close_cabinet(): # leaving kitchen cabinet
zoom_out()
zoom_out()
kitchen.show()
kitchen.show()
...
...
ItemList.gd
View file @
c916c6b4
...
@@ -39,6 +39,8 @@ func add_item(text, icon=null, selectable=true):
...
@@ -39,6 +39,8 @@ func add_item(text, icon=null, selectable=true):
print("Took bobby pins")
print("Took bobby pins")
elif text == "Nana":
elif text == "Nana":
get_parent().get_parent().get_node("Event Handler").bananaTaken()
get_parent().get_parent().get_node("Event Handler").bananaTaken()
elif text == "Shovel" or text == "Nana's food" or text == "Scissors":
get_parent().get_parent().get_node("Event Handler").getCabinet(text)
func updateUI():
func updateUI():
UI.updateUI()
UI.updateUI()
...
...
Lab Note.gd
View file @
c916c6b4
...
@@ -21,6 +21,8 @@ func pickup():
...
@@ -21,6 +21,8 @@ func pickup():
num += 1
num += 1
if get_name() == "Lab Note - Bathroom": # if this is specifically the lab note in the bathroom, signal to the mirror that it's been taken
if get_name() == "Lab Note - Bathroom": # if this is specifically the lab note in the bathroom, signal to the mirror that it's been taken
get_parent().get_node("Mirror").gotNote()
get_parent().get_node("Mirror").gotNote()
elif get_name() == "Lab Note - Cabinet":
eventHandler.getCabinet("Lab Notes")
#var tooltip = "Lab Notes (" + str(num) + ")"
#var tooltip = "Lab Notes (" + str(num) + ")"
#inventory.set_item_tooltip(inventory.hasItem("Lab Notes"), tooltip)
#inventory.set_item_tooltip(inventory.hasItem("Lab Notes"), tooltip)
...
...
Main rooms/Kitchen.tscn
View file @
c916c6b4
[gd_scene load_steps=2
2
format=2]
[gd_scene load_steps=2
6
format=2]
[ext_resource path="res://assets/Backgrounds/kitchen.jpg" type="Texture" id=1]
[ext_resource path="res://assets/Backgrounds/kitchen.jpg" 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]
...
@@ -14,6 +14,10 @@
...
@@ -14,6 +14,10 @@
[ext_resource path="res://assets/Thesis Clickables/kitchen cabinet open.png" type="Texture" id=12]
[ext_resource path="res://assets/Thesis Clickables/kitchen cabinet open.png" type="Texture" id=12]
[ext_resource path="res://assets/Backgrounds/kitchen.png" type="Texture" id=13]
[ext_resource path="res://assets/Backgrounds/kitchen.png" type="Texture" id=13]
[ext_resource path="res://assets/Thesis Clickables/kitchen sink.png" type="Texture" id=14]
[ext_resource path="res://assets/Thesis Clickables/kitchen sink.png" type="Texture" id=14]
[ext_resource path="res://assets/Thesis Clickables/lab note 3.png" type="Texture" id=15]
[ext_resource path="res://assets/Thesis Clickables/Nana's food.png" type="Texture" id=16]
[ext_resource path="res://assets/Thesis Clickables/shovel.png" type="Texture" id=17]
[ext_resource path="res://assets/Thesis Clickables/scissors.png" type="Texture" id=18]
[sub_resource type="RectangleShape2D" id=1]
[sub_resource type="RectangleShape2D" id=1]
...
@@ -141,17 +145,39 @@ position = Vector2( 22.2647, -55.1662 )
...
@@ -141,17 +145,39 @@ position = Vector2( 22.2647, -55.1662 )
scale = Vector2( 5, 5 )
scale = Vector2( 5, 5 )
shape = SubResource( 5 )
shape = SubResource( 5 )
[node name="Sprite" type="Sprite" parent="Cabinet/Hitbox"]
position = Vector2( 253.454, 93.9508 )
scale = Vector2( 0.657054, 0.657054 )
texture = ExtResource( 11 )
[node name="Sprite2" type="Sprite" parent="Cabinet/Hitbox"]
[node name="Sprite2" type="Sprite" parent="Cabinet/Hitbox"]
visible = false
visible = false
position = Vector2( 253.454, 93.9508 )
position = Vector2( 253.454, 93.9508 )
scale = Vector2( 0.657054, 0.657054 )
scale = Vector2( 0.657054, 0.657054 )
texture = ExtResource( 12 )
texture = ExtResource( 12 )
[node name="Lab Notes" type="Sprite" parent="Cabinet/Hitbox"]
position = Vector2( -20.2695, -20.2582 )
scale = Vector2( 0.0361945, 0.0361945 )
texture = ExtResource( 15 )
[node name="Nana\'s food" type="Sprite" parent="Cabinet/Hitbox"]
position = Vector2( 26.3476, -21.0981 )
scale = Vector2( 0.0361945, 0.0361945 )
texture = ExtResource( 16 )
[node name="Shovel" type="Sprite" parent="Cabinet/Hitbox"]
position = Vector2( -13.9698, 26.7789 )
rotation = 2.82743
scale = Vector2( 0.0362, -0.0362 )
texture = ExtResource( 17 )
[node name="Scissors" type="Sprite" parent="Cabinet/Hitbox"]
position = Vector2( 28.5438, 26.8923 )
rotation = 0.699042
scale = Vector2( 0.0221213, 0.0221213 )
texture = ExtResource( 18 )
[node name="Sprite" type="Sprite" parent="Cabinet/Hitbox"]
position = Vector2( 253.454, 93.9508 )
scale = Vector2( 0.657054, 0.657054 )
texture = ExtResource( 11 )
[node name="Stool" type="StaticBody2D" parent="."]
[node name="Stool" type="StaticBody2D" parent="."]
visible = false
visible = false
position = Vector2( 112.641, 527.75 )
position = Vector2( 112.641, 527.75 )
...
...
Multi.tscn
View file @
c916c6b4
...
@@ -190,7 +190,7 @@ items = [ NodePath("Mirror"), NodePath("Lab Note - Bathroom"), NodePath("Toilet"
...
@@ -190,7 +190,7 @@ items = [ NodePath("Mirror"), NodePath("Lab Note - Bathroom"), NodePath("Toilet"
[node name="Inside cabinet" parent="." instance=ExtResource( 21 )]
[node name="Inside cabinet" parent="." instance=ExtResource( 21 )]
visible = false
visible = false
script = ExtResource( 4 )
script = ExtResource( 4 )
items = [ NodePath("Lab
notes
"), NodePath("Scissors"), NodePath("Nana\'s food"), NodePath("Return"), NodePath("Shovel") ]
items = [ NodePath("Lab
Note - Cabinet
"), NodePath("Scissors"), NodePath("Nana\'s food"), NodePath("Return"), NodePath("Shovel") ]
[node name="Living room" parent="." instance=ExtResource( 27 )]
[node name="Living room" parent="." instance=ExtResource( 27 )]
visible = false
visible = false
...
@@ -225,7 +225,7 @@ items = [ NodePath("Nana from afar"), NodePath("Other balcony"), NodePath("Balco
...
@@ -225,7 +225,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/Laundry door"), 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"), NodePath("../Bathroom/Sink"), NodePath("../Bathroom/Toilet"), NodePath("../Bathroom/Mirror"), NodePath("../Bathroom/Mess on floor"), NodePath("../Hallway/Trash chute"), NodePath("../Neighbor\'s room/Ladder"), NodePath("../Living room - Notepad/Return"), NodePath("../Living room/Plants"), NodePath("../Living room - Notepad/Dialogue control"), NodePath("../Balcony/Other plants"), NodePath("../Living room/Yoga mat"), NodePath("../Neighbor\'s balcony/Other balcony"), NodePath("../Kitchen/Granola bar
") ]
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/Laundry door"), 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
Note - Cabinet"), NodePath("../Living room/Lab notes"), NodePath("../Bedroom/Pants"), NodePath("../Bedroom/Shirt"), NodePath("../Bedroom/Sando"), NodePath("../Bedroom/Towel"), NodePath("../Bathroom/Sink"), NodePath("../Bathroom/Toilet"), NodePath("../Bathroom/Mirror"), NodePath("../Bathroom/Mess on floor"), NodePath("../Hallway/Trash chute"), NodePath("../Neighbor\'s room/Ladder"), NodePath("../Living room - Notepad/Return"), NodePath("../Living room/Plants"), NodePath("../Living room - Notepad/Dialogue control"), NodePath("../Balcony/Other plants"), NodePath("../Living room/Yoga mat"), NodePath("../Neighbor\'s balcony/Other balcony
") ]
[node name="Moxie" type="Control" parent="."]
[node name="Moxie" type="Control" parent="."]
margin_left = 303.56
margin_left = 303.56
...
@@ -613,7 +613,6 @@ __meta__ = {
...
@@ -613,7 +613,6 @@ __meta__ = {
}
}
[node name="Cutscenes" type="Node2D" parent="."]
[node name="Cutscenes" type="Node2D" parent="."]
visible = false
z_index = 2
z_index = 2
[node name="0" parent="Cutscenes" instance=ExtResource( 42 )]
[node name="0" parent="Cutscenes" instance=ExtResource( 42 )]
...
...
Special views/Inside cabinet.tscn
View file @
c916c6b4
...
@@ -44,7 +44,7 @@ __meta__ = {
...
@@ -44,7 +44,7 @@ __meta__ = {
"_edit_use_anchors_": false
"_edit_use_anchors_": false
}
}
[node name="Lab
notes
" type="StaticBody2D" parent="."]
[node name="Lab
Note - Cabinet
" type="StaticBody2D" parent="."]
position = Vector2( -307.381, -62.1187 )
position = Vector2( -307.381, -62.1187 )
input_pickable = true
input_pickable = true
script = ExtResource( 7 )
script = ExtResource( 7 )
...
@@ -54,15 +54,15 @@ __meta__ = {
...
@@ -54,15 +54,15 @@ __meta__ = {
retrievable = true
retrievable = true
flavorText = "My lab notes! I wonder how it got there."
flavorText = "My lab notes! I wonder how it got there."
[node name="Hitbox" type="CollisionPolygon2D" parent="Lab
notes
"]
[node name="Hitbox" type="CollisionPolygon2D" parent="Lab
Note - Cabinet
"]
position = Vector2( 0.457642, 2.12714 )
position = Vector2( 0.457642, 2.12714 )
scale = Vector2( 0.185, 0.185 )
scale = Vector2( 0.185, 0.185 )
polygon = PoolVector2Array( 358.8, -395.2, 355.1, -385, 328, -198.3, 328, -177, 335.7, -20.7, 369.5, 120.6, 456, 295.7, 456, 304.2, 446.4, 325, 438.3, 325, -279, 527.2, -279, 515.5, -341, 395.4, -341, 391.5, -391, 235.6, -391, 229.9, -418, -67, -414.6, -67, -376.6, -317, -364.7, -317, 322.9, -415.2, 330.5, -418.8 )
polygon = PoolVector2Array( 358.8, -395.2, 355.1, -385, 328, -198.3, 328, -177, 335.7, -20.7, 369.5, 120.6, 456, 295.7, 456, 304.2, 446.4, 325, 438.3, 325, -279, 527.2, -279, 515.5, -341, 395.4, -341, 391.5, -391, 235.6, -391, 229.9, -418, -67, -414.6, -67, -376.6, -317, -364.7, -317, 322.9, -415.2, 330.5, -418.8 )
[node name="Sprite" type="Sprite" parent="Lab
notes
/Hitbox"]
[node name="Sprite" type="Sprite" parent="Lab
Note - Cabinet
/Hitbox"]
texture = ExtResource( 9 )
texture = ExtResource( 9 )
[node name="g" type="CollisionShape2D" parent="Lab
notes
"]
[node name="g" type="CollisionShape2D" parent="Lab
Note - Cabinet
"]
visible = false
visible = false
position = Vector2( -0.433167, 2.2196 )
position = Vector2( -0.433167, 2.2196 )
scale = Vector2( 5, 5 )
scale = Vector2( 5, 5 )
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment