Commit a2ddca5d authored by Julia Santos's avatar Julia Santos

Added floor to balcony, made it so that both arrows appear after cutscene 3,...

Added floor to balcony, made it so that both arrows appear after cutscene 3, and changed cabinet sprite
parent ab4f0f2b
source_md5="8f8aaffcd084c8cd21b9cd13a26720c8" source_md5="f3f6dd8f8112a1e70bdbc15c1a5c4d85"
dest_md5="ae8956e7c365033759270a4ecd0adef6" dest_md5="f50bccf3281dc9c2cd9ee2ac30eabd0a"
This diff is collapsed.
...@@ -196,6 +196,7 @@ func _start_cutscene_2(): ...@@ -196,6 +196,7 @@ func _start_cutscene_2():
quests.add("Do Lab (Notes: 0/4)") quests.add("Do Lab (Notes: 0/4)")
newQuests = true newQuests = true
movementHandle.finishTutorial() movementHandle.finishTutorial()
movementHandle.check_arrows()
get_parent().get_node("Desk/Laptop").start() get_parent().get_node("Desk/Laptop").start()
bedroom.get_node("Terrarium").removeBanana() bedroom.get_node("Terrarium").removeBanana()
bedroom.get_node("Terrarium").flavorText = "OMG! Where did Banana go??" bedroom.get_node("Terrarium").flavorText = "OMG! Where did Banana go??"
...@@ -346,7 +347,8 @@ func _living_to_hallway(): # moving from living room to hallway, if there's a re ...@@ -346,7 +347,8 @@ func _living_to_hallway(): # moving from living room to hallway, if there's a re
livingRoom.hide() livingRoom.hide()
hallway.show() hallway.show()
canFrontDoor = true canFrontDoor = true
dialogue.text = "What is that noise? Sounds like my neighbor's trying to break down their walls." if quests.hasQuest("Figure out what's making that noise & get rid of it"):
dialogue.text = "What is that noise? Sounds like my neighbor's trying to break down their walls."
dialogue.playText() dialogue.playText()
inventory.unselect_all() inventory.unselect_all()
movementHandle.getRoomPosition("Hallway") movementHandle.getRoomPosition("Hallway")
......
[gd_scene load_steps=16 format=2] [gd_scene load_steps=17 format=2]
[ext_resource path="res://assets/Thesis Clickables/other plants.png" type="Texture" id=1] [ext_resource path="res://assets/Thesis Clickables/other plants.png" type="Texture" id=1]
[ext_resource path="res://Item.gd" type="Script" id=2] [ext_resource path="res://Item.gd" type="Script" id=2]
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
[ext_resource path="res://Scripts/Movement scripts/Door to living room.gd" type="Script" id=6] [ext_resource path="res://Scripts/Movement scripts/Door to living room.gd" type="Script" id=6]
[ext_resource path="res://Scripts/Other plants.gd" type="Script" id=7] [ext_resource path="res://Scripts/Other plants.gd" type="Script" id=7]
[ext_resource path="res://assets/Thesis Clickables/potted plant (repotted).png" type="Texture" id=8] [ext_resource path="res://assets/Thesis Clickables/potted plant (repotted).png" type="Texture" id=8]
[ext_resource path="res://Scripts/Floor.gd" type="Script" id=9]
[sub_resource type="GDScript" id=1] [sub_resource type="GDScript" id=1]
script/source = "extends Control script/source = "extends Control
...@@ -103,6 +104,25 @@ rotation = 3.14159 ...@@ -103,6 +104,25 @@ rotation = 3.14159
scale = Vector2( 1.53367, -1.77748 ) scale = Vector2( 1.53367, -1.77748 )
texture = SubResource( 3 ) texture = SubResource( 3 )
[node name="Floor" type="StaticBody2D" parent="."]
position = Vector2( 642.065, 449.125 )
scale = Vector2( 0.829244, 0.829244 )
input_pickable = true
script = ExtResource( 9 )
interactable = true
[node name="Hitbox" type="CollisionPolygon2D" parent="Floor"]
position = Vector2( -197.565, -173.214 )
scale = Vector2( -1.11961, 1.13547 )
polygon = PoolVector2Array( 68.2913, 130.94, 178.837, 127.758, 192.837, 181.814, 253.317, 191.94, 315.204, 174.7, 521.771, 308.367, 236.127, 311.549 )
[node name="Sprite" type="Sprite" parent="Floor/Hitbox"]
visible = false
position = Vector2( -147.674, 137.307 )
rotation = 3.14159
scale = Vector2( 1.53367, -1.77748 )
texture = SubResource( 3 )
[node name="Other plants" type="StaticBody2D" parent="."] [node name="Other plants" type="StaticBody2D" parent="."]
position = Vector2( 299.246, 241.506 ) position = Vector2( 299.246, 241.506 )
scale = Vector2( 0.829244, 0.829244 ) scale = Vector2( 0.829244, 0.829244 )
......
...@@ -217,7 +217,6 @@ polygon = PoolVector2Array( 215.815, 42.251, 178.165, 99.8634, 121.254, 119.48, ...@@ -217,7 +217,6 @@ polygon = PoolVector2Array( 215.815, 42.251, 178.165, 99.8634, 121.254, 119.48,
position = Vector2( -9.64429, -3.69516 ) position = Vector2( -9.64429, -3.69516 )
scale = Vector2( -0.98, 0.965 ) scale = Vector2( -0.98, 0.965 )
frames = SubResource( 6 ) frames = SubResource( 6 )
frame = 1
speed_scale = 0.3 speed_scale = 0.3
playing = true playing = true
......
...@@ -167,17 +167,11 @@ visible = false ...@@ -167,17 +167,11 @@ visible = false
script = ExtResource( 4 ) script = ExtResource( 4 )
items = [ NodePath("Laundry door"), NodePath("Groceries"), NodePath("Stool"), NodePath("Noise") ] items = [ NodePath("Laundry door"), NodePath("Groceries"), NodePath("Stool"), NodePath("Noise") ]
[node name="Sprite2" parent="Laundry area/Noise/Hitbox" index="0"]
frame = 0
[node name="Kitchen" parent="." instance=ExtResource( 8 )] [node name="Kitchen" parent="." instance=ExtResource( 8 )]
visible = false visible = false
script = ExtResource( 4 ) script = ExtResource( 4 )
items = [ NodePath("Fridge"), NodePath("Cabinet"), NodePath("Stool"), NodePath("Granola bar"), NodePath("Sink"), NodePath("Noise") ] items = [ NodePath("Fridge"), NodePath("Cabinet"), NodePath("Stool"), NodePath("Granola bar"), NodePath("Sink"), NodePath("Noise") ]
[node name="Sprite2" parent="Kitchen/Noise/Hitbox" index="0"]
frame = 0
[node name="Fridge" parent="." instance=ExtResource( 17 )] [node name="Fridge" parent="." instance=ExtResource( 17 )]
visible = false visible = false
script = ExtResource( 4 ) script = ExtResource( 4 )
...@@ -203,9 +197,6 @@ visible = false ...@@ -203,9 +197,6 @@ visible = false
script = ExtResource( 4 ) script = ExtResource( 4 )
items = [ NodePath("Balcony door"), NodePath("Plants"), NodePath("Lab notes"), NodePath("Yoga mat"), NodePath("Front door"), NodePath("Noise") ] items = [ NodePath("Balcony door"), NodePath("Plants"), NodePath("Lab notes"), NodePath("Yoga mat"), NodePath("Front door"), NodePath("Noise") ]
[node name="Sprite2" parent="Living room/Noise/Hitbox" index="0"]
frame = 0
[node name="Living room - Notepad" parent="." instance=ExtResource( 32 )] [node name="Living room - Notepad" parent="." instance=ExtResource( 32 )]
visible = false visible = false
script = ExtResource( 4 ) script = ExtResource( 4 )
...@@ -216,22 +207,16 @@ visible = false ...@@ -216,22 +207,16 @@ visible = false
script = ExtResource( 4 ) script = ExtResource( 4 )
items = [ NodePath("Door to neighbor"), NodePath("Door to Moxie"), NodePath("Trash chute"), NodePath("Neighbor doorbell"), NodePath("Noise") ] items = [ NodePath("Door to neighbor"), NodePath("Door to Moxie"), NodePath("Trash chute"), NodePath("Neighbor doorbell"), NodePath("Noise") ]
[node name="Sprite2" parent="Hallway/Noise/Hitbox" index="0"]
frame = 0
[node name="Balcony" parent="." instance=ExtResource( 24 )] [node name="Balcony" parent="." instance=ExtResource( 24 )]
visible = false visible = false
script = ExtResource( 4 ) script = ExtResource( 4 )
items = [ NodePath("Other plants"), NodePath("Nana"), NodePath("Pot"), NodePath("Door to living room") ] items = [ NodePath("Other plants"), NodePath("Nana"), NodePath("Pot"), NodePath("Door to living room"), NodePath("Floor") ]
[node name="Neighbor\'s room" parent="." instance=ExtResource( 22 )] [node name="Neighbor\'s room" parent="." instance=ExtResource( 22 )]
visible = false visible = false
script = ExtResource( 4 ) script = ExtResource( 4 )
items = [ NodePath("Ladder"), NodePath("Neighbor to balcony"), NodePath("Neighbor"), NodePath("Reptile memorabilia"), NodePath("Toolbox"), NodePath("Screwdriver"), NodePath("Neighbor to hallway"), NodePath("Dialogue arrow"), NodePath("Noise") ] items = [ NodePath("Ladder"), NodePath("Neighbor to balcony"), NodePath("Neighbor"), NodePath("Reptile memorabilia"), NodePath("Toolbox"), NodePath("Screwdriver"), NodePath("Neighbor to hallway"), NodePath("Dialogue arrow"), NodePath("Noise") ]
[node name="Sprite3" parent="Neighbor\'s room/Noise/Hitbox" index="0"]
frame = 0
[node name="Neighbor\'s balcony" parent="." instance=ExtResource( 23 )] [node name="Neighbor\'s balcony" parent="." instance=ExtResource( 23 )]
visible = false visible = false
script = ExtResource( 4 ) script = ExtResource( 4 )
......
extends "res://Item.gd"
# Called when the node enters the scene tree for the first time.
func _ready():
pass # Replace with function body.
func mouseInteraction():
pass
func objInteraction(selected): # when an object is used on it
if inventory.get_item_text(selected) == "Plants": #checks if there's coded flavor text for this interaction
get_parent().get_node("Other plants").objInteraction(selected)
else:
pass
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