Merge branch 'bathroom' into 'master'

Uploaded Bathroom

See merge request breakdown/Reyes-Santos-Tsai-Thesis!1

Bathroom.tscn

+[gd_scene load_steps=15 format=2]
+
+[ext_resource path="res://Dialogue Contro - Bathrooml.gd" type="Script" id=1]
+[ext_resource path="res://assets/room zoom out.png" type="Texture" id=2]
+[ext_resource path="res://assets/placeholder.png" type="Texture" id=3]
+[ext_resource path="res://Item.gd" type="Script" id=4]
+[ext_resource path="res://assets/placeholder item.png" type="Texture" id=5]
+
+[sub_resource type="RectangleShape2D" id=1]
+
+[sub_resource type="RectangleShape2D" id=2]
+
+[sub_resource type="RectangleShape2D" id=3]
+
+[sub_resource type="RectangleShape2D" id=4]
+
+[sub_resource type="RectangleShape2D" id=5]
+extents = Vector2( 69.006, 185 )
+
+[sub_resource type="RectangleShape2D" id=6]
+
+[sub_resource type="RectangleShape2D" id=7]
+
+[sub_resource type="RectangleShape2D" id=8]
+
+[sub_resource type="RectangleShape2D" id=9]
+
+[node name="Bathroom" type="Node2D"]
+
+[node name="BG" type="Sprite" parent="."]
+position = Vector2( 640, 257 )
+texture = ExtResource( 2 )
+__meta__ = {
+"_edit_lock_": true
+}
+
+[node name="Mirror" type="StaticBody2D" parent="."]
+position = Vector2( 529.891, 258.782 )
+script = ExtResource( 4 )
+__meta__ = {
+"_edit_group_": true
+}
+interactable = true
+flavorText = "Fun to write on. I should wipe this down, though."
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Mirror"]
+shape = SubResource( 1 )
+
+[node name="Sprite" type="Sprite" parent="Mirror/CollisionShape2D"]
+position = Vector2( 87.9999, -76.5 )
+scale = Vector2( 1.58, 1.405 )
+texture = ExtResource( 3 )
+
+[node name="Label" type="Label" parent="Mirror/CollisionShape2D"]
+margin_left = 5.0
+margin_top = -5.0
+margin_right = 57.0
+margin_bottom = 22.0
+text = "MIRROR"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Lab Note - Bathroom" type="StaticBody2D" parent="."]
+position = Vector2( 535, 103 )
+scale = Vector2( 0.842056, 0.913043 )
+script = ExtResource( 4 )
+__meta__ = {
+"_edit_group_": true
+}
+retrievable = true
+flavorText = "My lab notes! I wonder how it got there."
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Lab Note - Bathroom"]
+shape = SubResource( 2 )
+
+[node name="Sprite" type="Sprite" parent="Lab Note - Bathroom/CollisionShape2D"]
+position = Vector2( -15, 3.99999 )
+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
+text = "LAB NOTE"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Toilet" type="StaticBody2D" parent="."]
+position = Vector2( 932, 384 )
+script = ExtResource( 4 )
+__meta__ = {
+"_edit_group_": true
+}
+interactable = true
+flavorText = "Toilet. A little clogged. No way am I sticking my hand in that."
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Toilet"]
+shape = SubResource( 3 )
+
+[node name="Sprite" type="Sprite" parent="Toilet/CollisionShape2D"]
+position = Vector2( -10, 4.99999 )
+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
+text = "TOILET"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Sink" type="StaticBody2D" parent="."]
+position = Vector2( 545, 430 )
+script = ExtResource( 4 )
+__meta__ = {
+"_edit_group_": true
+}
+interactable = true
+flavorText = "Sink. Stinky. Sinky. Do I have anything to clean this up with?"
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Sink"]
+shape = SubResource( 4 )
+
+[node name="Sprite" type="Sprite" parent="Sink/CollisionShape2D"]
+position = Vector2( 66, -7 )
+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
+text = "SINK"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Door - to Bedroom" type="StaticBody2D" parent="."]
+position = Vector2( 1162, 175 )
+script = ExtResource( 4 )
+__meta__ = {
+"_edit_group_": true
+}
+interactable = true
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Door - to Bedroom"]
+position = Vector2( 30, 65 )
+shape = SubResource( 5 )
+
+[node name="Sprite" type="Sprite" parent="Door - to Bedroom/CollisionShape2D"]
+visible = false
+texture = ExtResource( 3 )
+
+[node name="Plunger" type="StaticBody2D" parent="."]
+position = Vector2( 1057, 422 )
+script = ExtResource( 4 )
+__meta__ = {
+"_edit_group_": true
+}
+retrievable = true
+flavorText = "Smells like rubber."
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Plunger"]
+shape = SubResource( 6 )
+
+[node name="Sprite" type="Sprite" parent="Plunger/CollisionShape2D"]
+position = Vector2( 7.49999, 0 )
+scale = Vector2( 0.405, 1 )
+texture = ExtResource( 5 )
+
+[node name="Label" type="Label" parent="Plunger/CollisionShape2D"]
+margin_left = -23.0
+margin_top = -58.0
+margin_right = 43.0
+margin_bottom = 14.0
+text = "PLUNGER"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Bobby Pins" type="StaticBody2D" parent="."]
+position = Vector2( 284, 426 )
+script = ExtResource( 4 )
+__meta__ = {
+"_edit_group_": true
+}
+retrievable = true
+flavorText = "Good for holding my hair up or picking into small spaces."
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Bobby Pins"]
+shape = SubResource( 7 )
+
+[node name="Sprite" type="Sprite" parent="Bobby Pins/CollisionShape2D"]
+position = Vector2( 16.5, 33.5 )
+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
+text = "BOBBY PINS"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Trash" type="StaticBody2D" parent="."]
+position = Vector2( 1138, 424 )
+script = ExtResource( 4 )
+__meta__ = {
+"_edit_group_": true
+}
+retrievable = true
+flavorText = "Ew."
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Trash"]
+shape = SubResource( 8 )
+
+[node name="Sprite" type="Sprite" parent="Trash/CollisionShape2D"]
+position = Vector2( 18.5, 43.5 )
+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
+text = "TRASH"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Tabo" type="StaticBody2D" parent="."]
+position = Vector2( 912, 210 )
+script = ExtResource( 4 )
+__meta__ = {
+"_edit_group_": true
+}
+retrievable = true
+flavorText = "Hydration."
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Tabo"]
+shape = SubResource( 9 )
+
+[node name="Sprite" type="Sprite" parent="Tabo/CollisionShape2D"]
+position = Vector2( 5.5, 14 )
+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 )
+text = "TABO"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Dialogue Control" type="Control" parent="."]
+margin_right = 40.0
+margin_bottom = 40.0
+script = ExtResource( 1 )
+__meta__ = {
+"_edit_use_anchors_": false
+}

Dialogue Contro - Bathrooml.gd

+extends Control
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	pass # Replace with function body.
+
+func interaction(selected, clicked): #selected = item in inventory, clicked = item in environment 
+	match clicked:
+		"Laundry basket":
+			match selected:
+				"Shirt", "Towel", "Pants", "Sando":
+					return "Into the basket you go."
+
+					
+		"Placeholder 2":
+			match selected:
+				"Placeholder 1":
+					return "Using Placeholder 1 on 2"
+				"Placeholder 3":
+					return "Using Placeholder 3 on 2"
+					
+		"Placeholder 3":
+			match selected:
+				"Placeholder 1":
+					return "Using Placeholder 1 on 3"
+				"Placeholder 2":
+					return "Using Placeholder 1 on 3"
+	
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+#func _process(delta):
+#	pass

Items.gd

+extends StaticBody2D
+
+
+# Declare member variables here. Examples:
+# var a = 2
+# var b = "text"
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	pass # Replace with function body.
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+#func _process(delta):
+#	pass