diff --git a/.import/Booh.png-296ff563aa847695b220f6b3df09dfad.md5 b/.import/Booh.png-296ff563aa847695b220f6b3df09dfad.md5 new file mode 100644 index 0000000..9f34687 --- /dev/null +++ b/.import/Booh.png-296ff563aa847695b220f6b3df09dfad.md5 @@ -0,0 +1,3 @@ +source_md5="89300e3ae4de67821638926109baa285" +dest_md5="3de69c983a3fee71b0849bfb32ca4310" + diff --git a/.import/Booh.png-296ff563aa847695b220f6b3df09dfad.stex b/.import/Booh.png-296ff563aa847695b220f6b3df09dfad.stex new file mode 100644 index 0000000..bee1400 Binary files /dev/null and b/.import/Booh.png-296ff563aa847695b220f6b3df09dfad.stex differ diff --git a/.import/Booh.png-84940980811a47499ee274de83477e2a.md5 b/.import/Booh.png-84940980811a47499ee274de83477e2a.md5 new file mode 100644 index 0000000..5988e73 --- /dev/null +++ b/.import/Booh.png-84940980811a47499ee274de83477e2a.md5 @@ -0,0 +1,3 @@ +source_md5="149e5c5082cae375d69baf6262a9bfde" +dest_md5="0d6d4fdb8f233a9187c1337f66870e3b" + diff --git a/.import/Booh.png-84940980811a47499ee274de83477e2a.stex b/.import/Booh.png-84940980811a47499ee274de83477e2a.stex new file mode 100644 index 0000000..372f3da Binary files /dev/null and b/.import/Booh.png-84940980811a47499ee274de83477e2a.stex differ diff --git a/.import/Glass.png-8678c0300c4ceb28841173a60adcbab3.md5 b/.import/Glass.png-8678c0300c4ceb28841173a60adcbab3.md5 index e17e61d..d1075b2 100644 --- a/.import/Glass.png-8678c0300c4ceb28841173a60adcbab3.md5 +++ b/.import/Glass.png-8678c0300c4ceb28841173a60adcbab3.md5 @@ -1,3 +1,3 @@ -source_md5="ae48a5a22aa6a99422a8318ffed1feaa" -dest_md5="d181a180dfaeadaadbdfd93dc388012c" +source_md5="2919428092686f7fc301da07ad85f9d5" +dest_md5="7020af562391c452429b6a4a9cdd7bf6" diff --git a/.import/Glass.png-8678c0300c4ceb28841173a60adcbab3.stex b/.import/Glass.png-8678c0300c4ceb28841173a60adcbab3.stex index 0313439..321b71c 100644 Binary files a/.import/Glass.png-8678c0300c4ceb28841173a60adcbab3.stex and b/.import/Glass.png-8678c0300c4ceb28841173a60adcbab3.stex differ diff --git a/.import/chair.png-ab425e7756b0ca21db019c79ae4fb374.md5 b/.import/chair.png-ab425e7756b0ca21db019c79ae4fb374.md5 new file mode 100644 index 0000000..16c5ad8 --- /dev/null +++ b/.import/chair.png-ab425e7756b0ca21db019c79ae4fb374.md5 @@ -0,0 +1,3 @@ +source_md5="39c1e271f1dc5bda6a594ec1d9295814" +dest_md5="90929c18bedf629c2527310774c3af15" + diff --git a/.import/chair.png-ab425e7756b0ca21db019c79ae4fb374.stex b/.import/chair.png-ab425e7756b0ca21db019c79ae4fb374.stex new file mode 100644 index 0000000..512ad73 Binary files /dev/null and b/.import/chair.png-ab425e7756b0ca21db019c79ae4fb374.stex differ diff --git a/Scenes/Game.tscn b/Scenes/Game.tscn index dc9d675..7e8ef43 100644 --- a/Scenes/Game.tscn +++ b/Scenes/Game.tscn @@ -23,44 +23,43 @@ tile_data = PoolIntArray( 0, 1, 0, 1, 1, 0, 2, 1, 0, 3, 1, 0, 4, 1, 0, 5, 1, 0, [node name="Furniture" type="TileMap" parent="."] tile_set = ExtResource( 5 ) -cell_size = Vector2( 8, 8 ) +cell_size = Vector2( 4, 4 ) cell_quadrant_size = 8 cell_custom_transform = Transform2D( 8, 0, 0, 8, 0, 0 ) -show_collision = true format = 1 -tile_data = PoolIntArray( 524300, 3, 0, 917505, 0, 0 ) +tile_data = PoolIntArray( 1048599, 536870916, 0, 1048600, 536870915, 0, 1048602, 4, 0, 1835010, 536870912, 0 ) [node name="WaterThings" type="Node2D" parent="."] [node name="Jug" parent="WaterThings" instance=ExtResource( 3 )] -position = Vector2( 237, 20 ) - -[node name="Jug2" parent="WaterThings" instance=ExtResource( 3 )] position = Vector2( 15, 109 ) [node name="Glass" parent="WaterThings" instance=ExtResource( 7 )] -position = Vector2( 102, 68 ) +position = Vector2( 105, 68 ) [node name="Glass2" parent="WaterThings" instance=ExtResource( 7 )] -position = Vector2( 144, 52 ) +position = Vector2( 130, 41 ) [node name="Glass3" parent="WaterThings" instance=ExtResource( 7 )] -position = Vector2( 116, 78 ) +position = Vector2( 143, 45 ) [node name="Glass4" parent="WaterThings" instance=ExtResource( 7 )] -position = Vector2( 158, 63 ) +position = Vector2( 112, 41 ) [node name="Glass5" parent="WaterThings" instance=ExtResource( 7 )] -position = Vector2( 73, 45 ) +position = Vector2( 120, 53 ) [node name="Glass6" parent="WaterThings" instance=ExtResource( 7 )] -position = Vector2( 115, 29 ) +position = Vector2( 109, 26 ) [node name="Glass7" parent="WaterThings" instance=ExtResource( 7 )] -position = Vector2( 87, 55 ) +position = Vector2( 122, 30 ) [node name="Glass8" parent="WaterThings" instance=ExtResource( 7 )] -position = Vector2( 129, 40 ) +position = Vector2( 91, 26 ) + +[node name="Glass9" parent="WaterThings" instance=ExtResource( 7 )] +position = Vector2( 99, 38 ) [node name="Player" parent="." instance=ExtResource( 2 )] position = Vector2( 136, 80 ) diff --git a/Sprites/Water/Booh.png b/Sprites/Water/Booh.png new file mode 100644 index 0000000..b22e2ee Binary files /dev/null and b/Sprites/Water/Booh.png differ diff --git a/Sprites/Water/Booh.png.import b/Sprites/Water/Booh.png.import new file mode 100644 index 0000000..0e0fd20 --- /dev/null +++ b/Sprites/Water/Booh.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Booh.png-296ff563aa847695b220f6b3df09dfad.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Water/Booh.png" +dest_files=[ "res://.import/Booh.png-296ff563aa847695b220f6b3df09dfad.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=false +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=false +svg/scale=1.0 diff --git a/Sprites/Water/Broken/Booh.png b/Sprites/Water/Broken/Booh.png new file mode 100644 index 0000000..b68add1 Binary files /dev/null and b/Sprites/Water/Broken/Booh.png differ diff --git a/Sprites/Water/Broken/Booh.png.import b/Sprites/Water/Broken/Booh.png.import new file mode 100644 index 0000000..d582643 --- /dev/null +++ b/Sprites/Water/Broken/Booh.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Booh.png-84940980811a47499ee274de83477e2a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Water/Broken/Booh.png" +dest_files=[ "res://.import/Booh.png-84940980811a47499ee274de83477e2a.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=false +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=false +svg/scale=1.0 diff --git a/Sprites/Water/Glass.png b/Sprites/Water/Glass.png index e8e3fe9..f5db31b 100644 Binary files a/Sprites/Water/Glass.png and b/Sprites/Water/Glass.png differ diff --git a/Sprites/chair.png b/Sprites/chair.png new file mode 100644 index 0000000..0b7f722 Binary files /dev/null and b/Sprites/chair.png differ diff --git a/Sprites/chair.png.import b/Sprites/chair.png.import new file mode 100644 index 0000000..914866c --- /dev/null +++ b/Sprites/chair.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/chair.png-ab425e7756b0ca21db019c79ae4fb374.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/chair.png" +dest_files=[ "res://.import/chair.png-ab425e7756b0ca21db019c79ae4fb374.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=false +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=false +svg/scale=1.0 diff --git a/Sprites/furniture.tres b/Sprites/furniture.tres index 190d3e1..12471f9 100644 --- a/Sprites/furniture.tres +++ b/Sprites/furniture.tres @@ -1,7 +1,8 @@ -[gd_resource type="TileSet" load_steps=5 format=2] +[gd_resource type="TileSet" load_steps=7 format=2] [ext_resource path="res://Sprites/wardrobe.png" type="Texture" id=1] [ext_resource path="res://Sprites/table.png" type="Texture" id=2] +[ext_resource path="res://Sprites/chair.png" type="Texture" id=3] [sub_resource type="ConvexPolygonShape2D" id=1] points = PoolVector2Array( 16, 11.2241, 0, 11.3539, 0, 0, 16, 0 ) @@ -9,6 +10,9 @@ points = PoolVector2Array( 16, 11.2241, 0, 11.3539, 0, 0, 16, 0 ) [sub_resource type="ConvexPolygonShape2D" id=2] points = PoolVector2Array( 12, 12, 0, 12, 0, 0, 12, 0 ) +[sub_resource type="ConvexPolygonShape2D" id=3] +points = PoolVector2Array( 7, 11.9141, 0.9375, 11.9766, 1, 0, 7, 0 ) + [resource] 0/name = "wardrobe.png 0" 0/texture = ExtResource( 1 ) @@ -66,3 +70,24 @@ points = PoolVector2Array( 12, 12, 0, 12, 0, 0, 12, 0 ) "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) } ] 3/z_index = 0 +4/name = "chair.png 4" +4/texture = ExtResource( 3 ) +4/tex_offset = Vector2( 0, 0 ) +4/modulate = Color( 1, 1, 1, 1 ) +4/region = Rect2( 2, 0, 7, 13 ) +4/tile_mode = 0 +4/occluder_offset = Vector2( 0, 0 ) +4/navigation_offset = Vector2( 0, 0 ) +4/shape_offset = Vector2( 0, 0 ) +4/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +4/shape = SubResource( 3 ) +4/shape_one_way = false +4/shape_one_way_margin = 1.0 +4/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 3 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +4/z_index = 0