From 33230d23ffeec96a10d89532fc8f2cdc8e0fd1cd Mon Sep 17 00:00:00 2001 From: Orion Gunning Date: Tue, 5 Nov 2024 14:34:46 +1100 Subject: [PATCH] fix loading issue, upgrading babylon seem to fix it --- package-lock.json | 165 +++++++++++++----------- package.json | 16 +-- src/client/Controllers/VatController.ts | 8 +- src/client/Entities/Entity.ts | 2 +- src/server/Database.ts | 4 +- src/server/data/LocationsDB.ts | 49 +------ 6 files changed, 103 insertions(+), 141 deletions(-) diff --git a/package-lock.json b/package-lock.json index f87ad42c..f20ec07e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,11 +9,11 @@ "version": "0.4.0", "license": "MIT", "dependencies": { - "@babylonjs/core": "7.25.2", - "@babylonjs/gui": "7.25.2", - "@babylonjs/loaders": "7.25.2", - "@babylonjs/serializers": "7.25.2", - "babylonjs-gltf2interface": "7.25.2", + "@babylonjs/core": "7.32.3", + "@babylonjs/gui": "7.32.3", + "@babylonjs/loaders": "7.32.3", + "@babylonjs/serializers": "7.32.3", + "babylonjs-gltf2interface": "7.32.3", "colyseus": "^0.15.17", "colyseus.js": "^0.15.19", "cors": "^2.8.5", @@ -27,9 +27,9 @@ "winston": "^3.13.0" }, "devDependencies": { - "@babylonjs/gui-editor": "7.25.2", - "@babylonjs/inspector": "7.25.2", - "@babylonjs/materials": "7.25.2", + "@babylonjs/gui-editor": "7.32.3", + "@babylonjs/inspector": "7.32.3", + "@babylonjs/materials": "7.32.3", "@colyseus/core": "^0.15.39", "@colyseus/loadtest": "^0.15.2", "@colyseus/monitor": "^0.15.6", @@ -52,22 +52,22 @@ } }, "node_modules/@babylonjs/core": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-7.25.2.tgz", - "integrity": "sha512-To2od3XlYKZXkvWfsi16+cAWtVBwetqCq2Ts1wvyPre/kHHTT3SwecmobcX8EGBjmcyZ9tf8NVhZHM4IAm1Bog==" + "version": "7.32.3", + "resolved": "https://registry.npmjs.org/@babylonjs/core/-/core-7.32.3.tgz", + "integrity": "sha512-pHaF5W2fZoCQ7NuBxqCx+xkhnvArUrz3N0HSZOmg1S357vt91P/yihEmhW1XjoIylmZTg2a/vsIxYr2H76okPA==" }, "node_modules/@babylonjs/gui": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babylonjs/gui/-/gui-7.25.2.tgz", - "integrity": "sha512-eQkWiKx2OzLYbNyUbJCzVlTinAU5i/LjW25UldcjpRIAaOeEG+mbY20o+VZGN7hVhJgB+gzR3we7HcK4uXvwcQ==", + "version": "7.32.3", + "resolved": "https://registry.npmjs.org/@babylonjs/gui/-/gui-7.32.3.tgz", + "integrity": "sha512-vl0qsRR06RhvgKETFypc3pJfCMpbfZWM1sthaPFF8qWxDwh1bDxOkMnXXoa259RPntMWF6LmjeHWBTRgaZt+ow==", "peerDependencies": { "@babylonjs/core": "^7.0.0" } }, "node_modules/@babylonjs/gui-editor": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babylonjs/gui-editor/-/gui-editor-7.25.2.tgz", - "integrity": "sha512-CdyVk2X2q+YpKphU3RWb4BjIoirox2OoEn1qVu5/IqPni+u69Z2sRqAMqs4MKsi2fxcbAwVrykoUJ5gLaU8Fyg==", + "version": "7.32.3", + "resolved": "https://registry.npmjs.org/@babylonjs/gui-editor/-/gui-editor-7.32.3.tgz", + "integrity": "sha512-INvFVpRMlMFuarbAksVoLLEO/6A6+HSH8ZiCnR/cbOZX6VUxzPxXRQW5UPa/CSJOsroOKNv1v/e+fWOVb3HOnQ==", "dev": true, "peerDependencies": { "@babylonjs/core": "^7.0.0", @@ -77,9 +77,9 @@ } }, "node_modules/@babylonjs/inspector": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babylonjs/inspector/-/inspector-7.25.2.tgz", - "integrity": "sha512-FUtiAWPcL/WmhEaVqVGEfvQpd4ADEJ4Xvg2SruQD0eonXBL80w09k4sAn4zkFwyB4t7ycyp+s6OdSUpEB2nCvg==", + "version": "7.32.3", + "resolved": "https://registry.npmjs.org/@babylonjs/inspector/-/inspector-7.32.3.tgz", + "integrity": "sha512-Xz9cNAkgo6jxvO7H1D2O5Ip0Byit86UoOFJil8CXvwg7/tmPsjWtT6LPbgiDy/WtFRkKnNCoOoFsFdaP0Rfiyg==", "dev": true, "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.1.0", @@ -98,27 +98,27 @@ } }, "node_modules/@babylonjs/loaders": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babylonjs/loaders/-/loaders-7.25.2.tgz", - "integrity": "sha512-YwKPfLeNJ+xpL2s/DYfNUagsUZYNhv9Jyx5z7KhrQFL3U75cob7J90vCutC2wrUFfm08Ax6fHGJQmrsUzDwBIQ==", + "version": "7.32.3", + "resolved": "https://registry.npmjs.org/@babylonjs/loaders/-/loaders-7.32.3.tgz", + "integrity": "sha512-6uo8RXVyJdRG3f9uJGI8WA75Pf3pNco46TqXwadnugsNHztn/ifmBUgBEJ+X86h0lRNie7VYiNcYFKpvtgwrLA==", "peerDependencies": { "@babylonjs/core": "^7.0.0", "babylonjs-gltf2interface": "^7.0.0" } }, "node_modules/@babylonjs/materials": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babylonjs/materials/-/materials-7.25.2.tgz", - "integrity": "sha512-I2a5LNlz23JPDkzH5vKUbT//5ip5gTgMtRHVNNkAOTwMIlUyCfdrU0T1xxzAVjyHg9qiN/U2l1V9DZE8xhEfZg==", + "version": "7.32.3", + "resolved": "https://registry.npmjs.org/@babylonjs/materials/-/materials-7.32.3.tgz", + "integrity": "sha512-wG3kmBLUA1E8OYVJ70MVxBOVXkwNNLLMKj/epboRxr7RP5xtlIhoNKXGu7ZnYgbT8LeQqqXie7ZIpjdqSTuTAg==", "dev": true, "peerDependencies": { "@babylonjs/core": "^7.0.0" } }, "node_modules/@babylonjs/serializers": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/@babylonjs/serializers/-/serializers-7.25.2.tgz", - "integrity": "sha512-Es+dI0A6PlVsat6ZYOQOv8YdJOuRGjQAGP6AYJUT7SnteKHYTbsOwAhnD5oBkOM148QVtfjCP6MmtIEhFb2mxg==", + "version": "7.32.3", + "resolved": "https://registry.npmjs.org/@babylonjs/serializers/-/serializers-7.32.3.tgz", + "integrity": "sha512-MfAuQ4a+zgPE2HpWZ1cBDny7nSSM20qo2dfQrSsgcGvQUIWFPQPpVkhCXItKPNkvH18sSukiUC2kJNR67YCxfA==", "peerDependencies": { "@babylonjs/core": "^7.0.0", "babylonjs-gltf2interface": "^7.0.0" @@ -1261,7 +1261,8 @@ }, "node_modules/asn1.js": { "version": "5.4.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", + "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", "optional": true, "dependencies": { "bn.js": "^4.0.0", @@ -1293,9 +1294,9 @@ } }, "node_modules/babylonjs-gltf2interface": { - "version": "7.25.2", - "resolved": "https://registry.npmjs.org/babylonjs-gltf2interface/-/babylonjs-gltf2interface-7.25.2.tgz", - "integrity": "sha512-Vzwp0FmgTdxXH1RsPW8jRReSTkhTcrpulE6uJk4Kd4UTsRi1lpER31LpeysEYrjFf5SS+vc5gx4li8/TAUAWNw==" + "version": "7.32.3", + "resolved": "https://registry.npmjs.org/babylonjs-gltf2interface/-/babylonjs-gltf2interface-7.32.3.tgz", + "integrity": "sha512-ej2xVbYVHJk4D4A3ukLn6Vlh7N7bT/0115wH0j1emG8TvWUOyl7xG6xUPftk+dtoi/mybEYlp8u2DpMXnki9Qg==" }, "node_modules/balanced-match": { "version": "1.0.2", @@ -1370,7 +1371,8 @@ }, "node_modules/bn.js": { "version": "4.12.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", "optional": true }, "node_modules/body-parser": { @@ -1443,7 +1445,8 @@ }, "node_modules/brorand": { "version": "1.1.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", + "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==", "optional": true }, "node_modules/browserslist": { @@ -1986,9 +1989,9 @@ } }, "node_modules/cookie": { - "version": "0.5.0", - "license": "MIT", - "optional": true, + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "engines": { "node": ">= 0.6" } @@ -2372,9 +2375,9 @@ "license": "ISC" }, "node_modules/elliptic": { - "version": "6.5.7", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.7.tgz", - "integrity": "sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==", + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.0.tgz", + "integrity": "sha512-dpwoQcLc/2WLQvJvLRHKZ+f9FgOdjnq11rurqwekGQygGPsYSK29OMMD2WalatiqQ+XGFDglTNixpPfI+lpaAA==", "optional": true, "dependencies": { "bn.js": "^4.11.9", @@ -2627,16 +2630,16 @@ } }, "node_modules/express": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", - "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", @@ -2680,10 +2683,11 @@ } }, "node_modules/express-session": { - "version": "1.18.0", - "license": "MIT", + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.18.1.tgz", + "integrity": "sha512-a5mtTqEaZvBCL9A9aqkrtfz+3SMDhOVUnjafjo+s7A9Txkq+SVX2DLvSp1Zrv4uCXa3lMSK3viWnh9Gg07PBUA==", "dependencies": { - "cookie": "0.6.0", + "cookie": "0.7.2", "cookie-signature": "1.0.7", "debug": "2.6.9", "depd": "~2.0.0", @@ -2697,10 +2701,9 @@ } }, "node_modules/express-session/node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", - "license": "MIT", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", "engines": { "node": ">= 0.6" } @@ -2728,14 +2731,6 @@ "version": "2.1.3", "license": "MIT" }, - "node_modules/express/node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", - "engines": { - "node": ">= 0.6" - } - }, "node_modules/express/node_modules/debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -3184,23 +3179,33 @@ "license": "ISC" }, "node_modules/grant": { - "version": "5.4.22", - "license": "MIT", + "version": "5.4.23", + "resolved": "https://registry.npmjs.org/grant/-/grant-5.4.23.tgz", + "integrity": "sha512-lEMfgem990lWTU+j9jbOKmIsvvetVlwGzsWjoCgKz9zKcP7edI6mjyUA5QUSn7aeBYONTE3WnfhBhvONQGP1Hg==", "dependencies": { - "qs": "^6.11.2", - "request-compose": "^2.1.6", + "qs": "^6.13.0", + "request-compose": "^2.1.7", "request-oauth": "^1.0.1" }, "engines": { "node": ">=12.0.0" }, "optionalDependencies": { - "cookie": "^0.5.0", + "cookie": "^0.6.0", "cookie-signature": "^1.2.1", - "jwk-to-pem": "^2.0.5", + "jwk-to-pem": "^2.0.6", "jws": "^4.0.0" } }, + "node_modules/grant/node_modules/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "optional": true, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/grant/node_modules/cookie-signature": { "version": "1.2.1", "license": "MIT", @@ -3302,7 +3307,8 @@ }, "node_modules/hash.js": { "version": "1.1.7", - "license": "MIT", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", + "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", "optional": true, "dependencies": { "inherits": "^2.0.3", @@ -3321,7 +3327,8 @@ }, "node_modules/hmac-drbg": { "version": "1.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", + "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==", "optional": true, "dependencies": { "hash.js": "^1.0.3", @@ -3462,11 +3469,10 @@ } }, "node_modules/http-proxy-middleware": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz", - "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz", + "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==", "dev": true, - "license": "MIT", "dependencies": { "@types/http-proxy": "^1.17.8", "http-proxy": "^1.18.1", @@ -3988,12 +3994,13 @@ } }, "node_modules/jwk-to-pem": { - "version": "2.0.5", - "license": "Apache-2.0", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/jwk-to-pem/-/jwk-to-pem-2.0.6.tgz", + "integrity": "sha512-zPC/5vjyR08TpknpTGW6Z3V3lDf9dU92oHbf0jJlG8tGOzslF9xk2UiO/seSx2llCUrNAe+AvmuGTICSXiYU7A==", "optional": true, "dependencies": { "asn1.js": "^5.3.0", - "elliptic": "^6.5.4", + "elliptic": "^6.5.7", "safe-buffer": "^5.0.1" } }, @@ -4288,7 +4295,8 @@ }, "node_modules/minimalistic-crypto-utils": { "version": "1.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", + "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==", "optional": true }, "node_modules/minimatch": { @@ -5275,8 +5283,9 @@ } }, "node_modules/request-compose": { - "version": "2.1.6", - "license": "Apache-2.0", + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/request-compose/-/request-compose-2.1.7.tgz", + "integrity": "sha512-27amNkWTK4Qq25XEwdmrhb4VLMiQzRSKuDfsy1o1griykcyXk5MxMHmJG+OKTRdO9PgsO7Kkn7GrEkq0UAIIMQ==", "engines": { "node": ">=12.0.0" } diff --git a/package.json b/package.json index d70b5e3e..b2e8ad79 100644 --- a/package.json +++ b/package.json @@ -19,9 +19,9 @@ "author": "Orion3d", "license": "MIT", "devDependencies": { - "@babylonjs/gui-editor": "7.25.2", - "@babylonjs/inspector": "7.25.2", - "@babylonjs/materials": "7.25.2", + "@babylonjs/gui-editor": "7.32.3", + "@babylonjs/inspector": "7.32.3", + "@babylonjs/materials": "7.32.3", "@colyseus/core": "^0.15.39", "@colyseus/loadtest": "^0.15.2", "@colyseus/monitor": "^0.15.6", @@ -43,11 +43,11 @@ "webpack-merge": "^5.10.0" }, "dependencies": { - "@babylonjs/core": "7.25.2", - "@babylonjs/gui": "7.25.2", - "@babylonjs/loaders": "7.25.2", - "@babylonjs/serializers": "7.25.2", - "babylonjs-gltf2interface": "7.25.2", + "@babylonjs/core": "7.32.3", + "@babylonjs/gui": "7.32.3", + "@babylonjs/loaders": "7.32.3", + "@babylonjs/serializers": "7.32.3", + "babylonjs-gltf2interface": "7.32.3", "colyseus": "^0.15.17", "colyseus.js": "^0.15.19", "cors": "^2.8.5", diff --git a/src/client/Controllers/VatController.ts b/src/client/Controllers/VatController.ts index a5ec0298..73a251ad 100644 --- a/src/client/Controllers/VatController.ts +++ b/src/client/Controllers/VatController.ts @@ -1,20 +1,18 @@ // colyseus import { Mesh } from "@babylonjs/core/Meshes/mesh"; import { GameController } from "./GameController"; -import { bakeVertexData, calculateRanges, setAnimationParameters } from "../Entities/Common/VatHelper"; +import { bakeVertexData, calculateRanges } from "../Entities/Common/VatHelper"; import { BakedVertexAnimationManager } from "@babylonjs/core/BakedVertexAnimation/bakedVertexAnimationManager"; import { Vector3, Vector4 } from "@babylonjs/core/Maths/math.vector"; import { VertexAnimationBaker } from "@babylonjs/core/BakedVertexAnimation/vertexAnimationBaker"; import { AnimationGroup } from "@babylonjs/core/Animations/animationGroup"; -import AnimationHelper from "../Entities/Common/AnimationHelper"; import { mergeMesh, mergeMeshAndSkeleton } from "../Entities/Common/MeshHelper"; import { Texture } from "@babylonjs/core/Materials/Textures/texture"; import { Color3 } from "@babylonjs/core/Maths/math.color"; -import { PBRCustomMaterial } from "@babylonjs/materials/custom/pbrCustomMaterial"; import { EntityState, EquippableType, Item, PlayerSlots } from "../../shared/types"; import { VertexBuffer } from "@babylonjs/core/Buffers/buffer"; -import { AssetContainer } from "@babylonjs/core/assetContainer"; import { Entity } from "../Entities/Entity"; +import { PBRCustomMaterial } from "@babylonjs/materials/custom/pbrCustomMaterial"; class JavascriptDataDownloader { private data; @@ -225,8 +223,6 @@ export class VatController { // update material this.prepareMaterial(modelMeshMerged, race.key, entity.material); - console.log(race.key, entity); - // set mesh modelMeshMerged.registerInstancedBuffer("bakedVertexAnimationSettingsInstanced", 4); modelMeshMerged.instancedBuffers.bakedVertexAnimationSettingsInstanced = new Vector4(0, 0, 0, 0); diff --git a/src/client/Entities/Entity.ts b/src/client/Entities/Entity.ts index 73452a94..771d89ec 100644 --- a/src/client/Entities/Entity.ts +++ b/src/client/Entities/Entity.ts @@ -143,7 +143,7 @@ export class Entity extends TransformNode { // wait for vat to be ready setTimeout(() => { this.spawn(entity); - }, 500); + }, 250); } public async spawn(entity) { diff --git a/src/server/Database.ts b/src/server/Database.ts index 5f5acc89..c630c928 100644 --- a/src/server/Database.ts +++ b/src/server/Database.ts @@ -154,8 +154,8 @@ class Database { 20, 20, 20, - //"training_ground", - "lh_town", + "training_ground", + //"lh_town", 6.18, 0.1, diff --git a/src/server/data/LocationsDB.ts b/src/server/data/LocationsDB.ts index 84f55f09..0bfec9c2 100644 --- a/src/server/data/LocationsDB.ts +++ b/src/server/data/LocationsDB.ts @@ -17,7 +17,7 @@ let LocationsDB = { key: "lh_town", mesh: "lh_town", sun: true, - sunIntensity: 0.6, + sunIntensity: 0.0, spawnPoint: { x: 0, y: 0, @@ -443,7 +443,7 @@ let LocationsDB = { key: "training_ground", mesh: "training_ground", sun: true, - sunIntensity: 1, + sunIntensity: 0, fog: false, spawnPoint: { x: 0, @@ -456,50 +456,7 @@ let LocationsDB = { music: "MUSIC_01", dynamic: { interactive: [], - spawns: [ - { - key: "spawn_01", - type: "static", - behaviour: "idle", - aggressive: true, - canAttack: true, - points: [new Vector3(8.67, 0, -14.59)], - amount: 1, - baseHealth: 8000, - race: "skeleton_01", - material: 0, - name: "Dummy 2", - baseSpeed: Speed.VERY_SLOW, - }, - { - key: "spawn_02", - type: "global", - behaviour: "area", - aggressive: true, - canAttack: true, - points: [new Vector3(12, 0, -14.59)], - amount: 1, - race: "skeleton_01", - material: 0, - name: "Dummy 1", - - baseHealth: 100, - baseSpeed: Speed.VERY_SLOW, - baseDamageMultiplier: 2, // multiplicater for damage - experienceGain: { min: 5000, max: 10000 }, - goldGain: { min: 100, max: 200 }, - equipment: [ - { - key: "sword_01", - slot: PlayerSlots.WEAPON, - }, - ], - abilities: [ - { key: "base_attack", chance: 0.3 }, - { key: "fire_dart", chance: 0.7 }, - ], - }, - ], + spawns: [], }, }, lh_dungeon_01: {