Commit 4334b87a authored by TOM_RUS's avatar TOM_RUS
Browse files

WOW-37893patch9.0.5_PTR

parent 742e7a76
......@@ -148,13 +148,15 @@ function AuctionHouseItemSellFrameMixin:GetBestEntry()
return nil;
end
local itemKeyInfo = C_AuctionHouse.GetItemKeyInfo(self.listDisplayedItemKey);
local itemLevel = C_Item.GetCurrentItemLevel(self.itemLocation);
local isGreenQuality = C_Item.GetItemQuality(self.itemLocation) == Enum.ItemQuality.Uncommon;
local ignoreItemLevel = isGreenQuality or itemKeyInfo.isPet;
local bestEntry = nil;
local numSearchResults = C_AuctionHouse.GetNumItemSearchResults(self.listDisplayedItemKey);
for i = 1, numSearchResults do
local searchResult = C_AuctionHouse.GetItemSearchResultInfo(self.listDisplayedItemKey, i);
if isGreenQuality or (searchResult.itemKey.itemLevel == itemLevel) then
if ignoreItemLevel or (searchResult.itemKey.itemLevel == itemLevel) then
if RowDataCheapestBuyoutComparison(searchResult, bestEntry) then
bestEntry = searchResult;
end
......
......@@ -222,8 +222,9 @@ function TutorialHelper:GetActionButtonBySpellID(spellID)
if btn and btn.action then
local actionType, sID, subType = GetActionInfo(btn.action);
local baseSpellID = FindBaseSpellByID(spellID);
if (sID == baseSpellID) or (sID == FindSpellOverrideByID(spellID)) then
local baseSpellID = FindBaseSpellByID(spellID) or spellID;
local overrideSpellID = FindSpellOverrideByID(spellID) or spellID;
if sID and (sID == baseSpellID or sID == overrideSpellID) then
return btn;
elseif (actionType == "flyout" and FlyoutHasSpell(sID, spellID)) then
return btn;
......
......@@ -149,9 +149,9 @@ function TutorialLogic:Quest_ObjectivesComplete(questData)
local questID = C_QuestLog.GetQuestIDForLogIndex(i);
if questID and C_QuestLog.ReadyForTurnIn(questID) then
if questID == self.factionData.UseQuestItemData.ItemQuest then
tutorials.UseQuestItem:Finish();
TutorialQueue:NotifyDone(tutorials.UseQuestItem);
elseif questID == self.factionData.RemindUseQuestItemData.ItemQuest then
tutorials.UseQuestItem:Finish();
TutorialQueue:NotifyDone(tutorials.UseQuestItem);
elseif questID == self.factionData.UseFoodQuest then
tutorials.LowHealthWatcher:Complete();
end
......
......@@ -21,9 +21,10 @@ function TutorialQueue:Add(tutorialInstance, ...)
self:CheckQueue();
end
function TutorialQueue:NotifyDone()
if self.currentTutorial then
function TutorialQueue:NotifyDone(callingTutorial)
if self.currentTutorial and self.currentTutorial == callingTutorial then
--print("FINISH: "..self.currentTutorial.class.name);
self.currentTutorial:Finish();
self.currentTutorial.inProgress = false;
self.currentTutorial = nil;
end
......
......@@ -3426,7 +3426,8 @@ local function GetPFlag(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, ar
-- Add Blizzard Icon if this was sent by a GM/DEV
return "|TInterface\\ChatFrame\\UI-ChatIcon-Blizz:12:20:0:0:32:16:4:28:0:16|t ";
elseif specialFlag == "GUIDE" then
if DoesActivePlayerHaveMentorStatus() then
local shouldShowGuideStatus = C_PlayerMentorship.IsActivePlayerConsideredNewcomer() or (IsActivePlayerGuide() and C_ChatInfo.GetChannelRulesetForChannelID(zoneChannelID) == Enum.ChatChannelRuleset.Mentor);
if shouldShowGuideStatus then
return NPEV2_CHAT_USER_TAG_GUIDE .. " "; -- possibly unable to save global string with trailing whitespace...
end
elseif specialFlag == "NEWCOMER" then
......
......@@ -1764,7 +1764,7 @@ end
function LFGListSearchPanel_CreateGroupInstead(self)
PlaySound(SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON);
local panel = self:GetParent():GetParent();
local panel = self:GetParent():GetParent():GetParent();
LFGListEntryCreation_Show(panel:GetParent().EntryCreation, panel.preferredFilters, panel.categoryID, panel.filters);
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment