diff --git a/src/DiIiS-NA/D3-GameServer/GSSystem/GameSystem/Game.cs b/src/DiIiS-NA/D3-GameServer/GSSystem/GameSystem/Game.cs index 566a38a..f5c64f8 100644 --- a/src/DiIiS-NA/D3-GameServer/GSSystem/GameSystem/Game.cs +++ b/src/DiIiS-NA/D3-GameServer/GSSystem/GameSystem/Game.cs @@ -86,7 +86,7 @@ namespace DiIiS_NA.GameServer.GSSystem.GameSystem public List ConnectedPlayers = new List(); - public bool QuestSetuped = false; + public bool QuestSetup = false; public int LoadedPlayers = 0; @@ -931,7 +931,7 @@ namespace DiIiS_NA.GameServer.GSSystem.GameSystem { if (PvP) return; - if (!QuestSetuped) + if (!QuestSetup) { QuestManager.SetQuests(); DestinationEnterQuest = currQuest; @@ -941,7 +941,7 @@ namespace DiIiS_NA.GameServer.GSSystem.GameSystem CurrentQuest = QuestsOrder[0]; CurrentStep = -1; - if (CurrentAct == 3000) + if (CurrentAct is 3000 or 0) { QuestManager.Quests[CurrentQuest].Steps[-1].OnAdvance.Invoke(); return; diff --git a/src/DiIiS-NA/D3-GameServer/GSSystem/GameSystem/QuestManager.cs b/src/DiIiS-NA/D3-GameServer/GSSystem/GameSystem/QuestManager.cs index 8c650aa..98e02d7 100644 --- a/src/DiIiS-NA/D3-GameServer/GSSystem/GameSystem/QuestManager.cs +++ b/src/DiIiS-NA/D3-GameServer/GSSystem/GameSystem/QuestManager.cs @@ -75,7 +75,7 @@ namespace DiIiS_NA.GameServer.GSSystem.GameSystem { Game.QuestProgress.SetQuests(); Game.SideQuestProgress.SetQuests(); - Game.QuestSetuped = true; + Game.QuestSetup = true; } public void ClearQuests() diff --git a/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActI.cs b/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActI.cs index effd681..96268db 100644 --- a/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActI.cs +++ b/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/ActI.cs @@ -85,12 +85,8 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem { if (Game.CurrentQuest == 87700 & Game.CurrentStep == -1) { - //Указывает куда идти - //ActiveArrow(this.Game.GetWorld(71150), 3739); - - //Убираем лишнюю Лею - var Leah = world.GetActorBySNO(ActorSno._leah, true); - if (Leah != null) Leah.Hidden = true; + var leah = world.GetActorBySNO(ActorSno._leah, true); + if (leah != null) leah.Hidden = true; } }); SetActorOperable(world, ActorSno._trout_newtristram_gate_town, false); @@ -139,7 +135,7 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem } catch { } UnlockTeleport(0); - if (world.GetActorsBySNO(ActorSno._trout_newtristram_gate_town).Where(d => d.Visible).FirstOrDefault() != null) + if (world.GetActorsBySNO(ActorSno._trout_newtristram_gate_town).FirstOrDefault(d => d.Visible) != null) Open(world, ActorSno._trout_newtristram_gate_town); ActiveArrow(world, ActorSno._g_portal_rectangle_orange_icondoor, WorldSno.trout_tristram_inn); ListenConversation(151123, new Advance());