From 49d28e2a5a2108ccf9f7ae5693f38ed8d7bbe38b Mon Sep 17 00:00:00 2001
From: Paul Campbell <pacampbell87@gmail.com>
Date: Fri, 4 Oct 2024 20:47:40 -0400
Subject: [PATCH 1/4] fix: Fix few issues related to quest.Enabled

- Don't populate quest information for quests which are not enabled.
- Add a new function to check if a quest is enabled which can handle
  null without causing an exception.
---
 Arrowgene.Ddon.GameServer/Characters/QuestManager.cs | 11 +++++++++++
 .../GatheringItems/InstanceEventDropItemManager.cs   |  2 +-
 .../Handler/PartyPartyCreateHandler.cs               | 12 ++++++------
 .../Handler/QuestGetCycleContentsStateListHandler.cs | 12 +++++++++++-
 .../Handler/QuestGetTutorialQuestListHandler.cs      |  3 ++-
 Arrowgene.Ddon.GameServer/Party/PartyQuestState.cs   |  5 ++---
 6 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/Arrowgene.Ddon.GameServer/Characters/QuestManager.cs b/Arrowgene.Ddon.GameServer/Characters/QuestManager.cs
index 25351a2ac..b452f9583 100644
--- a/Arrowgene.Ddon.GameServer/Characters/QuestManager.cs
+++ b/Arrowgene.Ddon.GameServer/Characters/QuestManager.cs
@@ -228,6 +228,17 @@ public static Quest GetQuest(uint questId)
             return GetQuest((QuestId)questId);
         }
 
+        public static bool IsQuestEnabled(uint questId)
+        {
+            var quest = GetQuest(questId);
+            return (quest == null) ? false : quest.Enabled;
+        }
+
+        public static bool IsQuestEnabled(QuestId questId)
+        {
+            return IsQuestEnabled((uint)questId);
+        }
+
         public class LayoutFlag
         {
             public static CDataQuestLayoutFlagSetInfo Create(uint layoutFlag, StageNo stageNo, uint groupId)
diff --git a/Arrowgene.Ddon.GameServer/GatheringItems/InstanceEventDropItemManager.cs b/Arrowgene.Ddon.GameServer/GatheringItems/InstanceEventDropItemManager.cs
index d819cd0b4..f3d0701bd 100644
--- a/Arrowgene.Ddon.GameServer/GatheringItems/InstanceEventDropItemManager.cs
+++ b/Arrowgene.Ddon.GameServer/GatheringItems/InstanceEventDropItemManager.cs
@@ -23,7 +23,7 @@ public InstanceEventDropItemManager(AssetRepository assetRepository)
 
         private bool DropEnabled(Character character, EventItem item, Enemy enemy, StageId stageId)
         {
-            if (item.QuestIds.Count > 0 && !item.QuestIds.Any(x => QuestManager.GetQuest(x).Enabled))
+            if (item.QuestIds.Count > 0 && !item.QuestIds.Any(x => QuestManager.IsQuestEnabled(x)))
             {
                 return false;
             }
diff --git a/Arrowgene.Ddon.GameServer/Handler/PartyPartyCreateHandler.cs b/Arrowgene.Ddon.GameServer/Handler/PartyPartyCreateHandler.cs
index d404d9ec8..861c22782 100644
--- a/Arrowgene.Ddon.GameServer/Handler/PartyPartyCreateHandler.cs
+++ b/Arrowgene.Ddon.GameServer/Handler/PartyPartyCreateHandler.cs
@@ -51,17 +51,17 @@ public override void Handle(GameClient client, StructurePacket<C2SPartyPartyCrea
                 return;
             }
 
-            var quests = Server.Database.GetQuestProgressByType(client.Character.CommonId, QuestType.All);
-            foreach (var quest in quests)
+            var progress = Server.Database.GetQuestProgressByType(client.Character.CommonId, QuestType.All);
+            foreach (var questProgress in progress)
             {
-                if (quest.VariantId != 0)
+                if (questProgress.VariantId != 0)
                 {
-                    Logger.Debug($"Getting quest progress. Adding {quest.QuestId} with variant {quest.VariantId}");
-                    party.QuestState.AddNewQuest(quest.QuestId, quest.Step, true, (uint)quest.VariantId);
+                    Logger.Debug($"Getting quest progress. Adding {questProgress.QuestId} with variant {questProgress.VariantId}");
+                    party.QuestState.AddNewQuest(questProgress.QuestId, questProgress.Step, true, (uint)questProgress.VariantId);
                     continue;
                 }
 
-                party.QuestState.AddNewQuest(quest.QuestId, quest.Step, true);
+                party.QuestState.AddNewQuest(questProgress.QuestId, questProgress.Step, true);
             }
 
             // Add quest for debug command
diff --git a/Arrowgene.Ddon.GameServer/Handler/QuestGetCycleContentsStateListHandler.cs b/Arrowgene.Ddon.GameServer/Handler/QuestGetCycleContentsStateListHandler.cs
index d8fe938ea..35423a7bd 100644
--- a/Arrowgene.Ddon.GameServer/Handler/QuestGetCycleContentsStateListHandler.cs
+++ b/Arrowgene.Ddon.GameServer/Handler/QuestGetCycleContentsStateListHandler.cs
@@ -64,6 +64,11 @@ public override void Handle(GameClient client, IPacket packet)
             var tutorialQuestInProgress = Server.Database.GetQuestProgressByType(client.Character.CommonId, QuestType.Tutorial);
             foreach (var questProgress in tutorialQuestInProgress)
             {
+                if (!QuestManager.IsQuestEnabled(questProgress.QuestId))
+                {
+                    continue;
+                }
+
                 var quest = QuestManager.GetQuest(questProgress.QuestId);
                 var tutorialQuest = quest.ToCDataTutorialQuestOrderList(questProgress.Step);
                 ntc.TutorialQuestOrderList.Add(tutorialQuest);
@@ -74,7 +79,12 @@ public override void Handle(GameClient client, IPacket packet)
                 var priorityQuests = Server.Database.GetPriorityQuests(client.Party.Leader.Client.Character.CommonId);
                 foreach (var questId in priorityQuests)
                 {
-                    var quest = client.Party.QuestState.GetQuest(questId);
+                    if (!QuestManager.IsQuestEnabled(questId))
+                    {
+                        continue;
+                    }
+
+                    var quest = QuestManager.GetQuest(questId);
                     ntc.PriorityQuestList.Add(new CDataPriorityQuest()
                     {
                         QuestId = (uint)quest.QuestId,
diff --git a/Arrowgene.Ddon.GameServer/Handler/QuestGetTutorialQuestListHandler.cs b/Arrowgene.Ddon.GameServer/Handler/QuestGetTutorialQuestListHandler.cs
index c780696c9..231f74595 100644
--- a/Arrowgene.Ddon.GameServer/Handler/QuestGetTutorialQuestListHandler.cs
+++ b/Arrowgene.Ddon.GameServer/Handler/QuestGetTutorialQuestListHandler.cs
@@ -6,6 +6,7 @@
 using Arrowgene.Ddon.Shared.Network;
 using Arrowgene.Logging;
 using System.IO;
+using System.Linq;
 
 namespace Arrowgene.Ddon.GameServer.Handler
 {
@@ -28,7 +29,7 @@ public override S2CQuestGetTutorialQuestListRes Handle(GameClient client, C2SQue
 
             // This handler should return personal quests which have not been started
             // yet when the player enters the StageNo
-            foreach (var quest in QuestManager.GetTutorialQuestsByStageNo(request.StageNo))
+            foreach (var quest in QuestManager.GetTutorialQuestsByStageNo(request.StageNo).Where(x => x.Enabled).ToList())
             {
                 uint stageNo = (uint) StageManager.ConvertIdToStageNo(quest.StageId);
                 if (stageNo != request.StageNo)
diff --git a/Arrowgene.Ddon.GameServer/Party/PartyQuestState.cs b/Arrowgene.Ddon.GameServer/Party/PartyQuestState.cs
index e7a05ed86..9456b89e9 100644
--- a/Arrowgene.Ddon.GameServer/Party/PartyQuestState.cs
+++ b/Arrowgene.Ddon.GameServer/Party/PartyQuestState.cs
@@ -307,10 +307,9 @@ public void AddNewQuest(QuestId questId, uint step, bool questStarted)
                 quest = GetQuest(questId);
             }
 
-            if (quest == null)
+            if (!QuestManager.IsQuestEnabled(questId))
             {
-                // Might be progress from removed quest (or one in development).
-                Logger.Error($"Unable to locate quest data for {questId}");
+                // Quest either not enabled or removed (skip it)
                 return;
             }
 

From 117077a8e548162270e384931a529002dae24132 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pacampbell87@gmail.com>
Date: Fri, 4 Oct 2024 22:00:30 -0400
Subject: [PATCH 2/4] fix: Mark Bonus Lobby as a safe area

---
 Arrowgene.Ddon.GameServer/Characters/StageManager.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Arrowgene.Ddon.GameServer/Characters/StageManager.cs b/Arrowgene.Ddon.GameServer/Characters/StageManager.cs
index d6681b275..3fcccf679 100644
--- a/Arrowgene.Ddon.GameServer/Characters/StageManager.cs
+++ b/Arrowgene.Ddon.GameServer/Characters/StageManager.cs
@@ -75,6 +75,7 @@ public static StageNo ConvertIdToStageNo(StageId stageId)
             557, // Heroic Spirit Sleeping Path: Feryana Wilderness
             558, // Old Heroic Spirit Shrine
             576, // Fort Thines: Great Dining Hall
+            578, // Bonus Dungeon Lobby
             580, // Fortress City Megado: Craft Room
             584, // Eli Guard Tower
             594, // Northern Bandit Hideout

From 49f6bc6f42ae99d3cf44b9c6ef14d975a665f59e Mon Sep 17 00:00:00 2001
From: Paul Campbell <pacampbell87@gmail.com>
Date: Fri, 4 Oct 2024 22:00:43 -0400
Subject: [PATCH 3/4] fix: Add potential fix for BGM which don't end

---
 Arrowgene.Ddon.Shared/Files/Assets/quests/q00020010.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Arrowgene.Ddon.Shared/Files/Assets/quests/q00020010.json b/Arrowgene.Ddon.Shared/Files/Assets/quests/q00020010.json
index 38f5c7007..d2b2228fa 100644
--- a/Arrowgene.Ddon.Shared/Files/Assets/quests/q00020010.json
+++ b/Arrowgene.Ddon.Shared/Files/Assets/quests/q00020010.json
@@ -216,6 +216,7 @@
                     "stage_id": {
                         "id": 335
                     },
+                    "bgm_stop": true,
                     "event_id": 15,
                     "jump_stage_id": {
                         "id": 3

From cb50c6f00737e06ceaab4ee5bfcd5b27cb1c006b Mon Sep 17 00:00:00 2001
From: Paul Campbell <pacampbell87@gmail.com>
Date: Fri, 4 Oct 2024 23:13:45 -0400
Subject: [PATCH 4/4] revert improved enemy group handling

---
 Arrowgene.Ddon.GameServer/Context/ContextManager.cs       | 8 ++++++++
 .../Handler/InstanceGetEnemySetListHandler.cs             | 3 ++-
 Arrowgene.Ddon.GameServer/Quests/Quest.cs                 | 4 ++--
 docs/quests/holiday_personal_quests.md                    | 2 ++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Arrowgene.Ddon.GameServer/Context/ContextManager.cs b/Arrowgene.Ddon.GameServer/Context/ContextManager.cs
index 9e70abca2..2b77db4a6 100644
--- a/Arrowgene.Ddon.GameServer/Context/ContextManager.cs
+++ b/Arrowgene.Ddon.GameServer/Context/ContextManager.cs
@@ -41,6 +41,14 @@ public static void SetContext(PartyGroup partyGroup, ulong uniqueId, Tuple<CData
             }
         }
 
+        public static void RemoveContext(PartyGroup partyGroup, ulong uniqueId)
+        {
+            lock (partyGroup.Contexts)
+            {
+                partyGroup.Contexts.Remove(uniqueId);
+            }
+        }
+
         public static Tuple<CDataContextSetBase, CDataContextSetAdditional> SetAndGetContext(PartyGroup partyGroup, ulong uniqueId, Tuple<CDataContextSetBase, CDataContextSetAdditional> context)
         {
             lock (partyGroup.Contexts)
diff --git a/Arrowgene.Ddon.GameServer/Handler/InstanceGetEnemySetListHandler.cs b/Arrowgene.Ddon.GameServer/Handler/InstanceGetEnemySetListHandler.cs
index 07677b686..80308b65d 100644
--- a/Arrowgene.Ddon.GameServer/Handler/InstanceGetEnemySetListHandler.cs
+++ b/Arrowgene.Ddon.GameServer/Handler/InstanceGetEnemySetListHandler.cs
@@ -32,7 +32,8 @@ public override void Handle(GameClient client, StructurePacket<C2SInstanceGetEne
             foreach (var questId in client.Party.QuestState.StageQuests(stageId))
             {
                 quest = QuestManager.GetQuest(questId);
-                if (client.Party.QuestState.HasEnemiesInCurrentStageGroup(quest, stageId, subGroupId))
+                // if (client.Party.QuestState.HasEnemiesInCurrentStageGroup(quest, stageId, subGroupId))
+                if (quest.HasEnemiesInInCurrentStage(stageId))
                 {
                     IsQuestControlled = true;
                     break;
diff --git a/Arrowgene.Ddon.GameServer/Quests/Quest.cs b/Arrowgene.Ddon.GameServer/Quests/Quest.cs
index 94ae56b2b..56fa62b3c 100644
--- a/Arrowgene.Ddon.GameServer/Quests/Quest.cs
+++ b/Arrowgene.Ddon.GameServer/Quests/Quest.cs
@@ -511,7 +511,7 @@ public virtual void ResetEnemiesForBlock(GameClient client, QuestBlock questBloc
                 foreach (var enemy in enemyGroup.Enemies)
                 {
                     var uid = ContextManager.CreateEnemyUID(enemy.Index, enemyGroup.StageId.ToStageLayoutId());
-                    client.Party.Contexts.Remove(uid);
+                    ContextManager.RemoveContext(client.Party, uid);
                 }
 
                 S2CInstanceEnemyGroupResetNtc resetNtc = new S2CInstanceEnemyGroupResetNtc()
@@ -534,7 +534,7 @@ public virtual void ResetEnemiesForStage(GameClient client, StageId stageId)
                     foreach (var enemy in group.Enemies)
                     {
                         var uid = ContextManager.CreateEnemyUID(enemy.Index, group.StageId.ToStageLayoutId());
-                        client.Party.Contexts.Remove(uid);
+                        ContextManager.RemoveContext(client.Party, uid);
                     }
 
                     S2CInstanceEnemyGroupResetNtc resetNtc = new S2CInstanceEnemyGroupResetNtc()
diff --git a/docs/quests/holiday_personal_quests.md b/docs/quests/holiday_personal_quests.md
index 5d48d8472..b5b2f579c 100644
--- a/docs/quests/holiday_personal_quests.md
+++ b/docs/quests/holiday_personal_quests.md
@@ -4,6 +4,8 @@ There appears to be a set of holiday/seasonal personal quests. Some which don't
 
 ## Halloween
 
+https://moreali523425.com/2018/10/02/post-5695/
+
 - quest\q60301001\quest\60301001\q60301001_st0200.qst.json (mentions pumpkins)
 - quest\q60301054\quest\60301054\q60301054_st0200.qst.json (also mentions pumpkins)