From 8bca321d0f64bf563ce5dcbeaf5135a92f6fc376 Mon Sep 17 00:00:00 2001
From: Lephenixnoir <sebastien.michelland@protonmail.com>
Date: Sat, 23 Oct 2021 15:10:20 +0200
Subject: [PATCH] more test waves, preparing skills, better HUD

---
 CMakeLists.txt           |   4 ++--
 assets-cg/hud.png        | Bin 0 -> 1342 bytes
 assets-cg/hud_life.png   | Bin 265 -> 311 bytes
 assets-cg/hud_life2.png  | Bin 267 -> 0 bytes
 assets-cg/skillicons.png | Bin 845 -> 540 bytes
 src/entities.h           |   4 ++++
 src/game.c               |   1 +
 src/level.c              |  45 ++++++++++++++++++++++++++++++++++++++-
 src/main.c               |  11 ++++++++++
 src/render.c             |  44 ++++++++++++++++++--------------------
 10 files changed, 83 insertions(+), 26 deletions(-)
 create mode 100644 assets-cg/hud.png
 delete mode 100644 assets-cg/hud_life2.png

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b0267f..8e3a2d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,10 +36,10 @@ set(ASSETS
   assets-cg/levels/demo.txt
   assets-cg/levels/1.txt
   # HUD
+  assets-cg/hud.png
+  assets-cg/hud_life.png
   assets-cg/hud_wave.png
   assets-cg/hud_wave2.png
-  assets-cg/hud_life.png
-  assets-cg/hud_life2.png
   assets-cg/skillicons.png
   # Player animations
   assets-cg/player/player_up.aseprite
diff --git a/assets-cg/hud.png b/assets-cg/hud.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b896296a189dcbadeacd3cad7a6a5f44a1a2be0
GIT binary patch
literal 1342
zcmV-E1;P4>P)<h;3K|Lk000e1NJLTq00E2u001Ni1^@s6ngI=c00001b5ch_0Itp)
z=>Px(_(?=TRCt{2ov}+CK@`THA%Qd+!C0LHv`&#mEc^!o>BSTZ7IuP#-EqYgVrL=P
zSqP>`NFT^QU?DasLP`z6tAdc+5eOJ^Da_j)$KAW#oj1F0cE4Y9ckAu*+xKSXyBYV!
z2?78_EG{h%&DZB=rxR6a0YDq*3;<AU6#ahx&he?KDI$V#06+x801YR}DA**Dj=?xU
zlR@JLjbxNj*uXddxCM<KG>WV<3KPsY0JsH>9W;U>MqvZv08Iyt9Ml>Kqp*Q-fTp6N
zald}`ayb57#d!PSqxdyKZ;TJUQY<bl4<(JlCe1jsnMP>!hu#=%{p(@X0+=7y-^F82
z&&-O)WT4ltUP+{lg5h|+;!6@*{h?Q9|59NXoa|3m*J3eW%*}WyA`$cw`PB<#39bIn
ztG9otFpTM$*(f=4trigxUG;j=^DLO}zv}g(xITbhzj}czq17LH_4Y3nhGE0W<HTiw
z-=C*QQa~>ViO}i~y?Rh#80OT=C24k%d{04%ptmmc2ZND6pPHO3Nr^n6)gOBA$JK%g
z!?34xd7PQybIkM0nu0=an2a-twD*Q)9--AAdiC}%6^2oU^CNCJaeb4=C`O$higAQi
zf5i10*98@Z0YDkJ8bw;Xv^}T*s2dNe763pQ`23E9=I>tsAPEcu)Sfa1beINc0x%3v
zYowQ<wEQjrssM%o001BpFbn_y0GSZGOKN3xt?-VGgRfttWZc6=R~pb8<3q0$mzNin
z{9bK239bIn8zZUr{ku2LJKu`lR$H`#KJ~bPua7|kdSj{@lr^I*C!y6JdSj&Y&d)E1
z#1UJPa=EZSgI`iI5Vr<#fh?ibA93a5N*RyH3}a<=ZFqTkQRpl2L`2h19!JlUc5Tc;
z+BrovjRJaOeCU;eHQV3Jmb#lMEuOZVgjRp(jgitj*J{zq>e|qCSxR(Cs`yq3H<6pV
z?AmDV63OxWY~KLAe)Y;>c0?)TNIKulr@owoR)6T#+P_2$Lwa4XNYbm^8W?(YVrrH!
zj&Vl8@wIhwo6zbHy)sCQ)6RdcF_)u?c9driZitBJ^UvR|aw4AppC*3$`$#M%1HFFr
zO2UJC(!kD)GmflAVZK)rq17LH<@NRl1Db2KXnuad>24`!!&qEe9um22jlc=_fzJlw
z1L*Zb9^*(mchvbBje-fS{?HpEsh2m&JU=@vJnmz+TF?l1KsW#IfcZFXsVYRH06-e2
z83xZTT-R;0tRc5M-RSw=ZkO7fF754hN1Snsj}ARfZ<1DiJ`PQK`SmD59Wb-ZI7a<E
zr0dRGfAd%s^$)GRhLT@imLe)X%Mh7il+}5%47ge_wVI7Y>owSVHEWf?o^iB0T{<~F
ziXMrG);BhZi0I__C`hBogIQ~?y*bcnBdKj_Zm)KJ?PFyi(RNiVNoBo|cBe~+2m86t
zlP1gWwY6?-@6h4FekGcV=;Z;!JXS}><>uu0h}JhYgU&;d`tzU`LVGnokX2EqCiSnv
z-}E+@qsl__CkPu;>(=(pokxw>dh0&JNP=e+SG``;uGcp<8<7WlhN=CU?N995+pCrt
zJhy8ezw=V~Zx|AHN9CbE7~FAk`?V&Lv@#ksr|H$G)fYSi<VQZXx7)3K9@6@f);<<m
zdrit?mAQ4fTPhgC0Kg~Qfz6Jrb-)C`1sB8k2j<rL?4~ZtHvj+t07*qoM6N<$f;|m_
A=Kufz

literal 0
HcmV?d00001

diff --git a/assets-cg/hud_life.png b/assets-cg/hud_life.png
index cb5ffe9c301011d60e0e67cfbfc4cbb84008c1c6..7c2106b1b46f0d9393946454260bbec7d3f3dd9e 100644
GIT binary patch
literal 311
zcmV-70m%M|P)<h;3K|Lk000e1NJLTq000~S0015c1^@s6KgE8Z00001b5ch_0Itp)
z=>Px#@kvBMR7i>K)-eu(Fcb#hzoe6!#zErf4Y-1viJQlCGja0@+`y6GU|=I|IF&qW
zdF``hQU9&<^?hjrqzb~ExBH%scbAirtPd`x&?3(P08L$sVQ-NOvLk^<Cw)7jk?i>G
zp#=H_9tJUx1Xd}b5LizEnV5dGf0k4T$oGRfw6JR{c78Tr$Adm(td_%_pakO9yI}1q
zOcm3Q{)2~?=FzlCF&f%Cn;NsxEcG#R>DuZCKKwtJJQ@J*w<`c(x!Qn^W8>;KTrrMC
z(Q}2d(4j2V3z!1tAd}H+q67|sydVeL34ww^4wgV-&;?5%lP9qIpF-JrHYNZ7002ov
JPDHLkV1m?LgeCw0

literal 265
zcmeAS@N?(olHy`uVBq!ia0vp^X+X@*!3HFMm0QdOQjEnx?oJHr&dIz4at?dCIEHw1
zCYM~j_Tzj5>xK_S#vB~oMl}_`XFWXseEs52A=B>Heq~ecd7GKY)8G77{hX1J0T6hd
z(n#o?5$F)T;PCl_8-Bmyb@S(b{D1PFMUrv%cO1P?^V;O_{PXdWW$}9tT1Xi(bMU0J
zNG44D^yZW%8xXYZ%<18&x2sQ0kV@FzThSn+$pZu@_bdENF-c;RP;lpBW>z_FV9?`s
zrh!qmj;{@5@3}uedG*+|kAciQVR1`K`bU^#k<5W3j8PAc1zhxAbPDJl22WQ%mvv4F
FO#s$gXwLuu

diff --git a/assets-cg/hud_life2.png b/assets-cg/hud_life2.png
deleted file mode 100644
index 271cbdb499e38e1cd391042733525acba028a923..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 267
zcmV+m0rdWfP)<h;3K|Lk000e1NJLTq003YB000LF1^@s6_i0Gl00001b5ch_0Itp)
z=>Px##Ysd#R7i>K)=vt8Kokb>@5P{?2to$#-3ab%(*;`8zB721j^G`-ftxNNxUqGV
zg&+w^Fs%&1ag(-tZ#DD%-mHfCL)*ZYP?WGt*vl2l#~ttL#XhqqX+{7bBHb7u0HBp{
zq=llr0jeJMX&(48Ni$mXGspD?V^zjJ-6P$=ZnKtj-XD}#5ZC|f_`E<A*Zdneu7_^k
z->rVeK92(cGy<K%aP$NW7O>CeaZ@8nGZJxAD;tDm!lnwPM&qwM`_JC}f<BQ_NZ{mQ
R5%mB7002ovPDHLkV1msHa&!Oy

diff --git a/assets-cg/skillicons.png b/assets-cg/skillicons.png
index 59ce5075aaae4fe7edf6fda8bef8f09279e17916..19f506663c10aa476e52f099afdbf4520d19b435 100644
GIT binary patch
literal 540
zcmV+%0^|LOP)<h;3K|Lk000e1NJLTq0043T000vR1^@s6Om$g;00001b5ch_0Itp)
z=>Px$)=5M`RA_<iTFY{SFbrHXT+@3eIrRU(st1_f!v{E*iqW{1E%^mxx|c8@$wDg$
zkmEidUmhpK&+_e#_TfsH0pM}J0|1tF-H$ck^2@pc06uOv0KjwG_G1mW{BzqxIq$u9
z&NU~wm0j=sUKl<6lrYl)kwS!MK=L8^L`sT~5F{^=PXX#hBK_9b=OnhUXTb#6E0H54
z-&%<rR`OdQ7W|<OG{W9mEtN<h9j;$W2I)xpEi*eLi`(|U=&`N^QbI}o%(0VaL$9_P
zvq$HSs7%e8QY@xkPPGERxt77rCB+ey=pvA0!&scYBAs)tWkp((VblvtNs@BkPERDz
zt~#s<K}j@%%+S7-*h>&esCfygZObFbtnu;m&qzY;XF@FrBid{3xtPMGDl!F4wOU(c
z&mlx?of^Cak(P-He|geCOQK{`lQh!xoS$6pGOabd+1&SDE(o>Pxtu0(wBLvvDcNwn
zOI2j+78h%smTJ|uXr6Q_d5s^*$xdt+LxY%(b{8W=iB2g}Bf0Rp)o!cto>g}O%4e;>
z-+_D0;Jakto@!|&`j!C3+GcDjGvZrxZ>`dnR0@)OZc8eLnq8CHN+A7`K<A#-CH|Da
e{r^MYJ@5hz)SKdkxMCRq0000<MNUMnLSTa7uK3mf

literal 845
zcmV-T1G4;yP)<h;3K|Lk000e1NJLTq004>r000*V1^@s6)PL9c00001b5ch_0Itp)
z=>Px&2T4RhRA_<inmudVKpe)O6QVH*!2vf*@sKG9Y_P$kc=Y1IpQD36MJT18qMxLL
zmW;(E(1HY_lZKMTG1!zsD23}#pL!OjJLz6zNA+(y<kNF+kN)@KBLFZPk0=0q{B%#I
zy?|nie}2Z2xaeGF>Gf)vrGNkUnWe)x$=(m+gvhi-Wr#Fo+DGccpN&WK%`b{q{nr3M
zc|#PjlZQ)B0Xjc9&9waUGkp2J0`S)`EWN|#sZ>R$y?{pBywhGlk7lVCpC#Vj-{Ixe
z74E(!+G3MIfDdVkd9>Jh-fy=cG)V=b%@g|V7NU~II%1b>dbsFZ8kvMK83cGtQ-pB>
z0HiRIXwq-DGHqEtN+~6TIFCB6%Au5I({vr}P(h}>fSN{<Jj^TroJ4@FS%jU(I=C*A
zu(ZwccwHCzI(Yjm{5g{!Owr&r316M%dExTQ%bS5Oi*Bi-9wrnST2)_9v^}+fD_t4+
z!Ey!JqIz~HP!3g|qTd@c_3({!X%>|k4$&+`KvCYJzH@4nI-?cec-OlS7x`U53sAk2
zf991rVAH{st_)Y<zv@nk<vRqkl#L`R8n>7Q>~3342fMEG9911mH5#)<Vc6cbnhx^5
zO~UG6S`Ux^gU=?ebWJHcPxDlrO6olHQ`JMKy&{}WJ)(bs_o*w2HdWRgI_9cMQ5iZ@
zSW$jeJ4Ej_Zt4-8ZvgTEsG_g4V<@XDGXpcKj((NMQdGWoXkWbzY^?HSh&tRPyfcH8
zIisl>+4%Ql`l{a>x$AKS-;p9?*fM6`3^om~tM%U)rRYo4?Kqo*$!jqkk={NR$zB*I
zWW8EqG6<{)P6h$it0lrXAz_@5VYg#Nmoe;iw68)ItzUGJ4XTb7zYY=MaynJv&Bh~o
zdwqk)G&MF0yN7aneS_I}MA@aKe!FF*vh1cDyN9cT?e&Z8fg=)ZmQxiU03M<R-i;=B
z|LwDpS=Os1<|n6kh!(($f9;AkPZ)MPM%N)t-#=o8^rpPdEqq=}rY$N%q$$%rQXhW+
Xl$A0lgT<hg00000NkvXXu0mjf&aI0o

diff --git a/src/entities.h b/src/entities.h
index 8ea6c19..bfadaf5 100644
--- a/src/entities.h
+++ b/src/entities.h
@@ -49,6 +49,10 @@ typedef struct {
     uint8_t combo_next;
     /* Delay until ideal time to start next hit */
     fixed_t combo_delay;
+    /* Skill and item cooldowns (F2..F5).The "total" field is updated when
+       switching skills/items. The base field is the dynamic value. */
+    fixed_t actions_cooldown_total[5];
+    fixed_t actions_cooldown[5];
 
 } entity_player_t;
 
diff --git a/src/game.c b/src/game.c
index 34c4034..aaabb1b 100644
--- a/src/game.c
+++ b/src/game.c
@@ -79,6 +79,7 @@ void game_next_wave(game_t *g)
     g->wave++;
     g->wave_spawned = 0;
     g->time_wave = fix(0);
+    g->time_victory = fix(0);
 }
 
 //---
diff --git a/src/level.c b/src/level.c
index 326c309..69fe7b8 100644
--- a/src/level.c
+++ b/src/level.c
@@ -9,9 +9,23 @@ level_t lv_demo = {
     .map = &lv_map_demo,
 };
 
+/* Notation that would be very cool:
+
+   - slime/1 ;
+     | slime/1 ;
+     slime/1 ;
+     | slime/1 ;
+     slime/2 ;
+     | slime/2 ;
+   - slime/2 | slime/2 ;
+     bat/1 | bat/1 ;
+
+   Each - bullet is a wave, with ';' separating "instants". Default is
+   increments of 0.5 unless specified otherwise or @<time> */
+
 level_t lv_1 = {
     .map = &lv_map_1,
-    .wave_count = 2,
+    .wave_count = 5,
     .waves = (level_wave_t []){
         /* Wave 1: Just some slimes */
         { .enemy_count = 6,
@@ -31,5 +45,34 @@ level_t lv_1 = {
             { ENEMY_BAT,   1,   2,1,  fix(1.0) },
             { ENEMY_BAT,   1,  19,9,  fix(1.0) },
         }},
+        /* Wave 3: Strong, fast bats */
+        { .enemy_count = 4,
+          .enemies = (level_wave_spawn_t []) {
+            { ENEMY_BAT,   2,   2,1,  fix(0.0) },
+            { ENEMY_BAT,   2,  19,9,  fix(0.5) },
+            { ENEMY_BAT,   2,   2,1,  fix(1.0) },
+            { ENEMY_BAT,   2,  19,9,  fix(1.5) },
+        }},
+        /* Wave 4: A hurl of slimes, with bats to harass you */
+        { .enemy_count = 12,
+          .enemies = (level_wave_spawn_t []) {
+            { ENEMY_SLIME, 2,   2,1,  fix(0.00) },
+            { ENEMY_SLIME, 2,  19,9,  fix(0.00) },
+            { ENEMY_SLIME, 2,   2,1,  fix(0.25) },
+            { ENEMY_SLIME, 2,  19,9,  fix(0.25) },
+            { ENEMY_SLIME, 2,   2,1,  fix(0.50) },
+            { ENEMY_SLIME, 2,  19,9,  fix(0.50) },
+            { ENEMY_SLIME, 2,   2,1,  fix(0.75) },
+            { ENEMY_SLIME, 2,  19,9,  fix(0.75) },
+            { ENEMY_SLIME, 2,   2,1,  fix(1.00) },
+            { ENEMY_SLIME, 2,  19,9,  fix(1.00) },
+            { ENEMY_BAT,   3,   2,1,  fix(2.00) },
+            { ENEMY_BAT,   3,  19,9,  fix(2.00) },
+        }},
+        /* Wave 5: Stronger first boss */
+        { .enemy_count = 1,
+          .enemies = (level_wave_spawn_t []) {
+            { ENEMY_BAT,   5,   2,1,  fix(0.0) },
+        }},
     },
 };
diff --git a/src/main.c b/src/main.c
index 733a151..97c5fce 100644
--- a/src/main.c
+++ b/src/main.c
@@ -477,6 +477,17 @@ int main(void)
             player->current_attack = area;
             player->attack_follows_movement = false;
         }
+        /* Ideas for additional skills:
+           - Freeze enemies
+           - Barrier around player
+           - Teleport
+           - Time manipulation
+           - Player buuffs (short but strong) or wide area debuggs
+          Ideas for items:
+           - Healing potion
+           - Equipment
+           - XP boosts
+           - Weaker but longer-lasting buffs */
 
         /* Remove dead entities first as it will kill their attack areas */
         game_remove_dead_entities(&game);
diff --git a/src/render.c b/src/render.c
index c6b6ec0..467d037 100644
--- a/src/render.c
+++ b/src/render.c
@@ -29,8 +29,8 @@ void camera_init(camera_t *c, map_t const *m)
     c->x = (c->limits.x_min + c->limits.x_max) / 2;
     c->y = (c->limits.y_min + c->limits.y_max) / 2;
 
-    /* Slightly off-center to add space for the HUD */
-    c->y -= fix(0.375);
+    /* Vertical adjustment to add space for the HUD */
+    c->y -= fix(0);
 }
 
 ipoint_t camera_map2screen(camera_t const *c, fpoint_t p)
@@ -226,32 +226,27 @@ void render_game(game_t const *g, bool show_hitboxes)
     for(int i = 0; i < g->entity_count; i++)
         enemies_left += (g->entities[i]->identity != 0);
 
-    extern bopti_image_t img_hud_wave, img_hud_wave2;
-    dimage(DWIDTH - img_hud_wave.width, 17, &img_hud_wave);
-    int fill_length = (img_hud_wave2.width * enemies_left) /
-        g->level->waves[g->wave-1].enemy_count;
-    dsubimage(DWIDTH - fill_length, 17, &img_hud_wave2,
-        img_hud_wave2.width - fill_length, 0, fill_length,
-        img_hud_wave2.height, DIMAGE_NONE);
-
     if(g->wave_spawned < game_current_wave(g)->enemy_count)
-        dprint_opt(DWIDTH - 4, 2, C_WHITE, C_NONE, DTEXT_RIGHT, DTEXT_TOP,
+        dprint_opt(DWIDTH/2, 2, C_WHITE, C_NONE, DTEXT_CENTER, DTEXT_TOP,
             "Wave %d is preppin' up...", g->wave,
                 game_current_wave(g)->enemy_count - g->wave_spawned);
     else if(enemies_left > 0)
-        dprint_opt(DWIDTH - 4, 2, C_WHITE, C_NONE, DTEXT_RIGHT, DTEXT_TOP,
+        dprint_opt(DWIDTH/2, 2, C_WHITE, C_NONE, DTEXT_CENTER, DTEXT_TOP,
             "Wave %d is here for you!", g->wave, enemies_left);
     else
-        dprint_opt(DWIDTH - 4, 2, C_WHITE, C_NONE, DTEXT_RIGHT, DTEXT_TOP,
+        dprint_opt(DWIDTH/2, 2, C_WHITE, C_NONE, DTEXT_CENTER, DTEXT_TOP,
             "Victory! For now...", g->wave);
 
-    entity_t const *player = g->player;
-    dprint(2,  2, C_WHITE, "HP: %d/%d", player->HP, player->HP_max);
+    /* Render HUD */
+    extern bopti_image_t img_hud;
+    dimage(0, DHEIGHT - img_hud.height, &img_hud);
 
-    extern bopti_image_t img_hud_life, img_hud_life2;
-    dimage(0, 17, &img_hud_life);
-    fill_length = (img_hud_life2.width * player->HP) / player->HP_max;
-    dsubimage(0, 17, &img_hud_life2, 0, 0, fill_length, img_hud_life2.height,
+    /* Render life bar */
+    extern bopti_image_t img_hud_life;
+    entity_t const *player = g->player;
+    int fill_height = (img_hud_life.height * player->HP) / player->HP_max;
+    dsubimage(184, DHEIGHT - 5 - fill_height, &img_hud_life,
+        0, img_hud_life.height - fill_height, img_hud_life.width, fill_height,
         DIMAGE_NONE);
 
     /* Render skill icons */
@@ -264,12 +259,15 @@ void render_game(game_t const *g, bool show_hitboxes)
             cooldown_remaining = -player->movement.dash;
         }
         else if(i > 0) {
-            cooldown_remaining=fix(1);
+            cooldown_total = player->player->actions_cooldown_total[i-1];
+            cooldown_remaining = player->player->actions_cooldown[i-1];
         }
 
-        int x=15+68*i, y=DHEIGHT-27, bg=(cooldown_remaining!=0);
-        dsubimage(x, y, &img_skillicons, 23*bg, 0, 23, 23, DIMAGE_NONE);
-        dsubimage(x, y, &img_skillicons, 23*(i+2), 0, 23, 23, DIMAGE_NONE);
+        int x = 33 + 44*i + 84*(i>=3);
+        int y = DHEIGHT - 29;
+        int bg = (cooldown_remaining != 0);
+        dsubimage(x+2, y+2, &img_skillicons, 19*bg, 0, 19, 19, DIMAGE_NONE);
+        dsubimage(x+2, y+2, &img_skillicons, 19*(i+2), 0, 19, 19, DIMAGE_NONE);
 
         /* Darken the area representing remaining cooldown */
         if(cooldown_total != 0) {