fix: packets 0x87 (Trappers vs forge)

src/client/game.h

@@ -560,6 +560,28 @@ struct CyclopediaCharacterMiscStats
     std::vector<Concoction> concoctions;
 };
 
+struct ForgeItemInfo
+{
+    uint16_t id{ 0 };
+    uint8_t tier{ 0 };
+    uint16_t count{ 0 };
+};
+
+struct ForgeTransferData
+{
+    std::vector<ForgeItemInfo> donors;
+    std::vector<ForgeItemInfo> receivers;
+};
+
+struct ForgeOpenData
+{
+    std::vector<ForgeItemInfo> fusionItems;
+    std::vector<std::vector<ForgeItemInfo>> convergenceFusion;
+    std::vector<ForgeTransferData> transfers;
+    std::vector<ForgeTransferData> convergenceTransfers;
+    uint16_t dustLevel{ 0 };
+};
+
 //@bindsingleton g_game
 class Game
 {

src/client/luavaluecasts_client.cpp

@@ -1530,3 +1530,72 @@ int push_luavalue(const CyclopediaCharacterMiscStats& data)
 
     return 1;
 }
+
+int push_luavalue(const ForgeItemInfo& item) {
+    g_lua.createTable(0, 3);
+    g_lua.pushInteger(item.id);
+    g_lua.setField("id");
+    g_lua.pushInteger(item.tier);
+    g_lua.setField("tier");
+    g_lua.pushInteger(item.count);
+    g_lua.setField("count");
+    return 1;
+}
+
+int push_luavalue(const ForgeTransferData& data) {
+    g_lua.createTable(0, 2);
+    g_lua.createTable(data.donors.size(), 0);
+    for (size_t i = 0; i < data.donors.size(); ++i) {
+        push_luavalue(data.donors[i]);
+        g_lua.rawSeti(i + 1);
+    }
+    g_lua.setField("donors");
+
+    g_lua.createTable(data.receivers.size(), 0);
+    for (size_t i = 0; i < data.receivers.size(); ++i) {
+        push_luavalue(data.receivers[i]);
+        g_lua.rawSeti(i + 1);
+    }
+    g_lua.setField("receivers");
+    return 1;
+}
+
+int push_luavalue(const ForgeOpenData& data) {
+    g_lua.createTable(0, 5);
+
+    g_lua.createTable(data.fusionItems.size(), 0);
+    for (size_t i = 0; i < data.fusionItems.size(); ++i) {
+        push_luavalue(data.fusionItems[i]);
+        g_lua.rawSeti(i + 1);
+    }
+    g_lua.setField("fusionItems");
+
+    g_lua.createTable(data.convergenceFusion.size(), 0);
+    for (size_t i = 0; i < data.convergenceFusion.size(); ++i) {
+        g_lua.createTable(data.convergenceFusion[i].size(), 0);
+        for (size_t j = 0; j < data.convergenceFusion[i].size(); ++j) {
+            push_luavalue(data.convergenceFusion[i][j]);
+            g_lua.rawSeti(j + 1);
+        }
+        g_lua.rawSeti(i + 1);
+    }
+    g_lua.setField("convergenceFusion");
+
+    g_lua.createTable(data.transfers.size(), 0);
+    for (size_t i = 0; i < data.transfers.size(); ++i) {
+        push_luavalue(data.transfers[i]);
+        g_lua.rawSeti(i + 1);
+    }
+    g_lua.setField("transfers");
+
+    g_lua.createTable(data.convergenceTransfers.size(), 0);
+    for (size_t i = 0; i < data.convergenceTransfers.size(); ++i) {
+        push_luavalue(data.convergenceTransfers[i]);
+        g_lua.rawSeti(i + 1);
+    }
+    g_lua.setField("convergenceTransfers");
+
+    g_lua.pushInteger(data.dustLevel);
+    g_lua.setField("dustLevel");
+    return 1;
+}

src/client/luavaluecasts_client.h

@@ -101,3 +101,8 @@ int push_luavalue(const DailyRewardItem& item);
 int push_luavalue(const DailyRewardBundle& bundle);
 int push_luavalue(const DailyRewardDay& day);
 int push_luavalue(const DailyRewardData& data);
+
+// forge
+int push_luavalue(const ForgeOpenData& data);
+int push_luavalue(const ForgeTransferData& data);
+int push_luavalue(const ForgeItemInfo& data);

src/client/protocolcodes.h

@@ -117,8 +117,10 @@ namespace Proto
         GameServerTextEffect = 132,
         GameServerMissleEffect = 133, // Anthem on 13.x
         GameServerItemClasses = 134,
-        GameServerTrappers = 135,
+        GameServerTrappers = 135, // GameServerOpenForge = 135,
+        GameServerBrowseForgeHistory = 136,
         GameServerCloseForgeWindow = 137,
+        GameServerForgeResult = 138,
         GameServerCreatureData = 139,
         GameServerCreatureHealth = 140,
         GameServerCreatureLight = 141,
@@ -315,6 +317,8 @@ namespace Proto
         ClientBosstiaryRequestSlotAction = 176,
         ClientRequestHighscore = 177,
         ClientCancelAttackAndFollow = 190,
+        ClientForgeEnter = 191,
+        ClientForgeBrowseHistory = 192,
         ClientUpdateTile = 201,
         ClientRefreshContainer = 202,
         ClientBrowseField = 203,

src/client/protocolgame.h

@@ -244,6 +244,7 @@ class ProtocolGame final : public Protocol
     void parseItemClasses(const InputMessagePtr& msg);
     void parseCreatureMark(const InputMessagePtr& msg);
     void parseTrappers(const InputMessagePtr& msg);
+    void parseOpenForge(const InputMessagePtr& msg);
     void addCreatureIcon(const InputMessagePtr& msg, const uint32_t creatureId) const;
     void parseCloseForgeWindow(const InputMessagePtr& msg);
     void parseCreatureData(const InputMessagePtr& msg);