From 5376084f535ac9976061baf54d48b4a8c51abcc7 Mon Sep 17 00:00:00 2001 From: N <42465069+ofcoursenopewastaken@users.noreply.github.com> Date: Mon, 19 Aug 2024 22:47:54 +0700 Subject: [PATCH] removed temp fix for Kestrel --- bun.lockb | Bin 101243 -> 103389 bytes package.json | 10 +++++----- src/lib/logic/operators.ts | 14 +------------- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/bun.lockb b/bun.lockb index da2963ab5573a0b3d6da831daedc4e7ed8c9994b..503ffc7114847a2f5d017ebbd3dde8daf38cb949 100644 GIT binary patch delta 7397 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 diff --git a/package.json b/package.json index 210d3be..3bb5dee 100644 --- a/package.json +++ b/package.json @@ -8,15 +8,15 @@ }, "dependencies": { "@sveltejs/adapter-static": "^3.0.2", - "@sveltejs/kit": "^2.5.18", + "@sveltejs/kit": "^2.5.20", "@sveltejs/vite-plugin-svelte": "^3.1.1", "@tailwindcss/vite": "^4.0.0-alpha.18", - "@types/node": "^22.0.0", - "autoprefixer": "^10.4.19", + "@types/node": "^22.1.0", + "autoprefixer": "^10.4.20", "fast-xml-parser": "^4.4.1", "postcss": "^8.4.40", - "svelte": "^5.0.0-next.201", - "svelte-check": "^3.8.4", + "svelte": "^5.0.0-next.208", + "svelte-check": "^3.8.5", "tailwindcss": "^3.4.7", "tslib": "^2.6.3", "typescript": "^5.5.4", diff --git a/src/lib/logic/operators.ts b/src/lib/logic/operators.ts index e788d6e..2a0414c 100644 --- a/src/lib/logic/operators.ts +++ b/src/lib/logic/operators.ts @@ -163,20 +163,8 @@ for (const region of SERVERS) { { for (const rawCharSkill of rawChar.skills) { - // TEMPORARY: 31/7/2024, KR gamedata was missing Kestrel's skills let rawSkillData = RawSkillTable[rawCharSkill.skillId] - if (!rawSkillData) { - rawSkillData = ( - JSON.parse( - ( - await fs.readFile( - `${GAMEDATA_PATH}/zh_CN/gamedata/excel/skill_table.json` - ) - ).toString() - ) as RawSkillTable - )[rawCharSkill.skillId] - } - + const iconId = rawSkillData.iconId || rawSkillData.skillId const isGenericSkill = iconId.match(GenericSkillRegex) !== null