diff --git a/Resources/lodge.tres b/Resources/lodge.tres index 6134273..9e640fa 100644 --- a/Resources/lodge.tres +++ b/Resources/lodge.tres @@ -1,4 +1,4 @@ -[gd_resource type="TileSet" load_steps=42 format=2] +[gd_resource type="TileSet" load_steps=44 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] @@ -94,6 +94,12 @@ points = PoolVector2Array( 120, 60, 0, 60, 0, 0, 120, 0 ) [sub_resource type="ConvexPolygonShape2D" id=38] points = PoolVector2Array( 48, 105, 0, 105, 0, 20, 48, 20 ) +[sub_resource type="ConvexPolygonShape2D" id=39] +points = PoolVector2Array( 60, 60, 0, 60, 0, 51, 60, 51 ) + +[sub_resource type="ConvexPolygonShape2D" id=40] +points = PoolVector2Array( 60, 60, 0, 60, 0, 51, 60, 51 ) + [sub_resource type="ConvexPolygonShape2D" id=14] points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 ) @@ -920,3 +926,45 @@ points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 ) "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) } ] 53/z_index = 0 +54/name = "corridor.png 54" +54/texture = ExtResource( 3 ) +54/tex_offset = Vector2( 0, 0 ) +54/modulate = Color( 1, 1, 1, 1 ) +54/region = Rect2( 60, 180, 60, 60 ) +54/tile_mode = 0 +54/occluder_offset = Vector2( 0, 0 ) +54/navigation_offset = Vector2( 0, 0 ) +54/shape_offset = Vector2( 0, 0 ) +54/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +54/shape = SubResource( 39 ) +54/shape_one_way = false +54/shape_one_way_margin = 1.0 +54/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 39 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +54/z_index = 0 +55/name = "corridor.png 55" +55/texture = ExtResource( 3 ) +55/tex_offset = Vector2( 0, 0 ) +55/modulate = Color( 1, 1, 1, 1 ) +55/region = Rect2( 120, 180, 60, 60 ) +55/tile_mode = 0 +55/occluder_offset = Vector2( 0, 0 ) +55/navigation_offset = Vector2( 0, 0 ) +55/shape_offset = Vector2( 0, 0 ) +55/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +55/shape = SubResource( 40 ) +55/shape_one_way = false +55/shape_one_way_margin = 1.0 +55/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 40 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +55/z_index = 0 diff --git a/Scenes/UI.tscn b/Scenes/UI.tscn index 983713c..cf0027d 100644 --- a/Scenes/UI.tscn +++ b/Scenes/UI.tscn @@ -3,6 +3,7 @@ [node name="UI" type="Control"] margin_right = 960.0 margin_bottom = 480.0 +rect_clip_content = true __meta__ = { "_edit_lock_": true, "_edit_use_anchors_": false diff --git a/Scripts/CameraFollow.gd b/Scripts/CameraFollow.gd index c0dd85d..c4410c4 100644 --- a/Scripts/CameraFollow.gd +++ b/Scripts/CameraFollow.gd @@ -12,6 +12,6 @@ func _ready(): # Called every frame. 'delta' is the elapsed time since the previous frame. -onready var target = get_node("/root/MainScene/Player") +onready var target = get_node("/root/Ch1S2/FG/Player") func _process (delta): position = target.position diff --git a/Story/Ch1S2.tscn b/Story/Ch1S2.tscn index be7f7dd..48320da 100644 --- a/Story/Ch1S2.tscn +++ b/Story/Ch1S2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=2] +[gd_scene load_steps=13 format=2] [ext_resource path="res://Resources/lodge.tres" type="TileSet" id=1] [ext_resource path="res://Sprites/sak/Sak.tscn" type="PackedScene" id=2] @@ -11,49 +11,70 @@ [ext_resource path="res://Sprites/jame/James.tscn" type="PackedScene" id=9] [ext_resource path="res://Scenes/Player.tscn" type="PackedScene" id=10] [ext_resource path="res://Sprites/richal/Richal.tscn" type="PackedScene" id=11] +[ext_resource path="res://Scripts/CameraFollow.gd" type="Script" id=12] -[node name="LivingRoom" type="Node2D"] +[node name="Ch1S2" type="Node2D"] -[node name="Sky" type="TileMap" parent="."] +[node name="CanvasLayer" type="CanvasLayer" parent="."] + +[node name="UI" parent="CanvasLayer" instance=ExtResource( 8 )] +visible = false + +[node name="Camera2D" type="Camera2D" parent="."] +position = Vector2( 451, 306 ) +current = true +script = ExtResource( 12 ) + +[node name="ParallaxBackground" type="ParallaxBackground" parent="."] + +[node name="ParallaxLayer" type="ParallaxLayer" parent="ParallaxBackground"] +motion_scale = Vector2( 1.01, 1 ) + +[node name="Sky" type="TileMap" parent="ParallaxBackground/ParallaxLayer"] tile_set = ExtResource( 7 ) cell_size = Vector2( 60, 60 ) format = 1 -tile_data = PoolIntArray( 0, 0, 0, 4, 0, 0, 8, 0, 0, 12, 0, 0 ) +tile_data = PoolIntArray( 65532, 0, 0, 0, 0, 0, 4, 0, 0, 8, 0, 0, 12, 0, 0, 16, 0, 0, 20, 0, 0, 24, 0, 0 ) -[node name="Woods" type="TileMap" parent="."] +[node name="ParallaxLayer2" type="ParallaxLayer" parent="ParallaxBackground"] +motion_scale = Vector2( 1.05, 1 ) + +[node name="Woods" type="TileMap" parent="ParallaxBackground/ParallaxLayer2"] tile_set = ExtResource( 7 ) cell_size = Vector2( 60, 60 ) format = 1 tile_data = PoolIntArray( 65537, 1, 0, 65538, 1, 0, 65541, 1, 0, 65542, 1, 0 ) -[node name="Lodge" type="TileMap" parent="."] +[node name="BG" type="Node2D" parent="."] + +[node name="Lodge" type="TileMap" parent="BG"] position = Vector2( 60, 0 ) tile_set = ExtResource( 1 ) cell_size = Vector2( 60, 60 ) cell_quadrant_size = 15 format = 1 -tile_data = PoolIntArray( 65535, 15, 0, 0, 16, 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, 18, 0, 65536, 19, 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, 21, 0, 131072, 22, 0, 131074, 22, 0, 131076, 22, 0, 131078, 23, 0, 131079, 6, 0, 131080, 51, 0, 131082, 51, 0, 131084, 51, 0, 131086, 8, 0, 262143, 24, 0, 196608, 25, 0, 196610, 25, 0, 196612, 25, 0, 196614, 25, 0, 196616, 25, 0, 196618, 25, 0, 196620, 25, 0, 196622, 26, 0, 327679, 24, 0, 262144, 25, 0, 262146, 25, 0, 262148, 25, 0, 262150, 25, 0, 262152, 25, 0, 262154, 25, 0, 262156, 25, 0, 262158, 26, 0, 393215, 50, 0, 327680, 25, 0, 327682, 25, 0, 327684, 25, 0, 327686, 25, 0, 327688, 25, 0, 327690, 25, 0, 327692, 25, 0, 327694, 7, 0, 458751, 50, 0, 393216, 25, 0, 393218, 25, 0, 393220, 25, 0, 393222, 25, 0, 393224, 25, 0, 393226, 25, 0, 393228, 25, 0, 393230, 7, 0, 524287, 27, 0, 458752, 28, 0, 458754, 28, 0, 458756, 28, 0, 458758, 28, 0, 458760, 28, 0, 458762, 28, 0, 458764, 28, 0, 458766, 29, 0 ) +tile_data = PoolIntArray( 65535, 15, 0, 0, 16, 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, 18, 0, 65536, 19, 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, 196603, 5, 0, 196604, 4, 0, 196606, 1, 0, 196607, 21, 0, 131072, 22, 0, 131074, 22, 0, 131076, 22, 0, 131078, 23, 0, 131079, 6, 0, 131080, 51, 0, 131082, 51, 0, 131084, 51, 0, 131086, 8, 0, 131087, 31, 0, 131088, 4, 0, 131090, 1, 0, 262139, 5, 0, 262140, 4, 0, 262142, 1, 0, 262143, 24, 0, 196608, 25, 0, 196610, 25, 0, 196612, 25, 0, 196614, 25, 0, 196616, 25, 0, 196618, 25, 0, 196620, 25, 0, 196622, 26, 0, 196623, 31, 0, 196624, 4, 0, 196626, 5, 0, 327675, 6, 0, 327676, 51, 0, 327678, 8, 0, 327679, 24, 0, 262144, 25, 0, 262146, 25, 0, 262148, 25, 0, 262150, 25, 0, 262152, 25, 0, 262154, 25, 0, 262156, 25, 0, 262158, 26, 0, 262159, 6, 0, 262160, 51, 0, 262162, 8, 0, 393211, 24, 0, 393212, 25, 0, 393214, 7, 0, 393215, 50, 0, 327680, 25, 0, 327682, 25, 0, 327684, 25, 0, 327686, 25, 0, 327688, 25, 0, 327690, 25, 0, 327692, 25, 0, 327694, 7, 0, 327695, 50, 0, 327696, 7, 0, 327697, 50, 0, 327698, 26, 0, 458747, 24, 0, 458748, 25, 0, 458750, 7, 0, 458751, 50, 0, 393216, 25, 0, 393218, 25, 0, 393220, 25, 0, 393222, 25, 0, 393224, 25, 0, 393226, 25, 0, 393228, 25, 0, 393230, 7, 0, 393231, 50, 0, 393232, 7, 0, 393233, 50, 0, 393234, 26, 0, 524283, 50, 0, 524284, 25, 0, 524286, 7, 0, 524287, 55, 0, 458752, 28, 0, 458754, 28, 0, 458756, 28, 0, 458758, 28, 0, 458760, 28, 0, 458762, 28, 0, 458764, 28, 0, 458766, 54, 0, 458767, 50, 0, 458768, 25, 0, 458770, 7, 0, 589819, 24, 0, 589820, 25, 0, 589822, 26, 0, 524303, 24, 0, 524304, 25, 0, 524306, 26, 0, 655355, 24, 0, 655356, 25, 0, 655358, 26, 0, 589839, 24, 0, 589840, 25, 0, 589842, 26, 0, 720891, 24, 0, 720892, 25, 0, 720894, 26, 0, 655375, 24, 0, 655376, 25, 0, 655378, 26, 0, 786427, 50, 0, 786428, 25, 0, 786430, 26, 0, 720911, 24, 0, 720912, 25, 0, 720914, 7, 0, 851963, 24, 0, 851964, 25, 0, 851966, 26, 0, 786447, 24, 0, 786448, 25, 0, 786450, 26, 0, 917499, 24, 0, 917500, 25, 0, 917502, 26, 0, 851983, 24, 0, 851984, 25, 0, 851986, 26, 0, 983035, 50, 0, 983036, 25, 0, 983038, 26, 0, 917519, 24, 0, 917520, 25, 0, 917522, 7, 0, 1048571, 24, 0, 1048572, 25, 0, 1048574, 26, 0, 983055, 24, 0, 983056, 25, 0, 983058, 26, 0, 1114107, 24, 0, 1114108, 25, 0, 1114110, 26, 0, 1048591, 24, 0, 1048592, 25, 0, 1048594, 26, 0, 1179643, 24, 0, 1179644, 25, 0, 1179646, 26, 0, 1114127, 24, 0, 1114128, 25, 0, 1114130, 26, 0, 1245179, 50, 0, 1245180, 25, 0, 1245182, 26, 0, 1179663, 24, 0, 1179664, 25, 0, 1179666, 7, 0, 1310715, 24, 0, 1310716, 25, 0, 1310718, 26, 0, 1245199, 24, 0, 1245200, 25, 0, 1245202, 26, 0, 1376251, 27, 0, 1376252, 25, 0, 1376254, 29, 0, 1310735, 27, 0, 1310736, 25, 0, 1310738, 29, 0 ) -[node name="Carpet" type="TileMap" parent="."] +[node name="Carpet" type="TileMap" parent="BG"] 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="FG" type="YSort" parent="."] -[node name="Player" parent="YSort" instance=ExtResource( 10 )] -position = Vector2( 453, 309 ) +[node name="Player" parent="FG" instance=ExtResource( 10 )] +position = Vector2( 466, 418 ) -[node name="Furniture" type="TileMap" parent="YSort"] +[node name="Furniture" type="TileMap" parent="FG"] tile_set = ExtResource( 1 ) cell_size = Vector2( 30, 30 ) cell_tile_origin = 2 cell_y_sort = true format = 1 -tile_data = PoolIntArray( 131090, 45, 0, 458761, 47, 0, 524300, 48, 0, 589827, 53, 0, 589840, 32, 0, 720899, 54, 0, 720905, 46, 0, 720914, 34, 0, 720916, 34, 0, 720918, 34, 0, 720920, 34, 0, 720922, 34, 0 ) +tile_data = PoolIntArray( 131090, 45, 0, 458761, 47, 0, 524300, 48, 0, 589827, 53, 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"] +[node name="Chairs" type="TileMap" parent="FG"] tile_set = ExtResource( 1 ) cell_size = Vector2( 30, 30 ) cell_tile_origin = 1 @@ -61,30 +82,30 @@ 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( 11 )] +[node name="Richal" parent="FG" instance=ExtResource( 11 )] position = Vector2( 600, 180 ) -[node name="James" parent="YSort" instance=ExtResource( 9 )] +[node name="James" parent="FG" instance=ExtResource( 9 )] position = Vector2( 840, 190 ) -[node name="Sak" parent="YSort" instance=ExtResource( 2 )] +[node name="Sak" parent="FG" instance=ExtResource( 2 )] position = Vector2( 900, 230 ) -[node name="Charlene" parent="YSort" instance=ExtResource( 6 )] +[node name="Charlene" parent="FG" instance=ExtResource( 6 )] position = Vector2( 380, 380 ) -[node name="Alistair" parent="YSort" instance=ExtResource( 3 )] +[node name="Alistair" parent="FG" instance=ExtResource( 3 )] position = Vector2( 165, 150 ) -[node name="Kettle" type="Sprite" parent="YSort"] +[node name="Kettle" type="Sprite" parent="FG"] position = Vector2( 653, 156 ) texture = ExtResource( 4 ) -[node name="Mug" type="Sprite" parent="YSort"] +[node name="Mug" type="Sprite" parent="FG"] position = Vector2( 555, 155 ) texture = ExtResource( 5 ) -[node name="Mug2" type="Sprite" parent="YSort"] +[node name="Mug2" type="Sprite" parent="FG"] position = Vector2( 580, 155 ) texture = ExtResource( 5 ) @@ -93,7 +114,3 @@ tile_set = ExtResource( 1 ) cell_size = Vector2( 30, 30 ) format = 1 tile_data = PoolIntArray( 458755, 52, 0 ) - -[node name="CanvasLayer" type="CanvasLayer" parent="."] - -[node name="UI" parent="CanvasLayer" instance=ExtResource( 8 )] diff --git a/Tiles/Furniture/coffee table.png b/Tiles/Furniture/coffee table.png new file mode 100644 index 0000000..b3a3125 Binary files /dev/null and b/Tiles/Furniture/coffee table.png differ diff --git a/Tiles/Furniture/coffee-table.png b/Tiles/Furniture/coffee-table.png new file mode 100644 index 0000000..b3a3125 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..b1fbc34 --- /dev/null +++ b/Tiles/Furniture/coffee-table.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/coffee-table.png-689fe2e71d817ee91aa3ecff0dabf261.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Tiles/Furniture/coffee-table.png" +dest_files=[ "res://.import/coffee-table.png-689fe2e71d817ee91aa3ecff0dabf261.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/kitchen-bottom.png b/Tiles/Furniture/kitchen-bottom.png index c9cccb7..e618a43 100644 Binary files a/Tiles/Furniture/kitchen-bottom.png and b/Tiles/Furniture/kitchen-bottom.png differ diff --git a/Tiles/bedroom.png b/Tiles/bedroom.png index 6cff2b8..6e88d2b 100644 Binary files a/Tiles/bedroom.png and b/Tiles/bedroom.png differ diff --git a/Tiles/corridor.png b/Tiles/corridor.png index 76b147f..4cd4879 100644 Binary files a/Tiles/corridor.png and b/Tiles/corridor.png differ diff --git a/Tiles/living-room.png b/Tiles/living-room.png index 167453a..730ad28 100644 Binary files a/Tiles/living-room.png and b/Tiles/living-room.png differ diff --git a/project.godot b/project.godot index fda8b19..afde979 100644 --- a/project.godot +++ b/project.godot @@ -53,3 +53,4 @@ common/enable_pause_aware_picking=true quality/intended_usage/framebuffer_allocation=0 quality/intended_usage/framebuffer_allocation.mobile=0 +environment/default_clear_color=Color( 0, 0, 0, 1 )