Commit 48ba7cfc authored by Julia Santos's avatar Julia Santos

Reverted some z-index changes, background just goes to -1 instead while the...

Reverted some z-index changes, background just goes to -1 instead while the items stay at 0, also edited something to make it export-ready
parent f159159e
source_md5="aa7cb0418e5e5bdf7d1a37085215dd76"
dest_md5="16b98f6c6117ecc78ac623f7356ee208"
...@@ -64,26 +64,9 @@ func _groceries_put_away(): # when the groceries are put away ...@@ -64,26 +64,9 @@ func _groceries_put_away(): # when the groceries are put away
fridge.get_node("Granola bar").show() fridge.get_node("Granola bar").show()
groceries = true groceries = true
laundryArea.get_node("Laundry door").flavorText = "I think I'm still missing something..." laundryArea.get_node("Laundry door").flavorText = "I think I'm still missing something..."
var oilImage = Image.new() inventory.add_item("Oil", load("res://.import/Oil.png-29f84e969418d0f4084115c5ce859866.stex"))
var oilTexture = ImageTexture.new() inventory.add_item("Cleaning mat", load("res://.import/cleaning materials.png-9e1abb8a1d84afe3085c773f150c7347.stex"))
oilImage.load("res://assets/Thesis Clickables/Oil.png") inventory.add_item("Laundry detergent",load("res://.import/laundry detergent.png-79948b488e3c228ce282a9186c4bcf0c.stex"))
oilTexture.create_from_image(oilImage)
inventory.add_item("Oil", oilTexture)
var cleanImage = Image.new()
var cleanTexture = ImageTexture.new()
#cleanImage.load("res://assets/Thesis Clickables/cleaning materials.png")
#cleanTexture.create_from_image(cleanImage)
cleanTexture = load("res://.import/cleaning materials.png-9e1abb8a1d84afe3085c773f150c7347.stex")
inventory.add_item("Cleaning mat",cleanTexture)
var detergentImage = Image.new()
var detergentTexture = ImageTexture.new()
#detergentImage.load("res://assets/Thesis Clickables/laundry detergent.png")
#detergentTexture.create_from_image(detergentImage)
detergentTexture = load("res://.import/laundry detergent.png-79948b488e3c228ce282a9186c4bcf0c.stex")
#laundry detergent.png-79948b488e3c228ce282a9186c4bcf0c.stex
inventory.add_item("Laundry detergent",detergentTexture)
func _eaten(): # completing first "Eat" quest func _eaten(): # completing first "Eat" quest
quests.finishQuest("Eat") quests.finishQuest("Eat")
......
...@@ -91,6 +91,7 @@ texture = ExtResource( 1 ) ...@@ -91,6 +91,7 @@ texture = ExtResource( 1 )
[node name="Laundry basket" type="StaticBody2D" parent="."] [node name="Laundry basket" type="StaticBody2D" parent="."]
position = Vector2( 408.964, 304.1 ) position = Vector2( 408.964, 304.1 )
z_index = -1
input_pickable = true input_pickable = true
script = ExtResource( 9 ) script = ExtResource( 9 )
__meta__ = { __meta__ = {
...@@ -111,7 +112,6 @@ texture = ExtResource( 2 ) ...@@ -111,7 +112,6 @@ texture = ExtResource( 2 )
[node name="Terrarium" type="StaticBody2D" parent="."] [node name="Terrarium" type="StaticBody2D" parent="."]
position = Vector2( 463.667, 393.29 ) position = Vector2( 463.667, 393.29 )
z_index = 1
input_pickable = true input_pickable = true
script = ExtResource( 12 ) script = ExtResource( 12 )
__meta__ = { __meta__ = {
...@@ -175,6 +175,7 @@ texture = SubResource( 7 ) ...@@ -175,6 +175,7 @@ texture = SubResource( 7 )
[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 )
z_index = -1
input_pickable = true input_pickable = true
script = ExtResource( 10 ) script = ExtResource( 10 )
__meta__ = { __meta__ = {
...@@ -199,7 +200,6 @@ texture = SubResource( 9 ) ...@@ -199,7 +200,6 @@ texture = SubResource( 9 )
[node name="Pants" type="StaticBody2D" parent="."] [node name="Pants" type="StaticBody2D" parent="."]
position = Vector2( 94.5713, 491.212 ) position = Vector2( 94.5713, 491.212 )
scale = Vector2( 0.8, 0.8 ) scale = Vector2( 0.8, 0.8 )
z_index = 1
input_pickable = true input_pickable = true
script = ExtResource( 13 ) script = ExtResource( 13 )
__meta__ = { __meta__ = {
...@@ -221,7 +221,6 @@ texture = ExtResource( 6 ) ...@@ -221,7 +221,6 @@ texture = ExtResource( 6 )
[node name="Shirt" type="StaticBody2D" parent="."] [node name="Shirt" type="StaticBody2D" parent="."]
position = Vector2( 230.393, 406.988 ) position = Vector2( 230.393, 406.988 )
z_index = 1
input_pickable = true input_pickable = true
script = ExtResource( 13 ) script = ExtResource( 13 )
__meta__ = { __meta__ = {
...@@ -244,7 +243,6 @@ texture = ExtResource( 5 ) ...@@ -244,7 +243,6 @@ texture = ExtResource( 5 )
position = Vector2( -217.928, 395.301 ) position = Vector2( -217.928, 395.301 )
rotation = -3.0456 rotation = -3.0456
scale = Vector2( 0.9, 0.9 ) scale = Vector2( 0.9, 0.9 )
z_index = 1
input_pickable = true input_pickable = true
script = ExtResource( 13 ) script = ExtResource( 13 )
__meta__ = { __meta__ = {
...@@ -266,7 +264,6 @@ texture = SubResource( 13 ) ...@@ -266,7 +264,6 @@ texture = SubResource( 13 )
[node name="Towel" type="StaticBody2D" parent="."] [node name="Towel" type="StaticBody2D" parent="."]
position = Vector2( -67.9803, 464.817 ) position = Vector2( -67.9803, 464.817 )
rotation = 2.74191 rotation = 2.74191
z_index = 1
input_pickable = true input_pickable = true
script = ExtResource( 13 ) script = ExtResource( 13 )
__meta__ = { __meta__ = {
......
...@@ -58,7 +58,6 @@ bg_color = Color( 0.466667, 0.631373, 0.168627, 1 ) ...@@ -58,7 +58,6 @@ bg_color = Color( 0.466667, 0.631373, 0.168627, 1 )
bg_color = Color( 0.145098, 0.145098, 0.164706, 1 ) bg_color = Color( 0.145098, 0.145098, 0.164706, 1 )
[node name="Node2D" type="Node2D"] [node name="Node2D" type="Node2D"]
z_index = -1
[node name="Bedroom" parent="." instance=ExtResource( 1 )] [node name="Bedroom" parent="." instance=ExtResource( 1 )]
script = ExtResource( 4 ) script = ExtResource( 4 )
...@@ -163,6 +162,7 @@ __meta__ = { ...@@ -163,6 +162,7 @@ __meta__ = {
[node name="To do" type="StaticBody2D" parent="UI"] [node name="To do" type="StaticBody2D" parent="UI"]
position = Vector2( 474.699, 104.779 ) position = Vector2( 474.699, 104.779 )
z_index = 1
input_pickable = true input_pickable = true
script = ExtResource( 16 ) script = ExtResource( 16 )
__meta__ = { __meta__ = {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
[ext_resource path="res://assets/Thesis Clickables/scissors.png" type="Texture" id=4] [ext_resource path="res://assets/Thesis Clickables/scissors.png" type="Texture" id=4]
[ext_resource path="res://Scripts/Dialogue control/Dialogue Control - Inside cabinet.gd" type="Script" id=5] [ext_resource path="res://Scripts/Dialogue control/Dialogue Control - Inside cabinet.gd" type="Script" id=5]
[ext_resource path="res://Scripts/Movement scripts/Return_cabinet.gd" type="Script" id=6] [ext_resource path="res://Scripts/Movement scripts/Return_cabinet.gd" type="Script" id=6]
[ext_resource path="res://Lab note.gd" type="Script" id=7] [ext_resource path="res://Lab Note.gd" type="Script" id=7]
[sub_resource type="RectangleShape2D" id=1] [sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 10.2686, 10.4499 ) extents = Vector2( 10.2686, 10.4499 )
......
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
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
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/icon.png-b6a7fb2db36edd3d95dc42f1dc8c1c5d.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/icon.png"
dest_files=[ "res://.import/icon.png-b6a7fb2db36edd3d95dc42f1dc8c1c5d.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
[preset.0]
name="01 To Do (Break Down)"
platform="Windows Desktop"
runnable=true
custom_features=""
export_filter="all_resources"
include_filter=""
exclude_filter=""
export_path="../../To Do (Break Down).exe"
script_export_mode=1
script_encryption_key=""
[preset.0.options]
custom_template/debug=""
custom_template/release=""
binary_format/64_bits=true
binary_format/embed_pck=false
texture_format/bptc=false
texture_format/s3tc=true
texture_format/etc=false
texture_format/etc2=false
texture_format/no_bptc_fallbacks=true
codesign/enable=false
codesign/identity_type=0
codesign/identity=""
codesign/password=""
codesign/timestamp=true
codesign/timestamp_server_url=""
codesign/digest_algorithm=1
codesign/description=""
codesign/custom_options=PoolStringArray( )
application/icon="res://assets/icon.ico"
application/file_version=""
application/product_version=""
application/company_name="Reyes, Santos, and Tsai"
application/product_name="To Do Break Down"
application/file_description=""
application/copyright=""
application/trademarks=""
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