Skip to content

T
To Do Break Down
Commit 4c12f492 authored by Julia Santos's avatar Julia Santos
Browse files
Options

Some folder restructuring for cleanliness

parent c9b4d7d8
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 66 deletions
Balcony.tscn
View file @ 4c12f492
......@@ -4,8 +4,8 @@
[ext_resource path="res://Item.gd" type="Script" id=2]
[ext_resource path="res://assets/Thesis Clickables/pot.png" type="Texture" id=3]
[ext_resource path="res://assets/Thesis Clickables/nana.png" type="Texture" id=4]
[ext_resource path="res://Dialogue Contro - Living room.gd" type="Script" id=5]
[ext_resource path="res://Door to living room.gd" type="Script" id=6]
[ext_resource path="res://Scripts/Dialogue control/Dialogue Contro - Living room.gd" type="Script" id=5]
[ext_resource path="res://Scripts/Movement scripts/Door to living room.gd" type="Script" id=6]
[sub_resource type="RectangleShape2D" id=6]
extents = Vector2( 19.9228, 36.7719 )
......
Bathroom.tscn
View file @ 4c12f492
[gd_scene load_steps=16 format=2]
[ext_resource path="res://Dialogue control - Bathroom.gd" type="Script" id=1]
[ext_resource path="res://Scripts/Dialogue control/Dialogue Control - Bathroom.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]
[ext_resource path="res://Door - to Bedroom.gd" type="Script" id=6]
[ext_resource path="res://Scripts/Movement scripts/Door - to Bedroom.gd" type="Script" id=6]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 156.074, 141.192 )
......
Desk.tscn
View file @ 4c12f492
[gd_scene load_steps=8 format=2]
[ext_resource path="res://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/laptop.png" type="Texture" id=2]
[ext_resource path="res://Desk_laptop.gd" type="Script" id=3]
[ext_resource path="res://Return_laptop.gd" type="Script" id=4]
[ext_resource path="res://Scripts/Desk_laptop.gd" type="Script" id=3]
[ext_resource path="res://Scripts/Movement scripts/Return_laptop.gd" type="Script" id=4]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 40.1362, 40.1913 )
......
Event Handler.gd
View file @ 4c12f492
......@@ -31,6 +31,7 @@ onready var quests = notepad.get_node("Quests")
onready var groceries = false #if groceries were put away
onready var eat = false # if moxie has eaten the first time
onready var laundry = false #if laundry has been done
onready var newQuests = false
onready var lockedNotepad #if ur locked from certain areas bc u havent gotten the notebook yet
#items in the rooms that need access to the event handler
......@@ -71,6 +72,7 @@ func _start_lab():
quests.add("Clean bathroom")
quests.add("Take care of plants")
quests.add("Figure out what's making that noise")
newQuests = true
# ----------------- Notebook puzzle events -----------------
func _enter_notebook_laundry(): # trying to engage in the notebook puzzle for doing laundry
......
Fridge.tscn
View file @ 4c12f492
......@@ -5,9 +5,9 @@
[ext_resource path="res://assets/Placeholder BGs/ref inside.png" type="Texture" id=3]
[ext_resource path="res://assets/Thesis Clickables/Vienna sausage.png" type="Texture" id=5]
[ext_resource path="res://assets/Thesis Clickables/Granola bar.png" type="Texture" id=6]
[ext_resource path="res://Return_fridge.gd" type="Script" id=7]
[ext_resource path="res://Scripts/Movement scripts/Return_fridge.gd" type="Script" id=7]
[ext_resource path="res://Energy handler.gd" type="Script" id=8]
[ext_resource path="res://Food.gd" type="Script" id=9]
[ext_resource path="res://Scripts/Food.gd" type="Script" id=9]
[ext_resource path="res://assets/Thesis Clickables/eat button.png" type="Texture" id=10]
[ext_resource path="res://assets/Thesis Clickables/cook button.png" type="Texture" id=11]
......
Hallway.tscn
View file @ 4c12f492
[gd_scene load_steps=11 format=2]
[ext_resource path="res://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/trash chute.png" type="Texture" id=2]
[ext_resource path="res://assets/Thesis Clickables/door to neighbor's apartment.png" type="Texture" id=3]
[ext_resource path="res://assets/Thesis Clickables/door to moxie's apartment.png" type="Texture" id=4]
[ext_resource path="res://Item.gd" type="Script" id=5]
[ext_resource path="res://Door to Moxie.gd" type="Script" id=6]
[ext_resource path="res://Door to neighbor.gd" type="Script" id=7]
[ext_resource path="res://Scripts/Movement scripts/Door to Moxie.gd" type="Script" id=6]
[ext_resource path="res://Scripts/Movement scripts/Door to neighbor.gd" type="Script" id=7]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 23.7124, 45.104 )
......
Inside cabinet.tscn
View file @ 4c12f492
......@@ -4,8 +4,8 @@
[ext_resource path="res://Item.gd" type="Script" id=2]
[ext_resource path="res://assets/Thesis Clickables/Nana's food.png" type="Texture" id=3]
[ext_resource path="res://assets/Thesis Clickables/scissors.png" type="Texture" id=4]
[ext_resource path="res://Dialogue control - Inside cabinet.gd" type="Script" id=5]
[ext_resource path="res://Return_cabinet.gd" type="Script" id=6]
[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]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 10.2686, 10.4499 )
......
Kitchen.tscn
View file @ 4c12f492
......@@ -3,11 +3,11 @@
[ext_resource path="res://assets/Placeholder BGs/kitchen area.png" type="Texture" id=1]
[ext_resource path="res://assets/placeholder item.png" type="Texture" id=2]
[ext_resource path="res://Item.gd" type="Script" id=3]
[ext_resource path="res://Dialogue control - Kitchen.gd" type="Script" id=4]
[ext_resource path="res://Scripts/Dialogue control/Dialogue control - Kitchen.gd" type="Script" id=4]
[ext_resource path="res://assets/Thesis Clickables/stool.png" type="Texture" id=5]
[ext_resource path="res://Stool.gd" type="Script" id=6]
[ext_resource path="res://Fridge.gd" type="Script" id=7]
[ext_resource path="res://Cabinet.gd" type="Script" id=8]
[ext_resource path="res://Scripts/Stool.gd" type="Script" id=6]
[ext_resource path="res://Scripts/Fridge.gd" type="Script" id=7]
[ext_resource path="res://Scripts/Movement scripts/Cabinet.gd" type="Script" id=8]
[sub_resource type="RectangleShape2D" id=1]
......
Laundry - Notepad.tscn
View file @ 4c12f492
......@@ -3,13 +3,13 @@
[ext_resource path="res://assets/Placeholder BGs/laundry drawer open.png" type="Texture" id=1]
[ext_resource path="res://assets/Placeholder BGs/laundry all close.png" type="Texture" id=2]
[ext_resource path="res://assets/Thesis Clickables/soap.png" type="Texture" id=3]
[ext_resource path="res://Dialogue control - Laundry notepad.gd" type="Script" id=4]
[ext_resource path="res://Scripts/Dialogue control/Dialogue control - Laundry notepad.gd" type="Script" id=4]
[ext_resource path="res://Item - Notepad.gd" type="Script" id=5]
[ext_resource path="res://assets/Thesis Clickables/drawer.png" type="Texture" id=6]
[ext_resource path="res://assets/Thesis Clickables/washing machine.png" type="Texture" id=7]
[ext_resource path="res://assets/Thesis Clickables/soap pour.png" type="Texture" id=8]
[ext_resource path="res://assets/Thesis Clickables/clothes pile.png" type="Texture" id=9]
[ext_resource path="res://Return_laundry_notepad.gd" type="Script" id=10]
[ext_resource path="res://Scripts/Movement scripts/Return_laundry_notepad.gd" type="Script" id=10]
[ext_resource path="res://assets/Thesis Clickables/return arrow.png" type="Texture" id=11]
[sub_resource type="StreamTexture" id=1]
......
Laundry area.tscn
View file @ 4c12f492
......@@ -3,9 +3,9 @@
[ext_resource path="res://assets/Placeholder BGs/laundry area.png" type="Texture" id=1]
[ext_resource path="res://Item.gd" type="Script" id=2]
[ext_resource path="res://assets/Thesis Clickables/stool.png" type="Texture" id=3]
[ext_resource path="res://Stool.gd" type="Script" id=4]
[ext_resource path="res://Dialogue control - Laundry area.gd" type="Script" id=5]
[ext_resource path="res://Groceries.gd" type="Script" id=6]
[ext_resource path="res://Scripts/Stool.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/Groceries.gd" type="Script" id=6]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 35.8254, 37.878 )
......
Laundry basket.tscn
View file @ 4c12f492
......@@ -3,7 +3,7 @@
[ext_resource path="res://assets/Placeholder BGs/basket zoom.PNG" type="Texture" id=1]
[ext_resource path="res://assets/Placeholder BGs/notebook zoom in.png" type="Texture" id=2]
[ext_resource path="res://To do list.gd" type="Script" id=3]
[ext_resource path="res://Return_laundry_basket.gd" type="Script" id=4]
[ext_resource path="res://Scripts/Movement scripts/Return_laundry_basket.gd" type="Script" id=4]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 16.2181, 18.4658 )
......
Living room.tscn
View file @ 4c12f492
[gd_scene load_steps=15 format=2]
[ext_resource path="res://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/Balcony door.png" type="Texture" id=3]
[ext_resource path="res://assets/Thesis Clickables/plants.png" type="Texture" id=4]
[ext_resource path="res://Item.gd" type="Script" id=5]
[ext_resource path="res://assets/Thesis Clickables/Lab Notes.png" type="Texture" id=6]
[ext_resource path="res://assets/Thesis Clickables/front door.png" type="Texture" id=7]
[ext_resource path="res://Balcony door.gd" type="Script" id=8]
[ext_resource path="res://Front door.gd" type="Script" id=9]
[ext_resource path="res://Scripts/Movement scripts/Balcony door.gd" type="Script" id=8]
[ext_resource path="res://Scripts/Movement scripts/Front door.gd" type="Script" id=9]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 34.6417, 40.1913 )
......
Multi.tscn
View file @ 4c12f492
[gd_scene load_steps=34 format=2]
[gd_scene load_steps=33 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]
[ext_resource path="res://ItemList.gd" type="Script" id=3]
[ext_resource path="res://Main.gd" type="Script" id=4]
[ext_resource path="res://Button.gd" type="Script" id=5]
[ext_resource path="res://Scripts/Button.gd" type="Script" id=5]
[ext_resource path="res://Movement.gd" type="Script" id=6]
[ext_resource path="res://assets/Thesis Clickables/right arrow.png" type="Texture" id=7]
[ext_resource path="res://Kitchen.tscn" type="PackedScene" id=8]
[ext_resource path="res://assets/Thesis Clickables/left arrow.png" type="Texture" id=9]
[ext_resource path="res://Arrows.gd" type="Script" id=10]
[ext_resource path="res://Scripts/Movement scripts/Arrows.gd" type="Script" id=10]
[ext_resource path="res://Quests.gd" type="Script" id=11]
[ext_resource path="res://Event Handler.gd" type="Script" id=12]
[ext_resource path="res://Laundry basket.tscn" type="PackedScene" id=13]
[ext_resource path="res://Laundry area.tscn" type="PackedScene" id=14]
[ext_resource path="res://To do UI.gd" type="Script" id=15]
[ext_resource path="res://To do hitbox.gd" type="Script" id=16]
[ext_resource path="res://Fridge.tscn" type="PackedScene" id=17]
[ext_resource path="res://Laundry - Notepad.tscn" type="PackedScene" id=18]
......@@ -47,9 +46,9 @@ tracks/0/keys = {
[sub_resource type="StyleBoxFlat" id=2]
bg_color = Color( 0.984314, 0.847059, 0.435294, 1 )
[sub_resource type="StyleBoxEmpty" id=4]
[sub_resource type="StyleBoxEmpty" id=3]
[sub_resource type="RectangleShape2D" id=3]
[sub_resource type="RectangleShape2D" id=4]
extents = Vector2( 143.453, 196.701 )
[sub_resource type="StyleBoxFlat" id=5]
......@@ -168,7 +167,6 @@ margin_right = 287.0
margin_bottom = 393.0
mouse_filter = 2
custom_styles/panel = SubResource( 2 )
script = ExtResource( 15 )
__meta__ = {
"_edit_use_anchors_": false
}
......@@ -208,7 +206,7 @@ margin_top = 48.2599
margin_right = 252.802
margin_bottom = 155.26
rect_clip_content = false
custom_styles/bg = SubResource( 4 )
custom_styles/bg = SubResource( 3 )
custom_colors/font_color_selected = Color( 0, 0, 0, 1 )
custom_colors/font_color = Color( 0, 0, 0, 1 )
custom_constants/vseparation = 10
......@@ -220,7 +218,7 @@ __meta__ = {
[node name="CollisionShape2D" type="CollisionShape2D" parent="UI/To do"]
position = Vector2( 144.013, 197.335 )
shape = SubResource( 3 )
shape = SubResource( 4 )
[node name="Inventory" type="ItemList" parent="UI"]
margin_left = -201.361
......
Neighbor's balcony.tscn
View file @ 4c12f492
[gd_scene load_steps=10 format=2]
[ext_resource path="res://assets/Thesis Clickables/nana from a distance.png" type="Texture" id=1]
[ext_resource path="res://Dialogue Control - Neighbor's balcony.gd" type="Script" id=2]
[ext_resource path="res://Scripts/Dialogue control/Dialogue Control - Neighbor's balcony.gd" type="Script" id=2]
[ext_resource path="res://assets/Thesis Clickables/other balcony.png" type="Texture" id=3]
[ext_resource path="res://Item.gd" type="Script" id=4]
[ext_resource path="res://Balcony to neighbor's room.gd" type="Script" id=5]
[ext_resource path="res://Scripts/Movement scripts/Balcony to neighbor's room.gd" type="Script" id=5]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 44.7209, 45.4241 )
......
Neighbor's room.tscn
View file @ 4c12f492
[gd_scene load_steps=20 format=2]
[ext_resource path="res://Dialogue control - Neighbor's room.gd" type="Script" id=1]
[ext_resource path="res://Scripts/Dialogue control/Dialogue Control - Neighbor's room.gd" type="Script" id=1]
[ext_resource path="res://Item.gd" type="Script" id=2]
[ext_resource path="res://assets/Thesis Clickables/Ladder.png" type="Texture" id=3]
[ext_resource path="res://assets/Thesis Clickables/Toolbox.png" type="Texture" id=4]
......@@ -8,25 +8,25 @@
[ext_resource path="res://assets/Thesis Clickables/Balcony door.png" type="Texture" id=6]
[ext_resource path="res://item.gd" type="Script" id=7]
[ext_resource path="res://assets/Thesis Clickables/Reptile memorabilia.png" type="Texture" id=8]
[ext_resource path="res://Neighbor to hallway.gd" type="Script" id=9]
[ext_resource path="res://Neighbor to balcony.gd" type="Script" id=10]
[ext_resource path="res://Scripts/Movement scripts/Neighbor to hallway.gd" type="Script" id=9]
[ext_resource path="res://Scripts/Movement scripts/Neighbor to balcony.gd" type="Script" id=10]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 10.2686, 34.6917 )
[sub_resource type="RectangleShape2D" id=10]
[sub_resource type="RectangleShape2D" id=2]
extents = Vector2( 22.9649, 32.4101 )
[sub_resource type="RectangleShape2D" id=11]
[sub_resource type="RectangleShape2D" id=3]
extents = Vector2( 10.1137, 24.8506 )
[sub_resource type="RectangleShape2D" id=4]
extents = Vector2( 21.453, 8.21959 )
[sub_resource type="RectangleShape2D" id=12]
[sub_resource type="RectangleShape2D" id=5]
extents = Vector2( 15.1935, 10.447 )
[sub_resource type="RectangleShape2D" id=13]
[sub_resource type="RectangleShape2D" id=6]
extents = Vector2( 5.55923, 10.447 )
[sub_resource type="StreamTexture" id=7]
......@@ -85,7 +85,7 @@ interactable = true
[node name="CollisionShape2D" type="CollisionShape2D" parent="Neighbor to balcony"]
position = Vector2( -0.433167, 2.2196 )
scale = Vector2( 5, 5 )
shape = SubResource( 10 )
shape = SubResource( 2 )
[node name="Sprite" type="Sprite" parent="Neighbor to balcony/CollisionShape2D"]
position = Vector2( 0.304169, 0.207489 )
......@@ -104,7 +104,7 @@ interactable = true
[node name="CollisionShape2D" type="CollisionShape2D" parent="Neighbor"]
position = Vector2( -0.433167, 2.2196 )
scale = Vector2( 5, 5 )
shape = SubResource( 11 )
shape = SubResource( 3 )
[node name="Sprite" type="Sprite" parent="Neighbor/CollisionShape2D"]
position = Vector2( 0.178162, -0.170486 )
......@@ -143,7 +143,7 @@ flavorText = "Lotsa reptile stickers. Oh hey a screwdriver!"
[node name="CollisionShape2D" type="CollisionShape2D" parent="Toolbox"]
position = Vector2( -0.433167, 2.2196 )
scale = Vector2( 5, 5 )
shape = SubResource( 12 )
shape = SubResource( 5 )
[node name="Sprite" type="Sprite" parent="Toolbox/CollisionShape2D"]
position = Vector2( 0.304199, -0.170502 )
......@@ -164,7 +164,7 @@ flavorText = "Neighbor's screwdriver. Has a lil' gecko sticker on the handle."
[node name="CollisionShape2D" type="CollisionShape2D" parent="Screwdriver"]
position = Vector2( -0.433167, 2.2196 )
scale = Vector2( 5, 5 )
shape = SubResource( 13 )
shape = SubResource( 6 )
[node name="Sprite" type="Sprite" parent="Screwdriver/CollisionShape2D"]
position = Vector2( -0.0038681, -0.21283 )
......
Test room 1.tscn
View file @ 4c12f492
......@@ -3,14 +3,14 @@
[ext_resource path="res://assets/Placeholder BGs/room zoom out.png" type="Texture" id=1]
[ext_resource path="res://assets/placeholder item.png" type="Texture" id=2]
[ext_resource path="res://Item.gd" type="Script" id=3]
[ext_resource path="res://Dialogue control - Test Room 1.gd" type="Script" id=4]
[ext_resource path="res://Scripts/Dialogue control/Dialogue control - Test Room 1.gd" type="Script" id=4]
[ext_resource path="res://assets/Thesis Clickables/trail 1.png" type="Texture" id=5]
[ext_resource path="res://assets/Thesis Clickables/trail 2.png" type="Texture" id=6]
[ext_resource path="res://Placeholder 4.gd" type="Script" id=7]
[ext_resource path="res://Scripts/Placeholder 4.gd" type="Script" id=7]
[ext_resource path="res://assets/Thesis Clickables/clothes pile.png" type="Texture" id=8]
[ext_resource path="res://Laundry basket.gd" type="Script" id=9]
[ext_resource path="res://Bathroom door.gd" type="Script" id=10]
[ext_resource path="res://Laptop.gd" type="Script" id=11]
[ext_resource path="res://Scripts/Laundry basket.gd" type="Script" id=9]
[ext_resource path="res://Scripts/Movement scripts/Bathroom door.gd" type="Script" id=10]
[ext_resource path="res://Scripts/Laptop.gd" type="Script" id=11]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 14.2862, 14.7497 )
......
To do UI.gd deleted 100644 → 0
View file @ c9b4d7d8
extends Panel
onready var opened = false
#onready var animator = get_parent().get_node("AnimationPlayer")
# Called when the node enters the scene tree for the first time.
func _ready():
pass
# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta):
# pass
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