poi-plugin-quest-info-2 0.12.0 → 0.12.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # poi-plugin-quest-info-2
 
+## 0.12.2
+
+### Patch Changes
+
+- cf28588: Update quest data
+
+## 0.12.1
+
+### Patch Changes
+
+- 8224a06: Fix locked quest status bug
+
 ## 0.12.0
 
 ### Minor Changes

package/build/kcQuestsData/DATA_VERSION

@@ -1 +1 @@
-53b0db6d5a521bcf934878d07918e06b9fceaef1
+5f441167d25695fe9ba0b81e9cf3d3725cc01e2f

package/build/kcQuestsData/index.ts

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

package/build/kcQuestsData/quests-scn.json

@@ -5077,7 +5077,8 @@
     "memo2": "含有翔鹤、瑞鹤、胧、秋云的舰队分别出击 3-5,5-2,7-2P2,6-5 并取得 S 胜。",
     "name": "「第五航空战队」、纵横无尽",
     "pre": [
-      "D21"
+      "D21",
+      "B15"
     ],
     "rewards": "奖励：以下奖励三选一： 洋上补给 ×2 高速修复材 ×6 25mm 三连装机铳 ×2 以下奖励二选一： 試製東海 试制景云 (舰侦型)"
   },

package/build/prePostQuest.json

@@ -1130,7 +1130,8 @@
     ],
     "post": [
       "A78",
-      "F80"
+      "F80",
+      "B143"
     ]
   },
   "226": {
@@ -4245,6 +4246,7 @@
   },
   "913": {
     "pre": [
+      "B15",
       "D21"
     ],
     "post": []

package/package.json

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

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(
-      `"53b0db6d5a521bcf934878d07918e06b9fceaef1"`,
+      `"5f441167d25695fe9ba0b81e9cf3d3725cc01e2f"`,
     )
   })
 

package/src/questHelper.ts

@@ -356,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
     },
   }