diff --git a/.husky/pre-commit b/.husky/pre-commit index 69a15eb..60b1ca9 100644 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1 +1 @@ -pnpm check --write --staged --no-errors-on-unmatched +pnpm precommit diff --git a/.vscode/settings.json b/.vscode/settings.json index 69b8a7a..509d7b9 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -21,7 +21,7 @@ "editor.defaultFormatter": "biomejs.biome" }, "[json]": { - "editor.defaultFormatter": "vscode.json-language-features" + "editor.defaultFormatter": "biomejs.biome" }, "[jsonc]": { "editor.defaultFormatter": "biomejs.biome" diff --git a/biome.json b/biome.json index 8452eee..ac0fa48 100644 --- a/biome.json +++ b/biome.json @@ -21,7 +21,13 @@ "enabled": true, "indentStyle": "tab" }, - "assist": { "actions": { "source": { "organizeImports": "on" } } }, + "assist": { + "actions": { + "source": { + "organizeImports": "on" + } + } + }, "linter": { "enabled": true, "rules": { @@ -41,5 +47,20 @@ "formatter": { "quoteStyle": "double" } - } + }, + "overrides": [ + { + "includes": [ + "src/data/CHARACTERS_DATA.ts", + "src/data/MONSTERLING_DATA_*.ts" + ], + "linter": { + "rules": { + "complexity": { + "useLiteralKeys": "off" + } + } + } + } + ] } diff --git a/package.json b/package.json index bcc8c31..ea29aaf 100644 --- a/package.json +++ b/package.json @@ -10,13 +10,16 @@ "build": "rm -rf dist && vite build && tsc --noEmit", "preview": "vite preview", "test": "vitest run", - "format": "biome format --write", - "lint": "biome lint", + "format": "biome check --write .", + "format:check": "biome check .", + "lint": "biome lint .", + "lint:fix": "biome lint --write .", "check": "biome check", "fix": "biome check --fix", "deploy": "npm run build && wrangler deploy", "cf-typegen": "wrangler types", - "prepare": "husky" + "prepare": "husky", + "precommit": "lint-staged" }, "dependencies": { "@base-ui/react": "1.4.1", @@ -61,6 +64,7 @@ }, "devDependencies": { "@biomejs/biome": "2.4.5", + "@rolldown/plugin-babel": "^0.2.3", "@rsbuild/core": "2.0.1", "@tailwindcss/typography": "0.5.16", "@tanstack/devtools-vite": "0.6.0", @@ -71,14 +75,20 @@ "@types/react-dom": "19.2.0", "@vitejs/plugin-react": "6.0.1", "@vitejs/plugin-rsc": "0.5.24", + "babel-plugin-react-compiler": "^1.0.0", "husky": "9.1.7", "jsdom": "28.1.0", "lint-staged": "16.4.0", "react-scan": "0.5.7", - "typescript": "5.7.2", + "typescript": "7.0.1-rc", "vite": "8.0.0", "vitest": "3.0.5", "wrangler": "4.70.0" }, - "packageManager": "pnpm@11.2.2" + "packageManager": "pnpm@11.2.2", + "lint-staged": { + "*": [ + "biome check --write --no-errors-on-unmatched --files-ignore-unknown=true" + ] + } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 57d33f4..c49068f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -129,6 +129,9 @@ importers: '@biomejs/biome': specifier: 2.4.5 version: 2.4.5 + '@rolldown/plugin-babel': + specifier: ^0.2.3 + version: 0.2.3(@babel/core@7.29.7)(@babel/runtime@7.29.7)(rolldown@1.0.0-rc.9(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0))(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@22.10.2)(esbuild@0.27.3)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0)) '@rsbuild/core': specifier: 2.0.1 version: 2.0.1 @@ -155,10 +158,13 @@ importers: version: 19.2.0(@types/react@19.2.0) '@vitejs/plugin-react': specifier: 6.0.1 - version: 6.0.1(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@22.10.2)(esbuild@0.27.3)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0)) + version: 6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7)(@babel/runtime@7.29.7)(rolldown@1.0.0-rc.9(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0))(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@22.10.2)(esbuild@0.27.3)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@22.10.2)(esbuild@0.27.3)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0)) '@vitejs/plugin-rsc': specifier: 0.5.24 version: 0.5.24(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@22.10.2)(esbuild@0.27.3)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0)) + babel-plugin-react-compiler: + specifier: ^1.0.0 + version: 1.0.0 husky: specifier: 9.1.7 version: 9.1.7 @@ -172,8 +178,8 @@ importers: specifier: 0.5.7 version: 0.5.7(esbuild@0.27.3)(eslint@10.4.1(jiti@2.7.0))(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(rollup@4.60.4) typescript: - specifier: 5.7.2 - version: 5.7.2 + specifier: 7.0.1-rc + version: 7.0.1-rc vite: specifier: 8.0.0 version: 8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@22.10.2)(esbuild@0.27.3)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0) @@ -1159,42 +1165,84 @@ packages: cpu: [arm] os: [android] + '@oxc-parser/binding-android-arm-eabi@0.135.0': + resolution: {integrity: sha512-sHeZItACNcA5WRAWqF6ixriR4GkZDyY10gVgnZU7pXku1DjHFATSqnwZM809jl0gXPHxb6fKzYQCK7bNK5cACQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm] + os: [android] + '@oxc-parser/binding-android-arm64@0.132.0': resolution: {integrity: sha512-SThDrSeamB/kG2+NxcJ5/wSLcV6dUqDknrPLqFYQ0ST/55mtBP4M7Q/f3QbubH6aAd11wpzZn/nwbVRSdobOpg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [android] + '@oxc-parser/binding-android-arm64@0.135.0': + resolution: {integrity: sha512-wPte+SzgzWWFgMSF8YZDNM+tBXtJg0AXBi7+tU3yS2z1f2Af9kRLZLKuJojADmuD/cZexmnMHHC3SDItTW77Iw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [android] + '@oxc-parser/binding-darwin-arm64@0.132.0': resolution: {integrity: sha512-Lc0f/TYoKBghE5/2Gsv7bLXk+TJZunx2Tf61X8hG4ARXdc8UYI26dCGccFSd1AyFbK3jfaNXtMnupggDbjPXdQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [darwin] + '@oxc-parser/binding-darwin-arm64@0.135.0': + resolution: {integrity: sha512-BmKz3lHIsqVos+9aPcdYCT9MG3APoUyM43KlEFhJMWNVDOGG8FKyiFz81Bc+mGz2o0hpuQ3PfXLfVWJrKXjo2g==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [darwin] + '@oxc-parser/binding-darwin-x64@0.132.0': resolution: {integrity: sha512-RG2eJIpf7C21z9HSSXFw1bTArdpKe7Y4fwcJTwRq1yCSe1vSavaN9GA1sm9KqzemTLAGVktQ+7qBTGp0vQeUZg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [darwin] + '@oxc-parser/binding-darwin-x64@0.135.0': + resolution: {integrity: sha512-dM8BS+8+Br1fNvmh2QZbGiHaYttwLebRa6J4Uz9vuFzMNmvsdRYwf7993ptOaV0JTrR63AaoVLjX7nhWbijxjQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [darwin] + '@oxc-parser/binding-freebsd-x64@0.132.0': resolution: {integrity: sha512-wQIPntPLtJ8NcBpvKPbEv3NqzV6k8eP8tP/jE9Rg8HTg/j7urZGFSsTCPCW5k77Qfw2DM4vRvc9p3I4yq/Shvw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [freebsd] + '@oxc-parser/binding-freebsd-x64@0.135.0': + resolution: {integrity: sha512-xlZnvvJdR9bGu2pOhvR5hMuKPHCE6Sa9owK5A484mzjHdm75VRV5nCs5w/jkmGODMMTFc+KN7EnZqEieM813kw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [freebsd] + '@oxc-parser/binding-linux-arm-gnueabihf@0.132.0': resolution: {integrity: sha512-PixKEpeSe3yxQWqNyOCBALRYc72+Tj7ILDofUl3iXo25cVOzLA6jHUhmOINRtWIPh7dbUie3QNeabwaQpZTw6w==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [linux] + '@oxc-parser/binding-linux-arm-gnueabihf@0.135.0': + resolution: {integrity: sha512-PSR8LmBK/H/PQRiN8g7RebQgZX/ntVCrdT/JBfNxE5ezdHG1s2i4rbazsRJYD83TTI1MmgTpC0MGL42PLtskQQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm] + os: [linux] + '@oxc-parser/binding-linux-arm-musleabihf@0.132.0': resolution: {integrity: sha512-sCR+DzGHlyHKnbA2z9zWjTUhIo8Sy0enJl4RDsBwPmkxYynPatpwOAWe8W5127SlW0boqUWHGtr1NWn5UwIhXQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [linux] + '@oxc-parser/binding-linux-arm-musleabihf@0.135.0': + resolution: {integrity: sha512-I85GJXzfUsigkkk7Ngdz95C217M4FdUi1Z2HrX5UyPmURobwQZ7m2bbUvwFkz4VGZd+lymFGKHvDZ3RQC9qOzA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm] + os: [linux] + '@oxc-parser/binding-linux-arm64-gnu@0.132.0': resolution: {integrity: sha512-sQBix5P2cW+IpzTcCwYxnh9yALrKSIkKJThspBvMGcygSMnbzkSvhN7SfuX1hvBk8y1XEChsdkU3ET0V5DmzUw==} engines: {node: ^20.19.0 || >=22.12.0} @@ -1202,6 +1250,13 @@ packages: os: [linux] libc: [glibc] + '@oxc-parser/binding-linux-arm64-gnu@0.135.0': + resolution: {integrity: sha512-zqEY0npz0g0aGZj/8a5BclunjVDytsBQHYtIC10Gd26HcrLwbVF6YDbqRQjunMGYdSo97u6xOBl05aTDI2diDQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [linux] + libc: [glibc] + '@oxc-parser/binding-linux-arm64-musl@0.132.0': resolution: {integrity: sha512-WozHg3Kc//8Sk756HXXgMbEAvqtG+Lzb9JOojwQzIGDtN78Az2dLttkb71akWYUF/8IgYfDSlfKh4Uot8is5Vw==} engines: {node: ^20.19.0 || >=22.12.0} @@ -1209,6 +1264,13 @@ packages: os: [linux] libc: [musl] + '@oxc-parser/binding-linux-arm64-musl@0.135.0': + resolution: {integrity: sha512-mWAfprP819gQ2qYst1RxgTI8b/z0b29OpoKfRflIXLHde2dZLihQD4g47Onuvtpo5GPIkMYPRlX9QoeZfs/GnQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [linux] + libc: [musl] + '@oxc-parser/binding-linux-ppc64-gnu@0.132.0': resolution: {integrity: sha512-CmX/ulNBOEwWTyVRmcpYKAcAizW6+OjtLJgo7fXoL9OqQvjF4VER8tPomv44vwzfSCy1BHbsB0ZlZYzYJNj4cA==} engines: {node: ^20.19.0 || >=22.12.0} @@ -1216,6 +1278,13 @@ packages: os: [linux] libc: [glibc] + '@oxc-parser/binding-linux-ppc64-gnu@0.135.0': + resolution: {integrity: sha512-gri8c2AOmJKJwOux2KTHFBfUaXoJURuVMKhmKEi/2hTF55cQteTDV2XNfTiE5oCC+Tnem1Y4/MWzcyDadtsSag==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [ppc64] + os: [linux] + libc: [glibc] + '@oxc-parser/binding-linux-riscv64-gnu@0.132.0': resolution: {integrity: sha512-j9oQS+hM90SdhviNGWbPgT4+Rlq+ac++q/zjgwPD1mVHgxHzATvoRGtDx0sXGmFOQ9J9YkwAhYGb5MAHL6TAsA==} engines: {node: ^20.19.0 || >=22.12.0} @@ -1223,6 +1292,13 @@ packages: os: [linux] libc: [glibc] + '@oxc-parser/binding-linux-riscv64-gnu@0.135.0': + resolution: {integrity: sha512-Y2tkupCG5wo0SxH2rMLG4d4Kmv6DaM3sBp+GuM5lox0S8Za6VxKgQrY2Mut088QQxKkEE89n/4CCCgmw2o0e3Q==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [riscv64] + os: [linux] + libc: [glibc] + '@oxc-parser/binding-linux-riscv64-musl@0.132.0': resolution: {integrity: sha512-bLz+Xi+Agnfmd7kWPEsSVwCn2k4EyIalZkNBcQ0OGIv9rqn8VgCPLNd03tM9mKX/5TdlvDXalz0q71BIrOPNqg==} engines: {node: ^20.19.0 || >=22.12.0} @@ -1230,6 +1306,13 @@ packages: os: [linux] libc: [musl] + '@oxc-parser/binding-linux-riscv64-musl@0.135.0': + resolution: {integrity: sha512-xDRJq6i6WTynjeP+ISbDpyH4p9BaJ0wuQcL0lCSDkt9qOXC9dmwpOu1VG/TlwmPI3KpYntmO9nJCuc3TMTsNBA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [riscv64] + os: [linux] + libc: [musl] + '@oxc-parser/binding-linux-s390x-gnu@0.132.0': resolution: {integrity: sha512-U6t2qbJU0ypTfyj9QV3W1Y6mITDTL8ai/OR6NUn85vyHthOvobKWgXzU4tu0EskSzlpuVFz1g0jFGulDIUKHxQ==} engines: {node: ^20.19.0 || >=22.12.0} @@ -1237,6 +1320,13 @@ packages: os: [linux] libc: [glibc] + '@oxc-parser/binding-linux-s390x-gnu@0.135.0': + resolution: {integrity: sha512-V4MoUuiCRNvihxhIufRxvK+ka013V4joTSK0FAGA1KEjLuNprfH6N/Qw2uxQEVIFuNYMhD/hV6xJ/ptbzlKdHg==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [s390x] + os: [linux] + libc: [glibc] + '@oxc-parser/binding-linux-x64-gnu@0.132.0': resolution: {integrity: sha512-WcEaSNHFk8yz5YFlQQAlhq6jOFmZBB/RKE7uzhyCIf+pF1Lmv9gUH4221mle2Gd9iHyWT3ySNph8yZgb1xYdWg==} engines: {node: ^20.19.0 || >=22.12.0} @@ -1244,6 +1334,13 @@ packages: os: [linux] libc: [glibc] + '@oxc-parser/binding-linux-x64-gnu@0.135.0': + resolution: {integrity: sha512-JCFZ7zM7KXOKoPAbK/ZB4wY0M1jxRECiem2UQuiXLjzGqS9+hno7mtX+qyK2F7HWK2xPhyJb+frpcOtk5DKOtg==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [linux] + libc: [glibc] + '@oxc-parser/binding-linux-x64-musl@0.132.0': resolution: {integrity: sha512-iQrV4iJzQgRwK3BWRmQl1C3C6g3wYpXN2WLdQdyR+efoUnncdShZAVp9OgcojtlD3MDRbuOMGG3SjxF4fL4nlQ==} engines: {node: ^20.19.0 || >=22.12.0} @@ -1251,35 +1348,71 @@ packages: os: [linux] libc: [musl] + '@oxc-parser/binding-linux-x64-musl@0.135.0': + resolution: {integrity: sha512-9jSVS1b3hOV7sdKH4aA2DFfnTz0RgQd0v2BefR+LYbH8yIlmSM22JJZbAAjVeVXmFgUAk3zJQ1tpE/Nd+Vi2YQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [linux] + libc: [musl] + '@oxc-parser/binding-openharmony-arm64@0.132.0': resolution: {integrity: sha512-FWzmUGrZ6GUby4U7WIwcCtab6tdmlTO3xTRRKyb5kjIJVEiaUAT8animUG/nK8ZCA8gkRkPOTId4rl6uTqUmJQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [openharmony] + '@oxc-parser/binding-openharmony-arm64@0.135.0': + resolution: {integrity: sha512-M857ZLBSdn1Uy/SJJz5zh0qGu67B4P9omCgXGBU2LLqTzraX6ZjVNaKq5yW1PDw/LgJXDXR/dbZfgmB310f11Q==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [openharmony] + '@oxc-parser/binding-wasm32-wasi@0.132.0': resolution: {integrity: sha512-TlbMppxJI5CjWDes0QaP6G3aneVg1yikBu5QYI+DUShF9WDL66ccgKFNNGmi/Wybtszw6hxwAvv76T4DaPKnHw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [wasm32] + '@oxc-parser/binding-wasm32-wasi@0.135.0': + resolution: {integrity: sha512-2w6DVcntQZX9U5RhXtgiWb3FLWFB5EcwI1U8yr3htOCJUJjagN4BFUHz/Y/d9ZsumndZ6ByxxWEtbUZNE1bfFw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [wasm32] + '@oxc-parser/binding-win32-arm64-msvc@0.132.0': resolution: {integrity: sha512-RH/NbFjGKqdUAUi7Oh3LQPxUk2hsWFEEQ38HSnbRQT8QjBZFKqL1fMbmsB3N4jy/KPh9iX94+9dmkEMBBbambw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [win32] + '@oxc-parser/binding-win32-arm64-msvc@0.135.0': + resolution: {integrity: sha512-rX1U8+IH2Z37EJjDXKa1iifvUQAdba+vZ4Ewj1iaG5eA/QaSybzclCOwtWa0/5BuUQnnK/T2JHUEFrwhL6Ck2Q==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [win32] + '@oxc-parser/binding-win32-ia32-msvc@0.132.0': resolution: {integrity: sha512-JUr4jQY9jxoIB/YTLXr6XofSi5xikj6p5/Ns1h0VOBDT0j1jKU+kMsv2xxv51RwnETcXpA1Yw/9oUAfcqfaqEA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [ia32] os: [win32] + '@oxc-parser/binding-win32-ia32-msvc@0.135.0': + resolution: {integrity: sha512-9FAisBbH1QICGAjlJobiuKGd/jOuVmyqniWdQMwTa5SkCl6hhuotBCJf1n46B0flYbSOR5TzfV9HZCWSyb3c/Q==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [ia32] + os: [win32] + '@oxc-parser/binding-win32-x64-msvc@0.132.0': resolution: {integrity: sha512-2dapgHpA5X8DSXF4AU36hJWYf6zP0tKjMXFRAZFBD62pkevW/uhFDXoFH9Y/3Fd2EtDrw5ByNnR1wVE9X9y0SQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [win32] + '@oxc-parser/binding-win32-x64-msvc@0.135.0': + resolution: {integrity: sha512-wYF+A2AzJ2n7ul6q+Z2G/ia0S2+8cUp0AgWZzoFvF4WmUcl1P7p+o6se1Gdr5wGnWuF0iAMIkGddrjCarNr2yA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [win32] + '@oxc-project/runtime@0.115.0': resolution: {integrity: sha512-Rg8Wlt5dCbXhQnsXPrkOjL1DTSvXLgb2R/KYfnf1/K+R0k6UMLEmbQXPM+kwrWqSmWA2t0B1EtHy2/3zikQpvQ==} engines: {node: ^20.19.0 || >=22.12.0} @@ -1290,6 +1423,9 @@ packages: '@oxc-project/types@0.132.0': resolution: {integrity: sha512-FESMOxil5Se014ui/Eq8fT5uHJo6nIRwH0PfJrZJXs6Gek3ZVFOrpUv3YIZT20m+extU98Hg1Ym72U58rlsxUQ==} + '@oxc-project/types@0.135.0': + resolution: {integrity: sha512-wR+xRdFkUBMvcAjBJ2q2kcZM6d+DKu2NgoOyxZgYwZdLhmiv6+rnO8PZ/P68kMiZtIKm+pW7zyEJ4kSOs0vo+Q==} + '@oxc-resolver/binding-android-arm-eabi@11.20.0': resolution: {integrity: sha512-IjfWOXRgJFNdORDl+Uf1aibNgZY2guOD3zmOhx1BGVb/MIiqlFTdmjpQNplSN58lhWehnX4UNqC3QwpUo8pjJg==} cpu: [arm] @@ -2222,8 +2358,8 @@ packages: '@radix-ui/rect@1.1.1': resolution: {integrity: sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==} - '@react-grab/cli@0.1.44-dev.c0e9887': - resolution: {integrity: sha512-ikR/o8IC1PDPYnstuTF5NV058V5OsO7rgs1+94EmAQQxnJOQhrAZT0RHd+U7uEY9AQRUpUB4OGKezjFJ4R9mUQ==} + '@react-grab/cli@0.1.47': + resolution: {integrity: sha512-Cc7d8mSwvoV8gpeTQbE8dMPdeXIyO6w+yIhzgi3jY06i03WLNhb/6jIxNBNF1cVRI7ujnFQXZA66BbnBNTpBSw==} hasBin: true '@react-native-async-storage/async-storage@3.0.2': @@ -2389,6 +2525,23 @@ packages: cpu: [x64] os: [win32] + '@rolldown/plugin-babel@0.2.3': + resolution: {integrity: sha512-+zEk16yGlz1F9STiRr6uG9hmIXb6nprjLczV/htGptYuLoCuxb+itZ03RKCEeOhBpDDd1NU7qF6x1VLMUp62bw==} + engines: {node: '>=22.12.0 || ^24.0.0'} + peerDependencies: + '@babel/core': ^7.29.0 || ^8.0.0-rc.1 + '@babel/plugin-transform-runtime': ^7.29.0 || ^8.0.0-rc.1 + '@babel/runtime': ^7.27.0 || ^8.0.0-rc.1 + rolldown: ^1.0.0-rc.5 + vite: ^8.0.0 + peerDependenciesMeta: + '@babel/plugin-transform-runtime': + optional: true + '@babel/runtime': + optional: true + vite: + optional: true + '@rolldown/pluginutils@1.0.0-beta.40': resolution: {integrity: sha512-s3GeJKSQOwBlzdUrj4ISjJj5SfSh+aqn0wjOar4Bx95iV1ETI7F6S/5hLcfAxZ9kXDcyrAkxPlqmd1ZITttf+w==} @@ -3113,6 +3266,126 @@ packages: resolution: {integrity: sha512-4h0tY8ppCkdCzcrl2YM5M3my0xsE1Tf8om3owEu5oPWmXwkKRmk0j0LGDzYBGUcAlesEbxBhazqu/K4cu3Ug7w==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript/typescript-aix-ppc64@7.0.1-rc': + resolution: {integrity: sha512-oqq2ZfEJ7BQuufcC3QBQndZLPNyamYNHLao8lKRBeeSkZKypBqxPSgkzrcFZtbYcIaBvpiyUnQP9MT7DEYHWbw==} + engines: {node: '>=16.20.0'} + cpu: [ppc64] + os: [aix] + + '@typescript/typescript-darwin-arm64@7.0.1-rc': + resolution: {integrity: sha512-Slc0yTftT2F/uGDmtPst8ijydneL6uZaLEyr2UjahxZpbhTjHFBJ5agXtVz/TL4A+ldxzjzj+E8QtLZlh/5mXw==} + engines: {node: '>=16.20.0'} + cpu: [arm64] + os: [darwin] + + '@typescript/typescript-darwin-x64@7.0.1-rc': + resolution: {integrity: sha512-h68iFW/LbA1/BsGgSRGFw981/3s1f/rY27YrmeZNuN+ly7dI+fiDduwT9ZT9866x2onoKNRq7PTyxSKyKDzfAQ==} + engines: {node: '>=16.20.0'} + cpu: [x64] + os: [darwin] + + '@typescript/typescript-freebsd-arm64@7.0.1-rc': + resolution: {integrity: sha512-DE+ppd8Ix2c6OMuRkKY4PJ4hngMGJ9M95OQUP17p9xL/1IKXof7npIeuusMN/bgL5o5JzMfSGh+N+5scTYRg0Q==} + engines: {node: '>=16.20.0'} + cpu: [arm64] + os: [freebsd] + + '@typescript/typescript-freebsd-x64@7.0.1-rc': + resolution: {integrity: sha512-ST1ozHMw0u+CLOnWkcTyWDMV4Qn9osZ6fd1V1lnKDM1t0hZIp81mdGpdHxyHJjd7jdGrb6Gb/QXcZ1uqZ0t5zw==} + engines: {node: '>=16.20.0'} + cpu: [x64] + os: [freebsd] + + '@typescript/typescript-linux-arm64@7.0.1-rc': + resolution: {integrity: sha512-N46pRihK3t5zD5MUtTQcdmQUqr1WI4U2nxno1gLwOtRSsB4krFkRjPHcQNG7h2DtRkX64rQiReX6WKwg2wprMA==} + engines: {node: '>=16.20.0'} + cpu: [arm64] + os: [linux] + + '@typescript/typescript-linux-arm@7.0.1-rc': + resolution: {integrity: sha512-gHmHwT5Naq5CKM8g9bbaGeEpnwQEvWCLn3fwP4K2m61VQdDKkPk0Dhab/OoZ4LV2SrMddmclYXTzpyg23YGt5g==} + engines: {node: '>=16.20.0'} + cpu: [arm] + os: [linux] + + '@typescript/typescript-linux-loong64@7.0.1-rc': + resolution: {integrity: sha512-G17Sao312rgiPBTh2F4nOpLpa3CcnBSaNhqNghZk2LNhnsp1RaMO5HMq2me21gqu9xLpc6CIgHtOzU6JBgNlfg==} + engines: {node: '>=16.20.0'} + cpu: [loong64] + os: [linux] + + '@typescript/typescript-linux-mips64el@7.0.1-rc': + resolution: {integrity: sha512-0FQspOb5UsQ4tQKvWgUO3pS9OIWkP7/8dPRWq+CRazJUeQZ4LBjtYK52jg5iIOrvItrVl2CwvRtrU3/9OihwJg==} + engines: {node: '>=16.20.0'} + cpu: [mips64el] + os: [linux] + + '@typescript/typescript-linux-ppc64@7.0.1-rc': + resolution: {integrity: sha512-SUmwfVBEv6A2Ld0eWfcvW0FqrgemfQL8jFGOmV1qYxsDqumjE5DekHXqbstgmbE4SHr4rrjHjvmuGCY+kTH/vw==} + engines: {node: '>=16.20.0'} + cpu: [ppc64] + os: [linux] + + '@typescript/typescript-linux-riscv64@7.0.1-rc': + resolution: {integrity: sha512-rxeqnNnGiYzv/LlPHi/3+4p0ooR1cNJLjRIHXKovtiVmxXGJq6gtw8VSpbHuWPekyFMXgIAoLCZN0SQ51rAALQ==} + engines: {node: '>=16.20.0'} + cpu: [riscv64] + os: [linux] + + '@typescript/typescript-linux-s390x@7.0.1-rc': + resolution: {integrity: sha512-RYWCHCiPypxajdRHM2CNK/eM22e4Ex5TTjV2pXf7PTtBowGr0xX8i8kIMknyZS0LX2QfleYHouaoMVsFDSle3g==} + engines: {node: '>=16.20.0'} + cpu: [s390x] + os: [linux] + + '@typescript/typescript-linux-x64@7.0.1-rc': + resolution: {integrity: sha512-PfLJSu0JzroDkqw2m4nqflPEcn8yev0m/vHFQlY9EzHorzjR6QG0wL8AJHvnD1e6h1s76AZngJ5u+z1K/D/HKw==} + engines: {node: '>=16.20.0'} + cpu: [x64] + os: [linux] + + '@typescript/typescript-netbsd-arm64@7.0.1-rc': + resolution: {integrity: sha512-FfbPxH3dTfp8yVIaNM7bdWTixXuyxpzoemluqcqMROSIz+ImpCG3Q9HO9Ptzp9/giv+P9YYEnCMSXh61migj2w==} + engines: {node: '>=16.20.0'} + cpu: [arm64] + os: [netbsd] + + '@typescript/typescript-netbsd-x64@7.0.1-rc': + resolution: {integrity: sha512-FzdTfSzhRYb6hlav6K3cI5RVgcvCTvNAu/vc+t7B6AmZkThQ+t/1ntnvT5fnHmY1Az2RIBw7/b+qtCEG61HJTQ==} + engines: {node: '>=16.20.0'} + cpu: [x64] + os: [netbsd] + + '@typescript/typescript-openbsd-arm64@7.0.1-rc': + resolution: {integrity: sha512-PQGhlxfNig+0YQ9Wwzd0USPBkt6w/ZqkBQWsU7G/0JkTzunJel+jSWwhKw4947pak/m7hGSeYiI04xReDLGZww==} + engines: {node: '>=16.20.0'} + cpu: [arm64] + os: [openbsd] + + '@typescript/typescript-openbsd-x64@7.0.1-rc': + resolution: {integrity: sha512-WJ7NYgO2mHmLUkI/tZ+hl8lFd26QPJqO8ONOHNuYbdsybLvSB6B6sep222JIVrOfPRDGvFinbGGB+l3m1FWRWA==} + engines: {node: '>=16.20.0'} + cpu: [x64] + os: [openbsd] + + '@typescript/typescript-sunos-x64@7.0.1-rc': + resolution: {integrity: sha512-UYjDeUxd765V9qcwlUPk4pEXyL0i3G76CJm9baK4i99u1pGO1psf3nXDw4MMmElVOPvGbZag99ZR/O59E2OX6w==} + engines: {node: '>=16.20.0'} + cpu: [x64] + os: [sunos] + + '@typescript/typescript-win32-arm64@7.0.1-rc': + resolution: {integrity: sha512-KzXzFSXZOm7zvEt2Aw0MsB2LbTL88znAiVqTDNAOHdlEb7brgmUQh/X2wM/8Be+N0fjEqWKl65cBKNwpWEbJiw==} + engines: {node: '>=16.20.0'} + cpu: [arm64] + os: [win32] + + '@typescript/typescript-win32-x64@7.0.1-rc': + resolution: {integrity: sha512-98R3+OqDr/r0/PLWEoXu88AE0lGVLNd335Ew8ONgzK1JWkNs4ou/5BGt3Or1ij4iXjH+c7PRL+jFjCbtWze+EA==} + engines: {node: '>=16.20.0'} + cpu: [x64] + os: [win32] + '@vitejs/plugin-react@6.0.1': resolution: {integrity: sha512-l9X/E3cDb+xY3SWzlG1MOGt2usfEHGMNIaegaUGFsLkb3RCn/k8/TOXBcab+OndDI4TBtktT8/9BwwW8Vi9KUQ==} engines: {node: ^20.19.0 || >=22.12.0} @@ -3276,6 +3549,9 @@ packages: babel-dead-code-elimination@1.0.12: resolution: {integrity: sha512-GERT7L2TiYcYDtYk1IpD+ASAYXjKbLTDPhBtYj7X1NuRMDTMtAx9kyBenub1Ev41lo91OHCKdmP+egTDmfQ7Ig==} + babel-plugin-react-compiler@1.0.0: + resolution: {integrity: sha512-Ixm8tFfoKKIPYdCCKYTsqv+Fd4IJ0DQqMyEimo+pxUOMUR9cVPlwTrFt9Avu+3cb6Zp3mAzl+t1MrG2fxxKsxw==} + babel-plugin-syntax-hermes-parser@0.33.3: resolution: {integrity: sha512-/Z9xYdaJ1lC0pT9do6TqCqhOSLfZ5Ot8D5za1p+feEfWYupCOfGbhhEXN9r2ZgJtDNUNRw/Z+T2CvAGKBqtqWA==} @@ -3525,8 +3801,8 @@ packages: resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==} engines: {node: '>=6'} - deslop-js@0.0.24: - resolution: {integrity: sha512-ygcRwJXCUedo+hN1L4Ysm7luo4VWOvKEz/kRKWMlFp5bAtTKeXo+8fk/hQaJKsJ/nfahiqkhlYTlrKIR/5nsQg==} + deslop-js@0.5.8: + resolution: {integrity: sha512-Vq9D2x4dAIW24zcH55DTrl3/vi13UNKfXgw0yj7ULTssZ6KOdw/oyBHtlvE94KFC9yYEhgFTrGjaqqZKvV9pwA==} destroy@1.2.0: resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==} @@ -4494,11 +4770,15 @@ packages: resolution: {integrity: sha512-+0LAPHaqtfQlvWdpaAa09SmOaZZgP8C552xosEkGJ4+ruEwP1Vgx+sqBgcBCNfR6KDCmagGOZTde8wmAvcI/Hg==} engines: {node: ^20.19.0 || >=22.12.0} + oxc-parser@0.135.0: + resolution: {integrity: sha512-/DaPStu0s2zzNSRRniKyTPM6Z/o+DapOp2JYNKDL8AsgaBGPK2IdZyB87SQjVH+xeQPz+Qr9mrjglfkYgtbVRA==} + engines: {node: ^20.19.0 || >=22.12.0} + oxc-resolver@11.20.0: resolution: {integrity: sha512-CblytBiV/a/ZXY34dsVU2NxhIOxMXst8CvDCtyBelVITgd7PLrKzbEbA6oKLdPjvDKDzCiW48qzmzZ+mYaqn+g==} - oxlint-plugin-react-doctor@0.5.5-dev.daf0579: - resolution: {integrity: sha512-+M0V1PEXlfnqmoU4P70z/0YYWv+P60D4ug0ndMtNM5eso2izLtN7BcLk6aAb1R90T/k1ADqx53bmZxWVpVaUGw==} + oxlint-plugin-react-doctor@0.5.8: + resolution: {integrity: sha512-L0jveKAMbqF1qAqA2Ksu8aH0/Q8FDQxLwXmHYgALa2XlsxEUuamJ+1Da2MhPWJ2ahn+ekFbnWK20qixxD+fw6A==} engines: {node: ^20.19.0 || >=22.13.0} oxlint@1.66.0: @@ -4632,8 +4912,8 @@ packages: react-devtools-core@6.1.5: resolution: {integrity: sha512-ePrwPfxAnB+7hgnEr8vpKxL9cmnp7F322t8oqcPshbIQQhDKgFDW4tjhF2wjVbdXF9O/nyuy3sQWd9JGpiLPvA==} - react-doctor@0.5.5-dev.daf0579: - resolution: {integrity: sha512-8c44G3GHp2DYTIMuBDvUBq2MtgXLi6HKy2/DSWq7JaHyu5IgnPb3WkxZWCYMTUfAJ037mlZsfKTD+ijh9I1hsg==} + react-doctor@0.5.8: + resolution: {integrity: sha512-gDXDQ+48KeFq2jkVgsUhQ67oQ+kUMdnIaA+YeS9VXXZFXSg9wxY5dDxurEpILSh8RwO06W8p6uCnTR+wn5B/GA==} engines: {node: ^20.19.0 || >=22.13.0} hasBin: true @@ -4642,8 +4922,8 @@ packages: peerDependencies: react: ^19.2.0 - react-grab@0.1.44-dev.c0e9887: - resolution: {integrity: sha512-jk+P/F1btgS+yw6G0HfVV+71MMcnvexaepaVv09iiA/whI5en/aXv551dcgTHy01YDIV7rd7j9HEYIo4kSqI2w==} + react-grab@0.1.47: + resolution: {integrity: sha512-1GNy24KMJ4CY1IxorYO9mydItGi0L1HkQB19uYU3t0BMsJB0K+D/QYiaBz+rugRynyY8LzmXIuOcon1TykLlCg==} hasBin: true peerDependencies: react: '>=17.0.0' @@ -5080,6 +5360,11 @@ packages: engines: {node: '>=14.17'} hasBin: true + typescript@7.0.1-rc: + resolution: {integrity: sha512-drEP77wK7CCDlPfXZH4e008UUQOsw1DFmHmZOZjuNA+yoDLLnSNMZRXi90NbV/1LVo7SbNLq1bs3jjvk49TEqQ==} + engines: {node: '>=16.20.0'} + hasBin: true + ufo@1.6.4: resolution: {integrity: sha512-JFNbkD1Svwe0KvGi8GOeLcP4kAWQ609twvCdcHxq1oSL8svv39ZuSvajcD8B+5D0eL4+s1Is2D/O6KN3qcTeRA==} @@ -6232,51 +6517,99 @@ snapshots: '@oxc-parser/binding-android-arm-eabi@0.132.0': optional: true + '@oxc-parser/binding-android-arm-eabi@0.135.0': + optional: true + '@oxc-parser/binding-android-arm64@0.132.0': optional: true + '@oxc-parser/binding-android-arm64@0.135.0': + optional: true + '@oxc-parser/binding-darwin-arm64@0.132.0': optional: true + '@oxc-parser/binding-darwin-arm64@0.135.0': + optional: true + '@oxc-parser/binding-darwin-x64@0.132.0': optional: true + '@oxc-parser/binding-darwin-x64@0.135.0': + optional: true + '@oxc-parser/binding-freebsd-x64@0.132.0': optional: true + '@oxc-parser/binding-freebsd-x64@0.135.0': + optional: true + '@oxc-parser/binding-linux-arm-gnueabihf@0.132.0': optional: true + '@oxc-parser/binding-linux-arm-gnueabihf@0.135.0': + optional: true + '@oxc-parser/binding-linux-arm-musleabihf@0.132.0': optional: true + '@oxc-parser/binding-linux-arm-musleabihf@0.135.0': + optional: true + '@oxc-parser/binding-linux-arm64-gnu@0.132.0': optional: true + '@oxc-parser/binding-linux-arm64-gnu@0.135.0': + optional: true + '@oxc-parser/binding-linux-arm64-musl@0.132.0': optional: true + '@oxc-parser/binding-linux-arm64-musl@0.135.0': + optional: true + '@oxc-parser/binding-linux-ppc64-gnu@0.132.0': optional: true + '@oxc-parser/binding-linux-ppc64-gnu@0.135.0': + optional: true + '@oxc-parser/binding-linux-riscv64-gnu@0.132.0': optional: true + '@oxc-parser/binding-linux-riscv64-gnu@0.135.0': + optional: true + '@oxc-parser/binding-linux-riscv64-musl@0.132.0': optional: true + '@oxc-parser/binding-linux-riscv64-musl@0.135.0': + optional: true + '@oxc-parser/binding-linux-s390x-gnu@0.132.0': optional: true + '@oxc-parser/binding-linux-s390x-gnu@0.135.0': + optional: true + '@oxc-parser/binding-linux-x64-gnu@0.132.0': optional: true + '@oxc-parser/binding-linux-x64-gnu@0.135.0': + optional: true + '@oxc-parser/binding-linux-x64-musl@0.132.0': optional: true + '@oxc-parser/binding-linux-x64-musl@0.135.0': + optional: true + '@oxc-parser/binding-openharmony-arm64@0.132.0': optional: true + '@oxc-parser/binding-openharmony-arm64@0.135.0': + optional: true + '@oxc-parser/binding-wasm32-wasi@0.132.0': dependencies: '@emnapi/core': 1.10.0 @@ -6284,21 +6617,39 @@ snapshots: '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0) optional: true + '@oxc-parser/binding-wasm32-wasi@0.135.0': + dependencies: + '@emnapi/core': 1.10.0 + '@emnapi/runtime': 1.10.0 + '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0) + optional: true + '@oxc-parser/binding-win32-arm64-msvc@0.132.0': optional: true + '@oxc-parser/binding-win32-arm64-msvc@0.135.0': + optional: true + '@oxc-parser/binding-win32-ia32-msvc@0.132.0': optional: true + '@oxc-parser/binding-win32-ia32-msvc@0.135.0': + optional: true + '@oxc-parser/binding-win32-x64-msvc@0.132.0': optional: true + '@oxc-parser/binding-win32-x64-msvc@0.135.0': + optional: true + '@oxc-project/runtime@0.115.0': {} '@oxc-project/types@0.115.0': {} '@oxc-project/types@0.132.0': {} + '@oxc-project/types@0.135.0': {} + '@oxc-resolver/binding-android-arm-eabi@11.20.0': optional: true @@ -7183,7 +7534,7 @@ snapshots: '@radix-ui/rect@1.1.1': {} - '@react-grab/cli@0.1.44-dev.c0e9887': + '@react-grab/cli@0.1.47': dependencies: agent-install: 0.0.6 commander: 14.0.3 @@ -7325,6 +7676,15 @@ snapshots: '@rolldown/binding-win32-x64-msvc@1.0.0-rc.9': optional: true + '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7)(@babel/runtime@7.29.7)(rolldown@1.0.0-rc.9(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0))(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@22.10.2)(esbuild@0.27.3)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0))': + dependencies: + '@babel/core': 7.29.7 + picomatch: 4.0.4 + rolldown: 1.0.0-rc.9(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0) + optionalDependencies: + '@babel/runtime': 7.29.7 + vite: 8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@22.10.2)(esbuild@0.27.3)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0) + '@rolldown/pluginutils@1.0.0-beta.40': {} '@rolldown/pluginutils@1.0.0-rc.15': {} @@ -8034,10 +8394,73 @@ snapshots: '@typescript-eslint/types@8.60.1': {} - '@vitejs/plugin-react@6.0.1(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@22.10.2)(esbuild@0.27.3)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0))': + '@typescript/typescript-aix-ppc64@7.0.1-rc': + optional: true + + '@typescript/typescript-darwin-arm64@7.0.1-rc': + optional: true + + '@typescript/typescript-darwin-x64@7.0.1-rc': + optional: true + + '@typescript/typescript-freebsd-arm64@7.0.1-rc': + optional: true + + '@typescript/typescript-freebsd-x64@7.0.1-rc': + optional: true + + '@typescript/typescript-linux-arm64@7.0.1-rc': + optional: true + + '@typescript/typescript-linux-arm@7.0.1-rc': + optional: true + + '@typescript/typescript-linux-loong64@7.0.1-rc': + optional: true + + '@typescript/typescript-linux-mips64el@7.0.1-rc': + optional: true + + '@typescript/typescript-linux-ppc64@7.0.1-rc': + optional: true + + '@typescript/typescript-linux-riscv64@7.0.1-rc': + optional: true + + '@typescript/typescript-linux-s390x@7.0.1-rc': + optional: true + + '@typescript/typescript-linux-x64@7.0.1-rc': + optional: true + + '@typescript/typescript-netbsd-arm64@7.0.1-rc': + optional: true + + '@typescript/typescript-netbsd-x64@7.0.1-rc': + optional: true + + '@typescript/typescript-openbsd-arm64@7.0.1-rc': + optional: true + + '@typescript/typescript-openbsd-x64@7.0.1-rc': + optional: true + + '@typescript/typescript-sunos-x64@7.0.1-rc': + optional: true + + '@typescript/typescript-win32-arm64@7.0.1-rc': + optional: true + + '@typescript/typescript-win32-x64@7.0.1-rc': + optional: true + + '@vitejs/plugin-react@6.0.1(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.7)(@babel/runtime@7.29.7)(rolldown@1.0.0-rc.9(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0))(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@22.10.2)(esbuild@0.27.3)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0)))(babel-plugin-react-compiler@1.0.0)(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@22.10.2)(esbuild@0.27.3)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0))': dependencies: '@rolldown/pluginutils': 1.0.0-rc.7 vite: 8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@22.10.2)(esbuild@0.27.3)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0) + optionalDependencies: + '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.7)(@babel/runtime@7.29.7)(rolldown@1.0.0-rc.9(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0))(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@22.10.2)(esbuild@0.27.3)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0)) + babel-plugin-react-compiler: 1.0.0 '@vitejs/plugin-rsc@0.5.24(react-dom@19.2.0(react@19.2.0))(react@19.2.0)(vite@8.0.0(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)(@types/node@22.10.2)(esbuild@0.27.3)(jiti@2.7.0)(terser@5.48.0)(yaml@2.9.0))': dependencies: @@ -8207,6 +8630,10 @@ snapshots: transitivePeerDependencies: - supports-color + babel-plugin-react-compiler@1.0.0: + dependencies: + '@babel/types': 7.29.7 + babel-plugin-syntax-hermes-parser@0.33.3: dependencies: hermes-parser: 0.33.3 @@ -8469,7 +8896,7 @@ snapshots: dequal@2.0.3: {} - deslop-js@0.0.24: + deslop-js@0.5.8: dependencies: '@oxc-project/types': 0.132.0 fast-glob: 3.3.3 @@ -9546,6 +9973,31 @@ snapshots: '@oxc-parser/binding-win32-ia32-msvc': 0.132.0 '@oxc-parser/binding-win32-x64-msvc': 0.132.0 + oxc-parser@0.135.0: + dependencies: + '@oxc-project/types': 0.135.0 + optionalDependencies: + '@oxc-parser/binding-android-arm-eabi': 0.135.0 + '@oxc-parser/binding-android-arm64': 0.135.0 + '@oxc-parser/binding-darwin-arm64': 0.135.0 + '@oxc-parser/binding-darwin-x64': 0.135.0 + '@oxc-parser/binding-freebsd-x64': 0.135.0 + '@oxc-parser/binding-linux-arm-gnueabihf': 0.135.0 + '@oxc-parser/binding-linux-arm-musleabihf': 0.135.0 + '@oxc-parser/binding-linux-arm64-gnu': 0.135.0 + '@oxc-parser/binding-linux-arm64-musl': 0.135.0 + '@oxc-parser/binding-linux-ppc64-gnu': 0.135.0 + '@oxc-parser/binding-linux-riscv64-gnu': 0.135.0 + '@oxc-parser/binding-linux-riscv64-musl': 0.135.0 + '@oxc-parser/binding-linux-s390x-gnu': 0.135.0 + '@oxc-parser/binding-linux-x64-gnu': 0.135.0 + '@oxc-parser/binding-linux-x64-musl': 0.135.0 + '@oxc-parser/binding-openharmony-arm64': 0.135.0 + '@oxc-parser/binding-wasm32-wasi': 0.135.0 + '@oxc-parser/binding-win32-arm64-msvc': 0.135.0 + '@oxc-parser/binding-win32-ia32-msvc': 0.135.0 + '@oxc-parser/binding-win32-x64-msvc': 0.135.0 + oxc-resolver@11.20.0: optionalDependencies: '@oxc-resolver/binding-android-arm-eabi': 11.20.0 @@ -9568,12 +10020,12 @@ snapshots: '@oxc-resolver/binding-win32-arm64-msvc': 11.20.0 '@oxc-resolver/binding-win32-x64-msvc': 11.20.0 - oxlint-plugin-react-doctor@0.5.5-dev.daf0579: + oxlint-plugin-react-doctor@0.5.8: dependencies: '@typescript-eslint/types': 8.60.1 eslint-scope: 9.1.2 eslint-visitor-keys: 5.0.1 - oxc-parser: 0.132.0 + oxc-parser: 0.135.0 oxlint@1.66.0: optionalDependencies: @@ -9761,19 +10213,19 @@ snapshots: - bufferutil - utf-8-validate - react-doctor@0.5.5-dev.daf0579(eslint@10.4.1(jiti@2.7.0)): + react-doctor@0.5.8(eslint@10.4.1(jiti@2.7.0)): dependencies: '@babel/code-frame': 7.29.7 '@sentry/node': 10.56.0 agent-install: 0.0.5 conf: 15.1.0 confbox: 0.2.4 - deslop-js: 0.0.24 + deslop-js: 0.5.8 eslint-plugin-react-hooks: 7.1.1(eslint@10.4.1(jiti@2.7.0)) jiti: 2.7.0 magicast: 0.5.3 oxlint: 1.66.0 - oxlint-plugin-react-doctor: 0.5.5-dev.daf0579 + oxlint-plugin-react-doctor: 0.5.8 prompts: 2.4.2 typescript: 5.7.2 vscode-languageserver: 9.0.1 @@ -9790,9 +10242,9 @@ snapshots: react: 19.2.0 scheduler: 0.27.0 - react-grab@0.1.44-dev.c0e9887(react@19.2.0): + react-grab@0.1.47(react@19.2.0): dependencies: - '@react-grab/cli': 0.1.44-dev.c0e9887 + '@react-grab/cli': 0.1.47 bippy: 0.5.41(react@19.2.0) optionalDependencies: react: 19.2.0 @@ -9896,9 +10348,9 @@ snapshots: preact: 10.29.2 prompts: 2.4.2 react: 19.2.0 - react-doctor: 0.5.5-dev.daf0579(eslint@10.4.1(jiti@2.7.0)) + react-doctor: 0.5.8(eslint@10.4.1(jiti@2.7.0)) react-dom: 19.2.0(react@19.2.0) - react-grab: 0.1.44-dev.c0e9887(react@19.2.0) + react-grab: 0.1.47(react@19.2.0) optionalDependencies: esbuild: 0.27.3 unplugin: 3.0.0 @@ -10279,6 +10731,29 @@ snapshots: typescript@6.0.3: {} + typescript@7.0.1-rc: + optionalDependencies: + '@typescript/typescript-aix-ppc64': 7.0.1-rc + '@typescript/typescript-darwin-arm64': 7.0.1-rc + '@typescript/typescript-darwin-x64': 7.0.1-rc + '@typescript/typescript-freebsd-arm64': 7.0.1-rc + '@typescript/typescript-freebsd-x64': 7.0.1-rc + '@typescript/typescript-linux-arm': 7.0.1-rc + '@typescript/typescript-linux-arm64': 7.0.1-rc + '@typescript/typescript-linux-loong64': 7.0.1-rc + '@typescript/typescript-linux-mips64el': 7.0.1-rc + '@typescript/typescript-linux-ppc64': 7.0.1-rc + '@typescript/typescript-linux-riscv64': 7.0.1-rc + '@typescript/typescript-linux-s390x': 7.0.1-rc + '@typescript/typescript-linux-x64': 7.0.1-rc + '@typescript/typescript-netbsd-arm64': 7.0.1-rc + '@typescript/typescript-netbsd-x64': 7.0.1-rc + '@typescript/typescript-openbsd-arm64': 7.0.1-rc + '@typescript/typescript-openbsd-x64': 7.0.1-rc + '@typescript/typescript-sunos-x64': 7.0.1-rc + '@typescript/typescript-win32-arm64': 7.0.1-rc + '@typescript/typescript-win32-x64': 7.0.1-rc + ufo@1.6.4: {} uint8array-extras@1.5.0: {} diff --git a/src/data/Img_CharacterIllust_FrancisSummer.png b/public/images/Character_Full/Img_CharacterIllust_FrancisSummer.png similarity index 100% rename from src/data/Img_CharacterIllust_FrancisSummer.png rename to public/images/Character_Full/Img_CharacterIllust_FrancisSummer.png diff --git a/src/data/Img_CharacterIllust_VernaSummer.png b/public/images/Character_Full/Img_CharacterIllust_VernaSummer.png similarity index 100% rename from src/data/Img_CharacterIllust_VernaSummer.png rename to public/images/Character_Full/Img_CharacterIllust_VernaSummer.png diff --git a/src/data/portrait_Dimension_FrancisSummer_01.png b/public/images/Character_Portrait/portrait_Dimension_FrancisSummer_01.png similarity index 100% rename from src/data/portrait_Dimension_FrancisSummer_01.png rename to public/images/Character_Portrait/portrait_Dimension_FrancisSummer_01.png diff --git a/src/data/portrait_Dimension_VernaSummer_01.png b/public/images/Character_Portrait/portrait_Dimension_VernaSummer_01.png similarity index 100% rename from src/data/portrait_Dimension_VernaSummer_01.png rename to public/images/Character_Portrait/portrait_Dimension_VernaSummer_01.png diff --git a/src/data/portrait_FrancisSummer_01.png b/public/images/Character_Portrait/portrait_FrancisSummer_01.png similarity index 100% rename from src/data/portrait_FrancisSummer_01.png rename to public/images/Character_Portrait/portrait_FrancisSummer_01.png diff --git a/src/data/portrait_VernaSummer_01.png b/public/images/Character_Portrait/portrait_VernaSummer_01.png similarity index 100% rename from src/data/portrait_VernaSummer_01.png rename to public/images/Character_Portrait/portrait_VernaSummer_01.png diff --git a/src/data/Texture2D_6.png b/public/images/Maps/Texture2D_6.png similarity index 100% rename from src/data/Texture2D_6.png rename to public/images/Maps/Texture2D_6.png diff --git a/src/data/MIAdd_MonsterlingReginula.png b/public/images/Monsterling_Icons/MIAdd_MonsterlingReginula.png similarity index 100% rename from src/data/MIAdd_MonsterlingReginula.png rename to public/images/Monsterling_Icons/MIAdd_MonsterlingReginula.png diff --git a/src/data/MIcon_MonsterlingReginula.png b/public/images/Monsterling_Icons/MIcon_MonsterlingReginula.png similarity index 100% rename from src/data/MIcon_MonsterlingReginula.png rename to public/images/Monsterling_Icons/MIcon_MonsterlingReginula.png diff --git a/src/data/MonsterlingChopySummer.png b/public/images/Monsterling_Icons/MonsterlingChopySummer.png similarity index 100% rename from src/data/MonsterlingChopySummer.png rename to public/images/Monsterling_Icons/MonsterlingChopySummer.png diff --git a/src/data/MonsterlingReginula2.png b/public/images/Monsterling_Icons/MonsterlingReginula2.png similarity index 100% rename from src/data/MonsterlingReginula2.png rename to public/images/Monsterling_Icons/MonsterlingReginula2.png diff --git a/src/data/MonsterlingSlimeSummer.png b/public/images/Monsterling_Icons/MonsterlingSlimeSummer.png similarity index 100% rename from src/data/MonsterlingSlimeSummer.png rename to public/images/Monsterling_Icons/MonsterlingSlimeSummer.png diff --git a/src/data/MonsterlingSoranyongSummer.png b/public/images/Monsterling_Icons/MonsterlingSoranyongSummer.png similarity index 100% rename from src/data/MonsterlingSoranyongSummer.png rename to public/images/Monsterling_Icons/MonsterlingSoranyongSummer.png diff --git a/src/components/account/account-page.tsx b/src/components/account/account-page.tsx index e917ffb..97d6cf2 100644 --- a/src/components/account/account-page.tsx +++ b/src/components/account/account-page.tsx @@ -20,6 +20,7 @@ export const AccountPage = () => { const resetCodexStore = useAppStore((s) => s.resetCodexStore); const resetCharacterSlice = useAppStore((s) => s.resetCharacterSlice); const resetMonsterlingSlice = useAppStore((s) => s.resetMonsterlingSlice); + const resetLoadoutsSlice = useAppStore((s) => s.resetLoadoutsSlice); const hideItem = import.meta.env.VITE_NODE_ENV !== "development"; @@ -73,6 +74,15 @@ export const AccountPage = () => { > Clear Monsterlings Owned + {!hideItem && ( <> Options diff --git a/src/components/account/google/utils/drive-sync.ts b/src/components/account/google/utils/drive-sync.ts index 8eaf03a..5650cf5 100644 --- a/src/components/account/google/utils/drive-sync.ts +++ b/src/components/account/google/utils/drive-sync.ts @@ -14,6 +14,7 @@ type Backup = Pick< | "monsterCodexCompleted" | "charactersOwned" | "monsterlingsOwned" + | "loadouts" >; export function select(state: StoreState): Backup { @@ -22,6 +23,7 @@ export function select(state: StoreState): Backup { monsterCodexCompleted: state.monsterCodexCompleted, charactersOwned: state.charactersOwned, monsterlingsOwned: state.monsterlingsOwned, + loadouts: state.loadouts, }; } @@ -141,6 +143,7 @@ export async function initSync() { metadata: { charactersOwned: Object.keys(local.charactersOwned).length, monsterlingsOwned: Object.keys(local.monsterlingsOwned).length, + loadouts: Object.keys(local.loadouts).length, codexCompleted: local.monsterCodexCompleted.length, }, }, @@ -150,6 +153,7 @@ export async function initSync() { metadata: { charactersOwned: Object.keys(remote.charactersOwned).length, monsterlingsOwned: Object.keys(remote.monsterlingsOwned).length, + loadouts: Object.keys(remote.loadouts ?? {}).length, codexCompleted: remote.monsterCodexCompleted.length, }, }, diff --git a/src/components/characters/components/add-character.tsx b/src/components/characters/components/add-character.tsx index f38e085..1b36c4d 100644 --- a/src/components/characters/components/add-character.tsx +++ b/src/components/characters/components/add-character.tsx @@ -1,5 +1,5 @@ import { ArrowLeft } from "lucide-react"; -import { useMemo, useState } from "react"; +import { useState } from "react"; import CharacterCard from "@/components/characters/components/character-card"; import { CharacterOwnedDetailsForm } from "@/components/characters/components/character-details-form"; import { CharacterFilter } from "@/components/characters/components/character-filter"; @@ -26,10 +26,7 @@ export function AddCharacter() { const charToAddInfo = hasSelectedChar ? CHARACTERS_DATA[charToAdd] : null; - const ownedSet = useMemo( - () => new Set(Object.values(charactersOwned).map((c) => c.id)), - [charactersOwned], - ); + const ownedSet = new Set(Object.values(charactersOwned).map((c) => c.id)); const noCharsToAdd = Object.keys(charactersOwned).length === Object.keys(CHARACTERS_DATA).length; diff --git a/src/components/characters/components/character-owned-list.tsx b/src/components/characters/components/character-owned-list.tsx index 2fd2de3..41c866a 100644 --- a/src/components/characters/components/character-owned-list.tsx +++ b/src/components/characters/components/character-owned-list.tsx @@ -1,4 +1,4 @@ -import { useMemo, useState } from "react"; +import { useState } from "react"; import CharacterCard from "@/components/characters/components/character-card"; import { CharacterSkillLevel } from "@/components/characters/components/character-skill-level"; import { EditCharacterDetailsDialog } from "@/components/characters/components/edit-character-details-dialog"; @@ -15,15 +15,9 @@ export const CharacterOwnedList = () => { const { selectedCharacterClass, selectedElements } = characterFilters; - const classSet = useMemo( - () => new Set(selectedCharacterClass), - [selectedCharacterClass], - ); + const classSet = new Set(selectedCharacterClass); - const elementSet = useMemo( - () => new Set(selectedElements), - [selectedElements], - ); + const elementSet = new Set(selectedElements); const enrichedCharacters = Object.values(charactersOwned) .map((c) => ({ diff --git a/src/components/forms/combobox-form-input.tsx b/src/components/forms/combobox-form-input.tsx index 506f682..5c89d55 100644 --- a/src/components/forms/combobox-form-input.tsx +++ b/src/components/forms/combobox-form-input.tsx @@ -1,6 +1,6 @@ "use client"; -import { type JSX, useMemo } from "react"; +import type { JSX } from "react"; import { type Control, Controller, @@ -39,14 +39,10 @@ export const ComboboxFormInput = ({ renderItem, getLabel, }: ComboboxInputProps) => { - const items = useMemo( - () => - options.map((o) => ({ - label: getLabel(o.value), - value: o.value, - })), - [options, getLabel], - ); + const items = options.map((o) => ({ + label: getLabel(o.value), + value: o.value, + })); return ( { + const [open, setOpen] = useState(false); + + return ( + <> + + + + + ); +}; diff --git a/src/components/loadouts/components/loadouts-dialog.tsx b/src/components/loadouts/components/loadouts-dialog.tsx new file mode 100644 index 0000000..5610f7e --- /dev/null +++ b/src/components/loadouts/components/loadouts-dialog.tsx @@ -0,0 +1,573 @@ +import { ArrowLeftIcon, SearchIcon, Trash2Icon } from "lucide-react"; +import { useEffect, useState } from "react"; +import CharacterCard from "@/components/characters/components/character-card"; +import { MonsterlingCard } from "@/components/monsterlings/components/monsterling-card"; +import { MONSTERLING_CARD_WIDTH } from "@/components/monsterlings/components/monsterling-constants"; +import { Button } from "@/components/ui/button"; +import { + Dialog, + DialogContent, + DialogDescription, + DialogFooter, + DialogHeader, + DialogTitle, +} from "@/components/ui/dialog"; +import { Input } from "@/components/ui/input"; +import { + Select, + SelectContent, + SelectItem, + SelectTrigger, + SelectValue, +} from "@/components/ui/select"; +import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; +import { CHARACTERS_DATA } from "@/data/CHARACTERS_DATA"; +import { MONSTERLINGS_DATA } from "@/data/MONSTERLINGS_DATA"; +import { TIERS_DATA } from "@/data/TIERS_DATA"; +import { cn } from "@/lib/utils"; +import { useAppStore } from "@/stores/app-store"; +import { + emptyLoadoutCharacterSlot, + type LoadoutCharacterSlot, + type LoadoutOwned, +} from "@/stores/loadouts-slice"; + +const blankLoadout = (): Omit => ({ + name: "New Loadout", + characters: [ + emptyLoadoutCharacterSlot(), + emptyLoadoutCharacterSlot(), + emptyLoadoutCharacterSlot(), + ], +}); + +const UNKNOWN_CHARACTER_PORTRAIT = + "/images/Character_Portrait/portrait_Unknown_00.png"; +const CHARACTER_SLOT_INDEXES = [0, 1, 2] as const; +const MONSTERLING_SLOT_INDEXES = [0, 1, 2] as const; +const EQUIPMENT_SLOT_INDEXES = [1, 2, 3, 4] as const; + +type MonsterlingPickerTarget = { + characterIndex: number; + monsterlingIndex: number; +} | null; + +type LoadoutsDialogProps = { + open: boolean; + setOpen: React.Dispatch>; + loadoutToEdit?: string | null; + onClose?: () => void; +}; + +export const LoadoutsDialog = ({ + open, + setOpen, + loadoutToEdit = null, + onClose, +}: LoadoutsDialogProps) => { + const loadouts = useAppStore((s) => s.loadouts); + const charactersOwned = useAppStore((s) => s.charactersOwned); + const monsterlingsOwned = useAppStore((s) => s.monsterlingsOwned); + const setLoadout = useAppStore((s) => s.setLoadout); + + const [draft, setDraft] = useState>(blankLoadout); + const [pickerTarget, setPickerTarget] = + useState(null); + const [search, setSearch] = useState(""); + const [tierFilter, setTierFilter] = useState("all"); + const [activeCharacterTab, setActiveCharacterTab] = useState("0"); + + useEffect(() => { + if (!open) return; + + const existing = loadoutToEdit ? loadouts[loadoutToEdit] : null; + if (existing) { + setDraft({ + name: existing.name, + characters: existing.characters.map((slot) => ({ + characterId: slot.characterId, + monsterlingIds: [...slot.monsterlingIds], + })) as LoadoutOwned["characters"], + }); + setActiveCharacterTab("0"); + return; + } + + setDraft(blankLoadout()); + setActiveCharacterTab("0"); + }, [loadoutToEdit, loadouts, open]); + + const selectedCharacterIds = new Set( + draft.characters.map((slot) => slot.characterId), + ); + + const selectedMonsterlingIds = new Set( + draft.characters.flatMap((slot) => + slot.monsterlingIds.filter((id): id is string => id !== null), + ), + ); + + const ownedCharacters = Object.values(charactersOwned) + .map((character) => CHARACTERS_DATA[character.id]) + .filter(Boolean) + .sort((a, b) => a.name.localeCompare(b.name)); + + const ownedMonsterlings = Object.entries(monsterlingsOwned) + .map(([id, monsterling]) => ({ + id, + ...monsterling, + info: MONSTERLINGS_DATA[monsterling.monsterling_id], + })) + .filter(({ info }) => !!info) + .sort((a, b) => a.info.name.localeCompare(b.info.name)); + + const pickerOptions = ownedMonsterlings.filter((monsterling) => { + if ( + search && + !monsterling.info.name.toLowerCase().includes(search.toLowerCase()) + ) { + return false; + } + + if (tierFilter !== "all" && String(monsterling.tier_id) !== tierFilter) { + return false; + } + + return true; + }); + + const updateCharacterSlot = ( + index: number, + updater: (slot: LoadoutCharacterSlot) => LoadoutCharacterSlot, + ) => { + setDraft((current) => ({ + ...current, + characters: current.characters.map((slot, slotIndex) => + slotIndex === index ? updater(slot) : slot, + ) as LoadoutOwned["characters"], + })); + }; + + const selectCharacter = (index: number, value: string) => { + updateCharacterSlot(index, (slot) => ({ + ...slot, + characterId: value === "none" ? null : Number(value), + })); + }; + + const selectMonsterling = (monsterlingId: string | null) => { + if (!pickerTarget) return; + + updateCharacterSlot(pickerTarget.characterIndex, (slot) => { + const monsterlingIds = [ + ...slot.monsterlingIds, + ] as LoadoutCharacterSlot["monsterlingIds"]; + monsterlingIds[pickerTarget.monsterlingIndex] = monsterlingId; + + return { + ...slot, + monsterlingIds, + }; + }); + setPickerTarget(null); + setSearch(""); + setTierFilter("all"); + }; + + const close = () => { + setOpen(false); + setPickerTarget(null); + onClose?.(); + }; + + const canSave = + draft.name.trim().length > 0 && + draft.characters.every((slot) => slot.characterId !== null); + + const submit = () => { + if (!canSave) return; + + setLoadout( + { + name: draft.name.trim(), + characters: draft.characters, + }, + loadoutToEdit ?? undefined, + ); + close(); + }; + + const showPicker = pickerTarget !== null; + + return ( + + + {showPicker ? ( + <> + + + + Select Monsterling + + + Search owned monsterlings by name or filter by tier. + + + +
+
+ + setSearch(event.target.value)} + placeholder="Search name" + className="pl-9" + /> +
+ +
+ +
+ {pickerOptions.length === 0 && ( +
+ No owned monsterlings found. +
+ )} + + {pickerOptions.map((monsterling) => { + const alreadySelected = + selectedMonsterlingIds.has(monsterling.id) && + draft.characters[pickerTarget.characterIndex].monsterlingIds[ + pickerTarget.monsterlingIndex + ] !== monsterling.id; + + return ( + + ); + })} +
+ + ) : ( + <> + + + {loadoutToEdit ? "Edit Team Loadout" : "Add Team Loadout"} + + + Select three owned characters and assign owned monsterlings. + + + +
+ + + + + {CHARACTER_SLOT_INDEXES.map((index) => { + const slot = draft.characters[index]; + const character = + slot.characterId !== null + ? CHARACTERS_DATA[slot.characterId] + : null; + + return ( + + { + + {character?.name ?? `Character ${index + 1}`} + + + ); + })} + + + {CHARACTER_SLOT_INDEXES.map((index) => { + const slot = draft.characters[index]; + const character = + slot.characterId !== null + ? CHARACTERS_DATA[slot.characterId] + : null; + const characterOwned = + slot.characterId !== null + ? charactersOwned[slot.characterId] + : null; + + return ( + +
+ Character {index + 1} +
+ + + +
+ {MONSTERLING_SLOT_INDEXES.map((monsterIndex) => { + const monsterlingId = + slot.monsterlingIds[monsterIndex]; + const monsterling = + monsterlingId !== null + ? monsterlingsOwned[monsterlingId] + : null; + + return ( +
+ + {monsterling && ( + + )} +
+ ); + })} +
+ +
+
+ {character ? ( + + ) : ( +
+ Unknown character portrait + No character selected +
+ )} + +
+ Artifact +
+
+ +
+ {MONSTERLING_SLOT_INDEXES.map((monsterIndex) => { + const monsterlingId = + slot.monsterlingIds[monsterIndex]; + const monsterling = + monsterlingId !== null + ? monsterlingsOwned[monsterlingId] + : null; + + return ( +
+ {monsterling ? ( + + ) : ( +
+ Monsterling {monsterIndex + 1} +
+ )} +
+ ); + })} +
+
+ +
+ {EQUIPMENT_SLOT_INDEXES.map((equipmentIndex) => ( +
+ Equipment {equipmentIndex} +
+ ))} +
+
+ ); + })} +
+
+ + + + + + + )} +
+
+ ); +}; diff --git a/src/components/loadouts/components/loadouts-list.tsx b/src/components/loadouts/components/loadouts-list.tsx new file mode 100644 index 0000000..380c238 --- /dev/null +++ b/src/components/loadouts/components/loadouts-list.tsx @@ -0,0 +1,239 @@ +import { EditIcon, Trash2Icon } from "lucide-react"; +import { useState } from "react"; +import { LoadoutsDialog } from "@/components/loadouts/components/loadouts-dialog"; +import { TierPortrait } from "@/components/shared/tier-portrait"; +import { Button } from "@/components/ui/button"; +import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; +import { CHARACTER_CLASS_DATA } from "@/data/CHARACTER_CLASS_DATA"; +import { CHARACTERS_DATA } from "@/data/CHARACTERS_DATA"; +import { ELEMENTS_DATA } from "@/data/ELEMENTS_DATA"; +import { MONSTERLINGS_DATA } from "@/data/MONSTERLINGS_DATA"; +import { TIERS_DATA } from "@/data/TIERS_DATA"; +import { cn } from "@/lib/utils"; +import { useAppStore } from "@/stores/app-store"; +import type { LoadoutOwned } from "@/stores/loadouts-slice"; + +const CHARACTER_SLOT_INDEXES = [0, 1, 2] as const; +const MONSTERLING_SLOT_INDEXES = [0, 1, 2] as const; +// const EQUIPMENT_SLOT_INDEXES = [1, 2, 3, 4] as const; +const UNKNOWN_CHARACTER_PORTRAIT = + "/images/Character_Portrait/portrait_Unknown_00.png"; + +export const LoadoutsList = () => { + const [open, setOpen] = useState(false); + const [loadoutToEdit, setLoadoutToEdit] = useState(null); + + const loadouts = useAppStore((s) => s.loadouts); + const deleteLoadout = useAppStore((s) => s.deleteLoadout); + + const loadoutEntries = Object.values(loadouts).sort((a, b) => + a.name.localeCompare(b.name), + ); + + return ( +
+ {loadoutEntries.length === 0 && ( +
+ No loadouts yet. +
+ )} + +
+ {loadoutEntries.map((loadout) => ( + { + setLoadoutToEdit(loadout.id); + setOpen(true); + }} + onDelete={() => deleteLoadout(loadout.id)} + /> + ))} +
+ + setLoadoutToEdit(null)} + /> +
+ ); +}; + +type LoadoutCardProps = { + loadout: LoadoutOwned; + onEdit: () => void; + onDelete: () => void; +}; + +const LoadoutCard = ({ loadout, onEdit, onDelete }: LoadoutCardProps) => { + const charactersOwned = useAppStore((s) => s.charactersOwned); + const monsterlingsOwned = useAppStore((s) => s.monsterlingsOwned); + + return ( + + + + {loadout.name} + +
+ + +
+
+ + {CHARACTER_SLOT_INDEXES.map((index) => { + const slot = loadout.characters[index]; + const character = + slot.characterId !== null + ? CHARACTERS_DATA[slot.characterId] + : null; + const characterOwned = + slot.characterId !== null + ? charactersOwned[slot.characterId] + : null; + const element = + character !== null ? ELEMENTS_DATA[character.element_id] : null; + const characterClass = + character !== null + ? CHARACTER_CLASS_DATA[character.class_id] + : null; + + return ( +
+
+
+ { +
+ +
+ {element && ( + {`${element.element} + )} + + {characterClass && ( + {`${characterClass.character_class} + )} + + {(characterOwned?.awakening ?? 0) > 0 && ( + + A{characterOwned?.awakening} + + )} +
+
+ +
+ {/*
+
+ Artifact +
+ {EQUIPMENT_SLOT_INDEXES.map((equipmentIndex) => ( +
+ Eq {equipmentIndex} +
+ ))} +
*/} + +
+ {MONSTERLING_SLOT_INDEXES.map((monsterIndex) => { + const monsterlingId = slot.monsterlingIds[monsterIndex]; + const monsterling = + monsterlingId !== null + ? monsterlingsOwned[monsterlingId] + : null; + const monsterlingInfo = monsterling + ? MONSTERLINGS_DATA[monsterling.monsterling_id] + : null; + + return ( +
+ {monsterling && monsterlingInfo ? ( +
+ {/* + {monsterlingInfo.name} + */} + +
+ ) : ( + + Slot {monsterIndex + 1} + + )} +
+ ); + })} +
+
+
+ ); + })} +
+
+ ); +}; diff --git a/src/components/loadouts/loadouts-page.tsx b/src/components/loadouts/loadouts-page.tsx index 85455bc..4fb4847 100644 --- a/src/components/loadouts/loadouts-page.tsx +++ b/src/components/loadouts/loadouts-page.tsx @@ -1,9 +1,16 @@ +import { AddLoadoutDialog } from "@/components/loadouts/components/add-loadout"; +import { LoadoutsList } from "@/components/loadouts/components/loadouts-list"; import { PageTitle } from "@/components/shared/page-title"; export const LoadoutsPage = () => { return (
+ +
+ + +
); }; diff --git a/src/components/monster-codex/components/codex-card.tsx b/src/components/monster-codex/components/codex-card.tsx index 8c2bd40..6a1b4a8 100644 --- a/src/components/monster-codex/components/codex-card.tsx +++ b/src/components/monster-codex/components/codex-card.tsx @@ -12,7 +12,7 @@ import { cn } from "@/lib/utils"; import { useAppStore } from "@/stores/app-store"; export const CodexCard = ({ monsterling_id }: { monsterling_id: number }) => { - const { name, image, id } = MONSTERLINGS_DATA[monsterling_id]; + const { name, image, id, display_id } = MONSTERLINGS_DATA[monsterling_id]; const monsterCodexCompleted = useAppStore((s) => s.monsterCodexCompleted); const filterCodex = useCodexStore((s) => s.filterCodex); @@ -50,7 +50,7 @@ export const CodexCard = ({ monsterling_id }: { monsterling_id: number }) => { {completed ? : } - No. {id} + No. {display_id ?? id} {
{Object.values(REGIONS_DATA).map((region) => { + const regionNameTitleCase = toTitleCase(region.region); return ( { height="50" alt={`${region.region} map icon`} /> -

{toSentenceCase(region.region)}

+

+ {/* {toTitleCase(region.region)} */} + {/* {toTitleCase()} */} + {regionNameTitleCase.split(" ").map((word, index) => ( + + {index > 0 &&
} + {word} +
+ ))} +

); diff --git a/src/components/monsterlings/components/monsterling-combobox-input.tsx b/src/components/monsterlings/components/monsterling-combobox-input.tsx index 0d584c9..430e89d 100644 --- a/src/components/monsterlings/components/monsterling-combobox-input.tsx +++ b/src/components/monsterlings/components/monsterling-combobox-input.tsx @@ -1,4 +1,3 @@ -import { useMemo } from "react"; import type { Control, FieldValues, Path } from "react-hook-form"; import { ComboboxFormInput } from "@/components/forms/combobox-form-input"; import { useMonsterOptionStore } from "@/components/monsterlings/store/monsterlings-options-store"; @@ -21,26 +20,24 @@ export const MonsterlingComboboxInput = ({ (s) => s.getMonsterlingOptions, ); - const renderItem = useMemo(() => { - return (item: SelectOption) => { - const monster = MONSTERLINGS_DATA[+item.value]; + const renderItem = (item: SelectOption) => { + const monster = MONSTERLINGS_DATA[+item.value]; - return ( - - {monster.name} -

- {monster.name} -

-
- ); - }; - }, []); + return ( + + {monster.name} +

+ {monster.name} +

+
+ ); + }; const getLabel = (value: string) => { return MONSTERLINGS_DATA[+value].name; diff --git a/src/components/monsterlings/components/stats-combobox-input.tsx b/src/components/monsterlings/components/stats-combobox-input.tsx index f596f78..890e996 100644 --- a/src/components/monsterlings/components/stats-combobox-input.tsx +++ b/src/components/monsterlings/components/stats-combobox-input.tsx @@ -1,4 +1,3 @@ -import { useMemo } from "react"; import type { Control, FieldValues, Path } from "react-hook-form"; import { ComboboxFormInput } from "@/components/forms/combobox-form-input"; import { useStatOptionStore } from "@/components/monsterlings/store/stat-options-store"; @@ -18,26 +17,24 @@ export const StatComboboxInput = ({ }: Props) => { const getStatOptions = useStatOptionStore((s) => s.getStatOptions); - const renderItem = useMemo(() => { - return (item: SelectOption) => { - const stat = STAT_DATA[+item.value]; + const renderItem = (item: SelectOption) => { + const stat = STAT_DATA[+item.value]; - return ( - - {stat.stat} -

- {stat.stat} -

-
- ); - }; - }, []); + return ( + + {stat.stat} +

+ {stat.stat} +

+
+ ); + }; const getLabel = (value: string) => { if (!value) return ""; diff --git a/src/components/sync/sync-alert-dialog.tsx b/src/components/sync/sync-alert-dialog.tsx index 1f915ac..fd296bf 100644 --- a/src/components/sync/sync-alert-dialog.tsx +++ b/src/components/sync/sync-alert-dialog.tsx @@ -67,12 +67,14 @@ export function SyncConflictDialog() { Characters Monsterlings + Loadouts Codex {local.metadata.charactersOwned} {local.metadata.monsterlingsOwned} + {local.metadata.loadouts} {local.metadata.codexCompleted} @@ -115,12 +117,14 @@ export function SyncConflictDialog() { Characters Monsterlings + Loadouts Codex {remote.metadata.charactersOwned} {remote.metadata.monsterlingsOwned} + {remote.metadata.loadouts} {remote.metadata.codexCompleted} diff --git a/src/components/ui/tabs.tsx b/src/components/ui/tabs.tsx new file mode 100644 index 0000000..7f2c4f2 --- /dev/null +++ b/src/components/ui/tabs.tsx @@ -0,0 +1,89 @@ +import * as React from "react" +import { cva, type VariantProps } from "class-variance-authority" +import { Tabs as TabsPrimitive } from "radix-ui" + +import { cn } from "@/lib/utils" + +function Tabs({ + className, + orientation = "horizontal", + ...props +}: React.ComponentProps) { + return ( + + ) +} + +const tabsListVariants = cva( + "group/tabs-list inline-flex w-fit items-center justify-center rounded-lg p-[3px] text-muted-foreground group-data-[orientation=horizontal]/tabs:h-9 group-data-[orientation=vertical]/tabs:h-fit group-data-[orientation=vertical]/tabs:flex-col data-[variant=line]:rounded-none", + { + variants: { + variant: { + default: "bg-muted", + line: "gap-1 bg-transparent", + }, + }, + defaultVariants: { + variant: "default", + }, + } +) + +function TabsList({ + className, + variant = "default", + ...props +}: React.ComponentProps & + VariantProps) { + return ( + + ) +} + +function TabsTrigger({ + className, + ...props +}: React.ComponentProps) { + return ( + + ) +} + +function TabsContent({ + className, + ...props +}: React.ComponentProps) { + return ( + + ) +} + +export { Tabs, TabsList, TabsTrigger, TabsContent, tabsListVariants } diff --git a/src/data/CHARACTERS_DATA.ts b/src/data/CHARACTERS_DATA.ts index 3c47d81..4de18e0 100644 --- a/src/data/CHARACTERS_DATA.ts +++ b/src/data/CHARACTERS_DATA.ts @@ -5,9 +5,12 @@ import { import { ELEMENT_ID_BY_ELEMENT, type ElementId } from "@/data/ELEMENTS_DATA"; import { TIER_ID_BY_TIER, type TierId } from "@/data/TIERS_DATA"; +export type CharId = number; + export type Character = { - id: number; + id: CharId; name: string; + internal_name?: string; class_id: CharacterClassId; element_id: ElementId; portraitImage: string; @@ -81,6 +84,16 @@ export const CHARACTERS_DATA: Record = { fullImage: "/images/Character_Full/Img_CharacterIllust_Francis.png", tier_id: TIER_ID_BY_TIER.CHOICE_4, }, + [200_005]: { + id: 200_005, + name: "Francis", + internal_name: "Francis: Summer Dive!", + class_id: CLASS_ID_BY_CLASS.SUPPORT, + element_id: ELEMENT_ID_BY_ELEMENT.EARTH, + portraitImage: "/images/Character_Portrait/portrait_FrancisSummer_01.png", + fullImage: "/images/Character_Full/Img_CharacterIllust_FrancisSummer.png", + tier_id: TIER_ID_BY_TIER.PRIME_5, + }, 6: { id: 6, name: "Flare", @@ -218,12 +231,22 @@ export const CHARACTERS_DATA: Record = { element_id: ELEMENT_ID_BY_ELEMENT.FIRE, // portraitImage: // "https://res.cloudinary.com/dfrhytey3/image/upload/v1780895150/msd/Character_Portrait/portrait_Verna_00.png", - // fullImage: + // fullImage:a // "https://res.cloudinary.com/dfrhytey3/image/upload/v1780895146/msd/Character_Full/Img_CharacterIllust_Verna.png", portraitImage: "/images/Character_Portrait/portrait_Verna_00.png", fullImage: "/images/Character_Full/Img_CharacterIllust_Verna.png", tier_id: TIER_ID_BY_TIER.CHOICE_4, }, + [200_016]: { + id: 200_016, + name: "Verna", + internal_name: "Verna: Summer Dive!", + class_id: CLASS_ID_BY_CLASS.FIGHTER, + element_id: ELEMENT_ID_BY_ELEMENT.FIRE, + portraitImage: "/images/Character_Portrait/portrait_VernaSummer_01.png", + fullImage: "/images/Character_Full/Img_CharacterIllust_VernaSummer.png", + tier_id: TIER_ID_BY_TIER.PRIME_5, + }, 17: { id: 17, name: "Ellie", diff --git a/src/data/MONSTERLINGS_DATA.ts b/src/data/MONSTERLINGS_DATA.ts index 83dd85d..34f0958 100644 --- a/src/data/MONSTERLINGS_DATA.ts +++ b/src/data/MONSTERLINGS_DATA.ts @@ -1,16 +1,21 @@ import type { ElementId } from "@/data/ELEMENTS_DATA"; import { MONSTERLING_DATA_ELENDOR } from "@/data/MONSTERLING_DATA_ELENDOR"; -import { MONSTER_LING_DATA_MUWON } from "@/data/MONSTERLING_DATA_MUWON"; -import { MONSTER_LING_DATA_NAMRYUNG } from "@/data/MONSTERLING_DATA_NAMRYUNG"; +import { MONSTERLING_DATA_EVENTS } from "@/data/MONSTERLING_DATA_EVENTS"; +import { MONSTERLING_DATA_LEGENDARY_MONSTERS } from "@/data/MONSTERLING_DATA_LEGENDARY_MONSTERS"; +import { MONSTERLING_DATA_MUWON } from "@/data/MONSTERLING_DATA_MUWON"; +import { MONSTERLING_DATA_NAMRYUNG } from "@/data/MONSTERLING_DATA_NAMRYUNG"; import { MONSTERLING_DATA_SERENIA } from "@/data/MONSTERLING_DATA_SERENIA"; import { MONSTERLING_DATA_SURAH } from "@/data/MONSTERLING_DATA_SURAH"; import { MONSTERLING_DATA_VARHINE } from "@/data/MONSTERLING_DATA_VARHINE"; +import type { SourceId } from "@/data/MONSTERLINGS_SOURCE_DATA"; +import type { RegionId } from "@/data/REGIONS_DATA"; export type MonsterCodexEntry = { id: number; + display_id?: number; name: string; - region_id: number; - source_id: number[]; + region_id: RegionId; + source_id: SourceId[]; image: string; element_id: ElementId; ability: string; @@ -27,6 +32,8 @@ export const MONSTERLINGS_DATA: MonsterCodexData = { ...MONSTERLING_DATA_VARHINE, ...MONSTERLING_DATA_SERENIA, ...MONSTERLING_DATA_SURAH, - ...MONSTER_LING_DATA_NAMRYUNG, - ...MONSTER_LING_DATA_MUWON, + ...MONSTERLING_DATA_NAMRYUNG, + ...MONSTERLING_DATA_MUWON, + ...MONSTERLING_DATA_LEGENDARY_MONSTERS, + ...MONSTERLING_DATA_EVENTS, }; diff --git a/src/data/MONSTERLINGS_SOURCE_DATA.ts b/src/data/MONSTERLINGS_SOURCE_DATA.ts index 93d3b1d..41c6fd4 100644 --- a/src/data/MONSTERLINGS_SOURCE_DATA.ts +++ b/src/data/MONSTERLINGS_SOURCE_DATA.ts @@ -3,7 +3,9 @@ type MonsterCodexSource = | "capture" // done | "conquest" // done | "mutation" // done - | "request"; + | "request" + | "legendary conquest" + | "events"; type MonsterCodexSourceData = Record< SourceId, { id: SourceId; source: MonsterCodexSource; label: string } @@ -15,6 +17,8 @@ export const SOURCE_ID_BY_SOURCE = { CONQUEST: 2, MUTATION: 3, REQUEST: 4, + LEGENDARY_CONQUEST: 5, + EVENTS: 6, } as const; export type SourceId = (typeof SOURCE_ID_BY_SOURCE)[keyof typeof SOURCE_ID_BY_SOURCE]; @@ -45,4 +49,14 @@ export const MONSTERLINGS_SOURCE_DATA: MonsterCodexSourceData = { source: "request", label: "Request Board", }, + 5: { + id: SOURCE_ID_BY_SOURCE.LEGENDARY_CONQUEST, + source: "legendary conquest", + label: "Legendary Conquest", + }, + 6: { + id: SOURCE_ID_BY_SOURCE.EVENTS, + source: "events", + label: "Events", + }, }; diff --git a/src/data/MONSTERLING_DATA_EVENTS.ts b/src/data/MONSTERLING_DATA_EVENTS.ts new file mode 100644 index 0000000..49a0f88 --- /dev/null +++ b/src/data/MONSTERLING_DATA_EVENTS.ts @@ -0,0 +1,38 @@ +import { ELEMENT_ID_BY_ELEMENT } from "@/data/ELEMENTS_DATA"; +import type { MonsterCodexData } from "@/data/MONSTERLINGS_DATA"; +import { SOURCE_ID_BY_SOURCE } from "@/data/MONSTERLINGS_SOURCE_DATA"; +import { REGION_ID_BY_REGION } from "@/data/REGIONS_DATA"; + +// for events monsterlings start with 200_001 +export const MONSTERLING_DATA_EVENTS: MonsterCodexData = { + [200_001]: { + id: 200_001, + display_id: 1, + name: "Cappy: Summer Dive!", + image: "/images/Monsterling_Icons/MonsterlingChopySummer.png", + element_id: ELEMENT_ID_BY_ELEMENT.EARTH, + region_id: REGION_ID_BY_REGION.EVENTS, + source_id: [SOURCE_ID_BY_SOURCE.EVENTS], // TODO: keep or idk + ability: "", + }, + [200_002]: { + id: 200_002, + display_id: 2, + name: "Slimelet: Summer Dive!", + image: "/images/Monsterling_Icons/MonsterlingSlimeSummer.png", + element_id: ELEMENT_ID_BY_ELEMENT.WATER, + region_id: REGION_ID_BY_REGION.EVENTS, + source_id: [SOURCE_ID_BY_SOURCE.EVENTS], // TODO: keep or idk + ability: "", + }, + [200_003]: { + id: 200_003, + display_id: 3, + name: "Shellymander: Summer Dive!", + image: "/images/Monsterling_Icons/MonsterlingSoranyongSummer.png", + element_id: ELEMENT_ID_BY_ELEMENT.PHYSICAL, + region_id: REGION_ID_BY_REGION.EVENTS, + source_id: [SOURCE_ID_BY_SOURCE.EVENTS], // TODO: keep or idk + ability: "", + }, +}; diff --git a/src/data/MONSTERLING_DATA_LEGENDARY_MONSTERS.ts b/src/data/MONSTERLING_DATA_LEGENDARY_MONSTERS.ts new file mode 100644 index 0000000..4cd0ddf --- /dev/null +++ b/src/data/MONSTERLING_DATA_LEGENDARY_MONSTERS.ts @@ -0,0 +1,18 @@ +import { ELEMENT_ID_BY_ELEMENT } from "@/data/ELEMENTS_DATA"; +import type { MonsterCodexData } from "@/data/MONSTERLINGS_DATA"; +import { SOURCE_ID_BY_SOURCE } from "@/data/MONSTERLINGS_SOURCE_DATA"; +import { REGION_ID_BY_REGION } from "@/data/REGIONS_DATA"; + +// for legendary monsterlings start the id with 100_001 +export const MONSTERLING_DATA_LEGENDARY_MONSTERS: MonsterCodexData = { + [100_001]: { + id: 100_001, + display_id: 1, + name: "Reginula", + image: "/images/Monsterling_Icons/MIcon_MonsterlingReginula.png", + element_id: ELEMENT_ID_BY_ELEMENT.ICE, // TODO: need to find out + region_id: REGION_ID_BY_REGION.LEGENDARY, + source_id: [SOURCE_ID_BY_SOURCE.LEGENDARY_CONQUEST], // TODO: keep or idk + ability: "", + }, +}; diff --git a/src/data/MONSTERLING_DATA_MUWON.ts b/src/data/MONSTERLING_DATA_MUWON.ts index b327b8a..f15f923 100644 --- a/src/data/MONSTERLING_DATA_MUWON.ts +++ b/src/data/MONSTERLING_DATA_MUWON.ts @@ -3,7 +3,7 @@ import type { MonsterCodexData } from "@/data/MONSTERLINGS_DATA"; import { SOURCE_ID_BY_SOURCE } from "@/data/MONSTERLINGS_SOURCE_DATA"; import { REGION_ID_BY_REGION } from "@/data/REGIONS_DATA"; -export const MONSTER_LING_DATA_MUWON: MonsterCodexData = { +export const MONSTERLING_DATA_MUWON: MonsterCodexData = { 145: { id: 145, name: "Baby Spirit", diff --git a/src/data/MONSTERLING_DATA_NAMRYUNG.ts b/src/data/MONSTERLING_DATA_NAMRYUNG.ts index 0743872..d9daf81 100644 --- a/src/data/MONSTERLING_DATA_NAMRYUNG.ts +++ b/src/data/MONSTERLING_DATA_NAMRYUNG.ts @@ -3,7 +3,7 @@ import type { MonsterCodexData } from "@/data/MONSTERLINGS_DATA"; import { SOURCE_ID_BY_SOURCE } from "@/data/MONSTERLINGS_SOURCE_DATA"; import { REGION_ID_BY_REGION } from "@/data/REGIONS_DATA"; -export const MONSTER_LING_DATA_NAMRYUNG: MonsterCodexData = { +export const MONSTERLING_DATA_NAMRYUNG: MonsterCodexData = { 121: { id: 121, name: "Black Hauntstack", diff --git a/src/data/MonsterlingAmon.png b/src/data/MonsterlingAmon.png deleted file mode 100644 index 31d80bf..0000000 Binary files a/src/data/MonsterlingAmon.png and /dev/null differ diff --git a/src/data/MonsterlingAmonWhite.png b/src/data/MonsterlingAmonWhite.png deleted file mode 100644 index 3442cb0..0000000 Binary files a/src/data/MonsterlingAmonWhite.png and /dev/null differ diff --git a/src/data/MonsterlingAvadan.png b/src/data/MonsterlingAvadan.png deleted file mode 100644 index 70e599a..0000000 Binary files a/src/data/MonsterlingAvadan.png and /dev/null differ diff --git a/src/data/MonsterlingAvadanBlack.png b/src/data/MonsterlingAvadanBlack.png deleted file mode 100644 index 52a8207..0000000 Binary files a/src/data/MonsterlingAvadanBlack.png and /dev/null differ diff --git a/src/data/MonsterlingBlackKnightageMonk.png b/src/data/MonsterlingBlackKnightageMonk.png deleted file mode 100644 index b0955b6..0000000 Binary files a/src/data/MonsterlingBlackKnightageMonk.png and /dev/null differ diff --git a/src/data/MonsterlingBlackKnightageMonkWhite.png b/src/data/MonsterlingBlackKnightageMonkWhite.png deleted file mode 100644 index 7e5eb05..0000000 Binary files a/src/data/MonsterlingBlackKnightageMonkWhite.png and /dev/null differ diff --git a/src/data/MonsterlingBlackKnightagePriest.png b/src/data/MonsterlingBlackKnightagePriest.png deleted file mode 100644 index 00b6263..0000000 Binary files a/src/data/MonsterlingBlackKnightagePriest.png and /dev/null differ diff --git a/src/data/MonsterlingBlackKnightageSoldier.png b/src/data/MonsterlingBlackKnightageSoldier.png deleted file mode 100644 index ed55891..0000000 Binary files a/src/data/MonsterlingBlackKnightageSoldier.png and /dev/null differ diff --git a/src/data/MonsterlingBlackKnightageSoldierSpear.png b/src/data/MonsterlingBlackKnightageSoldierSpear.png deleted file mode 100644 index 84d2d71..0000000 Binary files a/src/data/MonsterlingBlackKnightageSoldierSpear.png and /dev/null differ diff --git a/src/data/MonsterlingChildGhost.png b/src/data/MonsterlingChildGhost.png deleted file mode 100644 index 0be65ab..0000000 Binary files a/src/data/MonsterlingChildGhost.png and /dev/null differ diff --git a/src/data/MonsterlingChildGhostSquirrel.png b/src/data/MonsterlingChildGhostSquirrel.png deleted file mode 100644 index 56f419b..0000000 Binary files a/src/data/MonsterlingChildGhostSquirrel.png and /dev/null differ diff --git a/src/data/MonsterlingChopaDaddy.png b/src/data/MonsterlingChopaDaddy.png deleted file mode 100644 index 5efe6f9..0000000 Binary files a/src/data/MonsterlingChopaDaddy.png and /dev/null differ diff --git a/src/data/MonsterlingChopaThrowUncle1.png b/src/data/MonsterlingChopaThrowUncle1.png deleted file mode 100644 index 26a4fb7..0000000 Binary files a/src/data/MonsterlingChopaThrowUncle1.png and /dev/null differ diff --git a/src/data/MonsterlingChopy.png b/src/data/MonsterlingChopy.png deleted file mode 100644 index 1054bc4..0000000 Binary files a/src/data/MonsterlingChopy.png and /dev/null differ diff --git a/src/data/MonsterlingChopyKing.png b/src/data/MonsterlingChopyKing.png deleted file mode 100644 index 7be14f0..0000000 Binary files a/src/data/MonsterlingChopyKing.png and /dev/null differ diff --git a/src/data/MonsterlingChopyKingSlimeling.png b/src/data/MonsterlingChopyKingSlimeling.png deleted file mode 100644 index 76e87b0..0000000 Binary files a/src/data/MonsterlingChopyKingSlimeling.png and /dev/null differ diff --git a/src/data/MonsterlingChopyPoison.png b/src/data/MonsterlingChopyPoison.png deleted file mode 100644 index 0918a6f..0000000 Binary files a/src/data/MonsterlingChopyPoison.png and /dev/null differ diff --git a/src/data/MonsterlingChopyPoisonOrange.png b/src/data/MonsterlingChopyPoisonOrange.png deleted file mode 100644 index 655b141..0000000 Binary files a/src/data/MonsterlingChopyPoisonOrange.png and /dev/null differ diff --git a/src/data/MonsterlingChopyPurple.png b/src/data/MonsterlingChopyPurple.png deleted file mode 100644 index fe4c89d..0000000 Binary files a/src/data/MonsterlingChopyPurple.png and /dev/null differ diff --git a/src/data/MonsterlingChopyThrow.png b/src/data/MonsterlingChopyThrow.png deleted file mode 100644 index 7ba5de4..0000000 Binary files a/src/data/MonsterlingChopyThrow.png and /dev/null differ diff --git a/src/data/MonsterlingChopyThrowBlue.png b/src/data/MonsterlingChopyThrowBlue.png deleted file mode 100644 index 4839fe6..0000000 Binary files a/src/data/MonsterlingChopyThrowBlue.png and /dev/null differ diff --git a/src/data/MonsterlingChopyThrowUncle.png b/src/data/MonsterlingChopyThrowUncle.png deleted file mode 100644 index 6a689a8..0000000 Binary files a/src/data/MonsterlingChopyThrowUncle.png and /dev/null differ diff --git a/src/data/MonsterlingDoranyong.png b/src/data/MonsterlingDoranyong.png deleted file mode 100644 index 0828bca..0000000 Binary files a/src/data/MonsterlingDoranyong.png and /dev/null differ diff --git a/src/data/MonsterlingDoranyongKing.png b/src/data/MonsterlingDoranyongKing.png deleted file mode 100644 index f164a4e..0000000 Binary files a/src/data/MonsterlingDoranyongKing.png and /dev/null differ diff --git a/src/data/MonsterlingDoranyongKingHat.png b/src/data/MonsterlingDoranyongKingHat.png deleted file mode 100644 index 2a04a70..0000000 Binary files a/src/data/MonsterlingDoranyongKingHat.png and /dev/null differ diff --git a/src/data/MonsterlingDoranyongMutation01.png b/src/data/MonsterlingDoranyongMutation01.png deleted file mode 100644 index 06cae4e..0000000 Binary files a/src/data/MonsterlingDoranyongMutation01.png and /dev/null differ diff --git a/src/data/MonsterlingDugi.png b/src/data/MonsterlingDugi.png deleted file mode 100644 index 0a866cb..0000000 Binary files a/src/data/MonsterlingDugi.png and /dev/null differ diff --git a/src/data/MonsterlingDugiGold.png b/src/data/MonsterlingDugiGold.png deleted file mode 100644 index 1f07d0d..0000000 Binary files a/src/data/MonsterlingDugiGold.png and /dev/null differ diff --git a/src/data/MonsterlingDugi_SlingShot.png b/src/data/MonsterlingDugi_SlingShot.png deleted file mode 100644 index e9041b4..0000000 Binary files a/src/data/MonsterlingDugi_SlingShot.png and /dev/null differ diff --git a/src/data/MonsterlingDuoxini.png b/src/data/MonsterlingDuoxini.png deleted file mode 100644 index ec270e8..0000000 Binary files a/src/data/MonsterlingDuoxini.png and /dev/null differ diff --git a/src/data/MonsterlingDuoxiniMiddle.png b/src/data/MonsterlingDuoxiniMiddle.png deleted file mode 100644 index 221a898..0000000 Binary files a/src/data/MonsterlingDuoxiniMiddle.png and /dev/null differ diff --git a/src/data/MonsterlingDuoxiniMiddleBoss.png b/src/data/MonsterlingDuoxiniMiddleBoss.png deleted file mode 100644 index 952c9b1..0000000 Binary files a/src/data/MonsterlingDuoxiniMiddleBoss.png and /dev/null differ diff --git a/src/data/MonsterlingDuoxiniMiddleBossWhite.png b/src/data/MonsterlingDuoxiniMiddleBossWhite.png deleted file mode 100644 index 0beddc5..0000000 Binary files a/src/data/MonsterlingDuoxiniMiddleBossWhite.png and /dev/null differ diff --git a/src/data/MonsterlingDuoxiniMiddleWhite.png b/src/data/MonsterlingDuoxiniMiddleWhite.png deleted file mode 100644 index 8e1439d..0000000 Binary files a/src/data/MonsterlingDuoxiniMiddleWhite.png and /dev/null differ diff --git a/src/data/MonsterlingDuoxiniRed.png b/src/data/MonsterlingDuoxiniRed.png deleted file mode 100644 index 0f1971c..0000000 Binary files a/src/data/MonsterlingDuoxiniRed.png and /dev/null differ diff --git a/src/data/MonsterlingFlowerBackah.png b/src/data/MonsterlingFlowerBackah.png deleted file mode 100644 index 1d87828..0000000 Binary files a/src/data/MonsterlingFlowerBackah.png and /dev/null differ diff --git a/src/data/MonsterlingFlowerBackahMiddle.png b/src/data/MonsterlingFlowerBackahMiddle.png deleted file mode 100644 index 524505c..0000000 Binary files a/src/data/MonsterlingFlowerBackahMiddle.png and /dev/null differ diff --git a/src/data/MonsterlingFlowerBackahMiddleBlue.png b/src/data/MonsterlingFlowerBackahMiddleBlue.png deleted file mode 100644 index dd3d563..0000000 Binary files a/src/data/MonsterlingFlowerBackahMiddleBlue.png and /dev/null differ diff --git a/src/data/MonsterlingGargoyle.png b/src/data/MonsterlingGargoyle.png deleted file mode 100644 index f6a41b1..0000000 Binary files a/src/data/MonsterlingGargoyle.png and /dev/null differ diff --git a/src/data/MonsterlingGargoyleGrassland.png b/src/data/MonsterlingGargoyleGrassland.png deleted file mode 100644 index 41047c7..0000000 Binary files a/src/data/MonsterlingGargoyleGrassland.png and /dev/null differ diff --git a/src/data/MonsterlingGargoyleMountain.png b/src/data/MonsterlingGargoyleMountain.png deleted file mode 100644 index 88326a9..0000000 Binary files a/src/data/MonsterlingGargoyleMountain.png and /dev/null differ diff --git a/src/data/MonsterlingGeuseunsae.png b/src/data/MonsterlingGeuseunsae.png deleted file mode 100644 index 1ba30c6..0000000 Binary files a/src/data/MonsterlingGeuseunsae.png and /dev/null differ diff --git a/src/data/MonsterlingGeuseunsaeBlack.png b/src/data/MonsterlingGeuseunsaeBlack.png deleted file mode 100644 index 74ea4e3..0000000 Binary files a/src/data/MonsterlingGeuseunsaeBlack.png and /dev/null differ diff --git a/src/data/MonsterlingGeuseunsaeGreen.png b/src/data/MonsterlingGeuseunsaeGreen.png deleted file mode 100644 index f813934..0000000 Binary files a/src/data/MonsterlingGeuseunsaeGreen.png and /dev/null differ diff --git a/src/data/MonsterlingGeuseunsaeSky.png b/src/data/MonsterlingGeuseunsaeSky.png deleted file mode 100644 index a221c0d..0000000 Binary files a/src/data/MonsterlingGeuseunsaeSky.png and /dev/null differ diff --git a/src/data/MonsterlingGeuseunsaeSmall.png b/src/data/MonsterlingGeuseunsaeSmall.png deleted file mode 100644 index 3bf9ff5..0000000 Binary files a/src/data/MonsterlingGeuseunsaeSmall.png and /dev/null differ diff --git a/src/data/MonsterlingGhostWind.png b/src/data/MonsterlingGhostWind.png deleted file mode 100644 index 3bea979..0000000 Binary files a/src/data/MonsterlingGhostWind.png and /dev/null differ diff --git a/src/data/MonsterlingGhostWindMiddle.png b/src/data/MonsterlingGhostWindMiddle.png deleted file mode 100644 index 10952e1..0000000 Binary files a/src/data/MonsterlingGhostWindMiddle.png and /dev/null differ diff --git a/src/data/MonsterlingGhostWindMiddleRed.png b/src/data/MonsterlingGhostWindMiddleRed.png deleted file mode 100644 index 2823560..0000000 Binary files a/src/data/MonsterlingGhostWindMiddleRed.png and /dev/null differ diff --git a/src/data/MonsterlingGoblin.png b/src/data/MonsterlingGoblin.png deleted file mode 100644 index c03edaf..0000000 Binary files a/src/data/MonsterlingGoblin.png and /dev/null differ diff --git a/src/data/MonsterlingGoblinBow.png b/src/data/MonsterlingGoblinBow.png deleted file mode 100644 index 7533bc3..0000000 Binary files a/src/data/MonsterlingGoblinBow.png and /dev/null differ diff --git a/src/data/MonsterlingGoblinChief.png b/src/data/MonsterlingGoblinChief.png deleted file mode 100644 index 843e60b..0000000 Binary files a/src/data/MonsterlingGoblinChief.png and /dev/null differ diff --git a/src/data/MonsterlingGoblinChiefWhite.png b/src/data/MonsterlingGoblinChiefWhite.png deleted file mode 100644 index c9364f3..0000000 Binary files a/src/data/MonsterlingGoblinChiefWhite.png and /dev/null differ diff --git a/src/data/MonsterlingGoblinEnforcer.png b/src/data/MonsterlingGoblinEnforcer.png deleted file mode 100644 index 4899082..0000000 Binary files a/src/data/MonsterlingGoblinEnforcer.png and /dev/null differ diff --git a/src/data/MonsterlingGoblinPink.png b/src/data/MonsterlingGoblinPink.png deleted file mode 100644 index 8c125ff..0000000 Binary files a/src/data/MonsterlingGoblinPink.png and /dev/null differ diff --git a/src/data/MonsterlingGoblinShieldKkebi.png b/src/data/MonsterlingGoblinShieldKkebi.png deleted file mode 100644 index 60d7909..0000000 Binary files a/src/data/MonsterlingGoblinShieldKkebi.png and /dev/null differ diff --git a/src/data/MonsterlingGoblinshield.png b/src/data/MonsterlingGoblinshield.png deleted file mode 100644 index 8b23001..0000000 Binary files a/src/data/MonsterlingGoblinshield.png and /dev/null differ diff --git a/src/data/MonsterlingGolemBlack.png b/src/data/MonsterlingGolemBlack.png deleted file mode 100644 index 1395e2b..0000000 Binary files a/src/data/MonsterlingGolemBlack.png and /dev/null differ diff --git a/src/data/MonsterlingGolemGold.png b/src/data/MonsterlingGolemGold.png deleted file mode 100644 index 80f95c1..0000000 Binary files a/src/data/MonsterlingGolemGold.png and /dev/null differ diff --git a/src/data/MonsterlingHaka.png b/src/data/MonsterlingHaka.png deleted file mode 100644 index 3aced29..0000000 Binary files a/src/data/MonsterlingHaka.png and /dev/null differ diff --git a/src/data/MonsterlingHakaBackah.png b/src/data/MonsterlingHakaBackah.png deleted file mode 100644 index b2a5c66..0000000 Binary files a/src/data/MonsterlingHakaBackah.png and /dev/null differ diff --git a/src/data/MonsterlingHakaBackahBlack.png b/src/data/MonsterlingHakaBackahBlack.png deleted file mode 100644 index 0214d40..0000000 Binary files a/src/data/MonsterlingHakaBackahBlack.png and /dev/null differ diff --git a/src/data/MonsterlingHakaPurple.png b/src/data/MonsterlingHakaPurple.png deleted file mode 100644 index bc5d1ee..0000000 Binary files a/src/data/MonsterlingHakaPurple.png and /dev/null differ diff --git a/src/data/MonsterlingHanul.png b/src/data/MonsterlingHanul.png deleted file mode 100644 index 259eb06..0000000 Binary files a/src/data/MonsterlingHanul.png and /dev/null differ diff --git a/src/data/MonsterlingHanulWhite.png b/src/data/MonsterlingHanulWhite.png deleted file mode 100644 index 59dfc22..0000000 Binary files a/src/data/MonsterlingHanulWhite.png and /dev/null differ diff --git a/src/data/MonsterlingHermanCrocodile.png b/src/data/MonsterlingHermanCrocodile.png deleted file mode 100644 index aa27dca..0000000 Binary files a/src/data/MonsterlingHermanCrocodile.png and /dev/null differ diff --git a/src/data/MonsterlingHermanCrocodileDora.png b/src/data/MonsterlingHermanCrocodileDora.png deleted file mode 100644 index 37ae5e4..0000000 Binary files a/src/data/MonsterlingHermanCrocodileDora.png and /dev/null differ diff --git a/src/data/MonsterlingHermanLizard.png b/src/data/MonsterlingHermanLizard.png deleted file mode 100644 index 5701b77..0000000 Binary files a/src/data/MonsterlingHermanLizard.png and /dev/null differ diff --git a/src/data/MonsterlingHermanLizardBow.png b/src/data/MonsterlingHermanLizardBow.png deleted file mode 100644 index 8407c0a..0000000 Binary files a/src/data/MonsterlingHermanLizardBow.png and /dev/null differ diff --git a/src/data/MonsterlingHermanLizardBowRed.png b/src/data/MonsterlingHermanLizardBowRed.png deleted file mode 100644 index 5ea9464..0000000 Binary files a/src/data/MonsterlingHermanLizardBowRed.png and /dev/null differ diff --git a/src/data/MonsterlingHermanLizardHat.png b/src/data/MonsterlingHermanLizardHat.png deleted file mode 100644 index b439e61..0000000 Binary files a/src/data/MonsterlingHermanLizardHat.png and /dev/null differ diff --git a/src/data/MonsterlingHermanTurtle.png b/src/data/MonsterlingHermanTurtle.png deleted file mode 100644 index cae22b0..0000000 Binary files a/src/data/MonsterlingHermanTurtle.png and /dev/null differ diff --git a/src/data/MonsterlingHermanTurtleBackah.png b/src/data/MonsterlingHermanTurtleBackah.png deleted file mode 100644 index 7d53e69..0000000 Binary files a/src/data/MonsterlingHermanTurtleBackah.png and /dev/null differ diff --git a/src/data/MonsterlingHermanTurtleBrown.png b/src/data/MonsterlingHermanTurtleBrown.png deleted file mode 100644 index a9f0986..0000000 Binary files a/src/data/MonsterlingHermanTurtleBrown.png and /dev/null differ diff --git a/src/data/MonsterlingHermanTurtlePojol.png b/src/data/MonsterlingHermanTurtlePojol.png deleted file mode 100644 index 5fd124f..0000000 Binary files a/src/data/MonsterlingHermanTurtlePojol.png and /dev/null differ diff --git a/src/data/MonsterlingHermanTurtleSilver.png b/src/data/MonsterlingHermanTurtleSilver.png deleted file mode 100644 index 450afa9..0000000 Binary files a/src/data/MonsterlingHermanTurtleSilver.png and /dev/null differ diff --git a/src/data/MonsterlingKimodong.png b/src/data/MonsterlingKimodong.png deleted file mode 100644 index f48660a..0000000 Binary files a/src/data/MonsterlingKimodong.png and /dev/null differ diff --git a/src/data/MonsterlingKimodongMaple.png b/src/data/MonsterlingKimodongMaple.png deleted file mode 100644 index 9ad16ec..0000000 Binary files a/src/data/MonsterlingKimodongMaple.png and /dev/null differ diff --git a/src/data/MonsterlingKimodongSwamp.png b/src/data/MonsterlingKimodongSwamp.png deleted file mode 100644 index 939ea66..0000000 Binary files a/src/data/MonsterlingKimodongSwamp.png and /dev/null differ diff --git a/src/data/MonsterlingKkebi.png b/src/data/MonsterlingKkebi.png deleted file mode 100644 index a18ac43..0000000 Binary files a/src/data/MonsterlingKkebi.png and /dev/null differ diff --git a/src/data/MonsterlingKkebiGreen.png b/src/data/MonsterlingKkebiGreen.png deleted file mode 100644 index e359ef1..0000000 Binary files a/src/data/MonsterlingKkebiGreen.png and /dev/null differ diff --git a/src/data/MonsterlingKnightRabbit_Evil.png b/src/data/MonsterlingKnightRabbit_Evil.png deleted file mode 100644 index b4e4a51..0000000 Binary files a/src/data/MonsterlingKnightRabbit_Evil.png and /dev/null differ diff --git a/src/data/MonsterlingManwollok.png b/src/data/MonsterlingManwollok.png deleted file mode 100644 index 5a4e879..0000000 Binary files a/src/data/MonsterlingManwollok.png and /dev/null differ diff --git a/src/data/MonsterlingManwollokBlack.png b/src/data/MonsterlingManwollokBlack.png deleted file mode 100644 index 54a0db4..0000000 Binary files a/src/data/MonsterlingManwollokBlack.png and /dev/null differ diff --git a/src/data/MonsterlingMeoguri.png b/src/data/MonsterlingMeoguri.png deleted file mode 100644 index 480aabc..0000000 Binary files a/src/data/MonsterlingMeoguri.png and /dev/null differ diff --git a/src/data/MonsterlingMeoguriBlue.png b/src/data/MonsterlingMeoguriBlue.png deleted file mode 100644 index 01cacc5..0000000 Binary files a/src/data/MonsterlingMeoguriBlue.png and /dev/null differ diff --git a/src/data/MonsterlingMeoguriRed.png b/src/data/MonsterlingMeoguriRed.png deleted file mode 100644 index a608c26..0000000 Binary files a/src/data/MonsterlingMeoguriRed.png and /dev/null differ diff --git a/src/data/MonsterlingMeoguriShield.png b/src/data/MonsterlingMeoguriShield.png deleted file mode 100644 index 8764d32..0000000 Binary files a/src/data/MonsterlingMeoguriShield.png and /dev/null differ diff --git a/src/data/MonsterlingNagiMiddlePink.png b/src/data/MonsterlingNagiMiddlePink.png deleted file mode 100644 index e3dc4a9..0000000 Binary files a/src/data/MonsterlingNagiMiddlePink.png and /dev/null differ diff --git a/src/data/MonsterlingNasusu.png b/src/data/MonsterlingNasusu.png deleted file mode 100644 index 714b767..0000000 Binary files a/src/data/MonsterlingNasusu.png and /dev/null differ diff --git a/src/data/MonsterlingNasusuButter.png b/src/data/MonsterlingNasusuButter.png deleted file mode 100644 index f06500c..0000000 Binary files a/src/data/MonsterlingNasusuButter.png and /dev/null differ diff --git a/src/data/MonsterlingOdongseed.png b/src/data/MonsterlingOdongseed.png deleted file mode 100644 index adf32bb..0000000 Binary files a/src/data/MonsterlingOdongseed.png and /dev/null differ diff --git a/src/data/MonsterlingOrc.png b/src/data/MonsterlingOrc.png deleted file mode 100644 index c07a876..0000000 Binary files a/src/data/MonsterlingOrc.png and /dev/null differ diff --git a/src/data/MonsterlingOrcAxe.png b/src/data/MonsterlingOrcAxe.png deleted file mode 100644 index 4385cc0..0000000 Binary files a/src/data/MonsterlingOrcAxe.png and /dev/null differ diff --git a/src/data/MonsterlingOrcAxePink.png b/src/data/MonsterlingOrcAxePink.png deleted file mode 100644 index 47e6fbf..0000000 Binary files a/src/data/MonsterlingOrcAxePink.png and /dev/null differ diff --git a/src/data/MonsterlingRabbitBackah.png b/src/data/MonsterlingRabbitBackah.png deleted file mode 100644 index 52759d3..0000000 Binary files a/src/data/MonsterlingRabbitBackah.png and /dev/null differ diff --git a/src/data/MonsterlingRabbitBackahWhite.png b/src/data/MonsterlingRabbitBackahWhite.png deleted file mode 100644 index ffc7210..0000000 Binary files a/src/data/MonsterlingRabbitBackahWhite.png and /dev/null differ diff --git a/src/data/MonsterlingRabbitKkebiGreen.png b/src/data/MonsterlingRabbitKkebiGreen.png deleted file mode 100644 index 3fee9cb..0000000 Binary files a/src/data/MonsterlingRabbitKkebiGreen.png and /dev/null differ diff --git a/src/data/MonsterlingRabbitPojol.png b/src/data/MonsterlingRabbitPojol.png deleted file mode 100644 index 543ef9d..0000000 Binary files a/src/data/MonsterlingRabbitPojol.png and /dev/null differ diff --git a/src/data/MonsterlingRaccoonBackah.png b/src/data/MonsterlingRaccoonBackah.png deleted file mode 100644 index ad9be9c..0000000 Binary files a/src/data/MonsterlingRaccoonBackah.png and /dev/null differ diff --git a/src/data/MonsterlingRaccoonBackahWhite.png b/src/data/MonsterlingRaccoonBackahWhite.png deleted file mode 100644 index 8581065..0000000 Binary files a/src/data/MonsterlingRaccoonBackahWhite.png and /dev/null differ diff --git a/src/data/MonsterlingRaccoonMask.png b/src/data/MonsterlingRaccoonMask.png deleted file mode 100644 index 15942a6..0000000 Binary files a/src/data/MonsterlingRaccoonMask.png and /dev/null differ diff --git a/src/data/MonsterlingRaccoonPojol.png b/src/data/MonsterlingRaccoonPojol.png deleted file mode 100644 index 966ebbd..0000000 Binary files a/src/data/MonsterlingRaccoonPojol.png and /dev/null differ diff --git a/src/data/MonsterlingSlime.png b/src/data/MonsterlingSlime.png deleted file mode 100644 index 25acaf8..0000000 Binary files a/src/data/MonsterlingSlime.png and /dev/null differ diff --git a/src/data/MonsterlingSlimeBlack.png b/src/data/MonsterlingSlimeBlack.png deleted file mode 100644 index ccfc92c..0000000 Binary files a/src/data/MonsterlingSlimeBlack.png and /dev/null differ diff --git a/src/data/MonsterlingSlimeFire.png b/src/data/MonsterlingSlimeFire.png deleted file mode 100644 index 2c3fc9c..0000000 Binary files a/src/data/MonsterlingSlimeFire.png and /dev/null differ diff --git a/src/data/MonsterlingSlimeIce.png b/src/data/MonsterlingSlimeIce.png deleted file mode 100644 index 3f154b0..0000000 Binary files a/src/data/MonsterlingSlimeIce.png and /dev/null differ diff --git a/src/data/MonsterlingSlimeIceGreen.png b/src/data/MonsterlingSlimeIceGreen.png deleted file mode 100644 index 36caeb1..0000000 Binary files a/src/data/MonsterlingSlimeIceGreen.png and /dev/null differ diff --git a/src/data/MonsterlingSlimeKing.png b/src/data/MonsterlingSlimeKing.png deleted file mode 100644 index 6fa9d32..0000000 Binary files a/src/data/MonsterlingSlimeKing.png and /dev/null differ diff --git a/src/data/MonsterlingSlimeLing.png b/src/data/MonsterlingSlimeLing.png deleted file mode 100644 index 5b07db3..0000000 Binary files a/src/data/MonsterlingSlimeLing.png and /dev/null differ diff --git a/src/data/MonsterlingSlimeQueen.png b/src/data/MonsterlingSlimeQueen.png deleted file mode 100644 index a94af39..0000000 Binary files a/src/data/MonsterlingSlimeQueen.png and /dev/null differ diff --git a/src/data/MonsterlingSlimeQueenRed.png b/src/data/MonsterlingSlimeQueenRed.png deleted file mode 100644 index db48154..0000000 Binary files a/src/data/MonsterlingSlimeQueenRed.png and /dev/null differ diff --git a/src/data/MonsterlingSlimeRed.png b/src/data/MonsterlingSlimeRed.png deleted file mode 100644 index 7bcc3b5..0000000 Binary files a/src/data/MonsterlingSlimeRed.png and /dev/null differ diff --git a/src/data/MonsterlingSlimeThunder.png b/src/data/MonsterlingSlimeThunder.png deleted file mode 100644 index 64c50ad..0000000 Binary files a/src/data/MonsterlingSlimeThunder.png and /dev/null differ diff --git a/src/data/MonsterlingSlimeThunderYellow.png b/src/data/MonsterlingSlimeThunderYellow.png deleted file mode 100644 index 74ffa33..0000000 Binary files a/src/data/MonsterlingSlimeThunderYellow.png and /dev/null differ diff --git a/src/data/MonsterlingSnowyBeast.png b/src/data/MonsterlingSnowyBeast.png deleted file mode 100644 index 244dabf..0000000 Binary files a/src/data/MonsterlingSnowyBeast.png and /dev/null differ diff --git a/src/data/MonsterlingSnowyBeastBlack.png b/src/data/MonsterlingSnowyBeastBlack.png deleted file mode 100644 index 8dcbece..0000000 Binary files a/src/data/MonsterlingSnowyBeastBlack.png and /dev/null differ diff --git a/src/data/MonsterlingSoranyong.png b/src/data/MonsterlingSoranyong.png deleted file mode 100644 index f53c0d4..0000000 Binary files a/src/data/MonsterlingSoranyong.png and /dev/null differ diff --git a/src/data/MonsterlingSoranyongKing.png b/src/data/MonsterlingSoranyongKing.png deleted file mode 100644 index 3671e14..0000000 Binary files a/src/data/MonsterlingSoranyongKing.png and /dev/null differ diff --git a/src/data/MonsterlingSoranyongMutation01.png b/src/data/MonsterlingSoranyongMutation01.png deleted file mode 100644 index 80a7834..0000000 Binary files a/src/data/MonsterlingSoranyongMutation01.png and /dev/null differ diff --git a/src/data/MonsterlingSpaDupaGreen.png b/src/data/MonsterlingSpaDupaGreen.png deleted file mode 100644 index 2e266d0..0000000 Binary files a/src/data/MonsterlingSpaDupaGreen.png and /dev/null differ diff --git a/src/data/MonsterlingSpadupa.png b/src/data/MonsterlingSpadupa.png deleted file mode 100644 index d128dc7..0000000 Binary files a/src/data/MonsterlingSpadupa.png and /dev/null differ diff --git a/src/data/MonsterlingSpiderForest.png b/src/data/MonsterlingSpiderForest.png deleted file mode 100644 index de76bc4..0000000 Binary files a/src/data/MonsterlingSpiderForest.png and /dev/null differ diff --git a/src/data/MonsterlingSpiderGrassland.png b/src/data/MonsterlingSpiderGrassland.png deleted file mode 100644 index e680661..0000000 Binary files a/src/data/MonsterlingSpiderGrassland.png and /dev/null differ diff --git a/src/data/MonsterlingSpiderHat.png b/src/data/MonsterlingSpiderHat.png deleted file mode 100644 index 1e3fa6b..0000000 Binary files a/src/data/MonsterlingSpiderHat.png and /dev/null differ diff --git a/src/data/MonsterlingSpiderMountain.png b/src/data/MonsterlingSpiderMountain.png deleted file mode 100644 index fcc148b..0000000 Binary files a/src/data/MonsterlingSpiderMountain.png and /dev/null differ diff --git a/src/data/MonsterlingSpoonmugger.png b/src/data/MonsterlingSpoonmugger.png deleted file mode 100644 index 257f72b..0000000 Binary files a/src/data/MonsterlingSpoonmugger.png and /dev/null differ diff --git a/src/data/MonsterlingSpoonmuggerFork.png b/src/data/MonsterlingSpoonmuggerFork.png deleted file mode 100644 index 76e47af..0000000 Binary files a/src/data/MonsterlingSpoonmuggerFork.png and /dev/null differ diff --git a/src/data/MonsterlingSpoonmuggerQueen.png b/src/data/MonsterlingSpoonmuggerQueen.png deleted file mode 100644 index 8f0e3d2..0000000 Binary files a/src/data/MonsterlingSpoonmuggerQueen.png and /dev/null differ diff --git a/src/data/MonsterlingStoneGuyGold.png b/src/data/MonsterlingStoneGuyGold.png deleted file mode 100644 index c511b4c..0000000 Binary files a/src/data/MonsterlingStoneGuyGold.png and /dev/null differ diff --git a/src/data/MonsterlingStoneguy.png b/src/data/MonsterlingStoneguy.png deleted file mode 100644 index 534aa9e..0000000 Binary files a/src/data/MonsterlingStoneguy.png and /dev/null differ diff --git a/src/data/MonsterlingStoneguyCrystal.png b/src/data/MonsterlingStoneguyCrystal.png deleted file mode 100644 index 60aa466..0000000 Binary files a/src/data/MonsterlingStoneguyCrystal.png and /dev/null differ diff --git a/src/data/MonsterlingSylphiBlack.png b/src/data/MonsterlingSylphiBlack.png deleted file mode 100644 index 3be960b..0000000 Binary files a/src/data/MonsterlingSylphiBlack.png and /dev/null differ diff --git a/src/data/MonsterlingSylphiSpear.png b/src/data/MonsterlingSylphiSpear.png deleted file mode 100644 index da3f82f..0000000 Binary files a/src/data/MonsterlingSylphiSpear.png and /dev/null differ diff --git a/src/data/MonsterlingSylphiSpearCaptin.png b/src/data/MonsterlingSylphiSpearCaptin.png deleted file mode 100644 index ff50f3e..0000000 Binary files a/src/data/MonsterlingSylphiSpearCaptin.png and /dev/null differ diff --git a/src/data/MonsterlingSylphiSpearCaptinBlack.png b/src/data/MonsterlingSylphiSpearCaptinBlack.png deleted file mode 100644 index ef2232d..0000000 Binary files a/src/data/MonsterlingSylphiSpearCaptinBlack.png and /dev/null differ diff --git a/src/data/MonsterlingSylphi_Grassland.png b/src/data/MonsterlingSylphi_Grassland.png deleted file mode 100644 index 09fc648..0000000 Binary files a/src/data/MonsterlingSylphi_Grassland.png and /dev/null differ diff --git a/src/data/MonsterlingSylphi_Mountain.png b/src/data/MonsterlingSylphi_Mountain.png deleted file mode 100644 index 7bc89fe..0000000 Binary files a/src/data/MonsterlingSylphi_Mountain.png and /dev/null differ diff --git a/src/data/MonsterlingTreeBackah.png b/src/data/MonsterlingTreeBackah.png deleted file mode 100644 index 5953560..0000000 Binary files a/src/data/MonsterlingTreeBackah.png and /dev/null differ diff --git a/src/data/MonsterlingTreeBackahAxe.png b/src/data/MonsterlingTreeBackahAxe.png deleted file mode 100644 index a08c98c..0000000 Binary files a/src/data/MonsterlingTreeBackahAxe.png and /dev/null differ diff --git a/src/data/MonsterlingTroll.png b/src/data/MonsterlingTroll.png deleted file mode 100644 index 110a765..0000000 Binary files a/src/data/MonsterlingTroll.png and /dev/null differ diff --git a/src/data/MonsterlingTrollBlue.png b/src/data/MonsterlingTrollBlue.png deleted file mode 100644 index 714ad22..0000000 Binary files a/src/data/MonsterlingTrollBlue.png and /dev/null differ diff --git a/src/data/MonsterlingTrollKing.png b/src/data/MonsterlingTrollKing.png deleted file mode 100644 index f136d73..0000000 Binary files a/src/data/MonsterlingTrollKing.png and /dev/null differ diff --git a/src/data/MonsterlingWerewolf.png b/src/data/MonsterlingWerewolf.png deleted file mode 100644 index 66634e3..0000000 Binary files a/src/data/MonsterlingWerewolf.png and /dev/null differ diff --git a/src/data/MonsterlingWerewolfMagic.png b/src/data/MonsterlingWerewolfMagic.png deleted file mode 100644 index c87a766..0000000 Binary files a/src/data/MonsterlingWerewolfMagic.png and /dev/null differ diff --git a/src/data/MonsterlingWerewolfMagicianRed.png b/src/data/MonsterlingWerewolfMagicianRed.png deleted file mode 100644 index ae3aee9..0000000 Binary files a/src/data/MonsterlingWerewolfMagicianRed.png and /dev/null differ diff --git a/src/data/MonsterlingWerewolf_MagicianLightning.png b/src/data/MonsterlingWerewolf_MagicianLightning.png deleted file mode 100644 index bf7a304..0000000 Binary files a/src/data/MonsterlingWerewolf_MagicianLightning.png and /dev/null differ diff --git a/src/data/MonsterlingWetlandMaster.png b/src/data/MonsterlingWetlandMaster.png deleted file mode 100644 index 87710e3..0000000 Binary files a/src/data/MonsterlingWetlandMaster.png and /dev/null differ diff --git a/src/data/MonsterlingWetlandMasterBlue.png b/src/data/MonsterlingWetlandMasterBlue.png deleted file mode 100644 index 59b797c..0000000 Binary files a/src/data/MonsterlingWetlandMasterBlue.png and /dev/null differ diff --git a/src/data/MonsterlingWhiteWolf_HostileBlack.png b/src/data/MonsterlingWhiteWolf_HostileBlack.png deleted file mode 100644 index 085bfe3..0000000 Binary files a/src/data/MonsterlingWhiteWolf_HostileBlack.png and /dev/null differ diff --git a/src/data/MonsterlingWolf.png b/src/data/MonsterlingWolf.png deleted file mode 100644 index 3d62b16..0000000 Binary files a/src/data/MonsterlingWolf.png and /dev/null differ diff --git a/src/data/MonsterlingWolfHuge.png b/src/data/MonsterlingWolfHuge.png deleted file mode 100644 index b4428a3..0000000 Binary files a/src/data/MonsterlingWolfHuge.png and /dev/null differ diff --git a/src/data/MonsterlingWolfHugeScar.png b/src/data/MonsterlingWolfHugeScar.png deleted file mode 100644 index 5b8fd2c..0000000 Binary files a/src/data/MonsterlingWolfHugeScar.png and /dev/null differ diff --git a/src/data/MonsterlingWolfHugeScarWhite.png b/src/data/MonsterlingWolfHugeScarWhite.png deleted file mode 100644 index e380e24..0000000 Binary files a/src/data/MonsterlingWolfHugeScarWhite.png and /dev/null differ diff --git a/src/data/MonsterlingWolfWhite.png b/src/data/MonsterlingWolfWhite.png deleted file mode 100644 index 6fa41a4..0000000 Binary files a/src/data/MonsterlingWolfWhite.png and /dev/null differ diff --git a/src/data/REGIONS_DATA.ts b/src/data/REGIONS_DATA.ts index 97132e0..3de45e8 100644 --- a/src/data/REGIONS_DATA.ts +++ b/src/data/REGIONS_DATA.ts @@ -5,7 +5,9 @@ type MonsterCodexRegion = | "namryung" | "serenia" | "surah" - | "varhine"; + | "varhine" + | "legendary monsters" + | "events"; type MonsterCodexRegionData = Record< RegionId, { id: RegionId; region: MonsterCodexRegion; image: string } @@ -19,6 +21,8 @@ export const REGION_ID_BY_REGION = { SERENIA: 4, SURAH: 5, VARHINE: 6, + LEGENDARY: 7, + EVENTS: 8, } as const; export type RegionId = (typeof REGION_ID_BY_REGION)[keyof typeof REGION_ID_BY_REGION]; @@ -73,4 +77,14 @@ export const REGIONS_DATA: MonsterCodexRegionData = { // "https://res.cloudinary.com/dfrhytey3/image/upload/v1780904899/msd/Maps/map-icon-muwon.png", image: "/images/Maps/map-icon-muwon.png", }, + 7: { + id: REGION_ID_BY_REGION.LEGENDARY, + region: "legendary monsters", + image: "/images/Maps/map-icon-all.png", + }, + 8: { + id: REGION_ID_BY_REGION.EVENTS, + region: "events", + image: "/images/Maps/map-icon-all.png", + }, }; diff --git a/src/stores/app-store.ts b/src/stores/app-store.ts index e64ef86..c7d4b95 100644 --- a/src/stores/app-store.ts +++ b/src/stores/app-store.ts @@ -8,6 +8,10 @@ import { type CompletedCodexSlice, createMonsterCodexSlice, } from "@/stores/completed-monster-codex-slice"; +import { + createLoadoutsSlice, + type LoadoutsSlice, +} from "@/stores/loadouts-slice"; import { createMonsterlingsSlice, type MonsterlingsSlice, @@ -26,6 +30,7 @@ export type StoreState = { metadata: { charactersOwned: number; monsterlingsOwned: number; + loadouts: number; codexCompleted: number; }; }; @@ -35,6 +40,7 @@ export type StoreState = { metadata: { charactersOwned: number; monsterlingsOwned: number; + loadouts: number; codexCompleted: number; }; }; @@ -45,7 +51,8 @@ export type StoreState = { setHasHydrated: (flag: boolean) => void; } & CompletedCodexSlice & CharactersOwnedSlice & - MonsterlingsSlice; + MonsterlingsSlice & + LoadoutsSlice; const initialState = { backupUpdatedAt: Date.now(), @@ -71,6 +78,7 @@ export const useAppStore = create()( ...createMonsterCodexSlice(set, get, api), ...createCharactersOwnedSlice(set, get, api), ...createMonsterlingsSlice(set, get, api), + ...createLoadoutsSlice(set, get, api), }), { name: "msd-tracker", diff --git a/src/stores/loadouts-slice.ts b/src/stores/loadouts-slice.ts new file mode 100644 index 0000000..2cae93d --- /dev/null +++ b/src/stores/loadouts-slice.ts @@ -0,0 +1,73 @@ +import { nanoid } from "nanoid"; +import type { StateCreator } from "zustand"; +import type { CharId } from "@/data/CHARACTERS_DATA"; +import type { StoreState } from "@/stores/app-store"; + +export type LoadoutCharacterSlot = { + characterId: CharId | null; + monsterlingIds: [string | null, string | null, string | null]; +}; + +export type LoadoutOwned = { + id: string; + name: string; + characters: [ + LoadoutCharacterSlot, + LoadoutCharacterSlot, + LoadoutCharacterSlot, + ]; +}; + +export type LoadoutsSlice = { + loadouts: Record; + + setLoadout: (loadout: Omit, id?: string) => void; + deleteLoadout: (id: string) => void; + resetLoadoutsSlice: () => void; +}; + +export const emptyLoadoutCharacterSlot = (): LoadoutCharacterSlot => ({ + characterId: null, + monsterlingIds: [null, null, null], +}); + +export const createLoadoutsSlice: StateCreator< + StoreState, + [], + [], + LoadoutsSlice +> = (set) => ({ + loadouts: {}, + + setLoadout: (loadout, id) => + set((state) => { + const loadoutId = id ?? nanoid(); + + return { + loadouts: { + ...state.loadouts, + [loadoutId]: { + id: loadoutId, + ...loadout, + }, + }, + backupUpdatedAt: Date.now(), + }; + }), + + deleteLoadout: (id) => + set((state) => { + const { [id]: _toDelete, ...rest } = state.loadouts; + + return { + loadouts: { ...rest }, + backupUpdatedAt: Date.now(), + }; + }), + + resetLoadoutsSlice: () => + set({ + loadouts: {}, + backupUpdatedAt: Date.now(), + }), +}); diff --git a/src/stores/monsterlings-slice.ts b/src/stores/monsterlings-slice.ts index e43b876..6f5da52 100644 --- a/src/stores/monsterlings-slice.ts +++ b/src/stores/monsterlings-slice.ts @@ -1,10 +1,11 @@ import { nanoid } from "nanoid"; import type { StateCreator } from "zustand"; import type { MonsterlingOwned } from "@/components/monsterlings/components/monsterling-form"; +import type { CharId } from "@/data/CHARACTERS_DATA"; import type { StoreState } from "@/stores/app-store"; export type MonsterlingsSlice = { - monsterlingsOwned: Record; + monsterlingsOwned: Record; setMonsterlingOwned: (monsterling: MonsterlingOwned, id?: string) => void; deleteMonsterlingOwned: (id: string) => void; diff --git a/vite.config.ts b/vite.config.ts index bbf968c..c504404 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,8 +1,9 @@ import { cloudflare } from "@cloudflare/vite-plugin"; +import babel from "@rolldown/plugin-babel"; import tailwindcss from "@tailwindcss/vite"; import { devtools } from "@tanstack/devtools-vite"; import { tanstackStart } from "@tanstack/react-start/plugin/vite"; -import viteReact from "@vitejs/plugin-react"; +import viteReact, { reactCompilerPreset } from "@vitejs/plugin-react"; import { defineConfig } from "vite"; const config = defineConfig({ @@ -24,6 +25,9 @@ const config = defineConfig({ // nitro(), // rsc(), viteReact(), + babel({ + presets: [reactCompilerPreset()], + }), ], });