diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 58ddcca2f..6d787926b 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -50,7 +50,7 @@ jobs: mkdir upload\modules copy build\windows\x64\release\js-module-v2.dll upload\modules copy build\windows\x64\release\js-module-v2.pdb upload\modules - copy server\deps\nodejs\lib\Release\libnodev2.dll upload + copy server\deps\nodejs\lib\Release\libnode.dll upload - name: Upload artifacts uses: actions/upload-artifact@v3 diff --git a/deps/cpp-sdk b/deps/cpp-sdk index b7825258f..f18e52bbb 160000 --- a/deps/cpp-sdk +++ b/deps/cpp-sdk @@ -1 +1 @@ -Subproject commit b7825258fafcb6d9aa3906b41e27cfe2d8bf93af +Subproject commit f18e52bbb7fd9cc57efa66f6c40449b41cdc13a0 diff --git a/server/src/namespaces/WeaponModelInfoNamespace.cpp b/server/src/namespaces/WeaponModelInfoNamespace.cpp index 240611e4f..ba1bff919 100644 --- a/server/src/namespaces/WeaponModelInfoNamespace.cpp +++ b/server/src/namespaces/WeaponModelInfoNamespace.cpp @@ -23,6 +23,7 @@ static void Get(js::FunctionContext& ctx) modelObj.Set("skillAbove50MaxAmmoMp", info.skillAbove50MaxAmmoMp); modelObj.Set("maxSkillMaxAmmoMp", info.maxSkillMaxAmmoMp); modelObj.Set("bonusMaxAmmoMp", info.bonusMaxAmmoMp); + modelObj.Set("damageType", info.damageType); ctx.Return(modelObj); }