From 27810b1ea0139a79c383cd10f1ab4478bf67304c Mon Sep 17 00:00:00 2001 From: Lephenixnoir Date: Fri, 23 Dec 2022 21:51:17 +0100 Subject: [PATCH] rearrange GUI for future combo counter --- assets-cg/hud.png | Bin 1387 -> 8371 bytes src/render.c | 12 ++++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/assets-cg/hud.png b/assets-cg/hud.png index 60abba1600a6a3e0ba6796c694be91e837bc21a0..e8958d49dd771b875fc0760eb5fe76f986a4e34a 100644 GIT binary patch literal 8371 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 dfont(&font_hud); - dprint_opt(349, HUD_Y - 5, RGB24(0x15171a), C_NONE, DTEXT_CENTER, + dprint_opt(164, HUD_Y - 5, RGB24(0x15171a), C_NONE, DTEXT_CENTER, DTEXT_TOP, "%d", player_data->xp_level); - dprint_opt(349, HUD_Y - 6, RGB24(0xabb1ba), C_NONE, DTEXT_CENTER, + dprint_opt(164, HUD_Y - 6, RGB24(0xabb1ba), C_NONE, DTEXT_CENTER, DTEXT_TOP, "%d", player_data->xp_level); dfont(&font_rogue); @@ -607,14 +607,14 @@ void render_game(game_t const *g, bool show_hitboxes) /* Render XP bar. The following values indicate the geometry of the XP bar so that we can show a partially-filled version of it */ if(anim_in(g->hud_xp_anim.frame, &anims_hud_xp_Explode, 0)) { - anim_frame_render(343, HUD_Y-32, g->hud_xp_anim.frame); + anim_frame_render(158, HUD_Y-32, g->hud_xp_anim.frame); } else { static int const XP_FULL=22; int xp_current = player_data->xp_current; int xp_total = max(player_data->xp_to_next_level, 1); int fill_height = XP_FULL * xp_current / xp_total; - anim_frame_subrender(343, HUD_Y-32, g->hud_xp_anim.frame, + anim_frame_subrender(158, HUD_Y-32, g->hud_xp_anim.frame, 0, XP_FULL - fill_height, -1, fill_height); } @@ -627,7 +627,7 @@ void render_game(game_t const *g, bool show_hitboxes) fixed_t cooldown_remaining = player_f->actions_cooldown[i+1]; int skill = player_f->skills[i+1]; - int x = 31 + 48*i + 64*(i>=3); + int x = 23 + 44*i + 103*(i>=3); int y = HUD_Y - 33; int bg = (cooldown_remaining != 0) ? 2 : 1; skill_render(x+2, y+2, skill, bg, C_WHITE); @@ -745,7 +745,7 @@ void render_game(game_t const *g, bool show_hitboxes) for(int i = 0; i < 5; i++) { int s1 = player_f->skills[i+1], s2 = switched_skills[i+1]; if(s1 == s2) continue; - int x = 31 + 48*i + 64*(i>=3); + int x = 23 + 44*i + 103*(i>=3); int y = HUD_Y - 33; skill_render(x+2, y+2, s2, 3, C_WHITE); }