Skip to content

T
To Do Break Down
Commit cf578379 authored by Julia Santos's avatar Julia Santos
Browse files
Options

Added segment to 3rd cutscene, renamed Cleaning mat to Cleaning materials

parent 76320137
Hide whitespace changes
Inline Side-by-side
Showing with 653 additions and 104 deletions
.import/23.png-3b667942c7294a54f31dc13057eb3225.md5 0 → 100644
View file @ cf578379
source_md5="13154c80d54805149e03ff4bc5db983b"
dest_md5="14915a75f555d1728f91f27db7c23e96"
.import/24.png-f87f86010f60b83c450800e0815973b1.md5 0 → 100644
View file @ cf578379
source_md5="a732d4eea4318e7108d2606bbd98e82c"
dest_md5="6fe04d607a4d750fed23fba6b4f51cf0"
Cutscenes/Cutscene 0.gd
View file @ cf578379
......@@ -54,3 +54,15 @@ func start():
func _on_Button_pressed():
start()
get_parent().get_node("Start").queue_free()
var save_data = File.new()
var curTime = OS.get_time()
var timestamp = "[" + str(curTime.hour) + ":" + str(curTime.minute) + ":" + str(curTime.second) + "]"
if !save_data.file_exists("user://data.save"): # creates a new save file if there is none
save_data.open("user://data.save",File.WRITE)
save_data.store_string(timestamp + " FILE START, GAME START\n")
print("Created file")
else: # appends to existing save file if it does exist
save_data.open("user://data.save",File.READ_WRITE)
save_data.seek_end()
save_data.store_string(timestamp + " GAME START\n")
save_data.close()
Cutscenes/Cutscene 2.gd
View file @ cf578379
......@@ -21,7 +21,7 @@ func getShot():
shotName = "Shot " + str(sceneProgress + 1) + "." + str(sceneDecimal)
else:
shotName = "Shot " + str(sceneProgress + 1)
if (sceneProgress+1) != 18:
if (sceneProgress+1) != 19:
anim.play(shotName)
match (sceneProgress + 1):
7, 8, 9, 10, 12:
......@@ -36,7 +36,7 @@ func getShot():
sceneProgress += 1
else:
sceneDecimal += 1
18:
19:
sceneProgress = 0
get_parent().queue_free() # dont need that scene anymore
tracking = false
......
Cutscenes/Cutscene 2.tscn
View file @ cf578379
[gd_scene load_steps=155 format=2]
[gd_scene load_steps=163 format=2]
[ext_resource path="res://Cutscenes/Cutscene 2.gd" type="Script" id=1]
[ext_resource path="res://assets/Thesis Clickables/arrow-white-normal.png" type="Texture" id=2]
......@@ -33,6 +33,10 @@
[ext_resource path="res://assets/Cutscenes/02 - Finished Tutorial Puzzles/22.png" type="Texture" id=31]
[ext_resource path="res://assets/Cutscenes/02 - Finished Tutorial Puzzles/21-3.png" type="Texture" id=32]
[ext_resource path="res://assets/Cutscenes/02 - Finished Tutorial Puzzles/20.png" type="Texture" id=33]
[ext_resource path="res://assets/Thesis Clickables/noise right.png" type="Texture" id=34]
[ext_resource path="res://assets/Cutscenes/02 - Finished Tutorial Puzzles/24.png" type="Texture" id=35]
[ext_resource path="res://assets/Cutscenes/02 - Finished Tutorial Puzzles/23.png" type="Texture" id=36]
[ext_resource path="res://assets/Thesis Clickables/noise left.png" type="Texture" id=37]
[sub_resource type="StyleBoxFlat" id=1]
bg_color = Color( 0.913725, 0.705882, 0.831373, 1 )
......@@ -309,7 +313,7 @@ tracks/21/keys = {
"values": [ false ]
}
tracks/22/type = "value"
tracks/22/path = NodePath("22:visible")
tracks/22/path = NodePath("24:visible")
tracks/22/interp = 1
tracks/22/loop_wrap = true
tracks/22/imported = false
......@@ -588,7 +592,7 @@ tracks/21/keys = {
"values": [ false, false, true ]
}
tracks/22/type = "value"
tracks/22/path = NodePath("22:visible")
tracks/22/path = NodePath("24:visible")
tracks/22/interp = 1
tracks/22/loop_wrap = true
tracks/22/imported = false
......@@ -659,6 +663,18 @@ tracks/27/keys = {
"update": 1,
"values": [ false ]
}
tracks/28/type = "value"
tracks/28/path = NodePath("22:visible")
tracks/28/interp = 1
tracks/28/loop_wrap = true
tracks/28/imported = false
tracks/28/enabled = true
tracks/28/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
[sub_resource type="Animation" id=6]
length = 1.8
......@@ -987,7 +1003,7 @@ tracks/26/keys = {
"values": [ false ]
}
tracks/27/type = "value"
tracks/27/path = NodePath("22:visible")
tracks/27/path = NodePath("24:visible")
tracks/27/interp = 1
tracks/27/loop_wrap = true
tracks/27/imported = false
......@@ -1313,7 +1329,7 @@ tracks/25/keys = {
"values": [ false, false, true ]
}
tracks/26/type = "value"
tracks/26/path = NodePath("22:visible")
tracks/26/path = NodePath("24:visible")
tracks/26/interp = 1
tracks/26/loop_wrap = true
tracks/26/imported = false
......@@ -1676,7 +1692,7 @@ tracks/23/keys = {
"values": [ false ]
}
tracks/24/type = "value"
tracks/24/path = NodePath("22:visible")
tracks/24/path = NodePath("24:visible")
tracks/24/interp = 1
tracks/24/loop_wrap = true
tracks/24/imported = false
......@@ -1991,7 +2007,7 @@ tracks/21/keys = {
"values": [ false ]
}
tracks/22/type = "value"
tracks/22/path = NodePath("22:visible")
tracks/22/path = NodePath("24:visible")
tracks/22/interp = 1
tracks/22/loop_wrap = true
tracks/22/imported = false
......@@ -2074,6 +2090,18 @@ tracks/28/keys = {
"update": 1,
"values": [ false, false, true ]
}
tracks/29/type = "value"
tracks/29/path = NodePath("16/dia 3:visible")
tracks/29/interp = 1
tracks/29/loop_wrap = true
tracks/29/imported = false
tracks/29/enabled = true
tracks/29/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
[sub_resource type="Animation" id=10]
length = 3.6
......@@ -2276,7 +2304,7 @@ tracks/16/loop_wrap = true
tracks/16/imported = false
tracks/16/enabled = true
tracks/16/keys = {
"times": PoolRealArray( 0, 2.4, 2.5 ),
"times": PoolRealArray( 0, 3.4, 3.6 ),
"transitions": PoolRealArray( 1, 1, 1 ),
"update": 1,
"values": [ false, false, true ]
......@@ -2342,7 +2370,7 @@ tracks/21/keys = {
"values": [ false ]
}
tracks/22/type = "value"
tracks/22/path = NodePath("22:visible")
tracks/22/path = NodePath("24:visible")
tracks/22/interp = 1
tracks/22/loop_wrap = true
tracks/22/imported = false
......@@ -2801,7 +2829,7 @@ tracks/21/keys = {
"values": [ false ]
}
tracks/22/type = "value"
tracks/22/path = NodePath("22:visible")
tracks/22/path = NodePath("24:visible")
tracks/22/interp = 1
tracks/22/loop_wrap = true
tracks/22/imported = false
......@@ -3152,7 +3180,7 @@ tracks/21/keys = {
"values": [ false ]
}
tracks/22/type = "value"
tracks/22/path = NodePath("22:visible")
tracks/22/path = NodePath("24:visible")
tracks/22/interp = 1
tracks/22/loop_wrap = true
tracks/22/imported = false
......@@ -3539,7 +3567,7 @@ tracks/21/keys = {
"values": [ false ]
}
tracks/22/type = "value"
tracks/22/path = NodePath("22:visible")
tracks/22/path = NodePath("24:visible")
tracks/22/interp = 1
tracks/22/loop_wrap = true
tracks/22/imported = false
......@@ -3974,7 +4002,7 @@ tracks/21/keys = {
"values": [ false ]
}
tracks/22/type = "value"
tracks/22/path = NodePath("22:visible")
tracks/22/path = NodePath("24:visible")
tracks/22/interp = 1
tracks/22/loop_wrap = true
tracks/22/imported = false
......@@ -4313,7 +4341,7 @@ tracks/21/keys = {
"values": [ false ]
}
tracks/22/type = "value"
tracks/22/path = NodePath("22:visible")
tracks/22/path = NodePath("24:visible")
tracks/22/interp = 1
tracks/22/loop_wrap = true
tracks/22/imported = false
......@@ -4652,7 +4680,7 @@ tracks/21/keys = {
"values": [ true ]
}
tracks/22/type = "value"
tracks/22/path = NodePath("22:visible")
tracks/22/path = NodePath("24:visible")
tracks/22/interp = 1
tracks/22/loop_wrap = true
tracks/22/imported = false
......@@ -5039,7 +5067,7 @@ tracks/21/keys = {
"values": [ true ]
}
tracks/22/type = "value"
tracks/22/path = NodePath("22:visible")
tracks/22/path = NodePath("24:visible")
tracks/22/interp = 1
tracks/22/loop_wrap = true
tracks/22/imported = false
......@@ -5474,7 +5502,7 @@ tracks/21/keys = {
"values": [ true ]
}
tracks/22/type = "value"
tracks/22/path = NodePath("22:visible")
tracks/22/path = NodePath("24:visible")
tracks/22/interp = 1
tracks/22/loop_wrap = true
tracks/22/imported = false
......@@ -5690,7 +5718,372 @@ tracks/39/keys = {
"values": [ false, false, true ]
}
[sub_resource type="Animation" id=125]
resource_name = "Shot 17"
length = 3.8
tracks/0/type = "value"
tracks/0/path = NodePath("1:visible")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
tracks/1/type = "value"
tracks/1/path = NodePath("2:visible")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
tracks/2/type = "value"
tracks/2/path = NodePath("3:visible")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
tracks/3/type = "value"
tracks/3/path = NodePath("4:visible")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
tracks/4/type = "value"
tracks/4/path = NodePath("5:visible")
tracks/4/interp = 1
tracks/4/loop_wrap = true
tracks/4/imported = false
tracks/4/enabled = true
tracks/4/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
tracks/5/type = "value"
tracks/5/path = NodePath("6:visible")
tracks/5/interp = 1
tracks/5/loop_wrap = true
tracks/5/imported = false
tracks/5/enabled = true
tracks/5/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
tracks/6/type = "value"
tracks/6/path = NodePath("7:visible")
tracks/6/interp = 1
tracks/6/loop_wrap = true
tracks/6/imported = false
tracks/6/enabled = true
tracks/6/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
tracks/7/type = "value"
tracks/7/path = NodePath("8:visible")
tracks/7/interp = 1
tracks/7/loop_wrap = true
tracks/7/imported = false
tracks/7/enabled = true
tracks/7/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
tracks/8/type = "value"
tracks/8/path = NodePath("9:visible")
tracks/8/interp = 1
tracks/8/loop_wrap = true
tracks/8/imported = false
tracks/8/enabled = true
tracks/8/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
tracks/9/type = "value"
tracks/9/path = NodePath("10:visible")
tracks/9/interp = 1
tracks/9/loop_wrap = true
tracks/9/imported = false
tracks/9/enabled = true
tracks/9/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
tracks/10/type = "value"
tracks/10/path = NodePath("11:visible")
tracks/10/interp = 1
tracks/10/loop_wrap = true
tracks/10/imported = false
tracks/10/enabled = true
tracks/10/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
tracks/11/type = "value"
tracks/11/path = NodePath("12:visible")
tracks/11/interp = 1
tracks/11/loop_wrap = true
tracks/11/imported = false
tracks/11/enabled = true
tracks/11/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
tracks/12/type = "value"
tracks/12/path = NodePath("13:visible")
tracks/12/interp = 1
tracks/12/loop_wrap = true
tracks/12/imported = false
tracks/12/enabled = true
tracks/12/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
tracks/13/type = "value"
tracks/13/path = NodePath("14:visible")
tracks/13/interp = 1
tracks/13/loop_wrap = true
tracks/13/imported = false
tracks/13/enabled = true
tracks/13/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
tracks/14/type = "value"
tracks/14/path = NodePath("15:visible")
tracks/14/interp = 1
tracks/14/loop_wrap = true
tracks/14/imported = false
tracks/14/enabled = true
tracks/14/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
tracks/15/type = "value"
tracks/15/path = NodePath("16:visible")
tracks/15/interp = 1
tracks/15/loop_wrap = true
tracks/15/imported = false
tracks/15/enabled = true
tracks/15/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
tracks/16/type = "value"
tracks/16/path = NodePath("Scene control:tracking")
tracks/16/interp = 1
tracks/16/loop_wrap = true
tracks/16/imported = false
tracks/16/enabled = true
tracks/16/keys = {
"times": PoolRealArray( 0, 3.6, 3.8 ),
"transitions": PoolRealArray( 1, 1, 1 ),
"update": 1,
"values": [ false, false, true ]
}
tracks/17/type = "value"
tracks/17/path = NodePath("17:visible")
tracks/17/interp = 1
tracks/17/loop_wrap = true
tracks/17/imported = false
tracks/17/enabled = true
tracks/17/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
tracks/18/type = "value"
tracks/18/path = NodePath("18:visible")
tracks/18/interp = 1
tracks/18/loop_wrap = true
tracks/18/imported = false
tracks/18/enabled = true
tracks/18/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
tracks/19/type = "value"
tracks/19/path = NodePath("19:visible")
tracks/19/interp = 1
tracks/19/loop_wrap = true
tracks/19/imported = false
tracks/19/enabled = true
tracks/19/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
tracks/20/type = "value"
tracks/20/path = NodePath("20:visible")
tracks/20/interp = 1
tracks/20/loop_wrap = true
tracks/20/imported = false
tracks/20/enabled = true
tracks/20/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
tracks/21/type = "value"
tracks/21/path = NodePath("21:visible")
tracks/21/interp = 1
tracks/21/loop_wrap = true
tracks/21/imported = false
tracks/21/enabled = true
tracks/21/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
tracks/22/type = "value"
tracks/22/path = NodePath("24:visible")
tracks/22/interp = 1
tracks/22/loop_wrap = true
tracks/22/imported = false
tracks/22/enabled = true
tracks/22/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ false ]
}
tracks/23/type = "value"
tracks/23/path = NodePath("22:visible")
tracks/23/interp = 1
tracks/23/loop_wrap = true
tracks/23/imported = false
tracks/23/enabled = true
tracks/23/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 1,
"values": [ true ]
}
tracks/24/type = "value"
tracks/24/path = NodePath("22/23/dia 1/RichTextLabel:percent_visible")
tracks/24/interp = 1
tracks/24/loop_wrap = true
tracks/24/imported = false
tracks/24/enabled = true
tracks/24/keys = {
"times": PoolRealArray( 0, 2, 2.2, 2.5, 3.7 ),
"transitions": PoolRealArray( 1, 1, 1, 1, 1 ),
"update": 0,
"values": [ 0.0, 0.0, 0.117647, 0.117647, 1.0 ]
}
tracks/25/type = "value"
tracks/25/path = NodePath("22/23/dia 1/RichTextLabel:visible")
tracks/25/interp = 1
tracks/25/loop_wrap = true
tracks/25/imported = false
tracks/25/enabled = true
tracks/25/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 0,
"values": [ true ]
}
tracks/26/type = "value"
tracks/26/path = NodePath("22/23/dia 1:modulate")
tracks/26/interp = 1
tracks/26/loop_wrap = true
tracks/26/imported = false
tracks/26/enabled = true
tracks/26/keys = {
"times": PoolRealArray( 0, 1.5, 2 ),
"transitions": PoolRealArray( 1, 1, 1 ),
"update": 0,
"values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ) ]
}
tracks/27/type = "value"
tracks/27/path = NodePath("22/23/dia 1:visible")
tracks/27/interp = 1
tracks/27/loop_wrap = true
tracks/27/imported = false
tracks/27/enabled = true
tracks/27/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 0,
"values": [ true ]
}
tracks/28/type = "value"
tracks/28/path = NodePath("22/23:visible")
tracks/28/interp = 1
tracks/28/loop_wrap = true
tracks/28/imported = false
tracks/28/enabled = true
tracks/28/keys = {
"times": PoolRealArray( 0, 1.5 ),
"transitions": PoolRealArray( 1, 1 ),
"update": 0,
"values": [ false, true ]
}
tracks/29/type = "value"
tracks/29/path = NodePath("22/23/dia 1/Arrow:visible")
tracks/29/interp = 1
tracks/29/loop_wrap = true
tracks/29/imported = false
tracks/29/enabled = true
tracks/29/keys = {
"times": PoolRealArray( 0, 3.6, 3.8 ),
"transitions": PoolRealArray( 1, 1, 1 ),
"update": 1,
"values": [ false, false, true ]
}
[sub_resource type="Animation" id=19]
resource_name = "Shot 18"
length = 1.5
tracks/0/type = "value"
tracks/0/path = NodePath("1:visible")
......@@ -5957,7 +6350,7 @@ tracks/21/keys = {
"values": [ false ]
}
tracks/22/type = "value"
tracks/22/path = NodePath("22:visible")
tracks/22/path = NodePath("24:visible")
tracks/22/interp = 1
tracks/22/loop_wrap = true
tracks/22/imported = false
......@@ -5969,7 +6362,7 @@ tracks/22/keys = {
"values": [ true ]
}
tracks/23/type = "value"
tracks/23/path = NodePath("22/dia 1:visible")
tracks/23/path = NodePath("24/dia 1:visible")
tracks/23/interp = 1
tracks/23/loop_wrap = true
tracks/23/imported = false
......@@ -5981,7 +6374,7 @@ tracks/23/keys = {
"values": [ true ]
}
tracks/24/type = "value"
tracks/24/path = NodePath("22/dia 1:modulate")
tracks/24/path = NodePath("24/dia 1:modulate")
tracks/24/interp = 1
tracks/24/loop_wrap = true
tracks/24/imported = false
......@@ -5993,7 +6386,7 @@ tracks/24/keys = {
"values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ) ]
}
tracks/25/type = "value"
tracks/25/path = NodePath("22/dia 1/RichTextLabel:visible")
tracks/25/path = NodePath("24/dia 1/RichTextLabel:visible")
tracks/25/interp = 1
tracks/25/loop_wrap = true
tracks/25/imported = false
......@@ -6005,7 +6398,7 @@ tracks/25/keys = {
"values": [ true ]
}
tracks/26/type = "value"
tracks/26/path = NodePath("22/dia 1/RichTextLabel:percent_visible")
tracks/26/path = NodePath("24/dia 1/RichTextLabel:percent_visible")
tracks/26/interp = 1
tracks/26/loop_wrap = true
tracks/26/imported = false
......@@ -6017,7 +6410,7 @@ tracks/26/keys = {
"values": [ 0.0, 0.0, 0.42, 0.42, 0.85, 0.85, 1.0 ]
}
tracks/27/type = "value"
tracks/27/path = NodePath("22/dia 1/Arrow:visible")
tracks/27/path = NodePath("24/dia 1/Arrow:visible")
tracks/27/interp = 1
tracks/27/loop_wrap = true
tracks/27/imported = false
......@@ -6308,7 +6701,7 @@ tracks/22/keys = {
"values": [ false, false, true ]
}
tracks/23/type = "value"
tracks/23/path = NodePath("22:visible")
tracks/23/path = NodePath("24:visible")
tracks/23/interp = 1
tracks/23/loop_wrap = true
tracks/23/imported = false
......@@ -6707,7 +7100,7 @@ tracks/26/keys = {
"values": [ false ]
}
tracks/27/type = "value"
tracks/27/path = NodePath("22:visible")
tracks/27/path = NodePath("24:visible")
tracks/27/interp = 1
tracks/27/loop_wrap = true
tracks/27/imported = false
......@@ -6950,7 +7343,7 @@ tracks/18/keys = {
"values": [ Color( 0.168627, 0.156863, 0.219608, 0 ), Color( 0.168627, 0.156863, 0.219608, 0 ), Color( 0.168627, 0.156863, 0.219608, 0.937255 ) ]
}
tracks/19/type = "value"
tracks/19/path = NodePath("22:visible")
tracks/19/path = NodePath("24:visible")
tracks/19/interp = 1
tracks/19/loop_wrap = true
tracks/19/imported = false
......@@ -7349,7 +7742,7 @@ tracks/26/keys = {
"values": [ false ]
}
tracks/27/type = "value"
tracks/27/path = NodePath("22:visible")
tracks/27/path = NodePath("24:visible")
tracks/27/interp = 1
tracks/27/loop_wrap = true
tracks/27/imported = false
......@@ -7652,7 +8045,7 @@ tracks/23/keys = {
"values": [ false ]
}
tracks/24/type = "value"
tracks/24/path = NodePath("22:visible")
tracks/24/path = NodePath("24:visible")
tracks/24/interp = 1
tracks/24/loop_wrap = true
tracks/24/imported = false
......@@ -8111,7 +8504,7 @@ tracks/31/keys = {
"values": [ false ]
}
tracks/32/type = "value"
tracks/32/path = NodePath("22:visible")
tracks/32/path = NodePath("24:visible")
tracks/32/interp = 1
tracks/32/loop_wrap = true
tracks/32/imported = false
......@@ -8486,7 +8879,7 @@ tracks/29/keys = {
"values": [ false, false, true ]
}
tracks/30/type = "value"
tracks/30/path = NodePath("22:visible")
tracks/30/path = NodePath("24:visible")
tracks/30/interp = 1
tracks/30/loop_wrap = true
tracks/30/imported = false
......@@ -8909,7 +9302,7 @@ tracks/28/keys = {
"values": [ false ]
}
tracks/29/type = "value"
tracks/29/path = NodePath("22:visible")
tracks/29/path = NodePath("24:visible")
tracks/29/interp = 1
tracks/29/loop_wrap = true
tracks/29/imported = false
......@@ -9308,7 +9701,7 @@ tracks/31/keys = {
"values": [ false, false, true ]
}
tracks/32/type = "value"
tracks/32/path = NodePath("22:visible")
tracks/32/path = NodePath("24:visible")
tracks/32/interp = 1
tracks/32/loop_wrap = true
tracks/32/imported = false
......@@ -9743,7 +10136,7 @@ tracks/29/keys = {
"values": [ false ]
}
tracks/30/type = "value"
tracks/30/path = NodePath("22:visible")
tracks/30/path = NodePath("24:visible")
tracks/30/interp = 1
tracks/30/loop_wrap = true
tracks/30/imported = false
......@@ -10094,7 +10487,7 @@ tracks/27/keys = {
"values": [ false, false, true ]
}
tracks/28/type = "value"
tracks/28/path = NodePath("22:visible")
tracks/28/path = NodePath("24:visible")
tracks/28/interp = 1
tracks/28/loop_wrap = true
tracks/28/imported = false
......@@ -10505,7 +10898,7 @@ tracks/27/keys = {
"values": [ false ]
}
tracks/28/type = "value"
tracks/28/path = NodePath("22:visible")
tracks/28/path = NodePath("24:visible")
tracks/28/interp = 1
tracks/28/loop_wrap = true
tracks/28/imported = false
......@@ -10844,7 +11237,7 @@ tracks/26/keys = {
"values": [ false, false, true ]
}
tracks/27/type = "value"
tracks/27/path = NodePath("22:visible")
tracks/27/path = NodePath("24:visible")
tracks/27/interp = 1
tracks/27/loop_wrap = true
tracks/27/imported = false
......@@ -11384,6 +11777,22 @@ font_data = SubResource( 34 )
size = 33
font_data = ExtResource( 5 )
[sub_resource type="StyleBoxFlat" id=122]
bg_color = Color( 0.168627, 0.156863, 0.219608, 0.937255 )
corner_radius_top_left = 120
corner_radius_top_right = 120
corner_radius_bottom_right = 120
corner_radius_bottom_left = 120
corner_detail = 13
[sub_resource type="DynamicFont" id=123]
size = 21
font_data = SubResource( 34 )
[sub_resource type="DynamicFont" id=124]
size = 33
font_data = ExtResource( 5 )
[sub_resource type="StyleBoxFlat" id=117]
bg_color = Color( 0.964706, 0.407843, 0.756863, 1 )
......@@ -11488,7 +11897,8 @@ shape = SubResource( 3 )
"anims/Shot 16" = SubResource( 16 )
"anims/Shot 16.1" = SubResource( 17 )
"anims/Shot 16.2" = SubResource( 18 )
"anims/Shot 17" = SubResource( 19 )
"anims/Shot 17" = SubResource( 125 )
"anims/Shot 18" = SubResource( 19 )
"anims/Shot 2" = SubResource( 20 )
"anims/Shot 3" = SubResource( 21 )
"anims/Shot 4" = SubResource( 22 )
......@@ -11510,7 +11920,7 @@ scale = Vector2( 0.431069, 0.43107 )
texture = ExtResource( 8 )
[node name="dia 1" type="Panel" parent="1"]
visible = false
modulate = Color( 1, 1, 1, 0 )
margin_left = 460.925
margin_top = -308.656
margin_right = 1323.92
......@@ -11529,6 +11939,8 @@ margin_bottom = 212.0
rect_pivot_offset = Vector2( -1182.04, -589.897 )
custom_fonts/bold_font = SubResource( 35 )
custom_fonts/normal_font = SubResource( 36 )
visible_characters = 0
percent_visible = 0.0
text = "Okay! Now that I've finished my chores from last night, what else is on my To-Do List?"
scroll_active = false
__meta__ = {
......@@ -11536,9 +11948,11 @@ __meta__ = {
}
[node name="Arrow" type="AnimatedSprite" parent="1/dia 1"]
visible = false
position = Vector2( 479.889, 182.543 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 37 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -11573,6 +11987,8 @@ margin_bottom = 177.959
rect_pivot_offset = Vector2( -1182.04, -589.897 )
custom_fonts/bold_font = SubResource( 35 )
custom_fonts/normal_font = SubResource( 36 )
visible_characters = 13
percent_visible = 0.272727
text = "Oh. Right... Lab. Okay, let's get this over wi--"
scroll_active = false
__meta__ = {
......@@ -11580,9 +11996,11 @@ __meta__ = {
}
[node name="Arrow" type="AnimatedSprite" parent="3/dia 1"]
visible = false
position = Vector2( 291.426, 129.284 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 37 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -11593,6 +12011,7 @@ scale = Vector2( 0.431069, 0.43107 )
texture = ExtResource( 30 )
[node name="dia 1" type="Panel" parent="4"]
modulate = Color( 1, 1, 1, 0 )
margin_left = 530.958
margin_top = -140.477
margin_right = 1351.96
......@@ -11611,6 +12030,8 @@ margin_bottom = 141.0
rect_pivot_offset = Vector2( -1182.04, -589.897 )
custom_fonts/bold_font = SubResource( 35 )
custom_fonts/normal_font = SubResource( 36 )
visible_characters = 0
percent_visible = 0.0
text = "Huh? Is that my phone ringing?!"
scroll_active = false
__meta__ = {
......@@ -11618,9 +12039,11 @@ __meta__ = {
}
[node name="Arrow" type="AnimatedSprite" parent="4/dia 1"]
visible = false
position = Vector2( 740.838, 86.3772 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 37 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -11677,7 +12100,6 @@ modulate = Color( 0.168627, 0.156863, 0.219608, 0 )
position = Vector2( 793.066, 80.2328 )
scale = Vector2( 3, 3 )
frames = SubResource( 40 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -11715,6 +12137,7 @@ __meta__ = {
position = Vector2( 557.997, 91.0169 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 44 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -11754,7 +12177,6 @@ visible = false
position = Vector2( 593.273, 116.537 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 49 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -11789,7 +12211,6 @@ visible = false
position = Vector2( 556.828, 113.087 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 53 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -11825,7 +12246,6 @@ visible = false
position = Vector2( 643.364, 107.911 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 57 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -11865,6 +12285,7 @@ visible = false
position = Vector2( 351.534, 107.255 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 62 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -11898,6 +12319,7 @@ visible = false
position = Vector2( 290.439, 166.707 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 66 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -11930,7 +12352,6 @@ __meta__ = {
position = Vector2( 235.133, 79.7091 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 70 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -11977,6 +12398,7 @@ visible = false
position = Vector2( 430.353, 197.104 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 75 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -12009,6 +12431,7 @@ __meta__ = {
position = Vector2( 478.026, 132.212 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 75 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -12050,7 +12473,6 @@ visible = false
position = Vector2( 585.084, 126.629 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 81 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -12084,6 +12506,7 @@ __meta__ = {
position = Vector2( 413.838, 126.629 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 85 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -12123,7 +12546,6 @@ visible = false
position = Vector2( 811.604, 195.818 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 89 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -12160,7 +12582,6 @@ visible = false
position = Vector2( 470.68, 91.76 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 89 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -12211,10 +12632,12 @@ __meta__ = {
position = Vector2( 361.021, 76.8747 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 66 )
frame = 1
speed_scale = 0.7
playing = true
[node name="16" type="Sprite" parent="."]
visible = false
position = Vector2( 511.234, 302.628 )
scale = Vector2( 0.49534, 0.49534 )
texture = ExtResource( 6 )
......@@ -12248,7 +12671,6 @@ visible = false
position = Vector2( 670.288, 155.607 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 66 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -12283,6 +12705,7 @@ visible = false
position = Vector2( 451.231, 218.4 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 66 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -12313,10 +12736,10 @@ __meta__ = {
}
[node name="Arrow" type="AnimatedSprite" parent="16/dia 3"]
visible = false
position = Vector2( 270.815, 171.679 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 66 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -12355,6 +12778,7 @@ visible = false
position = Vector2( 421.177, 92.1361 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 66 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -12377,6 +12801,8 @@ margin_bottom = 255.913
rect_pivot_offset = Vector2( -1182.04, -589.897 )
custom_fonts/bold_font = SubResource( 98 )
custom_fonts/normal_font = SubResource( 99 )
visible_characters = 109
percent_visible = 0.928572
text = "I have to reorganize my whole day AND switch to an entirely different set of tasks - OF COURSE I’m having a hard time!"
scroll_active = false
__meta__ = {
......@@ -12388,12 +12814,11 @@ visible = false
position = Vector2( 433.205, 207.738 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 66 )
frame = 1
speed_scale = 0.7
playing = true
[node name="dia 3" type="Panel" parent="17"]
modulate = Color( 1, 1, 1, 0 )
visible = false
margin_left = 222.892
margin_top = 299.979
margin_right = 921.892
......@@ -12412,8 +12837,6 @@ margin_bottom = 267.087
rect_pivot_offset = Vector2( -1182.04, -589.897 )
custom_fonts/bold_font = SubResource( 103 )
custom_fonts/normal_font = SubResource( 104 )
visible_characters = 0
percent_visible = 0.0
text = "Ms. Therapist told me how bad my cognitive flexibility is when I'm stressed… Oops."
scroll_active = false
__meta__ = {
......@@ -12421,11 +12844,9 @@ __meta__ = {
}
[node name="Arrow" type="AnimatedSprite" parent="17/dia 3"]
visible = false
position = Vector2( 440.88, 166.777 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 66 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -12436,7 +12857,6 @@ scale = Vector2( 0.49534, 0.49534 )
texture = ExtResource( 25 )
[node name="dia 1" type="Panel" parent="18"]
modulate = Color( 1, 1, 1, 0 )
margin_left = -937.628
margin_top = -330.215
margin_right = -252.628
......@@ -12455,8 +12875,6 @@ margin_bottom = 147.0
rect_pivot_offset = Vector2( -1182.04, -589.897 )
custom_fonts/bold_font = SubResource( 98 )
custom_fonts/normal_font = SubResource( 99 )
visible_characters = 0
percent_visible = 0.0
text = "Don’t blame yourself... It’s not your fault. Take a deep breath."
scroll_active = false
__meta__ = {
......@@ -12464,11 +12882,9 @@ __meta__ = {
}
[node name="Arrow" type="AnimatedSprite" parent="18/dia 1"]
visible = false
position = Vector2( 603.543, 121.782 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 66 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -12517,7 +12933,6 @@ visible = false
position = Vector2( 512.313, 121.782 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 66 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -12528,9 +12943,11 @@ scale = Vector2( 0.49534, 0.49534 )
texture = ExtResource( 32 )
[node name="2" type="Sprite" parent="21"]
visible = false
texture = ExtResource( 7 )
[node name="1" type="Sprite" parent="21"]
visible = false
texture = ExtResource( 22 )
[node name="dia 1" type="Panel" parent="21"]
......@@ -12563,7 +12980,6 @@ visible = false
position = Vector2( 279.436, 162.596 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 66 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -12596,6 +13012,7 @@ visible = false
position = Vector2( 402.148, 167.397 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 114 )
frame = 1
speed_scale = 0.7
playing = true
......@@ -12628,16 +13045,68 @@ __meta__ = {
position = Vector2( 399.476, 119.382 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 114 )
frame = 1
speed_scale = 0.7
playing = true
[node name="22" type="Sprite" parent="."]
visible = false
position = Vector2( 508.714, 303.888 )
scale = Vector2( 0.49534, 0.49534 )
texture = ExtResource( 36 )
[node name="Noise" type="Sprite" parent="22"]
position = Vector2( 715.263, 88.0653 )
scale = Vector2( 1.41958, 1.41958 )
texture = ExtResource( 34 )
[node name="Noise2" type="Sprite" parent="22"]
position = Vector2( -714.262, -243.972 )
scale = Vector2( 1.41958, 1.41958 )
texture = ExtResource( 37 )
[node name="23" type="Sprite" parent="22"]
position = Vector2( -0.618408, -0.701843 )
texture = ExtResource( 35 )
[node name="dia 1" type="Panel" parent="22/23"]
margin_left = -963.773
margin_top = 2.97504
margin_right = -312.773
margin_bottom = 177.975
custom_styles/panel = SubResource( 122 )
__meta__ = {
"_edit_group_": true,
"_edit_use_anchors_": false
}
[node name="RichTextLabel" type="RichTextLabel" parent="22/23/dia 1"]
margin_left = 78.9588
margin_top = 44.9998
margin_right = 596.959
margin_bottom = 147.0
rect_pivot_offset = Vector2( -1182.04, -589.897 )
custom_fonts/bold_font = SubResource( 123 )
custom_fonts/normal_font = SubResource( 124 )
text = "Right. I should probably figure out what's causing that, too."
scroll_active = false
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Arrow" type="AnimatedSprite" parent="22/23/dia 1"]
position = Vector2( 559.847, 119.983 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 66 )
frame = 1
speed_scale = 0.7
playing = true
[node name="24" type="Sprite" parent="."]
position = Vector2( 507.068, 290.565 )
scale = Vector2( 0.515587, 0.515587 )
texture = ExtResource( 31 )
[node name="Panel" type="Panel" parent="22"]
[node name="Panel" type="Panel" parent="24"]
margin_left = -1021.0
margin_top = -621.0
margin_right = 1062.0
......@@ -12647,7 +13116,7 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="Panel3" type="Panel" parent="22"]
[node name="Panel3" type="Panel" parent="24"]
margin_left = 1006.0
margin_top = -621.0
margin_right = 1062.0
......@@ -12657,7 +13126,7 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="Panel2" type="Panel" parent="22"]
[node name="Panel2" type="Panel" parent="24"]
margin_left = -1129.89
margin_top = -617.975
margin_right = -918.893
......@@ -12667,7 +13136,7 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="dia 1" type="Panel" parent="22"]
[node name="dia 1" type="Panel" parent="24"]
margin_left = 292.119
margin_top = 85.8085
margin_right = 982.119
......@@ -12679,7 +13148,7 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="RichTextLabel" type="RichTextLabel" parent="22/dia 1"]
[node name="RichTextLabel" type="RichTextLabel" parent="24/dia 1"]
margin_left = 82.817
margin_top = 42.9811
margin_right = 645.817
......@@ -12693,9 +13162,10 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="Arrow" type="AnimatedSprite" parent="22/dia 1"]
[node name="Arrow" type="AnimatedSprite" parent="24/dia 1"]
position = Vector2( 489.931, 160.577 )
scale = Vector2( 0.8, 0.8 )
frames = SubResource( 121 )
frame = 1
speed_scale = 0.7
playing = true
Event Handler.gd
View file @ cf578379
......@@ -130,10 +130,10 @@ func get_clothes(): # returns the number of pieces of clothing that have been co
func _clean(toolUsed): # adds to the number of items that have been cleaned, and to the number of times the cleaning materials have been used
bathroomClean = bathroomClean + 1
print("Cleaning " + str(bathroomClean))
if toolUsed == "Cleaning mat":
if toolUsed == "Cleaning materials":
cleaningMaterials += 1
if cleaningMaterials == 3: # if the cleaning materials have cleaned 3 objects (sink, mirror, and floor), remove it
inventory.remove_item_name("Cleaning mat")
inventory.remove_item_name("Cleaning materials")
if bathroomClean == 5: # if it's done, finish the quest
quests.finishQuest("Clean bathroom and take out trash")
......@@ -233,7 +233,7 @@ func _enter_notebook_laundry(): # trying to engage in the notebook puzzle for do
notepad_words.add_item("Close")
notepad_words.add_item("Turn on")
notepad_words.add_item("Put in")
notepad_words.add_item("Look")
notepad_words.add_item("Look at")
notepad.get_node("CollisionPolygon2D").disabled = true
return "Alright, lets do this!"
else:
......@@ -273,7 +273,7 @@ func _enter_notebook_plants(): # trying to engage in the notebook puzzle for doi
var notepad_words = notepad.get_node("Words")
notepad.get_node("Words").clear()
notepad_words.show()
notepad_words.add_item("Look")
notepad_words.add_item("Look at")
notepad_words.add_item("Clean")
notepad_words.add_item("Pick up")
notepad_words.add_item("Put down")
......
Scripts/BG.gd
View file @ cf578379
......@@ -5,18 +5,7 @@ export(bool) var tracking
# Called when the node enters the scene tree for the first time.
func _ready():
var save_data = File.new()
var curTime = OS.get_time()
var timestamp = "[" + str(curTime.hour) + ":" + str(curTime.minute) + ":" + str(curTime.second) + "]"
if !save_data.file_exists("user://data.save"): # creates a new save file if there is none
save_data.open("user://data.save",File.WRITE)
save_data.store_string("FILE START, GAME START\n")
print("Created file")
else: # appends to existing save file if it does exist
save_data.open("user://data.save",File.READ_WRITE)
save_data.seek_end()
save_data.store_string("GAME START\n")
save_data.close()
pass
func _unhandled_input(event): # for any input that isn't capture by UI or any other items in the scene tree (doesn't count instanced scene trees)
if event is InputEventMouseButton:
......
Scripts/Dialogue control/Dialogue Contro - Living room notepad.gd
View file @ cf578379
......@@ -44,7 +44,7 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
match clicked:
"Plant":
match selected:
"Look":
"Look at":
return "A plant, kinda dry"
"Clean":
if holding == "Plant": # putting clean plant in
......@@ -93,7 +93,7 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
return "That doesn't really make sense."
"Pot":
match selected:
"Look":
"Look at":
if !potClean:
return "A little dirty from sitting on the balcony."
else:
......@@ -169,7 +169,7 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
return "That doesn't really make sense."
"Soil":
match selected:
"Look":
"Look at":
return "Some soil"
"Clean":
return "Can't clean dirt!"
......@@ -196,7 +196,7 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
return "That doesn't really make sense."
"Water":
match selected:
"Look":
"Look at":
return "Some water"
"Clean":
return "It's as clean as tap water can get"
......
Scripts/Dialogue control/Dialogue control - Laundry notepad.gd
View file @ cf578379
......@@ -34,7 +34,7 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
match clicked:
"Washing machine door":
match selected:
"Look":
"Look at":
return "The door to the washing machine"
"Open":
get_parent().get_node(clicked +"/Hitbox/Sprite").visible = false
......@@ -52,7 +52,7 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
return "That doesn't really make sense."
"Drawer":
match selected:
"Look":
"Look at":
return "The little drawer for the soap"
"Open":
get_parent().get_node(clicked +"/Hitbox/Sprite").visible = false
......@@ -71,7 +71,7 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
return "That doesn't really make sense."
"Soap":
match selected:
"Look":
"Look at":
return "Vanilla flavored detergent. I mean, scented."
"Put in":
if drawer:
......@@ -86,7 +86,7 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
return "That doesn't really make sense."
"Clothes":
match selected:
"Look":
"Look at":
return "A pile of clothes."
"Put in":
if door:
......@@ -105,7 +105,7 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
match selected:
"Turn on":
return checkWin()
"Look":
"Look at":
if !machineOn:
return "The control panel. It's still off!"
else:
......
Scripts/Laundry basket.gd
View file @ cf578379
extends "res://Item.gd"
signal retrieved
onready var enterable = true
# This script changes the view to the zoomed into the laundry basket when clicked on
# Called when the node enters the scene tree for the first time.
......@@ -7,12 +8,15 @@ func _ready():
pass # Replace with function body.
func mouseInteraction():
emit_signal("retrieved")
pass
if enterable:
emit_signal("retrieved")
else:
.mouseInteraction()
func passEvent(handler):
connect("retrieved", handler,"_laundry_basket")
pass
func finished():
interactable = false
enterable = false
flavorText = "Belly of the beast. I sometimes lose stuff in there."
Scripts/Mess on floor.gd
View file @ cf578379
......@@ -15,7 +15,7 @@ func passEvent(handler):
func objInteraction(selected):
var flavor = control.interaction(inventory.get_item_text(selected), self.get_name())
if inventory.get_item_text(selected) == "Cleaning mat": # using the cleaning materials on the mess
if inventory.get_item_text(selected) == "Cleaning materials": # using the cleaning materials on the mess
if !inventory.hadBobby(): #if the bobby pins haven't been picked up yet
dialogueBox.text = "Ow! I stepped on something!"
else: # if they have been picked up
......@@ -23,7 +23,7 @@ func objInteraction(selected):
dialogueBox.text = "Finally... I can walk around my own bathroom."
flavorText = "Okay. That wasn't so bad..."
get_node("Hitbox/Sprite").visible = false
emit_signal("cleaned", "Cleaning mat")
emit_signal("cleaned", "Cleaning materials")
clean = true
else: # trying to use the cleaning materials when it's already clean
dialogueBox.text = flavorText
......
Scripts/Mirror.gd
View file @ cf578379
......@@ -24,12 +24,12 @@ func mouseInteraction():
func objInteraction(selected):
var flavor = control.interaction(inventory.get_item_text(selected), self.get_name())
if inventory.get_item_text(selected) == "Cleaning mat": # if the cleaning materials are used on it
if inventory.get_item_text(selected) == "Cleaning materials": # if the cleaning materials are used on it
if !clean: # if the mirror is clean yet
if gotLabNote: # if the note's been removed
flavorText = "Great! I can see my own face again."
dialogueBox.text = flavorText
emit_signal("cleaned", "Cleaning mat") # signals to event handler that another object has been cleaned
emit_signal("cleaned", "Cleaning materials") # signals to event handler that another object has been cleaned
clean = true # mirror is now clean
get_node("Hitbox/Mess").visible = false
else: # if the mirror is dirty but the lab note hasn't been retrieved
......
Scripts/Sink.gd
View file @ cf578379
......@@ -15,11 +15,11 @@ func passEvent(handler):
func objInteraction(selected):
var flavor = control.interaction(inventory.get_item_text(selected), self.get_name())
if inventory.get_item_text(selected) == "Cleaning mat":
if inventory.get_item_text(selected) == "Cleaning materials":
if !clean: # trying to clean the sink when it's dirty
flavorText = "Okay. That wasn't so bad..."
dialogueBox.text = flavorText
emit_signal("cleaned", "Cleaning mat")
emit_signal("cleaned", "Cleaning materials")
clean = true
get_node("Hitbox/Mess").visible = false
else: # trying to clean it again
......
assets/Cutscenes/02 - Finished Tutorial Puzzles/23.png.import 0 → 100644
View file @ cf578379
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/23.png-3b667942c7294a54f31dc13057eb3225.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Cutscenes/02 - Finished Tutorial Puzzles/23.png"
dest_files=[ "res://.import/23.png-3b667942c7294a54f31dc13057eb3225.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/Cutscenes/02 - Finished Tutorial Puzzles/24.png.import 0 → 100644
View file @ cf578379
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/24.png-f87f86010f60b83c450800e0815973b1.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Cutscenes/02 - Finished Tutorial Puzzles/24.png"
dest_files=[ "res://.import/24.png-f87f86010f60b83c450800e0815973b1.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
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