From 15b836efd9efce6300d9939d6f7ed42818ac848e Mon Sep 17 00:00:00 2001 From: Lonami Exo Date: Fri, 10 Feb 2017 18:54:06 +0100 Subject: [PATCH] Use a different font and color for the bonus --- android/assets/font/the-next-font.fnt | 18 ++++++++++++++++++ android/assets/font/the-next-font.png | Bin 0 -> 4468 bytes android/assets/themes/dark.theme | 1 + android/assets/themes/default.theme | 1 + .../io/github/lonamiwebs/klooni/Klooni.java | 1 + .../io/github/lonamiwebs/klooni/Theme.java | 2 ++ .../lonamiwebs/klooni/game/BonusParticle.java | 2 +- .../klooni/game/BonusParticleHandler.java | 7 +++++-- .../lonamiwebs/klooni/screens/GameScreen.java | 6 +----- original-resources/generate_theme.py | 1 + original-resources/theme.svg | 16 +++++++++++++--- 11 files changed, 44 insertions(+), 11 deletions(-) create mode 100644 android/assets/font/the-next-font.fnt create mode 100644 android/assets/font/the-next-font.png diff --git a/android/assets/font/the-next-font.fnt b/android/assets/font/the-next-font.fnt new file mode 100644 index 0000000..b58120b --- /dev/null +++ b/android/assets/font/the-next-font.fnt @@ -0,0 +1,18 @@ +info face="TheNextFont" size=64 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=1,1,1,1 spacing=-2,-2 +common lineHeight=65 base=48 scaleW=128 scaleH=256 pages=1 packed=0 +page id=0 file="the-next-font.png" +chars count=13 +char id=0 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=47 xadvance=12 page=0 chnl=0 +char id=32 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=47 xadvance=12 page=0 chnl=0 +char id=43 x=35 y=148 width=29 height=29 xoffset=2 yoffset=10 xadvance=33 page=0 chnl=0 +char id=48 x=35 y=0 width=49 height=49 xoffset=2 yoffset=0 xadvance=53 page=0 chnl=0 +char id=49 x=84 y=0 width=20 height=49 xoffset=2 yoffset=0 xadvance=23 page=0 chnl=0 +char id=50 x=0 y=50 width=34 height=49 xoffset=2 yoffset=0 xadvance=37 page=0 chnl=0 +char id=51 x=34 y=50 width=34 height=49 xoffset=2 yoffset=0 xadvance=38 page=0 chnl=0 +char id=52 x=68 y=50 width=34 height=49 xoffset=1 yoffset=0 xadvance=36 page=0 chnl=0 +char id=53 x=0 y=99 width=35 height=49 xoffset=2 yoffset=0 xadvance=39 page=0 chnl=0 +char id=54 x=35 y=99 width=35 height=49 xoffset=2 yoffset=0 xadvance=39 page=0 chnl=0 +char id=55 x=70 y=99 width=33 height=49 xoffset=2 yoffset=0 xadvance=37 page=0 chnl=0 +char id=56 x=0 y=0 width=35 height=50 xoffset=2 yoffset=-1 xadvance=39 page=0 chnl=0 +char id=57 x=0 y=148 width=35 height=49 xoffset=2 yoffset=0 xadvance=39 page=0 chnl=0 +kernings count=0 diff --git a/android/assets/font/the-next-font.png b/android/assets/font/the-next-font.png new file mode 100644 index 0000000000000000000000000000000000000000..09e7bb5999b0de37fc751ed7a2180d13331a2de3 GIT binary patch literal 4468 zcmcIm=|9xp`#$fPF@v!dVk`}j?E4xuM3}7Ejb*Y#5ej3CH(Es5iX>#qmTY~H7DmXv zmAzsL8Ec4;;-~Nb@OyNh`&{RB-%rl9+%Y#bU}eTJ0{~c!4E4?*R2TpVFrp7m;X9GV z0C1i(($ldDnOM$d^|ChLX+NyX!K9TlaO%U z!jYxU&P(A#JOlS9U6Q>|^%(bmL+LgSR}g8qio<2Fb*<+DtkU&8 z%&cV3df+8nEcjBQ*gBe~j_td=xVI~*bw;Js+o=Q?Cw0wPG`O^`=9NTnrP=fYWqprx zR%j!$*!3+FHpq*p1PpJEiX#Ut5ghh|;2#n7^f+AFXPavvXK8Duk*AOn~2`@z|O4hS}Lp?$fYCV>^cE6bB zdZZ)C`4{(HOD~=XZn)UwsVj!8I`$*@q%;DKyoC;WS0Cz;|GsM3iwB}(Bo#;bGMV9k zViwSw`$F&OFe%fhe3Txn?7<2*iG5~@;E!0Yw=etScnNbFL#jbj54D4GX(U+3t<*T~ zXbR6Y9|DZYvK=Ml>kgnKNPw|S3L;>)7b+yQi<^$qFeN0(Q&RfA2|W0 zOK&h8IqEQ7vK}zo56g6O%_&Jn%96wRK(fYObt1%z9jg&P2O?HpvJY4z;3r&_gUc@u z-oDD$KJo%VJ!@9I(WVbxKHJ{y*Mf2o4-+H?RlvYQVm6r1D?KtUa2^LZJ(_&asM0tVD1GDWQ{H% zBfc_$VfQ|(Ey#gNe9f13J3%YgPFNW@SL(QN4NM<^{jOyOkT=wVE{Uj!5ajK1D&oVG z1UT*((p87A!pG=pq&zJ)$Dg?uMF)ZmR?~=gP?J{53p{kfu<>L5%qPdHPgTFSm>o4= z+f17MjyR8j7h)qBHLpIrtdHwKzrwNlpnZ5nH)~mS5V@MaB3T3T7iwxaTOwcsY1_Sm zTRWf>NeEi{D?~S(<*J4iW8SBPo;6f~P2_N(4lWb^N}O;9%rc5t|B^Igj3kH`m? zBUMSO3>7*Ec_?Ca(JDfUyIRHgbjVvH{VcUxJ+^4UwCvHulAik?2P(Ve>z<|QlxAV+ zgCSppiUv*6TOFyAy$$eVk1Vx>cS9^6NZ*8{LBgSH?zdxps$y(*{F3*CFwF>j7k7W+ z8??G#6h5u#VGl)v2?ta9`?3(4eo-Z9Pq=~JIIZ&$ze?7_nYmmaW{32e7)}OIL9ju&A#g#wA!*@|dY_Oz8WL>H3nK^Fk)WqbVo}-`0 z<#RkxM-Yn~zvf1K)`fruTmKhX`a@sRuNdw*hfmYX5gb#>>zeeT#WG=gEND$Il(d&U zQ!CQGDy#jHwC%LBwL7!#U43<`9LW(}(IKpL+->D*`>#%pXLiim&h4SnJPB>6QzzVFTii4sFUY^@1*#9?0k)-hFnE)|Ueb3^< zY3AeNgFpQOSg8H5w!Y=W8HgZiPq{C6uOk8yY?nJ0er}{KC?^O7GV2HUdg9`kpR_3H z{n})rZ$C}cebcW2XtwfnD?v#RlqlImFL&TPInlXn>aolNWgsW_&2-xI)>&T8T)1_m zE@t|NX59t(CT<*n3qO8gl|6BGkNqNVVld1+HaOpz7{mhzmh(BR+^~aUcdCAEY25TP z?Fj{eD6AJ^0Q30=CHcbD(CJ_;&#^yhjH#aO5&e`NB|zg_bxzPlgDXMbUT;a>6MBhH z%+M$qyhO63u04s#)~I&MQfF|l_;a|I|Fbus0(xbcIYel$auU19oC5dCF$hetTI~&q zPt#JWI}>+P|6Cv`m=;`{DY-0ib7HZ=miZcAXX~?!&n?zU_NzR1@*`uHDUm<=fBM+?gC)=m{Mpg5;hN?Rpn?np79w?d_Uz6cA zFY8qVuUScU>}l$gZ5DdxTg7A%s=oKeqjT~$ZpCPqqH@t4+$T1BD=qFsXk^?cAk^pF zDCGq+TrA*SXwkWrU&4827!Y^Od~ieuO>53+?3BpQAC}Q~n^F#YP);mm0QB>C=5Cre&_Z_4BSyIEjvVzSHhakDScSFZzjiSGJQ4+O zq+0R81W28wZtpA_e-hlq{P-y`UtFpL#N0EFjpi~@jjA@2lmPXjDZZwgZioX_nxrB| zg49^@DT)`?VUKz2?GxyPqv-*oWI4cPs_CLAI@g~K~-5tR8lp<#|XglaQ1$1 zq=n6`=zNAAdH>)2JXbiw_lLt!fUnl4R}yGkFZsIhh;4~O=1MdMB#(DtZk5}!p|YPM z#v8=4BHQw0vJ;^(^w_nSR81v(v?0x2zxeb@b9%i10?v|Cewzw7ej7H=f64KA^aH?b zRY_LXmjGk0oN*Jd1WP~AdLEL~; zSP^wQLuOi8awYzTd@xV+c7X6bA=ad_<^j15=Y%8OZ6Y5S3BLV0?w=m@WynZTnLpXR zPnV%>8uu%nwUO)Zmjra#>~`0>h*|P`c8%@%cn9cHIA053!*v?!2PB=)`ouWsStP=ra7a?F{gSINLmEPQRY%Y8tiYY9ItzGEu|*pU3N4G95d59q)&h^Pt?! z>T67azbkRq!LXC=KGVc{!R5g7NO&%~>xVF2qU{Li5av7#hroR&XyLSzWtkLJsA~2B z8jMCS$}w@m52Gs=+fJqp zkM7qu=1?M1Y0jpH0o@fXn0FNjlYc}LGZJ=rPpcUb*} za*Xj!*R|ty(#Y6@Pm96Zrg!AB;%1^mQQUqe; z>}<&&p~?PTR2=WSu$?f<8dFtW5+@c(PC3i|#*8w?3v(gmZ*JI(wThj8>!}Flk>uD} zS~mra*9HQCT#?$Pe32eN3qdPe572A|H?Y(&Gs~(2sageIqa6iGgMnzgG>BZwy7|#$ zn`hYtIVu+_Q?Y}ALPYZPdf15cWc0s|Q18y4a$iP-fmG<)q_^-aY~7QE5556~*cE(m zAl``Ir7oJdgH#4GYsO~_Qck775d#SkmC^Z`#F2I& ziiIzyP8;AsnRqz6(gBu>`xAQavma**K>b0Fp%JTz--3Q9`~!YJKZQm3Tc}t+J{Smw z)6~9MT2$KYm{5yny>qY!S2K1W-QqzORMC+7Z>2$Vy=TK9Rh+ho$sTPgs z3kY~+z4V!eBi{u?@+VN;eqq*SdW2UMG+3%SW>0SNA~{ZhhMJLUW!qwVLd95Mf%6Kq zbmzw#yMYfFLPcDFuZ_WM)^V28{z+P2K*myr*iavE#{&04|6A=d particles; private final Label.LabelStyle labelStyle; - public BonusParticleHandler(final Label.LabelStyle style) { - labelStyle = style; + public BonusParticleHandler(final Klooni game) { + labelStyle = new Label.LabelStyle(); + labelStyle.font = game.skin.getFont("font_bonus"); particles = new Array(); } diff --git a/core/src/io/github/lonamiwebs/klooni/screens/GameScreen.java b/core/src/io/github/lonamiwebs/klooni/screens/GameScreen.java index a295744..b7aa2b2 100644 --- a/core/src/io/github/lonamiwebs/klooni/screens/GameScreen.java +++ b/core/src/io/github/lonamiwebs/klooni/screens/GameScreen.java @@ -8,7 +8,6 @@ import com.badlogic.gdx.audio.Sound; import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.g2d.SpriteBatch; -import com.badlogic.gdx.scenes.scene2d.ui.Label; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -88,10 +87,7 @@ class GameScreen implements Screen, InputProcessor, BinSerializable { board = new Board(layout, BOARD_SIZE); holder = new PieceHolder(layout, HOLDER_PIECE_COUNT, board.cellSize); pauseMenu = new PauseMenuStage(layout, game, scorer, gameMode); - - Label.LabelStyle labelStyle = new Label.LabelStyle(); - labelStyle.font = game.skin.getFont("font"); - bonusParticleHandler = new BonusParticleHandler(labelStyle); + bonusParticleHandler = new BonusParticleHandler(game); gameOverSound = Gdx.audio.newSound(Gdx.files.internal("sound/game_over.mp3")); diff --git a/original-resources/generate_theme.py b/original-resources/generate_theme.py index 89f67ea..63dd770 100755 --- a/original-resources/generate_theme.py +++ b/original-resources/generate_theme.py @@ -27,6 +27,7 @@ template = '''{{ ], "current_score": "{current_score}", "high_score": "{high_score}", + "bonus": "{bonus}", "band": "{band}" }}, "cell_texture": "{cell_tex}" diff --git a/original-resources/theme.svg b/original-resources/theme.svg index 5c0d6c1..e287330 100644 --- a/original-resources/theme.svg +++ b/original-resources/theme.svg @@ -26,8 +26,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.69999999" - inkscape:cx="335.14124" - inkscape:cy="488.33979" + inkscape:cx="28.553825" + inkscape:cy="118.51475" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -197,7 +197,8 @@ id="tspan4189">"generate_theme.py" to create "out.theme" + style="fill:#e5e5e5;fill-opacity:1" + transform="translate(3.0304577,0)"> + + +