diff --git a/MainScene.tscn b/MainScene.tscn index f09138e..6073131 100644 --- a/MainScene.tscn +++ b/MainScene.tscn @@ -5,6 +5,7 @@ [ext_resource path="res://lodge.tres" type="TileSet" id=14] [node name="LivingRoom" type="Node2D"] +position = Vector2( 60, 0 ) [node name="CanvasLayer" type="CanvasLayer" parent="."] @@ -15,13 +16,13 @@ tile_set = ExtResource( 14 ) cell_size = Vector2( 60, 60 ) cell_quadrant_size = 15 format = 1 -tile_data = PoolIntArray( 1, 15, 0, 2, 16, 0, 4, 16, 0, 6, 17, 0, 7, 31, 0, 8, 5, 0, 9, 5, 0, 10, 5, 0, 11, 5, 0, 12, 5, 0, 13, 5, 0, 14, 5, 0, 65537, 18, 0, 65538, 19, 0, 65540, 19, 0, 65542, 20, 0, 65543, 31, 0, 65544, 5, 0, 65545, 5, 0, 65546, 5, 0, 65547, 5, 0, 65548, 5, 0, 65549, 5, 0, 65550, 5, 0, 131073, 21, 0, 131074, 22, 0, 131076, 22, 0, 131078, 23, 0, 131079, 6, 0, 131080, 7, 0, 131082, 7, 0, 131084, 7, 0, 131086, 8, 0, 196609, 24, 0, 196610, 25, 0, 196612, 25, 0, 196614, 25, 0, 196616, 25, 0, 196618, 25, 0, 196620, 10, 0, 196622, 11, 0, 262145, 24, 0, 262146, 25, 0, 262148, 25, 0, 262150, 25, 0, 262152, 25, 0, 262154, 25, 0, 262156, 10, 0, 262158, 11, 0, 327681, 24, 0, 327682, 25, 0, 327684, 25, 0, 327686, 25, 0, 327688, 25, 0, 327690, 25, 0, 327692, 10, 0, 327694, 11, 0, 393217, 24, 0, 393218, 25, 0, 393220, 25, 0, 393222, 25, 0, 393224, 25, 0, 393226, 25, 0, 393228, 10, 0, 393230, 11, 0, 458753, 27, 0, 458754, 28, 0, 458756, 28, 0, 458758, 28, 0, 458760, 13, 0, 458762, 13, 0, 458764, 13, 0, 458766, 14, 0 ) +tile_data = PoolIntArray( 65535, 31, 0, 0, 1, 0, 1, 15, 0, 2, 16, 0, 4, 16, 0, 6, 17, 0, 7, 31, 0, 8, 5, 0, 9, 5, 0, 10, 5, 0, 11, 5, 0, 12, 5, 0, 13, 5, 0, 14, 5, 0, 131071, 31, 0, 65536, 1, 0, 65537, 18, 0, 65538, 19, 0, 65540, 19, 0, 65542, 20, 0, 65543, 31, 0, 65544, 5, 0, 65545, 5, 0, 65546, 5, 0, 65547, 5, 0, 65548, 5, 0, 65549, 5, 0, 65550, 5, 0, 196607, 6, 0, 131072, 8, 0, 131073, 21, 0, 131074, 22, 0, 131076, 22, 0, 131078, 23, 0, 131079, 6, 0, 131080, 7, 0, 131082, 7, 0, 131084, 7, 0, 131086, 8, 0, 262143, 9, 0, 196608, 25, 0, 196610, 10, 0, 196612, 25, 0, 196614, 25, 0, 196616, 25, 0, 196618, 25, 0, 196620, 10, 0, 196622, 11, 0, 327679, 9, 0, 262144, 25, 0, 262146, 10, 0, 262148, 25, 0, 262150, 25, 0, 262152, 25, 0, 262154, 25, 0, 262156, 10, 0, 262158, 11, 0, 393215, 9, 0, 327680, 25, 0, 327682, 25, 0, 327684, 25, 0, 327686, 25, 0, 327688, 25, 0, 327690, 25, 0, 327692, 10, 0, 327694, 11, 0, 458751, 9, 0, 393216, 25, 0, 393218, 25, 0, 393220, 25, 0, 393222, 25, 0, 393224, 25, 0, 393226, 25, 0, 393228, 10, 0, 393230, 11, 0, 524287, 12, 0, 458752, 10, 0, 458754, 28, 0, 458756, 28, 0, 458758, 28, 0, 458760, 13, 0, 458762, 13, 0, 458764, 13, 0, 458766, 14, 0 ) [node name="Carpet" type="TileMap" parent="."] tile_set = ExtResource( 14 ) cell_size = Vector2( 60, 60 ) format = 1 -tile_data = PoolIntArray( 262146, 36, 0, 262147, 37, 0, 262148, 37, 0, 262149, 37, 0, 262150, 38, 0, 327682, 39, 0, 327683, 40, 0, 327684, 40, 0, 327685, 40, 0, 327686, 41, 0, 393218, 42, 0, 393219, 43, 0, 393220, 43, 0, 393221, 43, 0, 393222, 44, 0 ) +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 ) [node name="YSort" type="YSort" parent="."] @@ -32,6 +33,15 @@ position = Vector2( 437, 314 ) position = Vector2( -1, 0 ) tile_set = ExtResource( 14 ) cell_size = Vector2( 30, 30 ) +cell_tile_origin = 2 cell_y_sort = true format = 1 -tile_data = PoolIntArray( 131088, 45, 0, 458761, 47, 0, 524300, 48, 0, 524305, 35, 0, 524307, 35, 0, 524309, 35, 0, 524311, 35, 0, 524313, 35, 0, 589840, 32, 0, 655369, 46, 0, 720914, 34, 0, 720916, 34, 0, 720918, 34, 0, 720920, 34, 0, 720922, 34, 0 ) +tile_data = PoolIntArray( 131088, 45, 0, 458753, 49, 0, 458761, 47, 0, 524300, 48, 0, 589840, 32, 0, 720905, 46, 0, 720914, 34, 0, 720916, 34, 0, 720918, 34, 0, 720920, 34, 0, 720922, 34, 0 ) + +[node name="Chairs" type="TileMap" parent="YSort"] +tile_set = ExtResource( 14 ) +cell_size = Vector2( 30, 30 ) +cell_tile_origin = 1 +cell_y_sort = true +format = 1 +tile_data = PoolIntArray( 524305, 35, 0, 524307, 35, 0, 524309, 35, 0, 524311, 35, 0, 524313, 35, 0 ) diff --git a/Player.tscn b/Player.tscn index 1ef4b06..1b10645 100644 --- a/Player.tscn +++ b/Player.tscn @@ -58,19 +58,21 @@ animations = [ { } ] [sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 22, 4.5 ) +extents = Vector2( 22, 4.75 ) [node name="Player" type="KinematicBody2D"] position = Vector2( 4, 4 ) script = ExtResource( 1 ) [node name="AnimatedSprite" type="AnimatedSprite" parent="."] +position = Vector2( -1, -1 ) frames = SubResource( 2 ) animation = "IdleDown" playing = true +offset = Vector2( 1, 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( 0, 31.5 ) +position = Vector2( 0, 32 ) shape = SubResource( 1 ) [node name="RayCast2D" type="RayCast2D" parent="."] diff --git a/Sprites/richal/front.png b/Sprites/richal/front.png new file mode 100644 index 0000000..a050dc5 Binary files /dev/null and b/Sprites/richal/front.png differ diff --git a/Sprites/richal/front.png.import b/Sprites/richal/front.png.import new file mode 100644 index 0000000..6897ef6 --- /dev/null +++ b/Sprites/richal/front.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/front.png-0e96da2d1e702aecfecc07a142c76241.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/richal/front.png" +dest_files=[ "res://.import/front.png-0e96da2d1e702aecfecc07a142c76241.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/coffee table.png b/Tiles/Furniture/coffee table.png new file mode 100644 index 0000000..4cb1933 Binary files /dev/null and b/Tiles/Furniture/coffee table.png differ diff --git a/Tiles/Furniture/coffee table.png.import b/Tiles/Furniture/coffee table.png.import new file mode 100644 index 0000000..4071684 --- /dev/null +++ b/Tiles/Furniture/coffee table.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/coffee table.png-3490cbd795ff093667b55a2ee2b80ead.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Tiles/Furniture/coffee table.png" +dest_files=[ "res://.import/coffee table.png-3490cbd795ff093667b55a2ee2b80ead.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/game.pck b/game.pck deleted file mode 100644 index c709cc4..0000000 Binary files a/game.pck and /dev/null differ diff --git a/game.x86_64 b/game.x86_64 deleted file mode 100755 index be71c1b..0000000 Binary files a/game.x86_64 and /dev/null differ diff --git a/lodge.tres b/lodge.tres index 6f29828..64af3a3 100644 --- a/lodge.tres +++ b/lodge.tres @@ -1,4 +1,4 @@ -[gd_resource type="TileSet" load_steps=35 format=2] +[gd_resource type="TileSet" load_steps=37 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] @@ -11,6 +11,7 @@ [ext_resource path="res://Tiles/Furniture/sofa-chair-back.png" type="Texture" id=9] [ext_resource path="res://Tiles/Furniture/sofa-chair-front.png" type="Texture" id=10] [ext_resource path="res://Tiles/Furniture/sofa.png" type="Texture" id=11] +[ext_resource path="res://Tiles/Furniture/coffee table.png" type="Texture" id=12] [sub_resource type="ConvexPolygonShape2D" id=10] points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 ) @@ -45,14 +46,14 @@ points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 ) [sub_resource type="ConvexPolygonShape2D" id=11] points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 ) -[sub_resource type="ConvexPolygonShape2D" id=25] -points = PoolVector2Array( 7.25, 30.25, 351.25, 30.25, 351.25, 107.25, 7.25, 107.25 ) +[sub_resource type="ConvexPolygonShape2D" id=27] +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 ) -[sub_resource type="ConvexPolygonShape2D" id=20] -points = PoolVector2Array( 30, 60, 0, 60, 0, 60, 30, 60 ) +[sub_resource type="ConvexPolygonShape2D" id=28] +points = PoolVector2Array( 24, 45, 12, 45, 12, 33, 24, 33 ) [sub_resource type="ConvexPolygonShape2D" id=12] points = PoolVector2Array( 120, 60, 60, 60, 60, 0, 120, 0 ) @@ -61,14 +62,17 @@ points = PoolVector2Array( 120, 60, 60, 60, 60, 0, 120, 0 ) points = PoolVector2Array( 0, 0, 420, 0, 420, 180, 330, 180, 330, 150, 0, 150 ) [sub_resource type="ConvexPolygonShape2D" id=22] -points = PoolVector2Array( 15, 30, 75, 30, 75, 90, 15, 90 ) +points = PoolVector2Array( 12, 51, 78, 51, 69, 81, 21, 81 ) -[sub_resource type="ConvexPolygonShape2D" id=23] -points = PoolVector2Array( 75, 90, 15, 90, 15, 30, 75, 30 ) +[sub_resource type="ConvexPolygonShape2D" id=31] +points = PoolVector2Array( 78, 48, 78, 72, 72, 81, 18, 81, 12, 72, 12, 48 ) [sub_resource type="ConvexPolygonShape2D" id=24] points = PoolVector2Array( 0, 45, 60, 45, 60, 150, 0, 150 ) +[sub_resource type="ConvexPolygonShape2D" id=30] +points = PoolVector2Array( 54, 165, 6, 165, 6, 66, 54, 66 ) + [sub_resource type="ConvexPolygonShape2D" id=13] points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 ) @@ -624,14 +628,14 @@ points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 ) 32/navigation_offset = Vector2( 0, 0 ) 32/shape_offset = Vector2( 0, 0 ) 32/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -32/shape = SubResource( 25 ) +32/shape = SubResource( 27 ) 32/shape_one_way = false 32/shape_one_way_margin = 1.0 32/shapes = [ { "autotile_coord": Vector2( 0, 0 ), "one_way": false, "one_way_margin": 1.0, -"shape": SubResource( 25 ), +"shape": SubResource( 27 ), "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) } ] 32/z_index = 0 @@ -639,7 +643,7 @@ points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 ) 34/texture = ExtResource( 7 ) 34/tex_offset = Vector2( 0, 0 ) 34/modulate = Color( 1, 1, 1, 1 ) -34/region = Rect2( 0, 0, 36, 60 ) +34/region = Rect2( 0, 0, 36, 63 ) 34/tile_mode = 0 34/occluder_offset = Vector2( 0, 0 ) 34/navigation_offset = Vector2( 0, 0 ) @@ -660,20 +664,20 @@ points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 ) 35/texture = ExtResource( 6 ) 35/tex_offset = Vector2( 0, 0 ) 35/modulate = Color( 1, 1, 1, 1 ) -35/region = Rect2( 0, 0, 36, 60 ) +35/region = Rect2( 0, 0, 36, 63 ) 35/tile_mode = 0 35/occluder_offset = Vector2( 0, 0 ) 35/navigation_offset = Vector2( 0, 0 ) 35/shape_offset = Vector2( 0, 0 ) 35/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -35/shape = SubResource( 20 ) +35/shape = SubResource( 28 ) 35/shape_one_way = false 35/shape_one_way_margin = 1.0 35/shapes = [ { "autotile_coord": Vector2( 0, 0 ), "one_way": false, "one_way_margin": 1.0, -"shape": SubResource( 20 ), +"shape": SubResource( 28 ), "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) } ] 35/z_index = 0 @@ -828,7 +832,7 @@ points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 ) 46/texture = ExtResource( 9 ) 46/tex_offset = Vector2( 0, 0 ) 46/modulate = Color( 1, 1, 1, 1 ) -46/region = Rect2( 0, 0, 90, 90 ) +46/region = Rect2( 0, 6, 87, 81 ) 46/tile_mode = 0 46/occluder_offset = Vector2( 0, 0 ) 46/navigation_offset = Vector2( 0, 0 ) @@ -849,20 +853,20 @@ points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 ) 47/texture = ExtResource( 10 ) 47/tex_offset = Vector2( 0, 0 ) 47/modulate = Color( 1, 1, 1, 1 ) -47/region = Rect2( 0, 0, 90, 90 ) +47/region = Rect2( 0, 6, 87, 81 ) 47/tile_mode = 0 47/occluder_offset = Vector2( 0, 0 ) 47/navigation_offset = Vector2( 0, 0 ) 47/shape_offset = Vector2( 0, 0 ) 47/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -47/shape = SubResource( 23 ) +47/shape = SubResource( 31 ) 47/shape_one_way = false 47/shape_one_way_margin = 1.0 47/shapes = [ { "autotile_coord": Vector2( 0, 0 ), "one_way": false, "one_way_margin": 1.0, -"shape": SubResource( 23 ), +"shape": SubResource( 31 ), "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) } ] 47/z_index = 0 @@ -887,3 +891,24 @@ points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 ) "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) } ] 48/z_index = 0 +49/name = "coffee table.png 49" +49/texture = ExtResource( 12 ) +49/tex_offset = Vector2( 0, 0 ) +49/modulate = Color( 1, 1, 1, 1 ) +49/region = Rect2( 0, 0, 60, 165 ) +49/tile_mode = 0 +49/occluder_offset = Vector2( 0, 0 ) +49/navigation_offset = Vector2( 0, 0 ) +49/shape_offset = Vector2( 0, 0 ) +49/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +49/shape = SubResource( 30 ) +49/shape_one_way = false +49/shape_one_way_margin = 1.0 +49/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 30 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +49/z_index = 0