From b9013149f3af7c31f3058ccab2b395a5ed8f0237 Mon Sep 17 00:00:00 2001
From: Gent S <gentsemaj@live.com>
Date: Mon, 14 Dec 2020 16:59:34 -0500
Subject: [PATCH] Racing cleanup

---
 src/Database.cpp      | 32 ++++++++++++++++++--------------
 src/Database.hpp      |  2 +-
 src/RacingManager.cpp | 19 ++++++++++++-------
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/Database.cpp b/src/Database.cpp
index eda0e8e..e8e7870 100644
--- a/src/Database.cpp
+++ b/src/Database.cpp
@@ -1758,25 +1758,29 @@ bool Database::sendEmail(EmailData* data, std::vector<sItemBase> attachments) {
     return true;
 }
 
-Database::RaceRanking Database::getTopRaceRanking(int epID) {
+Database::RaceRanking Database::getTopRaceRanking(int epID, int playerID) {
     std::lock_guard<std::mutex> lock(dbCrit);
-    const char* sql = R"(
+    std::string sql(R"(
         SELECT
-            "EPID",
-            "PlayerID",
-            "Score",
-            "RingCount",
-            "Time",
-            "Timestamp"
-        FROM "RaceResults"
-        WHERE "EPID" = ?
-        ORDER BY "Score" DESC
+            EPID, PlayerID, Score, RingCount, Time, Timestamp
+        FROM RaceResults
+        WHERE EPID = ?
+        )");
+
+    if (playerID > -1)
+        sql += " AND PlayerID = ? ";
+
+    sql += R"(
+        ORDER BY Score DESC
         LIMIT 1;
         )";
+
     sqlite3_stmt* stmt;
 
-    sqlite3_prepare_v2(db, sql, -1, &stmt, NULL);
+    sqlite3_prepare_v2(db, sql.c_str(), -1, &stmt, NULL);
     sqlite3_bind_int(stmt, 1, epID);
+    if(playerID > -1)
+        sqlite3_bind_int(stmt, 2, playerID);
 
     Database::RaceRanking ranking = {};
     if (sqlite3_step(stmt) != SQLITE_ROW) {
@@ -1802,8 +1806,8 @@ void Database::postRaceRanking(Database::RaceRanking ranking) {
     std::lock_guard<std::mutex> lock(dbCrit);
 
     const char* sql = R"(
-        INSERT INTO "RaceResults" 
-            ("EPID", "PlayerID", "Score", "RingCount", "Time", "Timestamp")
+        INSERT INTO RaceResults
+            (EPID, PlayerID, Score, RingCount, Time, Timestamp)
         VALUES(?, ?, ?, ?, ?, ?);
         )";
     sqlite3_stmt* stmt;
diff --git a/src/Database.hpp b/src/Database.hpp
index 03eade7..a86eb5c 100644
--- a/src/Database.hpp
+++ b/src/Database.hpp
@@ -98,6 +98,6 @@ namespace Database {
     bool sendEmail(EmailData* data, std::vector<sItemBase> attachments);
 
     // racing
-    RaceRanking getTopRaceRanking(int epID);
+    RaceRanking getTopRaceRanking(int epID, int playerID);
     void postRaceRanking(RaceRanking ranking);
 }
diff --git a/src/RacingManager.cpp b/src/RacingManager.cpp
index d84bd94..e60e505 100644
--- a/src/RacingManager.cpp
+++ b/src/RacingManager.cpp
@@ -87,7 +87,8 @@ void RacingManager::racingEnd(CNSocket* sock, CNPacketData* data) {
 
 	int timeDiff = now - EPRaces[sock].startTime;
 	int score = 500 * EPRaces[sock].ringCount - 10 * timeDiff;
-	int fm = score * plr->level * (1.0f / 36) * (1.0f / 3);
+	if (score < 0) score = 0; // lol
+	int fm = score * plr->level * (1.0f / 36) * 0.3f;
 
 	// we submit the ranking first...
 	Database::RaceRanking postRanking = {};
@@ -100,17 +101,21 @@ void RacingManager::racingEnd(CNSocket* sock, CNPacketData* data) {
 	Database::postRaceRanking(postRanking);
 
 	// ...then we get the top ranking, which may or may not be what we just submitted
-	Database::RaceRanking topRanking = Database::getTopRaceRanking(EPData[mapNum].EPID);
+	Database::RaceRanking topRankingGlobal = Database::getTopRaceRanking(EPData[mapNum].EPID, -1);
+	Database::RaceRanking topRankingPlayer = Database::getTopRaceRanking(EPData[mapNum].EPID, plr->iID);
 
 	INITSTRUCT(sP_FE2CL_REP_EP_RACE_END_SUCC, resp);
 
-	resp.iEPTopRank = 5; // top score is always 5 stars, since we're doing it relative to first place
-	resp.iEPTopRingCount = topRanking.RingCount;
-	resp.iEPTopScore = topRanking.Score;
-	resp.iEPTopTime = topRanking.Time;
+	resp.iEPTopRank = 1; // top score is always 5 stars, since we're doing it relative to first place
+	resp.iEPTopRingCount = topRankingPlayer.RingCount;
+	resp.iEPTopScore = topRankingPlayer.Score;
+	resp.iEPTopTime = topRankingPlayer.Time;
 	
 	resp.iEPRaceMode = EPRaces[sock].mode;
-	resp.iEPRank = (int)ceil((5.0 * score) / topRanking.Score); // [1, 5] out of 5, relative to top score
+	if (topRankingGlobal.Score == 0)
+		resp.iEPRank = 5; // don't divide by zero, just give them the single star they deserve
+	else
+		resp.iEPRank = 5 - ((score * 4.0) / topRankingGlobal.Score); // 5 - [0, 4] = [5, 1]
 	resp.iEPRingCnt = postRanking.RingCount;
 	resp.iEPScore = postRanking.Score;
 	resp.iEPRaceTime = postRanking.Time;