thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 04:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Challenges Menu: Cooler winged counters for Chao Keys and Completion Percentage

Browse source 
Moves rounds-to-key metyr back to being horizontal and under the counter again, but integrated into the wing
This commit is contained in:
toaster 2023-09-28 21:54:42 +01:00
parent aca676a7b6
commit 20f47a69dd
1 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/k_menudraw.c
View file

@ -5907,30 +5907,28 @@ static void M_DrawChallengeKeys(INT32 tilex, INT32 tiley)
offs = -offs; offs = -offs;
offs /= 2; offs /= 2;
fixed_t keyx = (3+offs)*FRACUNIT, keyy = 0; fixed_t keyx = (8+offs)*FRACUNIT, keyy = 0;
// Button prompt // Button prompt
K_drawButton( K_drawButton(
(21 + offs + 2) << FRACBITS, 24 << FRACBITS,
8 << FRACBITS, 16 << FRACBITS,
0, kp_button_c[1], 0, kp_button_c[1],
M_MenuExtraHeld(pid) M_MenuExtraHeld(pid)
); );
// Meter of rounds played that contribute to Chao Key generation // Metyr of rounds played that contribute to Chao Key generation
{ {
#define challengekeybarheight 27 const INT32 keybarlen = 36, keybary = 28;
offs = challengekeybarheight; offs = keybarlen;
if (gamedata->chaokeys < GDMAX_CHAOKEYS) if (gamedata->chaokeys < GDMAX_CHAOKEYS)
offs = ((gamedata->pendingkeyroundoffset * challengekeybarheight)/GDCONVERT_ROUNDSTOKEY); offs = ((gamedata->pendingkeyroundoffset * keybarlen)/GDCONVERT_ROUNDSTOKEY);
if (offs > 0) if (offs > 0)
V_DrawFill(1, 1 + (challengekeybarheight-offs), 2, offs, 0); V_DrawFill(1, keybary, offs, 1, 0);
if (offs < challengekeybarheight) if (offs < keybarlen)
V_DrawFadeFill(1, 1, 2, challengekeybarheight-offs, 0, 31, challengetransparentstrength); V_DrawFadeFill(1+offs, keybary, keybarlen-offs, 1, 0, 31, challengetransparentstrength);
#undef challengekeybarheight
} }
// Counter // Counter
@ -5944,8 +5942,8 @@ static void M_DrawChallengeKeys(INT32 tilex, INT32 tiley)
numbers[3] = ((gamedata->chaokeys / 1000) % 10); numbers[3] = ((gamedata->chaokeys / 1000) % 10);
if (numbers[3] != 0) if (numbers[3] != 0)
{ {
V_DrawScaledPatch(textx - 1, texty, 0, kp_facenum[numbers[3]]); V_DrawScaledPatch(textx - 4, texty, 0, kp_facenum[numbers[3]]);
textx += 5; textx += 2;
} }
UINT8 i = 0; UINT8 i = 0;
@ -6198,6 +6196,18 @@ challengedesc:
} }
} }
// Wings
{
const INT32 endy = 18, endlen = 38;
patch_t *endwing = W_CachePatchName("K_BOSB01", PU_CACHE);
V_DrawFill(0, endy, endlen, 11, 24);
V_DrawFixedPatch(endlen*FRACUNIT, endy*FRACUNIT, FRACUNIT, V_FLIP, endwing, NULL);
V_DrawFill(BASEVIDWIDTH - endlen, endy, endlen, 11, 24);
V_DrawFixedPatch((BASEVIDWIDTH - endlen)*FRACUNIT, endy*FRACUNIT, FRACUNIT, 0, endwing, NULL);
}
// Percentage // Percentage
{ {
patch_t *medal = W_CachePatchName( patch_t *medal = W_CachePatchName(
@ -6230,14 +6240,14 @@ challengedesc:
medalcolormap = R_GetTranslationColormap(TC_DEFAULT, M_GetCvPlayerColor(0), GTC_MENUCACHE); medalcolormap = R_GetTranslationColormap(TC_DEFAULT, M_GetCvPlayerColor(0), GTC_MENUCACHE);
} }
V_DrawFixedPatch((BASEVIDWIDTH - 32)*FRACUNIT, 1*FRACUNIT, FRACUNIT, 0, medal, medalcolormap); V_DrawFixedPatch((BASEVIDWIDTH - 31)*FRACUNIT, 1*FRACUNIT, FRACUNIT, 0, medal, medalcolormap);
V_ClearClipRect(); V_ClearClipRect();
medalchopy += challengesmenu.unlockcount[i]; medalchopy += challengesmenu.unlockcount[i];
} }
INT32 textx = BASEVIDWIDTH - 24, texty = 20-challengesmenu.unlockcount[CMC_ANIM]; INT32 textx = BASEVIDWIDTH - 21, texty = 20-challengesmenu.unlockcount[CMC_ANIM];
UINT8 numbers[3]; UINT8 numbers[3];
numbers[0] = ((challengesmenu.unlockcount[CMC_PERCENT] / 100) % 10); numbers[0] = ((challengesmenu.unlockcount[CMC_PERCENT] / 100) % 10);
numbers[1] = ((challengesmenu.unlockcount[CMC_PERCENT] / 10) % 10); numbers[1] = ((challengesmenu.unlockcount[CMC_PERCENT] / 10) % 10);
@ -6245,7 +6255,7 @@ challengedesc:
patch_t *percent = W_CachePatchName("K_SPDML1", PU_CACHE); patch_t *percent = W_CachePatchName("K_SPDML1", PU_CACHE);
V_DrawScaledPatch(textx + 3, texty, 0, percent); V_DrawScaledPatch(textx + 2, texty, 0, percent);
i = 3; i = 3;
while (i) while (i)