From e723e892e43afd9ae3e84939108579240db27ef5 Mon Sep 17 00:00:00 2001 From: Pravus Date: Wed, 8 Jun 2022 02:51:57 -0300 Subject: [PATCH 1/7] Updated ECS version used --- package-lock.json | 443 ++++++++++++++++++++++++++++++++++++++++++++-- package.json | 2 +- 2 files changed, 432 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1136647..0e73020 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,19 +4,208 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@dcl/amd": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/@dcl/amd/-/amd-6.11.0.tgz", + "integrity": "sha512-qdwwpWa+H0wH9gcfqzmUHaO7jaf3RSiDHSevFhRsYAdANAakoSkThwvWwhqgGn131PB2yfc18IpSstnsjzotSg==", + "dev": true + }, + "@dcl/build-ecs": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/@dcl/build-ecs/-/build-ecs-6.11.0.tgz", + "integrity": "sha512-cBTc65W4JIAXqbtMVXug3mQCAQnQ67V9fQmbjNBxmOsMVdCFOLLeqzyZl54bi472RdtOyB7gMnVGmnFPuTPd9Q==", + "dev": true, + "requires": { + "terser": "^5.7.2", + "typescript": "^4.4.2" + } + }, + "@dcl/kernel": { + "version": "1.0.0-2450204627.commit-f9c6a13", + "resolved": "https://registry.npmjs.org/@dcl/kernel/-/kernel-1.0.0-2450204627.commit-f9c6a13.tgz", + "integrity": "sha512-ABYYw2e5prdEa0NPdz9RQmkqsoOVMXr2DRZU66u4QWbyjI30Ye4puyMpT818Gl745b4zm7D1lPDbHRA6zempLQ==", + "dev": true + }, + "@dcl/posix": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@dcl/posix/-/posix-1.0.4.tgz", + "integrity": "sha512-Z0zpNr2HAxn2cLWUadWGlzaG48Z+N3hg2bI20UH+OT8NJtvCJnAwVBshAG83iAn4BTC+CsUsk4A394jrlv2ZIQ==", + "dev": true + }, + "@dcl/schemas": { + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-4.14.1.tgz", + "integrity": "sha512-c0mD4hrFZs+fEweaag3J0VlPRSasTMUbxn9Oj/vZUe8oO8KzObvxpXH2eCkPosX5pu1TqdIAUsOEouDghUmzlA==", + "dev": true, + "requires": { + "ajv": "^7.1.0", + "ajv-errors": "^2.0.1", + "ajv-keywords": "^4.0.1" + } + }, + "@dcl/unity-renderer": { + "version": "1.0.35874-20220512094007.commit-bfb5052", + "resolved": "https://registry.npmjs.org/@dcl/unity-renderer/-/unity-renderer-1.0.35874-20220512094007.commit-bfb5052.tgz", + "integrity": "sha512-cy3+dN6Exm4bd2cpMAx7aHyqztfuRhKOr9Bny0irJi79y1nnnGVeOxc6pPSDcO4uR3JFmZit9B5SifT1AxXHiw==", + "dev": true + }, + "@jridgewell/gen-mapping": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz", + "integrity": "sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==", + "dev": true, + "requires": { + "@jridgewell/set-array": "^1.0.0", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, + "@jridgewell/resolve-uri": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz", + "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==", + "dev": true + }, + "@jridgewell/set-array": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz", + "integrity": "sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==", + "dev": true + }, + "@jridgewell/source-map": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", + "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "dev": true, + "requires": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, + "@jridgewell/sourcemap-codec": { + "version": "1.4.13", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz", + "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==", + "dev": true + }, + "@jridgewell/trace-mapping": { + "version": "0.3.13", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz", + "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==", + "dev": true, + "requires": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, + "@types/http-proxy": { + "version": "1.17.9", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz", + "integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, + "@types/node": { + "version": "17.0.41", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.41.tgz", + "integrity": "sha512-xA6drNNeqb5YyV5fO3OAEsnXLfO7uF0whiOfPTz5AeDo8KeZFmODKnvwPymMNO8qE/an8pVY/O50tig2SQCrGw==", + "dev": true + }, + "acorn": { + "version": "8.7.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", + "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", + "dev": true + }, + "ajv": { + "version": "7.2.4", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-7.2.4.tgz", + "integrity": "sha512-nBeQgg/ZZA3u3SYxyaDvpvDtgZ/EZPF547ARgZBrG9Bhu1vKDwAIjtIf+sDtJUKa2zOcEbmRLBRSyMraS/Oy1A==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + } + }, + "ajv-errors": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-2.0.1.tgz", + "integrity": "sha512-hGH2npS6nUdBr61gf3rcG8R04DwwgQsdt6goZGmaZHYRHtLF948Emsdta/bcP9AD6/X1jnHm9lMbgujOQG7W6A==", + "dev": true + }, + "ajv-keywords": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-4.0.1.tgz", + "integrity": "sha512-vPmwZT6AL4R7kKrjKOMoKgnompJJS8MUgTB7dPBEknSSv4ahKgu046H+bGOH2eMRbAcz5pYz3fwaSwrCGNvuxA==", + "dev": true + }, + "balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true + }, + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true + }, "decentraland": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/decentraland/-/decentraland-3.3.0.tgz", "integrity": "sha512-SahNtTGhC/Q9nHvR7OehKz2cN2U/fC5oXzBUtkyd0MS52skYwTKMm60RGAh9Q5M2ErfZMihD7Qt3AEubV8CZSg==" }, "decentraland-ecs": { - "version": "6.4.10-20200623153317.commit-5ced1d4", - "resolved": "https://registry.npmjs.org/decentraland-ecs/-/decentraland-ecs-6.4.10-20200623153317.commit-5ced1d4.tgz", - "integrity": "sha512-XsmBNPQR9t/Cf9mrmCNX/oPFJL6GToHdHTqciU/QGyaZWvXSPknQAKjkJnRsJNUkGXAXWRyx46/9mJDFWofJpA==", + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/decentraland-ecs/-/decentraland-ecs-6.11.0.tgz", + "integrity": "sha512-Qj4XLc6RMGn6EtKyihzn3RVsVty6Xwf12ZlzupSQFj5nBr92TUK4ddk6IMaC2hj6EVbtZ5H0iQfMpsMWo0Wvew==", "dev": true, "requires": { - "typescript": "^3.8.3", - "uglify-js": "^3.5.2" + "@dcl/amd": "6.11.0", + "@dcl/build-ecs": "6.11.0", + "@dcl/kernel": "^1.0.0-2322196163.commit-bfb06e9", + "@dcl/posix": "^1.0.4", + "@dcl/schemas": "^4.8.0", + "@dcl/unity-renderer": "^1.0.35874-20220512094007.commit-bfb5052", + "glob": "^7.1.7", + "http-proxy-middleware": "^2.0.3", + "ignore": "^5.1.8" } }, "decentraland-ecs-utils": { @@ -24,16 +213,246 @@ "resolved": "https://registry.npmjs.org/decentraland-ecs-utils/-/decentraland-ecs-utils-1.1.4.tgz", "integrity": "sha512-OVVvkeF7bLbE6HmA4XhsP9X2gawvsh8lwqcK49Olm8sz+3I3YtZxZk9IMdjjsPAYyX1B/08v0ZDjSZdWBIm2lw==" }, + "eventemitter3": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", + "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", + "dev": true + }, + "fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "follow-redirects": { + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz", + "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==", + "dev": true + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true + }, + "glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "http-proxy": { + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", + "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", + "dev": true, + "requires": { + "eventemitter3": "^4.0.0", + "follow-redirects": "^1.0.0", + "requires-port": "^1.0.0" + } + }, + "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==", + "dev": true, + "requires": { + "@types/http-proxy": "^1.17.8", + "http-proxy": "^1.18.1", + "is-glob": "^4.0.1", + "is-plain-obj": "^3.0.0", + "micromatch": "^4.0.2" + } + }, + "ignore": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", + "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", + "dev": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "dev": true, + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true + }, + "is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "requires": { + "is-extglob": "^2.1.1" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "is-plain-obj": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", + "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==", + "dev": true + }, + "json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true + }, + "micromatch": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "dev": true, + "requires": { + "braces": "^3.0.2", + "picomatch": "^2.3.1" + } + }, + "minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "requires": { + "wrappy": "1" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true + }, + "picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true + }, + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "dev": true + }, + "require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "dev": true + }, + "requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "terser": { + "version": "5.14.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.0.tgz", + "integrity": "sha512-JC6qfIEkPBd9j1SMO3Pfn+A6w2kQV54tv+ABQLgZr7dA3k/DL/OBoYSWxzVpZev3J+bUHXfr55L8Mox7AaNo6g==", + "dev": true, + "requires": { + "@jridgewell/source-map": "^0.3.2", + "acorn": "^8.5.0", + "commander": "^2.20.0", + "source-map-support": "~0.5.20" + } + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" + } + }, "typescript": { - "version": "3.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.5.tgz", - "integrity": "sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==", + "version": "4.7.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.3.tgz", + "integrity": "sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==", "dev": true }, - "uglify-js": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.0.tgz", - "integrity": "sha512-Esj5HG5WAyrLIdYU74Z3JdG2PxdIusvj6IWHMtlyESxc7kcDz7zYlYjpnSokn1UbpV0d/QX9fan7gkCNd/9BQA==", + "uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "requires": { + "punycode": "^2.1.0" + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true } } diff --git a/package.json b/package.json index 1bc4ad2..cb12cf0 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "ecs:install-next": "npm install --save-dev decentraland-ecs@next" }, "devDependencies": { - "decentraland-ecs": "^6.4.10-20200623153317.commit-5ced1d4" + "decentraland-ecs": "^6.11.0" }, "dependencies": { "decentraland": "^3.2.7-20190919135901.commit-4f347f6", From 8d2808d6972814d8d4d2b056a80e55f96152bad3 Mon Sep 17 00:00:00 2001 From: Pravus Date: Thu, 9 Jun 2022 00:47:55 -0300 Subject: [PATCH 2/7] fixed some dialogue texts --- src/book.ts | 2 +- src/mica.ts | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/book.ts b/src/book.ts index ec2fb38..e028489 100644 --- a/src/book.ts +++ b/src/book.ts @@ -85,7 +85,7 @@ export class Page extends Entity { book.activateGlow() radarMicaDialogueUIText.value = - 'Now place me by the book and I shall cast the spell!' + 'Now place me by the book, I will cast the spell!' micaDialogueSystem.enabled = false } } diff --git a/src/mica.ts b/src/mica.ts index 3ed1c14..3f7bae7 100644 --- a/src/mica.ts +++ b/src/mica.ts @@ -14,7 +14,7 @@ export enum MicaState { GameStart, DetectingPages, ReadingFinalPassage, - Reincarnated // nice to have: Mica with a newly spawned body, but it's a woman's body and he says something like "Well... it's better than not having a body at all!" + Reincarnated // alternative ending: Mica with a newly spawned body, but it's a woman's body and he says something like "Well... it's better than not having a body at all!" } class DialogueLine { @@ -57,22 +57,22 @@ export class MicaComponent { new DialogueLine("Hi! I'm Mika, nice to meet you", 4), new DialogueLine("I've been cursed and lost my body", 4), new DialogueLine("Will you help me please?", 2), - new DialogueLine("I must retrieve pages from my book, the Salmonomicon", 4), - new DialogueLine("Take me with you, I'll lead the way!", -1) + new DialogueLine("I must retrieve pages from my book,\nthe Salmonomicon", 4), + new DialogueLine("Take me with you,\nI'll lead the way!", -1) // This text is not working for some reason... ] this.detectingPagesDialogueLines = [ - new DialogueLine("Oh, look out for the creature that's bound to this curse", 5), - new DialogueLine("It wants to kill you", 3), - new DialogueLine("DON'T look at it directly, or he will come at you faster!", 4), - new DialogueLine("And whatever you do... DO NOT LET HIM GET TO YOU", 4), + new DialogueLine("Oh, look out for the creature\nthat's bound to this curse", 5), + new DialogueLine("It'll want to kill you", 3), + new DialogueLine("DON'T look at it directly,\nor he will come at you faster!", 4), + new DialogueLine("And whatever you do...\nDO NOT LET HIM GET TO YOU", 4), new DialogueLine("Find the pages, follow my eyes", 3), new DialogueLine("", -1) ] this.finalPassageDialogueLines = [ new DialogueLine("Great! Now I must recite the magic words...", 3), - new DialogueLine("It's been so long since I chanted this, I hope it works...", 3), + new DialogueLine("It's been so long since I chanted this,\nI hope it works...", 3), new DialogueLine("Klaatu... Barada... AHEM-Cof!-Cof!-oktu!", 3), new DialogueLine("Oh shait! It seems it worked half-way", 3), new DialogueLine("It's trapped in the pentagram, but...", 3), From e7736b193e461f9884803a3f7e7782ddfcaed4bc Mon Sep 17 00:00:00 2001 From: Pravus Date: Thu, 9 Jun 2022 00:53:32 -0300 Subject: [PATCH 3/7] fixed mica UI dialogue outline colo --- src/micaUI.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/micaUI.ts b/src/micaUI.ts index 8e838d5..851675d 100644 --- a/src/micaUI.ts +++ b/src/micaUI.ts @@ -43,9 +43,8 @@ export function GrabLighter() { } export let radarMicaDialogueUIText = new UIText(canvas) -// radarMicaDialogueUIText.color = Color4.Red() radarMicaDialogueUIText.color = Color4.Yellow() -// radarMicaDialogueUIText.outlineColor = Color4.Yellow() +radarMicaDialogueUIText.outlineColor = Color4.Red() radarMicaDialogueUIText.fontSize = 40 radarMicaDialogueUIText.outlineWidth = 0.1 radarMicaDialogueUIText.vAlign = "top" From 532de648bd4ea1078d172b2dc710949d4706261d Mon Sep 17 00:00:00 2001 From: Pravus Date: Thu, 9 Jun 2022 01:21:44 -0300 Subject: [PATCH 4/7] adjusted UI hands position --- src/UI.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/UI.ts b/src/UI.ts index 4e298c9..ef3685b 100644 --- a/src/UI.ts +++ b/src/UI.ts @@ -3,7 +3,7 @@ import decentralandEcsUtils from "../node_modules/decentraland-ecs-utils/index" export const canvas = new UICanvas() export let atlas = new Texture("textures/HeadSprites.png") -let currentHandsY: number = -20 +let currentHandsY: number = -35 const handsPanel = new UIContainerRect(canvas) handsPanel.isPointerBlocker = false handsPanel.width = '100%' @@ -13,7 +13,7 @@ handsPanel.positionY = currentHandsY export let leftHandImage = new UIImage(handsPanel, atlas) leftHandImage.hAlign = 'left' leftHandImage.vAlign = 'bottom' -leftHandImage.positionX = '10%' +leftHandImage.positionX = '5%' leftHandImage.positionY = currentHandsY - 10 leftHandImage.sourceWidth = 425 leftHandImage.sourceHeight = 425 @@ -25,6 +25,7 @@ leftHandImage.height = leftHandImage.sourceHeight * 1.6 const rightHandImage = new UIImage(handsPanel, atlas) rightHandImage.hAlign = 'right' rightHandImage.vAlign = 'bottom' +rightHandImage.positionX = '-5%' rightHandImage.positionY = currentHandsY rightHandImage.sourceWidth = 425 rightHandImage.sourceHeight = 425 From 9825bcbbb06ea5feeb12d773f4a845e57e815e29 Mon Sep 17 00:00:00 2001 From: Pravus Date: Thu, 9 Jun 2022 01:48:21 -0300 Subject: [PATCH 5/7] improves OnPointerDown usage --- src/book.ts | 16 ++++++++-------- src/candles.ts | 9 +++++---- src/mica.ts | 3 +++ 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/book.ts b/src/book.ts index e028489..e5a9f83 100644 --- a/src/book.ts +++ b/src/book.ts @@ -64,8 +64,10 @@ export class Page extends Entity { this.addComponent(new PageComponent()) this.addComponent( new OnPointerDown((e) => { - if (e.hit.length > 3) return this.grab(totalPages) + }, { + hoverText: "Grab", + distance: 3 }) ) } @@ -261,12 +263,10 @@ export const book = new Book( book.addComponentOrReplace( new OnPointerDown((e) => { - if (e.hit.length > 4) { - return - } - if (hasAllPages && creature.currentState == CreatureState.Hunting) { - // book.trapCreature() - releaseMicasHead() - } + if (hasAllPages && creature.currentState != CreatureState.Hunting) return + + releaseMicasHead() + }, { + distance: 4 }) ) diff --git a/src/candles.ts b/src/candles.ts index 66c0591..bdd2a93 100644 --- a/src/candles.ts +++ b/src/candles.ts @@ -15,7 +15,6 @@ export class Candle extends Entity { isOn: boolean = false ) { super(); - this.addComponent(offModel); this.addComponent(new Transform(transform)) @@ -32,11 +31,14 @@ export class Candle extends Entity { this.onModel = onModel this.offModel = offModel - this.addComponent( new OnPointerDown(e => { - if (e.hit.length > 4 || this.isOn) return + if (this.isOn) return + this.turnOn() + }, { + hoverText: "Light", + distance: 4 }) ) } @@ -46,7 +48,6 @@ export class Candle extends Entity { this.offModel.visible = false candlesOnCounter += 1 if (candlesOnCounter == candles.length) { - log("YOU WIN") creature.getKilled() micaTextShape.value = "" diff --git a/src/mica.ts b/src/mica.ts index 3f7bae7..4423634 100644 --- a/src/mica.ts +++ b/src/mica.ts @@ -151,6 +151,9 @@ micaHeadEntity.addComponentOrReplace(new OnPointerDown(e=>{ // if (creature.currentState == CreatureState.Vanished){ // resetGame() // } +}, { + hoverText: "Talk", + distance: 3 })) engine.addEntity(micaHeadEntity) From 8909aca0930103cedafd2f07aeb41585a3dbe617 Mon Sep 17 00:00:00 2001 From: Pravus Date: Sat, 3 Sep 2022 19:13:05 -0300 Subject: [PATCH 6/7] improved laser calculations --- package-lock.json | 687 +++++++++++++++++++++++++++++++++++++++++----- package.json | 2 +- src/creature.ts | 110 ++++---- 3 files changed, 674 insertions(+), 125 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0e73020..9d9c412 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,19 +1,592 @@ { "name": "dcl-project", "version": "1.0.0", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "dcl-project", + "version": "1.0.0", + "dependencies": { + "decentraland": "^3.2.7-20190919135901.commit-4f347f6", + "decentraland-ecs-utils": "^1.1.3" + }, + "devDependencies": { + "decentraland-ecs": "^6.11.3" + } + }, + "node_modules/@dcl/amd": { + "version": "6.11.3", + "resolved": "https://registry.npmjs.org/@dcl/amd/-/amd-6.11.3.tgz", + "integrity": "sha512-fQW/QfXxh1AxK4ciecLs+Yk6NPMPt99RCMLhU1EwRxmEd0G1pyQUrz4Z2+clHsJyJXmK1/r1dxCv1S9q+FKPMA==", + "dev": true + }, + "node_modules/@dcl/build-ecs": { + "version": "6.11.3", + "resolved": "https://registry.npmjs.org/@dcl/build-ecs/-/build-ecs-6.11.3.tgz", + "integrity": "sha512-IqxtkPzjB+yrvl8Tgdy64lW2AfHt6jUcbwMN2PR5DBj9SqHdKUULx+hV5kxCCXcOTmcQv5JNFkbMOnfy5JZQOg==", + "dev": true, + "dependencies": { + "terser": "^5.7.2", + "typescript": "^4.4.2" + }, + "bin": { + "build-ecs": "index.js" + } + }, + "node_modules/@dcl/kernel": { + "version": "1.0.0-2570291833.commit-c09e849", + "resolved": "https://registry.npmjs.org/@dcl/kernel/-/kernel-1.0.0-2570291833.commit-c09e849.tgz", + "integrity": "sha512-RBYzyu/xWhfpkAAjmmFMVt21lCmfjKD40wlGAo7WRgrTOIJB9+vpzmRi0rHs+N7xrmwFIOp3aC+XwA2TQn3PJw==", + "dev": true + }, + "node_modules/@dcl/posix": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@dcl/posix/-/posix-1.0.4.tgz", + "integrity": "sha512-Z0zpNr2HAxn2cLWUadWGlzaG48Z+N3hg2bI20UH+OT8NJtvCJnAwVBshAG83iAn4BTC+CsUsk4A394jrlv2ZIQ==", + "dev": true + }, + "node_modules/@dcl/schemas": { + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-4.8.0.tgz", + "integrity": "sha512-NLvu90JSAunwA6vVYfVcdvlwO2x5fTc2tPhsko5kFfBEIp7lCzwSy6DoSlee/t92Uw9zIyNIS9Ai3ewLQ0T4zQ==", + "dev": true, + "dependencies": { + "ajv": "^7.1.0" + } + }, + "node_modules/@dcl/unity-renderer": { + "version": "1.0.40765-20220622131414.commit-3603482", + "resolved": "https://registry.npmjs.org/@dcl/unity-renderer/-/unity-renderer-1.0.40765-20220622131414.commit-3603482.tgz", + "integrity": "sha512-4U4TlUYYm8NVJL+rGVmYdkGZwB7cisKtFmLeoYBX5+c9RKqoKz3QY7q8PGEmkBzjz/7tCYcHLIfzxLVzAq8S7w==", + "dev": true + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", + "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", + "dev": true, + "dependencies": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", + "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", + "dev": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/set-array": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", + "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "dev": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/source-map": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz", + "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==", + "dev": true, + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.4.14", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", + "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", + "dev": true + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.14", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz", + "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==", + "dev": true, + "dependencies": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, + "node_modules/@types/http-proxy": { + "version": "1.17.9", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz", + "integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/node": { + "version": "17.0.41", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.41.tgz", + "integrity": "sha512-xA6drNNeqb5YyV5fO3OAEsnXLfO7uF0whiOfPTz5AeDo8KeZFmODKnvwPymMNO8qE/an8pVY/O50tig2SQCrGw==", + "dev": true + }, + "node_modules/acorn": { + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz", + "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/ajv": { + "version": "7.2.4", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-7.2.4.tgz", + "integrity": "sha512-nBeQgg/ZZA3u3SYxyaDvpvDtgZ/EZPF547ARgZBrG9Bhu1vKDwAIjtIf+sDtJUKa2zOcEbmRLBRSyMraS/Oy1A==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true + }, + "node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true + }, + "node_modules/decentraland": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/decentraland/-/decentraland-3.3.0.tgz", + "integrity": "sha512-SahNtTGhC/Q9nHvR7OehKz2cN2U/fC5oXzBUtkyd0MS52skYwTKMm60RGAh9Q5M2ErfZMihD7Qt3AEubV8CZSg==", + "bin": { + "dcl": "dist/cli.js" + } + }, + "node_modules/decentraland-ecs": { + "version": "6.11.3", + "resolved": "https://registry.npmjs.org/decentraland-ecs/-/decentraland-ecs-6.11.3.tgz", + "integrity": "sha512-tSEGEpN9Wl43sdMXHgzAYdfWJJB3pNFlzVRICmKU7a7SD91xK2guTngFGP+Ll2bf8LHPloPdYX/4gD2RBdXszg==", + "dev": true, + "dependencies": { + "@dcl/amd": "6.11.3", + "@dcl/build-ecs": "6.11.3", + "@dcl/kernel": "1.0.0-2570291833.commit-c09e849", + "@dcl/posix": "^1.0.4", + "@dcl/schemas": "4.8.0", + "@dcl/unity-renderer": "1.0.40765-20220622131414.commit-3603482", + "glob": "^7.1.7", + "http-proxy-middleware": "^2.0.3", + "ignore": "^5.1.8" + } + }, + "node_modules/decentraland-ecs-utils": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/decentraland-ecs-utils/-/decentraland-ecs-utils-1.1.4.tgz", + "integrity": "sha512-OVVvkeF7bLbE6HmA4XhsP9X2gawvsh8lwqcK49Olm8sz+3I3YtZxZk9IMdjjsPAYyX1B/08v0ZDjSZdWBIm2lw==" + }, + "node_modules/eventemitter3": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", + "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", + "dev": true + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, + "node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/follow-redirects": { + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz", + "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/http-proxy": { + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", + "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", + "dev": true, + "dependencies": { + "eventemitter3": "^4.0.0", + "follow-redirects": "^1.0.0", + "requires-port": "^1.0.0" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "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==", + "dev": true, + "dependencies": { + "@types/http-proxy": "^1.17.8", + "http-proxy": "^1.18.1", + "is-glob": "^4.0.1", + "is-plain-obj": "^3.0.0", + "micromatch": "^4.0.2" + }, + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "@types/express": "^4.17.13" + }, + "peerDependenciesMeta": { + "@types/express": { + "optional": true + } + } + }, + "node_modules/ignore": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", + "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "dev": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-plain-obj": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", + "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true + }, + "node_modules/micromatch": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "dev": true, + "dependencies": { + "braces": "^3.0.2", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", + "dev": true + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dev": true, + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/terser": { + "version": "5.14.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz", + "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==", + "dev": true, + "dependencies": { + "@jridgewell/source-map": "^0.3.2", + "acorn": "^8.5.0", + "commander": "^2.20.0", + "source-map-support": "~0.5.20" + }, + "bin": { + "terser": "bin/terser" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/typescript": { + "version": "4.7.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz", + "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + } + }, "dependencies": { "@dcl/amd": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/@dcl/amd/-/amd-6.11.0.tgz", - "integrity": "sha512-qdwwpWa+H0wH9gcfqzmUHaO7jaf3RSiDHSevFhRsYAdANAakoSkThwvWwhqgGn131PB2yfc18IpSstnsjzotSg==", + "version": "6.11.3", + "resolved": "https://registry.npmjs.org/@dcl/amd/-/amd-6.11.3.tgz", + "integrity": "sha512-fQW/QfXxh1AxK4ciecLs+Yk6NPMPt99RCMLhU1EwRxmEd0G1pyQUrz4Z2+clHsJyJXmK1/r1dxCv1S9q+FKPMA==", "dev": true }, "@dcl/build-ecs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/@dcl/build-ecs/-/build-ecs-6.11.0.tgz", - "integrity": "sha512-cBTc65W4JIAXqbtMVXug3mQCAQnQ67V9fQmbjNBxmOsMVdCFOLLeqzyZl54bi472RdtOyB7gMnVGmnFPuTPd9Q==", + "version": "6.11.3", + "resolved": "https://registry.npmjs.org/@dcl/build-ecs/-/build-ecs-6.11.3.tgz", + "integrity": "sha512-IqxtkPzjB+yrvl8Tgdy64lW2AfHt6jUcbwMN2PR5DBj9SqHdKUULx+hV5kxCCXcOTmcQv5JNFkbMOnfy5JZQOg==", "dev": true, "requires": { "terser": "^5.7.2", @@ -21,9 +594,9 @@ } }, "@dcl/kernel": { - "version": "1.0.0-2450204627.commit-f9c6a13", - "resolved": "https://registry.npmjs.org/@dcl/kernel/-/kernel-1.0.0-2450204627.commit-f9c6a13.tgz", - "integrity": "sha512-ABYYw2e5prdEa0NPdz9RQmkqsoOVMXr2DRZU66u4QWbyjI30Ye4puyMpT818Gl745b4zm7D1lPDbHRA6zempLQ==", + "version": "1.0.0-2570291833.commit-c09e849", + "resolved": "https://registry.npmjs.org/@dcl/kernel/-/kernel-1.0.0-2570291833.commit-c09e849.tgz", + "integrity": "sha512-RBYzyu/xWhfpkAAjmmFMVt21lCmfjKD40wlGAo7WRgrTOIJB9+vpzmRi0rHs+N7xrmwFIOp3aC+XwA2TQn3PJw==", "dev": true }, "@dcl/posix": { @@ -33,43 +606,41 @@ "dev": true }, "@dcl/schemas": { - "version": "4.14.1", - "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-4.14.1.tgz", - "integrity": "sha512-c0mD4hrFZs+fEweaag3J0VlPRSasTMUbxn9Oj/vZUe8oO8KzObvxpXH2eCkPosX5pu1TqdIAUsOEouDghUmzlA==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-4.8.0.tgz", + "integrity": "sha512-NLvu90JSAunwA6vVYfVcdvlwO2x5fTc2tPhsko5kFfBEIp7lCzwSy6DoSlee/t92Uw9zIyNIS9Ai3ewLQ0T4zQ==", "dev": true, "requires": { - "ajv": "^7.1.0", - "ajv-errors": "^2.0.1", - "ajv-keywords": "^4.0.1" + "ajv": "^7.1.0" } }, "@dcl/unity-renderer": { - "version": "1.0.35874-20220512094007.commit-bfb5052", - "resolved": "https://registry.npmjs.org/@dcl/unity-renderer/-/unity-renderer-1.0.35874-20220512094007.commit-bfb5052.tgz", - "integrity": "sha512-cy3+dN6Exm4bd2cpMAx7aHyqztfuRhKOr9Bny0irJi79y1nnnGVeOxc6pPSDcO4uR3JFmZit9B5SifT1AxXHiw==", + "version": "1.0.40765-20220622131414.commit-3603482", + "resolved": "https://registry.npmjs.org/@dcl/unity-renderer/-/unity-renderer-1.0.40765-20220622131414.commit-3603482.tgz", + "integrity": "sha512-4U4TlUYYm8NVJL+rGVmYdkGZwB7cisKtFmLeoYBX5+c9RKqoKz3QY7q8PGEmkBzjz/7tCYcHLIfzxLVzAq8S7w==", "dev": true }, "@jridgewell/gen-mapping": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz", - "integrity": "sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==", + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz", + "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==", "dev": true, "requires": { - "@jridgewell/set-array": "^1.0.0", + "@jridgewell/set-array": "^1.0.1", "@jridgewell/sourcemap-codec": "^1.4.10", "@jridgewell/trace-mapping": "^0.3.9" } }, "@jridgewell/resolve-uri": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz", - "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", + "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", "dev": true }, "@jridgewell/set-array": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz", - "integrity": "sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", + "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", "dev": true }, "@jridgewell/source-map": { @@ -83,15 +654,15 @@ } }, "@jridgewell/sourcemap-codec": { - "version": "1.4.13", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz", - "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==", + "version": "1.4.14", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", + "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", "dev": true }, "@jridgewell/trace-mapping": { - "version": "0.3.13", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz", - "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==", + "version": "0.3.14", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz", + "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==", "dev": true, "requires": { "@jridgewell/resolve-uri": "^3.0.3", @@ -114,9 +685,9 @@ "dev": true }, "acorn": { - "version": "8.7.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", - "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz", + "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==", "dev": true }, "ajv": { @@ -131,18 +702,6 @@ "uri-js": "^4.2.2" } }, - "ajv-errors": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-2.0.1.tgz", - "integrity": "sha512-hGH2npS6nUdBr61gf3rcG8R04DwwgQsdt6goZGmaZHYRHtLF948Emsdta/bcP9AD6/X1jnHm9lMbgujOQG7W6A==", - "dev": true - }, - "ajv-keywords": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-4.0.1.tgz", - "integrity": "sha512-vPmwZT6AL4R7kKrjKOMoKgnompJJS8MUgTB7dPBEknSSv4ahKgu046H+bGOH2eMRbAcz5pYz3fwaSwrCGNvuxA==", - "dev": true - }, "balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -192,17 +751,17 @@ "integrity": "sha512-SahNtTGhC/Q9nHvR7OehKz2cN2U/fC5oXzBUtkyd0MS52skYwTKMm60RGAh9Q5M2ErfZMihD7Qt3AEubV8CZSg==" }, "decentraland-ecs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/decentraland-ecs/-/decentraland-ecs-6.11.0.tgz", - "integrity": "sha512-Qj4XLc6RMGn6EtKyihzn3RVsVty6Xwf12ZlzupSQFj5nBr92TUK4ddk6IMaC2hj6EVbtZ5H0iQfMpsMWo0Wvew==", + "version": "6.11.3", + "resolved": "https://registry.npmjs.org/decentraland-ecs/-/decentraland-ecs-6.11.3.tgz", + "integrity": "sha512-tSEGEpN9Wl43sdMXHgzAYdfWJJB3pNFlzVRICmKU7a7SD91xK2guTngFGP+Ll2bf8LHPloPdYX/4gD2RBdXszg==", "dev": true, "requires": { - "@dcl/amd": "6.11.0", - "@dcl/build-ecs": "6.11.0", - "@dcl/kernel": "^1.0.0-2322196163.commit-bfb06e9", + "@dcl/amd": "6.11.3", + "@dcl/build-ecs": "6.11.3", + "@dcl/kernel": "1.0.0-2570291833.commit-c09e849", "@dcl/posix": "^1.0.4", - "@dcl/schemas": "^4.8.0", - "@dcl/unity-renderer": "^1.0.35874-20220512094007.commit-bfb5052", + "@dcl/schemas": "4.8.0", + "@dcl/unity-renderer": "1.0.40765-20220622131414.commit-3603482", "glob": "^7.1.7", "http-proxy-middleware": "^2.0.3", "ignore": "^5.1.8" @@ -414,9 +973,9 @@ } }, "terser": { - "version": "5.14.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.0.tgz", - "integrity": "sha512-JC6qfIEkPBd9j1SMO3Pfn+A6w2kQV54tv+ABQLgZr7dA3k/DL/OBoYSWxzVpZev3J+bUHXfr55L8Mox7AaNo6g==", + "version": "5.14.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz", + "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==", "dev": true, "requires": { "@jridgewell/source-map": "^0.3.2", @@ -435,9 +994,9 @@ } }, "typescript": { - "version": "4.7.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.3.tgz", - "integrity": "sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==", + "version": "4.7.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz", + "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==", "dev": true }, "uri-js": { diff --git a/package.json b/package.json index cb12cf0..7c295e9 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "ecs:install-next": "npm install --save-dev decentraland-ecs@next" }, "devDependencies": { - "decentraland-ecs": "^6.11.0" + "decentraland-ecs": "^6.11.3" }, "dependencies": { "decentraland": "^3.2.7-20190919135901.commit-4f347f6", diff --git a/src/creature.ts b/src/creature.ts index df4d1d6..71436e9 100644 --- a/src/creature.ts +++ b/src/creature.ts @@ -34,6 +34,7 @@ export class Creature extends Entity { rotationSpeed: number = 60 currentState: CreatureState = CreatureState.Dormant transform: Transform + laserLength: number = 10 laserL: IEntity = null laserR: IEntity = null beingWatched: boolean = false @@ -52,40 +53,40 @@ export class Creature extends Entity { speed: number = 0.3, currentState: CreatureState = CreatureState.Dormant ) { - super(); - this.addComponent(model) - this.addComponent(new Transform(transform)) - this.addComponent(new CreatureComponent()) - engine.addEntity(this) - this.currentState = currentState - this.transform = this.getComponent(Transform) - - // animations - this.invokeAnim = new AnimationState("Invoke") - this.searchAnim = new AnimationState("Search") - this.attackAnim = new AnimationState("Attack") - this.raysAnim = new AnimationState("Rays") - - this.addComponent(new Animator()).addClip(this.invokeAnim) - this.getComponent(Animator).addClip(this.searchAnim) - this.getComponent(Animator).addClip(this.attackAnim) - this.invokeAnim.play() - - // sounds - let mumblingClip = new AudioClip("sounds/Search.mp3") - this.addComponent(new AudioSource(mumblingClip)) - this.searchSound = this.getComponent(AudioSource) - - let attackAudioEnt = new Entity() - engine.addEntity(attackAudioEnt) - attackAudioEnt.setParent(this) - let attackClip = new AudioClip("sounds/Attack.mp3") - let attackSource = new AudioSource(attackClip) - this.attackSound = attackSource - attackAudioEnt.addComponent(this.attackSound) + super(); + this.addComponent(model) + this.addComponent(new Transform(transform)) + this.addComponent(new CreatureComponent()) + engine.addEntity(this) + this.currentState = currentState + this.transform = this.getComponent(Transform) + + // animations + this.invokeAnim = new AnimationState("Invoke") + this.searchAnim = new AnimationState("Search") + this.attackAnim = new AnimationState("Attack") + this.raysAnim = new AnimationState("Rays") + + this.addComponent(new Animator()).addClip(this.invokeAnim) + this.getComponent(Animator).addClip(this.searchAnim) + this.getComponent(Animator).addClip(this.attackAnim) + this.invokeAnim.play() + + // sounds + let mumblingClip = new AudioClip("sounds/Search.mp3") + this.addComponent(new AudioSource(mumblingClip)) + this.searchSound = this.getComponent(AudioSource) + + let attackAudioEnt = new Entity() + engine.addEntity(attackAudioEnt) + attackAudioEnt.setParent(this) + let attackClip = new AudioClip("sounds/Attack.mp3") + let attackSource = new AudioSource(attackClip) + this.attackSound = attackSource + attackAudioEnt.addComponent(this.attackSound) } - public getInvoked() : void { + public getInvoked() : void { this.currentState = CreatureState.Hunting this.invokeAnim.playing = true this.attackAnim.playing = false @@ -97,7 +98,6 @@ export class Creature extends Entity { } public getTrapped() : void { - this.currentState = CreatureState.Trapped this.startLaser() this.transform.position = creature.trappedPosition this.transform.rotation = Quaternion.Euler(0,0,0) @@ -106,6 +106,7 @@ export class Creature extends Entity { this.searchSound.playing = false this.attackSound.playing = false this.raysAnim.playing = true + this.currentState = CreatureState.Trapped } public getKilled() : void { @@ -121,8 +122,6 @@ export class Creature extends Entity { this.searchSound.playing = false this.attackSound.playing = false - - } public getReset() : void { @@ -185,7 +184,6 @@ export class Creature extends Entity { } public adjustSpeed(cameraForward: ReadOnlyVector3, playerPos: Vector3): void { - let viewAngle = Math.abs(Vector3.GetAngleBetweenVectors( new Vector3(cameraForward.x, cameraForward.y, cameraForward.z), this.transform.position.subtract(playerPos), Vector3.Up()) @@ -216,12 +214,10 @@ export class Creature extends Entity { this.searchAnim.playing = true this.attackSound.playing = false } - } public startLaser(): void { - - if (this.laserL){ + if (this.laserL) { this.laserL.getComponent(BoxShape).visible = true this.laserR.getComponent(BoxShape).visible = true } else { @@ -230,7 +226,7 @@ export class Creature extends Entity { laserL.getComponent(BoxShape).withCollisions = false laserL.addComponent(new Transform({ scale: new Vector3(0.05 ,0.05, 10 ), - position: new Vector3(-0.065, 0.55, 5.2) + position: new Vector3(-0.065, 0.472, 0) })) laserL.addComponent(rayMaterial) laserL.setParent(this) @@ -242,7 +238,7 @@ export class Creature extends Entity { laserR.getComponent(BoxShape).withCollisions = false laserR.addComponent(new Transform({ scale: new Vector3(0.05 ,0.05, 10 ), - position: new Vector3(0.065, 0.55, 5.2) + position: new Vector3(0.065, 0.472, 0) })) laserR.addComponent(rayMaterial) laserR.setParent(this) @@ -264,25 +260,23 @@ export class Creature extends Entity { let newRay: Ray = { origin: this.transform.position, direction: Vector3.Forward().rotate(this.transform.rotation), - distance: 15 + distance: this.laserLength } PhysicsCast.instance.hitFirst(newRay, (e) => { - let laserLen: number let playerSafe: boolean = false if (e.didHit){ - //debugCube.getComponent(Transform).position.set(e.hitPoint.x, e.hitPoint.y, e.hitPoint.z) let hitPoint = new Vector3(e.hitPoint.x, e.hitPoint.y, e.hitPoint.z) - laserLen = Vector3.Distance(this.transform.position, hitPoint) - 2 - this.drawLaserLength(laserLen) - //log(" laserLen: ", laserLen, " id: ", e.entity.entityId) + this.drawLaserLength(Vector3.Distance(this.transform.position, hitPoint) - 1) } else { - laserLen = 15 - this.drawLaserLength(laserLen) + this.drawLaserLength(this.laserLength) } + const rayToPlayer: Ray = PhysicsCast.instance.getRayFromPositions(this.transform.position, playerPos) + rayToPlayer.direction = new Vector3(rayToPlayer.direction.x, 0, rayToPlayer.direction.z) + PhysicsCast.instance.hitFirst(rayToPlayer, (e) => { - if(e.didHit){ + if(e.didHit){ // hit an obstacle between the creature and the player playerSafe = true } else { let angle = Vector3.GetAngleBetweenVectors( @@ -290,15 +284,13 @@ export class Creature extends Entity { new Vector3(newRay.direction.x, newRay.direction.y, newRay.direction.z) , Vector3.Up() ) - if (Math.abs(angle) < 0.2 && rayToPlayer.distance < laserLen + 0.5){ - log("PLAYER HIT, laserLen: ", laserLen, " player distance: ", rayToPlayer.distance) + if (Math.abs(angle) < 0.2 && rayToPlayer.distance < this.laserLength + 5){ + log("PLAYER HIT, laserLen: ", this.laserLength, " player distance: ", rayToPlayer.distance) resetGame() } } }, 3) - - //log(laserLen) this.waitingForRay = false }, 2) } @@ -306,8 +298,8 @@ export class Creature extends Entity { public drawLaserLength(laserLen: number): void { this.laserL.getComponent(Transform).scale.z = laserLen this.laserR.getComponent(Transform).scale.z = laserLen - this.laserL.getComponent(Transform).position.z = laserLen/2 + 0.5 - this.laserR.getComponent(Transform).position.z = laserLen/2 + 0.5 + this.laserL.getComponent(Transform).position.z = laserLen/2 + 0.3 + this.laserR.getComponent(Transform).position.z = laserLen/2 + 0.3 } public laserOff () :void { @@ -336,8 +328,6 @@ export class CreatureSystem { this.playerPos = camera.position.clone() for (let creature of creatures) { - - //let creatureComponent = creature.getComponent(CreatureComponent) let creatureTransform = creature.getComponent(Transform) switch (creature.currentState) { @@ -373,7 +363,7 @@ export class CreatureSystem { let cameraForward = PhysicsCast.instance.getRayFromCamera(1).direction creature.adjustSpeed(cameraForward, this.playerPos) - + break; ////// TRAPPED ////// @@ -400,7 +390,7 @@ engine.addSystem(new CreatureSystem()) -// Instance creature +// Instantiate creature export let creature = new Creature( { position: new Vector3(32, -1.5, 32), From 005ac428013420bba052fb94c74ee7a7f8d82fc7 Mon Sep 17 00:00:00 2001 From: Pravus Date: Sun, 4 Sep 2022 04:20:59 -0300 Subject: [PATCH 7/7] Implemented camera mode area for first person cam --- package-lock.json | 195 ++++++++++++++++++++++++++++------------------ package.json | 2 +- src/game.ts | 17 +++- 3 files changed, 135 insertions(+), 79 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9d9c412..43a944e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,32 +12,32 @@ "decentraland-ecs-utils": "^1.1.3" }, "devDependencies": { - "decentraland-ecs": "^6.11.3" + "decentraland-ecs": "^6.11.6" } }, "node_modules/@dcl/amd": { - "version": "6.11.3", - "resolved": "https://registry.npmjs.org/@dcl/amd/-/amd-6.11.3.tgz", - "integrity": "sha512-fQW/QfXxh1AxK4ciecLs+Yk6NPMPt99RCMLhU1EwRxmEd0G1pyQUrz4Z2+clHsJyJXmK1/r1dxCv1S9q+FKPMA==", + "version": "6.11.6", + "resolved": "https://registry.npmjs.org/@dcl/amd/-/amd-6.11.6.tgz", + "integrity": "sha512-ZwBZBTCnmWYxFM/QP8UTVzxMryd11Wz53xxZD/+etBivbPaADocHb3UDWtI6IBL/6RfkmN078HEVRNTI/CxanA==", "dev": true }, "node_modules/@dcl/build-ecs": { - "version": "6.11.3", - "resolved": "https://registry.npmjs.org/@dcl/build-ecs/-/build-ecs-6.11.3.tgz", - "integrity": "sha512-IqxtkPzjB+yrvl8Tgdy64lW2AfHt6jUcbwMN2PR5DBj9SqHdKUULx+hV5kxCCXcOTmcQv5JNFkbMOnfy5JZQOg==", + "version": "6.11.6", + "resolved": "https://registry.npmjs.org/@dcl/build-ecs/-/build-ecs-6.11.6.tgz", + "integrity": "sha512-TDlQZX1Ep0jvKafWiYpVmJUZ2myJ0XC4CCSKdcyTh7F2knt2o8tiFxYuVHXuS3pi/ZxhYRhxoJ77z7KQYA70tg==", "dev": true, "dependencies": { - "terser": "^5.7.2", - "typescript": "^4.4.2" + "terser": "^5.15.0", + "typescript": "^4.8.2" }, "bin": { "build-ecs": "index.js" } }, "node_modules/@dcl/kernel": { - "version": "1.0.0-2570291833.commit-c09e849", - "resolved": "https://registry.npmjs.org/@dcl/kernel/-/kernel-1.0.0-2570291833.commit-c09e849.tgz", - "integrity": "sha512-RBYzyu/xWhfpkAAjmmFMVt21lCmfjKD40wlGAo7WRgrTOIJB9+vpzmRi0rHs+N7xrmwFIOp3aC+XwA2TQn3PJw==", + "version": "1.0.0-2962066080.commit-0d7454e", + "resolved": "https://registry.npmjs.org/@dcl/kernel/-/kernel-1.0.0-2962066080.commit-0d7454e.tgz", + "integrity": "sha512-/LO4e5gDoJpk6LjxLYK50CPDMGZ6LuWJ+bx6UPL3wgOl4Cli33q2wkBRihV0lceQDmFiLWNA/As790f/91jWgA==", "dev": true }, "node_modules/@dcl/posix": { @@ -47,18 +47,20 @@ "dev": true }, "node_modules/@dcl/schemas": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-4.8.0.tgz", - "integrity": "sha512-NLvu90JSAunwA6vVYfVcdvlwO2x5fTc2tPhsko5kFfBEIp7lCzwSy6DoSlee/t92Uw9zIyNIS9Ai3ewLQ0T4zQ==", + "version": "5.14.0", + "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-5.14.0.tgz", + "integrity": "sha512-UKIny4sxoYpKwRItM7mEzFyM7+R2kwqV8PB7DBo30PCkoFBL3N6b85K/hGk9qd+ZNTioFy6ceL8y7bKeASWUHw==", "dev": true, "dependencies": { - "ajv": "^7.1.0" + "ajv": "^8.11.0", + "ajv-errors": "^3.0.0", + "ajv-keywords": "^5.1.0" } }, "node_modules/@dcl/unity-renderer": { - "version": "1.0.40765-20220622131414.commit-3603482", - "resolved": "https://registry.npmjs.org/@dcl/unity-renderer/-/unity-renderer-1.0.40765-20220622131414.commit-3603482.tgz", - "integrity": "sha512-4U4TlUYYm8NVJL+rGVmYdkGZwB7cisKtFmLeoYBX5+c9RKqoKz3QY7q8PGEmkBzjz/7tCYcHLIfzxLVzAq8S7w==", + "version": "1.0.51685-20220831135256.commit-e5429a6", + "resolved": "https://registry.npmjs.org/@dcl/unity-renderer/-/unity-renderer-1.0.51685-20220831135256.commit-e5429a6.tgz", + "integrity": "sha512-+1juT+Dy3iz/3l+yHh06DKru/K3Nbt5j8e6ryuKVdr2mIMfjeLYKKg055V2IrEUZ7Z49LRAfpo1R8HiVOGxZOQ==", "dev": true }, "node_modules/@jridgewell/gen-mapping": { @@ -110,9 +112,9 @@ "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.14", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz", - "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==", + "version": "0.3.15", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz", + "integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==", "dev": true, "dependencies": { "@jridgewell/resolve-uri": "^3.0.3", @@ -147,9 +149,9 @@ } }, "node_modules/ajv": { - "version": "7.2.4", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-7.2.4.tgz", - "integrity": "sha512-nBeQgg/ZZA3u3SYxyaDvpvDtgZ/EZPF547ARgZBrG9Bhu1vKDwAIjtIf+sDtJUKa2zOcEbmRLBRSyMraS/Oy1A==", + "version": "8.11.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", + "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", "dev": true, "dependencies": { "fast-deep-equal": "^3.1.1", @@ -162,6 +164,27 @@ "url": "https://github.com/sponsors/epoberezkin" } }, + "node_modules/ajv-errors": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-3.0.0.tgz", + "integrity": "sha512-V3wD15YHfHz6y0KdhYFjyy9vWtEVALT9UrxfN3zqlI6dMioHnJrqOYfyPKol3oqrnCM9uwkcdCwkJ0WUcbLMTQ==", + "dev": true, + "peerDependencies": { + "ajv": "^8.0.1" + } + }, + "node_modules/ajv-keywords": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.3" + }, + "peerDependencies": { + "ajv": "^8.8.2" + } + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -217,17 +240,17 @@ } }, "node_modules/decentraland-ecs": { - "version": "6.11.3", - "resolved": "https://registry.npmjs.org/decentraland-ecs/-/decentraland-ecs-6.11.3.tgz", - "integrity": "sha512-tSEGEpN9Wl43sdMXHgzAYdfWJJB3pNFlzVRICmKU7a7SD91xK2guTngFGP+Ll2bf8LHPloPdYX/4gD2RBdXszg==", + "version": "6.11.6", + "resolved": "https://registry.npmjs.org/decentraland-ecs/-/decentraland-ecs-6.11.6.tgz", + "integrity": "sha512-coTYZoVNEWGEAL4wIFrFkKV2uiJWsJMXpY+3mIeZaeSGsfOdfW7hVkwzwQbqGRQtxMIsp5Xh7hbdyovpt03G1w==", "dev": true, "dependencies": { - "@dcl/amd": "6.11.3", - "@dcl/build-ecs": "6.11.3", - "@dcl/kernel": "1.0.0-2570291833.commit-c09e849", + "@dcl/amd": "6.11.6", + "@dcl/build-ecs": "6.11.6", + "@dcl/kernel": "1.0.0-2962066080.commit-0d7454e", "@dcl/posix": "^1.0.4", - "@dcl/schemas": "4.8.0", - "@dcl/unity-renderer": "1.0.40765-20220622131414.commit-3603482", + "@dcl/schemas": "^5.14.0", + "@dcl/unity-renderer": "1.0.51685-20220831135256.commit-e5429a6", "glob": "^7.1.7", "http-proxy-middleware": "^2.0.3", "ignore": "^5.1.8" @@ -518,9 +541,9 @@ } }, "node_modules/terser": { - "version": "5.14.2", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz", - "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz", + "integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==", "dev": true, "dependencies": { "@jridgewell/source-map": "^0.3.2", @@ -548,9 +571,9 @@ } }, "node_modules/typescript": { - "version": "4.7.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz", - "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==", + "version": "4.8.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz", + "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -578,25 +601,25 @@ }, "dependencies": { "@dcl/amd": { - "version": "6.11.3", - "resolved": "https://registry.npmjs.org/@dcl/amd/-/amd-6.11.3.tgz", - "integrity": "sha512-fQW/QfXxh1AxK4ciecLs+Yk6NPMPt99RCMLhU1EwRxmEd0G1pyQUrz4Z2+clHsJyJXmK1/r1dxCv1S9q+FKPMA==", + "version": "6.11.6", + "resolved": "https://registry.npmjs.org/@dcl/amd/-/amd-6.11.6.tgz", + "integrity": "sha512-ZwBZBTCnmWYxFM/QP8UTVzxMryd11Wz53xxZD/+etBivbPaADocHb3UDWtI6IBL/6RfkmN078HEVRNTI/CxanA==", "dev": true }, "@dcl/build-ecs": { - "version": "6.11.3", - "resolved": "https://registry.npmjs.org/@dcl/build-ecs/-/build-ecs-6.11.3.tgz", - "integrity": "sha512-IqxtkPzjB+yrvl8Tgdy64lW2AfHt6jUcbwMN2PR5DBj9SqHdKUULx+hV5kxCCXcOTmcQv5JNFkbMOnfy5JZQOg==", + "version": "6.11.6", + "resolved": "https://registry.npmjs.org/@dcl/build-ecs/-/build-ecs-6.11.6.tgz", + "integrity": "sha512-TDlQZX1Ep0jvKafWiYpVmJUZ2myJ0XC4CCSKdcyTh7F2knt2o8tiFxYuVHXuS3pi/ZxhYRhxoJ77z7KQYA70tg==", "dev": true, "requires": { - "terser": "^5.7.2", - "typescript": "^4.4.2" + "terser": "^5.15.0", + "typescript": "^4.8.2" } }, "@dcl/kernel": { - "version": "1.0.0-2570291833.commit-c09e849", - "resolved": "https://registry.npmjs.org/@dcl/kernel/-/kernel-1.0.0-2570291833.commit-c09e849.tgz", - "integrity": "sha512-RBYzyu/xWhfpkAAjmmFMVt21lCmfjKD40wlGAo7WRgrTOIJB9+vpzmRi0rHs+N7xrmwFIOp3aC+XwA2TQn3PJw==", + "version": "1.0.0-2962066080.commit-0d7454e", + "resolved": "https://registry.npmjs.org/@dcl/kernel/-/kernel-1.0.0-2962066080.commit-0d7454e.tgz", + "integrity": "sha512-/LO4e5gDoJpk6LjxLYK50CPDMGZ6LuWJ+bx6UPL3wgOl4Cli33q2wkBRihV0lceQDmFiLWNA/As790f/91jWgA==", "dev": true }, "@dcl/posix": { @@ -606,18 +629,20 @@ "dev": true }, "@dcl/schemas": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-4.8.0.tgz", - "integrity": "sha512-NLvu90JSAunwA6vVYfVcdvlwO2x5fTc2tPhsko5kFfBEIp7lCzwSy6DoSlee/t92Uw9zIyNIS9Ai3ewLQ0T4zQ==", + "version": "5.14.0", + "resolved": "https://registry.npmjs.org/@dcl/schemas/-/schemas-5.14.0.tgz", + "integrity": "sha512-UKIny4sxoYpKwRItM7mEzFyM7+R2kwqV8PB7DBo30PCkoFBL3N6b85K/hGk9qd+ZNTioFy6ceL8y7bKeASWUHw==", "dev": true, "requires": { - "ajv": "^7.1.0" + "ajv": "^8.11.0", + "ajv-errors": "^3.0.0", + "ajv-keywords": "^5.1.0" } }, "@dcl/unity-renderer": { - "version": "1.0.40765-20220622131414.commit-3603482", - "resolved": "https://registry.npmjs.org/@dcl/unity-renderer/-/unity-renderer-1.0.40765-20220622131414.commit-3603482.tgz", - "integrity": "sha512-4U4TlUYYm8NVJL+rGVmYdkGZwB7cisKtFmLeoYBX5+c9RKqoKz3QY7q8PGEmkBzjz/7tCYcHLIfzxLVzAq8S7w==", + "version": "1.0.51685-20220831135256.commit-e5429a6", + "resolved": "https://registry.npmjs.org/@dcl/unity-renderer/-/unity-renderer-1.0.51685-20220831135256.commit-e5429a6.tgz", + "integrity": "sha512-+1juT+Dy3iz/3l+yHh06DKru/K3Nbt5j8e6ryuKVdr2mIMfjeLYKKg055V2IrEUZ7Z49LRAfpo1R8HiVOGxZOQ==", "dev": true }, "@jridgewell/gen-mapping": { @@ -660,9 +685,9 @@ "dev": true }, "@jridgewell/trace-mapping": { - "version": "0.3.14", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz", - "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==", + "version": "0.3.15", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz", + "integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==", "dev": true, "requires": { "@jridgewell/resolve-uri": "^3.0.3", @@ -691,9 +716,9 @@ "dev": true }, "ajv": { - "version": "7.2.4", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-7.2.4.tgz", - "integrity": "sha512-nBeQgg/ZZA3u3SYxyaDvpvDtgZ/EZPF547ARgZBrG9Bhu1vKDwAIjtIf+sDtJUKa2zOcEbmRLBRSyMraS/Oy1A==", + "version": "8.11.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", + "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -702,6 +727,22 @@ "uri-js": "^4.2.2" } }, + "ajv-errors": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-3.0.0.tgz", + "integrity": "sha512-V3wD15YHfHz6y0KdhYFjyy9vWtEVALT9UrxfN3zqlI6dMioHnJrqOYfyPKol3oqrnCM9uwkcdCwkJ0WUcbLMTQ==", + "dev": true, + "requires": {} + }, + "ajv-keywords": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.3" + } + }, "balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -751,17 +792,17 @@ "integrity": "sha512-SahNtTGhC/Q9nHvR7OehKz2cN2U/fC5oXzBUtkyd0MS52skYwTKMm60RGAh9Q5M2ErfZMihD7Qt3AEubV8CZSg==" }, "decentraland-ecs": { - "version": "6.11.3", - "resolved": "https://registry.npmjs.org/decentraland-ecs/-/decentraland-ecs-6.11.3.tgz", - "integrity": "sha512-tSEGEpN9Wl43sdMXHgzAYdfWJJB3pNFlzVRICmKU7a7SD91xK2guTngFGP+Ll2bf8LHPloPdYX/4gD2RBdXszg==", + "version": "6.11.6", + "resolved": "https://registry.npmjs.org/decentraland-ecs/-/decentraland-ecs-6.11.6.tgz", + "integrity": "sha512-coTYZoVNEWGEAL4wIFrFkKV2uiJWsJMXpY+3mIeZaeSGsfOdfW7hVkwzwQbqGRQtxMIsp5Xh7hbdyovpt03G1w==", "dev": true, "requires": { - "@dcl/amd": "6.11.3", - "@dcl/build-ecs": "6.11.3", - "@dcl/kernel": "1.0.0-2570291833.commit-c09e849", + "@dcl/amd": "6.11.6", + "@dcl/build-ecs": "6.11.6", + "@dcl/kernel": "1.0.0-2962066080.commit-0d7454e", "@dcl/posix": "^1.0.4", - "@dcl/schemas": "4.8.0", - "@dcl/unity-renderer": "1.0.40765-20220622131414.commit-3603482", + "@dcl/schemas": "^5.14.0", + "@dcl/unity-renderer": "1.0.51685-20220831135256.commit-e5429a6", "glob": "^7.1.7", "http-proxy-middleware": "^2.0.3", "ignore": "^5.1.8" @@ -973,9 +1014,9 @@ } }, "terser": { - "version": "5.14.2", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz", - "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz", + "integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==", "dev": true, "requires": { "@jridgewell/source-map": "^0.3.2", @@ -994,9 +1035,9 @@ } }, "typescript": { - "version": "4.7.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz", - "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==", + "version": "4.8.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz", + "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==", "dev": true }, "uri-js": { diff --git a/package.json b/package.json index 7c295e9..11cb33d 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "ecs:install-next": "npm install --save-dev decentraland-ecs@next" }, "devDependencies": { - "decentraland-ecs": "^6.11.3" + "decentraland-ecs": "^6.11.6" }, "dependencies": { "decentraland": "^3.2.7-20190919135901.commit-4f347f6", diff --git a/src/game.ts b/src/game.ts index e77711a..70bc4c3 100644 --- a/src/game.ts +++ b/src/game.ts @@ -21,4 +21,19 @@ let owl1 = new AmbientSound( {position: new Vector3(15, 4, 22)}, "sounds/owl1.mp3", 30000 -) \ No newline at end of file +) + +// 1st Person Camera Area covering the whole scene +const modArea = new Entity() +modArea.addComponent( + new Transform({ + position: new Vector3(8 * 4, 4, 8 * 4), + }) +) +modArea.addComponent( + new CameraModeArea({ + area: { box: new Vector3(64, 8, 64) }, + cameraMode: CameraMode.FirstPerson, + }) +) +engine.addEntity(modArea) \ No newline at end of file