add gores and race distinction for cotd sql database

Author: JSaurusRex

src/engine/server/databases/connection.cpp

@@ -91,25 +91,25 @@ void IDbConnection::FormatCreatePoints(char *aBuf, unsigned int BufferSize) cons
 		GetPrefix(), MAX_NAME_LENGTH_SQL, BinaryCollate());
 }
 
-void IDbConnection::FormatCreateCOTD_Points(char *aBuf, unsigned int BufferSize) const
+void IDbConnection::FormatCreateCOTD_Points(char *aBuf, unsigned int BufferSize, const char * mode) const
 {
 	str_format(aBuf, BufferSize,
-		"CREATE TABLE IF NOT EXISTS %s_cotd_points ("
+		"CREATE TABLE IF NOT EXISTS %s_cotd_points_%s ("
 		"  Name VARCHAR(%d) COLLATE %s NOT NULL, "
 		"  Points INT DEFAULT 0, "
 		"  PRIMARY KEY (Name)"
 		")",
-		GetPrefix(), MAX_NAME_LENGTH_SQL, BinaryCollate());
+		GetPrefix(), mode, MAX_NAME_LENGTH_SQL, BinaryCollate());
 }
 
-void IDbConnection::FormatCreateCOTD_Ranks(char *aBuf, unsigned int BufferSize) const
+void IDbConnection::FormatCreateCOTD_Ranks(char *aBuf, unsigned int BufferSize, const char * mode) const
 {
 	str_format(aBuf, BufferSize,
-		"CREATE TABLE IF NOT EXISTS %s_cotd_ranks ("
+		"CREATE TABLE IF NOT EXISTS %s_cotd_ranks_%s ("
 		"  Name VARCHAR(%d) COLLATE %s NOT NULL, "
 		"  Map VARCHAR(128) COLLATE %s NOT NULL, "
 		"  Rank INT DEFAULT 0, "
 		"  PRIMARY KEY (Name)"
 		")",
-		GetPrefix(), MAX_NAME_LENGTH_SQL, BinaryCollate(), BinaryCollate());
+		GetPrefix(), mode, MAX_NAME_LENGTH_SQL, BinaryCollate(), BinaryCollate());
 }

src/engine/server/databases/connection.h

@@ -98,8 +98,8 @@ class IDbConnection
 	void FormatCreateMaps(char *aBuf, unsigned int BufferSize) const;
 	void FormatCreateSaves(char *aBuf, unsigned int BufferSize, bool Backup) const;
 	void FormatCreatePoints(char *aBuf, unsigned int BufferSize) const;
-	void FormatCreateCOTD_Points(char *aBuf, unsigned int BufferSize) const;
-	void FormatCreateCOTD_Ranks(char *aBuf, unsigned int BufferSize) const;
+	void FormatCreateCOTD_Points(char *aBuf, unsigned int BufferSize, const char * mode) const;
+	void FormatCreateCOTD_Ranks(char *aBuf, unsigned int BufferSize, const char * mode) const;
 };
 
 bool MysqlAvailable();

src/engine/server/databases/sqlite.cpp

@@ -4,6 +4,7 @@
 
 #include <base/math.h>
 #include <engine/console.h>
+#include <engine/shared/config.h>
 
 #include <atomic>
 
@@ -166,12 +167,20 @@ bool CSqliteConnection::ConnectImpl(char *pError, int ErrorSize)
 		FormatCreatePoints(aBuf, sizeof(aBuf));
 		if(Execute(aBuf, pError, ErrorSize))
 			return true;
+				
+		FormatCreateCOTD_Points(aBuf, sizeof(aBuf), "race");
+		if(Execute(aBuf, pError, ErrorSize))
+			return true;
+		
+		FormatCreateCOTD_Points(aBuf, sizeof(aBuf), "gores");
+		if(Execute(aBuf, pError, ErrorSize))
+			return true;
 
-		FormatCreateCOTD_Points(aBuf, sizeof(aBuf));
+		FormatCreateCOTD_Ranks(aBuf, sizeof(aBuf), "race");
 		if(Execute(aBuf, pError, ErrorSize))
 			return true;
 
-		FormatCreateCOTD_Ranks(aBuf, sizeof(aBuf));
+		FormatCreateCOTD_Ranks(aBuf, sizeof(aBuf), "gores");
 		if(Execute(aBuf, pError, ErrorSize))
 			return true;
 
@@ -425,10 +434,10 @@ bool CSqliteConnection::AddPoints_COTD(const char *pPlayer, int Points, char *pE
 {
 	char aBuf[512];
 	str_format(aBuf, sizeof(aBuf),
-		"INSERT INTO %s_cotd_points(Name, Points) "
+		"INSERT INTO %s_cotd_points_%s(Name, Points) "
 		"VALUES (?, ?) "
 		"ON CONFLICT(Name) DO UPDATE SET Points=Points+?",
-		GetPrefix());
+		GetPrefix(), g_Config.m_SvKoMode == 0 ? "gores" : "race");
 	if(PrepareStatement(aBuf, pError, ErrorSize))
 	{
 		return true;

src/engine/shared/config_variables.h

@@ -660,6 +660,7 @@ MACRO_CONFIG_INT(SvKoPublicChat, sv_ko_public_chat, 0, 0, 1, CFGFLAG_SERVER, "ma
 MACRO_CONFIG_INT(SvKoBo3, sv_ko_bo3, 0, 0, 5, CFGFLAG_SERVER, "Best of X wins (KO GAME)")
 MACRO_CONFIG_INT(SvForcePredictionMargin, sv_force_prediction_margin, 0, 0, 200, CFGFLAG_SERVER, "force players to have a higher prediction margin for more consistant gameplay")
 MACRO_CONFIG_INT(SvKoSQL, sv_ko_sql, 0, 0, 1, CFGFLAG_SERVER, "Save result of cup of the day in database")
+MACRO_CONFIG_INT(SvKoMode, sv_ko_mode, 0, 0, 1, CFGFLAG_SERVER, "Cup of the day Mode: 0 = gores, 1 = race")
 
 
 MACRO_CONFIG_STR(SvRoundStatsDiscordWebhooks, sv_round_stats_discord_webhooks, 512, "", CFGFLAG_SERVER, "If set will post score stats there on round end. Is JSON")

src/game/server/scoreworker.cpp

@@ -828,8 +828,8 @@ bool CScoreWorker::SaveCOTD_Points(IDbConnection *pSqlServer, const ISqlData *pG
 	if(w == Write::NORMAL)
 	{
 		str_format(aBuf, sizeof(aBuf),
-			"SELECT COUNT(*) AS COTD_FINISH FROM %s_cotd_ranks WHERE Map=? AND Name=? ORDER BY Rank ASC LIMIT 1",
-			pSqlServer->GetPrefix());
+			"SELECT COUNT(*) AS COTD_FINISH FROM %s_cotd_ranks_%s WHERE Map=? AND Name=? ORDER BY Rank ASC LIMIT 1",
+			pSqlServer->GetPrefix(), g_Config.m_SvKoMode == 0 ? "gores" : "race");
 		if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
 		{
 			return true;
@@ -846,8 +846,8 @@ bool CScoreWorker::SaveCOTD_Points(IDbConnection *pSqlServer, const ISqlData *pG
 		if(NumFinished == 0)
 		{
 			str_format(aBuf, sizeof(aBuf),
-			"INSERT INTO %s_cotd_ranks(Name, Map, Rank) VALUES(?, ?, %i)",
-			pSqlServer->GetPrefix(), pData->m_Rank);
+			"INSERT INTO %s_cotd_ranks_%s(Name, Map, Rank) VALUES(?, ?, %i)",
+			pSqlServer->GetPrefix(), g_Config.m_SvKoMode == 0 ? "gores" : "race", pData->m_Rank);
 
 			if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
 			{
@@ -881,11 +881,13 @@ bool CScoreWorker::ShowCOTD_Points(IDbConnection *pSqlServer, const ISqlData *pG
 	char aBuf[512];
 	str_format(aBuf, sizeof(aBuf),
 		"SELECT ("
-		"  SELECT COUNT(Name) + 1 FROM %s_cotd_points WHERE Points > ("
-		"    SELECT Points FROM %s_cotd_points WHERE Name = ?"
+		"  SELECT COUNT(Name) + 1 FROM %s_cotd_points_%s WHERE Points > ("
+		"    SELECT Points FROM %s_cotd_points_%s WHERE Name = ?"
 		")) as Ranking, Points, Name "
-		"FROM %s_cotd_points WHERE Name = ?",
-		pSqlServer->GetPrefix(), pSqlServer->GetPrefix(), pSqlServer->GetPrefix());
+		"FROM %s_cotd_points_%s WHERE Name = ?",
+		pSqlServer->GetPrefix(), g_Config.m_SvKoMode == 0 ? "gores" : "race", pSqlServer->GetPrefix(),
+		g_Config.m_SvKoMode == 0 ? "gores" : "race", pSqlServer->GetPrefix(), g_Config.m_SvKoMode == 0 ? "gores" : "race");
+	
 	if(pSqlServer->PrepareStatement(aBuf, pError, ErrorSize))
 	{
 		return true;
@@ -906,13 +908,13 @@ bool CScoreWorker::ShowCOTD_Points(IDbConnection *pSqlServer, const ISqlData *pG
 		pSqlServer->GetString(3, aName, sizeof(aName));
 		pResult->m_MessageKind = CScorePlayerResult::ALL;
 		str_format(paMessages[0], sizeof(paMessages[0]),
-			"%d. %s COTD Points: %d, requested by %s",
-			Rank, aName, Count, pData->m_aRequestingPlayer);
+			"%d. %s COTD %s Points: %d, requested by %s",
+			Rank, aName, g_Config.m_SvKoMode == 0 ? "gores" : "race", Count, pData->m_aRequestingPlayer);
 	}
 	else
 	{
 		str_format(paMessages[0], sizeof(paMessages[0]),
-			"%s has not collected any cotd points so far", pData->m_aName);
+			"%s has not collected any cotd %s points so far", pData->m_aName, g_Config.m_SvKoMode == 0 ? "gores" : "race");
 	}
 	return false;
 }