From f799c4e7e28c778f917f27838fab977d93ab9f44 Mon Sep 17 00:00:00 2001
From: as4s4hetic <hyperbolicfish@outlook.com>
Date: Fri, 21 Jan 2022 13:11:59 +1100
Subject: [PATCH] added furniture to bedrooms

---
 Resources/lodge.tres                    | 140 +++++++++++++++++++++---
 Scenes/Player.tscn                      |  12 +-
 Scripts/CoverControl.gd                 |   2 +-
 Story/Ch1S2.tscn                        |  37 ++++---
 Tiles/Furniture/bed.png                 | Bin 1170 -> 1711 bytes
 Tiles/Furniture/clothes-rack.png        | Bin 0 -> 522 bytes
 Tiles/Furniture/clothes-rack.png.import |  35 ++++++
 Tiles/Furniture/desk-chair.png          | Bin 0 -> 562 bytes
 Tiles/Furniture/desk-chair.png.import   |  35 ++++++
 Tiles/Furniture/desk-set.png            | Bin 0 -> 794 bytes
 Tiles/Furniture/desk-set.png.import     |  35 ++++++
 Tiles/Furniture/desk.png                | Bin 0 -> 413 bytes
 Tiles/Furniture/desk.png.import         |  35 ++++++
 13 files changed, 292 insertions(+), 39 deletions(-)
 create mode 100644 Tiles/Furniture/clothes-rack.png
 create mode 100644 Tiles/Furniture/clothes-rack.png.import
 create mode 100644 Tiles/Furniture/desk-chair.png
 create mode 100644 Tiles/Furniture/desk-chair.png.import
 create mode 100644 Tiles/Furniture/desk-set.png
 create mode 100644 Tiles/Furniture/desk-set.png.import
 create mode 100644 Tiles/Furniture/desk.png
 create mode 100644 Tiles/Furniture/desk.png.import

diff --git a/Resources/lodge.tres b/Resources/lodge.tres
index b10f6f4..fa98116 100644
--- a/Resources/lodge.tres
+++ b/Resources/lodge.tres
@@ -1,4 +1,4 @@
-[gd_resource type="TileSet" load_steps=55 format=2]
+[gd_resource type="TileSet" load_steps=64 format=2]
 
 [ext_resource path="res://Tiles/bedroom.png" type="Texture" id=1]
 [ext_resource path="res://Tiles/living-room.png" type="Texture" id=2]
@@ -15,6 +15,10 @@
 [ext_resource path="res://Tiles/corners.png" type="Texture" id=13]
 [ext_resource path="res://Tiles/black.png" type="Texture" id=14]
 [ext_resource path="res://Tiles/Furniture/bed.png" type="Texture" id=15]
+[ext_resource path="res://Tiles/Furniture/clothes-rack.png" type="Texture" id=16]
+[ext_resource path="res://Tiles/Furniture/desk.png" type="Texture" id=17]
+[ext_resource path="res://Tiles/Furniture/desk-chair.png" type="Texture" id=18]
+[ext_resource path="res://Tiles/Furniture/desk-set.png" type="Texture" id=19]
 
 [sub_resource type="ConvexPolygonShape2D" id=10]
 points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 )
@@ -47,19 +51,19 @@ points = PoolVector2Array( 120, 60, 0, 60, 0, 0, 120, 0 )
 points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 )
 
 [sub_resource type="ConvexPolygonShape2D" id=32]
-points = PoolVector2Array( 12, 60, 0, 60, 0, 0, 12, 0 )
+points = PoolVector2Array( 9, 60, 0, 60, 0, 0, 9, 0 )
 
 [sub_resource type="ConvexPolygonShape2D" id=33]
-points = PoolVector2Array( 60, 60, 48, 60, 48, 0, 60, 0 )
+points = PoolVector2Array( 60, 60, 51, 60, 51, 0, 60, 0 )
 
 [sub_resource type="ConvexPolygonShape2D" id=34]
-points = PoolVector2Array( 0, 0, 12, 0, 12, 48, 60, 48, 60, 60, 0, 60 )
+points = PoolVector2Array( 0, 0, 9, 0, 9, 54, 60, 54, 60, 60, 0, 60 )
 
 [sub_resource type="ConvexPolygonShape2D" id=35]
-points = PoolVector2Array( 120, 60, 0, 60, 0, 48, 120, 48 )
+points = PoolVector2Array( 120, 60, 0, 60, 0, 54, 120, 54 )
 
 [sub_resource type="ConvexPolygonShape2D" id=36]
-points = PoolVector2Array( 48, 0, 60, 0, 60, 60, 0, 60, 0, 48, 48, 48 )
+points = PoolVector2Array( 51, 0, 60, 0, 60, 60, 0, 60, 0, 54, 51, 54 )
 
 [sub_resource type="ConvexPolygonShape2D" id=11]
 points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 )
@@ -68,16 +72,16 @@ points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 )
 points = PoolVector2Array( 27, 39, 27, 39, 339, 39, 339, 39, 348, 39, 348, 39, 348, 108, 12, 108, 12, 39 )
 
 [sub_resource type="ConvexPolygonShape2D" id=19]
-points = PoolVector2Array( 36, 30, 0, 30, 0, 60, 36, 60 )
+points = PoolVector2Array( 36, 30, 0, 30, 0, 63, 36, 63 )
 
 [sub_resource type="ConvexPolygonShape2D" id=28]
-points = PoolVector2Array( 24, 48, 12, 48, 12, 33, 24, 33 )
+points = PoolVector2Array( 21, 45, 15, 45, 15, 33, 21, 33 )
 
 [sub_resource type="ConvexPolygonShape2D" id=12]
 points = PoolVector2Array( 120, 60, 60, 60, 60, 0, 120, 0 )
 
 [sub_resource type="ConvexPolygonShape2D" id=21]
-points = PoolVector2Array( 0, 0, 420, 0, 420, 180, 360, 180, 360, 153, 0, 153 )
+points = PoolVector2Array( 0, 0, 411, 0, 411, 180, 336, 180, 336, 153, 0, 153 )
 
 [sub_resource type="ConvexPolygonShape2D" id=22]
 points = PoolVector2Array( 12, 51, 78, 51, 69, 81, 21, 81 )
@@ -104,16 +108,16 @@ points = PoolVector2Array( 60, 60, 0, 60, 0, 51, 60, 51 )
 points = PoolVector2Array( 60, 60, 0, 60, 0, 51, 60, 51 )
 
 [sub_resource type="ConvexPolygonShape2D" id=41]
-points = PoolVector2Array( 60, 60, 51, 60, 51, 48, 60, 48 )
+points = PoolVector2Array( 60, 60, 51, 60, 51, 54, 60, 54 )
 
 [sub_resource type="ConvexPolygonShape2D" id=42]
-points = PoolVector2Array( 0, 48, 9, 48, 9, 60, 0, 60 )
+points = PoolVector2Array( 0, 54, 9, 54, 9, 60, 0, 60 )
 
 [sub_resource type="ConvexPolygonShape2D" id=43]
-points = PoolVector2Array( 60, 12, 51, 12, 51, 0, 60, 0 )
+points = PoolVector2Array( 60, 6, 51, 6, 51, 0, 60, 0 )
 
 [sub_resource type="ConvexPolygonShape2D" id=44]
-points = PoolVector2Array( 0, 0, 9, 0, 9, 12, 0, 12 )
+points = PoolVector2Array( 0, 0, 9, 0, 9, 6, 0, 6 )
 
 [sub_resource type="ConvexPolygonShape2D" id=14]
 points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 )
@@ -127,9 +131,24 @@ points = PoolVector2Array( 240, 60, 228, 60, 228, 0, 240, 0 )
 [sub_resource type="ConvexPolygonShape2D" id=48]
 points = PoolVector2Array( 12, 48, 228, 48, 228, 0, 240, 0, 240, 60, 0, 60, 0, 0, 12, 0 )
 
+[sub_resource type="ConvexPolygonShape2D" id=50]
+points = PoolVector2Array( 171, 165, 54, 165, 60, 96, 171, 96 )
+
 [sub_resource type="ConvexPolygonShape2D" id=49]
 points = PoolVector2Array( 240, 120, 0, 120, 0, 0, 240, 0 )
 
+[sub_resource type="ConvexPolygonShape2D" id=53]
+points = PoolVector2Array( 6, 0, 57, 0, 57, 174, 6, 174 )
+
+[sub_resource type="ConvexPolygonShape2D" id=54]
+points = PoolVector2Array( 60, 168, 9, 168, 9, 60, 60, 60 )
+
+[sub_resource type="ConvexPolygonShape2D" id=55]
+points = PoolVector2Array( 0, 60, 42, 60, 42, 39, 54, 39, 54, 120, 0, 120 )
+
+[sub_resource type="ConvexPolygonShape2D" id=56]
+points = PoolVector2Array( 78, 135, 9, 135, 9, 36, 78, 36 )
+
 [sub_resource type="ConvexPolygonShape2D" id=16]
 points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 )
 
@@ -1151,9 +1170,16 @@ points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 )
 65/navigation_offset = Vector2( 0, 0 )
 65/shape_offset = Vector2( 0, 0 )
 65/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+65/shape = SubResource( 50 )
 65/shape_one_way = false
-65/shape_one_way_margin = 0.0
-65/shapes = [  ]
+65/shape_one_way_margin = 1.0
+65/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 50 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
 65/z_index = 0
 66/name = "bedroom.png 66"
 66/texture = ExtResource( 1 )
@@ -1204,3 +1230,87 @@ points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 )
 68/shape_one_way_margin = 0.0
 68/shapes = [  ]
 68/z_index = 0
+69/name = "clothes-rack.png 69"
+69/texture = ExtResource( 16 )
+69/tex_offset = Vector2( 0, 0 )
+69/modulate = Color( 1, 1, 1, 1 )
+69/region = Rect2( 0, 0, 60, 180 )
+69/tile_mode = 0
+69/occluder_offset = Vector2( 0, 0 )
+69/navigation_offset = Vector2( 0, 0 )
+69/shape_offset = Vector2( 0, 0 )
+69/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+69/shape = SubResource( 53 )
+69/shape_one_way = false
+69/shape_one_way_margin = 1.0
+69/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 53 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+69/z_index = 0
+72/name = "desk.png 72"
+72/texture = ExtResource( 17 )
+72/tex_offset = Vector2( 0, 0 )
+72/modulate = Color( 1, 1, 1, 1 )
+72/region = Rect2( 0, 0, 60, 180 )
+72/tile_mode = 0
+72/occluder_offset = Vector2( 0, 0 )
+72/navigation_offset = Vector2( 0, 0 )
+72/shape_offset = Vector2( 0, 0 )
+72/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+72/shape = SubResource( 54 )
+72/shape_one_way = false
+72/shape_one_way_margin = 1.0
+72/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 54 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+72/z_index = 0
+73/name = "desk-chair.png 73"
+73/texture = ExtResource( 18 )
+73/tex_offset = Vector2( 0, 0 )
+73/modulate = Color( 1, 1, 1, 1 )
+73/region = Rect2( 0, 0, 60, 120 )
+73/tile_mode = 0
+73/occluder_offset = Vector2( 0, 0 )
+73/navigation_offset = Vector2( 0, 0 )
+73/shape_offset = Vector2( 0, 0 )
+73/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+73/shape = SubResource( 55 )
+73/shape_one_way = false
+73/shape_one_way_margin = 1.0
+73/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 55 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+73/z_index = 0
+74/name = "desk-set.png 74"
+74/texture = ExtResource( 19 )
+74/tex_offset = Vector2( 0, 0 )
+74/modulate = Color( 1, 1, 1, 1 )
+74/region = Rect2( 0, 30, 90, 150 )
+74/tile_mode = 0
+74/occluder_offset = Vector2( 0, 0 )
+74/navigation_offset = Vector2( 0, 0 )
+74/shape_offset = Vector2( 0, 0 )
+74/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+74/shape = SubResource( 56 )
+74/shape_one_way = false
+74/shape_one_way_margin = 1.0
+74/shapes = [ {
+"autotile_coord": Vector2( 0, 0 ),
+"one_way": false,
+"one_way_margin": 1.0,
+"shape": SubResource( 56 ),
+"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
+} ]
+74/z_index = 0
diff --git a/Scenes/Player.tscn b/Scenes/Player.tscn
index 763ab18..69fcd10 100644
--- a/Scenes/Player.tscn
+++ b/Scenes/Player.tscn
@@ -36,9 +36,9 @@ animations = [ {
 "name": "MoveUp",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 2 ) ],
+"frames": [ ExtResource( 4 ) ],
 "loop": true,
-"name": "IdleDown",
+"name": "IdleLeft",
 "speed": 5.0
 }, {
 "frames": [ ExtResource( 5 ) ],
@@ -46,9 +46,9 @@ animations = [ {
 "name": "IdleUp",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 4 ) ],
+"frames": [ ExtResource( 2 ) ],
 "loop": true,
-"name": "IdleLeft",
+"name": "IdleDown",
 "speed": 5.0
 }, {
 "frames": [ ExtResource( 3 ) ],
@@ -58,7 +58,7 @@ animations = [ {
 } ]
 
 [sub_resource type="RectangleShape2D" id=1]
-extents = Vector2( 21, 4.5 )
+extents = Vector2( 24, 7.5 )
 
 [sub_resource type="CircleShape2D" id=3]
 radius = 30.0
@@ -74,7 +74,7 @@ animation = "IdleDown"
 playing = true
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
-position = Vector2( -4, 27.5 )
+position = Vector2( -4, 30.5 )
 shape = SubResource( 1 )
 one_way_collision = true
 
diff --git a/Scripts/CoverControl.gd b/Scripts/CoverControl.gd
index a7ceede..22a8ea5 100644
--- a/Scripts/CoverControl.gd
+++ b/Scripts/CoverControl.gd
@@ -1,5 +1,5 @@
 extends Node2D
-onready var player = get_parent().get_node("Player")
+onready var player = get_node("../Player")
 
 # Declare member variables here. Examples:
 # var a = 2
diff --git a/Story/Ch1S2.tscn b/Story/Ch1S2.tscn
index 1e9606d..82b0b15 100644
--- a/Story/Ch1S2.tscn
+++ b/Story/Ch1S2.tscn
@@ -60,7 +60,7 @@ tile_data = PoolIntArray( -262165, 61, 0, -262161, 61, 0, -262157, 61, 0, -26215
 tile_set = ExtResource( 1 )
 cell_size = Vector2( 60, 60 )
 format = 1
-tile_data = PoolIntArray( 262145, 36, 0, 262146, 37, 0, 262147, 37, 0, 262148, 37, 0, 262149, 37, 0, 262150, 38, 0, 327681, 39, 0, 327682, 40, 0, 327683, 40, 0, 327684, 40, 0, 327685, 40, 0, 327686, 41, 0, 393217, 42, 0, 393218, 43, 0, 393219, 43, 0, 393220, 43, 0, 393221, 43, 0, 393222, 44, 0 )
+tile_data = PoolIntArray( 262136, 36, 0, 262137, 37, 0, 262138, 37, 0, 262139, 38, 0, 196628, 36, 0, 196629, 37, 0, 196630, 37, 0, 196631, 38, 0, 327672, 42, 0, 327673, 43, 0, 327674, 43, 0, 327675, 44, 0, 262145, 36, 0, 262146, 37, 0, 262147, 37, 0, 262148, 37, 0, 262149, 37, 0, 262150, 38, 0, 262164, 42, 0, 262165, 43, 0, 262166, 43, 0, 262167, 44, 0, 327681, 39, 0, 327682, 40, 0, 327683, 40, 0, 327684, 40, 0, 327685, 40, 0, 327686, 41, 0, 393217, 42, 0, 393218, 43, 0, 393219, 43, 0, 393220, 43, 0, 393221, 43, 0, 393222, 44, 0, 524280, 36, 0, 524281, 37, 0, 524282, 37, 0, 524283, 38, 0, 458772, 36, 0, 458773, 37, 0, 458774, 37, 0, 458775, 38, 0, 589816, 42, 0, 589817, 43, 0, 589818, 43, 0, 589819, 44, 0, 524308, 42, 0, 524309, 43, 0, 524310, 43, 0, 524311, 44, 0, 786424, 36, 0, 786425, 37, 0, 786426, 37, 0, 786427, 38, 0, 720916, 36, 0, 720917, 37, 0, 720918, 37, 0, 720919, 38, 0, 851960, 42, 0, 851961, 43, 0, 851962, 43, 0, 851963, 44, 0, 786452, 42, 0, 786453, 43, 0, 786454, 43, 0, 786455, 44, 0, 1048568, 36, 0, 1048569, 37, 0, 1048570, 37, 0, 1048571, 38, 0, 983060, 36, 0, 983061, 37, 0, 983062, 37, 0, 983063, 38, 0, 1114104, 42, 0, 1114105, 43, 0, 1114106, 43, 0, 1114107, 44, 0, 1048596, 42, 0, 1048597, 43, 0, 1048598, 43, 0, 1048599, 44, 0 )
 
 [node name="FG" type="YSort" parent="."]
 
@@ -68,6 +68,7 @@ tile_data = PoolIntArray( 262145, 36, 0, 262146, 37, 0, 262147, 37, 0, 262148, 3
 position = Vector2( 468, 297 )
 
 [node name="Furniture" type="YSort" parent="FG"]
+z_index = 1
 
 [node name="Living" type="TileMap" parent="FG/Furniture"]
 tile_set = ExtResource( 1 )
@@ -99,10 +100,13 @@ texture = ExtResource( 5 )
 
 [node name="BedTop" type="TileMap" parent="FG/Furniture"]
 visible = false
+z_index = 1
 tile_set = ExtResource( 1 )
 cell_size = Vector2( 30, 30 )
+cell_y_sort = true
+show_collision = true
 format = 1
-tile_data = PoolIntArray( 262130, 65, 0, 196648, 536870977, 0 )
+tile_data = PoolIntArray( 262128, 69, 0, 262130, 65, 0, 196648, 536870977, 0, 196654, 536870981, 0, 655344, 74, 0, 589869, 536870986, 0 )
 
 [node name="BedTopMid" type="TileMap" parent="FG/Furniture"]
 visible = false
@@ -111,24 +115,26 @@ tile_set = ExtResource( 1 )
 cell_size = Vector2( 30, 30 )
 cell_y_sort = true
 format = 1
-tile_data = PoolIntArray( 458736, 68, 0, 393256, 536870980, 0, 589808, 68, 0, 524328, 536870980, 0, 720880, 67, 0, 655400, 536870979, 0, 786418, 65, 0, 720936, 536870977, 0 )
+tile_data = PoolIntArray( 458736, 68, 0, 393256, 536870980, 0, 589808, 68, 0, 524328, 536870980, 0, 720880, 67, 0, 655400, 536870979, 0, 786416, 69, 0, 786418, 65, 0, 720936, 536870977, 0, 720942, 536870981, 0, 1179632, 74, 0, 1114157, 536870986, 0 )
 
 [node name="BedBotMid" type="TileMap" parent="FG/Furniture"]
 visible = false
 z_index = 1
 tile_set = ExtResource( 1 )
 cell_size = Vector2( 30, 30 )
+cell_tile_origin = 2
 cell_y_sort = true
 format = 1
-tile_data = PoolIntArray( 983024, 536870980, 0, 917544, 68, 0, 1114096, 536870980, 0, 1048616, 68, 0, 1245168, 536870979, 0, 1179688, 67, 0, 1310706, 65, 0, 1245224, 536870977, 0 )
+tile_data = PoolIntArray( 983024, 536870980, 0, 917544, 68, 0, 1114096, 536870980, 0, 1048616, 68, 0, 1245168, 536870979, 0, 1179688, 67, 0, 1310704, 69, 0, 1310706, 65, 0, 1245224, 536870977, 0, 1245230, 536870981, 0, 1703920, 74, 0, 1638445, 536870986, 0 )
 
 [node name="BedBot" type="TileMap" parent="FG/Furniture"]
 visible = false
 z_index = 1
 tile_set = ExtResource( 1 )
 cell_size = Vector2( 30, 30 )
+cell_y_sort = true
 format = 1
-tile_data = PoolIntArray( 1507312, 68, 0, 1441832, 536870980, 0, 1638384, 68, 0, 1572904, 536870980, 0, 1769456, 67, 0, 1703976, 536870979, 0, 1834994, 65, 0, 1769512, 536870977, 0 )
+tile_data = PoolIntArray( 1507312, 68, 0, 1441832, 536870980, 0, 1638384, 68, 0, 1572904, 536870980, 0, 1769456, 67, 0, 1703976, 536870979, 0, 1834992, 69, 0, 1834994, 65, 0, 1769512, 536870977, 0, 1769518, 536870981, 0, 2228208, 74, 0, 2162733, 536870986, 0 )
 
 [node name="NPCs" type="YSort" parent="FG"]
 
@@ -187,18 +193,25 @@ timeline = "timeline-1642498159.json"
 [node name="CollisionShape2D" parent="FG/NPCs/Alistair/Node2D/Area2D" index="0"]
 position = Vector2( 0, 18 )
 
+[node name="Floating" type="TileMap" parent="FG"]
+z_index = 1
+tile_set = ExtResource( 1 )
+cell_size = Vector2( 30, 30 )
+cell_tile_origin = 2
+format = 1
+tile_data = PoolIntArray( 458755, 52, 0 )
+
 [node name="Covers" type="Node2D" parent="FG"]
+visible = false
 z_index = 1
 
 [node name="Living" type="TileMap" parent="FG/Covers"]
-visible = false
 tile_set = ExtResource( 1 )
 cell_size = Vector2( 60, 60 )
 format = 1
 tile_data = PoolIntArray( -4, 61, 0, -65536, 61, 0, -65532, 61, 0, -65528, 61, 0, -65524, 61, 0, -65520, 61, 0, 262140, 61, 0, 196608, 61, 0, 196612, 61, 0, 196616, 61, 0, 196620, 61, 0, 196624, 61, 0, 262144, 61, 0, 262148, 61, 0, 262152, 61, 0, 262156, 61, 0, 524284, 61, 0, 458768, 61, 0, 786428, 61, 0, 720912, 61, 0, 1048572, 61, 0, 983056, 61, 0 )
 
 [node name="BedTop" type="TileMap" parent="FG/Covers"]
-visible = false
 z_as_relative = false
 tile_set = ExtResource( 1 )
 cell_size = Vector2( 60, 60 )
@@ -206,7 +219,6 @@ format = 1
 tile_data = PoolIntArray( -8, 61, 0, -65516, 61, 0, 262136, 61, 0, 196628, 61, 0 )
 
 [node name="BedTopMid" type="TileMap" parent="FG/Covers"]
-visible = false
 z_as_relative = false
 tile_set = ExtResource( 1 )
 cell_size = Vector2( 60, 60 )
@@ -214,7 +226,6 @@ format = 1
 tile_data = PoolIntArray( 524280, 61, 0, 458772, 61, 0 )
 
 [node name="BedBotMid" type="TileMap" parent="FG/Covers"]
-visible = false
 z_as_relative = false
 tile_set = ExtResource( 1 )
 cell_size = Vector2( 60, 60 )
@@ -222,7 +233,6 @@ format = 1
 tile_data = PoolIntArray( 786424, 61, 0, 720916, 61, 0 )
 
 [node name="BedBot" type="TileMap" parent="FG/Covers"]
-visible = false
 z_as_relative = false
 tile_set = ExtResource( 1 )
 cell_size = Vector2( 60, 60 )
@@ -278,13 +288,6 @@ polygon = PoolVector2Array( -360, 900, -360, 1140, -153, 1137, -153, 900 )
 position = Vector2( 120, 0 )
 polygon = PoolVector2Array( 1113, 900, 1113, 1140, 1320, 1140, 1320, 900 )
 
-[node name="Floating" type="TileMap" parent="."]
-tile_set = ExtResource( 1 )
-cell_size = Vector2( 30, 30 )
-format = 1
-tile_data = PoolIntArray( 458755, 52, 0 )
-
-[editable path="FG/Player"]
 [editable path="FG/NPCs/Richal/Node2D"]
 [editable path="FG/NPCs/James/Node2D"]
 [editable path="FG/NPCs/Charlene/Node2D"]
diff --git a/Tiles/Furniture/bed.png b/Tiles/Furniture/bed.png
index 42d49e45dc09f563cbca8e1df004742a44962723..e6dec3740d53f32b7ee8ee1f4d22f52dcbe119bf 100644
GIT binary patch
literal 1711
zcmbVMdsLEV7`Lk#Ms2R_xQSNFoi2zwm|6msTINY5?@Om*YhV$kL%|!mxr64^QCXQ+
z^t72-$|)-(1tc$P6U4mXB{ehgLSlqS%57f*bm#29edm1Nci#7Xp67j@-|zQ4Ij8-+
zwrsZAY+_=v#rvdZ0PuhJ@!hl$_@aVmu9=u@Bzb!t3rZ@T8*z(?5LuhPE9v&k$t~;5
zs<_-e;$iD??30FVTYUqv!HKpnu9K$em1Re;f0g^p*{xOFG$+_revQcO#XNuY;I!2)
z7KI9a4BfM@yt^`PJ~@avABl8BQsz}@RW0Kj)vrgR(%o!qM#6)EyZ_JAyc_vodV@n+
zNl8f*x)F=Vcg(*wOZ)Bx$i&a@$6dFcP+5|0cRBZ|y54<57G|wEkHebYa5VTaGxvKH
z`=ThJa;=BMnk-CM%tlEY4RwFG*Nvj6F4B$T73z_*S{RzqJCPe&*DFGV@`WlClffCi
zR~GWqu3IJ^4p2vsT&kMCF>yB=xg1GUwC7te2>$J=t+R@#rg!&${=(rLaNnaY^L{Qz
z{SZP^+VoG{08I(srX?=@FiayJ+`co@%wc_xJN%oBbk*E(ShO?<v&pV`n-56v>`TZa
z7yRn-rB=yKX(CCBQksZK=Qw-xt`>T8pw5Vx9av(jYGA2Mp$Lrhw%4D_N$%p#VKa35
zuvzr0^*b{Msbc=%eo|#eJx@YU3!^a^P2bWw>RTr}Nz0U)+S&_N|BWk-C6k$Bri+Wk
z@v@<-IjX!r1Pw{Pf3_Z)QO+FIL;9$Te>_>sB7=N!`yJM=CIw*B*oAPK>?AHZ=H%z+
zr=#DvxWu%hpQwL<9Ljj;9Iv?|?fGf5IS)t;07CD`w|9ig_)~2GdXO0*(RKvrf{*Fp
z>YAFG6SuF1-fO-B7}tY*FA;F%b0_I2BaB3G!XRamYXr^rD}t-=;7xt_^OZ#)M#y1n
zeSTHcsvGqJ9DVf+$ZX{dn|X(D&fmcCLUUqrEHMf%%7_{xY6{SjrMUwzXUkfK^O%Zf
z%9duxmKDqOLL@stIHsBP@55;q`$ValJXrcdw1!RL;vw=0ya-`wmE{A_v?IkkUun}j
z_xf`NCq&3qX;UW~IAUk+hspEMS}Pj}Adp$fS#9-LnhZ{ov1x9oC9)uz12UG_6V8%1
zDb#XB5&;owKa`R59yTzHZ@28U$q<6&UbJHC5x=2+w-zgG@%#!or)pj%m$!Woaf`JP
z&X*RSPK~8&>kI60c67F)-<`u0kVlhovxkh(V4u-qM~;xRjcp$oqI85}xjPUkde=Th
zSE^gz8(4uZe7Y|x{-LUe-aFAZrmchM<fDK-14}!g;nU%|7%<{~S*mzI(y`Q6E@`4D
z=LHl_VjWAz8xIhWS6VKN5PL~9k#mQzpe}G0dl|*FE>wzO)H$hmku0S7YF4d1PW>W@
zY-sn6mLTIU#1_^Y2{Ep)nQ-A5BmKy2h4v9O<Z`du{+hEfuH7wFhEAW}8;p7$yC5!6
z3=~ZrH2Q)=q=+#VaVkeghPM2+V%oiUVLPszco%5OkMte!VaX8%@$xL*1zj|p6Q`94
zm5-UCJg(*<oTJ0A#IC1}y15pnX|a*WI#0o%aeMiO;ZsWA(nS)pI?lwP-#iaSo%uaq
zFTp`7q=G|`R}WAl4}dY(UHcjt>I%sGXQob0v7>Jj>3)*rajF>A#>?sx#yU!tw3Aq5
z+p){}FwRasrRGI-@d+b%xZa7Bp>~Z*c_%6%t}BmzF@3KcDm5YDt-?Z-z(QMQXA6=h
z@6Jf})zKU5G$`w8LuDzpLy@)b2ej%daBqFAQYyH=AHpmvv^!O(qZsOH>{>V8x4*++
z0yI8bBW<*h($|fwK$KUQ5@?VKFj#>J_|M=0W2TCn3}9P>DyUWZ%KtU;U4nIM1Z8~q
S5`^6OaohX2pJ$yrCi8DOASZ$V

literal 1170
zcmeAS@N?(olHy`uVBq!ia0vp^A3&Ic4M^IBzMRCsz!K@{;uumf=j~lXzuO5CYzZrN
zZCJvs^To^3@y5!k4nJGQ;Lx%nrum$lsfT11$WBmVHoS49^Z)g_d7W<in^yjMRsHjo
zin=<`JaWK+8Ggt2F)Yj98T0S=3!l)?f4X&trf<||_+i7?mXO8GetoIa=dkJV+CB*!
zY6k?~yuKmMpsxP5bYtZH=Vi;dg(aFe4OoH~&Rnx=-R*7nW4Aq8JSS2|Z11ZroID3v
zB$`%U=y_IFd;QO2L+$L1?_M8&`!!x~-_D85%X}IXXK<ZO$u*n3QGem~&E22lp8JAr
z@M%rk^y}J17c~PGVTb@wC4;j8&^1h8BZ2loB+l#w8eUbp_4CK@_g4;DLmcSSy38W?
z>a6WZyyzEcTjw2~dHU$~xzA@q#o=adyCCxX;mWdQ$}pc;c04VT{OfpI6H_J6vYnOd
zR=p~@{+Q=93#xO{xX;Gr%s8IP1a|0hdHKe&T+v&-GQYF`$!;@j1p6R5qpJ9Pu_eM~
zvD?<$7(?VlXZhVSJKqB}HY9`Zkgx3VM2KlxCTp)e_%!o?03^&DD`q|{oB`u;-^*3*
zhK058^{2J7f3JF7^?T0ht69H)RPD`^yIr~L{pa_|8za8_l5GFA&-rE1Ur5j{b2@*e
z_V13h-Pc#Ie*1X)>)p>b&P@+8sXw;T2<E1Hv!b8Qo;~~R_1S0BCOnsaRe4VDocqsx
z$5WsV`{Kj9HS}F{@bRj1llH&2gZpfIxOugK5-dd1S4B1pzb}3^6Xwh<RnJq~L=IsF
zA-CE2NSGn>6y~c~$itlax#?`N7|cNRMLR3=>MFMPe%S&G72Du<mGjtO3Yxd(&YQ^(
z<E5W^Rw)HDme2Ug-n0DvUj_V&1ytjsGhyQMR>s@c<?a9X_xt&d@I!E~@D;o$znyXI
zrO=czTUA(GRW<zzd%aD!WV&zZedDFE{wLE{y}x?yvoFlC;-_}!UTB5+R`}uK&}Szh
zp3O0D-g-4zv`T8%pZCoW1vj1iTV~tB6aZsBZvXGRLw~I<%!L_{xaZ6SHHc>rIYPID
rVRrg0Xfm)8b7)=G3s#R*1X!&4pK0g#IO1{W3XrI$tDnm{r-UW|i(lE%

diff --git a/Tiles/Furniture/clothes-rack.png b/Tiles/Furniture/clothes-rack.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b1675534abe15a564a2c44bf4a7016ab24a1126
GIT binary patch
literal 522
zcmeAS@N?(olHy`uVBq!ia0vp^HbA_EgAGWYkoP~%z`%IX)5S5QV$R#U7YmylL>w;8
z@MN5lz***^dBusd%z^VpW0?c{Gj*%qij(h76y5QDp8m0eE!O#W3w@mU;w5iw+iTy~
ze?0kIa9H`?xcSFx@5{>_zn>j*W){yf;~DSNpD(%nHte^Rn0fixhiW+na}SoVU6%Ao
zCxs!dXYtyfVOeIC9RJ~h8TQ8aUzY6JUsWS>d{w;totDF_>AEkME;+p>b5{NN$gIlc
zhkPw!3a(9>dHdrxrP|Dv*#$cuJc`|Q>|A7W`nTTW^9v4!-mBQNdG&O=?O#*{@(w+0
z5|6&L^**!y*V@BCogbc+y}Si7;zN@6ugTV*tq=L$NU&;t3G&T3G=}!Sm|d@To&6`F
zT52~x-cBy>5Xf)gd%TzbXHM<MqY=|6;~DFIn19rp?%n(P$BY7DKJl16OP=Q~+HLyM
zc4IKMfD8ZAdHjw#XSE>62j%tkFE8ER+&+5)D0u%e&70=0`FC#nTVNbBc)I$ztaD0e
F0syLg^r`>=

literal 0
HcmV?d00001

diff --git a/Tiles/Furniture/clothes-rack.png.import b/Tiles/Furniture/clothes-rack.png.import
new file mode 100644
index 0000000..b777c4b
--- /dev/null
+++ b/Tiles/Furniture/clothes-rack.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/clothes-rack.png-d950784fe6f539dc7a4e8638487920cd.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Tiles/Furniture/clothes-rack.png"
+dest_files=[ "res://.import/clothes-rack.png-d950784fe6f539dc7a4e8638487920cd.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
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Tiles/Furniture/desk-chair.png b/Tiles/Furniture/desk-chair.png
new file mode 100644
index 0000000000000000000000000000000000000000..d2f0a5cd9b8f6a892e53b196cb08f6c36f7f0a4c
GIT binary patch
literal 562
zcmeAS@N?(olHy`uVBq!ia0vp^Hb7j#!3HGPnNH+jU|{^|>EaktG3V`^hrLY>0<9m5
zSZ^@c1~l~sFoi~R^-j3JpgQ3~gY2EZ#)pq`Zr;9o#rwVQr|;x2kAK#A_|+{FCl1AX
z(=V^){=xrx*S|Nm%X4op&x?P0x-$Po%l`OS2hVA#H*5J~+h4ZWt6jP`_2#h(iMG3+
zFO)_cdf_1<%eh!Nu|%b(ujS%I11ljncOnHBzV~)7n|S5G?U|F9K}O&8@W1?}qwxOs
z;~}5hPd^R%v()8!qSeDEs~7a%wCD@{u6L`P{r9F_aqIh!-}9SRIdALt4VfIRcRi{O
zxAk6oTedpjQn8ZsracnTFRXmj_jEeEIuoOOZ)G*7vf;K1r8E30jDglgR6mi)UMZN&
z4YJVr;)`AHRJG-%&4K8dBQsg~aje!cv0Z$ZIn!O2x$Qas{PX4g)1zV+zBZU!a7}4m
zd++?-y}hsh*45i=3x9m&^KvJU3zPP56X~4UTlmE0*NUYKC5NuoKQlC%b7jU%+ZR?k
z(2!Xu%(wU9^%<Go6RTEx05v6=^O+r+c-t!9bg|jD|89?bK?a@eazD5I&6|zx_uf^S
zR(!n-boGxZyYg~QT5c0rX$lSQxo00tG-j5!w10lZ0i-Ej_Tb9<t5(_-0@DJ6r>mdK
II;Vst0M+agu>b%7

literal 0
HcmV?d00001

diff --git a/Tiles/Furniture/desk-chair.png.import b/Tiles/Furniture/desk-chair.png.import
new file mode 100644
index 0000000..74f870e
--- /dev/null
+++ b/Tiles/Furniture/desk-chair.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/desk-chair.png-43a2759de5fca2dbfbcca0e87ead7b84.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Tiles/Furniture/desk-chair.png"
+dest_files=[ "res://.import/desk-chair.png-43a2759de5fca2dbfbcca0e87ead7b84.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
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Tiles/Furniture/desk-set.png b/Tiles/Furniture/desk-set.png
new file mode 100644
index 0000000000000000000000000000000000000000..451af346d7b373aa56c7ea8c122c43cb9afc487f
GIT binary patch
literal 794
zcmeAS@N?(olHy`uVBq!ia0vp^6+pa&gAGW=`@N85U|@Ra>EaktG3V{wgTB&^5^ae>
zPrF>0zc_H3IB|wJCQotT^oX%k2y`fNR#u!GyY~9M+P^mH+Dt}|F8{BTkbd?GWHt);
zadLgJenR)Xd-wkRd!L+_pI`oQ@9)}otQ+(gkN=(d$uU?fTYp-}YakE|FOpKT@H<dA
zS*xm~wzl?*YfW99+~4eTr7tow);v9a{CKeL^9-MYISr4~!oNr@yYf#gtEL~!Hw(NN
zEVHWc>R)4F8TAJ{?uL9(OfFsh`aM{Z1t?^}c>Hahxb3FJ|IV=-=LA{8)F%uw2`WjR
z(2gtm4gQAzVqfgNGiOr^C(y(@M?=3HK79E4<KMr3pUE|9p8>KtHpbQ7-oF0roa3@z
zBkub9`^Wcxuef~b1jr?Mm-v4rPhDGRcunfrzool1#S`}K+4JUI!V!?<yGLagi{C5V
zN!EpUGf31n^?42FRvV*(K=*rxei2$4B{vi7xqXYK-&q&5_US~hEAq5{MTp1Vy>q9=
zR_=a@`M%4G!RF-&i|%c$W?NmF+XVEu`R+yA1D1RDe0?1re#4gWxbLbL-@kv~dc9C=
z>D^C?(3p7j?w#J|+k0B3bGU;=y3Z{-KK<UdH;*4bzT<5n4GwPKJuwwt#pmaLuaigu
z8C<@lxo;;sM{=m&&8L0V--6$D9sgh653#iTQtX#W=G%JbSHF0f(7Sw+bM_7I*x4X2
ztc|<ao>lzk`_8G>PmB9gxw9h<Aw|_4PkyUua}@I*#!5y<9F76IWp((MNzM(rG733~
kyx!oD#uJSOkW}e#*<R`I4mLeu=KCN4Pgg&ebxsLQ03-%z761SM

literal 0
HcmV?d00001

diff --git a/Tiles/Furniture/desk-set.png.import b/Tiles/Furniture/desk-set.png.import
new file mode 100644
index 0000000..5bc6716
--- /dev/null
+++ b/Tiles/Furniture/desk-set.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/desk-set.png-e4f41f98d4150dc3d27b13b0e9c39466.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Tiles/Furniture/desk-set.png"
+dest_files=[ "res://.import/desk-set.png-e4f41f98d4150dc3d27b13b0e9c39466.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
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0
diff --git a/Tiles/Furniture/desk.png b/Tiles/Furniture/desk.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d88db2e0509c021842b1d4cb67c40475012d6c4
GIT binary patch
literal 413
zcmeAS@N?(olHy`uVBq!ia0vp^HbA_EgAGWYkoP~%z`&T|>EaktG3V_aL%+ig0&N!?
zGL(O6?E9}-)4oMd=PAPlMRAuko!5{2-xD6laLeC#O^iUi9#A&~v{z;STz32Ix0}Be
z+$;aTXO>wT^Wpe4`5kfVcgsJj+yDNbwY;YJ!=i(;!*{h$v!A^8+P*t2r&;$O@!DRo
z<y&<4UJ!47+EV$*^;M^<rqAB+prq;Y+<(*JvUhGg?Hf^Gb?_z2a^X3C#51~o)o0Gn
z`q>CI=v(2f_$l0WXT7Rl9+aQTUDrAFTh^?;Q>^)MFO{#aZ!Z$o6Th?N(r26RcE=M>
z`R<4*xSTC_yztAc<D0d_|6JMp#em0JcJcbu$bI|u%o9P5seUyr?ta~66I0tGU#@&=
t2+2FtbeYpn-C{1tLM#kmKsPY$WAKeLkX@?(WgjTiJYD@<);T3K0RUA6zgPeO

literal 0
HcmV?d00001

diff --git a/Tiles/Furniture/desk.png.import b/Tiles/Furniture/desk.png.import
new file mode 100644
index 0000000..bd309dd
--- /dev/null
+++ b/Tiles/Furniture/desk.png.import
@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/desk.png-7a960b84b23f3defa692e1629dc838db.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Tiles/Furniture/desk.png"
+dest_files=[ "res://.import/desk.png-7a960b84b23f3defa692e1629dc838db.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
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0