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

Core/Quest: Fix repeatable quest mark

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/c5173aca15fcabba9ffce6393cf17868dc30750f)
This commit is contained in:
hondacrx
2021-12-26 19:59:39 -05:00
parent 639f5cc75d
commit 55189b9395
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Creature/Gossip.cs
+2 -2
View File
@@ -280,7 +280,7 @@ namespace Game.Misc
text.QuestType = item.QuestIcon; text.QuestType = item.QuestIcon;
text.QuestFlags = (uint)quest.Flags; text.QuestFlags = (uint)quest.Flags;
text.QuestFlagsEx = (uint)quest.FlagsEx; text.QuestFlagsEx = (uint)quest.FlagsEx;
text.Repeatable = quest.IsRepeatable(); text.Repeatable = quest.IsRepeatable() && !quest.IsDailyOrWeekly() && !quest.IsMonthly();
text.QuestTitle = quest.LogTitle; text.QuestTitle = quest.LogTitle;
Locale locale = _session.GetSessionDbLocaleIndex(); Locale locale = _session.GetSessionDbLocaleIndex();
@@ -372,7 +372,7 @@ namespace Game.Misc
text.QuestType = questMenuItem.QuestIcon; text.QuestType = questMenuItem.QuestIcon;
text.QuestFlags = (uint)quest.Flags; text.QuestFlags = (uint)quest.Flags;
text.QuestFlagsEx = (uint)quest.FlagsEx; text.QuestFlagsEx = (uint)quest.FlagsEx;
text.Repeatable = quest.IsRepeatable(); text.Repeatable = quest.IsRepeatable() && !quest.IsDailyOrWeekly() && !quest.IsMonthly();
text.QuestTitle = quest.LogTitle; text.QuestTitle = quest.LogTitle;
if (localeConstant != Locale.enUS) if (localeConstant != Locale.enUS)
Source/Game/Entities/Player/Player.Quest.cs
+4 -2
View File
@@ -307,7 +307,9 @@ namespace Game.Entities
if (!CanTakeQuest(quest, false)) if (!CanTakeQuest(quest, false))
continue; continue;
if (quest.IsAutoComplete()) if (quest.IsAutoComplete() && (!quest.IsRepeatable() || quest.IsDaily() || quest.IsWeekly() || quest.IsMonthly()))
qm.AddMenuItem(quest_id, 0);
else if (quest.IsAutoComplete())
qm.AddMenuItem(quest_id, 4); qm.AddMenuItem(quest_id, 4);
else if (GetQuestStatus(quest_id) == QuestStatus.None) else if (GetQuestStatus(quest_id) == QuestStatus.None)
qm.AddMenuItem(quest_id, 2); qm.AddMenuItem(quest_id, 2);
@@ -1955,7 +1957,7 @@ namespace Game.Entities
break; break;
} }
if (quest.IsAutoComplete() && CanTakeQuest(quest, false) && quest.IsRepeatable() && !quest.IsDailyOrWeekly()) if (quest.IsAutoComplete() && CanTakeQuest(quest, false) && quest.IsRepeatable() && !quest.IsDailyOrWeekly() && !quest.IsMonthly())
{ {
if (GetLevel() <= (GetQuestLevel(quest) + WorldConfig.GetIntValue(WorldCfg.QuestLowLevelHideDiff))) if (GetLevel() <= (GetQuestLevel(quest) + WorldConfig.GetIntValue(WorldCfg.QuestLowLevelHideDiff)))
result |= QuestGiverStatus.RepeatableTurnin; result |= QuestGiverStatus.RepeatableTurnin;