From 974739dc1883486d788c1bf465aed6363ff549b1 Mon Sep 17 00:00:00 2001
From: Cameron Reikes <cameronreikes@gmail.com>
Date: Sun, 5 Mar 2023 23:08:21 -0800
Subject: [PATCH] Helper icons for key buttons

---
 assets.mdesk          |   8 ++++++++
 assets/shift_icon.png | Bin 0 -> 1692 bytes
 assets/space_icon.png | Bin 0 -> 2060 bytes
 main.c                |  26 ++++++++++++++++++++++++--
 todo.txt              |   2 +-
 5 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 assets/shift_icon.png
 create mode 100644 assets/space_icon.png

diff --git a/assets.mdesk b/assets.mdesk
index 9a3618f..73c9f43 100644
--- a/assets.mdesk
+++ b/assets.mdesk
@@ -50,6 +50,14 @@
 {
  filepath: "white square.png",
 }
+@image shift_icon:
+{
+ filepath: "shift_icon.png",
+}
+@image space_icon:
+{
+ filepath: "space_icon.png",
+}
 @image mystery_tile:
 {
  filepath: "mystery_tile.png",
diff --git a/assets/shift_icon.png b/assets/shift_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1d9a02b0ffb6b87c225095466adac4a9deab528
GIT binary patch
literal 1692
zcmcIli&N5h5dZ%0b)spPW@Va|ji%lCXd+8AHMH^_oUg3Rt_CwxOnkq{D>Lg9P09B=
zQqO!<hK7Nq<oV1rOEQL%GeuKFR6sxuZ|44lc4lXHXLfc!yF0s^amw?=Cb%vf0I<pB
zq!R`JNUlQQCuO-f8(E8$3)P5|r||%&X>BkBib}R`xZp7-j)BG@J+9nP40iNz1fYee
zCb^&lfU=c~lcRSWG|!^rwEcF0?-oH@(os2DrHXLIZk|dv*Yu<krU>bX>e*VS%23@4
zk7T%Lo9LTfHfJzLT(mQ)LhHVhv$TyWktVxs_D}B7LtawohV@v*<K|h1SJy4q5x7`;
z18zug?C~eK`DC_;Rw%$4$#MK}8h>o}*2r_OXg7(il-F>-Z{FMZ9(SKV4>D{O^SNJG
z-p64HZ~V;&=7`PO`T)a`ok@r@si1h&ETwBJ8dqB~l&`-NHgzxM7_2!i=yae1jGL|D
zdAhQ<!$Ph_yPBA|&pih+Y~M0W@O)G<V1B#~`YeE?AqU}@v%ud)R?4e6|6-StDMA6n
zqyj*ld3i&{q{<KmzE!2ArB$P|D=RRRaMtYeLFSWS&bm}Q7f6re{a#`d{TI#l&><ZT
zhodjRb6#g2P7+2Wi)P2_ukpVQt}XTEns7$QZYxv0y}fM_UtZzIaAD{8>qDi;ZN)7)
zZ(gqEK%GDf1YPICyn~|6Qlx7uZHa>Li7?Gww*G8d<+<1(>!|wB`*ZiHIusl`kg~AM
z9la(I^4203t~_;Jsb9N#!xhx}|BATD^g0?sU1x?iIh#HoL+nftO$jd~*kEfOzHc~_
zz#sg&)YU}0!_3Hto{(7D>gA|Wk8K0W1?m+MeBv%f`A|8L@uI&a;LbqI7GSoT>>4|b
zv8R{5aC5Vg@p=ZQk1)a&Z?N7sG@fppkf>R7zZza^dY>y57x%{}*C+d|FqKK*REr-`
zFC&M^d^VSk0k<t^x5JluU!l@97@k-BJ`@%fp0|^kA|}fN4*o;7qkl@-W4&C1qNVuo
z4Qe~tO=mNb+b@{pvkCOM)y0k#-+^RlbWhk&$&ueIkabr6mmAEQ+?x?F2c`Agp$D1`
ziq|uR3!SOh=f5~(k*dJ%Gbt~@o<(V*bsS>dYS=8Vp(pQ|tZk(2Os~SN#utJ>empfw
zT&;QZHu0#$(nb{e(d!}@!FD8yBKuPv1ay({jE6k<6;m=!IG=w$=2Hxh#~IJY(KCe-
zepa!q7p0mcZLg%n5&y?=9OKGfW(Gq(KLfLf`H!twv-NxmJ4+U`BTx<L3~I-3ywfjm
zF^xhdK3DGuiIYs;)feQ3Av|z?eq6$$yvxt>biHbnpT2!fQel3JLVfe~OCZXO)h!|U
zT+AI9S^7wwH)VFA)Rg@n<|}tX6|nfL1Wu8}-d-Aony~%~8<@(CSo?BSi@kSy5Dcg{
z+o20cY-P#$<rb8t!67PW%@3SCyv@*SXG(MmO_YQkYo5qiUc>3=%=T-hr*qKxiQI-1
zwr!UsyUhrhy~^wBOSC<Qug)@R4Zt6v(?~}o^>f8+G1UiErQ%%HV}(HYxKr^O6|j1h
z(MRDyrO#rerKO+GC@Hvu>(E2BQ!O&$pWWE05Jv0t%n3^I{%kQPlMjW4kyAqLaLLU0
z1K>ZL8}<2TKo#O>s~Pm&yLZv|CSjf3-A?oJWr3u%zWe8dzL&Oj65WT1OQ~Vu;pVQG
zOQ0=wG4OBLjP>Z~D7t8mg2RFds~um{w!Y=6@6lRP0aM3%$7N@!#*VJ8E-M?G0K&~c
z(oR{Cfw$>H)>eI>yL9ea<PPR*bVze<<Z2O7*#3q+*<B8Xoy#<mo{qtpfZU%+M+u@2
zkgTgVlZTXqu}@Wjr^X1!xZ04MrKqPi<HbQ|V-z}_%w+Hxi;FE1mi&fHgU3m)E!YPH
zmmL<1v!-YSGzxMnQ_qu~5^4H+_bC=<KVeSl5_}_-n?GiF50RG=%&MU&xn~r?7VakA
fcnCj~#y8n3u+ko6I*+GDY$S4V_H=4I7WBuzsV3T3

literal 0
HcmV?d00001

diff --git a/assets/space_icon.png b/assets/space_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..92dceaf3c97a9f47225fbf0406d3190dc35b71b4
GIT binary patch
literal 2060
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

literal 0
HcmV?d00001

diff --git a/main.c b/main.c
index fb381b3..4e50761 100644
--- a/main.c
+++ b/main.c
@@ -1718,13 +1718,15 @@ void draw_dialog_panel(Entity *talking_to)
 
 
 
-#define ROLL_KEY SAPP_KEYCODE_K
+#define ROLL_KEY SAPP_KEYCODE_LEFT_SHIFT
 double elapsed_time = 0.0;
 double last_frame_processing_time = 0.0;
 uint64_t last_frame_time;
 Vec2 mouse_pos = {0}; // in screen space
 bool roll_just_pressed = false; // to use to initiate dialog, shouldn't initiate dialog if the button is simply held down
 #ifdef DEVTOOLS
+float learned_shift = 0.0;
+float learned_space = 0.0;
 bool mouse_frozen = false;
 #endif
 void frame(void)
@@ -1764,7 +1766,7 @@ void frame(void)
     (float)keydown[SAPP_KEYCODE_D] - (float)keydown[SAPP_KEYCODE_A],
     (float)keydown[SAPP_KEYCODE_W] - (float)keydown[SAPP_KEYCODE_S]
     );
-  bool attack = keydown[SAPP_KEYCODE_J];
+  bool attack = keydown[SAPP_KEYCODE_SPACE] || keydown[SAPP_KEYCODE_LEFT_CONTROL];
   bool roll = keydown[ROLL_KEY];
   if(LenV2(movement) > 1.0)
   {
@@ -2225,6 +2227,18 @@ void frame(void)
    }
   }
 
+  // ui
+
+#define HELPER_SIZE 250.0f
+  float total_height = HELPER_SIZE * 2.0f;
+  float vertical_spacing = HELPER_SIZE/2.0f;
+  total_height -= (total_height - (vertical_spacing + HELPER_SIZE));
+  const float padding = 50.0f;
+  float y = screen_size().y/2.0f + total_height/2.0f;
+  draw_quad((DrawParams){false, quad_at(V2(padding, y), V2(HELPER_SIZE,HELPER_SIZE)), IMG(image_shift_icon), (Color){1.0f,1.0f,1.0f,fmaxf(0.0f, 1.0f-learned_shift)}});
+  y -= vertical_spacing;
+  draw_quad((DrawParams){false, quad_at(V2(padding, y), V2(HELPER_SIZE,HELPER_SIZE)), IMG(image_space_icon), (Color){1.0f,1.0f,1.0f,fmaxf(0.0f, 1.0f-learned_space)}});
+
   PROFILE_SCOPE("flush rendering")
   {
    flush_quad_batch();
@@ -2275,6 +2289,14 @@ void event(const sapp_event *e)
    roll_just_pressed = true;
   }
 
+  if(e->key_code == SAPP_KEYCODE_LEFT_SHIFT)
+  {
+   learned_shift += 0.15f;
+  }
+  if(e->key_code == SAPP_KEYCODE_SPACE)
+  {
+   learned_space += 0.15f;
+  }
 #ifdef DESKTOP // very nice for my run from cmdline workflow, escape to quit
   if(e->key_code == SAPP_KEYCODE_ESCAPE)
   {
diff --git a/todo.txt b/todo.txt
index 1ff4a07..d4858f1 100644
--- a/todo.txt
+++ b/todo.txt
@@ -2,7 +2,7 @@ Happening:
 DONE - Animate text characters coming in
 DONE - Escape exits typing
 DONE - Get rid of enters and stars in javascript input box
- - Space and e for attack and roll, tooltip
+DONE - Space and e for attack and roll, tooltip
  - Skeleton enemy
  - Shopkeep character
  - Don't flip player direction when you walk vertically