Merge branch 'fix' into 'master'

Fixed hitboxes, updated notepad sprite in UI

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

.import/to do list.png-34be8e5695c929a1688989db8c53ed5e.md5

+source_md5="cb4f76f2227d8cbb496cf49669e752ce"
+dest_md5="21f657b313affc8155e39906628f04b5"
+

Main rooms/Balcony.tscn

@@ -43,11 +43,14 @@ func interaction(selected, clicked): #selected = item in inventory, clicked = it
 #	pass
 "
 
+[sub_resource type="RectangleShape2D" id=2]
+extents = Vector2( 19.9228, 46.1471 )
+
 [sub_resource type="RectangleShape2D" id=3]
 extents = Vector2( 19.9228, 32.1977 )
 
 [sub_resource type="RectangleShape2D" id=5]
-extents = Vector2( 34.6417, 55.6661 )
+extents = Vector2( 34.6417, 58.7324 )
 
 [sub_resource type="StreamTexture" id=6]
 flags = 4
@@ -65,7 +68,7 @@ extents = Vector2( 15.6685, 16.4124 )
 [node name="Node2D" type="Node2D"]
 
 [node name="BG" type="Sprite" parent="."]
-position = Vector2( 512.248, 303.008 )
+position = Vector2( 515.248, 303.008 )
 texture = ExtResource( 5 )
 __meta__ = {
 "_edit_lock_": true
@@ -79,24 +82,24 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="Repotted plants" type="StaticBody2D" parent="."]
-visible = false
-position = Vector2( 932.003, 339.541 )
+[node name="Other plants" type="StaticBody2D" parent="."]
+position = Vector2( 283.344, 247.965 )
 scale = Vector2( 0.829244, 0.829244 )
 input_pickable = true
 __meta__ = {
 "_edit_group_": true
 }
 
-[node name="Hitbox" type="CollisionShape2D" parent="Repotted plants"]
+[node name="Hitbox" type="CollisionShape2D" parent="Other plants"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 3 )
 
-[node name="Sprite" type="Sprite" parent="Repotted plants/Hitbox"]
-position = Vector2( 0.127625, 0.542709 )
-scale = Vector2( 0.201615, 0.325884 )
-texture = ExtResource( 8 )
+[node name="Sprite" type="Sprite" parent="Other plants/Hitbox"]
+visible = false
+position = Vector2( 0.449585, 0.542709 )
+scale = Vector2( 0.201615, 0.377395 )
+texture = ExtResource( 1 )
 
 [node name="Door to living room" type="StaticBody2D" parent="."]
 position = Vector2( 99.5567, 249.292 )
@@ -109,19 +112,18 @@ __meta__ = {
 interactable = true
 flavorText = "Clicked"
 
-[node name="Hitbox" type="CollisionShape2D" parent="Door to living room"]
+[node name="Hitbox" type="CollisionShape2D" parent="Repotted plants"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 5 )
 
-[node name="Sprite" type="Sprite" parent="Door to living room/Hitbox"]
-visible = false
-position = Vector2( 0.574005, 0.358818 )
-scale = Vector2( 0.343423, 0.403654 )
-texture = SubResource( 6 )
+[node name="Sprite" type="Sprite" parent="Repotted plants/Hitbox"]
+position = Vector2( 0.127625, 0.542709 )
+scale = Vector2( 0.201615, 0.325884 )
+texture = ExtResource( 8 )
 
-[node name="Other plants" type="StaticBody2D" parent="."]
-position = Vector2( 270.631, 268.094 )
+[node name="Pot" type="StaticBody2D" parent="."]
+position = Vector2( 293.251, 463.181 )
 scale = Vector2( 0.829244, 0.829244 )
 input_pickable = true
 script = ExtResource( 7 )
@@ -131,40 +133,37 @@ __meta__ = {
 interactable = true
 flavorText = "Great listeners! Terrible conversationalists."
 
-[node name="Hitbox" type="CollisionShape2D" parent="Other plants"]
+[node name="Hitbox" type="CollisionShape2D" parent="Pot"]
 position = Vector2( -16.8367, -2.11676 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 2 )
 
-[node name="Sprite" type="Sprite" parent="Other plants/Hitbox"]
-visible = false
-position = Vector2( 0.449585, 0.542709 )
-scale = Vector2( 0.201615, 0.377395 )
-texture = ExtResource( 1 )
+[node name="Sprite" type="Sprite" parent="Pot/Hitbox"]
+position = Vector2( -0.00619507, -0.0649719 )
+scale = Vector2( 0.155235, 0.155235 )
+texture = ExtResource( 3 )
 
-[node name="Pot" type="StaticBody2D" parent="."]
-position = Vector2( 300.667, 452.587 )
+[node name="Door to living room" type="StaticBody2D" parent="."]
+position = Vector2( 104.854, 273.66 )
 scale = Vector2( 0.829244, 0.829244 )
 input_pickable = true
-script = ExtResource( 2 )
-__meta__ = {
-"_edit_group_": true
-}
-retrievable = true
-flavorText = "A pant plot-- I mean... a plant pot."
+script = ExtResource( 6 )
+interactable = true
+flavorText = "Clicked"
 
-[node name="Hitbox" type="CollisionShape2D" parent="Pot"]
-position = Vector2( -16.8367, -2.11676 )
+[node name="Hitbox" type="CollisionShape2D" parent="Door to living room"]
+position = Vector2( -36.0011, -20.0035 )
 scale = Vector2( 5, 5 )
 shape = SubResource( 4 )
 
-[node name="Sprite" type="Sprite" parent="Pot/Hitbox"]
-position = Vector2( -0.00619507, -0.0649719 )
-scale = Vector2( 0.155235, 0.155235 )
-texture = ExtResource( 3 )
+[node name="Sprite" type="Sprite" parent="Door to living room/Hitbox"]
+visible = false
+position = Vector2( 0.574005, 0.358818 )
+scale = Vector2( 0.343423, 0.403654 )
+texture = SubResource( 6 )
 
 [node name="Nana" type="StaticBody2D" parent="."]
-position = Vector2( 208.515, 529.666 )
+position = Vector2( 204.277, 524.369 )
 scale = Vector2( 0.829244, 0.829244 )
 input_pickable = true
 script = ExtResource( 2 )

Multi.tscn

-[gd_scene load_steps=40 format=2]
+[gd_scene load_steps=41 format=2]
 
 [ext_resource path="res://Main rooms/Test room 1.tscn" type="PackedScene" id=1]
 [ext_resource path="res://assets/189066690_228150108704696_3850052974465333899_n.png" type="Texture" id=2]
@@ -33,6 +33,7 @@
 [ext_resource path="res://Paths/Bedroom.tres" type="Curve2D" id=31]
 [ext_resource path="res://Main rooms/Living room - Notepad.tscn" type="PackedScene" id=32]
 [ext_resource path="res://Cutscenes/Cutscene 3.tscn" type="PackedScene" id=33]
+[ext_resource path="res://assets/Thesis Clickables/to do list.png" type="Texture" id=34]
 
 [sub_resource type="Animation" id=1]
 resource_name = "Notepad open"
@@ -47,7 +48,7 @@ tracks/0/keys = {
 "times": PoolRealArray( 0, 0.1, 0.2, 0.4, 0.5 ),
 "transitions": PoolRealArray( 1, 1, 1, 1, 1 ),
 "update": 0,
-"values": [ Vector2( 474.699, 104.779 ), Vector2( 474.699, 90.9202 ), Vector2( 474.699, 116.119 ), Vector2( 474.699, -64.0501 ), Vector2( 474.699, -72.8696 ) ]
+"values": [ Vector2( 458.436, 104.779 ), Vector2( 458.436, 90.92 ), Vector2( 458.436, 116.119 ), Vector2( 458.436, -64.05 ), Vector2( 458.436, -72.87 ) ]
 }
 
 [sub_resource type="StyleBoxFlat" id=2]
@@ -195,15 +196,18 @@ __meta__ = {
 "anims/Notepad open" = SubResource( 1 )
 
 [node name="To do" type="StaticBody2D" parent="UI"]
-position = Vector2( 474.699, 104.779 )
+position = Vector2( 458.436, 104.779 )
 z_index = 1
 input_pickable = true
 script = ExtResource( 16 )
-__meta__ = {
-"_edit_group_": true
-}
 
-[node name="Panel" type="Panel" parent="UI/To do"]
+[node name="Panel" type="Sprite" parent="UI/To do"]
+position = Vector2( 150.967, 149.796 )
+scale = Vector2( 0.629082, 0.629082 )
+texture = ExtResource( 34 )
+
+[node name="Panel3" type="Panel" parent="UI/To do"]
+visible = false
 margin_right = 287.0
 margin_bottom = 393.0
 mouse_filter = 2
@@ -215,10 +219,10 @@ __meta__ = {
 [node name="Title" type="RichTextLabel" parent="UI/To do"]
 anchor_right = 1.0
 anchor_bottom = 1.0
-margin_left = 13.0
-margin_top = 16.0
-margin_right = 265.0
-margin_bottom = 116.0
+margin_left = 8.05023
+margin_top = 31.5565
+margin_right = 260.05
+margin_bottom = 131.556
 mouse_filter = 2
 custom_colors/default_color = Color( 0, 0, 0, 1 )
 text = "To Do (click to expand):"
@@ -227,10 +231,10 @@ __meta__ = {
 }
 
 [node name="Quests" type="RichTextLabel" parent="UI/To do"]
-margin_left = 14.7614
-margin_top = 39.8421
-margin_right = 272.761
-margin_bottom = 256.842
+margin_left = 9.10454
+margin_top = 61.7625
+margin_right = 267.104
+margin_bottom = 278.762
 mouse_filter = 2
 custom_colors/default_color = Color( 0, 0, 0, 1 )
 script = ExtResource( 11 )
@@ -258,6 +262,7 @@ __meta__ = {
 }
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="UI/To do"]
+visible = false
 position = Vector2( 144.013, 197.335 )
 shape = SubResource( 4 )
 

Special views/Desk.tscn

@@ -47,7 +47,7 @@ shape = SubResource( 1 )
 
 [node name="Sprite" type="Sprite" parent="Laptop/Hitbox"]
 position = Vector2( -0.573227, 0.64563 )
-scale = Vector2( 0.403654, 0.403654 )
+scale = Vector2( 0.15, 0.15 )
 texture = ExtResource( 2 )
 
 [node name="Return" type="StaticBody2D" parent="."]

assets/Thesis Clickables/to do list.png.import

+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/to do list.png-34be8e5695c929a1688989db8c53ed5e.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/Thesis Clickables/to do list.png"
+dest_files=[ "res://.import/to do list.png-34be8e5695c929a1688989db8c53ed5e.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