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
505341b9
Commit
505341b9
authored
Dec 06, 2021
by
Julia Santos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed a few script reference names so that the capitalization was consistent
parent
029e2146
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
19 deletions
+18
-19
Living room.tscn
Main rooms/Living room.tscn
+1
-3
Neighbor's room.tscn
Main rooms/Neighbor's room.tscn
+2
-4
Test room 1.tscn
Main rooms/Test room 1.tscn
+15
-12
No files found.
Main rooms/Living room.tscn
View file @
505341b9
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
[ext_resource path="res://assets/Thesis Clickables/front door.png" type="Texture" id=7]
[ext_resource path="res://assets/Thesis Clickables/front door.png" type="Texture" id=7]
[ext_resource path="res://Scripts/Movement scripts/Balcony door.gd" type="Script" id=8]
[ext_resource path="res://Scripts/Movement scripts/Balcony door.gd" type="Script" id=8]
[ext_resource path="res://Scripts/Movement scripts/Front door.gd" type="Script" id=9]
[ext_resource path="res://Scripts/Movement scripts/Front door.gd" type="Script" id=9]
[ext_resource path="res://Lab
n
ote.gd" type="Script" id=10]
[ext_resource path="res://Lab
N
ote.gd" type="Script" id=10]
[sub_resource type="RectangleShape2D" id=1]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 34.6417, 40.1913 )
extents = Vector2( 34.6417, 40.1913 )
...
@@ -129,8 +129,6 @@ script = ExtResource( 10 )
...
@@ -129,8 +129,6 @@ script = ExtResource( 10 )
__meta__ = {
__meta__ = {
"_edit_group_": true
"_edit_group_": true
}
}
retrievable = true
flavorText = "My lab notes! I wonder how it got there."
[node name="CollisionShape2D" type="CollisionShape2D" parent="Lab notes"]
[node name="CollisionShape2D" type="CollisionShape2D" parent="Lab notes"]
position = Vector2( -16.8367, -2.11676 )
position = Vector2( -16.8367, -2.11676 )
...
...
Main rooms/Neighbor's room.tscn
View file @
505341b9
[gd_scene load_steps=
20
format=2]
[gd_scene load_steps=
19
format=2]
[ext_resource path="res://Scripts/Dialogue control/Dialogue Control - Neighbor's room.gd" type="Script" id=1]
[ext_resource path="res://Scripts/Dialogue control/Dialogue Control - Neighbor's room.gd" type="Script" id=1]
[ext_resource path="res://Item.gd" type="Script" id=2]
[ext_resource path="res://Item.gd" type="Script" id=2]
...
@@ -6,7 +6,6 @@
...
@@ -6,7 +6,6 @@
[ext_resource path="res://assets/Thesis Clickables/Toolbox.png" type="Texture" id=4]
[ext_resource path="res://assets/Thesis Clickables/Toolbox.png" type="Texture" id=4]
[ext_resource path="res://assets/Thesis Clickables/Neighbor.png" type="Texture" id=5]
[ext_resource path="res://assets/Thesis Clickables/Neighbor.png" type="Texture" id=5]
[ext_resource path="res://assets/Thesis Clickables/Balcony door.png" type="Texture" id=6]
[ext_resource path="res://assets/Thesis Clickables/Balcony door.png" type="Texture" id=6]
[ext_resource path="res://item.gd" type="Script" id=7]
[ext_resource path="res://assets/Thesis Clickables/Reptile memorabilia.png" type="Texture" id=8]
[ext_resource path="res://assets/Thesis Clickables/Reptile memorabilia.png" type="Texture" id=8]
[ext_resource path="res://Scripts/Movement scripts/Neighbor to hallway.gd" type="Script" id=9]
[ext_resource path="res://Scripts/Movement scripts/Neighbor to hallway.gd" type="Script" id=9]
[ext_resource path="res://Scripts/Movement scripts/Neighbor to balcony.gd" type="Script" id=10]
[ext_resource path="res://Scripts/Movement scripts/Neighbor to balcony.gd" type="Script" id=10]
...
@@ -111,11 +110,10 @@ texture = ExtResource( 5 )
...
@@ -111,11 +110,10 @@ texture = ExtResource( 5 )
[node name="Reptile memorabilia" type="StaticBody2D" parent="."]
[node name="Reptile memorabilia" type="StaticBody2D" parent="."]
position = Vector2( -333.739, -277.246 )
position = Vector2( -333.739, -277.246 )
input_pickable = true
input_pickable = true
script = ExtResource(
7
)
script = ExtResource(
2
)
__meta__ = {
__meta__ = {
"_edit_group_": true
"_edit_group_": true
}
}
interactable = true
[node name="CollisionShape2D" type="CollisionShape2D" parent="Reptile memorabilia"]
[node name="CollisionShape2D" type="CollisionShape2D" parent="Reptile memorabilia"]
position = Vector2( -0.433167, 2.2196 )
position = Vector2( -0.433167, 2.2196 )
...
...
Main rooms/Test room 1.tscn
View file @
505341b9
...
@@ -26,24 +26,24 @@ load_path = "res://.import/placeholder item.png-cd6e4c1231156687d87915032ec4361d
...
@@ -26,24 +26,24 @@ load_path = "res://.import/placeholder item.png-cd6e4c1231156687d87915032ec4361d
[sub_resource type="RectangleShape2D" id=4]
[sub_resource type="RectangleShape2D" id=4]
extents = Vector2( 16.0697, 9.41678 )
extents = Vector2( 16.0697, 9.41678 )
[sub_resource type="RectangleShape2D" id=
7
]
[sub_resource type="RectangleShape2D" id=
5
]
extents = Vector2( 16.0423, 12.4535 )
extents = Vector2( 16.0423, 12.4535 )
[sub_resource type="StreamTexture" id=
8
]
[sub_resource type="StreamTexture" id=
6
]
flags = 4
flags = 4
load_path = "res://.import/trail 3.png-9960f4c5b964f5aca36ca6c97e309a5d.stex"
load_path = "res://.import/trail 3.png-9960f4c5b964f5aca36ca6c97e309a5d.stex"
[sub_resource type="RectangleShape2D" id=
9
]
[sub_resource type="RectangleShape2D" id=
7
]
extents = Vector2( 16.729, 28.1565 )
extents = Vector2( 16.729, 28.1565 )
[sub_resource type="StreamTexture" id=
10
]
[sub_resource type="StreamTexture" id=
8
]
flags = 4
flags = 4
load_path = "res://.import/trail 3.png-9960f4c5b964f5aca36ca6c97e309a5d.stex"
load_path = "res://.import/trail 3.png-9960f4c5b964f5aca36ca6c97e309a5d.stex"
[sub_resource type="RectangleShape2D" id=
5
]
[sub_resource type="RectangleShape2D" id=
9
]
extents = Vector2( 16.2181, 10.3281 )
extents = Vector2( 16.2181, 10.3281 )
[sub_resource type="RectangleShape2D" id=
6
]
[sub_resource type="RectangleShape2D" id=
10
]
[sub_resource type="RectangleShape2D" id=11]
[sub_resource type="RectangleShape2D" id=11]
...
@@ -149,25 +149,28 @@ interactable = true
...
@@ -149,25 +149,28 @@ interactable = true
[node name="CollisionShape2D" type="CollisionShape2D" parent="Laptop"]
[node name="CollisionShape2D" type="CollisionShape2D" parent="Laptop"]
position = Vector2( -16.4264, -2.27527 )
position = Vector2( -16.4264, -2.27527 )
scale = Vector2( 5, 5 )
scale = Vector2( 5, 5 )
shape = SubResource(
7
)
shape = SubResource(
5
)
[node name="Sprite" type="Sprite" parent="Laptop/CollisionShape2D"]
[node name="Sprite" type="Sprite" parent="Laptop/CollisionShape2D"]
visible = false
visible = false
position = Vector2( -0.277301, -0.137165 )
position = Vector2( -0.277301, -0.137165 )
scale = Vector2( 0.0197574, 0.0197574 )
scale = Vector2( 0.0197574, 0.0197574 )
texture = SubResource(
8
)
texture = SubResource(
6
)
[node name="Bathroom door" type="StaticBody2D" parent="."]
[node name="Bathroom door" type="StaticBody2D" parent="."]
position = Vector2( 588.187, 226.932 )
position = Vector2( 588.187, 226.932 )
scale = Vector2( 0.9, 0.9 )
scale = Vector2( 0.9, 0.9 )
input_pickable = true
input_pickable = true
script = ExtResource( 10 )
script = ExtResource( 10 )
__meta__ = {
"_edit_group_": true
}
interactable = true
interactable = true
[node name="CollisionShape2D" type="CollisionShape2D" parent="Bathroom door"]
[node name="CollisionShape2D" type="CollisionShape2D" parent="Bathroom door"]
position = Vector2( -16.4264, -2.27527 )
position = Vector2( -16.4264, -2.27527 )
scale = Vector2( 5, 5 )
scale = Vector2( 5, 5 )
shape = SubResource(
9
)
shape = SubResource(
7
)
__meta__ = {
__meta__ = {
"_edit_group_": true
"_edit_group_": true
}
}
...
@@ -176,7 +179,7 @@ __meta__ = {
...
@@ -176,7 +179,7 @@ __meta__ = {
visible = false
visible = false
position = Vector2( -0.277301, -0.137165 )
position = Vector2( -0.277301, -0.137165 )
scale = Vector2( 0.0197574, 0.0197574 )
scale = Vector2( 0.0197574, 0.0197574 )
texture = SubResource(
10
)
texture = SubResource(
8
)
[node name="Pants" type="StaticBody2D" parent="."]
[node name="Pants" type="StaticBody2D" parent="."]
position = Vector2( 94.5713, 491.212 )
position = Vector2( 94.5713, 491.212 )
...
@@ -193,7 +196,7 @@ flavorText = "A deconstructed pile of clothes."
...
@@ -193,7 +196,7 @@ flavorText = "A deconstructed pile of clothes."
position = Vector2( -2.31012, 0.749359 )
position = Vector2( -2.31012, 0.749359 )
rotation = 3.57443
rotation = 3.57443
scale = Vector2( 5, 5 )
scale = Vector2( 5, 5 )
shape = SubResource(
5
)
shape = SubResource(
9
)
[node name="Sprite" type="Sprite" parent="Pants/CollisionShape2D"]
[node name="Sprite" type="Sprite" parent="Pants/CollisionShape2D"]
position = Vector2( 0.911179, -3.52747 )
position = Vector2( 0.911179, -3.52747 )
...
@@ -213,7 +216,7 @@ flavorText = "A deconstructed pile of clothes."
...
@@ -213,7 +216,7 @@ flavorText = "A deconstructed pile of clothes."
[node name="CollisionShape2D" type="CollisionShape2D" parent="Shirt"]
[node name="CollisionShape2D" type="CollisionShape2D" parent="Shirt"]
position = Vector2( -1.78223, 0.549072 )
position = Vector2( -1.78223, 0.549072 )
scale = Vector2( 5, 5 )
scale = Vector2( 5, 5 )
shape = SubResource(
6
)
shape = SubResource(
10
)
[node name="Sprite" type="Sprite" parent="Shirt/CollisionShape2D"]
[node name="Sprite" type="Sprite" parent="Shirt/CollisionShape2D"]
position = Vector2( -0.277301, -0.137165 )
position = Vector2( -0.277301, -0.137165 )
...
...
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