poi-plugin-quest-info-2 0.11.0 → 0.12.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # poi-plugin-quest-info-2
 
+## 0.12.1
+
+### Patch Changes
+
+- 8224a06: Fix locked quest status bug
+
+## 0.12.0
+
+### Minor Changes
+
+- 7ba3993: Check the quest chain full completed
+
+### Patch Changes
+
+- d80267b: Update quest data
+
 ## 0.11.0
 
 ### Minor Changes

package/build/kcQuestsData/DATA_VERSION

@@ -1 +1 @@
-ff326d93a76cbfef36a1f3c9b4a8e3be4ac50583
+5f441167d25695fe9ba0b81e9cf3d3725cc01e2f

package/build/kcQuestsData/index.ts

@@ -4,4 +4,4 @@ export const KcwikiQuestData = {
   'zh-CN': zh_CN,
 }
 
-export const version = 'ff326d93a76cbfef36a1f3c9b4a8e3be4ac50583'
+export const version = '5f441167d25695fe9ba0b81e9cf3d3725cc01e2f'

package/build/kcQuestsData/quests-scn-new.json

@@ -1,5 +1,10 @@
 [
   "314",
+  "370",
+  "962",
+  "963",
+  "964",
+  "965",
   "992",
   "994"
 ]

package/build/kcQuestsData/quests-scn.json

@@ -2503,6 +2503,16 @@
     ],
     "rewards": "奖励：以下奖励三选一： 伊良湖  高速修复材 ×3 开发资材 ×3 以下奖励三选一： 「12.7cm 连装炮 C 型改二」  新型兵装资材 ×2 「强化型舰本式缶」×3"
   },
+  "370": {
+    "code": "2311C2",
+    "desc": "以包含「鹿岛」、「択捉」、「松轮」、「佐渡」、「福江」、「鹈来」、「岸波」、「早波」、「谷风」、「江风」、「山云」、「朝云」、「山汐丸」以及丁型海防舰中的至少 4 艘舰艇组成舰队，在本周内进行演习，取得 5 次【A 胜】以上！",
+    "memo2": "每周任务 演习舰队中包括【鹿岛、択捉、松轮、佐渡、福江、鹈来、岸波、早波、谷风、江风、山云、朝云、山汐丸】以及丁型海防舰（第四、二十二、三〇号海防舰）中至少 4 艘，本周演习 A 胜以上 5 次。",
+    "name": "【Xmas 限定】圣诞夜海上护卫队演习",
+    "pre": [
+      "B6"
+    ],
+    "rewards": "奖励：以下奖励二选一： 伊良湖 ×1 开发资材 ×3 以下奖励二选一： 改修资材 ×2 高速修复材 ×3"
+  },
   "401": {
     "code": "D1",
     "desc": "舰队出发「远征」！",
@@ -5067,7 +5077,8 @@
     "memo2": "含有翔鹤、瑞鹤、胧、秋云的舰队分别出击 3-5,5-2,7-2P2,6-5 并取得 S 胜。",
     "name": "「第五航空战队」、纵横无尽",
     "pre": [
-      "D21"
+      "D21",
+      "B15"
     ],
     "rewards": "奖励：以下奖励三选一： 洋上补给 ×2 高速修复材 ×6 25mm 三连装机铳 ×2 以下奖励二选一： 試製東海 试制景云 (舰侦型)"
   },
@@ -5459,6 +5470,48 @@
     ],
     "rewards": "奖励：以下奖励三选一： 特制家具职人 新型火炮兵装资材 ×2 改修资材 ×5 \n以下奖励三选一：' 61cm 四連装 (酸素) 魚雷後期型 新型兵装资材 ×4 战斗详报"
   },
+  "962": {
+    "code": "2311B6",
+    "desc": "【圣诞限定任务】以包含「夕云」、「早波」、「浜波」、「卷波」、「朧」、「漣」、「潮」、「曙」中至少 4 艘舰艇组成的舰队，在镇守府正面海域、炼油厂地带沿岸、南西群岛防卫线及镇守府近海进行反复出击！驱逐敌人！",
+    "memo2": "舰队包含【夕云 / 早波 / 滨波 / 卷波 / 胧 / 涟 / 潮 / 曙】中的 4 艘，取得 1-1、1-3、1-4、1-5 各 S 胜 2 次。",
+    "name": "【圣诞快乐】驱逐舰队，出击！",
+    "pre": [
+      "B2",
+      "D1"
+    ],
+    "rewards": "奖励：礼物箱 ×1 以下奖励三选一： 开发资材 ×10 改修资材 ×4 特制家具职人 ×1 "
+  },
+  "963": {
+    "code": "2311B7",
+    "desc": "【圣诞限定任务】以旗舰和僚舰为「大淀」「那珂」「酒匂」「矢矧改二 / 乙」「谢菲尔德」「德・鲁伊特」「哥特兰」的舰队，反复歼灭东部奥廖尔海和冲之岛海域的敌人！",
+    "memo2": "在【大淀 / 那珂 / 酒匂 / 矢矧改二 (乙)/Sheffield/De Ruyter/Gotland】中任选 2 艘（并将其中之一设置为旗舰）。取得 2-3、2-4 各 S 胜 2 次。",
+    "name": "【圣诞限定】圣夜的轻巡，拔锚！",
+    "pre": [
+      "2311B6"
+    ],
+    "rewards": "奖励：以下奖励三选一： 「新型高温高压缶」★+2 新型火炮兵装资材 ×2 高速修复材 ×6 以下奖励三选一： 「15.2cm 连装炮改」★+4 「8cm 高角炮」★+8 勋章 ×1 "
+  },
+  "964": {
+    "code": "2311B8",
+    "desc": "以旗舰和僚舰为「神威」「瑞穗」「迅鲸」「长鲸」「明石」「塔斯特司令官」「内华达」「鹿岛」「宗谷」的舰队，在爪姆岛近海、马绍尔群岛近海和古阿诺环礁海域海域反复取得 S 胜利！",
+    "memo2": "在【神威 / 瑞穂 / 速吸 / 迅鯨 / 長鯨 / 明石 / 朝日 / Commandant Teste/Nevada/ 鹿島 / 宗谷】中任选 2 艘（并将其中之一设置为旗舰）。取得 4-1、6-2、6-3 各 S 胜 2 次。",
+    "name": "【圣诞扩张作战 I】圣诞特务舰，作战开始！",
+    "pre": [
+      "2311B7",
+      "D18"
+    ],
+    "rewards": "奖励：以下奖励三选一： 熟练搭乘员 ×2 「14cm 连装炮改二」 改修资材 ×6 以下奖励三选一： 新型火炮兵装资材 ×3 新型兵装资材 ×3 「Barracuda Mk.II」 "
+  },
+  "965": {
+    "code": "2311B9",
+    "desc": "以包含「厌战」「谢菲尔德」「休斯顿」「铃谷」「熊野」「衣笠」之中 3 艘以上的圣诞合同舰队，反复出击咖喱洋里兰卡岛海域、萨部岛近海海域和中部北海域孔雀岛近海！歼灭敌人！",
+    "memo2": "舰队包括【Warspite/Sheffield/Houston/ 鈴谷 / 熊野 / 衣笠】中选择 3 艘，取得 4-5、5-3、6-4 各 S 胜 2 次。",
+    "name": "【圣诞扩张作战 II】圣诞最终决战，发动！",
+    "pre": [
+      "2311B8"
+    ],
+    "rewards": "奖励：以下奖励三选一： 「一式陆攻二二型甲」×2 「银河」 「Barracuda Mk.II」×2 以下奖励三选一： 新型航空兵装资材 ×3 勋章 ×2 Ne 式引擎 "
+  },
   "966": {
     "code": "B175",
     "desc": "击破南西诸岛近海，巴士海峡，东部奥廖尔海，槟榔屿深部的敌舰队！经由昭南本土航路于台湾停泊。准备「设营队」×1，在当地展开可用于空中掩护的南西海域「基地航空队」！",

package/build/prePostQuest.json

@@ -884,7 +884,8 @@
     "post": [
       "B4",
       "E1",
-      "E2"
+      "E2",
+      "2311B6"
     ]
   },
   "204": {
@@ -921,6 +922,7 @@
       "C15",
       "Cs5",
       "C32",
+      "2311C2",
       "F73",
       "B67",
       "B82",
@@ -1128,7 +1130,8 @@
     ],
     "post": [
       "A78",
-      "F80"
+      "F80",
+      "B143"
     ]
   },
   "226": {
@@ -2210,6 +2213,12 @@
       "2307B1"
     ]
   },
+  "370": {
+    "pre": [
+      "B6"
+    ],
+    "post": []
+  },
   "401": {
     "pre": [
       "A5"
@@ -2217,7 +2226,8 @@
     "post": [
       "Dd1",
       "Dw1",
-      "B107"
+      "B107",
+      "2311B6"
     ]
   },
   "402": {
@@ -2358,6 +2368,7 @@
     ],
     "post": [
       "Dm1",
+      "2311B8",
       "B186"
     ]
   },
@@ -4235,6 +4246,7 @@
   },
   "913": {
     "pre": [
+      "B15",
       "D21"
     ],
     "post": []
@@ -4529,6 +4541,38 @@
       "B184"
     ]
   },
+  "962": {
+    "pre": [
+      "B2",
+      "D1"
+    ],
+    "post": [
+      "2311B7"
+    ]
+  },
+  "963": {
+    "pre": [
+      "2311B6"
+    ],
+    "post": [
+      "2311B8"
+    ]
+  },
+  "964": {
+    "pre": [
+      "D18",
+      "2311B7"
+    ],
+    "post": [
+      "2311B9"
+    ]
+  },
+  "965": {
+    "pre": [
+      "2311B8"
+    ],
+    "post": []
+  },
   "966": {
     "pre": [
       "B113",

package/build/questCodeMap.json

@@ -248,6 +248,7 @@
   "C75": 365,
   "C76": 366,
   "Cy11": 368,
+  "2311C2": 370,
   "D1": 401,
   "Dd1": 402,
   "Dd2": 403,
@@ -531,6 +532,10 @@
   "B172": 957,
   "B173": 958,
   "B174": 961,
+  "2311B6": 962,
+  "2311B7": 963,
+  "2311B8": 964,
+  "2311B9": 965,
   "B175": 966,
   "B176": 967,
   "B177": 968,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poi-plugin-quest-info-2",
-  "version": "0.11.0",
+  "version": "0.12.1",
   "private": false,
   "description": "show quest info",
   "homepage": "https://github.com/lawvs/poi-plugin-quest-2/",

package/src/__tests__/__snapshots__/questHelper.spec.ts.snap

@@ -421,6 +421,10 @@ exports[`questHelper should 101 locked quests match snapshot 1`] = `
   "949": true,
   "958": true,
   "961": true,
+  "962": true,
+  "963": true,
+  "964": true,
+  "965": true,
   "966": true,
   "967": true,
   "968": true,

package/src/__tests__/kcwikiData.spec.ts

@@ -4,7 +4,7 @@ import newQuestData from '../../build/kcQuestsData/quests-scn-new.json'
 describe('should version correct', () => {
   test('should KcwikiQuestData Game data version correct', () => {
     expect(version).toMatchInlineSnapshot(
-      `"ff326d93a76cbfef36a1f3c9b4a8e3be4ac50583"`,
+      `"53b0db6d5a521bcf934878d07918e06b9fceaef1"`,
     )
   })
 

package/src/__tests__/questHelper.spec.ts

@@ -1,11 +1,18 @@
 import {
+  calcQuestMap,
   getCompletedQuest,
   getLockedQuest,
   getPostQuestIds,
   getPreQuestIds,
+  getQuestCodeByGameId,
 } from '../questHelper'
 
 describe('questHelper', () => {
+  test('should getQuestCodeByGameId correct', () => {
+    expect(getQuestCodeByGameId(0)).toEqual(null)
+    expect(getQuestCodeByGameId(101)).toEqual('A1')
+  })
+
   test('should getPreQuestIds correct', () => {
     expect(getPreQuestIds(101)).toEqual([])
     expect(getPreQuestIds(102)).toEqual([101])
@@ -23,11 +30,11 @@ describe('questHelper', () => {
   })
 
   test('should getCompletedQuest quest match snapshot', () => {
-    expect(getCompletedQuest([817])).toMatchSnapshot()
+    expect(calcQuestMap([817], getPreQuestIds)).toMatchSnapshot()
   })
 
   test('should 236 getCompletedQuest correct', () => {
-    expect(getCompletedQuest([236])).toMatchSnapshot()
+    expect(calcQuestMap([236], getPreQuestIds)).toMatchSnapshot()
   })
 
   test('should 101 locked quests match snapshot', () => {

package/src/questHelper.ts

@@ -211,6 +211,24 @@ export const getQuestPrePost = (gameId: number) => {
   return prePostQuest[String(gameId) as keyof typeof prePostQuest]
 }
 
+const getNoPostQuestIds = (): number[] => {
+  const noPostQuestIds = []
+  for (const [gameId, { post }] of Object.entries(prePostQuest)) {
+    if (!post.length) {
+      noPostQuestIds.push(+gameId)
+    }
+  }
+  return noPostQuestIds
+}
+
+/**
+ * Get quest id by quest code
+ *
+ * @example
+ * ```ts
+ * getQuestIdByCode('A1') // 101
+ * ```
+ */
 export const getQuestIdByCode = (code: string) => {
   if (code in questCodeMap) {
     return questCodeMap[code as keyof typeof questCodeMap]
@@ -218,17 +236,62 @@ export const getQuestIdByCode = (code: string) => {
   return null
 }
 
+export const getQuestCodeByGameId = (gameId: number) => {
+  const questCode = Object.entries(questCodeMap).find(([, id]) => id === gameId)
+  if (!questCode) {
+    return null
+  }
+  return questCode[0]
+}
+
+/**
+ * Get pre quest ids by quest id
+ *
+ * @example
+ * ```ts
+ * // Quest id A2's pre quest id is A1
+ * getPreQuestIds(102) // [101]
+ * ```
+ */
 export const getPreQuestIds = (gameId: number): number[] =>
   getQuestPrePost(gameId)
     .pre.map((code) => getQuestIdByCode(code))
     .filter(Boolean) as number[]
 
+const getAllPreQuestIds = (gameId: number): number[] => {
+  const set = new Set<number>()
+  const queue = [gameId]
+  while (queue.length) {
+    const gameId = queue.shift()!
+    getPreQuestIds(gameId).forEach((preGameId) => {
+      if (set.has(preGameId)) {
+        return
+      }
+      set.add(preGameId)
+      queue.push(preGameId)
+    })
+  }
+  return Array.from(set)
+}
+
+/**
+ * Get post quest ids by quest id
+ *
+ * @example
+ * ```ts
+ * // Quest id A1's post quest id is A2
+ * getPreQuestIds(101) // [102]
+ * ```
+ */
 export const getPostQuestIds = (gameId: number): number[] =>
   getQuestPrePost(gameId)
     .post.map((code) => getQuestIdByCode(code))
     .filter(Boolean) as number[]
 
-const calcQuestMap = (
+/**
+ * @internal Export for test
+ */
+export const calcQuestMap = (
   inProgressQuests: number[],
   next: (gameId: number) => number[],
 ) => {
@@ -251,6 +314,33 @@ const calcQuestMap = (
 export const getCompletedQuest = moize(
   (inProgressQuest: number[]) => {
     const completedQuest = calcQuestMap(inProgressQuest, getPreQuestIds)
+    // Check if the quest chain had completed
+    // See https://github.com/lawvs/poi-plugin-quest-2/issues/83
+    const noPostQuestIds = getNoPostQuestIds()
+    noPostQuestIds.forEach((gameId) => {
+      if (inProgressQuest.includes(gameId) || completedQuest[gameId]) {
+        return
+      }
+      const preQuestIds = getAllPreQuestIds(gameId)
+      const hasInProgressPreQuest = preQuestIds.some((preGameId) =>
+        inProgressQuest.includes(preGameId),
+      )
+      if (hasInProgressPreQuest) {
+        // The quest chain is not completed
+        return
+      }
+      const hasCompletedPreQuest = preQuestIds.some(
+        (preGameId) => completedQuest[preGameId],
+      )
+      if (!hasCompletedPreQuest) {
+        // The quest chain is not unlocked
+        return
+      }
+      preQuestIds.forEach((preGameId) => {
+        completedQuest[preGameId] = true
+      })
+      completedQuest[gameId] = true
+    })
     return completedQuest
   },
   {
@@ -266,6 +356,15 @@ export const getCompletedQuest = moize(
 export const getLockedQuest = moize(
   (inProgressQuest: number[]) => {
     const lockedQuest = calcQuestMap(inProgressQuest, getPostQuestIds)
+
+    // Fix https://github.com/lawvs/poi-plugin-quest-2/issues/87
+    // Since we check the quest chain in getCompletedQuest, we need to remove the completed quest from lockedQuest
+    const completedQuest = getCompletedQuest(inProgressQuest)
+    Object.keys(lockedQuest).forEach((gameId) => {
+      if (completedQuest[+gameId]) {
+        delete lockedQuest[+gameId]
+      }
+    })
     return lockedQuest
   },
   {

package/src/store/gameQuest.tsx

@@ -3,10 +3,10 @@ import React, { createContext, useContext } from 'react'
 import { useGameQuest } from '../poi/hooks'
 import { GameQuest } from '../poi/types'
 import {
+  QUEST_STATUS,
   getCompletedQuest,
   getLockedQuest,
   questApiStateToQuestStatus,
-  QUEST_STATUS,
 } from '../questHelper'
 
 export const GameQuestContext = createContext<{
@@ -47,12 +47,12 @@ const useQuestStatusQuery = (inProgressQuests: GameQuest[]) => {
         return questApiStateToQuestStatus(theGameQuest.api_state)
       }
 
-      if (gameId in lockedQuest) {
-        return QUEST_STATUS.LOCKED
-      }
       if (gameId in alreadyCompletedQuest) {
         return QUEST_STATUS.ALREADY_COMPLETED
       }
+      if (gameId in lockedQuest) {
+        return QUEST_STATUS.LOCKED
+      }
       return QUEST_STATUS.UNKNOWN
     },
   }