Merge pull request #643 from pacampbell/christmas_quests

event quest: Implement 2018 Christmas seasonal event quests
sebastian-heinz · Nov 29, 2024 · 4b71be0 · 4b71be0
2 parents b2ece74 + ff82d29
commit 4b71be0
Show file tree

Hide file tree

Showing 15 changed files with 541 additions and 57 deletions.
diff --git a/Arrowgene.Ddon.GameServer/Handler/QuestGetCycleContentsStateListHandler.cs b/Arrowgene.Ddon.GameServer/Handler/QuestGetCycleContentsStateListHandler.cs
@@ -1,5 +1,6 @@
 using Arrowgene.Ddon.GameServer.Characters;
 using Arrowgene.Ddon.GameServer.Dump;
+using Arrowgene.Ddon.GameServer.Quests;
 using Arrowgene.Ddon.Server;
 using Arrowgene.Ddon.Shared.Entity;
 using Arrowgene.Ddon.Shared.Entity.PacketStructure;

diff --git a/Arrowgene.Ddon.GameServer/Handler/StageUnisonAreaChangeBeginRecruitmentHandler.cs b/Arrowgene.Ddon.GameServer/Handler/StageUnisonAreaChangeBeginRecruitmentHandler.cs
@@ -1,10 +1,7 @@
 using Arrowgene.Ddon.GameServer.Characters;
 using Arrowgene.Ddon.Server;
 using Arrowgene.Ddon.Shared.Entity.PacketStructure;
-using Arrowgene.Ddon.Shared.Entity.Structure;
-using Arrowgene.Ddon.Shared.Model.EpitaphRoad;
 using Arrowgene.Logging;
-using System.IO;
 
 namespace Arrowgene.Ddon.GameServer.Handler
 {

diff --git a/Arrowgene.Ddon.GameServer/Quests/GenericQuest.cs b/Arrowgene.Ddon.GameServer/Quests/GenericQuest.cs
@@ -365,11 +365,12 @@ private static CDataQuestProcessState BlockAsCDataQuestProcessState(GenericQuest
                     break;
                 case QuestBlockType.NewNpcTalkAndOrder:
                     {
+                        var questId = (questBlock.NpcOrderDetails[0].QuestId == QuestId.None) ? quest.QuestId : questBlock.NpcOrderDetails[0].QuestId;
                         checkCommands.Add(QuestManager.CheckCommand.QuestNpcTalkAndOrderUi(
                             StageManager.ConvertIdToStageNo(questBlock.NpcOrderDetails[0].StageId),
                             (int)questBlock.NpcOrderDetails[0].StageId.GroupId,
                             questBlock.NpcOrderDetails[0].StageId.LayerNo,
-                            (int)quest.QuestId));
+                            (int) questId));
                         resultCommands.Add(QuestManager.ResultCommand.QstTalkChg(questBlock.NpcOrderDetails[0].NpcId, questBlock.NpcOrderDetails[0].MsgId));
                     }
                     break;
@@ -544,9 +545,11 @@ private static CDataQuestProcessState BlockAsCDataQuestProcessState(GenericQuest
                 case QuestBlockType.NewTalkToNpc:
                     {
                         var orderDetails = questBlock.NpcOrderDetails[0];
+                        var questId = (orderDetails.QuestId == QuestId.None) ? quest.QuestId : orderDetails.QuestId;
+
                         var questCommand = questBlock.ShowMarker ?
-                            QuestManager.CheckCommand.NewTalkNpc(StageManager.ConvertIdToStageNo(orderDetails.StageId), (int)orderDetails.StageId.GroupId, orderDetails.StageId.LayerNo, (int)quest.QuestId) :
-                            QuestManager.CheckCommand.NewTalkNpcWithoutMarker(StageManager.ConvertIdToStageNo(orderDetails.StageId), (int)orderDetails.StageId.GroupId, orderDetails.StageId.LayerNo, (int)quest.QuestId);
+                            QuestManager.CheckCommand.NewTalkNpc(StageManager.ConvertIdToStageNo(orderDetails.StageId), (int)orderDetails.StageId.GroupId, orderDetails.StageId.LayerNo, (int)questId) :
+                            QuestManager.CheckCommand.NewTalkNpcWithoutMarker(StageManager.ConvertIdToStageNo(orderDetails.StageId), (int)orderDetails.StageId.GroupId, orderDetails.StageId.LayerNo, (int)questId);
                         checkCommands.Add(questCommand);
                         resultCommands.Add(QuestManager.ResultCommand.QstTalkChg(orderDetails.NpcId, orderDetails.MsgId));
                     }

diff --git a/Arrowgene.Ddon.GameServer/Quests/Quest.cs b/Arrowgene.Ddon.GameServer/Quests/Quest.cs
@@ -380,6 +380,14 @@ public virtual CDataTutorialQuestList ToCDataTutorialQuestList(uint step, bool e
             };
         }
 
+        public virtual CDataTimeLimitedQuestOrderList ToCDataTimeLimitedQuestOrderList(uint step)
+        {
+            return new CDataTimeLimitedQuestOrderList()
+            {
+                Param = ToCDataQuestOrderList(step)
+            };
+        }
+
         public virtual CDataPriorityQuest ToCDataPriorityQuest(uint step)
         {
             var questProcessStateList = GetProcessState(step, out uint announceNoCount);

diff --git a/Arrowgene.Ddon.Shared/AssetReader/QuestAssetDeserializer.cs b/Arrowgene.Ddon.Shared/AssetReader/QuestAssetDeserializer.cs
@@ -614,6 +614,12 @@ private bool ParseBlocks(QuestProcess questProcess, JsonElement jBlocks)
                                 MsgId = jblock.GetProperty("message_id").GetInt32(),
                                 StageId = AssetCommonDeserializer.ParseStageId(jblock.GetProperty("stage_id"))
                             });
+
+                            questBlock.NpcOrderDetails[0].QuestId = QuestId.None;
+                            if (jblock.TryGetProperty("quest_id", out JsonElement jOrderQuestId))
+                            {
+                                questBlock.NpcOrderDetails[0].QuestId = (QuestId)jOrderQuestId.GetUInt32();
+                            }
                         }
                         break;
                     case QuestBlockType.IsQuestOrdered:

diff --git a/Arrowgene.Ddon.Shared/Files/Assets/EventDrops.json b/Arrowgene.Ddon.Shared/Files/Assets/EventDrops.json
@@ -102,6 +102,16 @@
                 "item_ids": [23395, 23396, 23397]
             }
         }
+    },
+    {
+        "item_id": 23548,
+        "comment": "Sparkling Snow Large Crystal (Christmas 2018)",
+        "min_num": 1,
+        "max_num": 1,
+        "drop_chance": 0.10,
+        "quest_ids": [60301057],
+        "stage_ids": [],
+        "enemy_ids": []
     }
 ]
 
diff --git a/Arrowgene.Ddon.Shared/Files/Assets/quests/q20085004.json b/Arrowgene.Ddon.Shared/Files/Assets/quests/q20085004.json
@@ -6,7 +6,7 @@
     "base_level": 47,
     "minimum_item_rank": 0,
     "discoverable": true,
-  "area_id": "EasternZandora",	
+    "area_id": "EasternZandora",
     "rewards": [
         {
             "type": "wallet",
@@ -35,7 +35,7 @@
                 },
                 {
                     "item_id": 9363,
-                    "num": 3					
+                    "num": 3
                 }
             ]
         },
@@ -61,7 +61,7 @@
                     "enemy_id": "0x015103",
                     "level": 48,
                     "exp": 13000,
-                    "is_boss": true			
+                    "is_boss": true
                 }
             ]
         }
@@ -92,7 +92,7 @@
             "stage_id": {
                 "id": 1,
                 "group_id": 1,
-                "layer_no": 1				
+                "layer_no": 1
             },
             "announce_type": "Update",
             "npc_id": "Rick",

diff --git a/Arrowgene.Ddon.Shared/Files/Assets/quests/q21014012.json b/Arrowgene.Ddon.Shared/Files/Assets/quests/q21014012.json
@@ -6,7 +6,7 @@
     "base_level": 75,
     "minimum_item_rank": 0,
     "discoverable": true,
-	"area_id": "ElanWaterGrove",	
+    "area_id": "ElanWaterGrove",
     "rewards": [
         {
             "type": "wallet",
@@ -29,13 +29,13 @@
                     "item_id": 13483,
                     "num": 3
                 },
-                {					
+                {
                     "item_id": 15962,
                     "num": 3
                 },
-                {				
+                {
                     "item_id": 7555,
-                    "num": 3					
+                    "num": 3
                 }
             ]
         }
@@ -60,40 +60,40 @@
                 {
                     "enemy_id": "0x015504",
                     "level": 75,
-                    "exp": 5000						
+                    "exp": 5000
                 }
             ]
         }
-    ],		
+    ],
     "blocks": [
-    {
-      "type": "NpcTalkAndOrder",
+        {
+            "type": "NpcTalkAndOrder",
             "flags": [
-                {"type": "QstLayout", "action": "Set", "value": 4474, "comment": "Spawns Sullivan NPC"}				
-            ],	  
-      "stage_id": {
-        "id": 372,
-		"group_id": 1,
-		"layer_no": 1		
-      },	  
-      "npc_id": "561",
-      "message_id": 10800
+                {"type": "QstLayout", "action": "Set", "value": 4474, "comment": "Spawns Sullivan NPC"}
+            ],
+            "stage_id": {
+                "id": 372,
+                "group_id": 1,
+                "layer_no": 1
+            },
+            "npc_id": "561",
+            "message_id": 10800
         },
-        {		
+        {
             "type": "NewTalkToNpc",
             "flags": [
-                {"type": "QstLayout", "action": "Set", "value": 4471, "comment": "Spawns Glenis NPC"}				
-            ],	  			
+                {"type": "QstLayout", "action": "Set", "value": 4471, "comment": "Spawns Glenis NPC"}
+            ],
             "stage_id": {
                 "id": 416,
                 "group_id": 1,
                 "layer_no": 1
             },
             "announce_type": "Accept",
             "npc_id": "562",
-            "message_id": 11842		  
-    },
-    {
+            "message_id": 11842
+        },
+        {
             "type": "SeekOutEnemiesAtMarkedLocation",
             "announce_type": "Update",
             "groups": [0]
@@ -103,7 +103,7 @@
             "announce_type": "Update",
             "groups": [0]
         },
-        {		
+        {
             "type": "TalkToNpc",
             "stage_id": {
                 "id": 372,
@@ -112,7 +112,7 @@
             },
             "announce_type": "Update",
             "npc_id": "561",
-            "message_id": 11842	
-    }
-  ]
-}
+            "message_id": 11842
+        }
+    ]
+}
diff --git a/Arrowgene.Ddon.Shared/Files/Assets/quests/q21017014.json b/Arrowgene.Ddon.Shared/Files/Assets/quests/q21017014.json
@@ -6,7 +6,7 @@
     "base_level": 73,
     "minimum_item_rank": 0,
     "discoverable": true,
-	"area_id": "KingalCanyon",	
+	"area_id": "KingalCanyon",
     "rewards": [
         {
             "type": "wallet",
@@ -29,13 +29,13 @@
                     "item_id": 15923,
                     "num": 3
                 },
-                {					
+                {
                     "item_id": 7555,
                     "num": 3
                 },
-                {				
+                {
                     "item_id": 9364,
-                    "num": 3					
+                    "num": 3
                 }
             ]
         }
@@ -51,7 +51,7 @@
                     "enemy_id": "0x010313",
                     "level": 73,
                     "exp": 3500,
-                    "is_boss": false					
+                    "is_boss": false
     },
     {
                     "enemy_id": "0x010313",
@@ -87,27 +87,27 @@
                     "enemy_id": "0x010607",
                     "level": 73,
                     "exp": 3500,
-                    "is_boss": false					
+                    "is_boss": false
                 }
             ]
         }
-    ],		
-    "blocks": [	
+    ],
+    "blocks": [
         {
-            "type": "NpcTalkAndOrder",	
+            "type": "NpcTalkAndOrder",
             "stage_id": {
                 "id": 377,
                 "group_id": 1,
                 "layer_no": 1
-            },				
+            },
             "npc_id": "Maeve",
             "message_id": 10800
     },
-    {		
+    {
             "type": "TalkToNpc",
             "flags": [
-                {"type": "QstLayout", "action": "Set", "value": 4362, "comment": "Spawns Plum NPC"}				
-            ],			
+                {"type": "QstLayout", "action": "Set", "value": 4362, "comment": "Spawns Plum NPC"}
+            ],
             "stage_id": {
                 "id": 429,
                 "group_id": 1,
@@ -117,17 +117,17 @@
             "npc_id": "Plum1",
             "message_id": 11842
         },
-        {				
+        {
             "type": "SeekOutEnemiesAtMarkedLocation",
             "announce_type": "Update",
             "groups": [0]
         },
         {
             "type": "KillGroup",
             "announce_type": "Update",
-            "groups": [0]					
+            "groups": [0]
         },
-        {		
+        {
             "type": "TalkToNpc",
             "stage_id": {
                 "id": 377,
@@ -136,7 +136,7 @@
             },
             "announce_type": "Update",
             "npc_id": "Maeve",
-            "message_id": 11842			
+            "message_id": 11842
         }
     ]
-}
+}
diff --git a/Arrowgene.Ddon.Shared/Files/Assets/quests/q60200022.json b/Arrowgene.Ddon.Shared/Files/Assets/quests/q60200022.json
@@ -0,0 +1,22 @@
+{
+    "state_machine": "GenericStateMachine",
+    "type": "Tutorial",
+    "comment": "For Christmas event NPC set (2016)",
+    "quest_id": 60200022,
+    "next_quest": 0,
+    "base_level": 0,
+    "minimum_item_rank": 0,
+    "discoverable": false,
+    "stage_id": {"id": 2},
+    "order_conditions": [],
+    "rewards": [],
+    "enabled": false,
+    "blocks": [
+        {
+            "type": "Raw",
+            "flags": [
+                {"type": "QstLayout", "action": "Set", "value": 5276, "comment": "Spawns Nicholas, Marco and Mia"}
+            ]
+        }
+    ]
+}