Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not set a quest to failed if it's rewarded or has no status at all (not taken).

Browse Source
This commit is contained in:
hondacrx
2017-10-04 12:32:54 -04:00
parent e45c13a8dc
commit 168b587aa9
3 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Game/AI/ScriptedAI/ScriptedEscortAI.cs
+2 -6
View File
@@ -148,15 +148,11 @@ namespace Game.AI
{ {
Player member = groupRef.GetSource(); Player member = groupRef.GetSource();
if (member) if (member)
if (member.GetQuestStatus(m_pQuestForEscort.Id) == QuestStatus.Incomplete) member.FailQuest(m_pQuestForEscort.Id);
member.FailQuest(m_pQuestForEscort.Id);
} }
} }
else else
{ player.FailQuest(m_pQuestForEscort.Id);
if (player.GetQuestStatus(m_pQuestForEscort.Id) == QuestStatus.Incomplete)
player.FailQuest(m_pQuestForEscort.Id);
}
} }
} }
Game/AI/ScriptedAI/ScriptedFollowerAI.cs
+2 -8
View File
@@ -153,17 +153,11 @@ namespace Game.AI
{ {
Player member = groupRef.GetSource(); Player member = groupRef.GetSource();
if (member) if (member)
{ member.FailQuest(m_pQuestForFollow.Id);
if (member.GetQuestStatus(m_pQuestForFollow.Id) == QuestStatus.Incomplete)
member.FailQuest(m_pQuestForFollow.Id);
}
} }
} }
else else
{ player.FailQuest(m_pQuestForFollow.Id);
if (player.GetQuestStatus(m_pQuestForFollow.Id) == QuestStatus.Incomplete)
player.FailQuest(m_pQuestForFollow.Id);
}
} }
} }
Game/AI/SmartScripts/SmartAI.cs
+3 -3
View File
@@ -235,7 +235,7 @@ namespace Game.AI
if (!fail && player.IsAtGroupRewardDistance(me) && player.GetCorpse() == null) if (!fail && player.IsAtGroupRewardDistance(me) && player.GetCorpse() == null)
player.GroupEventHappens(mEscortQuestID, me); player.GroupEventHappens(mEscortQuestID, me);
if (fail && player.GetQuestStatus(mEscortQuestID) == QuestStatus.Incomplete) if (fail)
player.FailQuest(mEscortQuestID); player.FailQuest(mEscortQuestID);
Group group = player.GetGroup(); Group group = player.GetGroup();
@@ -247,7 +247,7 @@ namespace Game.AI
if (!fail && groupGuy.IsAtGroupRewardDistance(me) && !groupGuy.GetCorpse()) if (!fail && groupGuy.IsAtGroupRewardDistance(me) && !groupGuy.GetCorpse())
groupGuy.AreaExploredOrEventHappens(mEscortQuestID); groupGuy.AreaExploredOrEventHappens(mEscortQuestID);
if (fail && groupGuy.GetQuestStatus(mEscortQuestID) == QuestStatus.Incomplete) else if (fail)
groupGuy.FailQuest(mEscortQuestID); groupGuy.FailQuest(mEscortQuestID);
} }
} }
@@ -261,7 +261,7 @@ namespace Game.AI
Player player = obj.ToPlayer(); Player player = obj.ToPlayer();
if (!fail && player.IsAtGroupRewardDistance(me) && player.GetCorpse() == null) if (!fail && player.IsAtGroupRewardDistance(me) && player.GetCorpse() == null)
player.AreaExploredOrEventHappens(mEscortQuestID); player.AreaExploredOrEventHappens(mEscortQuestID);
if (fail && player.GetQuestStatus(mEscortQuestID) == QuestStatus.Incomplete) else if (fail)
player.FailQuest(mEscortQuestID); player.FailQuest(mEscortQuestID);
} }
} }