Merge branch 'dev' into release

altmp · Nov 29, 2024 · 36de725 · 36de725
2 parents 02490c5 + 733ee60
commit 36de725
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
diff --git 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);
 }
+3 −0		ICore.h
+21 −1		README.md
+29 −0		script-objects/IInterior.h
+36 −0		script-objects/IInteriorPortal.h
+24 −0		script-objects/IInteriorRoom.h
+11 −0		types/AABB.h
+2 −4		types/WeaponModelInfo.h