diff --git a/Resources/lodge.tres b/Resources/lodge.tres index 9e640fa..97ab12a 100644 --- a/Resources/lodge.tres +++ b/Resources/lodge.tres @@ -1,4 +1,4 @@ -[gd_resource type="TileSet" load_steps=44 format=2] +[gd_resource type="TileSet" load_steps=49 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] @@ -12,6 +12,7 @@ [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] +[ext_resource path="res://Tiles/corners.png" type="Texture" id=13] [sub_resource type="ConvexPolygonShape2D" id=10] points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 ) @@ -68,13 +69,13 @@ points = PoolVector2Array( 27, 39, 27, 39, 339, 39, 339, 39, 348, 39, 348, 39, 3 points = PoolVector2Array( 36, 30, 0, 30, 0, 60, 36, 60 ) [sub_resource type="ConvexPolygonShape2D" id=28] -points = PoolVector2Array( 24, 45, 12, 45, 12, 33, 24, 33 ) +points = PoolVector2Array( 24, 48, 12, 48, 12, 33, 24, 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, 330, 180, 330, 150, 0, 150 ) +points = PoolVector2Array( 0, 0, 420, 0, 420, 180, 360, 180, 360, 153, 0, 153 ) [sub_resource type="ConvexPolygonShape2D" id=22] points = PoolVector2Array( 12, 51, 78, 51, 69, 81, 21, 81 ) @@ -100,6 +101,18 @@ 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=41] +points = PoolVector2Array( 60, 60, 51, 60, 51, 48, 60, 48 ) + +[sub_resource type="ConvexPolygonShape2D" id=42] +points = PoolVector2Array( 0, 48, 9, 48, 9, 60, 0, 60 ) + +[sub_resource type="ConvexPolygonShape2D" id=43] +points = PoolVector2Array( 60, 12, 51, 12, 51, 0, 60, 0 ) + +[sub_resource type="ConvexPolygonShape2D" id=44] +points = PoolVector2Array( 0, 0, 9, 0, 9, 12, 0, 12 ) + [sub_resource type="ConvexPolygonShape2D" id=14] points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 ) @@ -968,3 +981,87 @@ points = PoolVector2Array( 60, 60, 0, 60, 0, 0, 60, 0 ) "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) } ] 55/z_index = 0 +56/name = "corners.png 56" +56/texture = ExtResource( 13 ) +56/tex_offset = Vector2( 0, 0 ) +56/modulate = Color( 1, 1, 1, 1 ) +56/region = Rect2( 0, 0, 60, 60 ) +56/tile_mode = 0 +56/occluder_offset = Vector2( 0, 0 ) +56/navigation_offset = Vector2( 0, 0 ) +56/shape_offset = Vector2( 0, 0 ) +56/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +56/shape = SubResource( 41 ) +56/shape_one_way = false +56/shape_one_way_margin = 1.0 +56/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 41 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +56/z_index = 0 +57/name = "corners.png 57" +57/texture = ExtResource( 13 ) +57/tex_offset = Vector2( 0, 0 ) +57/modulate = Color( 1, 1, 1, 1 ) +57/region = Rect2( 60, 0, 60, 60 ) +57/tile_mode = 0 +57/occluder_offset = Vector2( 0, 0 ) +57/navigation_offset = Vector2( 0, 0 ) +57/shape_offset = Vector2( 0, 0 ) +57/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +57/shape = SubResource( 42 ) +57/shape_one_way = false +57/shape_one_way_margin = 1.0 +57/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 42 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +57/z_index = 0 +58/name = "corners.png 58" +58/texture = ExtResource( 13 ) +58/tex_offset = Vector2( 0, 0 ) +58/modulate = Color( 1, 1, 1, 1 ) +58/region = Rect2( 0, 60, 60, 60 ) +58/tile_mode = 0 +58/occluder_offset = Vector2( 0, 0 ) +58/navigation_offset = Vector2( 0, 0 ) +58/shape_offset = Vector2( 0, 0 ) +58/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +58/shape = SubResource( 43 ) +58/shape_one_way = false +58/shape_one_way_margin = 1.0 +58/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 43 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +58/z_index = 0 +59/name = "corners.png 59" +59/texture = ExtResource( 13 ) +59/tex_offset = Vector2( 0, 0 ) +59/modulate = Color( 1, 1, 1, 1 ) +59/region = Rect2( 60, 60, 60, 60 ) +59/tile_mode = 0 +59/occluder_offset = Vector2( 0, 0 ) +59/navigation_offset = Vector2( 0, 0 ) +59/shape_offset = Vector2( 0, 0 ) +59/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +59/shape = SubResource( 44 ) +59/shape_one_way = false +59/shape_one_way_margin = 1.0 +59/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 44 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +59/z_index = 0 diff --git a/Scenes/UI.tscn b/Scenes/UI.tscn index cf0027d..615f16c 100644 --- a/Scenes/UI.tscn +++ b/Scenes/UI.tscn @@ -8,13 +8,3 @@ __meta__ = { "_edit_lock_": true, "_edit_use_anchors_": false } - -[node name="PopupDialog" type="PopupDialog" parent="."] -visible = true -margin_left = 180.0 -margin_right = 900.0 -margin_bottom = 120.0 -popup_exclusive = true -__meta__ = { -"_edit_use_anchors_": false -} diff --git a/Story/Ch1S2.tscn b/Story/Ch1S2.tscn index 87d6c3a..70b0122 100644 --- a/Story/Ch1S2.tscn +++ b/Story/Ch1S2.tscn @@ -19,7 +19,6 @@ [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 ) @@ -54,7 +53,7 @@ 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, 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 ) +tile_data = PoolIntArray( -1, 31, 0, -65536, 4, 0, -65534, 4, 0, -65532, 4, 0, -65530, 4, 0, -65528, 4, 0, -65526, 4, 0, -65524, 4, 0, -65522, 5, 0, 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, 131067, 31, 0, 131068, 5, 0, 131069, 5, 0, 131070, 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, 65551, 31, 0, 65552, 4, 0, 65554, 5, 0, 196603, 31, 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, 31, 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, 56, 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, 57, 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="BG"] tile_set = ExtResource( 1 ) diff --git a/Tiles/corners.png b/Tiles/corners.png new file mode 100644 index 0000000..4f4e3f6 Binary files /dev/null and b/Tiles/corners.png differ diff --git a/Tiles/corners.png.import b/Tiles/corners.png.import new file mode 100644 index 0000000..31f5583 --- /dev/null +++ b/Tiles/corners.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/corners.png-a69d223b45ff454bf250eafd1ee2674d.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Tiles/corners.png" +dest_files=[ "res://.import/corners.png-a69d223b45ff454bf250eafd1ee2674d.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/addons/dialogic/Localization/dialogic.en.translation b/addons/dialogic/Localization/dialogic.en.translation index 5322c3a..c3df197 100644 Binary files a/addons/dialogic/Localization/dialogic.en.translation and b/addons/dialogic/Localization/dialogic.en.translation differ diff --git a/addons/dialogic/Localization/dialogic.es.translation b/addons/dialogic/Localization/dialogic.es.translation index 98120cf..d72935a 100644 Binary files a/addons/dialogic/Localization/dialogic.es.translation and b/addons/dialogic/Localization/dialogic.es.translation differ diff --git a/addons/dialogic/Localization/dialogic.fr.translation b/addons/dialogic/Localization/dialogic.fr.translation index 2628be3..04ecddf 100644 Binary files a/addons/dialogic/Localization/dialogic.fr.translation and b/addons/dialogic/Localization/dialogic.fr.translation differ diff --git a/addons/dialogic/Localization/dialogic.zh_CN.translation b/addons/dialogic/Localization/dialogic.zh_CN.translation index 07af9c0..e947361 100644 Binary files a/addons/dialogic/Localization/dialogic.zh_CN.translation and b/addons/dialogic/Localization/dialogic.zh_CN.translation differ diff --git a/dialogic/timelines/timeline-1642498159.json b/dialogic/timelines/timeline-1642498159.json index 8226d0d..8d3773d 100644 --- a/dialogic/timelines/timeline-1642498159.json +++ b/dialogic/timelines/timeline-1642498159.json @@ -3,7 +3,7 @@ { "character": "character-1642498039.json", "event_id": "dialogic_001", - "portrait": "", + "portrait": "Default", "text": "Why do I feel empty inside" }, { diff --git a/project.godot b/project.godot index f7a7139..559c92a 100644 --- a/project.godot +++ b/project.godot @@ -97,4 +97,3 @@ 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 )