Commit 2331ef22 authored by Julia Santos's avatar Julia Santos

Added more placeholder items, fixed collision boxes of bathroom items

parent c47fc7d9
source_md5="252955f11e8a5873ec845cf2b9441802"
dest_md5="61aaac67fcaa5d7ccd1e335954c5de59"
source_md5="fcee2bdfdbfde71c21136cde711d010c"
dest_md5="276f45a4f118498535218a6cfce17a19"
source_md5="7a9bb560b322fa5f7841450b4387e3d6"
dest_md5="6459d50cc3e89989fb962536a9f39165"
source_md5="516d02d47af60a02ad1cc668ba1890e7"
dest_md5="fe09bd26a21822e4a597d4d48e6ef0dd"
source_md5="abf8a530ec0f9ea8a8a1ce47fcac915c"
dest_md5="980f2a0398ec541d9229a5c993fe9f8c"
source_md5="f874bd2ab7f0046d45d68d81bac68b3c"
dest_md5="6175ef927e3367632dd39ee9e8d3b6c9"
source_md5="df724a34342f5e6de7254c9135810207"
dest_md5="79023fa2a3896817bf807ef3cb09415c"
source_md5="dd113756bc46dd7c5690bdce2d8bed0b"
dest_md5="867f0c6e0a47dbad66b45c19eaf5937c"
source_md5="d0f54b7fb0b09abf4272d3401365b116"
dest_md5="de306ba8ef99f87656cf6de869c8ba86"
......@@ -7,27 +7,36 @@
[ext_resource path="res://assets/placeholder item.png" type="Texture" id=5]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 156.074, 141.192 )
[sub_resource type="RectangleShape2D" id=2]
extents = Vector2( 56.6453, 56.4341 )
[sub_resource type="RectangleShape2D" id=3]
extents = Vector2( 91.0989, 130.014 )
[sub_resource type="RectangleShape2D" id=4]
extents = Vector2( 194.116, 92.9518 )
[sub_resource type="RectangleShape2D" id=5]
extents = Vector2( 69.006, 185 )
[sub_resource type="RectangleShape2D" id=6]
extents = Vector2( 38.6637, 100.122 )
[sub_resource type="RectangleShape2D" id=7]
extents = Vector2( 82.0634, 51.3664 )
[sub_resource type="RectangleShape2D" id=8]
extents = Vector2( 35.5088, 57.7678 )
[sub_resource type="RectangleShape2D" id=9]
extents = Vector2( 39.2613, 32.3414 )
[node name="Bathroom" type="Node2D"]
[node name="BG" type="Sprite" parent="."]
visible = false
position = Vector2( 640, 257 )
texture = ExtResource( 2 )
__meta__ = {
......@@ -35,7 +44,8 @@ __meta__ = {
}
[node name="Mirror" type="StaticBody2D" parent="."]
position = Vector2( 529.891, 258.782 )
position = Vector2( 375.163, 247.488 )
input_pickable = true
script = ExtResource( 4 )
__meta__ = {
"_edit_group_": true
......@@ -47,7 +57,7 @@ flavorText = "Fun to write on. I should wipe this down, though."
shape = SubResource( 1 )
[node name="Sprite" type="Sprite" parent="Mirror/CollisionShape2D"]
position = Vector2( 87.9999, -76.5 )
position = Vector2( 1.57028, 0.94989 )
scale = Vector2( 1.58, 1.405 )
texture = ExtResource( 3 )
......@@ -62,8 +72,9 @@ __meta__ = {
}
[node name="Lab Note - Bathroom" type="StaticBody2D" parent="."]
position = Vector2( 535, 103 )
position = Vector2( 307.312, 129.87 )
scale = Vector2( 0.842056, 0.913043 )
input_pickable = true
script = ExtResource( 4 )
__meta__ = {
"_edit_group_": true
......@@ -75,22 +86,23 @@ flavorText = "My lab notes! I wonder how it got there."
shape = SubResource( 2 )
[node name="Sprite" type="Sprite" parent="Lab Note - Bathroom/CollisionShape2D"]
position = Vector2( -15, 3.99999 )
position = Vector2( 0.996033, 0.311905 )
scale = Vector2( 0.55, 0.56 )
texture = ExtResource( 5 )
[node name="Label" type="Label" parent="Lab Note - Bathroom/CollisionShape2D"]
margin_left = -58.0
margin_top = -38.0
margin_right = 76.0
margin_bottom = 31.0
margin_left = -27.3409
margin_top = -29.3945
margin_right = 106.659
margin_bottom = 39.6055
text = "LAB NOTE"
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Toilet" type="StaticBody2D" parent="."]
position = Vector2( 932, 384 )
position = Vector2( 704.312, 410.87 )
input_pickable = true
script = ExtResource( 4 )
__meta__ = {
"_edit_group_": true
......@@ -102,22 +114,23 @@ flavorText = "Toilet. A little clogged. No way am I sticking my hand in that."
shape = SubResource( 3 )
[node name="Sprite" type="Sprite" parent="Toilet/CollisionShape2D"]
position = Vector2( -10, 4.99999 )
position = Vector2( 0.102173, -0.612312 )
scale = Vector2( 0.9, 1.31 )
texture = ExtResource( 3 )
[node name="Label" type="Label" parent="Toilet/CollisionShape2D"]
margin_left = -52.0
margin_top = -66.0
margin_right = 44.0
margin_bottom = 14.0
margin_left = -26.1833
margin_top = -55.8979
margin_right = 69.8167
margin_bottom = 24.1021
text = "TOILET"
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Sink" type="StaticBody2D" parent="."]
position = Vector2( 545, 430 )
position = Vector2( 374.557, 450.135 )
input_pickable = true
script = ExtResource( 4 )
__meta__ = {
"_edit_group_": true
......@@ -129,21 +142,23 @@ flavorText = "Sink. Stinky. Sinky. Do I have anything to clean this up with?"
shape = SubResource( 4 )
[node name="Sprite" type="Sprite" parent="Sink/CollisionShape2D"]
position = Vector2( 66, -7 )
position = Vector2( -1.34778, -2.51019 )
scale = Vector2( 1.95, 0.93 )
texture = ExtResource( 3 )
[node name="Label" type="Label" parent="Sink/CollisionShape2D"]
margin_top = -59.0
margin_right = 49.0
margin_bottom = 14.0
margin_left = -17.9594
margin_top = -48.8978
margin_right = 31.0406
margin_bottom = 24.1022
text = "SINK"
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Door - to Bedroom" type="StaticBody2D" parent="."]
position = Vector2( 1162, 175 )
position = Vector2( 934.312, 201.87 )
input_pickable = true
script = ExtResource( 4 )
__meta__ = {
"_edit_group_": true
......@@ -159,7 +174,8 @@ visible = false
texture = ExtResource( 3 )
[node name="Plunger" type="StaticBody2D" parent="."]
position = Vector2( 1057, 422 )
position = Vector2( 829.312, 448.87 )
input_pickable = true
script = ExtResource( 4 )
__meta__ = {
"_edit_group_": true
......@@ -171,14 +187,14 @@ flavorText = "Smells like rubber."
shape = SubResource( 6 )
[node name="Sprite" type="Sprite" parent="Plunger/CollisionShape2D"]
position = Vector2( 7.49999, 0 )
position = Vector2( 3.01013, 0 )
scale = Vector2( 0.405, 1 )
texture = ExtResource( 5 )
[node name="Label" type="Label" parent="Plunger/CollisionShape2D"]
margin_left = -23.0
margin_left = -27.4899
margin_top = -58.0
margin_right = 43.0
margin_right = 38.5101
margin_bottom = 14.0
text = "PLUNGER"
__meta__ = {
......@@ -186,7 +202,8 @@ __meta__ = {
}
[node name="Bobby Pins" type="StaticBody2D" parent="."]
position = Vector2( 284, 426 )
position = Vector2( 81.7675, 465.598 )
input_pickable = true
script = ExtResource( 4 )
__meta__ = {
"_edit_group_": true
......@@ -198,20 +215,23 @@ flavorText = "Good for holding my hair up or picking into small spaces."
shape = SubResource( 7 )
[node name="Sprite" type="Sprite" parent="Bobby Pins/CollisionShape2D"]
position = Vector2( 16.5, 33.5 )
position = Vector2( -0.336975, -1.2963 )
scale = Vector2( 0.835, 0.525 )
texture = ExtResource( 5 )
[node name="Label" type="Label" parent="Bobby Pins/CollisionShape2D"]
margin_right = 79.0
margin_bottom = 14.0
margin_left = -41.6223
margin_top = -33.2978
margin_right = 37.3777
margin_bottom = -19.2978
text = "BOBBY PINS"
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Trash" type="StaticBody2D" parent="."]
position = Vector2( 1138, 424 )
position = Vector2( 926.026, 491.279 )
input_pickable = true
script = ExtResource( 4 )
__meta__ = {
"_edit_group_": true
......@@ -223,20 +243,23 @@ flavorText = "Ew."
shape = SubResource( 8 )
[node name="Sprite" type="Sprite" parent="Trash/CollisionShape2D"]
position = Vector2( 18.5, 43.5 )
position = Vector2( -3.94922, -2.52094 )
scale = Vector2( 0.395, 0.565 )
texture = ExtResource( 5 )
[node name="Label" type="Label" parent="Trash/CollisionShape2D"]
margin_right = 40.0
margin_bottom = 14.0
margin_left = -21.3268
margin_top = -30.3065
margin_right = 19.6732
margin_bottom = -16.3065
text = "TRASH"
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Tabo" type="StaticBody2D" parent="."]
position = Vector2( 912, 210 )
position = Vector2( 684.312, 236.87 )
input_pickable = true
script = ExtResource( 4 )
__meta__ = {
"_edit_group_": true
......@@ -248,14 +271,15 @@ flavorText = "Hydration."
shape = SubResource( 9 )
[node name="Sprite" type="Sprite" parent="Tabo/CollisionShape2D"]
position = Vector2( 5.5, 14 )
position = Vector2( -0.112305, 2.77536 )
scale = Vector2( 0.405, 0.37 )
texture = ExtResource( 5 )
[node name="Label" type="Label" parent="Tabo/CollisionShape2D"]
margin_right = 40.0
margin_bottom = 14.0
rect_scale = Vector2( 1.08777, 3.19456 )
margin_left = -18.8519
margin_top = 17.1214
margin_right = 17.1481
margin_bottom = 31.1214
text = "TABO"
__meta__ = {
"_edit_use_anchors_": false
......
extends Control
onready var rooms = [self.owner.get_node("Bedroom"), self.owner.get_node("Laundry area"), self.owner.get_node("Kitchen")] # array of all the screens available to Moxie at the moment
onready var rooms = [self.owner.get_node("Bedroom"), self.owner.get_node("Laundry area"), self.owner.get_node("Kitchen"), self.owner.get_node("Bathroom")] # array of all the screens available to Moxie at the moment
onready var current # index of the room Moxie is currently in
onready var left = get_parent().get_node("Left")
onready var right = get_parent().get_node("Right")
......
[gd_scene load_steps=25 format=2]
[gd_scene load_steps=26 format=2]
[ext_resource path="res://Test room 1.tscn" type="PackedScene" id=1]
[ext_resource path="res://assets/189066690_228150108704696_3850052974465333899_n.png" type="Texture" id=2]
......@@ -19,6 +19,7 @@
[ext_resource path="res://Fridge.tscn" type="PackedScene" id=17]
[ext_resource path="res://Laundry - Notepad.tscn" type="PackedScene" id=18]
[ext_resource path="res://Main - Notepad.gd" type="Script" id=19]
[ext_resource path="res://Bathroom.tscn" type="PackedScene" id=20]
[sub_resource type="StyleBoxFlat" id=1]
bg_color = Color( 0.984314, 0.847059, 0.435294, 1 )
......@@ -69,6 +70,11 @@ visible = false
script = ExtResource( 19 )
items = [ NodePath("Washing machine door"), NodePath("Drawer"), NodePath("Soap"), NodePath("Clothes"), NodePath("Return") ]
[node name="Bathroom" parent="." instance=ExtResource( 20 )]
visible = false
script = ExtResource( 4 )
items = [ NodePath("Mirror"), NodePath("Lab Note - Bathroom"), NodePath("Toilet"), NodePath("Sink"), NodePath("Door - to Bedroom"), NodePath("Plunger"), NodePath("Bobby Pins"), NodePath("Trash"), NodePath("Tabo") ]
[node name="Event Handler" type="Node2D" parent="."]
position = Vector2( 460.602, 18.6417 )
script = ExtResource( 12 )
......@@ -259,3 +265,4 @@ __meta__ = {
[editable path="Laundry area"]
[editable path="Fridge"]
[editable path="Laundry - Notepad"]
[editable path="Bathroom"]
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/Balcony door.png-b1c8d05a5eb532517313dc4785195288.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/Balcony door.png"
dest_files=[ "res://.import/Balcony door.png-b1c8d05a5eb532517313dc4785195288.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
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/Lab Notes.png-ad6045bd2bdc13e2f1c1a25473097e1c.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/Lab Notes.png"
dest_files=[ "res://.import/Lab Notes.png-ad6045bd2bdc13e2f1c1a25473097e1c.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
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/Ladder.png-29e47ae1385fc6f036c55041d2f03000.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/Ladder.png"
dest_files=[ "res://.import/Ladder.png-29e47ae1385fc6f036c55041d2f03000.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
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/Nana's food.png-f8840935f02227b107ffe2d2b1755925.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/Nana's food.png"
dest_files=[ "res://.import/Nana's food.png-f8840935f02227b107ffe2d2b1755925.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
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/Neighbor.png-606d93b7fbb3138423826c166553d228.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/Neighbor.png"
dest_files=[ "res://.import/Neighbor.png-606d93b7fbb3138423826c166553d228.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
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/Reptile memorabilia.png-fe86479194f4ed6be4745d29ec1d6501.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/Reptile memorabilia.png"
dest_files=[ "res://.import/Reptile memorabilia.png-fe86479194f4ed6be4745d29ec1d6501.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
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/Screwdriver.png-87c542eaf219f05b01d5899f350f5c91.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/Screwdriver.png"
dest_files=[ "res://.import/Screwdriver.png-87c542eaf219f05b01d5899f350f5c91.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
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/Toolbox.png-aad5074879e9968712ed99f01d072f37.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/Toolbox.png"
dest_files=[ "res://.import/Toolbox.png-aad5074879e9968712ed99f01d072f37.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
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/scissors.png-838c4a6ee2d970762403400753d6981a.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/scissors.png"
dest_files=[ "res://.import/scissors.png-838c4a6ee2d970762403400753d6981a.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