OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2026-03-28 23:50:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Original Racing Scores Functionality (#257)

Browse Source
This commit is contained in:
FinnHornhoover
2023-07-24 00:33:19 +03:00
committed by dongresource
parent 38c68f351b
commit cd265af8e0
4 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/TableData.cpp
View File

@@ -375,7 +375,7 @@ static void loadPaths(json& pathData, int32_t* nextId) {
Transport::NPCPaths.push_back(pathTemplate);
}
std::cout << "[INFO] Loaded " << Transport::NPCPaths.size() << " NPC paths" << std::endl;
}
catch (const std::exception& err) {
std::cerr << "[FATAL] Malformed paths.json file! Reason:" << err.what() << std::endl;
@@ -584,8 +584,17 @@ static void loadDrops(json& dropData) {
continue;
}
// time limit isn't stored in the XDT, so we include it in the reward table instead
Racing::EPData[EPMap].maxTime = race["TimeLimit"];
EPInfo& epInfo = Racing::EPData[EPMap];
// max score is specified in the XDT, but can be updated if specified in the drops JSON
epInfo.maxScore = (int)race["ScoreCap"];
// time limit and total pods are not stored in the XDT, so we include it in the drops JSON
epInfo.maxTime = (int)race["TimeLimit"];
epInfo.maxPods = (int)race["TotalPods"];
// IZ-specific calculated constants included in the drops JSON
epInfo.scaleFactor = (double)race["ScaleFactor"];
epInfo.podFactor = (double)race["PodFactor"];
epInfo.timeFactor = (double)race["TimeFactor"];
// score cutoffs
std::vector<int> rankScores;
@@ -686,7 +695,7 @@ static void loadEggs(json& eggData, int32_t* nextId) {
}
}
/*
/*
* Load gruntwork output, if it exists
*/
static void loadGruntworkPre(json& gruntwork, int32_t* nextId) {
@@ -1361,7 +1370,7 @@ void TableData::flush() {
targetIDs.push_back(tID);
for (int32_t tType : path.targetTypes)
targetTypes.push_back(tType);
pathObj["iBaseSpeed"] = path.speed;
pathObj["iTaskID"] = path.escortTaskID;
pathObj["bRelative"] = path.isRelative;