Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
To Do Break Down
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
breakdown
To Do Break Down
Commits
b419d57e
Commit
b419d57e
authored
Dec 07, 2021
by
Julia Santos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Can now only enter the neighbor's apartment after ringing the doorbell
parent
a4f53ad2
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
64 additions
and
8 deletions
+64
-8
Hallway.tscn
Main rooms/Hallway.tscn
+33
-3
Multi.tscn
Multi.tscn
+1
-1
Door to neighbor.gd
Scripts/Movement scripts/Door to neighbor.gd
+11
-4
Neighbor doorbell.gd
Scripts/Neighbor doorbell.gd
+19
-0
No files found.
Main rooms/Hallway.tscn
View file @
b419d57e
[gd_scene load_steps=1
1
format=2]
[gd_scene load_steps=1
4
format=2]
[ext_resource path="res://Scripts/Dialogue control/Dialogue Contro - Living room.gd" type="Script" id=1]
[ext_resource path="res://Scripts/Dialogue control/Dialogue Contro - Living room.gd" type="Script" id=1]
[ext_resource path="res://assets/Thesis Clickables/trash chute.png" type="Texture" id=2]
[ext_resource path="res://assets/Thesis Clickables/trash chute.png" type="Texture" id=2]
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
[ext_resource path="res://Scripts/Trash chute.gd" type="Script" id=5]
[ext_resource path="res://Scripts/Trash chute.gd" type="Script" id=5]
[ext_resource path="res://Scripts/Movement scripts/Door to Moxie.gd" type="Script" id=6]
[ext_resource path="res://Scripts/Movement scripts/Door to Moxie.gd" type="Script" id=6]
[ext_resource path="res://Scripts/Movement scripts/Door to neighbor.gd" type="Script" id=7]
[ext_resource path="res://Scripts/Movement scripts/Door to neighbor.gd" type="Script" id=7]
[ext_resource path="res://Scripts/Neighbor doorbell.gd" type="Script" id=8]
[sub_resource type="RectangleShape2D" id=1]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 23.7124, 45.104 )
extents = Vector2( 23.7124, 45.104 )
...
@@ -14,6 +15,13 @@ extents = Vector2( 23.7124, 45.104 )
...
@@ -14,6 +15,13 @@ extents = Vector2( 23.7124, 45.104 )
[sub_resource type="RectangleShape2D" id=2]
[sub_resource type="RectangleShape2D" id=2]
extents = Vector2( 27.7283, 52.3883 )
extents = Vector2( 27.7283, 52.3883 )
[sub_resource type="RectangleShape2D" id=4]
extents = Vector2( 6.13235, 10.0569 )
[sub_resource type="StreamTexture" id=5]
flags = 4
load_path = "res://.import/door to neighbor's apartment.png-525cbedcadd2669e77f94194b29c950c.stex"
[sub_resource type="RectangleShape2D" id=3]
[sub_resource type="RectangleShape2D" id=3]
extents = Vector2( 27.7283, 52.3883 )
extents = Vector2( 27.7283, 52.3883 )
...
@@ -51,7 +59,7 @@ scale = Vector2( 0.232723, 0.448472 )
...
@@ -51,7 +59,7 @@ scale = Vector2( 0.232723, 0.448472 )
texture = ExtResource( 2 )
texture = ExtResource( 2 )
[node name="Door to neighbor" type="StaticBody2D" parent="."]
[node name="Door to neighbor" type="StaticBody2D" parent="."]
position = Vector2(
222.66, 308.526
)
position = Vector2(
555.035, 307.191
)
scale = Vector2( 0.829244, 0.829244 )
scale = Vector2( 0.829244, 0.829244 )
input_pickable = true
input_pickable = true
script = ExtResource( 7 )
script = ExtResource( 7 )
...
@@ -59,6 +67,7 @@ __meta__ = {
...
@@ -59,6 +67,7 @@ __meta__ = {
"_edit_group_": true
"_edit_group_": true
}
}
interactable = true
interactable = true
flavorText = "What is Brodie doing in there?! That sound is really ticking me off... Should I go inside?"
[node name="CollisionShape2D" type="CollisionShape2D" parent="Door to neighbor"]
[node name="CollisionShape2D" type="CollisionShape2D" parent="Door to neighbor"]
position = Vector2( -16.8367, -2.11676 )
position = Vector2( -16.8367, -2.11676 )
...
@@ -70,8 +79,29 @@ position = Vector2( 0.449593, -0.672775 )
...
@@ -70,8 +79,29 @@ position = Vector2( 0.449593, -0.672775 )
scale = Vector2( 0.276784, 0.525959 )
scale = Vector2( 0.276784, 0.525959 )
texture = ExtResource( 3 )
texture = ExtResource( 3 )
[node name="Neighbor doorbell" type="StaticBody2D" parent="."]
position = Vector2( 713.955, 317.786 )
scale = Vector2( 0.829244, 0.829244 )
input_pickable = true
script = ExtResource( 8 )
__meta__ = {
"_edit_group_": true
}
interactable = true
flavorText = "Brodie: Just come in, the door's open!"
[node name="CollisionShape2D" type="CollisionShape2D" parent="Neighbor doorbell"]
position = Vector2( -16.8367, -2.11676 )
scale = Vector2( 5, 5 )
shape = SubResource( 4 )
[node name="Sprite" type="Sprite" parent="Neighbor doorbell/CollisionShape2D"]
position = Vector2( -0.317139, 0.093811 )
scale = Vector2( 0.0595878, 0.0992322 )
texture = SubResource( 5 )
[node name="Door to Moxie" type="StaticBody2D" parent="."]
[node name="Door to Moxie" type="StaticBody2D" parent="."]
position = Vector2(
548.979, 308.527
)
position = Vector2(
234.394, 307.944
)
scale = Vector2( 0.829244, 0.829244 )
scale = Vector2( 0.829244, 0.829244 )
input_pickable = true
input_pickable = true
script = ExtResource( 6 )
script = ExtResource( 6 )
...
...
Multi.tscn
View file @
b419d57e
...
@@ -112,7 +112,7 @@ items = [ NodePath("Balcony door"), NodePath("Plants"), NodePath("Lab notes"), N
...
@@ -112,7 +112,7 @@ items = [ NodePath("Balcony door"), NodePath("Plants"), NodePath("Lab notes"), N
[node name="Hallway" parent="." instance=ExtResource( 25 )]
[node name="Hallway" parent="." instance=ExtResource( 25 )]
visible = false
visible = false
script = ExtResource( 4 )
script = ExtResource( 4 )
items = [ NodePath("Door to neighbor"), NodePath("Door to Moxie"), NodePath("Trash chute") ]
items = [ NodePath("Door to neighbor"), NodePath("Door to Moxie"), NodePath("Trash chute")
, NodePath("Neighbor doorbell")
]
[node name="Balcony" parent="." instance=ExtResource( 24 )]
[node name="Balcony" parent="." instance=ExtResource( 24 )]
visible = false
visible = false
...
...
Scripts/Movement scripts/Door to neighbor.gd
View file @
b419d57e
extends "res://Item.gd"
extends "res://Item.gd"
signal enter
signal enter
onready var comeIn = false
# Called when the node enters the scene tree for the first time.
# Called when the node enters the scene tree for the first time.
func _ready():
func _ready():
...
@@ -8,9 +9,15 @@ func _ready():
...
@@ -8,9 +9,15 @@ func _ready():
func passEvent(handler):
func passEvent(handler):
connect("enter", handler,"_hallway_to_neighbor")
connect("enter", handler,"_hallway_to_neighbor")
pass
func mouseInteraction():
func mouseInteraction():
if !comeIn:
.mouseInteraction()
if flavorText == "What is Brodie doing in there?! That sound is really ticking me off... Should I go inside?":
flavorText = "I should ring the bell first, it's only polite" #placeholder
else:
emit_signal("enter")
emit_signal("enter")
pass
dialogueBox.text = ""
func ring():
comeIn = true
Scripts/Neighbor doorbell.gd
0 → 100644
View file @
b419d57e
extends "res://Item.gd"
#signal enter
# Called when the node enters the scene tree for the first time.
func _ready():
pass # Replace with function body.
#func passEvent(handler):
#connect("enter", handler,"_hallway_to_neighbor")
# pass
func mouseInteraction():
get_parent().get_node("Door to neighbor").ring()
.mouseInteraction()
if flavorText == "Brodie: Just come in, the door's open!":
flavorText = "They said to just come in, so"
pass
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment