diff --git a/Ch1S2.tscn b/Ch1S2.tscn new file mode 100644 index 0000000..9df3e09 --- /dev/null +++ b/Ch1S2.tscn @@ -0,0 +1,73 @@ +[gd_scene load_steps=9 format=2] + +[ext_resource path="res://Player.tscn" type="PackedScene" id=1] +[ext_resource path="res://UI.tscn" type="PackedScene" id=2] +[ext_resource path="res://Sprites/richal/Richal.tscn" type="PackedScene" id=3] +[ext_resource path="res://Tiles/Furniture/kettle.png" type="Texture" id=4] +[ext_resource path="res://Tiles/Furniture/mug.png" type="Texture" id=5] +[ext_resource path="res://Sprites/jame/James.tscn" type="PackedScene" id=6] +[ext_resource path="res://Sprites/sak/Sak.tscn" type="PackedScene" id=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="."] + +[node name="UI" parent="CanvasLayer" instance=ExtResource( 2 )] + +[node name="Lodge" type="TileMap" parent="."] +tile_set = ExtResource( 14 ) +cell_size = Vector2( 60, 60 ) +cell_quadrant_size = 15 +format = 1 +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( 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="."] + +[node name="Player" parent="YSort" instance=ExtResource( 1 )] +position = Vector2( 453, 309 ) + +[node name="Furniture" type="TileMap" parent="YSort"] +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, 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 ) + +[node name="Richal" parent="YSort" instance=ExtResource( 3 )] +position = Vector2( 548, 180 ) + +[node name="James" parent="YSort" instance=ExtResource( 6 )] +position = Vector2( 786, 189 ) + +[node name="Sak" parent="YSort" instance=ExtResource( 7 )] +position = Vector2( 831, 216 ) + +[node name="Kettle" type="Sprite" parent="YSort"] +position = Vector2( 593, 156 ) +texture = ExtResource( 4 ) + +[node name="Mug" type="Sprite" parent="YSort"] +position = Vector2( 492, 155 ) +texture = ExtResource( 5 ) + +[node name="Mug2" type="Sprite" parent="YSort"] +position = Vector2( 517, 155 ) +texture = ExtResource( 5 ) diff --git a/LivingRoom.tscn b/LivingRoom.tscn new file mode 100644 index 0000000..7661c63 --- /dev/null +++ b/LivingRoom.tscn @@ -0,0 +1,47 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://lodge.tres" type="TileSet" id=1] +[ext_resource path="res://UI.tscn" type="PackedScene" id=2] +[ext_resource path="res://Player.tscn" type="PackedScene" id=3] + +[node name="LivingRoom" type="Node2D"] +position = Vector2( 60, 0 ) + +[node name="CanvasLayer" type="CanvasLayer" parent="."] + +[node name="UI" parent="CanvasLayer" instance=ExtResource( 2 )] + +[node name="Lodge" type="TileMap" parent="."] +tile_set = ExtResource( 1 ) +cell_size = Vector2( 60, 60 ) +cell_quadrant_size = 15 +format = 1 +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( 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 ) + +[node name="YSort" type="YSort" parent="."] + +[node name="Player" parent="YSort" instance=ExtResource( 3 )] +position = Vector2( 453, 309 ) + +[node name="Furniture" type="TileMap" parent="YSort"] +position = Vector2( -1, 0 ) +tile_set = ExtResource( 1 ) +cell_size = Vector2( 30, 30 ) +cell_tile_origin = 2 +cell_y_sort = true +format = 1 +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( 1 ) +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 1b10645..69530e1 100644 --- a/Player.tscn +++ b/Player.tscn @@ -16,16 +16,6 @@ [sub_resource type="SpriteFrames" id=2] animations = [ { -"frames": [ ExtResource( 2 ), ExtResource( 6 ), ExtResource( 2 ), ExtResource( 7 ) ], -"loop": true, -"name": "MoveDown", -"speed": 5.0 -}, { -"frames": [ ExtResource( 4 ), ExtResource( 13 ), ExtResource( 4 ), ExtResource( 8 ) ], -"loop": true, -"name": "MoveLeft", -"speed": 5.0 -}, { "frames": [ ExtResource( 5 ), ExtResource( 14 ), ExtResource( 5 ), ExtResource( 15 ) ], "loop": true, "name": "MoveUp", @@ -36,9 +26,14 @@ animations = [ { "name": "MoveRight", "speed": 5.0 }, { -"frames": [ ExtResource( 4 ) ], +"frames": [ ExtResource( 4 ), ExtResource( 13 ), ExtResource( 4 ), ExtResource( 8 ) ], "loop": true, -"name": "IdleLeft", +"name": "MoveLeft", +"speed": 5.0 +}, { +"frames": [ ExtResource( 2 ), ExtResource( 6 ), ExtResource( 2 ), ExtResource( 7 ) ], +"loop": true, +"name": "MoveDown", "speed": 5.0 }, { "frames": [ ExtResource( 3 ) ], @@ -55,26 +50,31 @@ animations = [ { "loop": true, "name": "IdleUp", "speed": 5.0 +}, { +"frames": [ ExtResource( 4 ) ], +"loop": true, +"name": "IdleLeft", +"speed": 5.0 } ] [sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 22, 4.75 ) +extents = Vector2( 22, 4.5 ) [node name="Player" type="KinematicBody2D"] position = Vector2( 4, 4 ) script = ExtResource( 1 ) [node name="AnimatedSprite" type="AnimatedSprite" parent="."] -position = Vector2( -1, -1 ) +position = Vector2( -4, -4 ) frames = SubResource( 2 ) animation = "IdleDown" playing = true -offset = Vector2( 1, 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( 0, 32 ) +position = Vector2( -4, 28 ) shape = SubResource( 1 ) [node name="RayCast2D" type="RayCast2D" parent="."] +position = Vector2( -4, -4 ) enabled = true cast_to = Vector2( 0, 60 ) diff --git a/Sprites/jame/James.tscn b/Sprites/jame/James.tscn new file mode 100644 index 0000000..21475e5 --- /dev/null +++ b/Sprites/jame/James.tscn @@ -0,0 +1,15 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://Sprites/jame/front.png" type="Texture" id=1] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 22, 4.5 ) + +[node name="James" type="StaticBody2D" groups=["Humans"]] + +[node name="Sprite" type="Sprite" parent="."] +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( 0, 32 ) +shape = SubResource( 1 ) diff --git a/Sprites/richal/Richal.tscn b/Sprites/richal/Richal.tscn new file mode 100644 index 0000000..a88cd12 --- /dev/null +++ b/Sprites/richal/Richal.tscn @@ -0,0 +1,15 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://Sprites/richal/front.png" type="Texture" id=1] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 22, 4.5 ) + +[node name="Richal" type="StaticBody2D" groups=["Humans"]] + +[node name="Sprite" type="Sprite" parent="."] +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( 0, 32 ) +shape = SubResource( 1 ) diff --git a/Sprites/sak/Sak.tscn b/Sprites/sak/Sak.tscn new file mode 100644 index 0000000..8558fe5 --- /dev/null +++ b/Sprites/sak/Sak.tscn @@ -0,0 +1,15 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://Sprites/sak/front.png" type="Texture" id=1] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 22, 4.5 ) + +[node name="Sak" type="StaticBody2D"] + +[node name="Sprite" type="Sprite" parent="."] +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( 0, 32 ) +shape = SubResource( 1 ) diff --git a/Tiles/Furniture/kettle.png b/Tiles/Furniture/kettle.png index 239a8e3..76d2b86 100644 Binary files a/Tiles/Furniture/kettle.png and b/Tiles/Furniture/kettle.png differ diff --git a/Tiles/Furniture/kitchen-bottom.png b/Tiles/Furniture/kitchen-bottom.png index a8f04c1..c9cccb7 100644 Binary files a/Tiles/Furniture/kitchen-bottom.png and b/Tiles/Furniture/kitchen-bottom.png differ diff --git a/Tiles/Furniture/mug.png b/Tiles/Furniture/mug.png new file mode 100644 index 0000000..2ba0792 Binary files /dev/null and b/Tiles/Furniture/mug.png differ diff --git a/Tiles/Furniture/mug.png.import b/Tiles/Furniture/mug.png.import new file mode 100644 index 0000000..d5ce5cf --- /dev/null +++ b/Tiles/Furniture/mug.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/mug.png-0d9d2911da1c980d5c5aa7bdfee3cff8.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Tiles/Furniture/mug.png" +dest_files=[ "res://.import/mug.png-0d9d2911da1c980d5c5aa7bdfee3cff8.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/sofa-chair-front.png b/Tiles/Furniture/sofa-chair-front.png index 1458591..fda7514 100644 Binary files a/Tiles/Furniture/sofa-chair-front.png and b/Tiles/Furniture/sofa-chair-front.png differ diff --git a/lodge.tres b/lodge.tres index 64af3a3..dbf73c3 100644 --- a/lodge.tres +++ b/lodge.tres @@ -65,7 +65,7 @@ points = PoolVector2Array( 0, 0, 420, 0, 420, 180, 330, 180, 330, 150, 0, 150 ) points = PoolVector2Array( 12, 51, 78, 51, 69, 81, 21, 81 ) [sub_resource type="ConvexPolygonShape2D" id=31] -points = PoolVector2Array( 78, 48, 78, 72, 72, 81, 18, 81, 12, 72, 12, 48 ) +points = PoolVector2Array( 78, 51, 78, 72, 72, 81, 18, 81, 12, 72, 12, 51 ) [sub_resource type="ConvexPolygonShape2D" id=24] points = PoolVector2Array( 0, 45, 60, 45, 60, 150, 0, 150 ) diff --git a/project.godot b/project.godot index 3c8c698..aceaa8c 100644 --- a/project.godot +++ b/project.godot @@ -11,7 +11,7 @@ config_version=4 [application] config/name="Fullhouse" -run/main_scene="res://MainScene.tscn" +run/main_scene="res://Ch1S2.tscn" config/icon="res://icon.png" [input]