npcId in aiMultiNpc might not exist in npcSvtFollower

Store npcId in NiceQuestPhaseAiNpc in case npc is none

Author: squaresmile

app/core/nice/follower.py

@@ -300,6 +300,7 @@ async def get_nice_support_servants(
                 lang=lang,
             )
             for aiNpcId in aiNpcIds
+            if any(npc_svt.id == aiNpcId for npc_svt in npcSvtFollower)
         }
     else:
         ai_npc = {}

app/core/nice/quest.py

@@ -434,12 +434,12 @@ async def get_nice_quest_phase_no_rayshift(
         )
         support_servants = npcs.support_servants
         if "aiNpc" in raw_quest.mstQuestPhase.script and npcs.ai_npc is not None:
-            raw_quest.mstQuestPhase.script["aiNpc"]["npc"] = npcs.ai_npc[
-                raw_quest.mstQuestPhase.script["aiNpc"]["npcId"]
-            ]
+            raw_quest.mstQuestPhase.script["aiNpc"]["npc"] = npcs.ai_npc.get(
+                raw_quest.mstQuestPhase.script["aiNpc"]["npcId"], None
+            )
         if "aiMultiNpc" in raw_quest.mstQuestPhase.script:
             for aiNpc in raw_quest.mstQuestPhase.script["aiMultiNpc"]:
-                aiNpc["npc"] = npcs.ai_npc[aiNpc["npcId"]]
+                aiNpc["npc"] = npcs.ai_npc.get(aiNpc["npcId"], None)
 
     if "LimitAct" in raw_quest.mstQuestPhase.script:
         raw_quest.mstQuestPhase.script["LimitAct"] = STAGE_LIMIT_ACT_TYPE_NAME[
@@ -570,11 +570,11 @@ def set_ai_npc_data(ai_npcs: dict[int, QuestEnemy] | None) -> None:
         if ai_npcs is not None:
             if db_data.nice.extraDetail.aiNpc is not None:
                 db_data.nice.extraDetail.aiNpc.detail = ai_npcs[
-                    db_data.nice.extraDetail.aiNpc.npc.npcId
+                    db_data.nice.extraDetail.aiNpc.npcId
                 ]
             if db_data.nice.extraDetail.aiMultiNpc is not None:
                 for aiNpc in db_data.nice.extraDetail.aiMultiNpc:
-                    aiNpc.detail = ai_npcs[aiNpc.npc.npcId]
+                    aiNpc.detail = ai_npcs[aiNpc.npcId]
 
     def set_follower_data(followers: dict[int, QuestEnemy] | None) -> None:
         if followers is not None:

app/schemas/nice.py

@@ -2931,7 +2931,8 @@ class SupportServant(BaseModelORJson):
 
 
 class NiceQuestPhaseAiNpc(BaseModelORJson):
-    npc: NpcServant
+    npcId: int
+    npc: NpcServant | None
     detail: QuestEnemy | None = None
     aiIds: list[int]