From 168b587aa91419e86db934fd4c11dabbfaa95ed4 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 4 Oct 2017 12:32:54 -0400 Subject: [PATCH] do not set a quest to failed if it's rewarded or has no status at all (not taken). --- Game/AI/ScriptedAI/ScriptedEscortAI.cs | 8 ++------ Game/AI/ScriptedAI/ScriptedFollowerAI.cs | 10 ++-------- Game/AI/SmartScripts/SmartAI.cs | 6 +++--- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/Game/AI/ScriptedAI/ScriptedEscortAI.cs b/Game/AI/ScriptedAI/ScriptedEscortAI.cs index 9e659ae31..913e32947 100644 --- a/Game/AI/ScriptedAI/ScriptedEscortAI.cs +++ b/Game/AI/ScriptedAI/ScriptedEscortAI.cs @@ -148,15 +148,11 @@ namespace Game.AI { Player member = groupRef.GetSource(); if (member) - if (member.GetQuestStatus(m_pQuestForEscort.Id) == QuestStatus.Incomplete) - member.FailQuest(m_pQuestForEscort.Id); + member.FailQuest(m_pQuestForEscort.Id); } } else - { - if (player.GetQuestStatus(m_pQuestForEscort.Id) == QuestStatus.Incomplete) - player.FailQuest(m_pQuestForEscort.Id); - } + player.FailQuest(m_pQuestForEscort.Id); } } diff --git a/Game/AI/ScriptedAI/ScriptedFollowerAI.cs b/Game/AI/ScriptedAI/ScriptedFollowerAI.cs index 033eb76bf..9ad91035c 100644 --- a/Game/AI/ScriptedAI/ScriptedFollowerAI.cs +++ b/Game/AI/ScriptedAI/ScriptedFollowerAI.cs @@ -153,17 +153,11 @@ namespace Game.AI { Player member = groupRef.GetSource(); if (member) - { - if (member.GetQuestStatus(m_pQuestForFollow.Id) == QuestStatus.Incomplete) - member.FailQuest(m_pQuestForFollow.Id); - } + member.FailQuest(m_pQuestForFollow.Id); } } else - { - if (player.GetQuestStatus(m_pQuestForFollow.Id) == QuestStatus.Incomplete) - player.FailQuest(m_pQuestForFollow.Id); - } + player.FailQuest(m_pQuestForFollow.Id); } } diff --git a/Game/AI/SmartScripts/SmartAI.cs b/Game/AI/SmartScripts/SmartAI.cs index 858e86811..c90cacd10 100644 --- a/Game/AI/SmartScripts/SmartAI.cs +++ b/Game/AI/SmartScripts/SmartAI.cs @@ -235,7 +235,7 @@ namespace Game.AI if (!fail && player.IsAtGroupRewardDistance(me) && player.GetCorpse() == null) player.GroupEventHappens(mEscortQuestID, me); - if (fail && player.GetQuestStatus(mEscortQuestID) == QuestStatus.Incomplete) + if (fail) player.FailQuest(mEscortQuestID); Group group = player.GetGroup(); @@ -247,7 +247,7 @@ namespace Game.AI if (!fail && groupGuy.IsAtGroupRewardDistance(me) && !groupGuy.GetCorpse()) groupGuy.AreaExploredOrEventHappens(mEscortQuestID); - if (fail && groupGuy.GetQuestStatus(mEscortQuestID) == QuestStatus.Incomplete) + else if (fail) groupGuy.FailQuest(mEscortQuestID); } } @@ -261,7 +261,7 @@ namespace Game.AI Player player = obj.ToPlayer(); if (!fail && player.IsAtGroupRewardDistance(me) && player.GetCorpse() == null) player.AreaExploredOrEventHappens(mEscortQuestID); - if (fail && player.GetQuestStatus(mEscortQuestID) == QuestStatus.Incomplete) + else if (fail) player.FailQuest(mEscortQuestID); } }