edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

rank/teamrank: Display how much better you are

Browse source
This commit is contained in:
def 2021-01-23 23:19:44 +01:00
parent 989d26bfec
commit b28cdc933a
1 changed files with 28 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/game/server/score.cpp
View file

@ -665,7 +665,11 @@ bool CScore::ShowRankThread(IDbConnection *pSqlServer, const ISqlData *pGameData
char aBuf[600]; char aBuf[600];
str_format(aBuf, sizeof(aBuf), str_format(aBuf, sizeof(aBuf),
"SELECT Rank, Name, Time " "SELECT Rank, Time, "
" 100.0 - 100.0 * (Rank - 1) / ("
" SELECT COUNT(DISTINCT Name) - 1 "
" FROM %s_race WHERE Map = ?"
" ) AS BetterThanPercent "
"FROM (" "FROM ("
" SELECT RANK() OVER w AS Rank, Name, MIN(Time) AS Time " " SELECT RANK() OVER w AS Rank, Name, MIN(Time) AS Time "
" FROM %s_race " " FROM %s_race "
@ -674,29 +678,30 @@ bool CScore::ShowRankThread(IDbConnection *pSqlServer, const ISqlData *pGameData
" WINDOW w AS (ORDER BY Time)" " WINDOW w AS (ORDER BY Time)"
") as a " ") as a "
"WHERE Name = ?;", "WHERE Name = ?;",
pSqlServer->GetPrefix()); pSqlServer->GetPrefix(), pSqlServer->GetPrefix());
pSqlServer->PrepareStatement(aBuf); pSqlServer->PrepareStatement(aBuf);
pSqlServer->BindString(1, pData->m_Map); pSqlServer->BindString(1, pData->m_Map);
pSqlServer->BindString(2, pData->m_Name); pSqlServer->BindString(2, pData->m_Map);
pSqlServer->BindString(3, pData->m_Name);
if(pSqlServer->Step()) if(pSqlServer->Step())
{ {
int Rank = pSqlServer->GetInt(1); int Rank = pSqlServer->GetInt(1);
float Time = pSqlServer->GetFloat(3); float Time = pSqlServer->GetFloat(2);
// CEIL and FLOOR are not supported in SQLite
int BetterThanPercent = std::floor(pSqlServer->GetFloat(3));
str_time_float(Time, TIME_HOURS_CENTISECS, aBuf, sizeof(aBuf)); str_time_float(Time, TIME_HOURS_CENTISECS, aBuf, sizeof(aBuf));
if(g_Config.m_SvHideScore) if(g_Config.m_SvHideScore)
{ {
str_format(pResult->m_Data.m_aaMessages[0], sizeof(pResult->m_Data.m_aaMessages[0]), str_format(pResult->m_Data.m_aaMessages[0], sizeof(pResult->m_Data.m_aaMessages[0]),
"Your time: %s", aBuf); "Your time: %s, better than %d%%", aBuf, BetterThanPercent);
} }
else else
{ {
char aName[MAX_NAME_LENGTH];
pSqlServer->GetString(2, aName, sizeof(aName));
pResult->m_MessageKind = CScorePlayerResult::ALL; pResult->m_MessageKind = CScorePlayerResult::ALL;
str_format(pResult->m_Data.m_aaMessages[0], sizeof(pResult->m_Data.m_aaMessages[0]), str_format(pResult->m_Data.m_aaMessages[0], sizeof(pResult->m_Data.m_aaMessages[0]),
"%d. %s Time: %s, requested by %s", "%d. %s Time: %s, better than %d%%, requested by %s",
Rank, aName, aBuf, pData->m_RequestingPlayer); Rank, pData->m_Name, aBuf, BetterThanPercent, pData->m_RequestingPlayer);
} }
} }
else else
@ -723,7 +728,11 @@ bool CScore::ShowTeamRankThread(IDbConnection *pSqlServer, const ISqlData *pGame
char aBuf[2400]; char aBuf[2400];
str_format(aBuf, sizeof(aBuf), str_format(aBuf, sizeof(aBuf),
"SELECT l.ID, Name, Time, Rank " "SELECT l.ID, Name, Time, Rank, "
" 100.0 - 100.0 * (Rank - 1) / ("
" SELECT COUNT(DISTINCT ID) - 1 "
" FROM %s_teamrace WHERE Map = ?"
" ) AS BetterThanPercent "
"FROM (" // teamrank score board "FROM (" // teamrank score board
" SELECT RANK() OVER w AS Rank, ID " " SELECT RANK() OVER w AS Rank, ID "
" FROM %s_teamrace " " FROM %s_teamrace "
@ -738,17 +747,21 @@ bool CScore::ShowTeamRankThread(IDbConnection *pSqlServer, const ISqlData *pGame
" LIMIT 1" " LIMIT 1"
") AS l ON TeamRank.ID = l.ID " ") AS l ON TeamRank.ID = l.ID "
"INNER JOIN %s_teamrace AS r ON l.ID = r.ID ", "INNER JOIN %s_teamrace AS r ON l.ID = r.ID ",
pSqlServer->GetPrefix(), pSqlServer->GetPrefix(), pSqlServer->GetPrefix()); pSqlServer->GetPrefix(), pSqlServer->GetPrefix(), pSqlServer->GetPrefix(),
pSqlServer->GetPrefix());
pSqlServer->PrepareStatement(aBuf); pSqlServer->PrepareStatement(aBuf);
pSqlServer->BindString(1, pData->m_Map); pSqlServer->BindString(1, pData->m_Map);
pSqlServer->BindString(2, pData->m_Map); pSqlServer->BindString(2, pData->m_Map);
pSqlServer->BindString(3, pData->m_Name); pSqlServer->BindString(3, pData->m_Map);
pSqlServer->BindString(4, pData->m_Name);
if(pSqlServer->Step()) if(pSqlServer->Step())
{ {
float Time = pSqlServer->GetFloat(3); float Time = pSqlServer->GetFloat(3);
str_time_float(Time, TIME_HOURS_CENTISECS, aBuf, sizeof(aBuf)); str_time_float(Time, TIME_HOURS_CENTISECS, aBuf, sizeof(aBuf));
int Rank = pSqlServer->GetInt(4); int Rank = pSqlServer->GetInt(4);
// CEIL and FLOOR are not supported in SQLite
int BetterThanPercent = std::floor(pSqlServer->GetFloat(5));
CTeamrank Teamrank; CTeamrank Teamrank;
Teamrank.NextSqlResult(pSqlServer); Teamrank.NextSqlResult(pSqlServer);
@ -766,14 +779,14 @@ bool CScore::ShowTeamRankThread(IDbConnection *pSqlServer, const ISqlData *pGame
if(g_Config.m_SvHideScore) if(g_Config.m_SvHideScore)
{ {
str_format(pResult->m_Data.m_aaMessages[0], sizeof(pResult->m_Data.m_aaMessages[0]), str_format(pResult->m_Data.m_aaMessages[0], sizeof(pResult->m_Data.m_aaMessages[0]),
"Your team time: %s", aBuf); "Your team time: %s, better than %d%%", aBuf, BetterThanPercent);
} }
else else
{ {
pResult->m_MessageKind = CScorePlayerResult::ALL; pResult->m_MessageKind = CScorePlayerResult::ALL;
str_format(pResult->m_Data.m_aaMessages[0], sizeof(pResult->m_Data.m_aaMessages[0]), str_format(pResult->m_Data.m_aaMessages[0], sizeof(pResult->m_Data.m_aaMessages[0]),
"%d. %s Team time: %s, requested by %s", "%d. %s Team time: %s, better than %d%%, requested by %s",
Rank, aFormattedNames, aBuf, pData->m_RequestingPlayer); Rank, aFormattedNames, aBuf, BetterThanPercent, pData->m_RequestingPlayer);
} }
} }
else else