From e526c037e8e91d7cd14dd90dfe12dfb6bf2cefe0 Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Wed, 10 Oct 2018 22:34:41 +0200 Subject: [PATCH] Completed the button implementation for the help tooltips Still need to fix the buttons in the panel --- assets/Extras/Controller.png | Bin 0 -> 1573 bytes assets/Extras/README.txt | 7 +++++++ assets/Extras/controller.aseprite | Bin 0 -> 2805 bytes assets/GUI/SDS_8x8.ttf | Bin 12696 -> 13224 bytes assets/GUI/SDS_8x8_orig.ttf | Bin 13224 -> 0 bytes src/main.c | 11 ++++++----- src/tooltip.c | 20 ++++++++++++++++---- 7 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 assets/Extras/Controller.png create mode 100644 assets/Extras/README.txt create mode 100644 assets/Extras/controller.aseprite delete mode 100644 assets/GUI/SDS_8x8_orig.ttf diff --git a/assets/Extras/Controller.png b/assets/Extras/Controller.png new file mode 100644 index 0000000000000000000000000000000000000000..8ee96deb771a35a36d5f42d2a9b8b15dc76c35aa GIT binary patch literal 1573 zcmV+=2HN?FP)p;`1YCkVqqr!HIcWl-ZP{jWDTc^9HBXn zGn}gD2#x0qr|LOE<2l2rJn2VHz}ChCB0}W)6yr}1=J8u$Q$ggkUS5S4#usLQzcwny zYDIc4ufoeG9y#h&wY*UJkpri-u6kUur0};=ty)2d$V$HzXigBy!F2c6x~Nqv%7L{m z{@nY$pQj%MTIkQ-`3b)j#CQDkU>>z<1#jD1N*=+>q2E4>8Z1XaVJ0%@kADIspWtmn zUzUi1Ye|{>jnDm)mRkjp6XpQ~n(=9Bp8#5+ea2@z$Vr5K#Oht(A|wpn2H-JH$N|90<5gn;{>JC{ zppu!*^;zYb+~?o6x3n>VGPlll98Dukqv6a8hMxs8F25BhQz17Fh{Z&>60YOZzyDbk zzVdh#pS(8;|Ezg}tv9Du{O0;B{%&4Z`0mLLzRx_c;%}YpVBz`$g%2AI;N?pz9*qXP zD6gkP0M`|4^U$u~n#ZOqB<8W{3M7xR6kZ9}(+dFT-H-Wa%@Zr0-2IsEp4g2ADcM;=eNGr%x29usy{>sh*wla2s zd_Hf?-05^UF0;Hc2y!4(kmkHB^6@-s3p0%v34i1HBi#P-4ZC~$&ivu3I$hU~kCbu* zuk8gMK5e7>{}ZiJF5RRL_wF0ho8hq)5A==yy1a-oV9f!M@%7^)C2f1|ChDc4R*naQ z_o%U)@uE*r{=>cdXokm1TGN};9KiAP&U2Aq;$`D$esN8tcRC&OZt&x)0vxOgn z*N=~|J$DmJBtIP(1#dMA$YX*{B+voSR_76AyLjsodMe&Gi zYoXFiCmFiQnDZ*A5e}EQRTVP)@}AndXg~A+8|l$#CLkBuo6nKM(L~ z)yg1mmadGh0q!q7g!(T&vdd5W6CrIO6iV+}Je_0WKaN1%Hvs0s6ct?wTAr)O#{x!&4>kCb`saBf;eSR*-s| zxX|-kfoH>WvgJovf8rM+v=P9?g!L!}VovciC_+L8#P1@c#kncul6ZQa#?$&->!dygDC}<_7NM^FkD+?i;!6Ye97Wvo#E?zX{%_^@gg~#m*U%o@FOwXEhy*twC$`*)Y$M=5n$VArNKvW zr-?UtUgkv^gY4<$Hl*>X5y0)DD8LzSvy0<+YJ@5Dle$3~&+QI@0oMU?#CT}E4` znrf=4rkZMkHL4FJxH87>U77I{nIXQ{kIONY!F=X^sZu_Y8uEL6t8&K83Gx3AaQWW9 zmv@+D=h!S+wReMuhlh#4(h~g$RZ*%V^ZC5ol`dVzzZbBTA)Kws8mDeB{YHo;4A})T zC(Qv@&A>EGy8um?v@Q^TZ$ISU{RvI{Ea0Wh@#ADX(04#;!)1+|5yNP@8Di2WW;^@~ X+c-FKBhYY500000NkvXXu0mjfEsqm3 literal 0 HcmV?d00001 diff --git a/assets/Extras/README.txt b/assets/Extras/README.txt new file mode 100644 index 0000000..43d2249 --- /dev/null +++ b/assets/Extras/README.txt @@ -0,0 +1,7 @@ +The image files contained in this folder are created by Linus Probert (author +of BreakHack). + +They are either modifications of the DanwLike tileset or completely original +content. Feel free to use them as you please. The images that are combined +from DawnLike assets should be handled under the same licensing rights as the +original works. The others are completely unencumbered. diff --git a/assets/Extras/controller.aseprite b/assets/Extras/controller.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..f1fb2b9ccd3c126c8128ec59547d0f89ee1d9c9d GIT binary patch literal 2805 zcmcJQ2~<;O8isEg2wT_;MWWDzhJspzOFmXgAt z3E)TsJHWx(_UN==Yo%C_O@bBbfW^j9s;mYHh)zOjOvro@57U#GadehH$#ar>|8u|h zeZTMgQJEvi-H&Y${fmrX5Clnr&)=5^g3(|6zpbp75JdgZXr<~ps754vJgw($SXYN2 zuadoiZ>#hMle&ho@F&Pa^Z>Iu%k7WRvX`a9srVG$3 zfB{6&eLyO!5cpokC@`^B2i!X_0la!k1JuDnklH_802cFwz_j#q;EuQ$;DL}b;8`y( z;LYucz#k8_0!7tt1Ise?)nWZ}HWT1_sBSyZbp0HVD_8(tf2`j>yP$v0(|1Y=e4$V% zx(axhk-lI0s2~!^1HynLAO^?)0s!}59ejgna13_AD;NcrU=jR*IlVKT4m^P&a06Dr z2bcf{ARn}YaJ}r6)l2}Hpb-Rux~I}oQa}+2_85_|D?69Hnjn$v+~jOBtrTt;lb7%6 zpy$g=KXo}L6ImVROXD5INZ3d?Tj6kt(V}Ae3Ip0?10DC`6#Njmbi-<*eQ{xMg2(<@ z*=$DxX?MAuR!047fiT0rryF&-NIEO@QxltN3QQWOKbUdr#kcsmr`fnhn2rx%bNYkJ zm>~kW#sYB&*}3;5R8~L4tPET^{QkGX;+=$3{%0iu#v7_ps>vsNY)~(E(=Qxqh{xp8 z>2OINcgk64(lFn3y4p@V(bugoW{1pOOIr-jUMx^XZ$Ys>^m(>-8&BIK!NdwZEW0L5 z+4;Fh9fO+dm`CgHETqBky)KM9VW91~LW>`nyd$Gw-sj!#W?RLzkq;!r+r<5@Z!DE# z^Mh#P(NlHn&bRdUOlD5-q?4qCuC>*B((fOB{M*%6)WLb5o~pyt5yRw9GL!gmmovMH zUF>%jAEqt~d+nWB=^qV*9eqYDR}d^}j?byWoTm z6o*cIXSH->{C3eD)1%J(DoXLgNlgBfO&{to#p-lGkXyC^ga6sU{e!ytz7c#>ZyBY#uxVOK zU3=P|*fOFMc`pt*(L{+#@N7_1s7oD+ym!3y5Lg5NqFP<>xP5 zb`@IyWHG5k43H^f4x{u>ZRcL#F;F{x0znFA8x;wxr zav?KdU%kQ9iJvib!&QT3Fm=WknZA!gd4+Rm@W&yqx&B<4iM4K+*f{)`8%?J-Z;RUd zz$rGz#VugHzjSfJPthE#b>m9YqbXvRmCC&o-LMH6!^dp;&_GMhGqn63Z=oh_aptgCWQ*$|s8@$; ziMx=A`uO++HZKr{L|k0+0%bapydA~bMTes6AAYDfz|A0squ4d%8t)Lp<*IR9 z{(;8Y0Pla6xjBh1;&T0vGRmd@`z8i3`dn| z<(&Fkq9|0%3GyxajaJrA_R$c<2qViHncIACf2u)|_!lXXpF|5$HxJ6W={H3gxb+Lz aG~7NqoR!Hi#bUzhK7AjJv52fn!}=Tikg)&& literal 0 HcmV?d00001 diff --git a/assets/GUI/SDS_8x8.ttf b/assets/GUI/SDS_8x8.ttf index 08c4b910025fe1a4a2fc298c8e34eb01c4958d68..2de25d90a927a8c0f573977fb5c137ce3c840ecc 100644 GIT binary patch literal 13224 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 YT>-s?f18;HA?JhebMQC_ItO3<54%qJ$N&HU literal 12696 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 J&$<7X@P8XEMoItx diff --git a/assets/GUI/SDS_8x8_orig.ttf b/assets/GUI/SDS_8x8_orig.ttf deleted file mode 100644 index 2de25d90a927a8c0f573977fb5c137ce3c840ecc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13224 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 YT>-s?f18;HA?JhebMQC_ItO3<54%qJ$N&HU diff --git a/src/main.c b/src/main.c index 4f70c2c..cc206e4 100644 --- a/src/main.c +++ b/src/main.c @@ -87,8 +87,9 @@ static char *skills_tooltip[] = { " Skills are listed in the bar below the game screen.", "", "", "", - " SKILL INFO: SHIFT + ", "", - " Where is the skill number (1-5)", "", + " SKILL INFO: ", "SHIFT", " + ", "", + " Where is the button corresponding to the skill", + " Eg. ", "1", "2", "3", "4", "5", "", "", " DISABLE TOOLTIPS: CTRL + D", "", "", @@ -104,11 +105,11 @@ static char *how_to_play_tooltip[] = { "", " ATTACK: Walk into a monster to attack it", "", "", - " HOLD TURN: Press SPACE", "", + " HOLD TURN: Press ", "SPACE", "", "", - " THROW DAGGER: Press 4 then chose a direction (nav keys)", "", + " THROW DAGGER: Press ", "4", " then chose a direction (nav keys)", "", "", - " DRINK HEALTH: Press 5 (if you need health and have potions)", "", + " DRINK HEALTH: Press ", "5", " (if you need health and have potions)", "", "", " TOGGLE MUSIC: CTRL + M", "", "", diff --git a/src/tooltip.c b/src/tooltip.c index 6fbd51b..f70e177 100644 --- a/src/tooltip.c +++ b/src/tooltip.c @@ -26,12 +26,24 @@ static bool render_button_texture_for(const char *text, Position pos, Camera *cam) { - Texture *t = texturecache_add("Characters/Player0.png"); - SDL_Rect clip = CLIP16(0, 0); + Texture *t = texturecache_add("Extras/Controller.png"); + SDL_Rect clip; if (strcmp(text, "1") == 0) { - // no op + clip = CLIP16(0, 0); } else if (strcmp(text, "2") == 0) { clip = CLIP16(16, 0); + } else if (strcmp(text, "3") == 0) { + clip = CLIP16(32, 0); + } else if (strcmp(text, "4") == 0) { + clip = CLIP16(48, 0); + } else if (strcmp(text, "5") == 0) { + clip = CLIP16(48, 48); + } else if (strcmp(text, "ESC") == 0) { + clip = CLIP16(0, 64); + } else if (strcmp(text, "SHIFT") == 0) { + clip = CLIP16(16, 48); + } else if (strcmp(text, "SPACE") == 0) { + clip = CLIP16(16, 32); } else { return false; } @@ -81,7 +93,7 @@ tooltip_create(char **content, Camera *cam) while (*content) { if (strlen(*content) > 0) { if (render_button_texture_for(*content, POS(renderBox.x, renderBox.y - 4), cam)) { - renderBox.x += 24; + renderBox.x += 16; } else { load_texture_for(text, *content, &renderBox, cam->renderer); texture_render(text, &renderBox, cam);