From 943222ca96dd641d8532b1f15330a6e87ed62b78 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 13 Sep 2024 12:18:48 -0400 Subject: [PATCH] v2.5.1: fixed underscores in custom notes being used for highlighting --- core/src/main/assets/fonts/pixel_font.ttf | Bin 59828 -> 59856 bytes .../shatteredpixeldungeon/items/Item.java | 3 ++- .../items/rings/Ring.java | 3 ++- .../ui/CustomNoteButton.java | 4 ++++ .../windows/WndTitledMessage.java | 5 +++++ 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/core/src/main/assets/fonts/pixel_font.ttf b/core/src/main/assets/fonts/pixel_font.ttf index d75c17fb9b0993e0502119123b51de00bd1c9eed..28cfd140dfd0ad1db8f13dd810459dc834fca779 100644 GIT binary patch delta 5069 zcmai03sjTonf|`~Az>JoW+=) zGOow6mhw}^x|CH1acX-!*ietP=pe&b>Tz5SWv%tN%z$>5VL2YxWj!t{Vc+lnfkEta z@$kw2-rx6mzxVxm|40r0k@6sn5c)fG1X0MO*ISE!c=IoV2z}iP)QEhoPLHJ2FX6il zzSnQHB&n`kir8V^L4rm2~!9a-JQ?vhIU+DVJ;QIk@BHwj_nBblYpJ7< z2q{hk;*)65UX+9UkPQCfq1T{fhp`8r!9Bb%-X`95ULWuGyg%?hXHJOT#-B6KMQ;`V z(D%O2?Q{6H`DkCUFJtch+@I&}&HZWaU*|^Velc_EQO3iRhsud76Sj%a@#o_$ zy3o6*mU<7pk7}rYLO()3r%s{+R0s8Q2)UkWrG84a;SZ^wp?8o6A3?uF*H9DMg}z69 z2q~YU7*vOjPEj36c@CMU)abS1Bk+|pa{CH7(M0`qoR=hjDI(~nAXMA`3lq^)HmKDipS+#7xtU=Z!YnHXi zI%Hk4;e=HQ!3iFDLS8~yLVd#NgrS5fd8phZKO#RS|FwKVK9jgUQIc4dcp|Yku|M&d zLZrx1I209%eTsTTqoQ5Wsd%7xq z%1Pyn@-+fvGHC?P>Ma}WXe~m z%G8q7=G39o7ike`>a?OXdsDS!WjB38rOlzKN`Px<5V69jy z*Y48RYU{N}wXNDt?FH>+?IT@~ZoN*XOY`XRbVgl?u1dF8cR<&uJE1$J>(>2RcU^Z& zcUL!|d#sz)2kB+{G<}}FTHmh!GGCH!$gj(9%kRh^DF`hnDL7RyT*xm}7al15xbR+4 zV3E3LZ&7>E$d-UDDO+4yTDJ^rd1{auT!vp6dJTPsLBnmsOmTRzqqx2JwvlJ_gd0^x zyRpG|+Bmp1V5@QK(XD-3CrtjPB9q-zWvVsRn~s}KnJ$>Fnr@lyo2E>&<^XfJS!T{K z7nw`Ud(HLcckmq|M~S1^ z(dT%)J$QT8_P!GTlJt_pC6`NlrRvhXr6Z-&Wf5hjvX9F~odRc`lXjLkcR3F@8=c3U z?aprJRp(9T9p`=Ll=G=`*2QxLxKyqZSEK8K%JsNhS#B?HC_h_1RI$DyrJ|r>SH=E{ za}ZQv5h&ForEpkE7|X2_>kw8W1F`* z_X{3;RBH*RL;DHgl<5hlPoK|AFk?A(!QO-UNHqxpgCr;)HlhHV-716#-B(9V`aKXy zv6WF2hQO&WJQPM_7j9Y9@_PVUg`g$GwD&>bR_rmOp%q49Z7w$o&L)Napq9X?;g%KV zh&-6Xa^!wF2%dvjB6E zlzXLxi9&5>jWp4Tjfom~B2C&&+6P_Ya6Dy-Mo)0^NUA|E^qg4y>m^r`96QkF2 z2Fn+@3x;Wqi-tHl0gtr_ppj_t48Mn1gD@WhcoMWAj|cpMIr?&WsPn+w{a58VI_&Rg z)1{Xqhe6~SVma|srutg@}umdix~=x1{1bIncAcdLL3f=l#C zVKwxR1nn|Wed?LD-uj)x1G z$J?t!ixHzCaHm7aYbyCOxs$T8bJ)cUmxaJNSr)&}MVgF6N!p3uL#`lFpdr?6k z?~y7$VHg_`s(~C>X9QJJZrs6izO^pdwJbO;2x1h1`-aXpu)&??=-%nKeunYe-lK2- z2adc!Xh;uzu-K7J!VIu|o0T;)Ej5=wG_Up}EM!GtkW9bx0Y2#6S640&j&oApdj~%E z!wW4c9#{1jM;L~fScj%J)HbnOCQ7|XELYQmkf|&VpemwjobG_?d@D1j~xsWiDg#hh` z{$M9Oxl(L5-e9hu3&G>e-E;X-Ygt~|{4_s>ZwwOfBG~WU@I5Pd0%cpvsJlbLfC}l= zkk02W9pAuOy35o8mmST(ZU3g11a}GEOlNlzoOimDk~!?{FlgBD$*y3h6o;K%wbaB5 zmWPRD{Dje;e-Do`*UyLG8SmZmiNS?VXh9VR76l6n;3r#Fh@H?DES*hr80b=#UdlHt zRt#KrEy6kSHfH@ba;mQ-Vkc95Eey`1*ET?R{tD=3<~DmyUyJlC zZFJ(x{{^%Pc;WRe`Fv@33x`>LIBr?+y<&*_-vT~NV2b`0{Z5vTc#=hZ>#`@sC}5fa z0&H1cHNe(6knl-)77e_tPo^5AI(9u|Hz&2Q`?=8}B&Fou7Nz{dD@w_|ElT;}OUT0x zSdxErt#I=2YWn2E%u>G#cm{woF5g`2ONK~6N&ODOU?==<`f8FZ7Nh7VKpEk5GPV7Q znq}bQ88+f14t$DUj2O#V@VRG1Dev*(3?Z)o*k+J_e@K|~jw(oi;5EVZIaH5(usNB) z8zGw(s{@;LVf9S1zPJtiYNK%*xRfco@wc)iQvXl318lZ%LbmLAV!#7U8~ABRAzS+( z0oE_Z1osCJz_1RXcFPf%Wal-=v2=un7A77HGZz2aPnYmtw8rHRcxJL%E3O{VV!Mic z1-w)dPX5)3l(Ke8ndwiz2l2ZGzlpzKDgGWde(q8)i+^F?fZU4s$;2l8dwnnj&bx!f z2}|AJgO?{eBFK~xVkhtT{N9B)o49Mq7(ZM0-R1q;#J*u{%;C>MJb(-uf_?yPqQ!IY zFHvHVo@$>$#`K)OL8B%?PC&JPtKJTt!|wrSYY6Q)!PAcXMp@&Xu>@JB{j3J!JHk)e*U zmUdmoWf&h)$6+jk7X4g5KZf|Vu8Ybz)UwoX$~Z2aS~~(`Eo1#$OR3vsG3SsVnidwo6Z)bF^btE6UfZtr z-;^N~-+<7yj=GnsYnQB+3PE=p{@2#kz2vKol0?1*4r4(et7~j-xu8j?hVKgqE$wJ{ zd0X{gzxc%-gkmKKglUnKU$_{|4z6C!yg~U8^TYrmc&Va4*riY{}WNolC{?% z4UnN#NQnF4ZynO3Fq8tn1ZW8qY%liV_i(=;POw3+MKCD%h2TG#&ggG5cv)R>OJG}| zJWv*}2dse?pZw;@r%!(UWcLxe*?vsCbH|lr7UZM|S=7VKb%-FIe{-hWS_LZW4LOTFT17SzsMJLfK zXeaS1dJQ!a$Iu(-UE)XRRpK3@8`Yy$;w_?+U~m_46updm*oXcNT|#YWJNgdM1*yJG z97auOAK^qVp&y_F=ol8`6+}K^Ac_eqQ9u-;LE>FBj5mYrHb|QLFM=S^9-@dSVP?Li z_$G~-F^TP%La$>dcKB0bPYHYn5<3&mCSFavD~XV7l2{}ak{ZdYl0%ZClGBp&k|D{6 zWL$DrG9w8jMJ26Bk|n8<)+L#fnv?bLi$5>ggRSI zsw>p>>Rswqb-TJteN%l~J)04kA7XRjBl-WZSC65wPWid*V)!}tov+z%6e*j z+xnsPv)Wj#R-3Q2X}17ZFrC^&!)0lv-`3yX5Y%bpFRKLsuu@zLS3v* zrXzKGb?0>VbaNY*Zd7hGZ``@@=*GL76xJEvcvuh4hu2lQk52YC^Bn!Jj<*1Y|B!+C-H z!u$jI9r@k)r}J;*&l@5Pv4(7e+fZj{Hgp)y8ZH=y4c85y8txh%8Rm^bW0Y})QD*cS zw;OjE_ZklxyNtcYbH>}INYiqY)TB1)d?vGrGPz7Ork$o%(+^FDO~*}VOg}YUHGO2d zWx8jYF-MxEX0=&ot~IxtKP^ZoFc#Dm94hE67%hx0qzVrgjug%pX^VCi^%RX+L>8^3 z#?o#XEfy53ipz=*7GEsBZ>+S)?w>|l9&>*q`hRgWX=|2^C@jMTeIz` zZLm~OYA)SddcO1)iO77?M!LxDL7KD>Z1mz%hV_}PEAn{sX0fa zW2Hms(D@t|hs#m#XmuQP9CP$J1{{|iqmFUMl;fdejuz1|bONoUwRAphqh0iNdKbNy zK1g@bz4STyB7Kd%L4QWyryn~7&ZW+kU;9tyR6Dg!z0=~PomI|e=N@O9v)$R{Jnr=M zIs2U#oHv}0%a)d{DwCCI%JgNHvb|;F%$@aQ}i59RTCc6wSp`#tTRnFQjA)6hW6^XIkKV4Lc<4AzvWsP9$wuzPkkYaW#xF(Cm20QM+9U*Pl z?VvUsX0Qs?er3qCzX^G!csE4p!d?KB9@O4sV@1m$iq5(^&W^o&lmN)NC?#Am>`aqY zjC=eCtS{g=dLbLnE-Wm-H7uwQ=>f`P&WL8tmJ}3`3*BrQ3*B&0&vGt!Ey>#RK!frO zEovL3#yh1y4xPcesXFb_EX4AnzfZ1sX|W~;ZA+eRa`W? zzp4CR1h|ly+fw6iaQ%j*v)TQVI1l(9;ky^K=TC!&5qeUwhf#atVYPVT<2`IYS$u4# zg;rp@9IdZqtKebwdE(Z7g&zBOJt*FAQj@1MC3Pl(q5T*8(Z zzro7^AkTM}xvczOpSR~p$vG8a4_oNPatFZv9k3T+Z>?d zcTHG$9ES)s0#Ytmh&%Wl=HfrD&U_Xe4}x_HnLh1Tb@9+KgA2A+c z+8f2;zvMI|bGGq)PEyI30{QY-FCRN!C$-E6NZ25zq;qw zc*7K{f(PK-BE)GfB)0{bLvr>ca|EsgdzdEvvAvl~5?674w+eOWf1!i_2OW$GyAmT8 ztmfr@$${6y6)YYF<|jrtiXqw-y4gwwZVLOknZZT^y?^-4KSd{A=5~@;6&hkt0T^QV zGhWWz?D=>6A=Cbz7=O<6y>|uwp4r~}V|Tze4gw?0mGp1m#_e?Qau}gCG1$=3-w4toQpe zf+TY?l2hU|XV&6L2)h2&*SP*~rsmY{xKDWP(|aeZg)8!({WGW1W3ii&42t92K(nk+ z)xyVMn(_0(#gKzy>|*K$--2~+FcH?3ml9#h=(yE&DLvi|r-j?gQB)69vH{O);jf$N zy|f1SFaowDGtI3LmlJ)9_bc1kh9N^?9h;rd%Ceo={=qUp-tqyL#norBfZvb>tdIq_p1JDV z!0n0=VbfEeqLa`9u1X*`hvYzic;~Tp5DRMcq1ZPF7nmpJ{UMs5v72jZ}q^7f%jAAiVZ8ZrEx#Vmlad}UycKAQzRTZ8g`E(?~~ zY!>~);