diff --git a/assets/textures/debug/dummy-npc-atlas.png b/assets/textures/debug/dummy-npc-atlas.png index 1bfb4d5..24860a9 100644 Binary files a/assets/textures/debug/dummy-npc-atlas.png and b/assets/textures/debug/dummy-npc-atlas.png differ diff --git a/assets/textures/debug/dummy-player-atlas.png b/assets/textures/debug/dummy-player-atlas.png index 86fac47..355468f 100644 Binary files a/assets/textures/debug/dummy-player-atlas.png and b/assets/textures/debug/dummy-player-atlas.png differ diff --git a/assets/textures/debug/dummy-player-atlas.png.import b/assets/textures/debug/dummy-player-atlas.png.import index 0e46850..3303020 100644 --- a/assets/textures/debug/dummy-player-atlas.png.import +++ b/assets/textures/debug/dummy-player-atlas.png.import @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/dummy-player-atlas.png-68f05802eecc35f4774851 [params] compress/mode=0 +compress/high_quality=false compress/lossy_quality=0.7 compress/hdr_compression=1 -compress/bptc_ldr=0 compress/normal_map=0 compress/channel_pack=0 mipmaps/generate=false diff --git a/project.godot b/project.godot index 1a05562..5f28ef2 100644 --- a/project.godot +++ b/project.godot @@ -24,11 +24,12 @@ Console="*res://scenes/gui/console.tscn" [display] -window/size/viewport_width=1537 -window/size/viewport_height=864 +window/size/viewport_width=1844 +window/size/viewport_height=1037 +window/size/window_width_override=1537 +window/size/window_height_override=864 mouse_cursor/custom_image="res://assets/textures/cursor.png" window/stretch/mode="canvas_items" -window/snap/snap_2d_transforms_to_pixel=false [dotnet] diff --git a/scenes/base_npc.tscn b/scenes/base_npc.tscn index 032d5d1..a0eb9f2 100644 --- a/scenes/base_npc.tscn +++ b/scenes/base_npc.tscn @@ -3,52 +3,52 @@ [ext_resource type="Texture2D" uid="uid://boewsqe4b5yxm" path="res://assets/textures/debug/dummy-npc-atlas.png" id="1_feq0g"] [ext_resource type="PackedScene" uid="uid://bu1xkt4xi58ox" path="res://scenes/dialog_trigger_area.tscn" id="2_cjcdi"] -[sub_resource type="AtlasTexture" id="AtlasTexture_0drx1"] +[sub_resource type="AtlasTexture" id="AtlasTexture_dtvay"] atlas = ExtResource("1_feq0g") -region = Rect2(0, 0, 84, 128) +region = Rect2(0, 0, 59, 90) -[sub_resource type="AtlasTexture" id="AtlasTexture_gmcfr"] +[sub_resource type="AtlasTexture" id="AtlasTexture_4vo8e"] atlas = ExtResource("1_feq0g") -region = Rect2(84, 0, 84, 128) +region = Rect2(59, 0, 59, 90) -[sub_resource type="AtlasTexture" id="AtlasTexture_1fq5y"] +[sub_resource type="AtlasTexture" id="AtlasTexture_qf4lj"] atlas = ExtResource("1_feq0g") -region = Rect2(168, 0, 84, 128) +region = Rect2(118, 0, 59, 90) -[sub_resource type="AtlasTexture" id="AtlasTexture_8pv6w"] +[sub_resource type="AtlasTexture" id="AtlasTexture_ix2cs"] atlas = ExtResource("1_feq0g") -region = Rect2(252, 0, 84, 128) +region = Rect2(177, 0, 59, 90) -[sub_resource type="AtlasTexture" id="AtlasTexture_rrbg8"] +[sub_resource type="AtlasTexture" id="AtlasTexture_y6ifs"] atlas = ExtResource("1_feq0g") -region = Rect2(252, 128, 84, 128) +region = Rect2(177, 90, 59, 90) -[sub_resource type="AtlasTexture" id="AtlasTexture_dwitn"] +[sub_resource type="AtlasTexture" id="AtlasTexture_tlb85"] atlas = ExtResource("1_feq0g") -region = Rect2(0, 128, 84, 128) +region = Rect2(0, 90, 59, 90) -[sub_resource type="AtlasTexture" id="AtlasTexture_cg6mx"] +[sub_resource type="AtlasTexture" id="AtlasTexture_b18m1"] atlas = ExtResource("1_feq0g") -region = Rect2(84, 128, 84, 128) +region = Rect2(59, 90, 59, 90) -[sub_resource type="AtlasTexture" id="AtlasTexture_bk3e1"] +[sub_resource type="AtlasTexture" id="AtlasTexture_5wb27"] atlas = ExtResource("1_feq0g") -region = Rect2(168, 128, 84, 128) +region = Rect2(118, 90, 59, 90) [sub_resource type="SpriteFrames" id="SpriteFrames_rr6ht"] animations = [{ "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_0drx1") +"texture": SubResource("AtlasTexture_dtvay") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_gmcfr") +"texture": SubResource("AtlasTexture_4vo8e") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_0drx1") +"texture": SubResource("AtlasTexture_dtvay") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_1fq5y") +"texture": SubResource("AtlasTexture_qf4lj") }], "loop": true, "name": &"move_down", @@ -56,10 +56,10 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_8pv6w") +"texture": SubResource("AtlasTexture_ix2cs") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_rrbg8") +"texture": SubResource("AtlasTexture_y6ifs") }], "loop": true, "name": &"move_side", @@ -67,16 +67,16 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_dwitn") +"texture": SubResource("AtlasTexture_tlb85") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_cg6mx") +"texture": SubResource("AtlasTexture_b18m1") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_dwitn") +"texture": SubResource("AtlasTexture_tlb85") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_bk3e1") +"texture": SubResource("AtlasTexture_5wb27") }], "loop": true, "name": &"move_up", @@ -84,27 +84,23 @@ animations = [{ }] [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_rsgcw"] -radius = 9.0 -height = 60.0 +radius = 7.99467 +height = 55.9998 [sub_resource type="RectangleShape2D" id="RectangleShape2D_sgrqb"] -size = Vector2(64, 79) +size = Vector2(54, 71) [node name="base_npc" type="CharacterBody2D"] [node name="animated_sprite_2d" type="AnimatedSprite2D" parent="."] -texture_filter = 1 -scale = Vector2(0.733398, 0.733398) sprite_frames = SubResource("SpriteFrames_rr6ht") animation = &"move_down" -frame_progress = 0.781605 metadata/_edit_lock_ = true [node name="collision_shape" type="CollisionShape2D" parent="."] -position = Vector2(0, 38) +position = Vector2(0, 37) rotation = 1.57345 shape = SubResource("CapsuleShape2D_rsgcw") -metadata/_edit_lock_ = true [node name="dialog_trigger_area" parent="." instance=ExtResource("2_cjcdi")] file = "res://assets/lang/en/dialogue/npcs/villager_normal.json" @@ -112,7 +108,7 @@ title = "Debug NPC" metadata/_edit_lock_ = true [node name="collision_shape_2d" parent="dialog_trigger_area" index="0"] -position = Vector2(0, -10.5) +position = Vector2(0, -6.5) shape = SubResource("RectangleShape2D_sgrqb") [editable path="dialog_trigger_area"] diff --git a/scenes/gui/console.tscn b/scenes/gui/console.tscn index 4195fbc..487b8c3 100644 --- a/scenes/gui/console.tscn +++ b/scenes/gui/console.tscn @@ -4,7 +4,7 @@ [node name="popup_panel" type="PopupPanel"] transparent_bg = true -size = Vector2i(1537, 193) +size = Vector2i(1844, 193) visible = true always_on_top = true script = ExtResource("1_gdt1r") @@ -12,7 +12,7 @@ script = ExtResource("1_gdt1r") [node name="v_box_container" type="VBoxContainer" parent="."] offset_left = 4.0 offset_top = 4.0 -offset_right = 1533.0 +offset_right = 1840.0 offset_bottom = 189.0 [node name="rich_text_label" type="RichTextLabel" parent="v_box_container"] diff --git a/scenes/gui/dialog_bubble.tscn b/scenes/gui/dialog_bubble.tscn index 0a9222e..7362306 100644 --- a/scenes/gui/dialog_bubble.tscn +++ b/scenes/gui/dialog_bubble.tscn @@ -51,7 +51,7 @@ grow_horizontal = 2 grow_vertical = 0 theme_override_colors/default_color = Color(1, 1, 1, 1) theme_override_fonts/normal_font = ExtResource("2_qrihj") -theme_override_font_sizes/normal_font_size = 32 +theme_override_font_sizes/normal_font_size = 42 bbcode_enabled = true scroll_active = false visible_characters_behavior = 1 @@ -70,7 +70,7 @@ offset_right = 0.389984 offset_bottom = 0.118996 theme_override_colors/font_color = Color(1, 1, 1, 1) theme_override_fonts/font = ExtResource("2_qrihj") -theme_override_font_sizes/font_size = 36 +theme_override_font_sizes/font_size = 38 text = "???" metadata/_edit_lock_ = true @@ -82,16 +82,15 @@ anchor_left = 1.0 anchor_top = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 -offset_left = -146.0 -offset_top = -337.0 -offset_right = 34.0 -offset_bottom = -237.0 +offset_left = -187.88 +offset_top = -367.402 +offset_right = 28.12 +offset_bottom = -247.402 grow_horizontal = 0 grow_vertical = 0 size_flags_horizontal = 8 size_flags_vertical = 8 theme_override_styles/panel = SubResource("StyleBoxEmpty_5w2xu") -metadata/_edit_lock_ = true [node name="nine_patch_rect" type="NinePatchRect" parent="box/panel_container"] layout_mode = 2 @@ -104,10 +103,10 @@ metadata/_edit_lock_ = true [node name="margin_container" type="MarginContainer" parent="box/panel_container"] layout_mode = 2 -theme_override_constants/margin_left = 40 -theme_override_constants/margin_top = 30 -theme_override_constants/margin_right = 60 -theme_override_constants/margin_bottom = 30 +theme_override_constants/margin_left = 48 +theme_override_constants/margin_top = 36 +theme_override_constants/margin_right = 72 +theme_override_constants/margin_bottom = 36 metadata/_edit_lock_ = true [node name="answerbtn_audio_stream" type="AudioStreamPlayer" parent="."] diff --git a/scenes/gui/dlg_answer_button.tscn b/scenes/gui/dlg_answer_button.tscn index 99fd9ff..42eb54f 100644 --- a/scenes/gui/dlg_answer_button.tscn +++ b/scenes/gui/dlg_answer_button.tscn @@ -34,7 +34,7 @@ theme_override_colors/icon_hover_pressed_color = Color(1, 1, 1, 1) theme_override_colors/icon_focus_color = Color(1, 1, 1, 1) theme_override_colors/icon_disabled_color = Color(1, 1, 1, 0) theme_override_fonts/font = ExtResource("1_2bkol") -theme_override_font_sizes/font_size = 28 +theme_override_font_sizes/font_size = 36 theme_override_styles/normal = SubResource("StyleBoxEmpty_mvyo0") theme_override_styles/hover = SubResource("StyleBoxEmpty_h66dw") theme_override_styles/pressed = SubResource("StyleBoxEmpty_2axga") diff --git a/scenes/player.tscn b/scenes/player.tscn index 01128d8..a13dbf6 100644 --- a/scenes/player.tscn +++ b/scenes/player.tscn @@ -4,52 +4,52 @@ [ext_resource type="Texture2D" uid="uid://olceowuycu8c" path="res://assets/textures/debug/dummy-player-atlas.png" id="2_yu1q5"] [ext_resource type="PackedScene" uid="uid://bkm7365u1mm3o" path="res://scenes/gui/dialog_bubble.tscn" id="3_8f573"] -[sub_resource type="AtlasTexture" id="AtlasTexture_tokqm"] +[sub_resource type="AtlasTexture" id="AtlasTexture_068kt"] atlas = ExtResource("2_yu1q5") -region = Rect2(0, 0, 83, 127) +region = Rect2(0, 0, 59, 90) -[sub_resource type="AtlasTexture" id="AtlasTexture_qomfj"] +[sub_resource type="AtlasTexture" id="AtlasTexture_tubtg"] atlas = ExtResource("2_yu1q5") -region = Rect2(168, 0, 84, 128) +region = Rect2(59, 0, 59, 90) -[sub_resource type="AtlasTexture" id="AtlasTexture_bsfbd"] +[sub_resource type="AtlasTexture" id="AtlasTexture_ck0si"] atlas = ExtResource("2_yu1q5") -region = Rect2(84, 0, 83, 127) +region = Rect2(118, 0, 59, 90) -[sub_resource type="AtlasTexture" id="AtlasTexture_ulejc"] +[sub_resource type="AtlasTexture" id="AtlasTexture_48laa"] atlas = ExtResource("2_yu1q5") -region = Rect2(252, 0, 84, 128) +region = Rect2(177, 0, 59, 90) -[sub_resource type="AtlasTexture" id="AtlasTexture_1x805"] +[sub_resource type="AtlasTexture" id="AtlasTexture_dp3ld"] atlas = ExtResource("2_yu1q5") -region = Rect2(252, 128, 84, 128) +region = Rect2(177, 90, 59, 90) -[sub_resource type="AtlasTexture" id="AtlasTexture_x338k"] +[sub_resource type="AtlasTexture" id="AtlasTexture_7t6sn"] atlas = ExtResource("2_yu1q5") -region = Rect2(0, 128, 84, 128) +region = Rect2(0, 90, 59, 90) -[sub_resource type="AtlasTexture" id="AtlasTexture_6ynw8"] +[sub_resource type="AtlasTexture" id="AtlasTexture_w5lt5"] atlas = ExtResource("2_yu1q5") -region = Rect2(84, 128, 84, 128) +region = Rect2(59, 90, 59, 90) -[sub_resource type="AtlasTexture" id="AtlasTexture_2yirn"] +[sub_resource type="AtlasTexture" id="AtlasTexture_0gngb"] atlas = ExtResource("2_yu1q5") -region = Rect2(168, 128, 84, 128) +region = Rect2(118, 90, 59, 90) -[sub_resource type="SpriteFrames" id="SpriteFrames_2x1cy"] +[sub_resource type="SpriteFrames" id="SpriteFrames_65gi3"] animations = [{ "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_tokqm") +"texture": SubResource("AtlasTexture_068kt") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_qomfj") +"texture": SubResource("AtlasTexture_tubtg") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_tokqm") +"texture": SubResource("AtlasTexture_068kt") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_bsfbd") +"texture": SubResource("AtlasTexture_ck0si") }], "loop": true, "name": &"move_down", @@ -57,10 +57,10 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_ulejc") +"texture": SubResource("AtlasTexture_48laa") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_1x805") +"texture": SubResource("AtlasTexture_dp3ld") }], "loop": true, "name": &"move_side", @@ -68,16 +68,16 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_x338k") +"texture": SubResource("AtlasTexture_7t6sn") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_6ynw8") +"texture": SubResource("AtlasTexture_w5lt5") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_x338k") +"texture": SubResource("AtlasTexture_7t6sn") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_2yirn") +"texture": SubResource("AtlasTexture_0gngb") }], "loop": true, "name": &"move_up", @@ -85,11 +85,11 @@ animations = [{ }] [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_38v5o"] -height = 59.9998 +radius = 7.99997 +height = 54.0 [node name="player" type="CharacterBody2D"] process_mode = 1 -floor_stop_on_slope = false script = ExtResource("1_qehox") metadata/_edit_lock_ = true @@ -106,14 +106,11 @@ collide_with_bodies = false metadata/_edit_lock_ = true [node name="animated_sprite_2d" type="AnimatedSprite2D" parent="."] -texture_filter = 1 -scale = Vector2(0.733398, 0.733398) -sprite_frames = SubResource("SpriteFrames_2x1cy") +sprite_frames = SubResource("SpriteFrames_65gi3") animation = &"move_down" metadata/_edit_lock_ = true [node name="main_cam" type="Camera2D" parent="."] -zoom = Vector2(0.8, 0.8) position_smoothing_enabled = true position_smoothing_speed = 3.0 drag_horizontal_enabled = true @@ -126,7 +123,6 @@ editor_draw_drag_margin = true metadata/_edit_lock_ = true [node name="cheat_cam" type="Camera2D" parent="."] -zoom = Vector2(0.8, 0.8) metadata/_edit_lock_ = true [node name="audio_listener_2d" type="AudioListener2D" parent="."] @@ -136,8 +132,6 @@ metadata/_edit_lock_ = true visible = false [node name="collision_shape" type="CollisionShape2D" parent="."] -position = Vector2(0, 38) -rotation = 1.57345 +position = Vector2(0, 37) +rotation = 1.5708 shape = SubResource("CapsuleShape2D_38v5o") - -[connection signal="animation_changed" from="animated_sprite_2d" to="." method="OnAnimationChanged"]