Merge pull request #191 from diamante0018/t6/dump-leaderboard

feature: dump leaderboard definitions on T6

docs/SupportedAssetTypes.md

@@ -194,7 +194,7 @@ The following section specify which assets are supported to be dumped to disk (u
 | FxImpactTable          | ❌              | ❌              |                                                                                                                                                                |
 | RawFile                | ✅              | ✅              |                                                                                                                                                                |
 | StringTable            | ✅              | ✅              |                                                                                                                                                                |
-| LeaderboardDef         | ❌              | ❌              |                                                                                                                                                                |
+| LeaderboardDef         | ✅              | ❌              |                                                                                                                                                                |
 | XGlobals               | ❌              | ❌              |                                                                                                                                                                |
 | ddlRoot_t              | ❌              | ❌              |                                                                                                                                                                |
 | Glasses                | ❌              | ❌              |                                                                                                                                                                |

src/Common/Game/T6/T6_Assets.h

@@ -1946,7 +1946,22 @@ namespace T6
         LBUPDATE_TYPE_NORMAL = 0x0,
         LBUPDATE_TYPE_RANK = 0x1,
         LBUPDATE_TYPE_COMBINE = 0x2,
-        LBUPDATE_TYPE_COUNT = 0x3,
+
+        LBUPDATE_TYPE_COUNT
+    };
+
+    enum LbTrackType
+    {
+        TRK_ALLTIME = 0x0,
+        TRK_WEEKLY = 0x1,
+        TRK_MONTHLY = 0x2,
+        TRK_PRESTIGE_ALLTIME = 0x3,
+        TRK_PRESTIGE_WEEKLY = 0x4,
+        TRK_PRESTIGE_MONTHLY = 0x5,
+        TRK_DAILY = 0x6,
+        TRK_PRESTIGE_DAILY = 0x7,
+
+        TRK_COUNT
     };
 
     struct LeaderboardDef

src/ObjCommon/Game/T6/Leaderboard/JsonLeaderboardDef.h

@@ -0,0 +1,85 @@
+#pragma once
+
+#include "Game/T6/T6.h"
+
+#include "Json/JsonCommon.h"
+#include "Json/JsonExtension.h"
+#include <memory>
+#include <nlohmann/json.hpp>
+#include <optional>
+#include <string>
+#include <vector>
+
+namespace T6
+{
+    NLOHMANN_JSON_SERIALIZE_ENUM(LbColType,
+                                 {
+                                     {LBCOL_TYPE_NUMBER,    "number"   },
+                                     {LBCOL_TYPE_TIME,      "time"     },
+                                     {LBCOL_TYPE_LEVELXP,   "levelxp"  },
+                                     {LBCOL_TYPE_PRESTIGE,  "prestige" },
+                                     {LBCOL_TYPE_BIGNUMBER, "bignumber"},
+                                     {LBCOL_TYPE_PERCENT,   "percent"  },
+                                     {LBCOL_TYPE_TIME_FULL, "time_full"},
+    });
+
+    NLOHMANN_JSON_SERIALIZE_ENUM(LbAggType,
+                                 {
+                                     {LBAGG_TYPE_MIN,     "min"    },
+                                     {LBAGG_TYPE_MAX,     "max"    },
+                                     {LBAGG_TYPE_ADD,     "add"    },
+                                     {LBAGG_TYPE_REPLACE, "replace"},
+    });
+
+    NLOHMANN_JSON_SERIALIZE_ENUM(LbUpdateType,
+                                 {
+                                     {LBUPDATE_TYPE_NORMAL,  "normal" },
+                                     {LBUPDATE_TYPE_RANK,    "rank"   },
+                                     {LBUPDATE_TYPE_COMBINE, "combine"},
+    });
+
+    NLOHMANN_JSON_SERIALIZE_ENUM(LbTrackType,
+                                 {
+                                     {TRK_ALLTIME,          "ALLTIME"         },
+                                     {TRK_WEEKLY,           "WEEKLY"          },
+                                     {TRK_MONTHLY,          "MONTHLY"         },
+                                     {TRK_PRESTIGE_ALLTIME, "PRESTIGE_ALLTIME"},
+                                     {TRK_PRESTIGE_WEEKLY,  "PRESTIGE_WEEKLY" },
+                                     {TRK_PRESTIGE_MONTHLY, "PRESTIGE_MONTHLY"},
+                                     {TRK_DAILY,            "DAILY"           },
+                                     {TRK_PRESTIGE_DAILY,   "PRESTIGE_DAILY"  },
+    });
+
+    class JsonColumnDef
+    {
+    public:
+        std::string name;
+        int colId;
+        std::optional<int> dwColIndex;
+        std::optional<bool> hidden;
+        std::optional<std::string> statName;
+        LbColType type;
+        std::optional<int> precision;
+        LbAggType aggregationFunction;
+        std::optional<std::string> localization;
+        std::optional<int> uiCalColX;
+        std::optional<int> uiCalColY;
+    };
+
+    NLOHMANN_DEFINE_TYPE_EXTENSION(
+        JsonColumnDef, name, colId, dwColIndex, hidden, statName, type, precision, aggregationFunction, localization, uiCalColX, uiCalColY);
+
+    class JsonLeaderboardDef
+    {
+    public:
+        unsigned int id;
+        int dwColumnCount;
+        std::optional<int> xpColId;
+        std::optional<int> prestigeColId;
+        std::vector<JsonColumnDef> columns;
+        LbUpdateType updateType;
+        std::vector<LbTrackType> trackTypes;
+    };
+
+    NLOHMANN_DEFINE_TYPE_EXTENSION(JsonLeaderboardDef, id, dwColumnCount, xpColId, prestigeColId, columns, updateType, trackTypes);
+} // namespace T6

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperLeaderboardDef.cpp

@@ -0,0 +1,28 @@
+#include "AssetDumperLeaderboardDef.h"
+
+#include "Game/T6/Leaderboard/JsonLeaderboardDefWriter.h"
+
+#include <format>
+#include <ranges>
+
+using namespace T6;
+
+std::string AssetDumperLeaderboardDef::GetFileNameForAsset(const std::string& assetName)
+{
+    return std::format("leaderboards/{}.json", assetName);
+}
+
+bool AssetDumperLeaderboardDef::ShouldDump(XAssetInfo<LeaderboardDef>* asset)
+{
+    return true;
+}
+
+void AssetDumperLeaderboardDef::DumpAsset(AssetDumpingContext& context, XAssetInfo<LeaderboardDef>* asset)
+{
+    const auto assetFile = context.OpenAssetFile(GetFileNameForAsset(asset->m_name));
+
+    if (!assetFile)
+        return;
+
+    DumpLeaderboardDefAsJson(*assetFile, asset->Asset());
+}

src/ObjWriting/Game/T6/AssetDumpers/AssetDumperLeaderboardDef.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include "Dumping/AbstractAssetDumper.h"
+#include "Game/T6/T6.h"
+
+namespace T6
+{
+    class AssetDumperLeaderboardDef final : public AbstractAssetDumper<LeaderboardDef>
+    {
+        static std::string GetFileNameForAsset(const std::string& assetName);
+
+    protected:
+        _NODISCARD bool ShouldDump(XAssetInfo<LeaderboardDef>* asset) override;
+        void DumpAsset(AssetDumpingContext& context, XAssetInfo<LeaderboardDef>* asset) override;
+    };
+} // namespace T6

src/ObjWriting/Game/T6/Leaderboard/JsonLeaderboardDefWriter.cpp

@@ -0,0 +1,103 @@
+#include "JsonLeaderboardDefWriter.h"
+
+#include "Game/T6/CommonT6.h"
+#include "Game/T6/Leaderboard/JsonLeaderboardDef.h"
+
+#include <iomanip>
+#include <nlohmann/json.hpp>
+
+using namespace nlohmann;
+using namespace T6;
+
+namespace
+{
+    class JsonDumper
+    {
+    public:
+        explicit JsonDumper(std::ostream& stream)
+            : m_stream(stream)
+        {
+        }
+
+        void Dump(const LeaderboardDef* leaderboardDef) const
+        {
+            JsonLeaderboardDef jsonLeaderboardDef;
+            CreateJsonLeaderboardDef(jsonLeaderboardDef, *leaderboardDef);
+
+            json jRoot = jsonLeaderboardDef;
+
+            jRoot["_type"] = "leaderboard";
+            jRoot["_version"] = 1;
+
+            m_stream << std::setw(4) << jRoot << "\n";
+        }
+
+    private:
+        static void CreateJsonColumnDef(JsonColumnDef& jColumnDef, const LbColumnDef& lbColumnDef)
+        {
+            jColumnDef.name = lbColumnDef.name;
+            jColumnDef.colId = lbColumnDef.colId;
+
+            if (lbColumnDef.dwColIndex >= 0)
+                jColumnDef.dwColIndex = lbColumnDef.dwColIndex;
+
+            if (lbColumnDef.hidden)
+                jColumnDef.hidden = lbColumnDef.hidden;
+
+            if (lbColumnDef.statName && lbColumnDef.statName[0])
+                jColumnDef.statName = lbColumnDef.statName;
+
+            jColumnDef.type = lbColumnDef.type;
+
+            if (lbColumnDef.precision != 0)
+                jColumnDef.precision = lbColumnDef.precision;
+
+            jColumnDef.aggregationFunction = lbColumnDef.agg;
+
+            if (lbColumnDef.localization && lbColumnDef.localization[0])
+                jColumnDef.localization = lbColumnDef.localization;
+
+            if (lbColumnDef.uiCalColX != 0 || lbColumnDef.uiCalColY != 0)
+            {
+                jColumnDef.uiCalColX = lbColumnDef.uiCalColX;
+                jColumnDef.uiCalColY = lbColumnDef.uiCalColY;
+            }
+        }
+
+        static void CreateJsonLeaderboardDef(JsonLeaderboardDef& jLeaderboardDef, const LeaderboardDef& leaderboardDef)
+        {
+            jLeaderboardDef.id = leaderboardDef.id;
+            jLeaderboardDef.dwColumnCount = leaderboardDef.dwColumnCount;
+
+            if (leaderboardDef.xpColId >= 0)
+                jLeaderboardDef.xpColId = leaderboardDef.xpColId;
+            if (leaderboardDef.prestigeColId >= 0)
+                jLeaderboardDef.prestigeColId = leaderboardDef.prestigeColId;
+
+            jLeaderboardDef.columns.resize(leaderboardDef.columnCount);
+            for (auto i = 0; i < leaderboardDef.columnCount; ++i)
+                CreateJsonColumnDef(jLeaderboardDef.columns[i], leaderboardDef.columns[i]);
+
+            jLeaderboardDef.updateType = leaderboardDef.updateType;
+
+            for (auto i = 0; i < TRK_COUNT; ++i)
+            {
+                const auto trackTypeMask = 1 << i;
+
+                if (leaderboardDef.trackTypes & trackTypeMask)
+                    jLeaderboardDef.trackTypes.emplace_back(static_cast<LbTrackType>(i));
+            }
+        }
+
+        std::ostream& m_stream;
+    };
+} // namespace
+
+namespace T6
+{
+    void DumpLeaderboardDefAsJson(std::ostream& stream, const LeaderboardDef* leaderboardDef)
+    {
+        JsonDumper dumper(stream);
+        dumper.Dump(leaderboardDef);
+    }
+} // namespace T6

src/ObjWriting/Game/T6/Leaderboard/JsonLeaderboardDefWriter.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#include "Dumping/AssetDumpingContext.h"
+#include "Game/T6/T6.h"
+
+#include <ostream>
+
+namespace T6
+{
+    void DumpLeaderboardDefAsJson(std::ostream& stream, const LeaderboardDef* leaderboardDef);
+} // namespace T6

src/ObjWriting/Game/T6/ZoneDumperT6.cpp

@@ -2,6 +2,7 @@
 
 #include "AssetDumpers/AssetDumperFontIcon.h"
 #include "AssetDumpers/AssetDumperGfxImage.h"
+#include "AssetDumpers/AssetDumperLeaderboardDef.h"
 #include "AssetDumpers/AssetDumperLocalizeEntry.h"
 #include "AssetDumpers/AssetDumperMaterial.h"
 #include "AssetDumpers/AssetDumperPhysConstraints.h"
@@ -75,7 +76,7 @@ bool ZoneDumper::DumpZone(AssetDumpingContext& context) const
     // DUMP_ASSET_POOL(AssetDumperFxImpactTable, m_fx_impact_table, ASSET_TYPE_IMPACT_FX)
     DUMP_ASSET_POOL(AssetDumperRawFile, m_raw_file, ASSET_TYPE_RAWFILE)
     DUMP_ASSET_POOL(AssetDumperStringTable, m_string_table, ASSET_TYPE_STRINGTABLE)
-    // DUMP_ASSET_POOL(AssetDumperLeaderboardDef, m_leaderboard, ASSET_TYPE_LEADERBOARD)
+    DUMP_ASSET_POOL(AssetDumperLeaderboardDef, m_leaderboard, ASSET_TYPE_LEADERBOARD)
     // DUMP_ASSET_POOL(AssetDumperXGlobals, m_xglobals, ASSET_TYPE_XGLOBALS)
     // DUMP_ASSET_POOL(AssetDumperDDLRoot, m_ddl, ASSET_TYPE_DDL)
     // DUMP_ASSET_POOL(AssetDumperGlasses, m_glasses, ASSET_TYPE_GLASSES)