thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'show-emerald-again' into 'master'

Browse source 
Draw Chaos Emerald again for Sealed Star

Closes #1271

See merge request KartKrew/Kart!2281
This commit is contained in:
toaster 2024-04-15 15:08:32 +00:00
commit feb9fdfaa1
3 changed files with 105 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_game.c
View file

@ -4532,7 +4532,7 @@ static void G_DoCompleted(void)
{
// Increase your total rings
INT32 ringtotal = player->hudrings;
if (ringtotal > 0)
if (ringtotal > 0 && grandprixinfo.eventmode != GPEVENT_SPECIAL)
{
if (ringtotal > 20)
ringtotal = 20;

200
src/k_podium.cpp
View file

@ -599,12 +599,12 @@ void podiumData_s::Draw(void)
.text(va("%c", ('A' + p)));
}
}
// Do not draw any stats for GAME OVERed player
else if (gpRank_level_perplayer_t *const dta = &lvl->perPlayer[p]; dta->grade != GRADE_INVALID)
else
{
gpRank_level_perplayer_t *const dta = &lvl->perPlayer[p];
srb2::Draw drawer_rank = drawer_perplayer.xy(2, 0);
if (lvl->event != GPEVENT_SPECIAL)
if (lvl->event != GPEVENT_SPECIAL && dta->grade != GRADE_INVALID)
{
drawer_rank
.xy(0, -1)
@ -612,124 +612,128 @@ void podiumData_s::Draw(void)
.patch(va("R_CUPRN%c", K_GetGradeChar(dta->grade)));
}
srb2::Draw drawer_gametype = drawer_rank.xy(18, 0);
switch (lvl->event)
// Do not draw any stats for GAME OVERed player
if (dta->grade != GRADE_INVALID || lvl->event == GPEVENT_SPECIAL)
{
case GPEVENT_BONUS:
srb2::Draw drawer_gametype = drawer_rank.xy(18, 0);
switch (lvl->event)
{
drawer_gametype
.xy(0, 1)
.patch("K_CAPICO");
drawer_gametype
.xy(22, 1)
.align(srb2::Draw::Align::kCenter)
.font(srb2::Draw::Font::kPing)
.text(va("%d/%d", dta->prisons, lvl->totalPrisons));
break;
}
case GPEVENT_SPECIAL:
{
srb2::Draw drawer_emerald = drawer_gametype;
UINT8 emeraldNum = g_podiumData.emeraldnum;
boolean useWhiteFrame = ((leveltime & 1) || !dta->gotSpecialPrize);
patch_t *emeraldPatch = nullptr;
skincolornum_t emeraldColor = SKINCOLOR_NONE;
if (emeraldNum == 0)
case GPEVENT_BONUS:
{
// Prize -- todo, currently using fake Emerald
emeraldColor = SKINCOLOR_GOLD;
drawer_gametype
.xy(0, 1)
.patch("K_CAPICO");
drawer_gametype
.xy(22, 1)
.align(srb2::Draw::Align::kCenter)
.font(srb2::Draw::Font::kPing)
.text(va("%d/%d", dta->prisons, lvl->totalPrisons));
break;
}
else
case GPEVENT_SPECIAL:
{
emeraldColor = static_cast<skincolornum_t>( SKINCOLOR_CHAOSEMERALD1 + ((emeraldNum - 1) % 7) );
}
srb2::Draw drawer_emerald = drawer_gametype;
UINT8 emeraldNum = g_podiumData.emeraldnum;
{
std::string emeraldName;
if (emeraldNum > 7)
boolean useWhiteFrame = ((leveltime & 1) || !dta->gotSpecialPrize);
patch_t *emeraldPatch = nullptr;
skincolornum_t emeraldColor = SKINCOLOR_NONE;
if (emeraldNum == 0)
{
emeraldName = (useWhiteFrame ? "K_SUPER2" : "K_SUPER1");
// Prize -- todo, currently using fake Emerald
emeraldColor = SKINCOLOR_GOLD;
}
else
{
emeraldName = (useWhiteFrame ? "K_EMERC" : "K_EMERW");
emeraldColor = static_cast<skincolornum_t>( SKINCOLOR_CHAOSEMERALD1 + ((emeraldNum - 1) % 7) );
}
emeraldPatch = static_cast<patch_t*>( W_CachePatchName(emeraldName.c_str(), PU_CACHE) );
}
if (dta->gotSpecialPrize)
{
if (emeraldColor != SKINCOLOR_NONE)
{
drawer_emerald = drawer_emerald.colormap( emeraldColor );
std::string emeraldName;
if (emeraldNum > 7)
{
emeraldName = (useWhiteFrame ? "K_SUPER2" : "K_SUPER1");
}
else
{
emeraldName = (useWhiteFrame ? "K_EMERC" : "K_EMERW");
}
emeraldPatch = static_cast<patch_t*>( W_CachePatchName(emeraldName.c_str(), PU_CACHE) );
}
if (dta->gotSpecialPrize)
{
if (emeraldColor != SKINCOLOR_NONE)
{
drawer_emerald = drawer_emerald.colormap( emeraldColor );
}
}
else
{
drawer_emerald = drawer_emerald.colormap( TC_BLINK, SKINCOLOR_BLACK );
}
drawer_emerald
.xy(6 - (emeraldPatch->width * 0.5), 0)
.patch(emeraldPatch);
break;
}
else
default:
{
drawer_emerald = drawer_emerald.colormap( TC_BLINK, SKINCOLOR_BLACK );
drawer_gametype
.xy(0, 1)
.patch("K_SPTLAP");
drawer_gametype
.xy(22, 1)
.align(srb2::Draw::Align::kCenter)
.font(srb2::Draw::Font::kPing)
.text(va("%d/%d", dta->lapPoints, lvl->totalLapPoints));
break;
}
}
if (singlePlayer)
{
srb2::Draw drawer_rings = drawer_gametype.xy(36, 0);
if (lvl->event == GPEVENT_NONE)
{
drawer_rings
.xy(0, -1)
.patch("K_SRING1");
drawer_rings
.xy(22, 1)
.colormap(TC_RAINBOW, SKINCOLOR_YELLOW)
.align(srb2::Draw::Align::kCenter)
.font(srb2::Draw::Font::kPing)
.text(va("%d", dta->rings));
}
drawer_emerald
.xy(6 - (emeraldPatch->width * 0.5), 0)
.patch(emeraldPatch);
break;
}
default:
{
drawer_gametype
.xy(0, 1)
.patch("K_SPTLAP");
srb2::Draw drawer_timer = drawer_rings.xy(36, 0);
drawer_gametype
.xy(22, 1)
drawer_timer
.xy(0, 0)
.patch("K_STTIMS");
drawer_timer
.xy(32, 1)
.align(srb2::Draw::Align::kCenter)
.font(srb2::Draw::Font::kPing)
.text(va("%d/%d", dta->lapPoints, lvl->totalLapPoints));
break;
.text(lvl->time == UINT32_MAX ?
"--'--\"--" : va(
"%i'%02i\"%02i",
G_TicsToMinutes(lvl->time, true),
G_TicsToSeconds(lvl->time),
G_TicsToCentiseconds(lvl->time)
));
}
}
if (singlePlayer)
{
srb2::Draw drawer_rings = drawer_gametype.xy(36, 0);
if (lvl->event == GPEVENT_NONE)
{
drawer_rings
.xy(0, -1)
.patch("K_SRING1");
drawer_rings
.xy(22, 1)
.colormap(TC_RAINBOW, SKINCOLOR_YELLOW)
.align(srb2::Draw::Align::kCenter)
.font(srb2::Draw::Font::kPing)
.text(va("%d", dta->rings));
}
srb2::Draw drawer_timer = drawer_rings.xy(36, 0);
drawer_timer
.xy(0, 0)
.patch("K_STTIMS");
drawer_timer
.xy(32, 1)
.align(srb2::Draw::Align::kCenter)
.font(srb2::Draw::Font::kPing)
.text(lvl->time == UINT32_MAX ?
"--'--\"--" : va(
"%i'%02i\"%02i",
G_TicsToMinutes(lvl->time, true),
G_TicsToSeconds(lvl->time),
G_TicsToCentiseconds(lvl->time)
));
}
}
drawer_perplayer = drawer_perplayer.x(56);

3
src/k_tally.cpp
View file

@ -331,7 +331,8 @@ void level_tally_t::Init(player_t *player)
}
}
if ((gametypes[gt]->rules & GTR_SPHERES) == 0)
if ((gametypes[gt]->rules & GTR_SPHERES) == 0
&& (!grandprixinfo.gp || grandprixinfo.eventmode != GPEVENT_SPECIAL))
{
if (player->hudrings > 0) // Don't count negative rings
{