From f82217ebbcb57d10a628daf6ee73c9bba845da82 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Sun, 6 Sep 2020 17:28:02 -0400 Subject: [PATCH] v0.9.0: adjusted some icons, chromes, and ChangesScene --- core/src/main/assets/interfaces/chrome.png | Bin 1159 -> 1119 bytes core/src/main/assets/interfaces/icons.png | Bin 10666 -> 10654 bytes .../shatteredpixeldungeon/Chrome.java | 11 ++- .../scenes/ChangesScene.java | 65 +++++++++++------- .../scenes/NewsScene.java | 8 +-- .../scenes/SupporterScene.java | 4 +- 6 files changed, 52 insertions(+), 36 deletions(-) diff --git a/core/src/main/assets/interfaces/chrome.png b/core/src/main/assets/interfaces/chrome.png index cf2cf117c8acf6c87b959d772ef97a0886ebbb4c..46e12af3604e16d54dc92d3995638f4cce84a51e 100644 GIT binary patch delta 955 zcmV;s14R6X3Ev2iG8?0&mD^7>0000000324P>zy=SzS|thk0jfV39!;FmZNjNlQb9 z94&5ccso5eK0rCCC@NoHX-7v(N=i<9esN=GT}(_+IXg8wJvTl;Igyfbe}>>cxTe*ifJ92o`V!2zdp zX;i%|wXU1b11@h<1E3#()ToaTAP3O`_#e^ftaTM5psKFdt1f%!5yS|%UT@bc29PKL zxBKl+1K5Y(0X99r5Q@<#D}BZD!vieg|A;)-G5;e93lNEo0x}5xSM0n_`vHUnFhT)z z|1T^LoWrkUFmjv!e>(gE-p>O|3(mgl7#NTF(*_gK^MGyqc>vt<=gT%ZfbM?_&fx)k z{>K6Chtl5**lZxkuLUR-H=s}|i5VbFfQT26{A<51kXs32Ab|d_s-A;{IoVk=vwi;) zMWZUSWYmT`XzaHvCjkHY0)U&_yZd|o^=W{I$EW9K{^bFne{cd|{+|ng!pmw71pMbq zixS2pY`~i~k&QnNkgI^n z8~{w!0B(Rx8wn?40qmKIJpk1_Q%1r#nJ^&$Wz3AAVeB!GNST>X_*5)AVQ(X2Ui$eO zD0(WUBoHpUteiHKsi1@IY&oJN=iga)0pnrJn!*02p*qPE-H?02==@|NsC0|NsC0|NsBY|FZx8|C#O((nkOQ z14BtfK~#7FUI7*e z=GS}Tm?t3df)H#lj7AJFL)N)s$hyUHwOViH*ZZ<8D}OK0tOQtmXEf%37=#$y^vYs| zw)5+KSyy!_;j9GMT+Q-G0U<5$rcD*kvyrqD%5?}+0j7AEGvFXLw1*FvW zQo<|CgVk!YonP;(x<0H0oRxr_5E~Y8gf5^t>NUH7_PE#P0N5g!U+;Zc)h7auUJsD> zdP6{gKz~_J0jG=t+$RSVXXob^m(K=V^}Z) z528Xoh(0wyc@WviOc!7iGot|Z_JGVrMq>_$Mu<6Jd_@EZZ+j5w+p!HpZhD0StdS_d zgYqbT^>+LU9551~KM$0`JJHRV);0QGu3YwBs$4FF;O z)k@l(F5l&S(vvs_w3?*?Wc6RYD|_J_&_aKp2d$PFAPiRlXknmdh!)HMNen;$Mv(xZ z@&QD^K#jq80r;H&iUG(3kO;tU2Q<}K0+N5gKj4c2?XL!Oz8cU~`oL!bs&8Kncz@R# z+4%DSsS23P0l-uZU#7xinp@7l>Xy@uoPNP!B?lh0GiW=X zaDKW7oTKsoU0#6nIa+|lQV;^vn$Pg3*!rdE5GjED@o@9ltHF99z>k0RCy*onLgz>UR0qJQ zKEQzlh(Am(5X0wtDFKfs3E;wt1IL&kfL>y}C`tepf(JjkdXXU`01yK3cv}I05`f1= z0PcP6wFCheIN`n@69gy}nC~U<0x)c}`KX=aqx4{x%u|RkY#~e}sA9{`s!1;Y6fDeMi;X6c$ z4=Z6l1)&5CAFqi!1GxmWAM0EL2#MnW8MtGp2*6STq?QuEm;8{cmIA;24$8X##ZVGJ zEde31)Dn<7Hzr;RfC`YWC(!Nu_Rj(EkR~xaA7JhIIRv=n@_p>+z1Fjxw_F)?Er9;; z63PjHTS6y5@1F#+7)}B~kUT%bU4XAb;40gERuSL7>m{YB0wCA~hS~>62~xsuBuHjx z)nNW_Z>p)Ln)-6RB`krE%K8VKW-UT0W3v5cSUw8Ux8c9K!ov2zyz@$)Ty%arW%>m` zNC5&YIDAVG2B6~WSWW5=LK5bKWQp9|{u7`Kd$ZZN?f1J8AVmUy-!0+slpl2Py?%Zt zBKfaq`%(f5z_9=Q!T(|O`yC6w@WK2muLFXB0x(fud{6CpaT|5@C367;12 zE_5e@7J%!$KjSS`0xtk7Q2_CEtj0?~eE6Wo;Swc4#w8%A;Mw+-2)=`O_&%{cII6h@(93~r`>aNQJa+*IU5B4n z0N>)pYe9XT>IC3_o7?Uq0q_jq_PG(V=BnA|>sSDWpIw0Z4}!cX{u-cvF9KNzH-V4} z!|#y*L0<%R_7yJo^PT-o)es=>uX;Gghu_x%Gy>>lp$R`nxv(%QWRUrPh*31*=PVbN z#s}FqKg4Kiu>KmT2_UM)7F+CFU}hvls0stos>=m&CB1LXS*Nnm1mO3Hy)wPE2;H#r z6Hi);0Cw8<78^}a9J%6m?f*lt>AxFn&T#?=W18>&|Mx5+bV3=vx#H^#-wOcZ@PGW{ zA1gvT5Tbn)ET%#L`M&dx+s5!S@GAJT@K}PsUp1M%bk~K}jRX^%e6oeL*E6v73YV9( z6Jhto|KD;+z|imi+t;LH5rPljOTgg00EFR(9bYYp1$gVNw?I%Z*iJhD=P>LP0T@2U zYqng~?mcvC5Zb^qe$?H_)UzOb66T$DF$iF{-~CQ0LX`kNxnmD4LH*!~79m9dj@<54 z0C3<+-k*C}IKL+HdkWd_oCi@Hp!UBnYl30X~Q-0XCi|80yvYw-OT6 z4!(v62_3)(?u4KK44yKu6J!?v{|lh1@bS9u0FdC+4Od3+X#Y|IAAAhYe&RZTl;9^n z`H9_f_%JO&{ovC@NWTW?OaKyhf)oKrCjt-z%+Mcr_^$Zuue=6WXR-OD1TK6WN5_x? zR7e1%1h2mOs#p#(1)m@SEht>*+(v~q0t6r~{usU%AVmx!YS>Ei85yzOnixr?0A2zv z2^1m{0LKuv7C=i-V>yt)XAz+kKoGnHK74|p1)*C3)LlVbaodLg?izpuPb2|F0D(b^ z_D@2B1SG^%EC(1tAP6SR8SKMr z*eD4YzFi*dxDf~wBlg=$kh}yS;3NSAxG-!HVi>d_q@co&B>)Ux3s6slcupLC)B$|> z9BT-0Y_$Lc5>SA;7lEM zEI`l#h_fHm_%dj$5`ck95h#EUAKMBFP?uV_fc3u)?tcM%*#7le0<5yiDh8HYZaEUV zA={5P(tqVM($ncbbI1umC_rlXUVu|hIR!uj5ITh);AtTk$n>EW;DjTC6+29B*!JPi zJoC&(I*_1v>)`_oqo&UVIQH0MApp*PN|4+Q;_x?#!gnI%2*2>*Pdn|jF{u(1m!Gz& zK?08xqrU|J2puADJ5>ONkFjb$WB5UZPf`Q`!K~mmr2t-nz7rr0U33Eys$k%xYCl)_ zUVw4N8RtQgDget%Kz15Fy`8qlg2w&6y$0|C@O8>CPzQK23f%AK3ZDY_@QD^6NrIpx z=;du-4FUMN6Tk%>Z^trVpQ9Hb4jtPre2^>rbO8px1X=(uLHcc=mV$HVn{Pggp#ba# zRZBxv7kKc&bK?$R*v}n41)u~JL0<&cmmvQ&f%`#-6Tt5&PKA8NL@loc(}RTLO1s=qtYndI`XLQ`UVFK$vmH8DjxT@Omd5 z;Kx6HtPC9^_OYEK{0tX?NfIaldMyG4V8AKC6LtUs5iqhF_}fD%z;A#1Tp2n>>|;A~ z_`C+lB7m2GcmaAXg6{y)sDjr5kf;+x-9QWQr$4<^hK`Zj8N$ze5vV250`y)4-vM;+ zS^xzFkdKQg07h!V73ZMlbH3Zmu&uxs%G2P4vx$T&^1Qh1#o(JzR2=MVOQ`tu?KE8RX0R=#P@#Amo zz@v|I5=a411={<8yR8F^+n1lY3->w74;=z9ScMBeNdN}U5l{%V3^8EIACDWe0t^H@ zK#Bmbyzx@W#phoR0qp%7CbsvlA4Qb_2$~@L>mPg&0@!$K7xA$H1z_NyVqXj3!>z8u zhpz?DZJ*&s0?0K#4qFQVY6!6Pmg|)u>=`GU79+Pi7T|?fo&)yctIw4JynFRHEyl%| zRe%&!cn-b9B?zF`ee7!ie9Mm|h~Y6WL2UsLcoh{(K;fYPPd)#HJ^lQXpcLS(%fD-H zU-4agt3{On2%5wKjJw!2@v#8~VB6<5_ft9mcz3F)q~tvQ;N-KK7C?tj0Vqj|0B)bu zy(7>9j97cslF5HK3Bt!%)d7l6uG_?7&fI8vLp}QBgDoDy2myHSPudE=;5m8;QUu`W zwt*6$@Zl=(p7ST3Qwk7;F2f&403rgHg5(f@NCB?jV}X+0=AFV&4?J=YNfrPh$Dj*f z^t8JRc=G-WEd_tJ#Nh*MD{y=u0sMMj6}}cgulaGle9pHkkW+hz-z(>1i z?+jVMB_PL>z#^8Q#`g$?4<7in-wTlX=r{3>Aj@|Fssmu%CmjnwAOM0*f#K(R5-8ex zY86$tdhxbLbrON>4qD87-vty5J%*vjF!UH7AfNHKM?Zk+lKS8F`Lln_{C8ykVyLJ| z=<(ONgSGPix8?Xunrg~4y0nRUzg7#+R!teok0}Cdzx8cK;;^driD>`Uo<@TIi2%g! zD*+hpI%^(h7|(v<_a2Lni_TzY92o4!&sKqBJ&~a404VMc)CCSY?+rWp*3Tt4?$3S| zKBdzV4dQLT9~k~_r#}cRUIOAdTmt-idnrIuK3s>F zfTQmKgrUX~5Qa|yI7bUWathFtKkIeae%}=ZpacrOr@06md>udvprz2y0sw+0*!Rx> zn%ltMmss;tuL0`+MbJa*K~QrS;NM@rnn%G+HD3nlYO1NGHvLa?cL5c3{_lT$WQGuF z#Ll&8kf8(#kx*g`QaY3{2#16zxaKk2)?XKJRa@+lv$8()jQG!zF6^4XoDnqJkN+C-1wUXbH-+WEuAS>OdRdxo- z6{gy~VYX9-B7NPSB`mXhmh3fiD8}BXH`Pi@8E2~zmE)#oEJ%J&>(@mar=%oAWf!hh zHgBu!-P%?=MT@ma zwos?sL*q%Qy+(VRzouM}{1)vej>tDN#ThYAYAf^FJ1?J-3zDCs8oYXflbTFI5_i{&B0LrNm7WUqg2^u} z{Fy`@leQ3z`b<~#r+F?K1Y2qm<}{69r+EbVda}rL77i0e<2X)=_pC8&aM7n?$!N+P zHK=tFTxA?oXgw`<(x~6&s%aufeu=|}8%^Hmy;XnwV#m{nqy)ml71&x>VryoBi=8FT zHfC6wnc}?Aij@JjSelyQ?zWIc3oWq{*8`lbQMS}RJ$wFW{jsk7CW7S0d^h-gUqtzG zFKPGgp$RSBA&D)tAGnHm6q z;?Bd{?swn5*M0uxc`jW)Lu~SDY;7!Xw6Y{|xg#zP7PvWB7i*TbAB zjJo*qdxlkA0e*& zR)d1#WyR03AFZhI(j2@Vr^~(wE!sjyQ|GNg^5U_Cxy;4Sb~Y~4G;tKgcQui+bh0`D zQ>7%#ld)s57LC3-GAELa$p$xAsnfMam!19^bVO)#B2t?|9|PiCr{Oi<7|-dN z_)eAzGW;g15jcpC<(;!;^4u2h5S7~rGT%8@OjoGwpCJIw+ ze5T1*I!Q{vG&TH%HFKnt%4L)}XwvMX$Jte5xV&16JxkT;3D)M*-G=n#ny@2aGRZb3 z-ASf~CW7SqB9m8|tWEOouHIcv>iTGE%QkVb`vQ(~Cl*ec{O=CiQPN4 zmzW5W=On7ZUkj)zd`Gv@3*wqEynsJV^>xGUA5j46M_Rx9e{BfrhX)|m z#h`wbtv;a(wTZFPB-c%grg%AfgSFV^ug-y(@l+`$5otRbugRkb5ERo!i2%q*nXgWX zy^IQH5gIoGZiMM@HfS{GSB~M0SRL+X7}FL18VRC%3Z27hV*RNJ+u0>9oa zl@To%pMHOf816hxzRtz?X{hsL6xRAg+v$>OD`VG2Uz!yr>=wnWUZze*ls5U^hJ?*h zBW}KoXi@m+xiWHXG$^*ypu$OugFf2aiyXtvNG}%Ohg^p9Uy`Sh->eY3pOTcK152&Q1in+mW5%%l@)tF6`Jqk1|(u zfJz3scJl6(eSCED1n>9kKfFq{5eU7;Yf!RK#`Z;;Tnf?SL8Kl-4MyBcF%;dvkbF}e8Xd;4$3cf3_L{V~sQ zqg{|Zcj7`vdqTo0R)_fD8?=^~SAUZ3D%!sP z1kyttNC=RV>@kBZxh{oPn(SYp$5vlmjz)~-cFs5sJ)h$P!J>5u3^W(f|{T223EU|YY)z6dtWzih1SVu?M1`bvxaPe?H56(97&h@atDvQ+Ie_r3vYIma%p!FC$=Y28Ml<|U~fDf7P9$yM@S51!-hDnywUmOz{SJH zKe_me-!vBC*9PFF_kS+{QNN}5Vyno&z+-}w8tCuuXQ2P#x8uII2}^8v+5J)LEH$E{ z7RXpNS4yO%CK*eN$nc#`s=q1eOXrd;H=w~qo8$4b*tdEH_mjr)Y04PBPS)j-DCWnR z#ykoc$6JAh^n~iO&0`F=lMK1H&X{Xny4;D-=f67*_~y;A{L5AY{!!fb;U;Zv#OqP% zrWdv6NLy64y}8)akb|h1tl9;>S0fc!hzE}(`n3zqA53!?qfSS+qjLw zI4@3b+rVJ=AwId=#Yb`v(g~d zR)cKU(QNh_PnQ2QlAWhe#Nn6|@PNzd4T_aX-xwiVL%?nB=G{3EJ1=2Bal&5@(6bnI!RYkxbRfAkKY zKDtEz#RELLa*Dn;&Tzit82hs`*qIwmrgIx&=a3MBvHJO>QloZ8t{>n+NzI91C zeDTNdAPl?yo2kCvcL4~E-`)G$IzX#x3h4W83J~LOr+|c)o*DG6ur}!RvoI#qX)5b| zXOXjf3e|xVsPZu)$5oR8PhCpox@`5G%&jC-{vmG~|K8}x=Or`wvZsb`K5OG|GMDm> zpAqkDl(W}w9#>b6<5<9WYMl((E56Sm#aJF>jOU|lLrz8NQLE;^b+Kui#*>$k@ z`t3_xyM2*!SC4b*>UqwdQ&Lk?#@4b}3bN9<*;32H`!`V5*K+aZ4Lim^PgPX` zUw`#EU;V@1^5NH?aa^fnOGy!N(ZK`+coVcNg5Hns({ueEVV@1GukzJdEgeZRv=-|$6XXu|H1+&2_rsX62`Q_4zHDbY4k;_YOVEz=eu(5EqC zG6fz}*}ZxS4J&8zR>V|3OP|5#nUgx`6kRW^yaQh&Na2 z@;H1fhnz-p)YpjKbVKfL9MAsn*;ED0CD(fv89uX!S~72FcSqaMiHohAzI2#V7miX` zl1WSZb}rU!plp34B}sl%#xJ4goi|t; zTGz=0T25f$cugz}HJGn2W6o$PGqlv6mDd+MtKQj2W>z8%TZ_4Jvr{bIs<}|Tf&8^A z*dbcDGCz#2QwQn3agOU(FVWL;O%!Eh$_v>)BiKCzByRMt@2Q1R?l3V_OE`X2Rvdkp+yU%&ge6!>L_ zMbDO-$)2sYQ6plZj2O9$bQdj(7i(~OjSe?b^f;TSOO2-{dE#?-;tY8lKbMbpF5zDu znDT$Vvg4b-J;nd}=Q9kQbl~5%jOB|GLq5&b=8cV0aeGY%&sn;7nU2MMz5&iNwXqwk zhMA!{Q#D30NhW!gmXq|Xs3eQ7TbH?bt&`3hhq-#;5I35$DUb4DXRbecN)j1(?;&ef zFUQ~CgV>NDvSL@z_uc?ks*ciZAS3eVgA%XvC;DytjcM)^^uP(mo#PH{ijfcEu zs||V2m9q3T8UC|n#M`QqzDSGA=i9$PEqZfJxVGMaY8MSU0(E&SR*$}r34BpAp8tAx z1^;$8ng4j*h5zVW#7819-Rt!EYL5X2VoX>xL5f@y+`@Pi3#aShW;PbrSz64~kugJ0 z#xy_t?fGq4fG|z%Z+#um=ou(P!jFRsq*z4J)`8}?F;NV zu#M)!4V<}heCSmOK(D}08t5l9sqr@*5(z)K2=tnz-n(SBI^J{D2{uz_#Vi@IuW68F ztx1}xIveCt-pbJBjWivaMJMPAHR8QO6NZj2;Ol*_@t^m`^Ucj^{B!dh?xY*>M!6Ax ze^QU;@F^@Z8HKIEC`|R$Ff*27KUIUJ7Dmi7P-B+AHT7#^ySz zi_+NMP{M_lGEUTHvacwX6I+tF-m;nQ=6vobOXxe@$eVi#*_$0o>*keQ-&amcasXEw z(m7uiM_HIBS*yHA@^>LC%9jIWo7h{E!O5dLxYl!-3vZpL}rydLOD>HNMlwMT{Y=k z+g(midpU2lm$6};f|NButXdjCQ+z14W>ze7w&C*jT<)}$a-%h$Gv)E@%8REs$(v(U zo7uUmjD3gexOw{u*Kb{=`~Ee0?sY3)g#bhej6_cHK2fyBU${+d`SvlP?MDxSmQ0XF zd5xD6FkKymC{XA`byiN4;b*KyzF<`&gMj2Hi7=0et)cX9cxD_p&OmXjBc zN4-1%D!*6ZeU&I0L+39FKxl$$JUj%dqhL1!bz?t$*^|(*GLojL6E;qr zB}P&fkCx&s9>W%B5Nsi1!$J)T-DT_v*5Y=BHD^Lc^G1vjS3>kT88wI7afW;-IzU^J zA@$*7P|Q`$|N1hlLbah_sZk(NTjmdl~hL z>0B>dK&77+Ro*gMg4DUR$&`o5WBIsjJO>gd(HN-BN>lY0D}F2SeJ%8!2S7Ydkm7D` z#AML{CTfjp7bMT!9=y?hByB%ZRQ0OI@{ z30>mCj&;E_Bt~$4Un4mwL0FhuV!B{HR;K1GwR2@peiW4(!lEJqr zjy%^v=V_Ir9{xINxazCDm=Z!~s1rF`M!KB_rHe*W?xI0sgayYlt?5e8r8`lJH`8=^ zm^+o8tSP)xJC2&*$)q`Jvc^mUdr@#(6LrkSYl-5^SZr#9%Yv~?)m3{sNl#5KNS?cV zyG!14@7mMTmyeTQkWFz>E=&9t6Pyr4PIe;uO4rj?no4s~C~aA*s7qT$?K;u^MbTZY z>~OcU6_4hG_&5{1%#OS;PZ}~6|_a-vV4@E=}bvw(Rc3wXz7ha73 zs6tRLFj9~DAF6f-!td~ckiB7s^?UscQRu1RGFJV?D}GiyKOvkYBiTutO)g{D;y;#Z z|0x_yvtTgKklU#m+*z;5gG?j-uE_-D8Y5CYXRz8zn>bq?9L7np5dpB6sD+~_yo>30 z1ZGoP-xo{%lPPpn9W%P3bXIZOx*zx|{$%4E~Zo`0oY4MCcY6xjt4Ww*QKkgf*E6lJCp2)if!#((Dcs z#rGMnj_*u0{O3yvu+$^aT9cZ!u3^!o!Dou_CYjQbZGRoj_q`I!lqo~`o zf-M^q6r~1Im={NDdp#Wom4pW@V^zo!s<#w(SCr?N2$JU{s==Qg096Rwg+YOl5T|^q z!=jeo{reoY=C&>mq#!K;=CuO-P{?a)bxX;ia*m?{bU9~Co)Tes&9Lj^|Q74LC zFqxUKSoSL0#c9TRP}xWq`*VO`NAlSu%Sx-m}$Nwm^&2#rkY?A5WIwYm|go zQW|W|wrFb#LM#Y(olT(qbe78}vuVjhT<7VrXpR;x^R)0-pf|X1nubD<{G9jx=6%IG zpS?Z!_>+gc`_V%NKfBMqt=Tl>$Fi$9fx>m+wC0C%s4$5uiR(F)5KL!WBu%2_Z%+-P zG2KHTji#~mi9V@Ao)Jk;5&b20ETyh5l#n>=<6T&UEdhu zZ>{g{F@JQoe6kvgW~yU9VHAs}O0k3qQkdyJ_m~f@CD#{k-4(@n;Xa-~aGqKKSBYPVU~xuF7P# zQSu;>PNUc_}$+cCZD8cVmnc-UOq|s)W&2Ka#4KCu~N*9M`3BKMv(Pb zHm+L4x)sjk1X&ZmcsAjVlSuWNNy^gKSm!?vH>*ic7tS%RUoc+XM3DRvAAIql$>Y!8 zum9+a51!tBe2e4T(y81SN_J`x2Xn$WToS{coCK7j?eEGAXYb}jO4s_3wRSldj#P1} z`wF+-y!f>5ojdgd@AjGqk{_cQyt-6d#P*jR7Cr8J_=mhX)N1S~xux-_cAN2PPt1*; zAL&Y2@cdYJq84T*QmiLxvTai+f6MHxNO1TmH_M zkK50*l|5-MO(r*aHBC7RE;MZBa&sx?cjj@fR&;~(5Xv{Mq&(G+yKmop@_K)F`<2@l z<$~nrs0Ob-)rn!0pcHzAA>oJ4lq z0N>0!ffzoYO9}XRiU2;WIB<*!0_Y{ii=qTzA$ahUtCkux0stidA8#fAPy+CA5rBK1 z+m|2!11H?}V}byg0>^s^yZ{W|3DEmX0D^X1K%V{Xc)mHV3+S`IECGlQo+Jq%B=$o0 zya24`0tgA506KgnK_q|(-ygg8!P_;KfLI{x!($F9fD65p4#4C4M*tTDiNkk@5^q+* z@f3s-FnsJ2cLr(+Xf+nN1`ra*0WxsU;1GZ%1V}C+04w25&RYun`rDIt0h&Q1fLH=T zYKbMF9eGH+6aW<<_a~x{Pd}!=1-QAkpB=l;2Da$IRSW^$k*$cPXezS zwj@GH#|2pQcrSn^T>ycvvW{nE@%_7AQmV=Tf=ytsy@8YVQiKmi!` zf8YO3WAxjXFVUU=3?D4I>UtmuC;-D%AOIymraruh@gi`4v)AIblb}BZh(q_`qYI2# zU>FDvuJ`_oH!ne|0IWm-#MiMJF9Gr4gJ$2<^_>7DFMM`@)U#a(V2J{B)B*Cs_bp#M zSN(E^mV1Oyd4+rARPcMy;Gj=nzyaG|?vf}Xwx(93~t`>aX; zcNf66PYLuAph2)A{PG3xEne&k;_Fl|0RJ{W@6RP54xjt7VT{4&dhrSU;lKg8&p>eXKZRRKgbWXOq z?ip+>0r+iVFVAXqLMQC{_!CwqfL->#*~StSN3Z;S`)&v}>-U4rKT(4)uKE6Ve_#=z z9RkBPSKQC=y#OE%|EE9wsUkE3A=-z*VsZqK&pU5mJHyYw^We|IV+sCwR~Vb7u8wX!5&==c5OE7GusY5c>?_G z_Pw+O#e*k8ghT;2a^9{0;NTlSh5#Hvdjh0aE$#q{Sb#SVm^KcdNC_A`&U(_2z!fFH z8<8i#rV9l_y>k9GLW07<7Z4$#1Ngwb5EOvHQwDZ|vIW5Z0hAX$_WKS12~OR3RRoXr zFC}2`dGPEft`kTJe)hAU+093e&=M36K3#9yAW8JEFvXv;p1_1j9dYP1VBpg$}6vk<)C2j1w^0)8AEsTMl}&20CDlh@TCArVh~Xy zR$0Wzs14S}NOA@65^zbN5Rm|Q3}I^lv;+l~gEE5GA_NK`2wnmoK0(le&64M2h?l7J$Bz@SC@Cm}%s5@K?e1B@V$MlkaS``}++fpHpq{F)SiglliUII9yn z!QKp(Lm&_A9V~|+NEQHVy+8}#Bw+Xe0juC6LW%_S5d;sH1KuLmM-T`FAWnor!H08> z#x}-=06u)f*ira4mhdf@V?V>UTCjmp2ooc=n@f>FQ!jB~Y z3||XSNCY0k(BqK;`0zOv5a9TH0SF|Z07WkXLmw8`e+Hi{f;i&|_WKUt!*|=ApZyfT zhwnQ;(c8cYP5>=}4_+ZVKp@=iNC49Ugur)`$uz=!Sk z7ZPB#)mAgG!U`*p&21H+V0ggZZcnE;ApAsZ@gE;)nqVSyvWrUyk z@MoTR=9p9ovf62z8zk^JG5T5nfWRRF=g9&ve2jV9C59hV_#{Pu24)%Olmd7O`c8m2 zbkPk+$b*5CyzSD$cLGc_(L@iBWC2)C0DS!()p2sp^o1+&X4jpqBJ}4{vbOCx_0xf`-ApJH_ zOTl9oS!5B5p#ba#c}qiH7kJ=-b1m)w*e*MK3P1@cg1!hWE~{n z1Q2GQeRhilAlTnd2l(kvA2o)K5!;xT5q^P-z+w^z0lF;$1z^A_!4q}>KoKyq8|d3Z zC&2H2|Ew`|jM&D!ujj0^$YevIxEd#G?#e3P9pc5O)J5z+e9IqA_%goR=Ja z85eihu<>-P=f9YAVgpXNDV%|2H@GA*99m5 zh&w`vVQ|39Q1A<$wgkYOlpp{lhy?&$uk_%x01VvEL7ogj;lnJw7&_7W3YWML9NdLK zJ0MJWIKfFDR91-gDk~9Irs?T_M<6To9u}zV+;fgGaLh4#TFRVbCj!_n$5_l8mj=F0 z_NU)}W$p6WyEmKvu;zq)Rx`6-C4uL5D)SjXUo<+lnCx3TAig&d|0rfmQ3*1H*(QYq z_~PCLjMNVPe*w-pa>Zm2KE_ypy;hyx4%>WDd+Et*lECu;j%_!<{huFZO(e)RyeU`; zW5d6J5~Tc#s1b!F$d+1YVQYt?9pJOO=4tTx-SgxMFxe4DCc)?X4zS^(6WKYZ?2`nZ ztCkUj+YAUm36uaMYB3#$AL8&al6YUQ36Oaxz$drQPLc#bO}fMWQh>bh?z`nwOF*8z z40yyPD@rH;<|zWip>s?SAR|HmP)vY*_ukIPe6!4nkeiLEOF(9>?tb8Qg8(1hJcE5$ z=cAiuXej{d^Phfg2Om4&B~SvOGPL)D_gJq1=e09;<2Fb6rb7S*t8n2b3BbTP0t%s) zAqFh@^T4d*Q8@%w! zvqk~lxoV<16Jsn@fD}}Cj+7-%3ZU10Y-<60%a0|9;bTsM;sPM>JaU$R%tHa5eC~03 z>bWNxP=GgU-?z6e|GvFhCr+?cAmX z(BV@6N|GXg+a`tY2&4d`)?MAmv_GB-;bY9}0NKaaZe}rOZZfN(9(m${IuBxm0KE4n zO$A`^9K8f70&w(mAOy&KxC%Vy{3+*`0z{$9@LLH$RNzXGQUoAMfa~^J%*Y-KPiLt6 zAHJI;3xJSg&;>Ahn%xCFao>fOfw``><=Lf$8V8A7E1m^XvRY5~NVpCABGYrcSwmnwkl z02gdCH|ap3>T#Zj>Ldc$9fX*reix82^caR7!_Z@Vfc%WV73u?+4k`X^ zpF8`<&EHY}7eiS=LRY`e?b#~-Z!6_Jsj4c|=+Y+Y?Sd`5s*=i3eoPTy$8B#lf^Cww zO+@>*7E}_94*`hZRst~G_0}FRjAuXoNAtvwi_TzY931SY&*Xu}x*|c<0Z`m-)ddbY z?{z!&md_-3+@Jj_d`hP!sA{||0Vx6iguMR=&l%hNeq)~H9Qz@Gy7y+tQUKCJ0#qHq zhhK+hI7Y&4Jnki^1n6>E0eturKtKVU1l<*&3jgcTD-v#V4mi)-4h(;f(;sLMF9Go} zTmt-aD*?J$K3s>F!0)2~grUX~5Qa|yc#IZ+R05P){;bzw`)yYgfD$P9oF2RgtU7=e zKuRG$3jhe3a3600tJ}cdD7ogRUjr2XhoGwuf(FlBfPa4Rsy+&?s`@fWS5;M2^}pus z0xIhK-~af?3?b5poomw|LkSWhp~M)ZbSPmE(v7r%gaVF<9f+OahD|8jUAOP$w)-!S z=RE%(-TCcrFB`ITR?m5y`S67=#{0$l6EkxRNo+P2q6DSTD+~$GREAX7l&Y^W79_tX zzxkTRK~}m^tLzMvD@?U}!)&JvMf$ouOIT+2EZJ-3P>j7%Z>p7+GR{^bD#uOFSdjdl z)~|~;PDx3K$}U{1Y~EJcyS1%!sJb}g*`_ry&o;z*4JAe{@7L z5~{(gOZ?-@g?8bIzz982-6Q|4h2P{TldrYYY+q$2eWI|ROt6I!@c~O&9TLf^@Hm2e zyohw0O|r*$iWX~;Y@trMhsKjqdyV!se@(d{`7PQ{9FcFz2x(7Tt9Y_hv6L0dmXns~ zL7=w-&TRFT~w^2JX|faT=?Jvw<2OA_Q>@q?EgAa=>>CRW9lr3ew11^Rrb?m5bn7sHv%Ayug6yrjQ!j9}< zN3w!l33hiBK{3Nh2p7Td@wK6~DUYj{PYfPAeOMt#zVELCRbg}^B)p(d`<57g-^&6p z?CVEk5{l*adbSH>*(sfU;k_~RKQm1Q;E<61-=!nqfM5H!_ zJ_f|OPQz=yF`m;k@trIcWcW>1BY3uyVmo!VIBC(mOpgPSXg7f(2kO1KdLtRaiuMb zZeHwz$eINsjfSerGMAi7N)yl8?$NIOcbWt_)L?rbdr>SX=?ZjYvxEPmCGn|(4^T%kF%@BaCx;BdzPxx6Rgdr zyAA2fHDO17#CcMsQctD}Z9I}0d?^FguLhB$v0To>6A znGi){@@n#O61#V7FEJ4$&q-8+zZOtc_>OL)7sNGTcmaQ!>g$HxKcWECkFTy1g_n`$gtQwd#bKpkUS?* z4gS;ssJ3fQ1%ACrQ4zBDUL*e!}# zy-b~sC~fk+4GEj2M%;WE(W3Ctb7kb(Xi#jYL4}hR2Ys};7deKTky`Yn>2o?nmrjKq z8|NBOX+Dv2w){($>dv?e2A4ot+4Dw<9~j zm;GhQT-dRJ9%ZiR0F?}M?d07n`}pYQ3EuD7#|PI=@c3LK{hd2`>vS!b_m;6`eGo}2 zbB-{^1=ZwzkccI>kqHVg}=7$;Q=V#F&$xe0Y^-A|40HPQSI6J^_qxD zX{3MPA^rW25#y2E*Z!9PY;@LY->}q#G@t22ddwr--iTydZE~H)u*1igj!-Qc{6ulr z=yEt#hf+^HvKNhEy@M9(%%p6w*PvvfjO~jwxfG(ugGfDw8jQG?Vko+SA^D~{G&+o7 zkAn_7>@{g|RcDurM!O(+?!<+T_Jo90tPb(PH)ttm#lr7&&pAAuZP~cWh3d859Ir^_ zVnZ@ln{s$_e*yQ87ckIS%e$9a`RKan0yp+CaBeUCr?zwFL@8JIm2-GU7A1+kWQH%o z!+9aeDZvz%WO41zMe3?^+J!$q0IE~FCj!6Lrd%a`1CIzvYG!p}D+7HG5!Xg?SY#Z! zKx&*|ul^+6RkVHo38aTQkPsjz*<%J-a$O3oG}*sGkFCDC9E}*u?VNEOdOpWz8gaXL zEGNVCQM!$JQT!vG8k}6A%k3~7y5seE7;j9ws{vP5n(!!1kHNX?RDV;_m(C?yZa{;JHpk;I@j<*60=?T?mo5vV#CmC{YoiW$Ebh#6u&wqCs@XecJ`IoH* z{G+(g#)K|rqh@a zMN@7d-N$xvws9MUabBF>wt>O!Lws_#i;vzsExN!-9$(nU{ZoxxR2H(YGKGc>VXX7F zCCt~J%^7iQ&Ra|3+7K>xpXXNZ&8Sx)07`*hEvbpY{zpWp0w8=l9vC1r@ugFNa-Gj? zWwgs|V&zj=XQe@^tp?eyquJ~=o-F@qBs))`$jO95fs?qBV#cSNU*lgZ=kZypJ~ubp z(_iS!!{FKcod`oum=P_0qB}&7=d-Md+>O=ecAP$g8*~}S9K-uX27Fy7!XdgrZJ<8s z_BzU2z1NjJz1QjKy~X8QCpmilFl~polAf^v??nzYY%8Si-G{vW`A1Z3%%!$8nDbds*Zy`s|L7e)eRPTbiwAgg|$KO^4RC}*$VJg%-B$FYF%)H)fmSA3sCim^P%7|%!9hMbDjqh!fw z(#rj(VYQlf37 z#M{XzTc#~Spig7OWC}c{vU~Lu8dlEat%#|7mOg{eH%;b0w$9>TJJ;~9?SB00p-}$0 zbOG-r&E!^q5pS;4<#G5}4mpkHsIL*d>4x0hIG+9Cv#AQ0ORo1UGJIwcwPfDV?vA#h z6Bk=Ked#c#E*zz>B$Jl*?Od$eK-v08N|OAjj9)^}J8!Ty#-F=)uki4bKKdTt#)p#}okXO+D7vpVeIGp{+-C{tS9aToO;TJ&6DuB*oir)+(H0#* zljLAL?)5XWA=5j8Os+XhJ2c<%^Mr1;`W*jp0jlE zG98Qid;^?kYGXH64KqV^rfQ60l1%a}Ehp(&QArkEw=Q$>S|^=14s-RwA#OBhQy%5R z&Rl=?lq53n-b2=|UXH)N2eBbRWW}za@4W%8R3&kHR|RLcrjcL0i?YIUmV3CfwxFIX zS1-`9ub%iICrTp1ICJS3jXR6zx_pEqo%^Y4Ec@vI)Q7qKu6`x}LjwQPzze54?;_^- zUtN6FiQ&&38xMKSRvYr3D`n|xGW=)Dh__WIeUTQK&$oYpTJ+|caBaN-)h-%z1nTlu ztR8(K6ZoQLJpc9X3jXbGGXL?q3;)r%h>t{Iy4UIR)gA*5#F(&Xf)u$ZxP|d37Eag0 z&1@{Lv$U9}BV&f1jA?qZp`40>p^W_G7stMxmkx38@LtYeJ;}}XEnMASM^j+}hx1o+ zC?|r_STE}G(`cy5qcJs*t_pEqO)9tdRdT2xmikynVc8#r_2_|U5mfL?*0G|*3IQsZwrBocmd5$H8by?4oMb-d@Q z6Ktl=idiyZU(+DVT9Y(WbvDSQyp^HL8)-T;i%!rLYQ%emCJY^4z}Nd;<3I0>=bM|; z_~+(1+(|d$jdCOY{-hqw;Zs;-G74LRQJCthVP-7FeyRpbEsU6FpvElyQB2d3_9{EJ z_ZAkW(slhDjm>pb7p1Yip@a)9Wt^zZWM5G%C$=PUy=61q&H3C>me6;)kvI1gvNt=F z*3B!qzOS5?@%PgKPzwCKKEl`5{Sj*brRNN((r1>GWiwNH+UyI`;!@@!{$bC2KCU+8KaP##AGa;!-5AjwiVV10sl$m)T2us1 zdhwL8jVSg4JvB@X#dw?ykNHN-&>h8e9T5O+sj_KrjdELcKDCu4ghvMv6uO+a*wrK@ zg>s-Yk;bejx@yw7w!563_Hy28FJr?x1u1KSShX~Orua~7&8%4FY{TX4x!h?hSuHU*!_x)@1-0N1p3IT``7>S(XeWGZMzi^w_ z^6g_n+m9XuEtw#V@)|ECV7fXAQJ~O?>a3h7!_QcafbrsE3r%8eWK_7Rb90?GZxS zj8S8X_9%p?TYYDu?moWF`I}udHPuj1Sj3Lj8W#Jw;=Rm++6@ZPzEio>oXv^4Yy$l~ z$k9v6kRDQ3*|40Cgg(m_p)%Td1hR$CUfY1chSQUcdN5O6e>c)Qh zvL~TqWh6~gCv2QLON^u}9xcUNJccdMAlO32hJ_jwy35!Tti|mLYtDp@=8YI5u7v1w zGHMRD;|%#wbbz)bL+ZoFpqQ(g|Mg{9i4d6SiY_2Rh{>V@Ow=0HE=ZocJ$R%2#)E5IyLSoYiG5UWEyTsq5qEbd%F@=L zEKcEYNjzmq0mS(^61v2N9qWQ=NQ~h8zD9CVg0L{R#B{-YtW3>WYUj$H{3t3ngi%?Y z#rljWO7ho|m6J-sx>e-mWRjK|(JuV-lR-aqFyxmy{)OQMR$U));fDo4E<6<&sb8}u zc-a5=#jarZ)4_EL9eJ*U&eJMKJ^XdlaMf3PF(rh~P$zP>jC4BH(;Fn20FSyOnYb{sXqlSy;dWQ~~y_M+gnChC}t*Am5-vDnlImjz>) zs;l;NlAfAekUV$!c9*>8-nFNvFCQnrAe-W%T$cDPCO9F8oa{vQm9D3)G?nI}P};Iq zQJ1!i+I6D+i=w+)+2L+yD;~`W@o^@2nH_myo-|}C$dB<9bN?2+z1#>`?oDKzABu<| z>UNer?Yw?cF1#86P=%mgV5A=PKUD1wgx}!>A$!9N>-YK@qR>;rWvu#(SNyDaenL1) zMzWJOn_R}Q#eXc-{!=)ZX2D>dA-7XCxU*i92bo6vU6TpQHAbX*&S15bHgUE(IE<5G zBLZMCQ42>=co)<0$Y<&?MQ2pKAo;!{$J^`cT537m*~Yo+=V()IWp`sedk$`+r6OI( zLRq|#=FOq(&W)lnI*`VUB(}r^QJQ8E(MdRhk?P z*5q=+WR$_KC`t{aFfWeQ_If%FDhUr*#;TAdRBtKnt|-qj5hTw^RD(Y~ z0ICqU3xfh9Ax`;Jhea*F%Zoy@O~<&$PLd6JjF;j!Ps(yp{H1d=aG#+;u=N-=x@uGE zsZaIlIg|&_qfQjP$Xkcj6bH6MI}+tGgFr_!{O0NtXK&0h(FuHP#^E&21lyT9IL+1> zoMkL^7bHLCqt8EdfA7=5!H>RphkNhbrT?AV^uBY8-COe6EjmDZK^heq;WTALaX2@Q zhUIRw1T7=i!+~9qp|pzYWvMGDULQhcULp~3!R%?PKzVc*5s9mDc5@l5uE=*6B!BVU zKt&aVKhR5liNY#=SqL5zn%MBWy(~Ovg1W+Iwsg?X$^ef!nmA99vSjvXyl1PkY=IW3 zi}l&)KAtSU*C+|Gq%_!^ZPC^ggjf*nI-5ZI=`5E|X48_1xX#mK(Ht#Y=4s)vKyPs2 zG!2Cy`8n_X&HIXXK6`uc@h1;?_oIgles-UITeE4%k7ZYJ0)^|sY0VGkP+<~R64!Go zA(+m%NSZ{;-<}#oY4R#!?Ja3*Eak}IgETgl)7VnZw#rR|E$wv*LGpdy4OITj01WR0 zBb*K%(bqrlyS_2R-&)_@WB%xF`D8T~%~Z#J!YCF`m0~wRiks*LDejZV3$`U-;RM1x z7l;s8QxsxN=;GH1a+pe_gAwW8lW>`D$f5<$7k-A_cGJ||1<6Rf`+2|n4?#CD=uy?m1Nsg21fY+SX7bt|0739=@B@od5!Cz0wkla!^evCe-UZdQ|?E}UarzhJz& zi6HqUKKSB8lgFRGU;oh;A3VMN_!h^vrBk^vlISD95+uxNL&fd+5 zl&pe(@66*|t>^~nA(U@iNqMRt zci+DINVs&e_XHWI1Qzn#l)y(b`y*R$?xfGZHn=UilnH{ zUFpi=2(R9~MbSeYwVBV(Zcl&KS{Oc5nyTn+%8OGr6^2LkefYpwkc`Ct2h03HM|o$k Qi2wiq07*qoM6N<$f{OHpbN~PV diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Chrome.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Chrome.java index 63c9ae3f0..5bd9e8820 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Chrome.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Chrome.java @@ -49,19 +49,18 @@ public class Chrome { case WINDOW_SILVER: return new NinePatch( Asset, 86, 0, 22, 22, 7 ); case TOAST: - return new NinePatch( Asset, 22, 0, 18, 18, 5 ); + return new NinePatch( Asset, 20, 0, 9, 9, 4 ); case TOAST_TR: - return new NinePatch( Asset, 40, 0, 18, 18, 5 ); + case GREY_BUTTON_TR: + return new NinePatch( Asset, 20, 9, 9, 9, 4 ); case RED_BUTTON: - return new NinePatch( Asset, 58, 0, 6, 6, 2 ); + return new NinePatch( Asset, 29, 0, 6, 6, 2 ); case GREY_BUTTON: - return new NinePatch( Asset, 58, 6, 6, 6, 2 ); + return new NinePatch( Asset, 29, 6, 6, 6, 2 ); case TAG: return new NinePatch( Asset, 22, 18, 16, 14, 3 ); case GEM: return new NinePatch( Asset, 0, 32, 32, 32, 13 ); - case GREY_BUTTON_TR: - return new NinePatch( Asset, 53, 20, 9, 9, 5 ); case SCROLL: return new NinePatch( Asset, 32, 32, 32, 32, 5, 11, 5, 11 ); case TAB_SET: diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java index 7430cf348..969de1280 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java @@ -27,9 +27,9 @@ import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.ui.Archs; import com.shatteredpixel.shatteredpixeldungeon.ui.ExitButton; -import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton; import com.shatteredpixel.shatteredpixeldungeon.ui.RenderedTextBlock; import com.shatteredpixel.shatteredpixeldungeon.ui.ScrollPane; +import com.shatteredpixel.shatteredpixeldungeon.ui.StyledButton; import com.shatteredpixel.shatteredpixeldungeon.ui.Window; import com.shatteredpixel.shatteredpixeldungeon.ui.changelist.ChangeInfo; import com.shatteredpixel.shatteredpixeldungeon.ui.changelist.v0_1_X_Changes; @@ -76,11 +76,11 @@ public class ChangesScene extends PixelScene { NinePatch panel = Chrome.get(Chrome.Type.TOAST); int pw = 135 + panel.marginLeft() + panel.marginRight() - 2; - int ph = h - 35; + int ph = h - 36; panel.size( pw, ph ); panel.x = (w - pw) / 2f; - panel.y = title.bottom() + 4; + panel.y = title.bottom() + 5; align( panel ); add( panel ); @@ -88,15 +88,18 @@ public class ChangesScene extends PixelScene { switch (changesSelected){ case 0: default: - v0_8_X_Changes.addAllChanges(changeInfos); + //TODO break; case 1: - v0_7_X_Changes.addAllChanges(changeInfos); + v0_8_X_Changes.addAllChanges(changeInfos); break; case 2: - v0_6_X_Changes.addAllChanges(changeInfos); + v0_7_X_Changes.addAllChanges(changeInfos); break; case 3: + v0_6_X_Changes.addAllChanges(changeInfos); + break; + case 4: v0_5_X_Changes.addAllChanges(changeInfos); v0_4_X_Changes.addAllChanges(changeInfos); v0_3_X_Changes.addAllChanges(changeInfos); @@ -153,11 +156,11 @@ public class ChangesScene extends PixelScene { list.setRect( panel.x + panel.marginLeft(), panel.y + panel.marginTop() - 1, - panel.innerWidth(), + panel.innerWidth() + 2, panel.innerHeight() + 2); list.scrollTo(0, 0); - RedButton btn0_8 = new RedButton("v0.8"){ + StyledButton btn0_9 = new StyledButton(Chrome.Type.GREY_BUTTON_TR, "v0.9"){ @Override protected void onClick() { super.onClick(); @@ -167,11 +170,11 @@ public class ChangesScene extends PixelScene { } } }; - if (changesSelected == 0) btn0_8.textColor(Window.TITLE_COLOR); - btn0_8.setRect(list.left()-4f, list.bottom()+5, 32, 14); - add(btn0_8); - - RedButton btn0_7 = new RedButton("v0.7"){ + if (changesSelected != 0) btn0_9.textColor( 0xBBBBBB ); + btn0_9.setRect(list.left()-4f, list.bottom(), 26, changesSelected == 0 ? 19 : 15); + addToBack(btn0_9); + + StyledButton btn0_8 = new StyledButton(Chrome.Type.GREY_BUTTON_TR, "v0.8"){ @Override protected void onClick() { super.onClick(); @@ -181,11 +184,11 @@ public class ChangesScene extends PixelScene { } } }; - if (changesSelected == 1) btn0_7.textColor(Window.TITLE_COLOR); - btn0_7.setRect(btn0_8.right() + 1, btn0_8.top(), 32, 14); - add(btn0_7); + if (changesSelected != 1) btn0_8.textColor( 0xBBBBBB ); + btn0_8.setRect(btn0_9.right() + 1, list.bottom(), 26, changesSelected == 1 ? 19 : 15); + addToBack(btn0_8); - RedButton btn0_6 = new RedButton("v0.6"){ + StyledButton btn0_7 = new StyledButton(Chrome.Type.GREY_BUTTON_TR, "v0.7"){ @Override protected void onClick() { super.onClick(); @@ -195,11 +198,11 @@ public class ChangesScene extends PixelScene { } } }; - if (changesSelected == 2) btn0_6.textColor(Window.TITLE_COLOR); - btn0_6.setRect(btn0_7.right() + 1, btn0_8.top(), 32, 14); - add(btn0_6); + if (changesSelected != 2) btn0_7.textColor( 0xBBBBBB ); + btn0_7.setRect(btn0_8.right() + 1, btn0_8.top(), 26, changesSelected == 2 ? 19 : 15); + addToBack(btn0_7); - RedButton btnOld = new RedButton("v0.5-0.1"){ + StyledButton btn0_6 = new StyledButton(Chrome.Type.GREY_BUTTON_TR, "v0.6"){ @Override protected void onClick() { super.onClick(); @@ -209,9 +212,23 @@ public class ChangesScene extends PixelScene { } } }; - if (changesSelected == 3) btnOld.textColor(Window.TITLE_COLOR); - btnOld.setRect(btn0_6.right() + 1, btn0_8.top(), 42, 14); - add(btnOld); + if (changesSelected != 3) btn0_6.textColor( 0xBBBBBB ); + btn0_6.setRect(btn0_7.right() + 1, btn0_8.top(), 26, changesSelected == 3 ? 19 : 15); + addToBack(btn0_6); + + StyledButton btnOld = new StyledButton(Chrome.Type.GREY_BUTTON_TR,"v0.1-5"){ + @Override + protected void onClick() { + super.onClick(); + if (changesSelected != 4) { + changesSelected = 4; + ShatteredPixelDungeon.seamlessResetScene(); + } + } + }; + if (changesSelected != 4) btnOld.textColor( 0xBBBBBB ); + btnOld.setRect(btn0_6.right() + 1, btn0_8.top(), 33, changesSelected == 4 ? 19 : 15); + addToBack(btnOld); Archs archs = new Archs(); archs.setSize( Camera.main.width, Camera.main.height ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/NewsScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/NewsScene.java index 9bb94c68d..4161ccfa9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/NewsScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/NewsScene.java @@ -237,7 +237,7 @@ public class NewsScene extends PixelScene { bg.y = y; text.maxWidth((int)width - bg.marginHor()); - text.setPos(x + bg.marginLeft(), y + bg.marginTop()); + text.setPos(x + bg.marginLeft(), y + bg.marginTop()+1); height = (text.bottom()) - y; @@ -248,7 +248,7 @@ public class NewsScene extends PixelScene { height = button.bottom() - y; } - height += bg.marginBottom(); + height += bg.marginBottom() + 1; bg.size(width, height); @@ -291,8 +291,8 @@ public class NewsScene extends PixelScene { text.setPos(x + bg.marginLeft() + 18, text.top()); if (date != null) { - date.x = x + width - bg.marginRight() - date.width() + 2; - date.y = y + height - bg.marginBottom() - date.height() + 3.5f; + date.x = x + width - bg.marginRight() - date.width() + 1; + date.y = y + height - bg.marginBottom() - date.height() + 2.5f; align(date); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/SupporterScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/SupporterScene.java index 6afa1cb8f..88f0c6e3e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/SupporterScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/SupporterScene.java @@ -141,12 +141,12 @@ public class SupporterScene extends PixelScene { bg.y = y; text.maxWidth((int)width - bg.marginHor()); - text.setPos(x + bg.marginLeft(), y + bg.marginTop()); + text.setPos(x + bg.marginLeft(), y + bg.marginTop() + 1); icon.y = text.bottom() - icon.height() + 4; icon.x = x + 25; - height = (text.bottom() + 2) - y; + height = (text.bottom() + 3) - y; height += bg.marginBottom();