commented out default config value

Co-authored-by: Gent Semaj <gsemaj@proton.me>

.vscode/launch.json

@@ -0,0 +1,26 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Debug (Linux)",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/bin/fusion",
+            "cwd": "${workspaceFolder}"
+        },
+        {
+            "name": "Debug (Windows)",
+            "type": "cppvsdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/bin/Debug/winfusion.exe",
+            "cwd": "${workspaceFolder}"
+        },
+        {
+            "name": "Release (Windows)",
+            "type": "cppvsdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/bin/Release/winfusion.exe",
+            "cwd": "${workspaceFolder}"
+        }
+    ]
+}

CMakeLists.txt

@@ -44,7 +44,7 @@ add_executable(openfusion ${SOURCES})
 set_target_properties(openfusion PROPERTIES OUTPUT_NAME ${BIN_NAME})
 
 # find sqlite3 and use it
-find_package(sqlite3 REQUIRED)
+find_package(SQLite3 REQUIRED)
 target_include_directories(openfusion PRIVATE ${SQLite3_INCLUDE_DIRS})
 target_link_libraries(openfusion PRIVATE ${SQLite3_LIBRARIES})
 
@@ -56,5 +56,5 @@ set_property(TARGET openfusion PROPERTY VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_S
 # It's not something you should do, but it's there if you need it...
 if (NOT CMAKE_GENERATOR MATCHES "Visual Studio" AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND NOT CMAKE_GENERATOR MATCHES "MinGW Makefiles")
 	find_package(Threads REQUIRED)
-	target_link_libraries(openfusion pthread)
+	target_link_libraries(openfusion PRIVATE pthread)
 endif()

Dockerfile

@@ -0,0 +1,21 @@
+FROM debian:latest
+
+WORKDIR /usr/src/app
+
+RUN apt-get -y update && apt-get install -y \
+git \
+clang \
+make \
+libsqlite3-dev
+
+COPY . ./
+
+RUN make -j8
+
+# tabledata should be copied from the host;
+# clone it there before building the container
+#RUN git submodule update --init --recursive
+
+CMD ["./bin/fusion"]
+
+LABEL Name=openfusion Version=0.0.1

config.ini

@@ -51,6 +51,11 @@ motd=Welcome to OpenFusion!
 # and pre-Academy builds must *not* contain it.
 #enabledpatches=1013
 
+# Use Original FusionFall's racing score and reward calculation?
+# Set false to use Retro's calculation, make sure you have the correct
+# patch(es) loaded.
+#ogracingscores=true
+
 # xdt json filename
 #xdtdata=xdt.json
 # NPC json filename

docker-compose.yml

@@ -0,0 +1,12 @@
+version: '3.4'
+
+services:
+  openfusion:
+    image: openfusion
+    build:
+      context: .
+      dockerfile: ./Dockerfile
+    ports:
+      - "23000:23000"
+      - "23001:23001"
+      - "8003:8003"

src/Racing.cpp

@@ -97,31 +97,43 @@ static void racingEnd(CNSocket* sock, CNPacketData* data) {
     if (EPData.find(mapNum) == EPData.end() || EPData[mapNum].EPID == 0)
         return; // IZ not found
 
-    uint64_t now = getTime() / 1000;
+    EPInfo& epInfo = EPData[mapNum];
+    EPRace& epRace = EPRaces[sock];
 
-    int timeDiff = now - EPRaces[sock].startTime;
+    uint64_t now = getTime() / 1000;
-    int score = 500 * EPRaces[sock].collectedRings.size() - 10 * timeDiff;
+    int timeDiff = now - epRace.startTime;
-    if (score < 0) score = 0; // lol
+    int podsCollected = epRace.collectedRings.size();
-    int fm = score * plr->level * (1.0f / 36) * 0.3f;
+    int score = 0, fm = 0;
+
+    if (settings::OGRACINGSCORES) {
+        score = std::min(epInfo.maxScore, (int)std::exp(
+            (epInfo.podFactor * podsCollected) / epInfo.maxPods
+            - (epInfo.timeFactor * timeDiff) / epInfo.maxTime
+            + epInfo.scaleFactor));
+        fm = (1.0 + std::exp(epInfo.scaleFactor - 1.0) * epInfo.podFactor * podsCollected) / epInfo.maxPods;
+    } else {
+        score = std::max(0, 500 * podsCollected - 10 * timeDiff);
+        fm = score * plr->level * (1.0f / 36) * 0.3f;
+    }
 
     // we submit the ranking first...
     Database::RaceRanking postRanking = {};
-    postRanking.EPID = EPData[mapNum].EPID;
+    postRanking.EPID = epInfo.EPID;
     postRanking.PlayerID = plr->iID;
-    postRanking.RingCount = EPRaces[sock].collectedRings.size();
+    postRanking.RingCount = podsCollected;
     postRanking.Score = score;
     postRanking.Time = timeDiff;
     postRanking.Timestamp = getTimestamp();
     Database::postRaceRanking(postRanking);
 
     // ...then we get the top ranking, which may or may not be what we just submitted
-    Database::RaceRanking topRankingPlayer = Database::getTopRaceRanking(EPData[mapNum].EPID, plr->iID);
+    Database::RaceRanking topRankingPlayer = Database::getTopRaceRanking(epInfo.EPID, plr->iID);
 
     INITSTRUCT(sP_FE2CL_REP_EP_RACE_END_SUCC, resp);
 
     // get rank scores and rewards
-    std::vector<int>* rankScores = &EPRewards[EPData[mapNum].EPID].first;
+    std::vector<int>* rankScores = &EPRewards[epInfo.EPID].first;
-    std::vector<int>* rankRewards = &EPRewards[EPData[mapNum].EPID].second;
+    std::vector<int>* rankRewards = &EPRewards[epInfo.EPID].second;
 
     // top ranking
     int topRank = 0;

src/Racing.hpp

@@ -5,7 +5,11 @@
 #include "servers/CNShardServer.hpp"
 
 struct EPInfo {
-    int zoneX, zoneY, EPID, maxScore, maxTime;
+    // available through XDT (maxScore may be updated by drops)
+    int zoneX, zoneY, EPID, maxScore;
+    // (maybe) available through drops
+    int maxTime = 0, maxPods = 0;
+    double scaleFactor = 0.0, podFactor = 0.0, timeFactor = 0.0;
 };
 
 struct EPRace {

src/TableData.cpp

@@ -572,8 +572,19 @@ static void loadDrops(json& dropData) {
                 continue;
             }
 
+            EPInfo& epInfo = Racing::EPData[EPMap];
+
             // time limit isn't stored in the XDT, so we include it in the reward table instead
-            Racing::EPData[EPMap].maxTime = race["TimeLimit"];
+            epInfo.maxTime = (int)race["TimeLimit"];
+
+            // the following has to be present based on the score calculation method
+            if (settings::OGRACINGSCORES) {
+                epInfo.maxScore = (int)race["ScoreCap"];
+                epInfo.maxPods = (int)race["TotalPods"];
+                epInfo.scaleFactor = (double)race["ScaleFactor"];
+                epInfo.podFactor = (double)race["PodFactor"];
+                epInfo.timeFactor = (double)race["TimeFactor"];
+            }
 
             // score cutoffs
             std::vector<int> rankScores;

src/settings.cpp

@@ -66,6 +66,9 @@ int settings::MONITORINTERVAL = 5000;
 // event mode settings
 int settings::EVENTMODE = 0;
 
+// racing score mode
+bool settings::OGRACINGSCORES = true;
+
 void settings::init() {
     INIReader reader("config.ini");
 
@@ -110,6 +113,7 @@ void settings::init() {
     EVENTMODE = reader.GetInteger("shard", "eventmode", EVENTMODE);
     DISABLEFIRSTUSEFLAG = reader.GetBoolean("shard", "disablefirstuseflag", DISABLEFIRSTUSEFLAG);
     ANTICHEAT = reader.GetBoolean("shard", "anticheat", ANTICHEAT);
+    OGRACINGSCORES = reader.GetBoolean("shard", "ogracingscores", OGRACINGSCORES);
     MONITORENABLED = reader.GetBoolean("monitor", "enabled", MONITORENABLED);
     MONITORPORT = reader.GetInteger("monitor", "port", MONITORPORT);
     MONITORINTERVAL = reader.GetInteger("monitor", "interval", MONITORINTERVAL);

src/settings.hpp

@@ -36,6 +36,7 @@ namespace settings {
     extern int MONITORPORT;
     extern int MONITORINTERVAL;
     extern bool DISABLEFIRSTUSEFLAG;
+    extern bool OGRACINGSCORES;
 
     void init();
 }