Commit 09691a69 authored by Julia Santos's avatar Julia Santos

Added plant sprites

parent bddd80e3
source_md5="cfb210bb4468e51e0bad8dcd975d0abb"
dest_md5="ec27430d09f65df41ac8db06007872c8"
source_md5="3c5734e64d03fdd2a0a136d9b5105ad4"
dest_md5="bb450409b40e5463b44fa9e499608950"
source_md5="34b549b6763b4c5ff63d7e67df15017f"
dest_md5="4b18e59d178d7798ccc5172547b6c814"
...@@ -9,7 +9,7 @@ onready var moxie = get_parent().get_node("Moxie") ...@@ -9,7 +9,7 @@ onready var moxie = get_parent().get_node("Moxie")
onready var left = get_parent().get_node("UI/Left") # left arrow onready var left = get_parent().get_node("UI/Left") # left arrow
onready var right = get_parent().get_node("UI/Right") # right arrow onready var right = get_parent().get_node("UI/Right") # right arrow
onready var inventory = get_parent().get_node("UI/Inventory") onready var inventory = get_parent().get_node("UI/Inventory")
onready var deselect = get_parent().get_node("UI/Button") onready var deselect = get_parent().get_node("UI/Inventory control")
onready var energy = get_parent().get_node("UI/Energy bar") onready var energy = get_parent().get_node("UI/Energy bar")
onready var dialogue = get_parent().get_node("UI/Dialogue Box/RichTextLabel") onready var dialogue = get_parent().get_node("UI/Dialogue Box/RichTextLabel")
onready var movementHandle = get_parent().get_node("UI/Movement Handler") # not a UI element, just the node that handles the left/right movement between rooms onready var movementHandle = get_parent().get_node("UI/Movement Handler") # not a UI element, just the node that handles the left/right movement between rooms
...@@ -247,6 +247,7 @@ func _plants_finished(): ...@@ -247,6 +247,7 @@ func _plants_finished():
livingRoom.get_node("Plants").interactable = false livingRoom.get_node("Plants").interactable = false
livingRoom.get_node("Plants").retrievable = true livingRoom.get_node("Plants").retrievable = true
livingRoom.get_node("Plants").flavorText = "Time to bring these outside for some sunlight!" livingRoom.get_node("Plants").flavorText = "Time to bring these outside for some sunlight!"
livingRoom.get_node("Plants/Hitbox/Sprite").set_texture(load("res://.import/potted plant (repotted).png-3dc208dea4408a6b19d704a770115b80.stex"))
inventory.remove_item_name("Pot") inventory.remove_item_name("Pot")
inventory.remove_item_name("Shovel") inventory.remove_item_name("Shovel")
inventory.remove_item_name("Tabo with water") inventory.remove_item_name("Tabo with water")
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
[ext_resource path="res://assets/Backgrounds/balcony_moxie.jpg" type="Texture" id=5] [ext_resource path="res://assets/Backgrounds/balcony_moxie.jpg" type="Texture" id=5]
[ext_resource path="res://Scripts/Movement scripts/Door to living room.gd" type="Script" id=6] [ext_resource path="res://Scripts/Movement scripts/Door to living room.gd" type="Script" id=6]
[ext_resource path="res://Scripts/Other plants.gd" type="Script" id=7] [ext_resource path="res://Scripts/Other plants.gd" type="Script" id=7]
[ext_resource path="res://assets/Thesis Clickables/potted plant (repotted).png" type="Texture" id=8]
[sub_resource type="GDScript" id=1] [sub_resource type="GDScript" id=1]
script/source = "extends Control script/source = "extends Control
...@@ -48,21 +49,17 @@ extents = Vector2( 15.2784, 49.98 ) ...@@ -48,21 +49,17 @@ extents = Vector2( 15.2784, 49.98 )
[sub_resource type="RectangleShape2D" id=3] [sub_resource type="RectangleShape2D" id=3]
extents = Vector2( 19.9773, 38.0507 ) extents = Vector2( 19.9773, 38.0507 )
[sub_resource type="StreamTexture" id=4] [sub_resource type="RectangleShape2D" id=4]
flags = 4
load_path = "res://.import/other plants.png-8902b95d40871e2122cfbd88be258a08.stex"
[sub_resource type="RectangleShape2D" id=5]
extents = Vector2( 28.1752, 60.0101 ) extents = Vector2( 28.1752, 60.0101 )
[sub_resource type="StreamTexture" id=6] [sub_resource type="StreamTexture" id=5]
flags = 4 flags = 4
load_path = "res://.import/Balcony door.png-b1c8d05a5eb532517313dc4785195288.stex" load_path = "res://.import/Balcony door.png-b1c8d05a5eb532517313dc4785195288.stex"
[sub_resource type="RectangleShape2D" id=7] [sub_resource type="RectangleShape2D" id=6]
extents = Vector2( 15.1887, 16.2857 ) extents = Vector2( 15.1887, 16.2857 )
[sub_resource type="RectangleShape2D" id=8] [sub_resource type="RectangleShape2D" id=7]
extents = Vector2( 15.6685, 16.4124 ) extents = Vector2( 15.6685, 16.4124 )
[node name="Node2D3" type="Node2D"] [node name="Node2D3" type="Node2D"]
...@@ -106,24 +103,26 @@ texture = ExtResource( 1 ) ...@@ -106,24 +103,26 @@ texture = ExtResource( 1 )
[node name="Repotted plants" type="StaticBody2D" parent="."] [node name="Repotted plants" type="StaticBody2D" parent="."]
visible = false visible = false
position = Vector2( 371.274, 292.927 ) position = Vector2( 329.402, 328.563 )
scale = Vector2( 0.829244, 0.829244 ) scale = Vector2( 0.829244, 0.829244 )
input_pickable = true input_pickable = true
script = ExtResource( 2 )
__meta__ = { __meta__ = {
"_edit_group_": true "_edit_group_": true
} }
interactable = true
[node name="Hitbox" type="CollisionShape2D" parent="Repotted plants"] [node name="h" type="CollisionShape2D" parent="Repotted plants"]
position = Vector2( -16.8367, -2.11676 ) position = Vector2( -16.8367, -2.11676 )
scale = Vector2( 5, 5 ) scale = Vector2( 5, 5 )
shape = SubResource( 3 ) shape = SubResource( 3 )
disabled = true
[node name="Hitbox" type="CollisionPolygon2D" parent="Repotted plants"]
position = Vector2( -14.5888, 0.596802 )
scale = Vector2( 0.3, 0.3 )
polygon = PoolVector2Array( 146, -573, 146, -565.3, 137, -502.4, 195.6, -561.8, 208, -556.7, 208, -551.1, 237, -480, 237, -473.7, 241.1, -418.4, 294, -438.5, 294, -426.6, 310, -407.6, 310, -389.5, 270.4, -261, 266.4, -261, 214, -205.6, 311, -208.3, 311, -195.9, 295, -125, 290, -125, 226, -64, 220.1, -64, 150.9, -52.3, 228.7, -5, 233.9, -5, 327, 31.2, 327, 37.2, 348, 91.1, 348, 101.8, 335.5, 178, 331.2, 178, 307, 212.3, 307, 216.1, 232.1, 568, 225.2, 568, 179.2, 589, 170.9, 589, 73.5, 598, -35.8, 598, -191, 573.5, -191, 564.9, -234.3, 376.5, -253, 371.8, -253, 355.9, -241, 347.3, -269.7, 206.6, -309, 158.6, -309, 152.7, -318.9, 97, -313, 97, -287.9, 30, -282.9, 30, -173, -43, -169.2, -43, -9.5, -83.3, -130, -98.2, -130, -102.4, -247, -175.5, -247, -180.8, -286.8, -265, -274.5, -265, -257.5, -284, -250.4, -284, -228.8, -286.7, -280, -357.8, -280, -362.8, -301.4, -461, -286.3, -461, -218.3, -437.6, -236, -480, -236, -493.1, -228, -529, -220.2, -529, -177, -538.4, -177, -529.8, -127.5, -490.3, -113.3, -501.7, -106.4, -498.4, -92.8, -553, -87.8, -553, -65.9, -573, -56.1, -573, -24, -543.4, -24, -537.1, -15.7, -502.7, 30.8, -570, 33.6, -570, 72.9, -600, 128, -600 )
[node name="Sprite" type="Sprite" parent="Repotted plants/Hitbox"] [node name="Sprite" type="Sprite" parent="Repotted plants/Hitbox"]
position = Vector2( 0.449585, 0.542709 ) texture = ExtResource( 8 )
scale = Vector2( 0.201615, 0.377395 )
texture = SubResource( 4 )
[node name="Door to living room" type="StaticBody2D" parent="."] [node name="Door to living room" type="StaticBody2D" parent="."]
position = Vector2( 146.173, 286.373 ) position = Vector2( 146.173, 286.373 )
...@@ -139,13 +138,13 @@ flavorText = "Clicked" ...@@ -139,13 +138,13 @@ flavorText = "Clicked"
[node name="Hitbox" type="CollisionShape2D" parent="Door to living room"] [node name="Hitbox" type="CollisionShape2D" parent="Door to living room"]
position = Vector2( -36.0011, -20.0035 ) position = Vector2( -36.0011, -20.0035 )
scale = Vector2( 5, 5 ) scale = Vector2( 5, 5 )
shape = SubResource( 5 ) shape = SubResource( 4 )
[node name="Sprite" type="Sprite" parent="Door to living room/Hitbox"] [node name="Sprite" type="Sprite" parent="Door to living room/Hitbox"]
visible = false visible = false
position = Vector2( 0.574005, 0.358818 ) position = Vector2( 0.574005, 0.358818 )
scale = Vector2( 0.343423, 0.403654 ) scale = Vector2( 0.343423, 0.403654 )
texture = SubResource( 6 ) texture = SubResource( 5 )
[node name="Pot" type="StaticBody2D" parent="."] [node name="Pot" type="StaticBody2D" parent="."]
position = Vector2( 334.116, 428.79 ) position = Vector2( 334.116, 428.79 )
...@@ -171,7 +170,7 @@ texture = ExtResource( 3 ) ...@@ -171,7 +170,7 @@ texture = ExtResource( 3 )
visible = false visible = false
position = Vector2( -16.8367, -2.11676 ) position = Vector2( -16.8367, -2.11676 )
scale = Vector2( 5, 5 ) scale = Vector2( 5, 5 )
shape = SubResource( 7 ) shape = SubResource( 6 )
disabled = true disabled = true
[node name="Nana" type="StaticBody2D" parent="."] [node name="Nana" type="StaticBody2D" parent="."]
...@@ -188,7 +187,7 @@ flavorText = "That's enough shenanigans from you for today." ...@@ -188,7 +187,7 @@ flavorText = "That's enough shenanigans from you for today."
[node name="Hitbox" type="CollisionShape2D" parent="Nana"] [node name="Hitbox" type="CollisionShape2D" parent="Nana"]
position = Vector2( -16.8367, -2.11676 ) position = Vector2( -16.8367, -2.11676 )
scale = Vector2( 5, 5 ) scale = Vector2( 5, 5 )
shape = SubResource( 8 ) shape = SubResource( 7 )
[node name="Sprite" type="Sprite" parent="Nana/Hitbox"] [node name="Sprite" type="Sprite" parent="Nana/Hitbox"]
position = Vector2( -0.00619507, -0.0649719 ) position = Vector2( -0.00619507, -0.0649719 )
......
...@@ -40,7 +40,7 @@ extents = Vector2( 34.2254, 111.257 ) ...@@ -40,7 +40,7 @@ extents = Vector2( 34.2254, 111.257 )
extents = Vector2( 205.176, 46.6856 ) extents = Vector2( 205.176, 46.6856 )
[sub_resource type="RectangleShape2D" id=8] [sub_resource type="RectangleShape2D" id=8]
extents = Vector2( 82.0634, 51.3664 ) extents = Vector2( 44.5322, 31.5077 )
[sub_resource type="RectangleShape2D" id=9] [sub_resource type="RectangleShape2D" id=9]
extents = Vector2( 35.5088, 57.7678 ) extents = Vector2( 35.5088, 57.7678 )
...@@ -221,11 +221,11 @@ retrievable = true ...@@ -221,11 +221,11 @@ retrievable = true
flavorText = "Good for holding my hair up or picking into small spaces." flavorText = "Good for holding my hair up or picking into small spaces."
[node name="Hitbox" type="CollisionShape2D" parent="Bobby pins"] [node name="Hitbox" type="CollisionShape2D" parent="Bobby pins"]
position = Vector2( 6.81549, -18.2035 ) position = Vector2( 37.288, -1.65586 )
shape = SubResource( 8 ) shape = SubResource( 8 )
[node name="Sprite" type="Sprite" parent="Bobby pins/Hitbox"] [node name="Sprite" type="Sprite" parent="Bobby pins/Hitbox"]
position = Vector2( 55.2519, 38.6937 ) position = Vector2( -23.6973, 0.805664 )
scale = Vector2( 0.03, 0.03 ) scale = Vector2( 0.03, 0.03 )
texture = ExtResource( 15 ) texture = ExtResource( 15 )
...@@ -241,7 +241,7 @@ __meta__ = { ...@@ -241,7 +241,7 @@ __meta__ = {
} }
[node name="Sprite2" type="Sprite" parent="Bobby pins"] [node name="Sprite2" type="Sprite" parent="Bobby pins"]
position = Vector2( -11.209, 30.0396 ) position = Vector2( 56.7495, -2.99609 )
rotation = 0.131935 rotation = 0.131935
scale = Vector2( 0.06, 0.06 ) scale = Vector2( 0.06, 0.06 )
texture = ExtResource( 16 ) texture = ExtResource( 16 )
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
[ext_resource path="res://Scripts/Laundry door.gd" type="Script" id=4] [ext_resource path="res://Scripts/Laundry door.gd" type="Script" id=4]
[ext_resource path="res://Scripts/Dialogue control/Dialogue control - Laundry area.gd" type="Script" id=5] [ext_resource path="res://Scripts/Dialogue control/Dialogue control - Laundry area.gd" type="Script" id=5]
[ext_resource path="res://Scripts/Groceries.gd" type="Script" id=6] [ext_resource path="res://Scripts/Groceries.gd" type="Script" id=6]
[ext_resource path="res://assets/Thesis Clickables/groceries.png" type="Texture" id=7]
[sub_resource type="RectangleShape2D" id=1] [sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 35.8254, 38.2746 ) extents = Vector2( 35.8254, 38.2746 )
...@@ -17,11 +18,7 @@ load_path = "res://.import/placeholder item.png-cd6e4c1231156687d87915032ec4361d ...@@ -17,11 +18,7 @@ load_path = "res://.import/placeholder item.png-cd6e4c1231156687d87915032ec4361d
[sub_resource type="RectangleShape2D" id=3] [sub_resource type="RectangleShape2D" id=3]
extents = Vector2( 16.7582, 15.6005 ) extents = Vector2( 16.7582, 15.6005 )
[sub_resource type="StreamTexture" id=4] [sub_resource type="RectangleShape2D" id=4]
flags = 4
load_path = "res://.import/placeholder item.png-cd6e4c1231156687d87915032ec4361d.stex"
[sub_resource type="RectangleShape2D" id=5]
extents = Vector2( 15.4169, 13.9691 ) extents = Vector2( 15.4169, 13.9691 )
[node name="Laundry area" type="Node2D"] [node name="Laundry area" type="Node2D"]
...@@ -77,7 +74,7 @@ __meta__ = { ...@@ -77,7 +74,7 @@ __meta__ = {
} }
[node name="Groceries" type="StaticBody2D" parent="."] [node name="Groceries" type="StaticBody2D" parent="."]
position = Vector2( 358.306, 464.043 ) position = Vector2( 358.306, 437.614 )
scale = Vector2( 0.829244, 0.829244 ) scale = Vector2( 0.829244, 0.829244 )
input_pickable = true input_pickable = true
script = ExtResource( 6 ) script = ExtResource( 6 )
...@@ -87,17 +84,23 @@ __meta__ = { ...@@ -87,17 +84,23 @@ __meta__ = {
interactable = true interactable = true
flavorText = "Gotta put these away before they go bad or I trip on them. But legs... Too short... Can't reach pantry shelves... Why did I put them so high up anyway?" flavorText = "Gotta put these away before they go bad or I trip on them. But legs... Too short... Can't reach pantry shelves... Why did I put them so high up anyway?"
[node name="Hitbox" type="CollisionShape2D" parent="Groceries"] [node name="Hitbox" type="CollisionPolygon2D" parent="Groceries"]
position = Vector2( 3.17688, 4.86261 )
scale = Vector2( 0.2, 0.2 )
polygon = PoolVector2Array( -233, -554, -233, -544.3, -217.4, -475, -216.8, -508, -206.8, -508, -152.9, -529, -139.9, -529, -38, -527.9, -38, -524.7, 4, -513.7, 4, -503, 6.59998, -459.5, 27, -439.1, 27, -429.3, 8.90002, -377.6, 69.1, -355.1, 96.2, -389, 101.7, -389, 149, -402.5, 193.4, -455, 273, -455, 273, -447.4, 297.3, -416.1, 307.8, -447, 316, -447, 387, -458.8, 387, -453.9, 435, -443, 435, -435, 441.1, -396.9, 491, -368.8, 491, -365.4, 520.3, -327.1, 562, -346.8, 562, -331.7, 572.9, -299, 567.4, -299, 521.4, 466, 511.1, 466, 355, 467.9, 355, 475.9, 339.4, 564, 330, 564, -245, 563, -245, 552.7, -256.7, 468, -500.1, 468, -522, 458.6, -522, 435, -568, -306.7, -568, -334, -542.1, -334, -576.1, -512, -564.4, -512, -337, -571.7, -337, -577.5 )
[node name="Sprite" type="Sprite" parent="Groceries/Hitbox"]
texture = ExtResource( 7 )
[node name="h" type="CollisionShape2D" parent="Groceries"]
visible = false
position = Vector2( 4.11099, 2.53656 ) position = Vector2( 4.11099, 2.53656 )
scale = Vector2( 5, 5 ) scale = Vector2( 5, 5 )
shape = SubResource( 3 ) shape = SubResource( 3 )
disabled = true
[node name="Sprite" type="Sprite" parent="Groceries/Hitbox"]
position = Vector2( -0.186829, 0.46521 )
scale = Vector2( 0.163649, 0.163649 )
texture = SubResource( 4 )
[node name="Label" type="Label" parent="Groceries"] [node name="Label" type="Label" parent="Groceries"]
visible = false
margin_left = -74.0 margin_left = -74.0
margin_top = -27.7054 margin_top = -27.7054
margin_right = 84.0 margin_right = 84.0
...@@ -123,7 +126,7 @@ flavorText = "A sturdy stool." ...@@ -123,7 +126,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( 5 ) shape = SubResource( 4 )
[node name="Sprite" type="Sprite" parent="Stool/Hitbox"] [node name="Sprite" type="Sprite" parent="Stool/Hitbox"]
visible = false visible = false
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
[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/yoga mat.png" type="Texture" id=2] [ext_resource path="res://assets/Thesis Clickables/yoga mat.png" type="Texture" id=2]
[ext_resource path="res://assets/Thesis Clickables/Balcony door.png" type="Texture" id=3] [ext_resource path="res://assets/Thesis Clickables/Balcony door.png" type="Texture" id=3]
[ext_resource path="res://assets/Thesis Clickables/plants.png" type="Texture" id=4] [ext_resource path="res://assets/Thesis Clickables/potted plant (og).png" type="Texture" id=4]
[ext_resource path="res://Scripts/Yoga mat.gd" type="Script" id=5] [ext_resource path="res://Scripts/Yoga mat.gd" type="Script" id=5]
[ext_resource path="res://assets/Thesis Clickables/lab note 1.png" type="Texture" id=6] [ext_resource path="res://assets/Thesis Clickables/lab note 1.png" type="Texture" id=6]
[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]
...@@ -86,7 +86,7 @@ scale = Vector2( 0.264548, 0.403654 ) ...@@ -86,7 +86,7 @@ scale = Vector2( 0.264548, 0.403654 )
texture = ExtResource( 7 ) texture = ExtResource( 7 )
[node name="Plants" type="StaticBody2D" parent="."] [node name="Plants" type="StaticBody2D" parent="."]
position = Vector2( 698.077, 366.572 ) position = Vector2( 666.708, 363.902 )
scale = Vector2( 0.829244, 0.829244 ) scale = Vector2( 0.829244, 0.829244 )
input_pickable = true input_pickable = true
script = ExtResource( 11 ) script = ExtResource( 11 )
...@@ -96,14 +96,19 @@ __meta__ = { ...@@ -96,14 +96,19 @@ __meta__ = {
interactable = true interactable = true
flavorText = "Plants don't complain. So you gotta check on them every now and then. These are in terrible condition though, they're so dry!" flavorText = "Plants don't complain. So you gotta check on them every now and then. These are in terrible condition though, they're so dry!"
[node name="Hitbox" type="CollisionShape2D" parent="Plants"] [node name="h" type="CollisionShape2D" parent="Plants"]
visible = false
position = Vector2( -16.8367, -2.11676 ) position = Vector2( -16.8367, -2.11676 )
scale = Vector2( 5, 5 ) scale = Vector2( 5, 5 )
shape = SubResource( 3 ) shape = SubResource( 3 )
disabled = true
[node name="Hitbox" type="CollisionPolygon2D" parent="Plants"]
position = Vector2( -18.9858, 3.26251 )
scale = Vector2( 0.25, 0.25 )
polygon = PoolVector2Array( 129, -596.7, 145, -568.7, 145, -558.1, 132.9, -494.8, 195.5, -559.8, 208, -554.7, 208, -548.8, 235, -479.9, 235, -473, 239.1, -416.1, 274.9, -432, 288.9, -432, 308, -407.4, 308, -389.5, 269.4, -263, 265.4, -263, 206.9, -201.4, 250.9, -195.5, 309, -209.7, 309, -194.9, 294, -127, 289.1, -127, 226, -66, 220, -66, 145.9, -54.1, 228.8, -3, 233.9, -3, 325, 32.1, 325, 38.1, 346, 91.1, 346, 101.8, 333.5, 178, 329.2, 178, 305, 212.3, 305, 216, 231.1, 566, 224.6, 566, 189.5, 585, 182, 585, 73.5, 596, -35.8, 596, -189, 572.6, -189, 564.2, -267.9, 205.2, -307, 158.6, -307, 152.7, -316.9, 97, -311, 97, -287, 32, -282, 32, -171, -42, -167.2, -42, 0.299988, -84.3, -130, -100.1, -130, -104.5, -246, -177.5, -246, -181.7, -275, -222.8, -275, -229, -279.1, -268, -268.3, -268, -221.4, -281.4, -278, -357.7, -278, -363, -300.6, -459, -285.2, -459, -214.7, -433.4, -232, -470.8, -232, -478.4, -228.3, -527, -218.7, -527, -172, -533.5, -172, -525.6, -125.6, -485.8, -110.7, -498.8, -104.1, -495.7, -91, -553, -85.8, -553, -65.8, -571, -56.1, -571, -26, -543.4, -26, -537, -16.7, -497.2, 41.9, -579, 45.1, -579, 78, -600, 129, -600 )
[node name="Sprite" type="Sprite" parent="Plants/Hitbox"] [node name="Sprite" type="Sprite" parent="Plants/Hitbox"]
position = Vector2( -0.42981, 1.07585 )
scale = Vector2( 0.201448, 0.330516 )
texture = ExtResource( 4 ) texture = ExtResource( 4 )
[node name="Yoga mat" type="StaticBody2D" parent="."] [node name="Yoga mat" type="StaticBody2D" parent="."]
...@@ -133,7 +138,7 @@ polygon = PoolVector2Array( 116, -578.8, 116, -573.6, 171, -526.6, 171, -516, 17 ...@@ -133,7 +138,7 @@ polygon = PoolVector2Array( 116, -578.8, 116, -573.6, 171, -526.6, 171, -516, 17
texture = ExtResource( 2 ) texture = ExtResource( 2 )
[node name="Lab notes" type="StaticBody2D" parent="."] [node name="Lab notes" type="StaticBody2D" parent="."]
position = Vector2( 766.25, 287.798 ) position = Vector2( 706.182, 402.594 )
scale = Vector2( 0.829244, 0.829244 ) scale = Vector2( 0.829244, 0.829244 )
input_pickable = true input_pickable = true
script = ExtResource( 10 ) script = ExtResource( 10 )
......
[gd_scene load_steps=48 format=2] [gd_scene load_steps=50 format=2]
[ext_resource path="res://Main rooms/Test room 1.tscn" type="PackedScene" id=1] [ext_resource path="res://Main rooms/Test room 1.tscn" type="PackedScene" id=1]
[ext_resource path="res://assets/Thesis Clickables/moxie1.png" type="Texture" id=2] [ext_resource path="res://assets/Thesis Clickables/moxie1.png" type="Texture" id=2]
...@@ -37,6 +37,8 @@ ...@@ -37,6 +37,8 @@
[ext_resource path="res://Scripts/Text Animator.gd" type="Script" id=35] [ext_resource path="res://Scripts/Text Animator.gd" type="Script" id=35]
[ext_resource path="res://assets/Fonts/Be Vietnam Bold.tres" type="DynamicFont" id=36] [ext_resource path="res://assets/Fonts/Be Vietnam Bold.tres" type="DynamicFont" id=36]
[ext_resource path="res://assets/Fonts/Be Vietnam.tres" type="DynamicFont" id=37] [ext_resource path="res://assets/Fonts/Be Vietnam.tres" type="DynamicFont" id=37]
[ext_resource path="res://assets/Thesis Clickables/Polygon 1.png" type="Texture" id=38]
[ext_resource path="res://assets/Thesis Clickables/Deselect button.tres" type="StyleBox" id=39]
[sub_resource type="Animation" id=1] [sub_resource type="Animation" id=1]
resource_name = "Notepad open" resource_name = "Notepad open"
...@@ -70,19 +72,19 @@ corner_radius_bottom_right = 36 ...@@ -70,19 +72,19 @@ corner_radius_bottom_right = 36
corner_radius_bottom_left = 36 corner_radius_bottom_left = 36
[sub_resource type="StyleBoxFlat" id=6] [sub_resource type="StyleBoxFlat" id=6]
bg_color = Color( 0.145098, 0.145098, 0.164706, 0.901961 )
corner_radius_top_left = 30
corner_radius_top_right = 30
corner_radius_bottom_right = 30
corner_radius_bottom_left = 30
[sub_resource type="StyleBoxFlat" id=7]
bg_color = Color( 0.168627, 0.156863, 0.219608, 0.937255 ) bg_color = Color( 0.168627, 0.156863, 0.219608, 0.937255 )
corner_radius_top_left = 36 corner_radius_top_left = 36
corner_radius_top_right = 36 corner_radius_top_right = 36
corner_radius_bottom_right = 36 corner_radius_bottom_right = 36
corner_radius_bottom_left = 36 corner_radius_bottom_left = 36
[sub_resource type="StyleBoxFlat" id=7]
bg_color = Color( 0.662745, 0.639216, 0.72549, 1 )
corner_radius_top_left = 500
corner_radius_top_right = 500
corner_radius_bottom_right = 500
corner_radius_bottom_left = 500
[sub_resource type="Animation" id=8] [sub_resource type="Animation" id=8]
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/path = NodePath("RichTextLabel:percent_visible") tracks/0/path = NodePath("RichTextLabel:percent_visible")
...@@ -123,7 +125,7 @@ script = ExtResource( 4 ) ...@@ -123,7 +125,7 @@ script = ExtResource( 4 )
items = [ NodePath("Pants"), NodePath("Shirt"), NodePath("Sando"), NodePath("Towel"), NodePath("Laundry basket"), NodePath("Laptop"), NodePath("Cellphone"), NodePath("Bathroom door"), NodePath("Terrarium") ] items = [ NodePath("Pants"), NodePath("Shirt"), NodePath("Sando"), NodePath("Towel"), NodePath("Laundry basket"), NodePath("Laptop"), NodePath("Cellphone"), NodePath("Bathroom door"), NodePath("Terrarium") ]
[node name="BG" parent="Bedroom" index="1"] [node name="BG" parent="Bedroom" index="1"]
position = Vector2( 192.18, 296.31 ) position = Vector2( 192.923, 293.932 )
[node name="Desk" parent="." instance=ExtResource( 26 )] [node name="Desk" parent="." instance=ExtResource( 26 )]
visible = false visible = false
...@@ -302,10 +304,10 @@ quests = PoolStringArray( "Do laundry" ) ...@@ -302,10 +304,10 @@ quests = PoolStringArray( "Do laundry" )
[node name="Words" type="ItemList" parent="UI/To do"] [node name="Words" type="ItemList" parent="UI/To do"]
visible = false visible = false
anchor_right = 0.267 anchor_right = 0.267
margin_left = 32.8016 margin_left = 31.7422
margin_top = 48.2599 margin_top = 77.9248
margin_right = 252.802 margin_right = 251.743
margin_bottom = 155.26 margin_bottom = 184.925
rect_clip_content = false rect_clip_content = false
custom_styles/bg = SubResource( 3 ) custom_styles/bg = SubResource( 3 )
custom_fonts/font = ExtResource( 37 ) custom_fonts/font = ExtResource( 37 )
...@@ -347,13 +349,46 @@ __meta__ = { ...@@ -347,13 +349,46 @@ __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
[node name="Button" type="Button" parent="UI"] [node name="Inventory control" type="Panel" parent="UI"]
margin_left = 348.838 margin_left = 334.0
margin_top = 169.861 margin_top = 98.0
margin_right = 417.838 margin_right = 429.0
margin_bottom = 200.861 margin_bottom = 146.0
custom_styles/normal = SubResource( 6 ) custom_styles/panel = SubResource( 6 )
text = "Deselect" __meta__ = {
"_edit_group_": true,
"_edit_use_anchors_": false
}
[node name="Inventory right" type="TextureButton" parent="UI/Inventory control"]
margin_left = 65.2903
margin_top = 11.3307
margin_right = 84.2903
margin_bottom = 38.3307
texture_normal = ExtResource( 38 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Inventory left" type="TextureButton" parent="UI/Inventory control"]
margin_left = 28.9565
margin_top = 38.3624
margin_right = 47.9565
margin_bottom = 65.3624
rect_rotation = 180.0
texture_normal = ExtResource( 38 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Deselect" type="Button" parent="UI/Inventory control"]
margin_left = 39.5535
margin_top = 16.442
margin_right = 56.5535
margin_bottom = 33.442
custom_styles/hover = SubResource( 7 )
custom_styles/pressed = ExtResource( 39 )
custom_styles/normal = ExtResource( 39 )
script = ExtResource( 5 ) script = ExtResource( 5 )
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
...@@ -397,11 +432,11 @@ __meta__ = { ...@@ -397,11 +432,11 @@ __meta__ = {
} }
[node name="Dialogue Box" type="Panel" parent="UI"] [node name="Dialogue Box" type="Panel" parent="UI"]
margin_left = 242.45 margin_left = 241.743
margin_top = -368.329 margin_top = -369.036
margin_right = 783.45 margin_right = 782.743
margin_bottom = -276.329 margin_bottom = -277.036
custom_styles/panel = SubResource( 7 ) custom_styles/panel = SubResource( 6 )
__meta__ = { __meta__ = {
"_edit_group_": true, "_edit_group_": true,
"_edit_use_anchors_": false "_edit_use_anchors_": false
...@@ -423,13 +458,13 @@ script = ExtResource( 35 ) ...@@ -423,13 +458,13 @@ script = ExtResource( 35 )
__meta__ = { __meta__ = {
"_edit_use_anchors_": false "_edit_use_anchors_": false
} }
textSpeed = "Medium" textSpeed = "Fast"
[node name="Energy bar" type="ProgressBar" parent="UI"] [node name="Energy bar" type="ProgressBar" parent="UI"]
margin_left = -197.0 margin_left = -197.0
margin_top = -368.0 margin_top = -368.0
margin_right = 236.0 margin_right = 233.0
margin_bottom = -322.0 margin_bottom = -319.0
custom_styles/fg = SubResource( 9 ) custom_styles/fg = SubResource( 9 )
custom_styles/bg = SubResource( 10 ) custom_styles/bg = SubResource( 10 )
value = 50.0 value = 50.0
...@@ -453,7 +488,7 @@ visible = false ...@@ -453,7 +488,7 @@ visible = false
[node name="3" parent="Cutscenes" instance=ExtResource( 33 )] [node name="3" parent="Cutscenes" instance=ExtResource( 33 )]
visible = false visible = false
[connection signal="pressed" from="UI/Button" to="UI/Inventory" method="_on_Button_pressed"] [connection signal="pressed" from="UI/Inventory control/Deselect" to="UI/Inventory" method="_on_Button_pressed"]
[editable path="Bedroom"] [editable path="Bedroom"]
[editable path="Desk"] [editable path="Desk"]
......
...@@ -15,7 +15,6 @@ func playText(): ...@@ -15,7 +15,6 @@ func playText():
textAnimation.track_remove_key(0,1) textAnimation.track_remove_key(0,1)
textAnimation.length = float(textLength)/float(checkSpeed(textSpeed)) textAnimation.length = float(textLength)/float(checkSpeed(textSpeed))
textAnimation.track_insert_key(0, textAnimation.length, 1) textAnimation.track_insert_key(0, textAnimation.length, 1)
print("text: " + str(textLength) + ", animation length: " + str(textAnimation.length))
animationPlayer.play("Dialogue") animationPlayer.play("Dialogue")
......
...@@ -19,11 +19,11 @@ extents = Vector2( 28.921, 12.2725 ) ...@@ -19,11 +19,11 @@ extents = Vector2( 28.921, 12.2725 )
[sub_resource type="RectangleShape2D" id=3] [sub_resource type="RectangleShape2D" id=3]
extents = Vector2( 77.34, 74.1447 ) extents = Vector2( 77.34, 74.1447 )
[sub_resource type="StreamTexture" id=5] [sub_resource type="StreamTexture" id=4]
flags = 4 flags = 4
load_path = "res://.import/return arrow.png-ba7c2fea6c5a220a249845f29bbe9177.stex" load_path = "res://.import/return arrow.png-ba7c2fea6c5a220a249845f29bbe9177.stex"
[sub_resource type="RectangleShape2D" id=4] [sub_resource type="RectangleShape2D" id=5]
extents = Vector2( 17.4279, 15.7667 ) extents = Vector2( 17.4279, 15.7667 )
[node name="Node2D" type="Node2D"] [node name="Node2D" type="Node2D"]
...@@ -95,7 +95,6 @@ scale = Vector2( 0.2, -0.2 ) ...@@ -95,7 +95,6 @@ scale = Vector2( 0.2, -0.2 )
polygon = PoolVector2Array( 656, -316.9, 656, -311, 687, -237, 687, -229.1, 673.9, -195, 669.8, -195, 608.8, -141, 605, -141, 458, -78.4, 289.7, 20, 214.5, 20, 187, 36, 229.5, 38.6, 242.2, 21.2, 256, 25.8, 256, 31.7, 260.1, 40, 289, 40, 347.9, 52, 346, 70, 338.9, 70, 157.9, 186, 153.4, 186, -167.4, 288, -171.9, 288, -362, 328, -387.8, 328, -554, 331.2, -554, 328.6, -692, 307.6, -692, 301, -703.6, 283.6, -698, 273, -695.3, 273, -624.3, 197, -620.9, 197, -364.9, 35, -362.6, 35, -100.5, -107, -92.6, -107, -59, -97.6, -59, -88.7, -53, -55.5, -4, -18.5, 98.3, -78.5, 120.9, -143, 134.7, -143, 146.9, -128.2, 225.8, -150.3, 499.3, -310, 504.4, -310, 606.8, -316.6, 611, -326.2, 611, -342.1 ) polygon = PoolVector2Array( 656, -316.9, 656, -311, 687, -237, 687, -229.1, 673.9, -195, 669.8, -195, 608.8, -141, 605, -141, 458, -78.4, 289.7, 20, 214.5, 20, 187, 36, 229.5, 38.6, 242.2, 21.2, 256, 25.8, 256, 31.7, 260.1, 40, 289, 40, 347.9, 52, 346, 70, 338.9, 70, 157.9, 186, 153.4, 186, -167.4, 288, -171.9, 288, -362, 328, -387.8, 328, -554, 331.2, -554, 328.6, -692, 307.6, -692, 301, -703.6, 283.6, -698, 273, -695.3, 273, -624.3, 197, -620.9, 197, -364.9, 35, -362.6, 35, -100.5, -107, -92.6, -107, -59, -97.6, -59, -88.7, -53, -55.5, -4, -18.5, 98.3, -78.5, 120.9, -143, 134.7, -143, 146.9, -128.2, 225.8, -150.3, 499.3, -310, 504.4, -310, 606.8, -316.6, 611, -326.2, 611, -342.1 )
[node name="Sprite" type="Sprite" parent="Shovel/Hitbox"] [node name="Sprite" type="Sprite" parent="Shovel/Hitbox"]
scale = Vector2( 1, 1 )
texture = ExtResource( 8 ) texture = ExtResource( 8 )
[node name="Scissors" type="StaticBody2D" parent="."] [node name="Scissors" type="StaticBody2D" parent="."]
...@@ -143,7 +142,6 @@ polygon = PoolVector2Array( 161, -489.4, 161, -487.2, 408, -454.3, 408, -450.9, ...@@ -143,7 +142,6 @@ polygon = PoolVector2Array( 161, -489.4, 161, -487.2, 408, -454.3, 408, -450.9,
[node name="Sprite" type="Sprite" parent="Nana\'s food/Hitbox"] [node name="Sprite" type="Sprite" parent="Nana\'s food/Hitbox"]
position = Vector2( 0, -0.00012207 ) position = Vector2( 0, -0.00012207 )
scale = Vector2( 1, 1 )
texture = ExtResource( 3 ) texture = ExtResource( 3 )
[node name="g" type="CollisionShape2D" parent="Nana\'s food"] [node name="g" type="CollisionShape2D" parent="Nana\'s food"]
...@@ -169,12 +167,11 @@ scale = Vector2( 0.197539, 0.197539 ) ...@@ -169,12 +167,11 @@ scale = Vector2( 0.197539, 0.197539 )
polygon = PoolVector2Array( -79, -406.4, -79, -171, 453.4, -171, 469, -163.2, 469, -155, 471, 161, 460.2, 161, -79, 170.8, -79, 411.2, -122, 414.9, -122, 405.6, -447.7, 0.399994, -442.3, -11, -439.7, -11, -110, -414.5, -110, -418.5, -98.1, -423.8 ) polygon = PoolVector2Array( -79, -406.4, -79, -171, 453.4, -171, 469, -163.2, 469, -155, 471, 161, 460.2, 161, -79, 170.8, -79, 411.2, -122, 414.9, -122, 405.6, -447.7, 0.399994, -442.3, -11, -439.7, -11, -110, -414.5, -110, -418.5, -98.1, -423.8 )
[node name="Sprite" type="Sprite" parent="Return/Hitbox"] [node name="Sprite" type="Sprite" parent="Return/Hitbox"]
scale = Vector2( 1, 1 ) texture = SubResource( 4 )
texture = SubResource( 5 )
[node name="g" type="CollisionShape2D" parent="Return"] [node name="g" type="CollisionShape2D" parent="Return"]
visible = false visible = false
position = Vector2( -2.31012, 0.749359 ) position = Vector2( -2.31012, 0.749359 )
scale = Vector2( 5, 5 ) scale = Vector2( 5, 5 )
shape = SubResource( 4 ) shape = SubResource( 5 )
disabled = true disabled = true
[gd_resource type="StyleBoxFlat" format=2]
[resource]
bg_color = Color( 0.814545, 0.8013, 0.847656, 1 )
corner_radius_top_left = 500
corner_radius_top_right = 500
corner_radius_bottom_right = 500
corner_radius_bottom_left = 500
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/Polygon 1.png-83c034b23660e52b67011cf15195dddb.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/Polygon 1.png"
dest_files=[ "res://.import/Polygon 1.png-83c034b23660e52b67011cf15195dddb.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/potted plant (og).png-381def586512b67b7f45a10eae71a003.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/potted plant (og).png"
dest_files=[ "res://.import/potted plant (og).png-381def586512b67b7f45a10eae71a003.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/potted plant (repotted).png-3dc208dea4408a6b19d704a770115b80.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Thesis Clickables/potted plant (repotted).png"
dest_files=[ "res://.import/potted plant (repotted).png-3dc208dea4408a6b19d704a770115b80.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
...@@ -7,7 +7,7 @@ custom_features="" ...@@ -7,7 +7,7 @@ custom_features=""
export_filter="all_resources" export_filter="all_resources"
include_filter="" include_filter=""
exclude_filter="" exclude_filter=""
export_path="../To Do (Break Down).exe" export_path="../Exports/To Do (Break Down).exe"
script_export_mode=1 script_export_mode=1
script_encryption_key="" script_encryption_key=""
......
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