From edfa2b715cb3370efe74a0ae9f11b9bf9c7f0119 Mon Sep 17 00:00:00 2001 From: cmod31 Date: Sat, 25 Feb 2023 19:27:22 +0100 Subject: [PATCH] fixed texture jittering and bleeding --- assets/textures/debug/dummy-npc-atlas.png | Bin 3879 -> 2434 bytes assets/textures/debug/dummy-player-atlas.png | Bin 3908 -> 2430 bytes .../debug/dummy-player-atlas.png.import | 2 +- project.godot | 7 +- scenes/base_npc.tscn | 66 ++++++++--------- scenes/gui/console.tscn | 4 +- scenes/gui/dialog_bubble.tscn | 21 +++--- scenes/gui/dlg_answer_button.tscn | 2 +- scenes/player.tscn | 70 ++++++++---------- 9 files changed, 81 insertions(+), 91 deletions(-) diff --git a/assets/textures/debug/dummy-npc-atlas.png b/assets/textures/debug/dummy-npc-atlas.png index 1bfb4d56bea3fc6d11f6a82e55e91020d2ddf9cf..24860a9ee4846d47575aa02e79e89f2563f67877 100644 GIT binary patch literal 2434 zcmZ{ldpwl+8o-CxRSF>?llw~1=B{BVVg`%YTxOEnU}A7E7$#EEN;?P@(zM6XVYit< zG^R#IQxIeP>Od(>dpJ{&?Tt=l8zP?f3ki=lkTH_CoC0rMU|N zf$VWZp7I4(A^1F!`wD!QDm*U$7b(0i!UQoTwZcI=bH+7 zr5hNz44GI14_@wT+MIuD{Ho2TEkDmnb32PoH_f@$}5O80fnEGYe2=ntxy@a4fUDP2_)ot%F=@=Y>|XSPSBkH($l`!%9RPCn`;R-kB}3&nj! zq|P<5127z4jEn|Cz9w;^Z?CZ|%0e!ZY>G*8UqEB(U2^}5`Nl|U3$sKGzqRr)IALu$ z4(9HQd#Zx2|}5*-DaFY#TPQ z)XPfx@1atLxrlH(y+`VezN2-ayEPhl+P(!F$C3(BG>ZNbl_iLAsdX7D;$F|RKAfRO z7;e>rj0Bl-!)nU3;qNjt@5OS$Sl(-NL!3w?#OcO51R(nHrpbXPl(wj2p8)8;4jJ_!q9KSRtI)S^5kVyOMXX#HF$TdS*)suhfhIy^(Y{UT1gW~rOE zzOLn0Y_<=&T@{=$YdXoha<9Sf^TdM-i;Fc?Uzf5YVb?tZvC9m>8^E_GrjwJgl77&> z!IcvrdaKGB=%S0Pk+y^koZkCDpZZHTW|8(D8Y<41LIziT$`WQc<_5Q*Sk3f9vG{v{ zhkw5W~lxqgnkjRhgiL&B}^WW zg{qxU1y5@n{WjOt$j(|TbCf_s7&Qdz-m!|ZP_8*&bX9T}o~{#QpSDRWbixbG@DK)z zO0l|nC>SV9+ypq!IC}DuW4iO21ZCW{+28K0b~ero4PGhy$=|vN?br605U=injS<{g4O7odYKP3?`m%EvgB2^ zGNq!kA+VxnN=8XdOGt*+3EkNC|Q2iA(=KyIqWx|M&Cf zS-!}I-M-_06mJxV7&6y7**gY8_P-hY_Uc!nshYG}T>^C>GLMJ3 za7t5#j4k7LM$*HXHa6UwwSriBf3*$Sq~ZArG)gGaTIXF}BYtjXxt=(nEwLv$2X0xM0TA!^qOh@XY}`}gQWA{#{*TGrx%0{B zXW8`hyH#qbK=eG78SO7_8V>W z>13;xL780ytxLPbxFppz$>;NCJ@0y-to3`> z^L*C#NsgC?D;%m11%W_tH-d{d2n6;5E|8Ku;2COuwF@xd7;jfRsCIDI9B`vRaXRG$ z0zJrsiOCS){tGX6-(!GX>MpUau(sBfv$nS0r)P3(-%%Z%oq+!Z;voz$%2aO;pY2~i zARo_oO{p`A5D)_bsXmro;KL9f6JU_)=HlcVPh2c}mWytJyBPGuiMK;`X-Ds?8fInL z+2+y=$_sCC?!PN%r-qoDi~A}DT<7o(?z$hzY@S*S`hB51!7#&4p*OTX8=0W8p>Bc- zJ}dWoGpRX&*~X=^#GRbS$(0?NGYu!!**p+B_^d*K`HymI%fVGoEG2A`TgTZ!kI6yL zUaj&Zd`kdPmp$3C_h#vIEc1)sIt*aeA3C`6{k`daDJLpdULt~%B@lQrQbSe=$~K0o}pnxky&w9jORXw zzInXO(GQtxjcw-C?%z6G>CgelC}umJoF-p;B~Yex;8&$D|5NGT9hfhFJfYLJ=3{xx z+D01nzN`jc4M=Bvd+w4{i*JlH&G#j;q72JoRLw*rtg5eMA+z2cb9l9d7B*}I6)Z@z^P_d* zrXD`QifEu}=5Kq&g zCXpzIXrpa;9BTaCgVeM^0-nuNm^+;ZQK25!90GDQC89~+VG9`MR!;2UP_TSierBdo zYq{rw;T_YGAFi~}-*fI`pQkpD8SxVB$(3nWV9~Dq7Ex+nO)dw`;Sv9QsO&IOQRgpA zugZy#ICZ&WqRPsb_AC`NoeM#g@z*_?i30bV;V5MwP7sD_`cs4Kb!v5Si0}ZJ&{0@f zP6OHmHQ56dyE3wj&Ry^Hv!oBYyh>qp#3{^82VQm0|0~goS6pT8i)_CP%QqY1UsuE- zhUrjNVI<1(n10eTN6H#4360X;s6&fo-^_5gby3zpSWKS`rVS@ueRst)&5X#~b!i3$;NCa6ZQ2l}FNW5RQ_ zaI4NZg?kTXa9b*48Z3nUveJ;qo=YwR76-WqY-EqkHe*67PwDfc4^VAQn8R3M8)+C; zhW)W8?n%shDw@-iV}237_?tFrjOV0D+B0c>ZKwK#Y2>U_oP7m3%-4K9X$s!8>$No2-k zZSZsBbIWrfD$V*SKtiGC$_2Y))_b+$J5C(xUMuM5M&Hr9RT!3%ix{ZCnP77lb}IhA zfB9DJ2w#U5`*~8z{QT_(akR^lOgm@aKjAwKXPjQN;b(@Q2h3`p&TAYrsBj>2)&JwR zSABMZ*P%K_f{;3rKp%cv6Vo&6$;Z0v*{iicHoQ4-AdF~N7E2@x56{0`6(KfMzUozm zBo%#5!<}%VkhA1Cn3Rfj{q9*$#@_VU6Z;tXkq3|NEA`{FB@VgjzLV+sD8MHZQS0yA zjJ6l>G>>&C2eWzGJ_6-=Rh+m~vNVWS`y(MuJVt?{$>!Bobuf6x5dAoE4u1f-EurHq3t}dzN5Ulm1HnPH{{0v1aW5bd zo6En|WEJm_B1++#2l^3)^&UXWV?8}rl+YpN7el9-JOiG;8OYo;%5Nvcq%COpN4DH> zDA7ax5vYRCrb{`ttmOjsarg6&FQ+?ud$gPj1Ld zPf+Pr{-zPTkjkQyuyCQy8tjef4F}1NzcfB_rmR+^mCHJ^&;WNGKvl{c?-7~+4Ja1n zoD7&?HpaK|gqP2JP!AWF`#b!kB`G}f~I*@KIw zxt0tYQ*~r~`sQ>VFF-~JR)8Izk|yi$5kjRhNCD#{v)YYZ=cu2;;?f7@fYuHGX~^=a zj9-<6j89+PlfE&(m1n>zT$ZA0Ay}X~)b~NXcsG1wmVQSxl>Mi+Y314w$?8@R$u|A{ z%$`FoNefv^eE4`iQGiGM*mFscJI*thqXPx`;|BpCwy0q*sSFc9!GE}0V;>H!EgVNo z#ZdPidZGee(k5Vl<3of}RGniY6L!kNIW-9~1OsI0$-O+lAQnNcek~3JvziK{+CD{H zaAkPhZ0d?nUsUoA-5vqB;n}aixda6GCA0$I+_+4V{Xqn>^%>ptY+mviQ^&YabKU@+ zbGQLOk*aa`GEl)sUC-SC+8jp0H{5!AVjlH#!*&G-@s#ZRN!kV1ppeOLDgo5&VkmC0 zrrsV2nW0$b0uXBK=Ewk7w_@ev*(0Y)$Vm2HTfL20$LhJBZs)xqhso&X7hiJkZYX#M ztJB_06i?)I9rm#L-xJD4iia0s<)o~tsmye{{)~nMdVeWEn^zb9fmj1G+Ln=ru5^{7 z_8(!A)YiYd0B|G%fQn7&uLMJW->CQltw)LrvHfWODiEpq?n<#mw|xCLsZ0~PqQ8}0 zYh>2%1rjZ~zPnfaRz{>rEIDfjskIZgN9(oqhFY+LcM%h`HkS9Z54LAk+p?~_i_)c{ z))AKh5Uu02sE)_>H${Se7C932%J2=LV>r=s_g^xuKtv-OZza#;)#N_MD@9~>;AeBAdy*}4}o~Tpb zm`L9mZQ<^|1j~WEDoyyWNtDDnJfymia9vnXjcung(}z#8o+kDV7ZW7`^jcGjjh~g? z&=CNDbJNCj=(xf0J@x#^pa1>AK(gu1iRR=?_XDjhcX}CvB;Cb)`k{p;*M!?asX zopIUuOxt$xI`mu8MGF9k7q2GV&RFbQ4neKm>fPL|?bG}OA5r}Ni<*h7qMjrCM`DTg t?#SXBdCP3{vx$G{Cu++d*SXtr-!TR*{4{NMANYd`ay#bXQi~_0{|zdzLyiCd diff --git a/assets/textures/debug/dummy-player-atlas.png b/assets/textures/debug/dummy-player-atlas.png index 86fac47ab188273bf1452c25889b48ddd8cba35b..355468f7b4d54ff4bcb119570ca6fbc3e762aa77 100644 GIT binary patch literal 2430 zcmcgudpOf=A9vi7E#y4r_)wOuoJ!<4hS99CSti-Uul1kFM zMGooBIG$Pd?Ssnz__3Z9BuHZHr>c?nssFWvolka8J}G5$N*pkQxUyF-K` zj}`nfUCdw(z8T@1_&^U^wDp#JFXNFGAX?mAoLsjVdNT)m!5F+QX&H&$RtikhY2q1U ziq~@to#Dqwy&8U52|uGGaa8Sm@|mtr8te)^GecS`z7rX!{r$k;mDhqThR&M*j1+up zhb0b=r`3fDa;T|@tr8k;A)21HmMPMAWs!#}7 zP_&{}n-3NLwE|V|tOMHK*pe8*0{T)wjjGV6_9w?YlTp)R2OJGGYa9IG8t;<}yk*6* zJIx6bwSDAO6_&5u#<`0VplLZP7!%rH^$yoONgbfxM%{6)B5DX}dm)MhPkr<8j!`*) zSi#XxkDpSq&iRtw8ZKwF>)=Mc=6}z@6fA_r}iSGnu2!6 zfJQhr(`%arsW1MLX`67ta6RQSl-dN*MUz#e9dNfXE5&h%tkA19&o!<2e^xZ=I`{d8 z;+YlGO;3h(Z!?_C8STGc2E`HS$onHshz0YQ0PQf}1YEH9^Q_foho-*Mssw4(q9CQM zbqq-pw69Q6A*|0Mcm)UgoV3n6WumK?4r?b2ZXIwRnA}4cs|T~+&LtyaHu(R*%dKg3Wq93zd?rC zX?@43ZcjhxV|oPx&kOOc(eUi7USTl$|mciiw>! z0}{j4ed8;u4|$rx;ZtYdXIfa~_vdZ4kXL%-e`n*R`a@LXo-T1z8V+NDPu6dckln^t zUTk{9lY=b4b_>M?(IKhICNi?IBA6Tbf{q!oXx$+_yH5YT9mN);0Wbl2m z)hk=;^+b8Si2anZ2!GS5s~=^^frGC}Og>AAa!JFDTVy(F-KY_62SzZErmrIqWqT2q zbQO4%SP-_D4R+MPGYJWe1A8Dsyy=TMeHdhDuGY&twHyK;yxC2PWM!_fuL_&H7ls?U zvL+pIkHp6npEDx+p?+kz^ZWJ9*H5*BXtR1e!L89pqFPXo-o05<4ST)`_QxlF=$kVx zJu=E6dLUw@u51{;O1 z;pk^^I-Ig7OCNCLhqTH6B1LrtHQl>Ps?%CK+`MX4_cU*T@*u(U3$p9ilBZ3d&h6>4 zQQ@|(C?h|bnev4S2QzvLo5N3+0cX}`0rHf7fHNfgv{{W#Oos0BnNg13UF6e}8CbzI z6TDt$3Q}WfsT$s`(@L>iz#J7_jQ#G;dju0eoEc?d6994SoY@UtdqYxES;=^21lgW< zhwlI9A^y;LnXmjc`l9!!CKXnpBY0YwS0IvZ;}*9tLNT;4`{)*$zobZIk!dOLIgQ% zCb*U__oB1kPKPNXDzY(4d}9N9gBe<HF7f)scN z`RHoc5^_^{+0$IA>Wza*4|wAq*~%jSelT09`(zDIMb?FVwFJm?7e8MN18?^QKuIn& zHYr{1LKKy8TIz%g=AgubBki|@>&_VtY59kRXuYk1j} z#=my|o0&SHWD;U48VDSF1K8adz)A{D77&j|iAO%q%g|Q)xURT=2VNld?u@&=G>kbs zSEoL>C(^=eM(qO0De{lUw^j?$=VWu|CORz*?NiJBw;eSKDdHhE8j_+|nd5=u?P*_p zX=#rJYFSF`O6m$*OZVB4QXMOmVt=>Gml)$$LgV}>(J{}l;h~xaTHx6SSt99DbUGUF St|}G(eIz_wap)#zD&rroz+6B8 literal 3908 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 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"]