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
3de1862f
Commit
3de1862f
authored
Feb 07, 2022
by
Julia Santos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added kitchen sink to get water from
parent
ea6c07be
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
52 additions
and
10 deletions
+52
-10
Kitchen.tscn
Main rooms/Kitchen.tscn
+39
-9
Multi.tscn
Multi.tscn
+1
-1
Kitchen Sink.gd
Scripts/Kitchen Sink.gd
+12
-0
No files found.
Main rooms/Kitchen.tscn
View file @
3de1862f
[gd_scene load_steps=
17
format=2]
[gd_scene load_steps=
20
format=2]
[ext_resource path="res://assets/Backgrounds/kitchen.jpg" type="Texture" id=1]
[ext_resource path="res://assets/Backgrounds/kitchen.jpg" type="Texture" id=1]
[ext_resource path="res://assets/placeholder item.png" type="Texture" id=2]
[ext_resource path="res://assets/placeholder item.png" type="Texture" id=2]
...
@@ -9,6 +9,7 @@
...
@@ -9,6 +9,7 @@
[ext_resource path="res://Scripts/Fridge.gd" type="Script" id=7]
[ext_resource path="res://Scripts/Fridge.gd" type="Script" id=7]
[ext_resource path="res://Scripts/Movement scripts/Cabinet.gd" type="Script" id=8]
[ext_resource path="res://Scripts/Movement scripts/Cabinet.gd" type="Script" id=8]
[ext_resource path="res://assets/Thesis Clickables/granola.png" type="Texture" id=9]
[ext_resource path="res://assets/Thesis Clickables/granola.png" type="Texture" id=9]
[ext_resource path="res://Scripts/Kitchen Sink.gd" type="Script" id=10]
[sub_resource type="RectangleShape2D" id=1]
[sub_resource type="RectangleShape2D" id=1]
...
@@ -19,17 +20,24 @@ extents = Vector2( 27.3341, 38.3652 )
...
@@ -19,17 +20,24 @@ extents = Vector2( 27.3341, 38.3652 )
flags = 4
flags = 4
load_path = "res://.import/placeholder item.png-cd6e4c1231156687d87915032ec4361d.stex"
load_path = "res://.import/placeholder item.png-cd6e4c1231156687d87915032ec4361d.stex"
[sub_resource type="RectangleShape2D" id=4]
[sub_resource type="RectangleShape2D" id=10]
extents = Vector2( 13.7101, 7.33546 )
[sub_resource type="StreamTexture" id=11]
flags = 4
load_path = "res://.import/placeholder item.png-cd6e4c1231156687d87915032ec4361d.stex"
[sub_resource type="RectangleShape2D" id=12]
extents = Vector2( 24.763, 17.5829 )
extents = Vector2( 24.763, 17.5829 )
[sub_resource type="StreamTexture" id=
5
]
[sub_resource type="StreamTexture" id=
13
]
flags = 4
flags = 4
load_path = "res://.import/placeholder item.png-cd6e4c1231156687d87915032ec4361d.stex"
load_path = "res://.import/placeholder item.png-cd6e4c1231156687d87915032ec4361d.stex"
[sub_resource type="RectangleShape2D" id=
6
]
[sub_resource type="RectangleShape2D" id=
8
]
extents = Vector2( 15.4169, 13.9691 )
extents = Vector2( 15.4169, 13.9691 )
[sub_resource type="RectangleShape2D" id=
7
]
[sub_resource type="RectangleShape2D" id=
9
]
extents = Vector2( 9.26066, 9.03523 )
extents = Vector2( 9.26066, 9.03523 )
[node name="Node2D" type="Node2D"]
[node name="Node2D" type="Node2D"]
...
@@ -94,6 +102,28 @@ position = Vector2( -0.158181, -0.0184715 )
...
@@ -94,6 +102,28 @@ position = Vector2( -0.158181, -0.0184715 )
scale = Vector2( 0.101337, 0.101337 )
scale = Vector2( 0.101337, 0.101337 )
texture = SubResource( 3 )
texture = SubResource( 3 )
[node name="Sink" type="StaticBody2D" parent="."]
position = Vector2( 240.853, 315.984 )
scale = Vector2( 0.829244, 0.829244 )
input_pickable = true
script = ExtResource( 10 )
__meta__ = {
"_edit_group_": true
}
interactable = true
flavorText = "Not covered in dishes, for once."
[node name="Hitbox" type="CollisionShape2D" parent="Sink"]
position = Vector2( 31.7679, -0.411346 )
scale = Vector2( 5, 5 )
shape = SubResource( 10 )
[node name="Sprite" type="Sprite" parent="Sink/Hitbox"]
visible = false
position = Vector2( -0.158181, -0.0184715 )
scale = Vector2( 0.101337, 0.101337 )
texture = SubResource( 11 )
[node name="Cabinet" type="StaticBody2D" parent="."]
[node name="Cabinet" type="StaticBody2D" parent="."]
position = Vector2( 119.154, 171.637 )
position = Vector2( 119.154, 171.637 )
scale = Vector2( 0.829244, 0.829244 )
scale = Vector2( 0.829244, 0.829244 )
...
@@ -108,13 +138,13 @@ flavorText = "This cabinet is horribly jammed. I'll have to deal with it eventua
...
@@ -108,13 +138,13 @@ flavorText = "This cabinet is horribly jammed. I'll have to deal with it eventua
[node name="Hitbox" type="CollisionShape2D" parent="Cabinet"]
[node name="Hitbox" type="CollisionShape2D" parent="Cabinet"]
position = Vector2( 7.28166, -20.2055 )
position = Vector2( 7.28166, -20.2055 )
scale = Vector2( 5, 5 )
scale = Vector2( 5, 5 )
shape = SubResource(
4
)
shape = SubResource(
12
)
[node name="Sprite" type="Sprite" parent="Cabinet/Hitbox"]
[node name="Sprite" type="Sprite" parent="Cabinet/Hitbox"]
visible = false
visible = false
position = Vector2( -0.158181, -0.0184715 )
position = Vector2( -0.158181, -0.0184715 )
scale = Vector2( 0.101337, 0.101337 )
scale = Vector2( 0.101337, 0.101337 )
texture = SubResource(
5
)
texture = SubResource(
13
)
[node name="Stool" type="StaticBody2D" parent="."]
[node name="Stool" type="StaticBody2D" parent="."]
visible = false
visible = false
...
@@ -130,7 +160,7 @@ flavorText = "A sturdy stool."
...
@@ -130,7 +160,7 @@ flavorText = "A sturdy stool."
[node name="Hitbox" type="CollisionShape2D" parent="Stool"]
[node name="Hitbox" type="CollisionShape2D" parent="Stool"]
position = Vector2( 1.25211, 0.295086 )
position = Vector2( 1.25211, 0.295086 )
scale = Vector2( 5, 5 )
scale = Vector2( 5, 5 )
shape = SubResource(
6
)
shape = SubResource(
8
)
[node name="Sprite" type="Sprite" parent="Stool/Hitbox"]
[node name="Sprite" type="Sprite" parent="Stool/Hitbox"]
visible = false
visible = false
...
@@ -163,7 +193,7 @@ flavorText = "Crunchy. But not as filling. And very hard to open."
...
@@ -163,7 +193,7 @@ flavorText = "Crunchy. But not as filling. And very hard to open."
visible = false
visible = false
position = Vector2( -0.433167, 2.2196 )
position = Vector2( -0.433167, 2.2196 )
scale = Vector2( 5, 5 )
scale = Vector2( 5, 5 )
shape = SubResource(
7
)
shape = SubResource(
9
)
disabled = true
disabled = true
[node name="Hitbox" type="CollisionPolygon2D" parent="Granola bar"]
[node name="Hitbox" type="CollisionPolygon2D" parent="Granola bar"]
...
...
Multi.tscn
View file @
3de1862f
...
@@ -158,7 +158,7 @@ items = [ NodePath("Laundry door"), NodePath("Groceries"), NodePath("Stool") ]
...
@@ -158,7 +158,7 @@ items = [ NodePath("Laundry door"), NodePath("Groceries"), NodePath("Stool") ]
[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") ]
items = [ NodePath("Fridge"), NodePath("Cabinet"), NodePath("Stool"), NodePath("Granola bar")
, NodePath("Sink")
]
[node name="Fridge" parent="." instance=ExtResource( 17 )]
[node name="Fridge" parent="." instance=ExtResource( 17 )]
visible = false
visible = false
...
...
Scripts/Kitchen Sink.gd
0 → 100644
View file @
3de1862f
extends "res://Item.gd"
func _ready():
pass # Replace with function body.
func objInteraction(selected):
if inventory.get_item_text(selected) == "Tabo":
inventory.add_item("Tabo with water", load("res://.import/tabo (with water).png-3eb7036eb5e151adbbfd6e3d610a078e.stex"))
inventory.remove_item(selected)
dialogueBox.text = "Hydration."
else:
dialogueBox.text = "This doesn't really need washing."
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