diff --git a/package-lock.json b/package-lock.json
index 2f092c3..aa686be 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -35,7 +35,7 @@
"jsdom": "^24.1.1",
"npm-run-all2": "^6.2.2",
"phaser3-rex-plugins": "^1.80.5",
- "phavuer": "^0.15.7",
+ "phavuer": "^0.16.1",
"postcss": "^8.4.39",
"prettier": "^3.3.3",
"sass": "^1.77.8",
@@ -99,9 +99,9 @@
}
},
"node_modules/@babel/compat-data": {
- "version": "7.25.0",
- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.0.tgz",
- "integrity": "sha512-P4fwKI2mjEb3ZU5cnMJzvRsRKGBUcs8jvxIoRmr6ufAY9Xk2Bz7JubRTTivkw55c7WQJfTECeqYVa+HZ0FzREg==",
+ "version": "7.25.2",
+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.2.tgz",
+ "integrity": "sha512-bYcppcpKBvX4znYaPEeFau03bp89ShqNMLs+rmdptMw+heSZh9+z84d2YG+K7cYLbWwzdjtDoW/uqZmPjulClQ==",
"dev": true,
"license": "MIT",
"engines": {
@@ -109,22 +109,22 @@
}
},
"node_modules/@babel/core": {
- "version": "7.24.9",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.9.tgz",
- "integrity": "sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==",
+ "version": "7.25.2",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
+ "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
"dev": true,
"license": "MIT",
"dependencies": {
"@ampproject/remapping": "^2.2.0",
"@babel/code-frame": "^7.24.7",
- "@babel/generator": "^7.24.9",
- "@babel/helper-compilation-targets": "^7.24.8",
- "@babel/helper-module-transforms": "^7.24.9",
- "@babel/helpers": "^7.24.8",
- "@babel/parser": "^7.24.8",
- "@babel/template": "^7.24.7",
- "@babel/traverse": "^7.24.8",
- "@babel/types": "^7.24.9",
+ "@babel/generator": "^7.25.0",
+ "@babel/helper-compilation-targets": "^7.25.2",
+ "@babel/helper-module-transforms": "^7.25.2",
+ "@babel/helpers": "^7.25.0",
+ "@babel/parser": "^7.25.0",
+ "@babel/template": "^7.25.0",
+ "@babel/traverse": "^7.25.2",
+ "@babel/types": "^7.25.2",
"convert-source-map": "^2.0.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.2",
@@ -179,13 +179,13 @@
}
},
"node_modules/@babel/helper-compilation-targets": {
- "version": "7.24.8",
- "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.8.tgz",
- "integrity": "sha512-oU+UoqCHdp+nWVDkpldqIQL/i/bvAv53tRqLG/s+cOXxe66zOYLU7ar/Xs3LdmBihrUMEUhwu6dMZwbNOYDwvw==",
+ "version": "7.25.2",
+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz",
+ "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@babel/compat-data": "^7.24.8",
+ "@babel/compat-data": "^7.25.2",
"@babel/helper-validator-option": "^7.24.8",
"browserslist": "^4.23.1",
"lru-cache": "^5.1.1",
@@ -276,16 +276,16 @@
}
},
"node_modules/@babel/helper-module-transforms": {
- "version": "7.25.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.0.tgz",
- "integrity": "sha512-bIkOa2ZJYn7FHnepzr5iX9Kmz8FjIz4UKzJ9zhX3dnYuVW0xul9RuR3skBfoLu+FPTQw90EHW9rJsSZhyLQ3fQ==",
+ "version": "7.25.2",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz",
+ "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"@babel/helper-module-imports": "^7.24.7",
"@babel/helper-simple-access": "^7.24.7",
"@babel/helper-validator-identifier": "^7.24.7",
- "@babel/traverse": "^7.25.0"
+ "@babel/traverse": "^7.25.2"
},
"engines": {
"node": ">=6.9.0"
@@ -609,9 +609,9 @@
}
},
"node_modules/@babel/plugin-transform-typescript": {
- "version": "7.25.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.25.0.tgz",
- "integrity": "sha512-LZicxFzHIw+Sa3pzgMgSz6gdpsdkfiMObHUzhSIrwKF0+/rP/nuR49u79pSS+zIFJ1FeGeqQD2Dq4QGFbOVvSw==",
+ "version": "7.25.2",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.25.2.tgz",
+ "integrity": "sha512-lBwRvjSmqiMYe/pS0+1gggjJleUJi7NzjvQ1Fkqtt69hBa/0t1YuW/MLQMAPixfwaQOHUXsd6jeU3Z+vdGv3+A==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -657,9 +657,9 @@
}
},
"node_modules/@babel/traverse": {
- "version": "7.25.1",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.1.tgz",
- "integrity": "sha512-LrHHoWq08ZpmmFqBAzN+hUdWwy5zt7FGa/hVwMcOqW6OVtwqaoD5utfuGYU87JYxdZgLUvktAsn37j/sYR9siA==",
+ "version": "7.25.2",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.2.tgz",
+ "integrity": "sha512-s4/r+a7xTnny2O6FcZzqgT6nE4/GHEdcqj4qAeglbUOh0TeglEfmNJFAd/OLoVtGd6ZhAO8GCVvCNUO5t/VJVQ==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -667,7 +667,7 @@
"@babel/generator": "^7.25.0",
"@babel/parser": "^7.25.0",
"@babel/template": "^7.25.0",
- "@babel/types": "^7.25.0",
+ "@babel/types": "^7.25.2",
"debug": "^4.3.1",
"globals": "^11.1.0"
},
@@ -686,9 +686,9 @@
}
},
"node_modules/@babel/types": {
- "version": "7.25.0",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.0.tgz",
- "integrity": "sha512-LcnxQSsd9aXOIgmmSpvZ/1yo46ra2ESYyqLcryaBZOghxy5qqOBjvCWP5JfkI8yl9rlxRgdLTTMCQQRcN2hdCg==",
+ "version": "7.25.2",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.2.tgz",
+ "integrity": "sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -1728,17 +1728,17 @@
"license": "MIT"
},
"node_modules/@typescript-eslint/eslint-plugin": {
- "version": "7.17.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.17.0.tgz",
- "integrity": "sha512-pyiDhEuLM3PuANxH7uNYan1AaFs5XE0zw1hq69JBvGvE7gSuEoQl1ydtEe/XQeoC3GQxLXyOVa5kNOATgM638A==",
+ "version": "7.18.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz",
+ "integrity": "sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==",
"dev": true,
"license": "MIT",
"dependencies": {
"@eslint-community/regexpp": "^4.10.0",
- "@typescript-eslint/scope-manager": "7.17.0",
- "@typescript-eslint/type-utils": "7.17.0",
- "@typescript-eslint/utils": "7.17.0",
- "@typescript-eslint/visitor-keys": "7.17.0",
+ "@typescript-eslint/scope-manager": "7.18.0",
+ "@typescript-eslint/type-utils": "7.18.0",
+ "@typescript-eslint/utils": "7.18.0",
+ "@typescript-eslint/visitor-keys": "7.18.0",
"graphemer": "^1.4.0",
"ignore": "^5.3.1",
"natural-compare": "^1.4.0",
@@ -1762,16 +1762,16 @@
}
},
"node_modules/@typescript-eslint/parser": {
- "version": "7.17.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.17.0.tgz",
- "integrity": "sha512-puiYfGeg5Ydop8eusb/Hy1k7QmOU6X3nvsqCgzrB2K4qMavK//21+PzNE8qeECgNOIoertJPUC1SpegHDI515A==",
+ "version": "7.18.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.18.0.tgz",
+ "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==",
"dev": true,
"license": "BSD-2-Clause",
"dependencies": {
- "@typescript-eslint/scope-manager": "7.17.0",
- "@typescript-eslint/types": "7.17.0",
- "@typescript-eslint/typescript-estree": "7.17.0",
- "@typescript-eslint/visitor-keys": "7.17.0",
+ "@typescript-eslint/scope-manager": "7.18.0",
+ "@typescript-eslint/types": "7.18.0",
+ "@typescript-eslint/typescript-estree": "7.18.0",
+ "@typescript-eslint/visitor-keys": "7.18.0",
"debug": "^4.3.4"
},
"engines": {
@@ -1791,14 +1791,14 @@
}
},
"node_modules/@typescript-eslint/scope-manager": {
- "version": "7.17.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.17.0.tgz",
- "integrity": "sha512-0P2jTTqyxWp9HiKLu/Vemr2Rg1Xb5B7uHItdVZ6iAenXmPo4SZ86yOPCJwMqpCyaMiEHTNqizHfsbmCFT1x9SA==",
+ "version": "7.18.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz",
+ "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@typescript-eslint/types": "7.17.0",
- "@typescript-eslint/visitor-keys": "7.17.0"
+ "@typescript-eslint/types": "7.18.0",
+ "@typescript-eslint/visitor-keys": "7.18.0"
},
"engines": {
"node": "^18.18.0 || >=20.0.0"
@@ -1809,14 +1809,14 @@
}
},
"node_modules/@typescript-eslint/type-utils": {
- "version": "7.17.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.17.0.tgz",
- "integrity": "sha512-XD3aaBt+orgkM/7Cei0XNEm1vwUxQ958AOLALzPlbPqb8C1G8PZK85tND7Jpe69Wualri81PLU+Zc48GVKIMMA==",
+ "version": "7.18.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz",
+ "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@typescript-eslint/typescript-estree": "7.17.0",
- "@typescript-eslint/utils": "7.17.0",
+ "@typescript-eslint/typescript-estree": "7.18.0",
+ "@typescript-eslint/utils": "7.18.0",
"debug": "^4.3.4",
"ts-api-utils": "^1.3.0"
},
@@ -1837,9 +1837,9 @@
}
},
"node_modules/@typescript-eslint/types": {
- "version": "7.17.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.17.0.tgz",
- "integrity": "sha512-a29Ir0EbyKTKHnZWbNsrc/gqfIBqYPwj3F2M+jWE/9bqfEHg0AMtXzkbUkOG6QgEScxh2+Pz9OXe11jHDnHR7A==",
+ "version": "7.18.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
+ "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
"dev": true,
"license": "MIT",
"engines": {
@@ -1851,14 +1851,14 @@
}
},
"node_modules/@typescript-eslint/typescript-estree": {
- "version": "7.17.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.17.0.tgz",
- "integrity": "sha512-72I3TGq93t2GoSBWI093wmKo0n6/b7O4j9o8U+f65TVD0FS6bI2180X5eGEr8MA8PhKMvYe9myZJquUT2JkCZw==",
+ "version": "7.18.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",
+ "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==",
"dev": true,
"license": "BSD-2-Clause",
"dependencies": {
- "@typescript-eslint/types": "7.17.0",
- "@typescript-eslint/visitor-keys": "7.17.0",
+ "@typescript-eslint/types": "7.18.0",
+ "@typescript-eslint/visitor-keys": "7.18.0",
"debug": "^4.3.4",
"globby": "^11.1.0",
"is-glob": "^4.0.3",
@@ -1880,16 +1880,16 @@
}
},
"node_modules/@typescript-eslint/utils": {
- "version": "7.17.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.17.0.tgz",
- "integrity": "sha512-r+JFlm5NdB+JXc7aWWZ3fKSm1gn0pkswEwIYsrGPdsT2GjsRATAKXiNtp3vgAAO1xZhX8alIOEQnNMl3kbTgJw==",
+ "version": "7.18.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz",
+ "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==",
"dev": true,
"license": "MIT",
"dependencies": {
"@eslint-community/eslint-utils": "^4.4.0",
- "@typescript-eslint/scope-manager": "7.17.0",
- "@typescript-eslint/types": "7.17.0",
- "@typescript-eslint/typescript-estree": "7.17.0"
+ "@typescript-eslint/scope-manager": "7.18.0",
+ "@typescript-eslint/types": "7.18.0",
+ "@typescript-eslint/typescript-estree": "7.18.0"
},
"engines": {
"node": "^18.18.0 || >=20.0.0"
@@ -1903,13 +1903,13 @@
}
},
"node_modules/@typescript-eslint/visitor-keys": {
- "version": "7.17.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.17.0.tgz",
- "integrity": "sha512-RVGC9UhPOCsfCdI9pU++K4nD7to+jTcMIbXTSOcrLqUEW6gF2pU1UUbYJKc9cvcRSK1UDeMJ7pdMxf4bhMpV/A==",
+ "version": "7.18.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
+ "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",
"dev": true,
"license": "MIT",
"dependencies": {
- "@typescript-eslint/types": "7.17.0",
+ "@typescript-eslint/types": "7.18.0",
"eslint-visitor-keys": "^3.4.3"
},
"engines": {
@@ -2913,9 +2913,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001643",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz",
- "integrity": "sha512-ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg==",
+ "version": "1.0.30001644",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001644.tgz",
+ "integrity": "sha512-YGvlOZB4QhZuiis+ETS0VXR+MExbFf4fZYYeMTEE0aTQd/RdIjkTyZjLrbYVKnHzppDvnOhritRVv+i7Go6mHw==",
"dev": true,
"funding": [
{
@@ -3385,9 +3385,9 @@
}
},
"node_modules/electron-to-chromium": {
- "version": "1.5.2",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.2.tgz",
- "integrity": "sha512-kc4r3U3V3WLaaZqThjYz/Y6z8tJe+7K0bbjUVo3i+LWIypVdMx5nXCkwRe6SWbY6ILqLdc1rKcKmr3HoH7wjSQ==",
+ "version": "1.5.3",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.3.tgz",
+ "integrity": "sha512-QNdYSS5i8D9axWp/6XIezRObRHqaav/ur9z1VzCDUCH1XIFOr9WQk5xmgunhsTpjjgDy3oLxO/WMOVZlpUQrlA==",
"dev": true,
"license": "ISC"
},
@@ -4880,12 +4880,12 @@
"license": "ISC"
},
"node_modules/magic-string": {
- "version": "0.30.10",
- "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz",
- "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==",
+ "version": "0.30.11",
+ "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
+ "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
"license": "MIT",
"dependencies": {
- "@jridgewell/sourcemap-codec": "^1.4.15"
+ "@jridgewell/sourcemap-codec": "^1.5.0"
}
},
"node_modules/memorystream": {
@@ -5512,9 +5512,9 @@
}
},
"node_modules/phaser3-rex-plugins": {
- "version": "1.80.5",
- "resolved": "https://registry.npmjs.org/phaser3-rex-plugins/-/phaser3-rex-plugins-1.80.5.tgz",
- "integrity": "sha512-hdL3Cm6dK72w6phQdGnEiqqntlwT8SvjU0yit7DkdqiPy/Io1g3KnsRFqndtY+Hu69zaMEuckpIVeQK6yVwx4A==",
+ "version": "1.80.6",
+ "resolved": "https://registry.npmjs.org/phaser3-rex-plugins/-/phaser3-rex-plugins-1.80.6.tgz",
+ "integrity": "sha512-p03OGkuM8RTO5wCAuG8wIT8h/T79lxH18/LApm1JMJarR0qgSNLla/MHKT4Tv0UiMyuGLyOnw0TZ4LkeMQdX0Q==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -5535,9 +5535,9 @@
"license": "MIT"
},
"node_modules/phavuer": {
- "version": "0.15.7",
- "resolved": "https://registry.npmjs.org/phavuer/-/phavuer-0.15.7.tgz",
- "integrity": "sha512-TbLw0IvNVPBP+fkAqTkVGU4ft3V0jsxaezIfVrmkH/XevPHFun47g6iBY/UgYMdSnmMnShUBqRuU/z4n89lqIA==",
+ "version": "0.16.1",
+ "resolved": "https://registry.npmjs.org/phavuer/-/phavuer-0.16.1.tgz",
+ "integrity": "sha512-4b+o2BUnE155qdtSrQTsLM0O/EtI5xxX8JXLvpAX+uKHPx38CzLEkqt3btnXJb/WsrYp5oV7Z/nNrnjcq1J8WA==",
"dev": true,
"license": "MIT",
"peerDependencies": {
diff --git a/package.json b/package.json
index 2c21418..964ba44 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
"jsdom": "^24.1.1",
"npm-run-all2": "^6.2.2",
"phaser3-rex-plugins": "^1.80.5",
- "phavuer": "^0.15.7",
+ "phavuer": "^0.16.1",
"postcss": "^8.4.39",
"prettier": "^3.3.3",
"sass": "^1.77.8",
diff --git a/src/components/World.vue b/src/components/World.vue
index c7cf1fd..dc8b6fc 100644
--- a/src/components/World.vue
+++ b/src/components/World.vue
@@ -25,7 +25,7 @@ import { onBeforeMount, onBeforeUnmount, ref, toRaw, computed } from 'vue'
import Controls from '@/components/utilities/Controls.vue'
import { useGameStore } from '@/stores/game'
import { useAssetStore } from '@/stores/assets'
-import type { Zone, ZoneObject, Character as CharacterT } from '@/types'
+import type { Zone, ZoneObject, ExtendedCharacter } from '@/types'
import TilemapLayer = Phaser.Tilemaps.TilemapLayer
import { useZoneStore } from '@/stores/zone'
import Character from '@/components/sprites/Character.vue'
@@ -64,7 +64,7 @@ const sortedItems = computed(() => {
})
// Event listeners
-gameStore.connection?.on('zone:character:join', (data: CharacterT) => {
+gameStore.connection?.on('zone:character:join', (data: ExtendedCharacter) => {
zoneStore.addCharacter(data)
})
@@ -72,7 +72,7 @@ gameStore.connection?.on('zone:character:leave', (character_id: number) => {
zoneStore.removeCharacter(character_id)
})
-gameStore.connection?.on('character:moved', (data: CharacterT) => {
+gameStore.connection?.on('character:moved', (data: ExtendedCharacter) => {
zoneStore.updateCharacter(data)
})
@@ -85,7 +85,7 @@ onBeforeMount(() => {
type TResponse = {
zone: Zone
- characters: CharacterT[]
+ characters: ExtendedCharacter[]
}
gameStore.connection?.emit('character:zone:request', { zoneId: gameStore.character?.zoneId }, (response: TResponse) => {
diff --git a/src/components/sprites/Character.vue b/src/components/sprites/Character.vue
index d7820ef..1691757 100644
--- a/src/components/sprites/Character.vue
+++ b/src/components/sprites/Character.vue
@@ -1,8 +1,7 @@
<template>
<Container v-if="props.character">
- <Rectangle :x="tileToWorldX(props.layer, props.character.position_x, props.character.position_y)" :y="tileToWorldY(props.layer, props.character.position_x, props.character.position_y)" :origin-x="0.5" :origin-y="16" :fillColor="0xffffff" :width="74" :height="8">
- <Rectangle :x="tileToWorldX(props.layer, props.character.position_x, props.character.position_y)" :y="tileToWorldY(props.layer, props.character.position_x, props.character.position_y)" :origin-x="0.5" :origin-y="31.5" :fillColor="0x09ad19" :width="70" :height="4" />
- </Rectangle>
+ <RoundRectangle :x="tileToWorldX(props.layer, props.character.position_x, props.character.position_y)" :y="tileToWorldY(props.layer, props.character.position_x, props.character.position_y)" :origin-x="0.5" :origin-y="16" :fillColor="0xffffff" :width="74" :height="8" :radius="4" />
+ <RoundRectangle :x="tileToWorldX(props.layer, props.character.position_x, props.character.position_y)" :y="tileToWorldY(props.layer, props.character.position_x, props.character.position_y)" :origin-x="0.5" :origin-y="31.5" :fillColor="0x09ad19" :width="70" :height="4" :radius="4" />
<Text
@create="createText"
:text="props.character.name"
@@ -16,23 +15,34 @@
fontSize: '14px'
}"
/>
- <Image v-if="!props.character.characterType" texture="character" :x="tileToWorldX(props.layer, props.character.position_x, props.character.position_y)" :y="tileToWorldY(props.layer, props.character.position_x, props.character.position_y)" :origin-y="1" />
+ <Container v-if="!props.character.characterType">
+ <Image texture="character" :x="tileToWorldX(props.layer, props.character.position_x, props.character.position_y)" :y="tileToWorldY(props.layer, props.character.position_x, props.character.position_y)" :origin-y="1" />
+ </Container>
+ <Container v-else>
+ <Image v-if="!props.character.isMoving"
+ :texture="charTexture"
+ :x="tileToWorldX(props.layer, props.character.position_x, props.character.position_y)"
+ :y="tileToWorldY(props.layer, props.character.position_x, props.character.position_y)"
+ :origin-y="1"
+ :flipX="props.character.rotation === 6 || props.character.rotation === 4"
+ :flipY="false"
+ />
+ <Sprite v-else
+ :play="charTexture + '-anim'"
+ :x="tileToWorldX(props.layer, props.character.position_x, props.character.position_y)"
+ :y="tileToWorldY(props.layer, props.character.position_x, props.character.position_y)"
+ :origin-y="1"
+ :flipX="props.character.rotation === 6 || props.character.rotation === 4"
+ :flipY="false"
+ />
+ </Container>
- <Image
- v-else
- :texture="charTexture"
- :x="tileToWorldX(props.layer, props.character.position_x, props.character.position_y)"
- :y="tileToWorldY(props.layer, props.character.position_x, props.character.position_y)"
- :origin-y="1"
- :flipX="props.character.rotation === 6 || props.character.rotation === 4"
- :flipY="false"
- />
</Container>
</template>
<script lang="ts" setup>
-import { Container, Image, Rectangle, RoundRectangle, Text } from 'phavuer'
-import { type Character as CharacterT } from '@/types'
+import { Container, Image, RoundRectangle, Sprite, Text } from 'phavuer'
+import { type ExtendedCharacter as CharacterT } from '@/types'
import { tileToWorldX, tileToWorldY } from '@/services/zone'
import { watch, computed } from 'vue'
@@ -54,14 +64,15 @@ const charTexture = computed(() => {
const rotation = props.character.rotation
const spriteId = props.character.characterType.sprite.id
+ const action = props.character.isMoving ? 'walk' : 'idle'
if (rotation === 2 || rotation === 4) {
- return `${spriteId}-idle_left_down`
+ return `${spriteId}-${action}_left_down`
} else if (rotation === 0 || rotation === 6) {
- return `${spriteId}-idle_right_up`
+ return `${spriteId}-${action}_right_up`
}
- return `${spriteId}-idle_left_down` // Default fallback
+ return `${spriteId}-${action}_left_down` // Default fallback
})
watch(
diff --git a/src/components/utilities/Modal.vue b/src/components/utilities/Modal.vue
index 2246e4a..5adb431 100644
--- a/src/components/utilities/Modal.vue
+++ b/src/components/utilities/Modal.vue
@@ -1,7 +1,7 @@
<template>
<Teleport to="body">
<div v-if="isModalOpenRef" class="fixed bg-gray-300/80 border-solid border-2 border-cyan-200 z-50 flex flex-col backdrop-blur-sm shadow-lg" :style="modalStyle">
- <div @mousedown="startDrag" class="cursor-move p-2.5 flex justify-between items-center border-solid border-0 border-b border-cyan-200">
+ <div @mousedown="startDrag" class="cursor-move p-2.5 flex justify-between items-center">
<slot name="modalHeader" />
<div class="flex gap-2.5">
<button @click="toggleFullScreen" class="w-5 h-5 m-0 p-0 relative hover:scale-110 transition-transform duration-300 ease-in-out" v-if="canFullScreen">
diff --git a/src/components/utilities/assetManager/partials/sprite/SpriteDetails.vue b/src/components/utilities/assetManager/partials/sprite/SpriteDetails.vue
index 02a9eb3..6d4b405 100644
--- a/src/components/utilities/assetManager/partials/sprite/SpriteDetails.vue
+++ b/src/components/utilities/assetManager/partials/sprite/SpriteDetails.vue
@@ -71,6 +71,7 @@ import { useAssetManagerStore } from '@/stores/assetManager'
import { useGameStore } from '@/stores/game'
import Accordion from '@/components/utilities/Accordion.vue'
import SpriteActionsInput from '@/components/utilities/assetManager/partials/sprite/partials/SpriteImagesInput.vue'
+import { uuidv4 } from '@/utilities'
const gameStore = useGameStore()
const assetManagerStore = useAssetManagerStore()
@@ -143,10 +144,6 @@ function saveSprite() {
})
}
-function uuidv4() {
- return '10000000-1000-4000-8000-100000000000'.replace(/[018]/g, (c) => (+c ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (+c / 4)))).toString(16))
-}
-
function addNewImage() {
if (!selectedSprite.value) return
diff --git a/src/components/utilities/zoneEditor/ZoneEditor.vue b/src/components/utilities/zoneEditor/ZoneEditor.vue
index b14f7d4..d5df297 100644
--- a/src/components/utilities/zoneEditor/ZoneEditor.vue
+++ b/src/components/utilities/zoneEditor/ZoneEditor.vue
@@ -43,15 +43,12 @@ import ZoneSettings from '@/components/utilities/zoneEditor/partials/ZoneSetting
import { calculateDepth, placeTile, setAllTiles, tileToWorldX, tileToWorldY, sortByDepth } from '@/services/zone'
import { useAssetStore } from '@/stores/assets'
import Objects from '@/components/utilities/zoneEditor/partials/Objects.vue'
-import type { Zone, ZoneEventTile, ZoneObject } from '@/types'
+import type { ZoneEventTile, ZoneObject } from '@/types'
import { storeToRefs } from 'pinia'
import ZoneList from '@/components/utilities/zoneEditor/partials/ZoneList.vue'
import Tileset = Phaser.Tilemaps.Tileset
import TilemapLayer = Phaser.Tilemaps.TilemapLayer
-
-function uuidv4() {
- return '10000000-1000-4000-8000-100000000000'.replace(/[018]/g, (c) => (+c ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (+c / 4)))).toString(16))
-}
+import { uuidv4 } from '@/utilities'
const scene = useScene()
const gameStore = useGameStore()
diff --git a/src/config.ts b/src/config.ts
index 4a929c1..763f5d6 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,4 +1,4 @@
-const dev: boolean = false
+const dev: boolean = true
export default {
name: 'New Quest',
diff --git a/src/screens/Game.vue b/src/screens/Game.vue
index d274783..0282061 100644
--- a/src/screens/Game.vue
+++ b/src/screens/Game.vue
@@ -112,7 +112,14 @@ const preloadScene = (scene: Phaser.Scene) => {
* Load the assets into the Phaser scene
*/
assets.value.forEach((asset) => {
- scene.load.image(asset.key, config.server_endpoint + asset.url)
+ if (asset.group === 'sprites') {
+ if (!asset.frameWidth || !asset.frameHeight) {
+ console.error('Frame width and height must be defined for spritesheets', asset)
+ }
+ scene.load.spritesheet(asset.key, config.server_endpoint + asset.url, { frameWidth: asset.frameWidth, frameHeight: asset.frameHeight })
+ } else {
+ scene.load.image(asset.key, config.server_endpoint + asset.url)
+ }
})
scene.load.image('BLOCK', '/assets/zone/bt_tile.png')
@@ -124,16 +131,17 @@ const preloadScene = (scene: Phaser.Scene) => {
'character',
'data:image/png;base64,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'
)
- // scene.textures.addImage('character', '/assets/avatar/default/idle.png')
- scene.load.spritesheet('characterW', '/assets/avatar/default/walk.png', { frameWidth: 36, frameHeight: 94 })
}
const createScene = (scene: Phaser.Scene) => {
- scene.anims.create({
- key: 'walk',
- frameRate: 7,
- frames: scene.anims.generateFrameNumbers('characterW', { start: 0, end: 3 }),
- repeat: -1
+ assets.value.forEach((asset) => {
+ if (asset.group !== 'sprite_animations') return
+ scene.anims.create({
+ key: asset.key,
+ frameRate: 7,
+ frames: scene.anims.generateFrameNumbers(asset.key, { start: 0, end: 3 }),
+ repeat: -1
+ })
})
/**
diff --git a/src/stores/assets.ts b/src/stores/assets.ts
index 6ed046b..141fb7b 100644
--- a/src/stores/assets.ts
+++ b/src/stores/assets.ts
@@ -1,26 +1,15 @@
import { defineStore } from 'pinia'
-import { type Asset, type Object } from '@/types'
+import { type Asset } from '@/types'
import config from '@/config'
export const useAssetStore = defineStore('assets', {
state: () => ({
assets: [] as Asset[],
- tiles: [] as string[],
- objects: [] as Object[]
}),
actions: {
setAssets(assets: Asset[]) {
this.assets = assets
},
- addAsset(asset: Asset) {
- this.assets.push(asset)
- },
- setTiles(tiles: string[]) {
- this.tiles = tiles
- },
- setObjects(objects: Object[]) {
- this.objects = objects
- },
async fetchAssets() {
return fetch(config.server_endpoint + '/assets')
.then((response) => response.json())
diff --git a/src/stores/zone.ts b/src/stores/zone.ts
index 83ce746..46ea903 100644
--- a/src/stores/zone.ts
+++ b/src/stores/zone.ts
@@ -1,32 +1,44 @@
import { defineStore } from 'pinia'
-import type { Character, Zone } from '@/types'
+import type { ExtendedCharacter, Zone } from '@/types'
export const useZoneStore = defineStore('zone', {
state: () => ({
zone: null as Zone | null,
- characters: [] as Character[]
+ characters: [] as ExtendedCharacter[]
}),
+ getters: {
+ getCharacterById: (state) => {
+ return (id: number) => state.characters.find(char => char.id === id)
+ },
+ getCharacterCount: (state) => {
+ return state.characters.length
+ },
+ isZoneSet: (state) => {
+ return state.zone !== null
+ }
+ },
actions: {
setZone(zone: Zone | null) {
this.zone = zone
},
- setCharacters(characters: Character[]) {
+ setCharacters(characters: ExtendedCharacter[]) {
this.characters = characters
},
- addCharacter(character: Character) {
+ addCharacter(character: ExtendedCharacter) {
this.characters.push(character)
},
- updateCharacter(character: Character) {
- const index = this.characters.findIndex((c) => c.id === character.id)
- if (index === -1) return
- this.characters[index] = character
+ updateCharacter(updatedCharacter: ExtendedCharacter) {
+ const index = this.characters.findIndex(char => char.id === updatedCharacter.id)
+ if (index !== -1) {
+ this.characters[index] = { ...this.characters[index], ...updatedCharacter }
+ }
},
removeCharacter(character_id: number) {
- this.characters = this.characters.filter((c) => c.id !== character_id)
+ this.characters = this.characters.filter(char => char.id !== character_id)
},
reset() {
this.zone = null
this.characters = []
}
}
-})
+})
\ No newline at end of file
diff --git a/src/types.ts b/src/types.ts
index 91b212d..cda9808 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -139,6 +139,10 @@ export type Character = {
items: CharacterItem[]
}
+export type ExtendedCharacter = Character & {
+ isMoving?: boolean
+}
+
export type CharacterItem = {
id: number
characterId: number
diff --git a/src/utilities.ts b/src/utilities.ts
new file mode 100644
index 0000000..d2afc12
--- /dev/null
+++ b/src/utilities.ts
@@ -0,0 +1,3 @@
+export function uuidv4() {
+ return '10000000-1000-4000-8000-100000000000'.replace(/[018]/g, (c) => (+c ^ (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (+c / 4)))).toString(16))
+}
\ No newline at end of file