Commit 3f922e47 authored by Julia Santos's avatar Julia Santos

Added some flavor text, fixed the sprites for the notebook plant puzzle.

parent 01d795ba
source_md5="e1640f4a6ad4b9eb3bc28e9396ee2523"
dest_md5="7a1daefda849d421a719c83d40cdd255"
...@@ -138,9 +138,12 @@ disabled = true ...@@ -138,9 +138,12 @@ disabled = true
[node name="Repotted plants" type="StaticBody2D" parent="."] [node name="Repotted plants" type="StaticBody2D" parent="."]
visible = false visible = false
position = Vector2( 329.402, 328.563 ) position = Vector2( 332.011, 354.837 )
scale = Vector2( 0.829244, 0.829244 ) scale = Vector2( 0.8, 0.8 )
input_pickable = true input_pickable = true
__meta__ = {
"_edit_group_": true
}
[node name="h" type="CollisionShape2D" parent="Repotted plants"] [node name="h" type="CollisionShape2D" parent="Repotted plants"]
visible = false visible = false
......
[gd_scene load_steps=16 format=2] [gd_scene load_steps=17 format=2]
[ext_resource path="res://Item - Notepad.gd" type="Script" id=1] [ext_resource path="res://Item - Notepad.gd" type="Script" id=1]
[ext_resource path="res://Scripts/Dialogue control/Dialogue Contro - Living room notepad.gd" type="Script" id=2] [ext_resource path="res://Scripts/Dialogue control/Dialogue Contro - Living room notepad.gd" type="Script" id=2]
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
[ext_resource path="res://assets/Thesis Clickables/plant (dirty).png" type="Texture" id=4] [ext_resource path="res://assets/Thesis Clickables/plant (dirty).png" type="Texture" id=4]
[ext_resource path="res://assets/Thesis Clickables/soil (sack).png" type="Texture" id=5] [ext_resource path="res://assets/Thesis Clickables/soil (sack).png" type="Texture" id=5]
[ext_resource path="res://assets/Thesis Clickables/tabo (with water).png" type="Texture" id=6] [ext_resource path="res://assets/Thesis Clickables/tabo (with water).png" type="Texture" id=6]
[ext_resource path="res://assets/Thesis Clickables/soil.png" type="Texture" id=7]
[ext_resource path="res://assets/Thesis Clickables/tabo (pour).png" type="Texture" id=8] [ext_resource path="res://assets/Thesis Clickables/tabo (pour).png" type="Texture" id=8]
[ext_resource path="res://assets/Thesis Clickables/soil (pour).png" type="Texture" id=9] [ext_resource path="res://assets/Thesis Clickables/soil (pour).png" type="Texture" id=9]
[ext_resource path="res://assets/Thesis Clickables/pot.png" type="Texture" id=12] [ext_resource path="res://assets/Thesis Clickables/pot.png" type="Texture" id=12]
...@@ -53,9 +54,6 @@ position = Vector2( 403.429, 420.482 ) ...@@ -53,9 +54,6 @@ position = Vector2( 403.429, 420.482 )
scale = Vector2( 0.6, 0.6 ) scale = Vector2( 0.6, 0.6 )
input_pickable = true input_pickable = true
script = ExtResource( 1 ) script = ExtResource( 1 )
__meta__ = {
"_edit_group_": true
}
interactable = true interactable = true
[node name="Hitbox" type="CollisionPolygon2D" parent="Pot"] [node name="Hitbox" type="CollisionPolygon2D" parent="Pot"]
...@@ -67,6 +65,12 @@ polygon = PoolVector2Array( 236, -412.7, 440, -368.9, 503, -328.5, 532.513, -177 ...@@ -67,6 +65,12 @@ polygon = PoolVector2Array( 236, -412.7, 440, -368.9, 503, -328.5, 532.513, -177
scale = Vector2( 0.7, 0.7 ) scale = Vector2( 0.7, 0.7 )
texture = ExtResource( 12 ) texture = ExtResource( 12 )
[node name="Soil in pot" type="Sprite" parent="Pot/Hitbox/Sprite"]
visible = false
position = Vector2( 14.5568, -4.89764 )
scale = Vector2( 0.968995, 0.986308 )
texture = ExtResource( 7 )
[node name="h" type="CollisionShape2D" parent="Pot"] [node name="h" type="CollisionShape2D" parent="Pot"]
visible = false visible = false
position = Vector2( -16.8367, -2.11676 ) position = Vector2( -16.8367, -2.11676 )
...@@ -75,18 +79,21 @@ shape = SubResource( 1 ) ...@@ -75,18 +79,21 @@ shape = SubResource( 1 )
disabled = true disabled = true
[node name="Plant" type="StaticBody2D" parent="."] [node name="Plant" type="StaticBody2D" parent="."]
position = Vector2( 151.95, 178.386 ) position = Vector2( 146.805, 227.99 )
input_pickable = true input_pickable = true
script = ExtResource( 1 ) script = ExtResource( 1 )
__meta__ = {
"_edit_group_": true
}
interactable = true interactable = true
[node name="Hitbox" type="CollisionPolygon2D" parent="Plant"] [node name="Hitbox" type="CollisionPolygon2D" parent="Plant"]
position = Vector2( -18.9857, 3.2625 ) position = Vector2( -20.0452, 3.26251 )
scale = Vector2( 0.2, 0.2 ) scale = Vector2( 0.2, 0.2 )
polygon = PoolVector2Array( 198, -500.9, 174.4, -381.3, 256.2, -482, 297, -481.9, 341, -375, 349.1, -256.5, 417.9, -286, 458.341, -251.599, 438.8, -125, 400.2, -32, 355.2, 33, 292.6, 86.4, 376.7, 97.5, 452.829, 93.3045, 424.1, 212, 344.3, 285, 213.444, 321.665, 121.1, 309.5, 170.1, 353.2, 265, 378.3, 297, 391.1, 314, 426, 348, 438.7, 386.683, 490.18, 394.7, 550, 361.9, 548.3, 324.9, 575, 291.401, 567.35, 248.2, 555, 218, 559.6, 191.395, 558.688, 151.9, 561.2, 107.8, 572.1, 80.2, 588.9, 25.2432, 587.823, -18.1, 585, -52.7145, 577.587, -102, 570.6, -141, 577.1, -173.982, 574.437, -209.1, 559.9, -248, 565.8, -267.688, 553.176, -298.4, 542.9, -348, 552.8, -376.1, 540.1, -399, 499.3, -399, 498.7, -389.6, 470, -361, 453.3, -350.9, 427, -324.6, 417.2, -299.974, 398.835, -277.5, 374, -212.9, 380.6, -58.6, 345.3, 6, 271.8, -109, 267.9, -226, 241, -341, 180.7, -428, 108.7, -471, 33, -466.126, -10.639, -425.178, -42.9246, -380.7, -47.8, -462, -154.6, -489.749, -300.421, -464, -330.9, -364.8, -284.7, -403, -375, -391.318, -423.263, -362.9, -455, -292, -430.9, -237.7, -375.3, -195.5, -380.8, -169, -479, -114.135, -500.433, -75, -450.7, -61.9, -380.1, 33.9052, -504.371, 90.6017, -547.68, 167.772, -556.342 ) polygon = PoolVector2Array( 198, -500.9, 174.4, -381.3, 256.2, -482, 297, -481.9, 341, -375, 349.1, -256.5, 417.9, -286, 458.341, -251.599, 438.8, -125, 400.2, -32, 355.2, 33, 292.6, 86.4, 376.7, 97.5, 452.829, 93.3045, 424.1, 212, 344.3, 285, 213.444, 321.665, 121.1, 309.5, 170.1, 353.2, 265, 378.3, 297, 391.1, 314, 426, 348, 438.7, 386.683, 490.18, 394.7, 550, 361.9, 548.3, 324.9, 575, 291.401, 567.35, 248.2, 555, 218, 559.6, 191.395, 558.688, 151.9, 561.2, 107.8, 572.1, 80.2, 588.9, 25.2432, 587.823, -18.1, 585, -52.7145, 577.587, -102, 570.6, -141, 577.1, -173.982, 574.437, -209.1, 559.9, -248, 565.8, -267.688, 553.176, -298.4, 542.9, -348, 552.8, -376.1, 540.1, -399, 499.3, -399, 498.7, -389.6, 470, -361, 453.3, -350.9, 427, -324.6, 417.2, -299.974, 398.835, -277.5, 374, -212.9, 380.6, -58.6, 345.3, 6, 271.8, -109, 267.9, -226, 241, -341, 180.7, -428, 108.7, -471, 33, -466.126, -10.639, -425.178, -42.9246, -380.7, -47.8, -462, -154.6, -489.749, -300.421, -464, -330.9, -364.8, -284.7, -403, -375, -391.318, -423.263, -362.9, -455, -292, -430.9, -237.7, -375.3, -195.5, -380.8, -169, -479, -114.135, -500.433, -75, -450.7, -61.9, -380.1, 33.9052, -504.371, 90.6017, -547.68, 167.772, -556.342 )
[node name="Sprite" type="Sprite" parent="Plant/Hitbox"] [node name="Sprite" type="Sprite" parent="Plant/Hitbox"]
position = Vector2( -3.14984, 22.0486 ) position = Vector2( -10.6377, -4.90918 )
scale = Vector2( 0.7, 0.7 ) scale = Vector2( 0.7, 0.7 )
texture = ExtResource( 4 ) texture = ExtResource( 4 )
...@@ -146,7 +153,6 @@ scale = Vector2( 0.238061, 0.204053 ) ...@@ -146,7 +153,6 @@ scale = Vector2( 0.238061, 0.204053 )
polygon = PoolVector2Array( -182, -135.8, -50, -109, 57, -68.9, 105, -19, 165, -19, 442, -16.2, 706, 10, 804.107, 50.5278, 800.799, 156.009, 745.1, 196, 537.9, 160, 119, 162.4, 96.3, 460, 60.2, 560, 5, 630, -95.4, 694, -191.4, 725, -426, 721, -599, 658, -652, 606.9, -689, 545, -730, 344, -723.7, 3, -690.7, -53, -623.8, -90, -487.4, -127, -365, -138.1 ) polygon = PoolVector2Array( -182, -135.8, -50, -109, 57, -68.9, 105, -19, 165, -19, 442, -16.2, 706, 10, 804.107, 50.5278, 800.799, 156.009, 745.1, 196, 537.9, 160, 119, 162.4, 96.3, 460, 60.2, 560, 5, 630, -95.4, 694, -191.4, 725, -426, 721, -599, 658, -652, 606.9, -689, 545, -730, 344, -723.7, 3, -690.7, -53, -623.8, -90, -487.4, -127, -365, -138.1 )
[node name="Sprite" type="Sprite" parent="Water/Hitbox"] [node name="Sprite" type="Sprite" parent="Water/Hitbox"]
scale = Vector2( 1, 1 )
texture = ExtResource( 6 ) texture = ExtResource( 6 )
[node name="Sprite2" type="Sprite" parent="Water/Hitbox"] [node name="Sprite2" type="Sprite" parent="Water/Hitbox"]
......
...@@ -613,7 +613,6 @@ __meta__ = { ...@@ -613,7 +613,6 @@ __meta__ = {
} }
[node name="Cutscenes" type="Node2D" parent="."] [node name="Cutscenes" type="Node2D" parent="."]
visible = false
z_index = 2 z_index = 2
[node name="0" parent="Cutscenes" instance=ExtResource( 42 )] [node name="0" parent="Cutscenes" instance=ExtResource( 42 )]
......
...@@ -131,7 +131,8 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it ...@@ -131,7 +131,8 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
holding = "" holding = ""
soilIn = true soilIn = true
soil.position.y += 20 soil.position.y += 20
pot.set_texture(load("res://.import/pot (with soil).png-232052a26ec16c2b0ec251e8c34bb9fa.stex")) #pot.set_texture(load("res://.import/pot (with soil).png-232052a26ec16c2b0ec251e8c34bb9fa.stex"))
pot.get_node("Soil in pot").visible = true
soil.get_parent().get_node("Sprite2").visible = true soil.get_parent().get_node("Sprite2").visible = true
soil.visible = false soil.visible = false
soil_timer.start() soil_timer.start()
...@@ -153,7 +154,7 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it ...@@ -153,7 +154,7 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
"Plant": "Plant":
if soilIn and cleanRoots: # putting plant in the new pot if soilIn and cleanRoots: # putting plant in the new pot
holding = "" holding = ""
get_parent().get_node("Plant").position = Vector2(412.459,251.065) get_parent().get_node("Plant").position = Vector2(418.441,267.277)
#original: (276.321, 282.901) #original: (276.321, 282.901)
#new: (412.459,251.065) #new: (412.459,251.065)
plantIn = true plantIn = true
......
...@@ -6,10 +6,10 @@ func _ready(): ...@@ -6,10 +6,10 @@ func _ready():
func interaction(selected, clicked): #selected = item in inventory, clicked = item in environment func interaction(selected, clicked): #selected = item in inventory, clicked = item in environment
match clicked: match clicked:
"Laptop": "Plants":
match selected: match selected:
"Lab Notes": "Tabo with water", "Shovel":
return "I don't think my notes are complete. Why did I put them all in different places?" return "I don't know how to start this.."
# Called every frame. 'delta' is the elapsed time since the previous frame. # Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta): #func _process(delta):
......
...@@ -13,8 +13,8 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it ...@@ -13,8 +13,8 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
"Toilet": "Toilet":
match selected: match selected:
"Placeholder 1": "Cleaning materials":
return "Using Placeholder 1 on 2" return "Clean as a whistle, for now."
"Placeholder 3": "Placeholder 3":
return "Using Placeholder 3 on 2" return "Using Placeholder 3 on 2"
......
...@@ -31,9 +31,14 @@ func objInteraction(selected): # when an object is used on it ...@@ -31,9 +31,14 @@ func objInteraction(selected): # when an object is used on it
# dont have all equipment yet # dont have all equipment yet
dialogueBox.text = "I don't think I have all my equipment for this yet." dialogueBox.text = "I don't think I have all my equipment for this yet."
dialogueBox.playText() dialogueBox.playText()
elif inventory.get_item_text(selected) == "Pot" or inventory.get_item_text(selected) == "Shovel" or inventory.get_item_text(selected) == "Tabo with water":
if inventory.hasItem("Pot") != -1 and inventory.hasItem("Shovel") != -1 and inventory.hasItem("Tabo with water") != -1:
dialogueBox.text = "I have everything I need, but I don't know how to start this..."
else:
dialogueBox.text = "I don't think I have all my equipment for this yet."
elif typeof(flavor) != 0: #checks if there's coded flavor text for this interaction elif typeof(flavor) != 0: #checks if there's coded flavor text for this interaction
dialogueBox.text = flavor dialogueBox.text = flavor
dialogueBox.playText() dialogueBox.playText()
else: else:
dialogueBox.text = "No flavor text found" #can replace this later! dialogueBox.text = "I'm not putting that in my plant, it's been through enough!" #can replace this later!
dialogueBox.playText() dialogueBox.playText()
...@@ -16,10 +16,6 @@ func passEvent(handler): ...@@ -16,10 +16,6 @@ func passEvent(handler):
func objInteraction(selected): # when an object is used on it func objInteraction(selected): # when an object is used on it
var flavor = control.interaction(inventory.get_item_text(selected), self.get_name()) var flavor = control.interaction(inventory.get_item_text(selected), self.get_name())
if typeof(flavor) != 0: #checks if there's coded flavor text for this interaction
dialogueBox.text = flavor
else:
dialogueBox.text = "No flavor text found" #can replace this later!
if (inventory.get_item_text(selected) == "Plunger"): if (inventory.get_item_text(selected) == "Plunger"):
if !clean: # if toilet isnt clean, and they use the plunger if !clean: # if toilet isnt clean, and they use the plunger
...@@ -33,4 +29,10 @@ func objInteraction(selected): # when an object is used on it ...@@ -33,4 +29,10 @@ func objInteraction(selected): # when an object is used on it
inventory.unselect_all() inventory.unselect_all()
else: # if they try to use the plunger on a clean toilet else: # if they try to use the plunger on a clean toilet
dialogueBox.text = "I can't make it any LESS unclogged.." dialogueBox.text = "I can't make it any LESS unclogged.."
elif !clean:
dialogueBox.text = "I'm not touching that until I've gotten it to flush!"
elif typeof(flavor) != 0: #checks if there's coded flavor text for this interaction
dialogueBox.text = flavor
else:
dialogueBox.text = "I'm not sending that to the sewers!" #can replace this later!
dialogueBox.playText() dialogueBox.playText()
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/soil.png-97e2af017121de84bff383857db76d6d.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/soil.png"
dest_files=[ "res://.import/soil.png-97e2af017121de84bff383857db76d6d.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