Commit faac0458 authored by Julia Santos's avatar Julia Santos

Added sprites for opening/closing things, fixed some hitboxes, made it so that...

Added sprites for opening/closing things, fixed some hitboxes, made it so that the notebook can't be hidden during notepad puzzles
parent 66f2a6e8
source_md5="b032d8033f8d0f75e8973fde80317c0a"
dest_md5="c344c4ea363e66475d17862b95642088"
source_md5="063dba5bbaf8e5373947739614f30227"
dest_md5="0713f44e0222f498ded1f20cd3b51839"
source_md5="075ebb9613a5fe60020c3d856f993efe"
dest_md5="b750b11aaffb2b9062fb29a95cd219b8"
source_md5="a8fdeb8a60c4ac8eb07047bd37e247b3"
dest_md5="daa4cb51529e4ed3ddf24f87044cf6f2"
source_md5="4c4606f3ef0d8061c74d763e10612ca2"
dest_md5="0ca81c043aca448c965c14e30e990974"
source_md5="b71d199710442a4a50f0e7a34401ebfb"
dest_md5="9595e5ba6644ec8a2aa0c0219f774e4f"
source_md5="f6e739fa7b841caeeba39c5da2543e01"
dest_md5="de27f444e80c0a2ed82c51f1620e8832"
source_md5="0e43ccb3a6b92d8827edf22176d822f8"
dest_md5="b12d427c45c01aaf3ed84123c3e4aa9b"
source_md5="291b50b57a560671a8bd78211905ad66"
dest_md5="869b863459fb3b8ddcfd7222fdafdcea"
source_md5="8a370b1dcb85165978391e0dd37ca613"
dest_md5="e34367985c89b9eb9065a3c84533883c"
source_md5="d62f2825f9c939498876d39dd9245e82"
dest_md5="518fc5d90d0cd9063292e3e3390ade51"
source_md5="d4b7d079bed31e2dcab82bd4016bebc1"
dest_md5="0dd905de8978e189eec0cbd478b80bdf"
source_md5="0040f70dd7f260ee7834c1fbacc73013"
dest_md5="c2a805f47dae884e3ddc99909fc2b4af"
source_md5="3ed9ad01bc68551eb1b4344cfde16d40"
dest_md5="3c1ea0817d27e291e6bdce496a5325ef"
source_md5="1ad68cb7f2e814b8e1853864855ac641"
dest_md5="7be588bbed777e1a24d92990908cd144"
source_md5="e14666023a4b10f4527a74532e5b6f84"
dest_md5="011dded7462d6f54dbbd22c2c6ad398c"
source_md5="a2cc344ffa340820ba8a833560d3fb0b"
dest_md5="5100b941611068d31c0c312422b499b4"
source_md5="466a7c6191302451b1b69e5087e288e1"
dest_md5="e04fb8c2d72ced6ec3cd1ac3c12f28de"
source_md5="078dddf4aba305906a5ea2823dfbc86f"
dest_md5="44a8d90362ffab1bf3cba74843eb30d0"
source_md5="d4e9c4116d3ceadaea22077faf38f1cc"
dest_md5="5e5528505b7a4652f0ab8c6726214c29"
source_md5="2a62fa1db9cc2494fee5972b0465185a"
dest_md5="9c6873d85cdfa07d91fc386f2108542b"
......@@ -101,6 +101,8 @@ func _add_quest(questName): # adding a quest to the quest list
func _remove_quest(questName): # removing a quest from the quest list
quests.finishQuest(questName)
if questName == "Do something relaxing":
moxie.rect_position = Vector2(554.483, 451.976)
func _add_lab_note(): # when a new lab note is retrieved
labNotes = labNotes + 1
......@@ -147,6 +149,7 @@ func _balcony_outer_lock():
balcony.show()
movementHandle.setRoom(3)
movementHandle.disableMovement()
movementHandle.getRoomPosition("Balcony")
if !quests.hasQuest("Clean bathroom"):
inventory.remove_item_name("Plunger")
plungerUsed = true
......@@ -217,6 +220,7 @@ func _enter_notebook_laundry(): # trying to engage in the notebook puzzle for do
notepad_words.add_item("Turn on")
notepad_words.add_item("Put in")
notepad_words.add_item("Look")
notepad.get_node("CollisionPolygon2D").disabled = true
return "Alright, lets do this!"
else:
return "I still need to pick up all my clothes!"
......@@ -236,6 +240,7 @@ func _return_laundry_notepad(): # exiting laundry notebook puzzle
notepad.get_node("Quests").show()
notepad.get_node("Title").text = "To do (click to expand):"
notepad.get_node("Words").hide()
notepad.get_node("CollisionPolygon2D").disabled = false
movementHandle.checkRoom()
_start_cutscene_2()
......@@ -258,6 +263,7 @@ func _enter_notebook_plants(): # trying to engage in the notebook puzzle for doi
notepad_words.add_item("Pick up")
notepad_words.add_item("Put down")
notepad_words.add_item("Put in")
notepad.get_node("CollisionPolygon2D").disabled = true
return "Awww my babies are growing up so fast. Looks like they've outgrown their pots. Time for some big boy pants!"
func _plants_finished():
......@@ -270,6 +276,7 @@ func _plants_finished():
inventory.remove_item_name("Pot")
inventory.remove_item_name("Shovel")
inventory.remove_item_name("Tabo with water")
notepad.get_node("CollisionPolygon2D").disabled = false
func _return_plant_notepad(): # exiting laundry notebook puzzle
zoom_out()
......
[gd_scene load_steps=19 format=2]
[gd_scene load_steps=22 format=2]
[ext_resource path="res://assets/Placeholder BGs/laundry drawer open.png" type="Texture" id=1]
[ext_resource path="res://assets/Placeholder BGs/laundry all close.png" type="Texture" id=2]
[ext_resource path="res://assets/Thesis Clickables/soap drawer open.png" type="Texture" id=2]
[ext_resource path="res://assets/Thesis Clickables/soap.png" type="Texture" id=3]
[ext_resource path="res://Scripts/Dialogue control/Dialogue control - Laundry notepad.gd" type="Script" id=4]
[ext_resource path="res://Item - Notepad.gd" type="Script" id=5]
[ext_resource path="res://assets/Thesis Clickables/drawer.png" type="Texture" id=6]
[ext_resource path="res://assets/Thesis Clickables/soap drawer closed.png" type="Texture" id=6]
[ext_resource path="res://assets/Thesis Clickables/washing machine.png" type="Texture" id=7]
[ext_resource path="res://assets/Thesis Clickables/soap pour.png" type="Texture" id=8]
[ext_resource path="res://assets/Thesis Clickables/clothes pile.png" type="Texture" id=9]
[ext_resource path="res://Scripts/Movement scripts/Return_laundry_notepad.gd" type="Script" id=10]
[ext_resource path="res://assets/Thesis Clickables/return arrow.png" type="Texture" id=11]
[ext_resource path="res://assets/Backgrounds/laundry open.jpg" type="Texture" id=12]
[ext_resource path="res://assets/Thesis Clickables/machine door open.png" type="Texture" id=13]
[ext_resource path="res://assets/Thesis Clickables/machine door closed.png" type="Texture" id=14]
[sub_resource type="StreamTexture" id=1]
flags = 4
load_path = "res://.import/laundry door open.png-4b5301b83ad58821eec5d9f14596c644.stex"
[sub_resource type="RectangleShape2D" id=2]
extents = Vector2( 18.1476, 15.0675 )
[sub_resource type="CircleShape2D" id=8]
radius = 11.0581
[sub_resource type="RectangleShape2D" id=3]
extents = Vector2( 24.0534, 14.1028 )
[sub_resource type="RectangleShape2D" id=4]
extents = Vector2( 18.1476, 4.25272 )
extents = Vector2( 10.1238, 2.82562 )
[sub_resource type="RectangleShape2D" id=5]
extents = Vector2( 10.1799, 3.6851 )
extents = Vector2( 7.2196, 2.57398 )
[sub_resource type="RectangleShape2D" id=6]
extents = Vector2( 6.41233, 8.96647 )
......@@ -39,7 +42,7 @@ extents = Vector2( 15.414, 13.6335 )
[node name="laundry all closed" type="Sprite" parent="."]
position = Vector2( 512.384, 301.785 )
scale = Vector2( 0.998181, 0.99818 )
texture = ExtResource( 2 )
texture = ExtResource( 12 )
__meta__ = {
"_edit_lock_": true
}
......@@ -72,7 +75,7 @@ __meta__ = {
}
[node name="Washing machine door" type="StaticBody2D" parent="."]
position = Vector2( 434.376, 404.681 )
position = Vector2( 434.971, 410.032 )
scale = Vector2( 0.829244, 0.829244 )
input_pickable = true
script = ExtResource( 5 )
......@@ -82,15 +85,20 @@ __meta__ = {
interactable = true
[node name="Hitbox" type="CollisionShape2D" parent="Washing machine door"]
position = Vector2( 1.07745, 4.57318 )
position = Vector2( -1.07367, 6.00726 )
scale = Vector2( 5, 5 )
shape = SubResource( 2 )
shape = SubResource( 8 )
[node name="Sprite" type="Sprite" parent="Washing machine door/Hitbox"]
position = Vector2( 15.6905, -20.7761 )
scale = Vector2( 0.200696, 0.200696 )
texture = ExtResource( 14 )
[node name="Sprite2" type="Sprite" parent="Washing machine door/Hitbox"]
visible = false
position = Vector2( -9.19508, -2.97264 )
position = Vector2( 15.6905, -20.7761 )
scale = Vector2( 0.200696, 0.200696 )
texture = ExtResource( 7 )
texture = ExtResource( 13 )
[node name="Label" type="Label" parent="Washing machine door"]
visible = false
......@@ -106,7 +114,7 @@ __meta__ = {
}
[node name="Clothes" type="StaticBody2D" parent="."]
position = Vector2( 252.376, 456.681 )
position = Vector2( 342.886, 503.35 )
scale = Vector2( 0.829244, 0.829244 )
input_pickable = true
script = ExtResource( 5 )
......@@ -115,15 +123,12 @@ __meta__ = {
}
interactable = true
[node name="Hitbox" type="CollisionShape2D" parent="Clothes"]
[node name="h" type="CollisionShape2D" parent="Clothes"]
visible = false
position = Vector2( 1.07745, 4.57318 )
scale = Vector2( 5, 5 )
shape = SubResource( 3 )
[node name="Sprite" type="Sprite" parent="Clothes/Hitbox"]
position = Vector2( -0.830688, -5.5271 )
scale = Vector2( 0.051844, 0.051844 )
texture = ExtResource( 9 )
disabled = true
[node name="Label" type="Label" parent="Clothes"]
visible = false
......@@ -138,6 +143,14 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="Hitbox" type="CollisionPolygon2D" parent="Clothes"]
position = Vector2( -3.07602, -23.0623 )
scale = Vector2( 0.25922, 0.25922 )
polygon = PoolVector2Array( 130, -112.6, 130, -108.8, 346, -26.9, 346, -22.7, 409.6, 51, 478, 96.7, 478, 103.3, 488.6, 176, 484.2, 176, 473.8, 226.9, 494.6, 259.6, 488.9, 270, 486.7, 270, 472.7, 287, 464.6, 287, 394.4, 299.4, 390.1, 345, 382.9, 345, 350.9, 365, 340.1, 365, 244.7, 328.1, 252.7, 339.1, 247.1, 350, 244.6, 350, 192.6, 410, 176.9, 410, 120, 397, 120, 390.7, 106, 367.8, 106, 362, 95.8, 371, 66.8, 371, 17, 358.9, 17, 353, -6.5, 317, -12, 317, -62.3, 306.6, -95.8, 341, -99.9, 341, -178.8, 377, -182.4, 377, -303, 368.3, -303, 362.6, -326.7, 342, -336, 342, -385, 332.2, -385, 323, -388, 298.3, -433, 286.8, -433, 280.9, -468, 225.9, -468, 206.8, -415, 94.8, -415, 92.7, -410.4, 22, -404.5, 22, -370.5, -17, -367.1, -17, -220, -120.2, -220, -126.4 )
[node name="Sprite" type="Sprite" parent="Clothes/Hitbox"]
texture = ExtResource( 9 )
[node name="Buttons" type="StaticBody2D" parent="."]
position = Vector2( 433.485, 338.882 )
scale = Vector2( 0.829244, 0.829244 )
......@@ -147,9 +160,10 @@ __meta__ = {
"_edit_group_": true
}
interactable = true
flavorText = "The control panel. It's still off!"
[node name="Hitbox" type="CollisionShape2D" parent="Buttons"]
position = Vector2( 1.07745, 0.955444 )
position = Vector2( -33.3405, -1.19568 )
scale = Vector2( 5, 5 )
shape = SubResource( 4 )
......@@ -177,22 +191,24 @@ position = Vector2( 465.504, 296.38 )
scale = Vector2( 0.829244, 0.829244 )
input_pickable = true
script = ExtResource( 5 )
__meta__ = {
"_edit_group_": true
}
interactable = true
[node name="Hitbox" type="CollisionShape2D" parent="Drawer"]
position = Vector2( -2.33716, 0.955444 )
position = Vector2( -1.13123, 5.17615 )
scale = Vector2( 5, 5 )
shape = SubResource( 5 )
[node name="Sprite" type="Sprite" parent="Drawer/Hitbox"]
visible = false
position = Vector2( -14.4847, -7.3775 )
position = Vector2( 8.61483, 0.148811 )
scale = Vector2( 0.199722, 0.199722 )
texture = ExtResource( 6 )
[node name="Sprite2" type="Sprite" parent="Drawer/Hitbox"]
visible = false
position = Vector2( 8.61483, 0.148811 )
scale = Vector2( 0.199722, 0.199722 )
texture = ExtResource( 2 )
[node name="Label" type="Label" parent="Drawer"]
visible = false
margin_left = -74.0
......@@ -207,8 +223,8 @@ __meta__ = {
}
[node name="Soap" type="StaticBody2D" parent="."]
position = Vector2( 403.675, 269.369 )
scale = Vector2( 0.829244, 0.829244 )
position = Vector2( 405.991, 268.913 )
scale = Vector2( 0.7, 0.7 )
input_pickable = true
script = ExtResource( 5 )
__meta__ = {
......@@ -216,21 +232,12 @@ __meta__ = {
}
interactable = true
[node name="Hitbox" type="CollisionShape2D" parent="Soap"]
[node name="h" type="CollisionShape2D" parent="Soap"]
visible = false
position = Vector2( 2.21564, -2.45926 )
scale = Vector2( 5, 5 )
shape = SubResource( 6 )
[node name="Sprite" type="Sprite" parent="Soap/Hitbox"]
position = Vector2( -1.2373, 0.66748 )
scale = Vector2( 0.0213467, 0.0213467 )
texture = ExtResource( 3 )
[node name="Sprite2" type="Sprite" parent="Soap/Hitbox"]
visible = false
position = Vector2( 7.78718, 0.237717 )
scale = Vector2( 0.0226359, 0.0226359 )
texture = ExtResource( 8 )
disabled = true
[node name="Label" type="Label" parent="Soap"]
visible = false
......@@ -245,6 +252,20 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="Hitbox" type="CollisionPolygon2D" parent="Soap"]
position = Vector2( -3.97083, 0.878113 )
scale = Vector2( 0.106733, 0.106733 )
polygon = PoolVector2Array( 278, -462.1, 362, -344.2, 362, -339, 370.1, 410, 359, 410, -268, 416, -268, 404, -270, -347, -264.4, -347, -189, -462.1, -189, -470, 278, -470 )
[node name="Sprite" type="Sprite" parent="Soap/Hitbox"]
texture = ExtResource( 3 )
[node name="Sprite2" type="Sprite" parent="Soap/Hitbox"]
visible = false
position = Vector2( 422.757, -20.1326 )
scale = Vector2( 1.06039, 1.06039 )
texture = ExtResource( 8 )
[node name="Return" type="StaticBody2D" parent="."]
position = Vector2( 95.853, 523.599 )
scale = Vector2( 0.829244, 0.829244 )
......@@ -255,15 +276,12 @@ __meta__ = {
}
interactable = true
[node name="Hitbox" type="CollisionShape2D" parent="Return"]
[node name="h" type="CollisionShape2D" parent="Return"]
visible = false
position = Vector2( -2.89487, 2.65125 )
scale = Vector2( 5, 5 )
shape = SubResource( 7 )
[node name="Sprite" type="Sprite" parent="Return/Hitbox"]
position = Vector2( -1.10974, 0.0285645 )
scale = Vector2( 0.0338674, 0.0338674 )
texture = ExtResource( 11 )
disabled = true
[node name="Label" type="Label" parent="Return"]
visible = false
......@@ -278,6 +296,14 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="Hitbox" type="CollisionPolygon2D" parent="Return"]
position = Vector2( -8.44357, 2.79407 )
scale = Vector2( 0.169337, 0.169337 )
polygon = PoolVector2Array( -78, -408.7, -78, -172, 454.4, -172, 470, -164.2, 470, -156, 472, 162, 461.2, 162, -78, 171.8, -78, 411.4, -118, 423.4, -118, 411.6, -448.7, 0.399994, -443.3, -11, -440.7, -11, -110, -416.5, -110, -420.4, -98.5, -425.8 )
[node name="Sprite" type="Sprite" parent="Return/Hitbox"]
texture = ExtResource( 11 )
[node name="Dialogue control" type="Control" parent="."]
margin_right = 40.0
margin_bottom = 40.0
......@@ -285,3 +311,6 @@ script = ExtResource( 4 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Timer" type="Timer" parent="."]
one_shot = true
......@@ -126,7 +126,7 @@ polygon = PoolVector2Array( 146, -573, 146, -565.3, 137, -502.4, 195.6, -561.8,
texture = ExtResource( 8 )
[node name="Door to living room" type="StaticBody2D" parent="."]
position = Vector2( 146.173, 286.373 )
position = Vector2( 642.065, 449.125 )
scale = Vector2( 0.829244, 0.829244 )
input_pickable = true
script = ExtResource( 6 )
......@@ -136,15 +136,23 @@ __meta__ = {
interactable = true
flavorText = "Clicked"
[node name="Hitbox" type="CollisionShape2D" parent="Door to living room"]
[node name="h" type="CollisionShape2D" parent="Door to living room"]
visible = false
position = Vector2( -36.0011, -20.0035 )
scale = Vector2( 5, 5 )
shape = SubResource( 4 )
disabled = true
[node name="Hitbox" type="CollisionPolygon2D" parent="Door to living room"]
position = Vector2( -198.468, -174.117 )
scale = Vector2( -1.11961, 1.13547 )
polygon = PoolVector2Array( 512, -222.5, 512, -150, 512, -4.89999, 512, 84, 512, 201.3, 512, 295, 508, 295, 266, 134.4, 266, 125, 265, -280, 271.2, -280, 278, -288.4, 278, -299.8 )
[node name="Sprite" type="Sprite" parent="Door to living room/Hitbox"]
visible = false
position = Vector2( 0.574005, 0.358818 )
scale = Vector2( 0.343423, 0.403654 )
position = Vector2( -147.674, 137.307 )
rotation = 3.14159
scale = Vector2( 1.53367, -1.77748 )
texture = SubResource( 5 )
[node name="Pot" type="StaticBody2D" parent="."]
......
[gd_scene load_steps=20 format=2]
[gd_scene load_steps=21 format=2]
[ext_resource path="res://assets/Backgrounds/kitchen.jpg" type="Texture" id=1]
[ext_resource path="res://assets/placeholder item.png" type="Texture" id=2]
......@@ -10,6 +10,8 @@
[ext_resource path="res://Scripts/Movement scripts/Cabinet.gd" type="Script" id=8]
[ext_resource path="res://assets/Thesis Clickables/granola.png" type="Texture" id=9]
[ext_resource path="res://Scripts/Kitchen Sink.gd" type="Script" id=10]
[ext_resource path="res://assets/Thesis Clickables/kitchen cabinet closed.png" type="Texture" id=11]
[ext_resource path="res://assets/Thesis Clickables/kitchen cabinet open.png" type="Texture" id=12]
[sub_resource type="RectangleShape2D" id=1]
......@@ -20,30 +22,26 @@ extents = Vector2( 27.3341, 38.3652 )
flags = 4
load_path = "res://.import/placeholder item.png-cd6e4c1231156687d87915032ec4361d.stex"
[sub_resource type="RectangleShape2D" id=10]
[sub_resource type="RectangleShape2D" id=4]
extents = Vector2( 13.7101, 7.33546 )
[sub_resource type="StreamTexture" id=11]
[sub_resource type="StreamTexture" id=5]
flags = 4
load_path = "res://.import/placeholder item.png-cd6e4c1231156687d87915032ec4361d.stex"
[sub_resource type="RectangleShape2D" id=12]
extents = Vector2( 24.763, 17.5829 )
[sub_resource type="RectangleShape2D" id=6]
extents = Vector2( 62.7102, 48.4286 )
[sub_resource type="StreamTexture" id=13]
flags = 4
load_path = "res://.import/placeholder item.png-cd6e4c1231156687d87915032ec4361d.stex"
[sub_resource type="RectangleShape2D" id=8]
[sub_resource type="RectangleShape2D" id=7]
extents = Vector2( 15.4169, 13.9691 )
[sub_resource type="RectangleShape2D" id=9]
[sub_resource type="RectangleShape2D" id=8]
extents = Vector2( 9.26066, 9.03523 )
[node name="Node2D" type="Node2D"]
[node name="BG" type="Sprite" parent="."]
position = Vector2( 510.711, 298.398 )
position = Vector2( 511.46, 298.398 )
scale = Vector2( 1.00091, 1.00091 )
texture = ExtResource( 1 )
......@@ -116,35 +114,37 @@ flavorText = "Not covered in dishes, for once."
[node name="Hitbox" type="CollisionShape2D" parent="Sink"]
position = Vector2( 31.7679, -0.411346 )
scale = Vector2( 5, 5 )
shape = SubResource( 10 )
shape = SubResource( 4 )
[node name="Sprite" type="Sprite" parent="Sink/Hitbox"]
visible = false
position = Vector2( -0.158181, -0.0184715 )
scale = Vector2( 0.101337, 0.101337 )
texture = SubResource( 11 )
texture = SubResource( 5 )
[node name="Cabinet" type="StaticBody2D" parent="."]
position = Vector2( 119.154, 171.637 )
scale = Vector2( 0.829244, 0.829244 )
scale = Vector2( 0.3, 0.3 )
input_pickable = true
script = ExtResource( 8 )
__meta__ = {
"_edit_group_": true
}
interactable = true
flavorText = "This cabinet is horribly jammed. I'll have to deal with it eventually since Banana's food is in there but.. I'll do that later."
[node name="Hitbox" type="CollisionShape2D" parent="Cabinet"]
position = Vector2( 7.28166, -20.2055 )
position = Vector2( 22.2647, -55.1662 )
scale = Vector2( 5, 5 )
shape = SubResource( 12 )
shape = SubResource( 6 )
[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"]
visible = false
position = Vector2( -0.158181, -0.0184715 )
scale = Vector2( 0.101337, 0.101337 )
texture = SubResource( 13 )
position = Vector2( 253.454, 93.9508 )
scale = Vector2( 0.657054, 0.657054 )
texture = ExtResource( 12 )
[node name="Stool" type="StaticBody2D" parent="."]
visible = false
......@@ -160,7 +160,7 @@ flavorText = "A sturdy stool."
[node name="Hitbox" type="CollisionShape2D" parent="Stool"]
position = Vector2( 1.25211, 0.295086 )
scale = Vector2( 5, 5 )
shape = SubResource( 8 )
shape = SubResource( 7 )
[node name="Sprite" type="Sprite" parent="Stool/Hitbox"]
visible = false
......@@ -193,7 +193,7 @@ flavorText = "Crunchy. But not as filling. And very hard to open."
visible = false
position = Vector2( -0.433167, 2.2196 )
scale = Vector2( 5, 5 )
shape = SubResource( 9 )
shape = SubResource( 8 )
disabled = true
[node name="Hitbox" type="CollisionPolygon2D" parent="Granola bar"]
......
......@@ -117,19 +117,21 @@ position = Vector2( 642.322, 475.158 )
scale = Vector2( 0.829244, 0.829244 )
input_pickable = true
script = ExtResource( 2 )
__meta__ = {
"_edit_group_": true
}
retrievable = true
flavorText = "A sturdy stool."
[node name="Hitbox" type="CollisionShape2D" parent="Stool"]
position = Vector2( 1.25211, 0.295086 )
scale = Vector2( 5, 5 )
shape = SubResource( 4 )
[node name="Hitbox" type="CollisionPolygon2D" parent="Stool"]
position = Vector2( -165.093, -213.414 )
scale = Vector2( 1.18393, 1.18393 )
polygon = PoolVector2Array( 211, 129.1, 211, 137.5, 215.3, 166, 207.1, 166, 195.7, 172.3, 220.3, 242, 210.5, 242, 196.5, 251.3, 188, 246.8, 188, 245.3, 176, 237.3, 176, 233.1, 157.6, 198.6, 151, 250, 137.5, 250, 120, 231.1, 120, 221, 119.1, 200.3, 98.6, 236, 94.4, 236, 62, 248.7, 62, 233.4, 88.2, 172.6, 64, 162.3, 64, 154, 62.4, 131, 70.7, 131, 110, 119, 110, 114.8 )
[node name="Sprite" type="Sprite" parent="Stool/Hitbox"]
visible = false
position = Vector2( -0.158181, -0.0184715 )
scale = Vector2( 0.101337, 0.101337 )
position = Vector2( 135.963, 186.269 )
texture = ExtResource( 3 )
[node name="g" type="CollisionShape2D" parent="Stool"]
visible = false
position = Vector2( 1.25211, 0.295086 )
scale = Vector2( 5, 5 )
shape = SubResource( 4 )
disabled = true
......@@ -22,14 +22,15 @@ extents = Vector2( 19.9646, 20.1882 )
[sub_resource type="RectangleShape2D" id=4]
extents = Vector2( 19.9646, 20.1882 )
[sub_resource type="RectangleShape2D" id=5]
extents = Vector2( 15.414, 13.6335 )
[sub_resource type="StreamTexture" id=6]
flags = 4
load_path = "res://.import/return arrow.png-ba7c2fea6c5a220a249845f29bbe9177.stex"
[sub_resource type="RectangleShape2D" id=5]
extents = Vector2( 15.414, 13.6335 )
[node name="Node2D" type="Node2D"]
position = Vector2( 38.699, 16.0459 )
[node name="BG" type="Sprite" parent="."]
......@@ -56,7 +57,6 @@ __meta__ = {
"_edit_group_": true
}
interactable = true
flavorText = "Click pot"
[node name="Hitbox" type="CollisionPolygon2D" parent="Pot"]
position = Vector2( -18.9859, 1.3479 )
......@@ -81,7 +81,6 @@ __meta__ = {
"_edit_group_": true
}
interactable = true
flavorText = "Click plant"
[node name="Hitbox" type="CollisionPolygon2D" parent="Plant"]
position = Vector2( -18.9857, 3.2625 )
......@@ -99,12 +98,11 @@ shape = SubResource( 2 )
disabled = true
[node name="Soil" type="StaticBody2D" parent="."]
position = Vector2( 655.488, 194.312 )
position = Vector2( 602.631, 171.659 )
scale = Vector2( 0.6, 0.6 )
input_pickable = true
script = ExtResource( 1 )
interactable = true
flavorText = "Click soil"
[node name="g" type="CollisionShape2D" parent="Soil"]
visible = false
......@@ -127,12 +125,11 @@ position = Vector2( -1280.71, 599.626 )
texture = ExtResource( 9 )
[node name="Water" type="StaticBody2D" parent="."]
position = Vector2( 778.953, 232.029 )
position = Vector2( 726.096, 209.376 )
scale = Vector2( 0.6, 0.6 )
input_pickable = true
script = ExtResource( 1 )
interactable = true
flavorText = "Click water"
[node name="g" type="CollisionShape2D" parent="Water"]
visible = false
......@@ -155,7 +152,7 @@ position = Vector2( -1649.91, -578.146 )
texture = ExtResource( 8 )
[node name="Return" type="StaticBody2D" parent="."]
position = Vector2( 95.853, 523.599 )
position = Vector2( 77.1652, 488.893 )
scale = Vector2( 0.829244, 0.829244 )
input_pickable = true
script = ExtResource( 3 )
......@@ -164,16 +161,23 @@ __meta__ = {
}
interactable = true
[node name="Hitbox" type="CollisionShape2D" parent="Return"]
position = Vector2( -2.89487, 2.65125 )
scale = Vector2( 5, 5 )
shape = SubResource( 5 )
[node name="Hitbox" type="CollisionPolygon2D" parent="Return"]
position = Vector2( -8.44357, 2.79407 )
scale = Vector2( 0.169337, 0.169337 )
polygon = PoolVector2Array( -79, -408.7, -79, -171, 454.9, -171, 470, -161.5, 470, -152, 471, 162, 460.2, 162, -79, 170.8, -79, 412.1, -118, 420.3, -118, 409.6, -447.7, 0.399994, -442.3, -11, -439.8, -11, -110, -415.6, -110, -419.3, -98.6, -424.7 )
[node name="Sprite" type="Sprite" parent="Return/Hitbox"]
position = Vector2( -1.10974, 0.0285645 )
scale = Vector2( 0.0338674, 0.0338674 )
position = Vector2( -6.10352e-05, 0 )
scale = Vector2( 1, 1 )
texture = SubResource( 6 )
[node name="h" type="CollisionShape2D" parent="Return"]
visible = false
position = Vector2( -2.89487, 2.65125 )
scale = Vector2( 5, 5 )
shape = SubResource( 5 )
disabled = true
[node name="Label" type="Label" parent="Return"]
visible = false
margin_left = -74.0
......
[gd_scene load_steps=18 format=2]
[gd_scene load_steps=20 format=2]
[ext_resource path="res://Scripts/Dialogue control/Dialogue Contro - Living room.gd" type="Script" id=1]
[ext_resource path="res://assets/Thesis Clickables/yoga mat.png" type="Texture" id=2]
[ext_resource path="res://assets/Thesis Clickables/Balcony door.png" type="Texture" id=3]
[ext_resource path="res://assets/Thesis Clickables/balcony door closed.png" type="Texture" id=3]
[ext_resource path="res://assets/Thesis Clickables/potted plant (og).png" type="Texture" id=4]
[ext_resource path="res://Scripts/Yoga mat.gd" type="Script" id=5]
[ext_resource path="res://assets/Thesis Clickables/lab note 1.png" type="Texture" id=6]
......@@ -12,9 +12,10 @@
[ext_resource path="res://Lab Note.gd" type="Script" id=10]
[ext_resource path="res://Scripts/Plants.gd" type="Script" id=11]
[ext_resource path="res://assets/Backgrounds/living room.jpg" type="Texture" id=12]
[ext_resource path="res://assets/Thesis Clickables/balcony door open.png" type="Texture" id=13]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 38.7144, 50.0827 )
extents = Vector2( 31.6102, 50.0827 )
[sub_resource type="RectangleShape2D" id=2]
extents = Vector2( 22.9422, 35.1795 )
......@@ -22,6 +23,10 @@ extents = Vector2( 22.9422, 35.1795 )
[sub_resource type="RectangleShape2D" id=3]
extents = Vector2( 13.704, 29.6463 )
[sub_resource type="StreamTexture" id=6]
flags = 4
load_path = "res://.import/yoga mat (floor).png-a7d2841e8097154bcf5ea4a913bbc11c.stex"
[sub_resource type="RectangleShape2D" id=4]
extents = Vector2( 20.5876, 32.5145 )
......@@ -46,24 +51,31 @@ __meta__ = {
}
[node name="Balcony door" type="StaticBody2D" parent="."]
position = Vector2( 789.903, 429.13 )
scale = Vector2( 0.829244, 0.829244 )
position = Vector2( 779.812, 412.312 )
input_pickable = true
script = ExtResource( 8 )
interactable = true
flavorText = "BANANA?? How did you even get out there?"
[node name="Hitbox" type="CollisionShape2D" parent="Balcony door"]
position = Vector2( 205.173, -242.232 )
scale = Vector2( 5, 5 )
shape = SubResource( 1 )
[node name="Hitbox" type="CollisionPolygon2D" parent="Balcony door"]
position = Vector2( -268.574, -109.981 )
scale = Vector2( 1.00448, 1.00448 )
polygon = PoolVector2Array( 512, -222.5, 512, -150, 512, -4.89999, 512, 84, 512, 201.3, 512, 295, 508, 295, 266, 134.4, 266, 125, 265, -280, 271.2, -280, 278, -288.4, 278, -299.8 )
[node name="Sprite" type="Sprite" parent="Balcony door/Hitbox"]
visible = false
position = Vector2( 0.574005, 0.358818 )
scale = Vector2( 0.343423, 0.403654 )
texture = ExtResource( 3 )
[node name="Sprite2" type="Sprite" parent="Balcony door/Hitbox"]
visible = false
texture = ExtResource( 13 )
[node name="h" type="CollisionShape2D" parent="Balcony door"]
visible = false
position = Vector2( 205.173, -242.232 )
scale = Vector2( 5, 5 )
shape = SubResource( 1 )
disabled = true
[node name="Front door" type="StaticBody2D" parent="."]
position = Vector2( 178.938, 291.028 )
scale = Vector2( 0.829244, 0.829244 )
......@@ -110,6 +122,23 @@ polygon = PoolVector2Array( 116, -578.8, 116, -573.6, 171, -526.6, 171, -516, 17
[node name="Sprite" type="Sprite" parent="Yoga mat/Hitbox"]
texture = ExtResource( 2 )
[node name="Yoga mat2" type="StaticBody2D" parent="."]
visible = false
position = Vector2( 608.445, 621.436 )
scale = Vector2( 0.829244, 0.829244 )
input_pickable = true
script = ExtResource( 5 )
interactable = true
flavorText = "Aaaah. That felt good. So peaceful..."
[node name="Hitbox" type="CollisionPolygon2D" parent="Yoga mat2"]
position = Vector2( -114.134, -136.255 )
scale = Vector2( 0.650718, 0.43609 )
polygon = PoolVector2Array( 236, -61.2, 600, 195.4, 600, 234, 596.1, 234, -254, 244.1, -254, 238, -589, -16, -589, -67, 236, -67 )
[node name="Sprite" type="Sprite" parent="Yoga mat2/Hitbox"]
texture = SubResource( 6 )
[node name="Plants" type="StaticBody2D" parent="."]
position = Vector2( 666.708, 363.902 )
scale = Vector2( 0.829244, 0.829244 )
......
......@@ -63,12 +63,14 @@ scale = Vector2( 0.829244, 0.829244 )
input_pickable = true
script = ExtResource( 4 )
interactable = true
flavorText = "I can see Banana from here. So near yet so far."
flavorText = "I can see Banana from here, but she's on the inner side of the balcony! So near yet so far."
[node name="h" type="CollisionShape2D" parent="Nana from afar"]
visible = false
position = Vector2( -16.8367, -2.11676 )
scale = Vector2( 5, 5 )
shape = SubResource( 2 )
disabled = true
[node name="Hitbox" type="CollisionPolygon2D" parent="Nana from afar"]
position = Vector2( 15.5351, 43.8314 )
......@@ -81,7 +83,7 @@ rotation = -2.98023e-08
texture = ExtResource( 1 )
[node name="Balcony to neighbor\'s room" type="StaticBody2D" parent="."]
position = Vector2( 855.473, 292.303 )
position = Vector2( 729.757, 415.774 )
input_pickable = true
script = ExtResource( 5 )
__meta__ = {
......@@ -89,13 +91,20 @@ __meta__ = {
}
interactable = true
[node name="Hitbox" type="CollisionShape2D" parent="Balcony to neighbor\'s room"]
[node name="h" type="CollisionShape2D" parent="Balcony to neighbor\'s room"]
visible = false
position = Vector2( -0.433167, 2.2196 )
scale = Vector2( 5, 5 )
shape = SubResource( 3 )
disabled = true
[node name="Hitbox" type="CollisionPolygon2D" parent="Balcony to neighbor\'s room"]
position = Vector2( -268.574, -109.981 )
scale = Vector2( 1.00448, 1.00448 )
polygon = PoolVector2Array( 512, -222.5, 512, -150, 512, -4.89999, 512, 84, 512, 201.3, 512, 295, 508, 295, 266, 134.4, 266, 125, 265, -280, 271.2, -280, 278, -288.4, 278, -299.8 )
[node name="Sprite" type="Sprite" parent="Balcony to neighbor\'s room/Hitbox"]
visible = false
position = Vector2( 0.304169, 0.207489 )
scale = Vector2( 0.231109, 0.325438 )
position = Vector2( 268.459, 112.733 )
scale = Vector2( 1.15039, 1.61993 )
texture = SubResource( 4 )
......@@ -23,7 +23,7 @@ extents = Vector2( 512.15, 301.549 )
extents = Vector2( 14.2862, 14.7497 )
[sub_resource type="RectangleShape2D" id=3]
extents = Vector2( 15.9468, 11.0641 )
extents = Vector2( 15.9468, 9.38631 )
[sub_resource type="RectangleShape2D" id=4]
extents = Vector2( 15.155, 12.9997 )
......@@ -43,12 +43,12 @@ extents = Vector2( 16.2181, 10.3281 )
[sub_resource type="RectangleShape2D" id=9]
[sub_resource type="RectangleShape2D" id=10]
[sub_resource type="StreamTexture" id=11]
flags = 4
load_path = "res://.import/trail 3.png-9960f4c5b964f5aca36ca6c97e309a5d.stex"
[sub_resource type="RectangleShape2D" id=10]
[sub_resource type="RectangleShape2D" id=12]
extents = Vector2( 13.7803, 7.3572 )
......@@ -143,14 +143,19 @@ __meta__ = {
}
interactable = true
[node name="Hitbox" type="CollisionShape2D" parent="Laptop"]
[node name="h" type="CollisionShape2D" parent="Laptop"]
visible = false
position = Vector2( -16.4264, -2.27527 )
scale = Vector2( 5, 5 )
shape = SubResource( 4 )
disabled = true
[node name="Hitbox" type="CollisionPolygon2D" parent="Laptop"]
position = Vector2( -15.7129, -0.861694 )
scale = Vector2( 0.15, 0.15 )
polygon = PoolVector2Array( 131, -452.3, 131, -444, 135.8, 4.89999, 161, -6.60001, 161, 10, 161.6, 22.9, 175.4, 27, 195.4, 27, 500, 49.4, 500, 141.3, 272.6, 332, 270.1, 332, 100, 446, 94.9, 446, -89, 441.8, -89, 439.8, -463, 391.8, -463, 384.6, -498, 321.6, -498, 316, -500, 303.4, -500, -210.4, -498.2, -233, -492.8, -233, -453.8, -282, -448.7, -282, 93, -466.5, 102.7, -471.7 )
[node name="Sprite" type="Sprite" parent="Laptop/Hitbox"]
position = Vector2( 0.1427, 0.282715 )
scale = Vector2( 0.03, 0.03 )
texture = ExtResource( 1 )
[node name="Cellphone" type="StaticBody2D" parent="."]
......@@ -163,18 +168,24 @@ __meta__ = {
retrievable = true
flavorText = "I would've called it to find it but I always put it on silent. And I only have one phone. Oh hey, an upload notif from that yoga dude."
[node name="Hitbox" type="CollisionShape2D" parent="Cellphone"]
position = Vector2( 0.842377, -0.977234 )
scale = Vector2( 5, 5 )
shape = SubResource( 5 )
[node name="Hitbox" type="CollisionPolygon2D" parent="Cellphone"]
position = Vector2( 1.66864, -2.80707 )
scale = Vector2( 0.15, 0.15 )
polygon = PoolVector2Array( 164, -59.3, 164, -55.8, 182, -48.8, 182, -41.7, 196.2, -2, 186.8, -2, 173.8, 21, 168.9, 21, 90.9, 70, 85.5, 70, 9.10001, 80, -8, 112, -18.5, 112, -171, 98.1, -171, 92.8, -200, 69.8, -200, 60.1, -193.3, 24, -187.4, 24, -94.5, -50, -91, -50, -47, -69.4, -47, -74.8 )
[node name="Sprite" type="Sprite" parent="Cellphone/Hitbox"]
position = Vector2( 0.165253, -0.365967 )
scale = Vector2( 0.03, 0.03 )
scale = Vector2( 1, 1 )
texture = ExtResource( 8 )
[node name="h" type="CollisionShape2D" parent="Cellphone"]
visible = false
position = Vector2( 0.842377, -0.977234 )
scale = Vector2( 5, 5 )
shape = SubResource( 5 )
disabled = true
[node name="Bathroom door" type="StaticBody2D" parent="."]
position = Vector2( 587.187, 225.932 )
position = Vector2( 593.794, 230.651 )
scale = Vector2( 0.9, 0.9 )
z_index = -1
input_pickable = true
......@@ -209,16 +220,24 @@ __meta__ = {
retrievable = true
flavorText = "A deconstructed pile of clothes."
[node name="Hitbox" type="CollisionShape2D" parent="Pants"]
[node name="Hitbox" type="CollisionPolygon2D" parent="Pants"]
position = Vector2( -13.8438, 14.8492 )
rotation = -2.70876
scale = Vector2( 0.197539, 0.197539 )
polygon = PoolVector2Array( -52.1, -155, -51.3, -155, 394, -168.3, 394, -156.6, 377.4, 59.1, 404.6, 238, 394.7, 238, 361.7, 257, 352.4, 257, -49.4, 307, -210.7, 351, -218.4, 351, -356, 359.6, -356, 350.6, -407, 260.6, -407, 255, -408.2, 197, -398.5, 197, -316.4, 155, -311.6, 155, 13.2, 57.6, -195.5, 78, -197.5, 78, -405, 59.1, -405, 50.8, -429, -12.2, -429, -15, -437.6, -163, -426.5, -163, -253, -171.5, -253, -174 )
[node name="Sprite" type="Sprite" parent="Pants/Hitbox"]
rotation = 2.98023e-08
scale = Vector2( 1, 1 )
texture = ExtResource( 6 )
[node name="h" type="CollisionShape2D" parent="Pants"]
visible = false
position = Vector2( -2.31012, 0.749359 )
rotation = 3.57443
scale = Vector2( 5, 5 )
shape = SubResource( 8 )
[node name="Sprite" type="Sprite" parent="Pants/Hitbox"]
position = Vector2( 0.911179, -3.52747 )
scale = Vector2( 0.0395079, 0.0395079 )
texture = ExtResource( 6 )
disabled = true
[node name="Shirt" type="StaticBody2D" parent="."]
position = Vector2( 252.087, 439.172 )
......@@ -230,16 +249,21 @@ __meta__ = {
retrievable = true
flavorText = "All over the ground! Where did these come from?"
[node name="Hitbox" type="CollisionShape2D" parent="Shirt"]
position = Vector2( -1.78223, 0.549072 )
scale = Vector2( 5, 5 )
shape = SubResource( 9 )
[node name="Hitbox" type="CollisionPolygon2D" parent="Shirt"]
position = Vector2( -3.16876, -0.136749 )
scale = Vector2( 0.098787, 0.098787 )
polygon = PoolVector2Array( -141.1, -369, -138.3, -369, 219, -246.1, 219, -239.9, 269.7, -117.4, 292, -97, 392, -67.5, 392, -59, 399.2, 4, 396.5, 4, 391.5, 101, 388.3, 101, 346.3, 234, 344.6, 234, 289.7, 367, 287.2, 367, 212.2, 475, 204.7, 475, 66, 467.5, 66, 464.7, -38, 436.7, -38, 421.8, 71.8, 265.1, -78.1, 323, -85, 323, -196, 346, -225.8, 346, -264, 332, -264, 328, -304, 286, -304, 282.2, -351, 179.2, -351, 174.3, -395, 17.4, -395, 8.79999, -401.8, -77, -391.2, -77, -152.6, -142.6, -398, -204.2, -398, -216.1, -322.6, -391, -319.5, -391, -276, -440.7, -276, -443.9, -265.6, -449.6 )
[node name="Sprite" type="Sprite" parent="Shirt/Hitbox"]
position = Vector2( -0.277301, -0.137165 )
scale = Vector2( 0.0197574, 0.0197574 )
texture = ExtResource( 5 )
[node name="h" type="CollisionShape2D" parent="Shirt"]
visible = false
position = Vector2( -1.78223, 0.549072 )
scale = Vector2( 5, 5 )
shape = SubResource( 9 )
disabled = true
[node name="Sando" type="StaticBody2D" parent="."]
position = Vector2( 382.518, 428.547 )
rotation = -3.0456
......@@ -252,16 +276,22 @@ __meta__ = {
retrievable = true
flavorText = "Oops, must have taken this one out of the basket sometime last night."
[node name="Hitbox" type="CollisionShape2D" parent="Sando"]
position = Vector2( -3.5491, 1.06189 )
scale = Vector2( 5, 5 )
shape = SubResource( 10 )
[node name="Hitbox" type="CollisionPolygon2D" parent="Sando"]
position = Vector2( -4.93555, 0.376038 )
scale = Vector2( 0.098787, 0.098787 )
polygon = PoolVector2Array( -244.8, -244, -236.5, -244, -53.2, -227, 119, -232.7, 358, -264.4, 358, -254.4, 381, -207.3, 381, -201, 389.2, -127, 377.2, -127, 263.4, -114.6, 211.1, -87, 180, -29.4, 180, -27.8, 177.2, 29.2, 189.6, 63.6, 246.3, 92, 247.3, 92, 427, 66.5, 427, 78.3, 443.5, 198, 432.6, 198, 183.7, 285, 177.9, 285, -202, 360, -203.2, 360, -333, 370.9, -333, 361.2, -381, 257.2, -381, 252.3, -441, -16.9, -441, -20.1, -436.8, -214, -433.7, -214, -420.7, -262, -414.6, -262, -395, -272.9, -395, -280.7 )
[node name="Sprite" type="Sprite" parent="Sando/Hitbox"]
position = Vector2( -0.277301, -0.137165 )
scale = Vector2( 0.0197574, 0.0197574 )
rotation = -7.45058e-09
texture = SubResource( 11 )
[node name="h" type="CollisionShape2D" parent="Sando"]
visible = false
position = Vector2( -3.5491, 1.06189 )
scale = Vector2( 5, 5 )
shape = SubResource( 10 )
disabled = true
[node name="Towel" type="StaticBody2D" parent="."]
position = Vector2( -39.9188, 486.144 )
rotation = 2.74191
......@@ -273,12 +303,18 @@ __meta__ = {
retrievable = true
flavorText = "Goodness, what was I doing last night?"
[node name="Hitbox" type="CollisionShape2D" parent="Towel"]
[node name="h" type="CollisionShape2D" parent="Towel"]
visible = false
position = Vector2( -3.5491, 1.06189 )
scale = Vector2( 5, 5 )
shape = SubResource( 12 )
disabled = true
[node name="Hitbox" type="CollisionPolygon2D" parent="Towel"]
position = Vector2( -4.64178, -6.80188 )
rotation = -2.48353e-08
scale = Vector2( 0.15, 0.15 )
polygon = PoolVector2Array( 437, -162.9, 437, -155.4, 456, -119.5, 456, -114.7, 420, 22.4, 420, 31.6, 389.9, 288, 377.9, 288, 93, 279.7, 93, 277.6, -199.8, 234, -203.4, 234, -383, 245.7, -383, 236.1, -404.4, 188, -397.4, 188, -384.4, -32, -380, -32, -343.9, -98, -335.1, -98, 348, -170, 348, -173.2 )
[node name="Sprite" type="Sprite" parent="Towel/Hitbox"]
position = Vector2( -0.218535, -1.57275 )
scale = Vector2( 0.03, 0.03 )
texture = SubResource( 13 )
......@@ -276,27 +276,27 @@ __meta__ = {
"anims/Notepad open" = SubResource( 1 )
[node name="To do" type="StaticBody2D" parent="UI"]
visible = false
position = Vector2( 458.436, 104.779 )
z_index = 1
input_pickable = true
script = ExtResource( 16 )
[node name="Panel" type="Sprite" parent="UI/To do"]
position = Vector2( 150.967, 149.796 )
scale = Vector2( 0.629082, 0.629082 )
texture = ExtResource( 34 )
[node name="Panel3" type="Panel" parent="UI/To do"]
visible = false
modulate = Color( 1, 1, 1, 0 )
margin_right = 287.0
margin_bottom = 393.0
mouse_filter = 2
input_pass_on_modal_close_click = false
custom_styles/panel = SubResource( 2 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Panel" type="Sprite" parent="UI/To do"]
position = Vector2( 150.967, 149.796 )
scale = Vector2( 0.629082, 0.629082 )
texture = ExtResource( 34 )
[node name="Title" type="RichTextLabel" parent="UI/To do"]
anchor_right = 1.0
anchor_bottom = 1.0
......@@ -518,7 +518,6 @@ __meta__ = {
}
[node name="Deselect" type="Button" parent="UI/Inventory control"]
visible = false
margin_left = 39.5535
margin_top = 16.442
margin_right = 56.5535
......
......@@ -4,10 +4,15 @@ onready var soap = false # if soap is being poured
onready var door = false # if washing machine door is open
onready var clothes_in = false # if clothes are in the machine
onready var clothes = get_parent().get_node("Clothes")
onready var soapTimer = get_parent().get_node("Timer")
signal laundry_finished
# Called when the node enters the scene tree for the first time.
func _ready():
pass # Replace with function body.
soapTimer.connect("timeout", self, "_pour_soap")
func _pour_soap():
get_parent().get_node("Soap/Hitbox/Sprite2").visible = false
get_parent().get_node("Soap/Hitbox/Sprite").visible = true
func checkWin():
#print("Checked win")
......@@ -30,11 +35,13 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
"Look":
return "The door to the washing machine"
"Open":
#get_parent().get_node(clicked +"/CollisionShape2D/Sprite").visible = true
get_parent().get_node(clicked +"/Hitbox/Sprite").visible = false
get_parent().get_node(clicked +"/Hitbox/Sprite2").visible = true
door = true
return "Open."
"Close":
#get_parent().get_node(clicked +"/CollisionShape2D/Sprite").visible = false
get_parent().get_node(clicked +"/Hitbox/Sprite").visible = true
get_parent().get_node(clicked +"/Hitbox/Sprite2").visible = false
door = false
if clothes_in:
clothes.hide()
......@@ -46,11 +53,13 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
"Look":
return "The little drawer for the soap"
"Open":
#get_parent().get_node(clicked +"/CollisionShape2D/Sprite").visible = true
get_parent().get_node(clicked +"/Hitbox/Sprite").visible = false
get_parent().get_node(clicked +"/Hitbox/Sprite2").visible = true
drawer = true
return "Open."
"Close":
#get_parent().get_node(clicked +"/CollisionShape2D/Sprite").visible = false
get_parent().get_node(clicked +"/Hitbox/Sprite").visible = true
get_parent().get_node(clicked +"/Hitbox/Sprite2").visible = false
drawer = false
if soap:
get_parent().get_node("Soap/Hitbox/Sprite2").visible = false
......@@ -66,6 +75,7 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
if drawer:
get_parent().get_node(clicked +"/Hitbox/Sprite").visible = false
get_parent().get_node(clicked +"/Hitbox/Sprite2").visible = true
soapTimer.start()
soap = true
return "Soap loaded."
else:
......@@ -90,6 +100,7 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
"Buttons":
match selected:
"Turn on":
return checkWin()
_:
return "That doesn't really make sense."
......@@ -28,6 +28,8 @@ func objInteraction(selected): # when an object is used on it
dialogueBox.text = "I can't believe that actually worked?!"
flavorText = ""
unlocked = true # can now go through the balcony door freely
get_node("Hitbox/Sprite").visible = false
get_node("Hitbox/Sprite2").visible = true
inventory.remove_item(selected)
elif typeof(flavor) != 0: #checks if there's coded flavor text for this interaction
dialogueBox.text = flavor
......@@ -38,3 +40,5 @@ func objInteraction(selected): # when an object is used on it
func outerLock():
unlocked = true
flavorText = ""
get_node("Hitbox/Sprite").visible = false
get_node("Hitbox/Sprite2").visible = true
......@@ -30,6 +30,8 @@ func objInteraction(selected):
dialogueBox.text = "No flavor text found" #can replace this later!
if inventory.get_item_text(selected) == "Screwdriver": # unjamming the cabinet with the screwdriver
dialogueBox.text = "Food, you are now free from your prison. You're welcome."
get_node("Hitbox/Sprite").visible = false
get_node("Hitbox/Sprite2").visible = true
unlocked = true
inventory.remove_item(selected)
dialogueBox.playText()
......@@ -15,6 +15,8 @@ func objInteraction(selected): # when an object is used on it
if inventory.get_item_text(selected) == "Cellphone":
if yoga:
dialogueBox.text = "Share with me your knowledge, yoga man. Oh, I had one last lab note on here!"
visible = false
get_parent().get_node("Yoga mat2").visible = true
emit_signal("finished", "Do something relaxing")
emit_signal("lab")
else:
......
......@@ -2,7 +2,7 @@
[ext_resource path="res://assets/Thesis Clickables/bread.png" type="Texture" id=1]
[ext_resource path="res://assets/Thesis Clickables/eggs.png" type="Texture" id=2]
[ext_resource path="res://assets/Backgrounds/kitchen_ ref.jpg" type="Texture" id=3]
[ext_resource path="res://assets/Backgrounds/kitchen_ref.jpg" type="Texture" id=3]
[ext_resource path="res://assets/Thesis Clickables/Vienna sausage.png" type="Texture" id=5]
[ext_resource path="res://assets/Thesis Clickables/Granola bar.png" type="Texture" id=6]
[ext_resource path="res://Scripts/Movement scripts/Return_fridge.gd" type="Script" id=7]
......
......@@ -5,11 +5,11 @@
[ext_resource path="res://To do list.gd" type="Script" id=3]
[ext_resource path="res://Scripts/Movement scripts/Return_laundry_basket.gd" type="Script" id=4]
[sub_resource type="StreamTexture" id=2]
[sub_resource type="StreamTexture" id=1]
flags = 4
load_path = "res://.import/notebook.png-dac36d6e437642ffc9e789867a2b96f8.stex"
[sub_resource type="RectangleShape2D" id=1]
[sub_resource type="RectangleShape2D" id=2]
extents = Vector2( 16.2181, 18.4658 )
[sub_resource type="RectangleShape2D" id=3]
......@@ -46,14 +46,13 @@ polygon = PoolVector2Array( 207, -454, 207, -443, 216.6, -299.2, 266.8, -90, 336
[node name="Sprite" type="Sprite" parent="To do list/Hitbox"]
rotation = -5.96046e-08
scale = Vector2( 1, 1 )
texture = SubResource( 2 )
texture = SubResource( 1 )
[node name="h" type="CollisionShape2D" parent="To do list"]
visible = false
position = Vector2( -2.31012, 0.749359 )
scale = Vector2( 5, 5 )
shape = SubResource( 1 )
shape = SubResource( 2 )
disabled = true
[node name="Return" type="StaticBody2D" parent="."]
......@@ -79,7 +78,6 @@ scale = Vector2( 0.197539, 0.197539 )
polygon = PoolVector2Array( -79, -406.4, -79, -171, 453.4, -171, 469, -163.2, 469, -155, 471, 161, 460.2, 161, -79, 170.8, -79, 411.2, -122, 414.9, -122, 405.6, -447.7, 0.399994, -442.3, -11, -439.7, -11, -110, -414.5, -110, -418.5, -98.1, -423.8 )
[node name="Sprite" type="Sprite" parent="Return/Hitbox"]
scale = Vector2( 1, 1 )
texture = SubResource( 4 )
[node name="notebook zoom in" type="Sprite" parent="."]
......
assets/Backgrounds/desk.jpg

55.7 KB | W: | H:

assets/Backgrounds/desk.jpg

36.3 KB | W: | H:

assets/Backgrounds/desk.jpg
assets/Backgrounds/desk.jpg
assets/Backgrounds/desk.jpg
assets/Backgrounds/desk.jpg
  • 2-up
  • Swipe
  • Onion skin
assets/Backgrounds/kitchen.jpg

105 KB | W: | H:

assets/Backgrounds/kitchen.jpg

69.7 KB | W: | H:

assets/Backgrounds/kitchen.jpg
assets/Backgrounds/kitchen.jpg
assets/Backgrounds/kitchen.jpg
assets/Backgrounds/kitchen.jpg
  • 2-up
  • Swipe
  • Onion skin
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/kitchen_ref.jpg-383a37125f0e18f952c8a10565ec3a96.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Backgrounds/kitchen_ref.jpg"
dest_files=[ "res://.import/kitchen_ref.jpg-383a37125f0e18f952c8a10565ec3a96.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/Backgrounds/laundry closed.jpg

55.9 KB | W: | H:

assets/Backgrounds/laundry closed.jpg

53.7 KB | W: | H:

assets/Backgrounds/laundry closed.jpg
assets/Backgrounds/laundry closed.jpg
assets/Backgrounds/laundry closed.jpg
assets/Backgrounds/laundry closed.jpg
  • 2-up
  • Swipe
  • Onion skin
assets/Backgrounds/laundry open.jpg

68.8 KB | W: | H:

assets/Backgrounds/laundry open.jpg

59.9 KB | W: | H:

assets/Backgrounds/laundry open.jpg
assets/Backgrounds/laundry open.jpg
assets/Backgrounds/laundry open.jpg
assets/Backgrounds/laundry open.jpg
  • 2-up
  • Swipe
  • Onion skin
assets/Backgrounds/living room.jpg

96.4 KB | W: | H:

assets/Backgrounds/living room.jpg

60.5 KB | W: | H:

assets/Backgrounds/living room.jpg
assets/Backgrounds/living room.jpg
assets/Backgrounds/living room.jpg
assets/Backgrounds/living room.jpg
  • 2-up
  • Swipe
  • Onion skin
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/balcony door closed.png-14239361aaa311478614ee99ad6d63cc.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/balcony door closed.png"
dest_files=[ "res://.import/balcony door closed.png-14239361aaa311478614ee99ad6d63cc.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
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/balcony door open.png-8eec7587a7fe898d83cdc17d006c4153.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/balcony door open.png"
dest_files=[ "res://.import/balcony door open.png-8eec7587a7fe898d83cdc17d006c4153.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
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/kitchen cabinet closed.png-2e67aa87e34bb157548d608b01e55636.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/kitchen cabinet closed.png"
dest_files=[ "res://.import/kitchen cabinet closed.png-2e67aa87e34bb157548d608b01e55636.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
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/kitchen cabinet open.png-890e875d85bf22c6d287e0244d9e9041.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/kitchen cabinet open.png"
dest_files=[ "res://.import/kitchen cabinet open.png-890e875d85bf22c6d287e0244d9e9041.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
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/machine door closed.png-27dcbf53e50e261eb89ab6013ecc6304.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/machine door closed.png"
dest_files=[ "res://.import/machine door closed.png-27dcbf53e50e261eb89ab6013ecc6304.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
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/machine door open.png-6a3a4e433dab2346b20c5e138d583b9b.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/machine door open.png"
dest_files=[ "res://.import/machine door open.png-6a3a4e433dab2346b20c5e138d583b9b.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
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/soap drawer closed.png-1097952895ea9e503201531ad4b7c894.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/soap drawer closed.png"
dest_files=[ "res://.import/soap drawer closed.png-1097952895ea9e503201531ad4b7c894.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
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/soap drawer open.png-2b0a5a5f2602eca491d1980ab6d47710.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/soap drawer open.png"
dest_files=[ "res://.import/soap drawer open.png-2b0a5a5f2602eca491d1980ab6d47710.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/stool.png

28.8 KB | W: | H:

assets/Thesis Clickables/stool.png

12.2 KB | W: | H:

assets/Thesis Clickables/stool.png
assets/Thesis Clickables/stool.png
assets/Thesis Clickables/stool.png
assets/Thesis Clickables/stool.png
  • 2-up
  • Swipe
  • Onion skin
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