diff --git a/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActI.cs b/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActI.cs index 618714e..f373dc6 100644 --- a/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActI.cs +++ b/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActI.cs @@ -59,7 +59,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 66, - Objectives = new List { Objective.Default() }, OnAdvance = () => { var world = Game.GetWorld(WorldSno.trout_town); @@ -81,7 +80,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 42, - Objectives = new List { Objective.Default() }, OnAdvance = () => { var world = Game.GetWorld(WorldSno.trout_town); @@ -101,7 +99,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 75, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go and talk to Leah var world = Game.GetWorld(WorldSno.trout_town); @@ -129,7 +126,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 46, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //fighting zombies script = new LeahInn(); @@ -145,7 +141,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 50, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //talk to Leah again ListenConversation(151167, new Advance()); @@ -162,7 +157,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 60, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go and talk to Rumford //ListenProximity(3739, new LaunchConversation(198503)); @@ -176,7 +170,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 27, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //kill wretched mother var world = Game.GetWorld(WorldSno.trout_town); @@ -200,7 +193,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 55, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //MOAR wretched mothers StartConversation(Game.GetWorld(WorldSno.trout_town), 156223); @@ -228,7 +220,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //complete } @@ -242,7 +233,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 7, - Objectives = new List { Objective.Default() }, OnAdvance = () => { StartConversation(Game.GetWorld(WorldSno.trout_town), 198541); @@ -254,7 +244,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 28, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //use Tristram Portal UnlockTeleport(1); @@ -281,7 +270,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 49, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to gates var world = Game.GetWorld(WorldSno.trout_town); @@ -302,7 +290,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 39, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to Adria house var world = Game.GetWorld(WorldSno.trout_town); @@ -323,7 +310,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 41, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //inspect house ListenProximity(ActorSno._g_portal_square_blue_cellar, new Advance()); @@ -336,7 +322,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 51, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to cave //DestroyFollower(4580); @@ -361,7 +346,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 43, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //inspect cave @@ -374,7 +358,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 45, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //kill Daltin (156801) ActorSystem.Actor CapitanDaltyn = null; @@ -408,7 +391,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 47, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //talk to Leah in cave var world = Game.GetWorld(WorldSno.trout_adriascellar); @@ -433,7 +415,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 23, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to church var world = Game.GetWorld(WorldSno.trout_town); @@ -454,7 +435,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 11, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to 1st floor of church ListenTeleport(19780, new Advance()); @@ -466,7 +446,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 15, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //find Cain in 1st floor ListenTeleport(60714, new Advance()); @@ -478,7 +457,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 17, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //kill skeletons //115403 elite //this.Game.GetWorld(60713).SpawnMonster(115403, new Vector3D{X = 99.131f, Y = 211.501f, Z = 0.1f}); @@ -495,7 +473,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 19, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //talk to Cain //this.Game.GetWorld(60713).GetActorBySNO(5723, true).Hidden = true; @@ -509,7 +486,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 32, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go with Cain Game.CurrentEncounter.Activated = false; @@ -523,7 +499,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 21, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //talk to Leah in New Tristram var tristramWorld = Game.GetWorld(WorldSno.trout_town); @@ -559,7 +534,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //complete //this.Game.GetWorld(71150).GetActorBySNO(196224).Destroy(); @@ -576,7 +550,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 41, - Objectives = new List { Objective.Default() }, OnAdvance = () => { Game.AddOnLoadWorldAction(WorldSno.trout_town, () => @@ -605,7 +578,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 43, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //talk to Hedric var world = Game.GetWorld(WorldSno.trout_town); @@ -625,7 +597,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 51, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to cellar and kill zombies var tristramWorld = Game.GetWorld(WorldSno.trout_town); @@ -666,7 +637,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 45, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //kill Mira Imon ListenProximity(ActorSno._blacksmithwife, new LaunchConversation(131345)); @@ -681,7 +651,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 35, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //talk to Hedric var world = Game.GetWorld(WorldSno.trout_oldtristram_cellar_f); @@ -704,7 +673,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 25, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //open north gates ListenInteract(ActorSno._trout_newtristram_gate_town_nw, 1, new Advance()); @@ -728,7 +696,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 37, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to graveyard ListenProximity(ActorSno._cemetary_gate_trout_wilderness_no_lock, new Advance()); @@ -740,7 +707,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 59, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //find crown holder var world = Game.GetWorld(WorldSno.trout_town); @@ -759,7 +725,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 61, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //kill Imon advisor if (!Game.Players.IsEmpty) UnlockTeleport(6); @@ -777,7 +742,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 54, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //get Leoric crown ListenInteract(ActorSno._a1dun_crypts_leoric_crown_holder_crowntreasureclass, 1, new Advance()); @@ -789,7 +753,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 17, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to Tristram (by town portal) and talk to Hedric ListenConversation(196041, new Advance()); @@ -801,7 +764,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //complete } @@ -815,7 +777,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 30, - Objectives = new List { Objective.Default() }, OnAdvance = () => { StartConversation(Game.GetWorld(WorldSno.trout_town), 80681); @@ -827,7 +788,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 28, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to cathedral garden ListenTeleport(19938, new BackToCath()); @@ -839,7 +799,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 3, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //enter Hall of Leoric Game.AddOnLoadWorldAction(WorldSno.trdun_cain_intro, () => @@ -855,7 +814,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 6, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to 2nd level of Cath ListenTeleport(19783, new Advance()); @@ -867,7 +825,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 37, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //we need to go deeper (to 3rd level of Cath) ListenTeleport(87907, new Advance()); @@ -880,7 +837,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 40, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //help Cormac(kill cultists) var Kormak_Imprisoned = Game.GetWorld(WorldSno.a1trdun_level05_templar).GetActorBySNO(ActorSno._templarnpc_imprisoned); @@ -917,7 +873,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 42, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //find Kormac's stuff 178657 Game.AddOnLoadWorldAction(WorldSno.a1trdun_level05_templar, () => @@ -942,7 +897,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 56, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //find and kill Jondar Game.AddOnLoadWorldAction(WorldSno.a1trdun_level05_templar, () => @@ -969,7 +923,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 44, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //join templar(wtf?) var world = Game.GetWorld(WorldSno.a1trdun_level05_templar); @@ -1012,7 +965,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 66, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //enter king's crypt Game.AddOnLoadWorldAction(WorldSno.a1trdun_level05_templar, () => @@ -1031,7 +983,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 16, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //find Leoric's crypt ListenProximity(ActorSno._trdun_skeletonking_sealed_door, new Advance()); @@ -1043,7 +994,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 58, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //enter crypt Game.AddOnLoadWorldAction(WorldSno.a1trdun_king_level08, () => @@ -1061,7 +1011,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 19, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //kill skeletons Game.AddOnLoadWorldAction(WorldSno.a1trdun_king_level08, () => @@ -1080,7 +1029,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 21, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //take crown on Leoric's head Game.AddOnLoadWorldAction(WorldSno.a1trdun_king_level08, () => @@ -1105,7 +1053,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 48, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //kill Leoric Game.AddOnLoadWorldAction(WorldSno.a1trdun_king_level08, () => @@ -1126,7 +1073,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 50, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to fallen star room Game.CurrentEncounter.Activated = false; @@ -1148,7 +1094,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 52, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //talk with Tyrael convList 117403 qr 176870 ListenInteract(ActorSno._stranger_crater, 1, new LaunchConversation(181910)); //cork @@ -1162,7 +1107,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 54, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //return to New Tristram ListenTeleport(19947, new Advance()); @@ -1174,7 +1118,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 24, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //talk with Cain UnlockTeleport(5); @@ -1187,7 +1130,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //complete PlayCutscene(2); @@ -1202,7 +1144,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = () => { var world = Game.GetWorld(WorldSno.trout_town); @@ -1216,7 +1157,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 10, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to Wild Fields var world = Game.GetWorld(WorldSno.trout_town); @@ -1239,7 +1179,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 3, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //find Hazra cave ListenTeleport(119893, new Advance()); @@ -1251,7 +1190,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 18, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //find piece of sword Game.AddOnLoadWorldAction(WorldSno.fields_cave_swordofjustice_level01, () => @@ -1271,7 +1209,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 13, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //kill cultists UnlockTeleport(7); @@ -1287,7 +1224,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 5, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //get piece of sword ListenInteract(ActorSno._trdun_cave_swordofjustice_blade, 1, new Advance()); @@ -1299,7 +1235,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 7, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //take piece to Cain ListenConversation(118037, new Advance()); @@ -1311,7 +1246,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //complete StartConversation(Game.GetWorld(WorldSno.trout_town), 198713); @@ -1326,7 +1260,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 86, - Objectives = new List { Objective.Default() }, OnAdvance = () => { var world = Game.GetWorld(WorldSno.trout_town); @@ -1342,7 +1275,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 88, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to Sunken Temple AddFollower(Game.GetWorld(WorldSno.trout_town), ActorSno._leah); @@ -1356,7 +1288,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 90, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //follow Scoundrel NPC var world = Game.GetWorld(WorldSno.trout_town); @@ -1374,7 +1305,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 92, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //talk with bandits var world = Game.GetWorld(WorldSno.trout_town); @@ -1391,7 +1321,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 94, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //kill the bandits var world = Game.GetWorld(WorldSno.trout_town); @@ -1407,7 +1336,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 112, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //talk with Scoundrel DestroyFollower(ActorSno._leah); @@ -1422,7 +1350,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 8, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //lead Scoundrel to waypoint var world = Game.GetWorld(WorldSno.trout_town); @@ -1454,7 +1381,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 26, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to Sunken Temple var world = Game.GetWorld(WorldSno.trout_town); @@ -1471,7 +1397,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 28, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //talk with Alaric DestroyFollower(ActorSno._leah); @@ -1486,7 +1411,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 12, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to Rotten forest var world = Game.GetWorld(WorldSno.trout_town); @@ -1536,7 +1460,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 38, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //enter the temple var world = Game.GetWorld(WorldSno.trout_town); @@ -1553,7 +1476,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 69, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //explore the temple DestroyFollower(ActorSno._leah); @@ -1572,7 +1494,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 99, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //kill prophet Ezek and skeletons DestroyFollower(ActorSno._leah); @@ -1591,7 +1512,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 103, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //talk with Alaric in temple DestroyFollower(ActorSno._leah); @@ -1606,7 +1526,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 71, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //defend the sword piece DestroyFollower(ActorSno._leah); @@ -1629,7 +1548,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 56, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //use the piece of sword var world = Game.GetWorld(WorldSno.trout_town); @@ -1647,7 +1565,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 21, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //return to Tristram Game.AddOnLoadWorldAction(WorldSno.trdun_cave_nephalem_03, () => @@ -1667,7 +1584,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //complete } @@ -1681,7 +1597,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 34, - Objectives = new List { Objective.Default() }, OnAdvance = () => { StartConversation(Game.GetWorld(WorldSno.trout_town), 120357); @@ -1693,7 +1608,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 20, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //talk with parom man ListenConversation(72817, new Advance()); @@ -1705,7 +1619,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 59, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to Vortem square var AttackedTown = Game.GetWorld(WorldSno.trout_townattack); @@ -1721,7 +1634,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 11, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //kill all cultists int Count = 0; @@ -1745,7 +1657,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 16, - Objectives = new List { Objective.Default() }, OnAdvance = () => { Game.AddOnLoadWorldAction(WorldSno.trout_townattack, () => @@ -1764,7 +1675,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 63, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //kill 3 berserkers Game.AddOnLoadWorldAction(WorldSno.trout_townattack, () => @@ -1786,7 +1696,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 65, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //talk with priest Game.AddOnLoadWorldAction(WorldSno.trout_townattack, () => @@ -1805,7 +1714,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 67, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to church cellar //this.Game.AddOnLoadAction(72882, () => @@ -1821,7 +1729,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 69, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //find piece of sword ListenInteract(ActorSno._trout_townattack_cellar_altar, 1, new LaunchConversation(165080)); @@ -1835,7 +1742,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 9, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to Cain's house @@ -1865,7 +1771,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = () => { UnlockTeleport(10); @@ -1880,7 +1785,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = () => { } @@ -1891,7 +1795,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 8, - Objectives = new List { Objective.Default() }, OnAdvance = () => { Game.AddOnLoadWorldAction(WorldSno.trout_townattack_chapelcellar_a, () => @@ -1922,7 +1825,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 17, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to Aranea Cave var LeahAfterEvent = Game.GetWorld(WorldSno.trout_town).GetActorBySNO(ActorSno._leah_afterevent31_exit); @@ -1937,7 +1839,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 31, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //find Aranea Queen lair Game.GetWorld(WorldSno.trout_town).GetActorBySNO(ActorSno._leah_afterevent31_exit, true).Hidden = true; @@ -1951,7 +1852,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 19, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //talk with woman in web var world = Game.GetWorld(WorldSno.a1dun_spidercave_02); @@ -1966,7 +1866,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 21, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //kill Aranea Queen Game.GetWorld(WorldSno.a1dun_spidercave_02).SpawnMonster(ActorSno._spiderqueen, new Vector3D { X = 149.439f, Y = 121.452f, Z = 13.794f }); @@ -1979,7 +1878,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 23, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //grab Aranea acid SetActorOperable(Game.GetWorld(WorldSno.a1dun_spidercave_02), ActorSno._a2dun_spider_venom_pool, true); @@ -1992,7 +1890,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 26, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //use acid on Karina SetActorOperable(Game.GetWorld(WorldSno.a1dun_spidercave_02), ActorSno._a2dun_spider_queen_web_door, true); @@ -2005,7 +1902,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 47, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to Southern Highlands ListenTeleport(93632, new Advance()); @@ -2017,7 +1913,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 29, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //talk with Karina SetActorOperable(Game.GetWorld(WorldSno.trout_town), ActorSno._trout_highlands_goatmen_chokepoint_gate, false); @@ -2031,7 +1926,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 36, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //find Hazra staff ListenInteract(ActorSno._trout_highlands_mystic_wagon, 1, new Advance()); @@ -2044,7 +1938,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 10, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to Hazra wall SetActorOperable(Game.GetWorld(WorldSno.trout_town), ActorSno._trout_highlands_goatmen_chokepoint_gate, true); @@ -2058,7 +1951,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 51, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to the Leoric's Manor ListenInteract(ActorSno._trout_highlands_manor_front_gate, 1, new Advance()); @@ -2070,7 +1962,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 34, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //enter the Leoric's Manor ListenTeleport(100854, new Advance()); @@ -2082,7 +1973,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 43, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //explore the Leoric's Manor UnlockTeleport(12); @@ -2095,7 +1985,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 16, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //kill cultists if (!Game.Empty) StartConversation(Game.GetWorld(WorldSno.a1dun_leor_manor), 134968); @@ -2113,7 +2002,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //complete } @@ -2127,7 +2015,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = () => { } @@ -2138,7 +2025,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 21, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to 1st level of Torture Rooms UnlockTeleport(13); @@ -2151,7 +2037,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 65, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to 2nd level of Torture Rooms ListenTeleport(19775, new Advance()); @@ -2163,7 +2048,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 2, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to Highlands Bridge if (Game.Empty) UnlockTeleport(14); @@ -2176,7 +2060,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 34, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //go to Leoric's Jail UnlockTeleport(14); @@ -2189,7 +2072,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 17, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //talk with Asilla Queen (npc 103381) Game.AddOnLoadWorldAction(WorldSno.trdun_jail_level01, () => @@ -2205,7 +2087,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 19, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //free 6 souls //spawn souls on 104104, 104106, 104108 @@ -2225,7 +2106,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 36, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //kill Overseer Game.AddOnLoadWorldAction(WorldSno.trdun_jail_level01, () => @@ -2241,7 +2121,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 7, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //find Butcher's Room if (Game.Empty) UnlockTeleport(15); @@ -2258,7 +2137,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 41, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //kill Butcher Game.AddOnLoadWorldAction(WorldSno.trdun_butcherslair_02, () => @@ -2279,7 +2157,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 39, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //find Tyrael Game.CurrentEncounter.Activated = false; @@ -2296,7 +2173,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 11, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //kill cultists ListenKill(ActorSno._triunevessel_event31, 6, new Advance()); @@ -2308,7 +2184,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 13, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //talk with Tyrael (npc 183117) ListenProximity(ActorSno._stranger_ritual, new LaunchConversation(120220)); //cork @@ -2321,7 +2196,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //complete } @@ -2335,7 +2209,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = () => { } @@ -2346,7 +2219,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 8, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //talk with Tyrael @@ -2360,7 +2232,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 4, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //talk with caravan leader @@ -2373,7 +2244,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = () => { //complete } diff --git a/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActII.cs b/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActII.cs index 63e8101..746c895 100644 --- a/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActII.cs +++ b/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActII.cs @@ -42,7 +42,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 82, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { var world = Game.GetWorld(WorldSno.caout_town); //ListenProximity(151989, new Advance()); @@ -65,7 +64,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 85, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //go to Caldeum ListenTeleport(55313, new Advance()); }) @@ -76,7 +74,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 50, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Asheera (201085) var world = Game.GetWorld(WorldSno.caout_town); world.GetActorBySNO(ActorSno._a2duncald_deco_sewer_lid).SetUsable(false); @@ -92,7 +89,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 61, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //go through canyon try { @@ -110,7 +106,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 52, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill cultists var world = Game.GetWorld(WorldSno.caout_town); AddFollower(world, ActorSno._enchantressnpc); @@ -127,7 +122,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 102, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with enchantress DestroyFollower(ActorSno._enchantressnpc); //ListenProximity(85843, new LaunchConversation(85832)); @@ -143,7 +137,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 106, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill Lakuni's var world = Game.GetWorld(WorldSno.caout_town); world.GetActorBySNO(ActorSno._enchantressnpc).Hidden = true; @@ -158,7 +151,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 91, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Steel Wolf's leader var world = Game.GetWorld(WorldSno.caout_town); DestroyFollower(ActorSno._enchantressnpc); @@ -193,7 +185,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 117, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //go to Canyon Bridge DestroyFollower(ActorSno._enchantressnpc); AddFollower(Game.GetWorld(WorldSno.caout_town), ActorSno._enchantressnpc); @@ -206,7 +197,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 10, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with enchantress DestroyFollower(ActorSno._enchantressnpc); AddFollower(Game.GetWorld(WorldSno.caout_town), ActorSno._enchantressnpc); @@ -220,7 +210,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete DestroyFollower(ActorSno._enchantressnpc); Open(Game.GetWorld(WorldSno.caout_town), ActorSno._caoutstingingwinds_illusion_bridge); @@ -250,7 +239,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 76, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -260,7 +248,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 58, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //go through Canyon bridge ListenProximity(ActorSno._waypoint, new Advance()); @@ -272,7 +259,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 46, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find Khasim gate var world = Game.GetWorld(WorldSno.caout_town); ListenProximity(ActorSno._lore_belial_guardsorders, new Advance()); @@ -290,7 +276,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 74, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with leutenant Vahem UnlockTeleport(2); UnlockTeleport(3); @@ -304,7 +289,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 30, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //enter HQ ListenTeleport(61066, new Advance()); }) @@ -344,7 +328,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 48, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill stealthed demons script = new SpawnSnakemans(); script.Execute(Game.GetWorld(WorldSno.caout_town)); @@ -357,7 +340,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 10, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with captain David Game.GetWorld(WorldSno.caout_town).ShowOnlyNumNPC(ActorSno._davyd, 1); //ListenProximity(80980, new LaunchConversation(60608)); @@ -370,7 +352,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete Open(Game.GetWorld(WorldSno.caout_town), ActorSno._caout_stingingwinds_khamsin_gate); }) @@ -385,7 +366,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 5, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -407,7 +387,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 26, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find Maghda's lair and optionally, free 8 cells var encW = Game.GetWorld(WorldSno.caout_town); encW.SpawnMonster(ActorSno._caout_cage, new Vector3D(528.7084f, 1469.1945f, 197.2559f)); @@ -425,7 +404,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 9, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill Maghda UnlockTeleport(4); ListenKill(ActorSno._maghda, 1, new Advance()); @@ -437,7 +415,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 10, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //return to camp Game.CurrentEncounter.Activated = false; Game.AddOnLoadWorldAction(WorldSno.caout_cellar_alcarnus_main, () => @@ -453,7 +430,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete PlayCutscene(1); }) @@ -468,7 +444,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -478,7 +453,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 38, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Asheera //ListenProximity(3205, new LaunchConversation(201285)); Game.GetWorld(WorldSno.caout_town).ShowOnlyNumNPC(ActorSno._asheara, 0); @@ -491,7 +465,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 18, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Asheera for reach emperor's palace //ListenConversation(165807, new Advance()); ListenProximity(ActorSno._caldeumguard_captain_b_ravd, new AskBossEncounter(162231)); @@ -504,7 +477,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 21, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Emperor Game.AddOnLoadWorldAction(WorldSno.a2_belial_room_intro, () => { @@ -534,7 +506,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 2, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill demons int snakes = 0; Game.AddOnLoadWorldAction(WorldSno.a2_belial_room_intro, () => @@ -564,7 +535,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 31, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //escape the emperor's palace Game.AddOnLoadWorldAction(WorldSno.a2_belial_room_intro, () => { @@ -585,7 +555,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 34, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //destroy 4 demon summoners Game.AddOnLoadWorldAction(WorldSno.a2dun_cald, () => { @@ -611,7 +580,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 7, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //hide into Caldeum drains Game.AddOnLoadWorldAction(WorldSno.a2dun_cald, () => { @@ -633,7 +601,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete Game.AddOnLoadWorldAction(WorldSno.a2dun_cald, () => { @@ -658,7 +625,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 9, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -668,7 +634,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 2, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find Cursed Pit if (Game.Empty) UnlockTeleport(1); ListenTeleport(58494, new Advance()); @@ -680,7 +645,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 15, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill guardians Game.AddOnLoadWorldAction(WorldSno.a2dun_swr_adria_level01, () => { @@ -705,7 +669,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 21, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Adria in pit Game.AddOnLoadWorldAction(WorldSno.a2dun_swr_adria_level01, () => { @@ -720,7 +683,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 8, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Adria in camp var world = Game.GetWorld(WorldSno.a2dun_swr_adria_level01); Game.CurrentEncounter.Activated = false; @@ -755,7 +717,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete PlayCutscene(2); Game.GetWorld(WorldSno.caout_town).GetActorBySNO(ActorSno._a2duncald_deco_sewer_lid).SetUsable(true); @@ -772,7 +733,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 2, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -781,7 +741,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 34, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find passage to Oasis if (Game.DestinationEnterQuest == 78266) if (Game.DestinationEnterQuestStep == -1 || Game.DestinationEnterQuestStep == 2) @@ -807,7 +766,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 31, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Emperor ListenProximity(ActorSno._hakan, new Advance()); }) @@ -818,7 +776,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 4, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find Oasis ListenConversation(180063, new LaunchConversation(187093)); ListenTeleport(175367, new Advance()); @@ -837,7 +794,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 22, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //enter ruins in Oasis ListenTeleport(61632, new Advance()); if (Game.Empty) UnlockTeleport(5); @@ -849,7 +805,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 24, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find Kulle's head UnlockTeleport(5); UnlockTeleport(6); @@ -862,7 +817,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 26, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //get Kulle's head ListenInteract(ActorSno._a2dun_zolt_head_container, 1, new Advance()); }) @@ -873,7 +827,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 11, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Adria in camp ListenProximity(ActorSno._tyrael, new LaunchConversation(123146)); ListenConversation(123146, new Advance()); @@ -885,7 +838,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete }) }); @@ -899,7 +851,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 34, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -909,7 +860,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 40, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //enter to drain in Oasis ListenTeleport(62752, new Advance()); }) @@ -940,7 +890,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 54, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //enter to drowned passage Game.AddOnLoadWorldAction(WorldSno.a2dun_aqd_special_01, () => { @@ -960,7 +909,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 56, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill Deceiveds Game.AddOnLoadWorldAction(WorldSno.a2dun_aqd_oasis_level00, () => { @@ -979,7 +927,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 58, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //break talking barrel Game.AddOnLoadWorldAction(WorldSno.a2dun_aqd_oasis_level00, () => { @@ -994,7 +941,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 60, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with jeweler Game.AddOnLoadWorldAction(WorldSno.a2dun_aqd_oasis_level00, () => { @@ -1011,7 +957,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 62, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find crucible Game.AddOnLoadWorldAction(WorldSno.a2dun_aqd_oasis_level00, () => { @@ -1029,7 +974,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 64, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill Gevin var world = Game.GetWorld(WorldSno.a2dun_aqd_oasis_level00); Game.AddOnLoadWorldAction(WorldSno.a2dun_aqd_oasis_level00, () => @@ -1060,7 +1004,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 44, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //get crucible Game.AddOnLoadWorldAction(WorldSno.a2dun_aqd_oasis_level00, () => { @@ -1079,7 +1022,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 24, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //enter the ancient passage Game.AddOnLoadWorldAction(WorldSno.a2dun_aqd_oasis_level00, () => { @@ -1123,7 +1065,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete PlayCutscene(3); }) @@ -1138,7 +1079,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 25, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -1148,7 +1088,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 39, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //enter the Kulle's archives UnlockTeleport(7); UnlockTeleport(8); @@ -1161,7 +1100,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 35, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //enter the Limit ListenProximity(ActorSno._hakanprojection, new Advance()); }) @@ -1199,7 +1137,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 0, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //enter the shadows world Game.AddOnLoadWorldAction(WorldSno.a2dun_zolt_lobby, () => { @@ -1215,7 +1152,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 3, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find Kulle's body ListenInteract(ActorSno._a2dun_zolt_body_container, 1, new Advance()); }) @@ -1226,7 +1162,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 26, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Leah ListenProximity(ActorSno._leah, new LaunchConversation(62505)); foreach (var act in Game.GetWorld(WorldSno.a2dun_zolt_lobby).GetActorsBySNO(ActorSno._temp_zknavblocker)) @@ -1240,7 +1175,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 27, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //enter the soulstone storage ListenTeleport(60194, new Advance()); }) @@ -1251,7 +1185,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 4, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Kulle Game.AddOnLoadWorldAction(WorldSno.a2dun_zolt_bossfight_level04, () => { @@ -1269,7 +1202,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 31, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill Kulle ListenKill(ActorSno._zoltunkulle, 1, new Advance()); }) @@ -1280,7 +1212,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 33, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //get Soulstone Game.AddOnLoadWorldAction(WorldSno.a2dun_zolt_bossfight_level04, () => { @@ -1295,7 +1226,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 6, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Adria in camp ListenProximity(ActorSno._adria, new LaunchConversation(80513)); ListenConversation(80513, new Advance()); @@ -1307,7 +1237,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete }) }); @@ -1321,7 +1250,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 34, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -1331,7 +1259,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 23, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find Asheara Game.AddOnLoadWorldAction(WorldSno.caout_town, () => { @@ -1349,7 +1276,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 21, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Asheara foreach (var Ashe in Game.GetWorld(WorldSno.caout_town).GetActorsBySNO(ActorSno._asheara)) AddQuestConversation(Ashe, 121359); @@ -1362,7 +1288,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 3, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //todo: timed event 115494 var world = Game.GetWorld(WorldSno.caout_town); try { (world.FindActorAt(ActorSno._a2dun_cald_exit_gate, new Vector3D { X = 3135.3f, Y = 1546.1f, Z = 250.545f }, 15.0f) as Door).Open(); } catch { } @@ -1379,7 +1304,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete }) }); @@ -1393,7 +1317,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 10, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -1403,7 +1326,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 12, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //enter the Caldeum palace AddFollower(Game.GetWorld(WorldSno.a2_belial_room_intro), ActorSno._leah); AddFollower(Game.GetWorld(WorldSno.caout_refugeecamp), ActorSno._adria); @@ -1416,7 +1338,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 29, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //go to emperor's palace var world = Game.GetWorld(WorldSno.a2dun_cald_uprising); foreach (var door in world.GetActorsBySNO(ActorSno._a2dun_cald_gate_belial_destroyable)) @@ -1442,7 +1363,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 13, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill Belial DestroyFollower(ActorSno._leah); DestroyFollower(ActorSno._adria); @@ -1499,7 +1419,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 27, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //get Belial's soul Game.CurrentEncounter.Activated = false; Game.AddOnLoadWorldAction(WorldSno.a2_belial_room_01, () => @@ -1516,7 +1435,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 14, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Tyrael in camp Game.AddOnLoadWorldAction(WorldSno.a2_belial_room_01, () => { @@ -1534,7 +1452,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 3, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with caravan leader ListenInteract(ActorSno._hub_caravanleader, 1, new LaunchConversation(177669)); ListenConversation(177669, new ChangeAct(200)); @@ -1547,7 +1464,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete }) }); diff --git a/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActIII.cs b/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActIII.cs index cbb63c6..ed1ef97 100644 --- a/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActIII.cs +++ b/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActIII.cs @@ -36,7 +36,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 8, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { Game.GetWorld(WorldSno.a3dun_hub_adria_tower_intro).GetActorBySNO(ActorSno._tyrael_act3, true).NotifyConversation(1); ListenInteract(ActorSno._tyrael_act3, 1, new LaunchConversation(204905)); @@ -49,7 +48,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 26, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //use fire torches var world = Game.GetWorld(WorldSno.a3dun_hub_adria_tower_intro); ListenInteract(ActorSno._a3dunrmpt_interactives_signal_fire_a, 5, new Advance()); @@ -63,7 +61,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 3, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find sergeant Dalen UnlockTeleport(0); ListenProximity(ActorSno._bastionskeepguard_melee_b_02_sgt_dalen, new LaunchConversation(196152)); @@ -77,7 +74,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete }) }); @@ -91,7 +87,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 18, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -125,7 +120,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 2, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //return to base UnlockTeleport(1); ListenProximity(ActorSno._tyrael_act3, new Advance()); @@ -137,7 +131,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete }) }); @@ -151,7 +144,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 20, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -161,7 +153,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 18, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //go to 2nd level of bastion keep ListenTeleport(93103, new Advance()); }) @@ -172,7 +163,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 22, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find breach on 2nd level if (Game.Empty) { @@ -191,7 +181,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find bastion's ambar (gluttony boss) ListenTeleport(111232, new Advance()); }) @@ -202,7 +191,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 16, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill gluttony UnlockTeleport(3); Game.AddOnLoadWorldAction(WorldSno.gluttony_boss, () => @@ -230,7 +218,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 3, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //return to base ListenProximity(ActorSno._tyrael_act3, new Advance()); }) @@ -241,7 +228,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete }) }); @@ -255,7 +241,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { var Tyrael = Game.GetWorld(WorldSno.a3dun_hub_keep).GetActorBySNO(ActorSno._tyrael_act3); (Tyrael as InteractiveNPC).Conversations.Add(new ActorSystem.Interactions.ConversationInteraction(183792)); @@ -270,7 +255,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 4, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //go to Armory var Tyrael = Game.GetWorld(WorldSno.a3dun_hub_keep).GetActorBySNO(ActorSno._tyrael_act3); (Tyrael as InteractiveNPC).Conversations.Clear(); @@ -285,7 +269,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 6, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill shadows Game.AddOnLoadWorldAction(WorldSno.a3dun_keep_hub_inn, () => { @@ -331,7 +314,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 8, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Leah ListenProximity(ActorSno._leah, new LaunchConversation(134266)); ListenConversation(134266, new Advance()); @@ -355,7 +337,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete PlayCutscene(1); }) @@ -370,7 +351,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 4, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -380,7 +360,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 6, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //go to battlefields ListenTeleport(154644, new Advance()); }) @@ -391,7 +370,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 9, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with sergeant Pale var Serge = Game.GetWorld(WorldSno.a3_battlefields_02).GetActorBySNO(ActorSno._a3_battlefield_guard_sargeant); (Serge as InteractiveNPC).Conversations.Add(new ActorSystem.Interactions.ConversationInteraction(170486)); @@ -407,7 +385,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //go through Korsikk bridge Game.AddOnLoadWorldAction(WorldSno.a3_battlefields_02, () => { @@ -442,7 +419,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 21, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find Rakkis bridge if (!Game.Empty) UnlockTeleport(4); //69504 @@ -456,7 +432,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 3, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Tyrael Game.AddOnLoadWorldAction(WorldSno.a3_battlefields_02, () => { @@ -476,7 +451,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete }) }); @@ -490,7 +464,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -500,7 +473,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 10, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find demonic gates to Siegebreaker if (Game.Empty) UnlockTeleport(5); ListenProximity(ActorSno._a3dun_crater_st_demon_chainpylon_fire_azmodan, new Advance()); @@ -513,7 +485,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 17, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill Siegebreaker if (!Game.Empty) UnlockTeleport(5); Game.AddOnLoadWorldAction(WorldSno.a3_battlefields_03, () => @@ -531,7 +502,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 3, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Adria Game.CurrentEncounter.Activated = false; ListenProximity(ActorSno._adria, new LaunchConversation(196366)); @@ -545,7 +515,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete PlayCutscene(3); }) @@ -560,7 +529,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 10, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -570,7 +538,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 41, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find Tower of the Doomed lv. 1 Game.AddOnLoadWorldAction(WorldSno.a3_battlefields_03, () => { @@ -589,7 +556,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 25, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find Heart of Sin if (!Game.Empty) UnlockTeleport(6); if (Game.Empty) UnlockTeleport(7); @@ -615,7 +581,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 29, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find Tower of Damned lv. 1 if (Game.Empty) UnlockTeleport(8); Game.AddOnLoadWorldAction(WorldSno.a3dun_crater_st_level04, () => @@ -631,7 +596,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 23, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find Heart of Sin if (!Game.Empty) UnlockTeleport(8); if (Game.Empty) UnlockTeleport(9); @@ -644,7 +608,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 27, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill Cydaea if (!Game.Empty) UnlockTeleport(9); ListenKill(ActorSno._mistressofpain, 1, new Advance()); @@ -667,7 +630,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //Destroy Heart of Sin Game.CurrentEncounter.Activated = false; ListenKill(ActorSno._a3dun_crater_st_giantdemonheart_mob, 1, new Advance()); @@ -687,7 +649,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 32, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill Azmodan, finally if (Game.Empty) UnlockTeleport(10); ListenKill(ActorSno._azmodan, 1, new Advance()); @@ -706,7 +667,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 5, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //get Azmodan's soul Game.CurrentEncounter.Activated = false; ListenProximity(ActorSno._azmodan_bss_soulremnants, new Advance()); @@ -722,7 +682,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 39, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //return to base ListenProximity(ActorSno._tyrael_act3, new Advance()); Game.AddOnLoadWorldAction(WorldSno.a3dun_azmodan_arena, () => @@ -737,7 +696,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 46, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with leutenant Lavaile ListenProximity(ActorSno._a3_rampart_guard_captain_alt, new LaunchConversation(160644)); ListenConversation(160644, new Advance()); @@ -749,7 +707,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 34, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //go to Armory ListenTeleport(185228, new Advance()); }) @@ -760,7 +717,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 36, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //go to Adria tower event var World = Game.GetWorld(WorldSno.a3dun_hub_adria_tower); @@ -876,7 +832,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 4, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //use Heaven portal ListenInteract(ActorSno._event47_bigportal, 1, new ChangeAct(300)); }) @@ -887,7 +842,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete Game.CurrentEncounter.Activated = false; }) diff --git a/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActIV.cs b/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActIV.cs index eb08e67..b1bf6d7 100644 --- a/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActIV.cs +++ b/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActIV.cs @@ -33,7 +33,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 2, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { UnlockTeleport(0); //{[World] SNOId: 182944 GlobalId: 117440513 Name: a4dun_heaven_1000_monsters_fight_entrance} var Tyrael = Game.GetWorld(WorldSno.a4dun_heaven_1000_monsters_fight_entrance).GetActorBySNO(ActorSno._tyrael) as InteractiveNPC; @@ -52,7 +51,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 17, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Tyrael UnlockTeleport(1); Game.AddOnLoadWorldAction(WorldSno.a4dun_heaven_1000_monsters_fight_entrance, () => @@ -79,7 +77,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 15, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //go to Hall of Light //ListenProximity(182963, new AskBossEncounter(182960)); ListenTeleport(109149, new Advance()); @@ -91,7 +88,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 12, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill Iskatu if (!Game.Empty) { @@ -108,7 +104,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete Game.CurrentEncounter.Activated = false; }) @@ -123,7 +118,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 66, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -133,7 +127,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 58, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find Iterael var world = Game.GetWorld(WorldSno.a4dun_heaven_1000_monsters_fight); if (Game.Empty) UnlockTeleport(2); @@ -158,7 +151,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 40, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Iterael var Ityrael = Game.GetWorld(WorldSno.a4dun_heaven_1000_monsters_fight).GetActorBySNO(ActorSno._fate) as InteractiveNPC; @@ -178,7 +170,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 17, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find Library of Fate if (!Game.Empty) UnlockTeleport(2); if (Game.Empty) UnlockTeleport(3); @@ -197,7 +188,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 11, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //enter the Library ListenTeleport(143648, new Advance()); }) @@ -208,7 +198,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 13, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill Rakanoth if (!Game.Empty) UnlockTeleport(3); var Library = Game.GetWorld(WorldSno.a4dun_libraryoffate); @@ -240,7 +229,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 33, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //destroy Auriel's jail Game.CurrentEncounter.Activated = false; @@ -262,7 +250,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 38, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Auriel var Library = Game.GetWorld(WorldSno.a4dun_libraryoffate); @@ -290,7 +277,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 42, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //return to Gardens of Hope lv. 1 PlayCutscene(1); var Library = Game.GetWorld(WorldSno.a4dun_libraryoffate); @@ -314,7 +300,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 44, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find demonic rift ListenProximity(ActorSno._a4_heaven_gardens_hellportal, new Advance()); }) @@ -325,7 +310,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 62, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //destroy Eye of Hell ListenKill(ActorSno._a4dun_garden_hellportal_pillar, 1, new Advance()); @@ -337,7 +321,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 50, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //leave demonic rift var World = Game.GetWorld(WorldSno.a4dun_hell_portal_01); World.SpawnMonster(ActorSno._diablo_vo, World.Players.Values.First().Position); @@ -351,7 +334,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 52, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //go to 2nd lv. of Gardens of Hope ListenTeleport(109516, new Advance()); }) @@ -362,7 +344,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 48, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find another demonic rift if (Game.Empty) UnlockTeleport(4); ListenProximity(ActorSno._a4_heaven_gardens_hellportal, new Advance()); @@ -374,7 +355,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 60, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //destroy Eye of Hell ListenKill(ActorSno._a4dun_garden_hellportal_pillar, 1, new Advance()); }) @@ -385,7 +365,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 56, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //leave demonic rift var World = Game.GetWorld(WorldSno.a4dun_hell_portal_02); World.SpawnMonster(ActorSno._diablo_vo, World.Players.Values.First().Position); @@ -399,7 +378,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 54, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find portal to Crystal Collonade ListenProximity(ActorSno._coreelitedemon_a_nopod_unique, new Advance()); }) @@ -410,7 +388,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 23, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Tyrael if (!Game.Empty) UnlockTeleport(4); @@ -431,7 +408,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 29, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //go to Crystal Collonade ListenTeleport(119882, new Advance()); }) @@ -442,7 +418,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete Game.CurrentEncounter.Activated = false; PlayCutscene(2); @@ -458,7 +433,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 14, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -468,7 +442,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 18, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find Imperius var CrystalWorld = Game.GetWorld(WorldSno.a4dun_garden3_spireentrance); @@ -491,7 +464,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 16, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Imperius //ListenProximity(195606, new LaunchConversation(196579)); ListenConversation(196579, new Advance()); @@ -503,7 +475,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 12, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //go to road to Spire Game.AddOnLoadWorldAction(WorldSno.a4dun_garden3_spireentrance, () => { @@ -528,7 +499,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete }) }); @@ -542,7 +512,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 24, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -552,7 +521,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 26, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //go to Spire exterior if (Game.Empty) UnlockTeleport(5); ListenTeleport(215396, new Advance()); @@ -564,7 +532,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 7, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill Izual if (!Game.Empty) UnlockTeleport(5); Game.AddOnLoadWorldAction(WorldSno.a4dun_spire_exterior, () => @@ -587,7 +554,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 20, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //go to Spire entrance (heavens peak) if (Game.Empty) UnlockTeleport(6); ListenTeleport(205434, new Advance()); @@ -599,7 +565,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 22, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Tyrael if (!Game.Empty) UnlockTeleport(6); if (Game.Empty) UnlockTeleport(7); @@ -613,7 +578,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 10, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //go to Crystal Arch ListenTeleport(109563, new Advance()); }) @@ -624,7 +588,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find Diablo if (!Game.Empty) UnlockTeleport(7); Game.AddOnLoadWorldAction(WorldSno.a4dun_diablo_arena, () => @@ -640,7 +603,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 6, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill Diablo (1st phase, to 50% hp) Game.AddOnLoadWorldAction(WorldSno.a4dun_diablo_arena, () => { @@ -659,7 +621,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 12, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill Diablo Shadow (2nd phase) ListenKill(ActorSno._terrordiablo, 1, new Advance()); }) @@ -670,7 +631,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 3, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill Diablo (3rd phase) var targetWorld = Game.GetWorld(WorldSno.a4dun_diablo_arena_phase3); TeleportToWorld(Game.GetWorld(WorldSno.a4dun_diablo_shadowrealm_01), targetWorld, 172); @@ -684,7 +644,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 17, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //destroy Diablo StartConversation(Game.GetWorld(WorldSno.a4dun_diablo_arena_phase3), 205783); ListenConversation(205783, new Advance()); @@ -696,7 +655,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 5, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Auriel Game.GetWorld(WorldSno.a4dun_diablo_arena_phase3).GetActorBySNO(ActorSno._hope).NotifyConversation(1); if (Game.IsHardcore) @@ -721,7 +679,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete }) }); diff --git a/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActV.cs b/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActV.cs index 62c2a2e..c2c6f63 100644 --- a/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActV.cs +++ b/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActV.cs @@ -81,7 +81,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 2, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Lorath Nahr ListenKill(ActorSno._x1_ghost_dark_introoverlook, 1, new LaunchConversation(320130)); @@ -94,7 +93,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 59, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //enter Westmarch var world = Game.GetWorld(WorldSno.x1_westm_intro); @@ -137,7 +135,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 14, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find a5 hub var npc = Game.GetWorld(WorldSno.x1_westm_intro).GetActorBySNO(ActorSno._x1_npc_westmarch_introguy); @@ -158,7 +155,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 7, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill mobs at hub var world = Game.GetWorld(WorldSno.x1_westm_intro); @@ -193,7 +189,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 57, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { var world = Game.GetWorld(WorldSno.x1_westm_intro); //Delete Monsters @@ -216,7 +211,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 18, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //enter the church var world = Game.GetWorld(WorldSno.x1_westm_intro); @@ -241,7 +235,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 11, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //Kill unique 273419 ListenKill(ActorSno._x1_deathmaiden_unique_b, 1, new AfterKillBoss()); @@ -253,7 +246,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 67, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk to Tyrael UnlockTeleport(0); @@ -269,7 +261,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 5, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //leave the church var Tyrael = Game.GetWorld(WorldSno.x1_westmarch_hub).ShowOnlyNumNPC(ActorSno._x1_tyrael_hurt, 0) as InteractiveNPC; @@ -288,7 +279,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete }) @@ -304,7 +294,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 47, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -314,7 +303,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 62, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //OnTargetedActor ID: 315793, Name: x1_westm_Door_Cloister, NumInWorld: 0 Game.AddOnLoadWorldAction(WorldSno.x1_westmarch_hub, () => @@ -344,7 +332,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 57, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find orbs var world = Game.GetWorld(WorldSno.x1_westmarch_hub); @@ -360,7 +347,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 60, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //destroy bodies var world = Game.GetWorld(WorldSno.x1_westm_deathorb_gideonscourt); @@ -393,7 +379,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //slay Drygha Game.AddOnLoadWorldAction(WorldSno.x1_westm_deathorb_gideonscourt, () => @@ -409,7 +394,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 68, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //destroy orb Game.AddOnLoadWorldAction(WorldSno.x1_westm_deathorb_gideonscourt, () => @@ -425,7 +409,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 30, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { var world = Game.GetWorld(WorldSno.x1_westm_deathorb_gideonscourt); //destroy effects @@ -447,7 +430,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 32, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk to Mystic Game.AddOnLoadWorldAction(WorldSno.x1_westm_deathorb_gideonscourt, () => @@ -489,7 +471,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 55, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //exit alley Game.AddOnLoadWorldAction(WorldSno.x1_westm_deathorb_gideonscourt, () => @@ -534,7 +515,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 49, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find death orb ListenTeleport(339158, new AdvanceWithNotify()); @@ -551,7 +531,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 53, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //destroy bodies UnlockTeleport(2); @@ -578,7 +557,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 34, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //slay guardian Game.AddOnLoadWorldAction(WorldSno.x1_westm_deathorb_kerwinsrow, () => @@ -599,7 +577,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 40, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //destroy final orb Game.AddOnLoadWorldAction(WorldSno.x1_westm_deathorb_kerwinsrow, () => @@ -620,7 +597,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 42, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk to Mystic ListenProximity(ActorSno._pt_mystic_novendor_nonglobalfollower, new LaunchConversation(305871)); @@ -638,7 +614,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 29, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //return to hub ListenTeleport(270011, new Advance()); @@ -661,7 +636,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete }) @@ -677,7 +651,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -687,7 +660,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 6, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //enter Westmarch Heights ListenTeleport(263493, new AdvanceWithNotify()); @@ -699,7 +671,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 12, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find Tower ListenTeleport(308487, new AdvanceWithNotify()); @@ -714,7 +685,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 14, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill Urzael UnlockTeleport(3); @@ -727,7 +697,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 16, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk to Malthael spirit Game.AddOnLoadWorldAction(WorldSno.x1_urzael_arena, () => @@ -746,7 +715,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 18, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //return to the Hub ListenTeleport(270011, new AdvanceWithNotify()); @@ -758,7 +726,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 3, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk to Tyrael ListenInteract(ActorSno._x1_tyrael_hurt, 1, new LaunchConversation(283403)); @@ -771,7 +738,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete PlayCutscene(1); @@ -788,7 +754,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 67, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -798,7 +763,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 65, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find entrance //DisableArrow(this.Game.GetWorld(304235), target); @@ -856,7 +820,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 92, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill mobs Game.AddOnLoadWorldAction(WorldSno.x1_bog_adriaritual, () => @@ -880,7 +843,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 106, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find Nephalem Guidestone Game.AddOnLoadWorldAction(WorldSno.x1_bog_adriaritual, () => @@ -898,7 +860,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 73, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //use waystone UnlockTeleport(4); @@ -913,7 +874,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 10, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find catacombs var world = Game.GetWorld(WorldSno.x1_bog_adriaritual); @@ -949,7 +909,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 110, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //search tomb var world = Game.GetWorld(WorldSno.x1_bog_adriaritual); @@ -987,7 +946,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 14, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //go Adria UnlockTeleport(6); @@ -1000,7 +958,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 78, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill Adria //UnlockTeleport(7); //hacky @@ -1013,7 +970,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 115, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk to Lorath Game.CurrentEncounter.Activated = false; @@ -1045,7 +1001,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 3, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk to Tyrael foreach (var Myst in Game.GetWorld(WorldSno.x1_adria_boss_arena_02).GetActorsBySNO(ActorSno._x1_npc_lorathnahr)) //284530 @@ -1064,7 +1019,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete PlayCutscene(2); @@ -1081,7 +1035,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 15, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -1091,7 +1044,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 17, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //go to Pandemonium Gate ListenTeleport(339468, new Advance()); @@ -1103,7 +1055,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 19, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill reapers and Lamiel ListenKill(ActorSno._x1_deathmaiden_unique_heaven, 1, new Advance()); @@ -1115,7 +1066,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 11, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk to Imperius Game.AddOnLoadWorldAction(WorldSno.x1_heaven_pandemonium_portal, () => @@ -1132,7 +1082,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 3, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //use portal ListenTeleport(299453, new Advance()); @@ -1144,7 +1093,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete }) @@ -1160,7 +1108,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 35, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -1170,7 +1117,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 41, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //cork for Imperius Game.AddOnLoadWorldAction(WorldSno.x1_pand_ext_gateoverlook, () => @@ -1189,7 +1135,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //reach Imperius ListenInteract(ActorSno._x1_imperius, 1, new LaunchConversation(361245)); @@ -1208,7 +1153,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 51, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //get to Siege Camp ListenProximity(ActorSno._x1_pand_ext_imperiuscharge_towers_chain, new Advance()); @@ -1220,7 +1164,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 11, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //gather siege rune ListenInteract(ActorSno._x1_pandext_siegerune, 1, new Advance()); @@ -1232,7 +1175,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 43, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk to Imperius ListenInteract(ActorSno._x1_imperius, 1, new LaunchConversation(361252)); @@ -1252,7 +1194,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 45, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //hunt for Siege Runes UnlockTeleport(8); @@ -1265,7 +1206,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 30, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //enter Siege outpost ListenTeleport(339397, new Advance()); @@ -1277,7 +1217,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 33, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //Kill Ram Defense Captain (Thilor) ListenKill(ActorSno._x1_bigred_chronodemon_burned_ramguard, 1, new Advance()); @@ -1289,7 +1228,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 15, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk to Tyrael ListenInteract(ActorSno._x1_tyrael_pandext, 1, new LaunchConversation(346540)); @@ -1306,7 +1244,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete }) @@ -1322,7 +1259,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 32, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -1332,7 +1268,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 25, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //Board Ram UnlockTeleport(9); @@ -1372,7 +1307,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 27, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //breach phase ListenKill(ActorSno._x1_westmarchranged_b, 2, new Advance()); @@ -1388,7 +1322,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 29, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //Fight Ram Boss ListenKill(ActorSno._x1_westmarchbrute_batteringramboss, 1, new Advance()); @@ -1405,7 +1338,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 22, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //Finish the Gate @@ -1436,7 +1368,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 8, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //enter Breach var RamWorld = Game.GetWorld(WorldSno.x1_pand_batteringram); @@ -1464,7 +1395,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete PlayCutscene(3); @@ -1481,7 +1411,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 30, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -1491,7 +1420,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 12, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //FortressIntroTyrael var world = Game.GetWorld(WorldSno.x1_fortress_level_01); @@ -1514,7 +1442,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 36, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //Spirit Well 1 RemoveConversations(Game.GetWorld(WorldSno.x1_fortress_level_01).GetActorBySNO(ActorSno._tyrael)); @@ -1553,7 +1480,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 65, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //Spirit Well 2 ListenTeleport(360494, new Advance()); @@ -1565,7 +1491,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 61, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //Kill Death Maiden ListenKill(ActorSno._x1_deathmaiden_pand_a_fortressunique, 1, new Advance()); @@ -1581,7 +1506,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 3, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //Destroy Soul Prison UnlockTeleport(11); @@ -1598,7 +1522,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 8, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find Malthael ListenTeleport(330576, new Advance()); @@ -1610,7 +1533,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 21, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill Malthael ListenKill(ActorSno._x1_malthael_boss, 1, new Advance()); @@ -1622,7 +1544,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 7, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //Success Game.CurrentEncounter.Activated = false; @@ -1658,7 +1579,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete }) diff --git a/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/Events.cs b/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/Events.cs index 6d6d639..99ff9fa 100644 --- a/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/Events.cs +++ b/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/Events.cs @@ -31,7 +31,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 6, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -41,7 +40,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 4, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //free Guards ListenKill(ActorSno._terrordemon_a_unique_1000monster, 1, new SideAdvance()); }) @@ -52,7 +50,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 3, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //guard winches ListenKill(ActorSno._terrordemon_a_unique_1000monster, 1, new SideAdvance()); }) @@ -63,7 +60,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete }) }); @@ -78,7 +74,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -87,7 +82,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 7, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { ListenKill(ActorSno._fleshpitflyerspawner_b_event_farmambush, 4, new SideAdvance()); }) @@ -97,7 +91,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 4, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { var world = Game.GetWorld(WorldSno.trout_town); StartConversation(world, 60182); @@ -111,7 +104,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { StartConversation(Game.GetWorld(WorldSno.trout_town), 60184); }) @@ -128,7 +120,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -138,7 +129,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 3, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //defend yourself var world = Game.GetWorld(WorldSno.trout_town); script = new Invasion(world.Players.First().Value.Position, 50f, new List { ActorSno._skeleton_b, ActorSno._skeletonarcher_b }, 30f, ActorSno._shield_skeleton_nephchamp, false); @@ -152,7 +142,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete }) }); @@ -167,7 +156,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -177,7 +165,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 3, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //escape to treasure room SetQuestTimer(120396, 180f, Game.GetWorld(WorldSno.a2dun_zolt_timed01_level01), new SideAbandon()); ListenTeleport(168200, new SideAdvance()); @@ -189,7 +176,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete foreach (var plr in Game.Players) if (Game.QuestManager.QuestTimerEstimate >= 90f) @@ -207,7 +193,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 4, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -217,7 +202,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //Break Totems ListenKill(ActorSno._trout_highlands_goatman_totem_gharbad, 2, new SideAdvance()); }) @@ -228,7 +212,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 12, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill shamans var world = Game.GetWorld(WorldSno.trout_town); script = new Invasion( @@ -249,7 +232,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 14, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk to Gharbad ListenConversation(81099, new SideAdvance()); }) @@ -260,7 +242,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 2, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //Kill gharbad (Game.GetWorld(WorldSno.trout_town).GetActorBySNO(ActorSno._gharbad_the_weak_ghost) as Gharbad).Resurrect(); ListenKill(ActorSno._goatmutant_melee_a_unique_gharbad, 1, new SideAdvance()); @@ -272,7 +253,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete }) @@ -288,7 +268,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 0, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -298,7 +277,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 3, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Poltahr ListenInteract(ActorSno._a2c2poltahr, 1, new LaunchConversation(18039)); ListenConversation(18039, new SideAdvance()); @@ -310,7 +288,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 17, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find Idol AddFollower(Game.GetWorld(WorldSno.a2c2dun_zolt_treasurehunter), ActorSno._a2c2poltahr); ListenProximity(ActorSno._interactlocation, new SideAdvance()); @@ -322,7 +299,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 19, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //get idol StartConversation(Game.GetWorld(WorldSno.a2c2dun_zolt_treasurehunter), 18038); ListenInteract(ActorSno._a2dun_zolt_pedestal, 1, new SideAdvance()); @@ -334,7 +310,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 2, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //stop ambush foreach (var spawner in Game.GetWorld(WorldSno.a2c2dun_zolt_treasurehunter).GetActorsBySNO(ActorSno._spawner_skeletonmage_cold_a)) { @@ -350,7 +325,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete DestroyFollower(ActorSno._a2c2poltahr); }) @@ -366,7 +340,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 16, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -376,7 +349,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 18, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find lever var world = Game.GetWorld(WorldSno.a2dun_aqd_oasis_randomfacepuzzle_large); SetActorOperable(world, ActorSno._a2dun_aqd_godhead_door_largepuzzle, false); @@ -391,7 +363,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 20, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //enter vault SetActorOperable(Game.GetWorld(WorldSno.a2dun_aqd_oasis_randomfacepuzzle_large), ActorSno._a2dun_aqd_godhead_door_largepuzzle, true); ListenInteract(ActorSno._a2dun_aqd_godhead_door_largepuzzle, 1, new SideAdvance()); @@ -403,7 +374,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 22, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //claim treasure ListenInteract(ActorSno._a2dun_aqd_chest_special_facepuzzle_large, 1, new SideAdvance()); }) @@ -414,7 +384,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 3, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill unique var world = Game.GetWorld(WorldSno.a2dun_aqd_oasis_randomfacepuzzle_large); foreach (var spawner in world.GetActorsBySNO(ActorSno._spawner_ghost_d_facepuzzle)) @@ -431,7 +400,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete }) }); @@ -446,7 +414,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 13, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -456,7 +423,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 17, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find lever var world = Game.GetWorld(WorldSno.a2dun_aqd_oasis_randomfacepuzzle_small); SetActorOperable(world, ActorSno._a2dun_aqd_godhead_door, false); @@ -471,7 +437,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 22, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //enter vault SetActorOperable(Game.GetWorld(WorldSno.a2dun_aqd_oasis_randomfacepuzzle_small), ActorSno._a2dun_aqd_godhead_door, true); ListenInteract(ActorSno._a2dun_aqd_godhead_door, 1, new SideAdvance()); @@ -483,7 +448,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 19, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //claim treasure ListenInteract(ActorSno._a2dun_aqd_chest_rare_facepuzzlesmall, 1, new SideAdvance()); }) @@ -494,7 +458,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 3, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //kill unique var world = Game.GetWorld(WorldSno.a2dun_aqd_oasis_randomfacepuzzle_small); foreach (var spawner in world.GetActorsBySNO(ActorSno._spawner_fastmummy_climb_a_smallfacepuzzle)) @@ -511,7 +474,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete }) }); @@ -524,7 +486,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 13, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -534,7 +495,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find lever ListenInteract(Game.SideQuestGizmo.SNO, 1, new SideAdvance()); }) @@ -545,7 +505,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 2, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //enter vault script = new WavedInvasion(Game.SideQuestGizmo.Position, 30f, new List { ActorSno._x1_zombieskinny_a }, ActorSno._x1_zombieskinny_skeleton_a_lr_boss); script.Execute(Game.SideQuestGizmo.World); @@ -558,7 +517,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete if (Game.SideQuestGizmo != null && Game.SideQuestGizmo is CursedShrine) (Game.SideQuestGizmo as CursedShrine).Activate(); @@ -573,7 +531,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 13, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -583,7 +540,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find lever ListenInteract(Game.SideQuestGizmo.SNO, 1, new SideAdvance()); }) @@ -594,7 +550,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 2, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //enter vault script = new WavedInvasion( Game.SideQuestGizmo.Position, @@ -612,7 +567,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete if (Game.SideQuestGizmo != null && Game.SideQuestGizmo is CursedShrine) (Game.SideQuestGizmo as CursedShrine).Activate(); @@ -627,7 +581,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 13, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -637,7 +590,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find lever ListenInteract(Game.SideQuestGizmo.SNO, 1, new SideAdvance()); }) @@ -648,7 +600,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 2, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //enter vault script = new WavedInvasion(Game.SideQuestGizmo.Position, 30f, new List { ActorSno._triunecultist_c_event }, ActorSno._cultist_crownleader); script.Execute(Game.SideQuestGizmo.World); @@ -661,7 +612,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete if (Game.SideQuestGizmo != null && Game.SideQuestGizmo is CursedShrine) (Game.SideQuestGizmo as CursedShrine).Activate(); @@ -676,7 +626,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 11, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -686,7 +635,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find lever ListenInteract(Game.SideQuestGizmo.SNO, 1, new SideAdvance()); }) @@ -697,7 +645,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 2, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //enter vault script = new WavedInvasion(Game.SideQuestGizmo.Position, 30f, new List { ActorSno._ghoul_a, ActorSno._ghoul_b }, ActorSno._ghoul_b_speedkill_rare); script.Execute(Game.SideQuestGizmo.World); @@ -710,7 +657,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete if (Game.SideQuestGizmo != null && Game.SideQuestGizmo is CursedChest) (Game.SideQuestGizmo as CursedChest).Activate(); @@ -725,7 +671,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 11, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -735,7 +680,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find lever ListenInteract(Game.SideQuestGizmo.SNO, 1, new SideAdvance()); }) @@ -746,7 +690,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 2, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //enter vault script = new WavedInvasion(Game.SideQuestGizmo.Position, 30f, new List { ActorSno._demontrooper_a_catapult }, ActorSno._x1_demontrooper_chronodemon_test_a); script.Execute(Game.SideQuestGizmo.World); @@ -759,7 +702,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete if (Game.SideQuestGizmo != null && Game.SideQuestGizmo is CursedChest) (Game.SideQuestGizmo as CursedChest).Activate(); @@ -774,7 +716,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 11, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -784,7 +725,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //find lever ListenInteract(Game.SideQuestGizmo.SNO, 1, new SideAdvance()); }) @@ -795,7 +735,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 2, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //enter vault script = new WavedInvasion( Game.SideQuestGizmo.Position, @@ -813,7 +752,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete if (Game.SideQuestGizmo != null && Game.SideQuestGizmo is CursedChest) (Game.SideQuestGizmo as CursedChest).Activate(); @@ -827,7 +765,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -836,7 +773,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 3, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Tyrael var TristHab = Game.GetWorld(WorldSno.x1_tristram_adventure_mode_hub); var Tyrael = TristHab.GetActorBySNO(ActorSno._tyrael_heaven) as ActorSystem.InteractiveNPC; @@ -854,7 +790,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete foreach (var plr in Game.Players.Values) { @@ -876,7 +811,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -886,7 +820,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 3, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Tyrael ListenInteract(ActorSno._tyrael_heaven, 1, new LaunchConversation(357038)); ListenConversation(357038, new SideAdvance()); @@ -898,7 +831,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete foreach (var plr in Game.Players.Values) { @@ -920,7 +852,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -930,7 +861,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 3, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Tyrael ListenInteract(ActorSno._tyrael_heaven, 1, new LaunchConversation(357040)); ListenConversation(357040, new SideAdvance()); @@ -942,7 +872,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete foreach (var plr in Game.Players.Values) { @@ -965,7 +894,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -975,7 +903,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 3, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Tyrael ListenInteract(ActorSno._tyrael_heaven, 1, new LaunchConversation(357021)); ListenConversation(357021, new SideAdvance()); @@ -987,7 +914,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete foreach (var plr in Game.Players.Values) { @@ -1009,7 +935,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { }) }); @@ -1019,7 +944,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 3, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //talk with Tyrael ListenInteract(ActorSno._tyrael_heaven, 1, new LaunchConversation(357042)); ListenConversation(357042, new SideAdvance()); @@ -1031,7 +955,6 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, OnAdvance = new Action(() => { //complete foreach (var plr in Game.Players.Values) { diff --git a/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/OpenWorld.cs b/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/OpenWorld.cs index e333c36..6a61203 100644 --- a/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/OpenWorld.cs +++ b/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/OpenWorld.cs @@ -32,12 +32,11 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 2, - Objectives = new List { Objective.Default() }, - OnAdvance = new Action(() => { + OnAdvance = () => { script = new CryptPortals(); script.Execute(Game.GetWorld(WorldSno.trout_town)); - Game.AddOnLoadWorldAction(WorldSno.a1dun_spidercave_02, () => - { + Game.AddOnLoadWorldAction(WorldSno.a1dun_spidercave_02, () => + { Game.GetWorld(WorldSno.a1dun_spidercave_02).SpawnMonster(ActorSno._spiderqueen, new Vector3D { X = 149.439f, Y = 121.452f, Z = 13.794f }); });//spawn spider queen Game.AddOnLoadWorldAction(WorldSno.trdun_butcherslair_02, () => @@ -63,7 +62,7 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem world.SpawnMonster(ActorSno._siegebreakerdemon, new Vector3D { X = 396.565f, Y = 366.167f, Z = 0.1f }); }); //spawn Siegebreaker - }) + } }); Game.QuestManager.Quests[312429].Steps.Add(2, new QuestStep @@ -71,9 +70,8 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = 1, - Objectives = new List { Objective.Default() }, - OnAdvance = new Action(() => { //complete - }) + OnAdvance = () => { //complete + } }); Game.QuestManager.Quests[312429].Steps.Add(1, new QuestStep @@ -81,9 +79,8 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = true, NextStep = -1, - Objectives = new List { Objective.Default() }, - OnAdvance = new Action(() => { //complete - }) + OnAdvance = () => { //complete + } }); #endregion @@ -96,10 +93,9 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 1, - Objectives = new List { Objective.Default() }, - OnAdvance = new Action(() => { + OnAdvance = () => { - }) + } }); Game.QuestManager.SideQuests[382695].Steps.Add(1, new QuestStep @@ -107,12 +103,11 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 3, - Objectives = new List { Objective.Default() }, - OnAdvance = new Action(() => { + OnAdvance = () => { - }) + } }); Game.QuestManager.SideQuests[382695].Steps.Add(3, new QuestStep @@ -120,8 +115,7 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, - OnAdvance = new Action(() => { //complete + OnAdvance = () => { //complete var nephalem = Game.GetWorld(Game.WorldOfPortalNephalem); ActorSystem.Actor BossOfPortal = null; @@ -148,7 +142,7 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem } ActiveArrow(nephalem, BossOfPortal.SNO); ListenKill(BossOfPortal.SNO, 1, new QuestEvents.SideAdvance()); - }) + } }); Game.QuestManager.SideQuests[382695].Steps.Add(10, new QuestStep @@ -156,9 +150,8 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, - OnAdvance = new Action(() => { //complete - }) + OnAdvance = () => { //complete + } }); Game.QuestManager.SideQuests[382695].Steps.Add(5, new QuestStep @@ -166,13 +159,12 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, - OnAdvance = new Action(() => { //complete + OnAdvance = () => { //complete foreach (var plr in Game.Players.Values) { } - }) + } }); //*/ @@ -187,10 +179,7 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 1, - Objectives = new List { Objective.Default() }, - OnAdvance = new Action(() => { - - }) + OnAdvance = () => { } }); Game.QuestManager.SideQuests[337492].Steps.Add(1, new QuestStep @@ -198,10 +187,7 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = 3, - Objectives = new List { Objective.Default() }, - OnAdvance = new Action(() => { - - }) + OnAdvance = () => { } // complete }); Game.QuestManager.SideQuests[337492].Steps.Add(3, new QuestStep @@ -209,11 +195,7 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, - OnAdvance = new Action(() => { //complete - - - }) + OnAdvance = () => { } // complete }); Game.QuestManager.SideQuests[337492].Steps.Add(10, new QuestStep @@ -221,10 +203,7 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, - OnAdvance = new Action(() => { //complete - - }) + OnAdvance = () => { } // complete }); Game.QuestManager.SideQuests[337492].Steps.Add(5, new QuestStep @@ -232,13 +211,7 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem Completed = false, Saveable = false, NextStep = -1, - Objectives = new List { Objective.Default() }, - OnAdvance = new Action(() => { //complete - foreach (var plr in Game.Players.Values) - { - - } - }) + OnAdvance = () => { } // complete }); //*/ diff --git a/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/QuestProgress.cs b/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/QuestProgress.cs index 4282640..b04ae7e 100644 --- a/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/QuestProgress.cs +++ b/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/QuestProgress.cs @@ -43,7 +43,7 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem public class QuestStep { public bool Completed; - public List Objectives; + public List Objectives = new() { Objective.Default() }; public int NextStep; public Action OnAdvance; public bool Saveable;