Skip to content

Commit

Permalink
- Fixed pet battle track all button under Zone Maps
Browse files Browse the repository at this point in the history
  • Loading branch information
Tercioo committed Oct 22, 2019
1 parent d931837 commit a08bd93
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 29 deletions.
40 changes: 18 additions & 22 deletions WorldQuestTracker_Core.lua
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ hooksecurefunc ("WorldMap_CreatePOI", function (index, isObjectIcon, atlasIcon)
end)
--]=]

--troca a função de click dos botões de quest no mapa da zona
--troca a fun��o de click dos bot�es de quest no mapa da zona
--[=[
hooksecurefunc ("WorldMap_GetOrCreateTaskPOI", function (index)
local button = _G ["WorldMapFrameTaskPOI" .. index]
Expand Down Expand Up @@ -497,7 +497,7 @@ WorldQuestTracker.OnToggleWorldMap = function (self)
WorldQuestTracker.LastMapID = WorldMapFrame.mapID

if (WorldMapFrame:IsShown()) then
--é a primeira vez que é mostrado?
-- a primeira vez que mostrado?

if (not WorldMapFrame.firstRun and not InCombatLockdown()) then

Expand Down Expand Up @@ -994,7 +994,7 @@ WorldQuestTracker.OnToggleWorldMap = function (self)
ToggleQuestsButton:SetPoint ("bottomleft", HordeWorldQuestButton, "topleft", 0, 1)
ToggleQuestsSummaryButton:SetPoint ("bottomleft", ToggleQuestsButton, "topleft", 0, 1)

-- õptionsfunc ~optionsfunc
-- �ptionsfunc ~optionsfunc
local options_on_click = function (_, _, option, value, value2, mouseButton)

if (option == "accessibility") then
Expand Down Expand Up @@ -1234,7 +1234,7 @@ WorldQuestTracker.OnToggleWorldMap = function (self)
--desligou o tracker do tomtom
for questID, t in pairs (WorldQuestTracker.db.profile.tomtom.uids) do
if (type (questID) == "number" and QuestMapFrame_IsQuestWorldQuest (questID)) then
--procura o botão da quest
--procura o bot�o da quest
for _, widget in ipairs (WorldQuestTracker.WorldMapWidgets) do
if (widget.questID == questID) then
WorldQuestTracker.AddQuestToTracker (widget)
Expand Down Expand Up @@ -1321,14 +1321,14 @@ WorldQuestTracker.OnToggleWorldMap = function (self)
end

if (option == "tracker_is_locked") then
--> aparece esta opção quando o tracker esta móvel
--> s� aparece esta op��o quando o tracker esta m�vel
if (WorldQuestTracker.db.profile.tracker_is_movable) then
if (value) then
--> o tracker agora esta trancado - desliga o mouse
WorldQuestTrackerScreenPanel:EnableMouse (false)
--LibWindow.MakeDraggable (WorldQuestTrackerScreenPanel)
else
--> o tracker agora está movel - liga o mouse
--> o tracker agora est� movel - liga o mouse
WorldQuestTrackerScreenPanel:EnableMouse (true)
LibWindow.MakeDraggable (WorldQuestTrackerScreenPanel)
end
Expand All @@ -1342,8 +1342,8 @@ WorldQuestTracker.OnToggleWorldMap = function (self)
end

if (value) then
--> o tracker agora é móvel
--verificar a opção se esta locked
--> o tracker agora � m�vel
--verificar a op��o se esta locked
if (LibWindow and not WorldQuestTrackerScreenPanel.RegisteredForLibWindow) then
LibWindow.RestorePosition (WorldQuestTrackerScreenPanel)
WorldQuestTrackerScreenPanel.RegisteredForLibWindow = true
Expand Down Expand Up @@ -1491,7 +1491,7 @@ WorldQuestTracker.OnToggleWorldMap = function (self)
--worldSummary.HideAnimation:Play()
end

-- ãnchorbutton ~anchorbutton
-- �nchorbutton ~anchorbutton
local on_click_anchor_button = function (self, button, param1, param2)
local anchor = self.MyObject.Anchor
local questsToTrack = {}
Expand Down Expand Up @@ -2881,7 +2881,7 @@ WorldQuestTracker.OnToggleWorldMap = function (self)
end

if (type (questInfo.rewardTexture) == "string" and questInfo.rewardTexture:find ("icon_artifactpower")) then
--forçando sempre mostrar icone vermelho
--for�ando sempre mostrar icone vermelho
line.icon:SetTexture ([[Interface\AddOns\WorldQuestTracker\media\icon_artifactpower_blueT]])

--format the artifact power amount
Expand Down Expand Up @@ -3531,7 +3531,7 @@ WorldQuestTracker.OnToggleWorldMap = function (self)
statisticsButton:SetScript ("OnClick", function() SummaryFrame.ShowAnimation:Play() end)

---------------------------------------------------------
-- ~map ~anchor ~ãnchor
-- ~map ~anchor ~�nchor
-- WorldQuestTracker.MapAnchorButton - need to remove all references of this button

---------------------------------------------------------
Expand All @@ -3543,7 +3543,7 @@ WorldQuestTracker.OnToggleWorldMap = function (self)

--build option menu

local BuildOptionsMenu = function() -- õptions ~options
local BuildOptionsMenu = function() -- �ptions ~options
GameCooltip:Preset (2)
GameCooltip:SetOption ("TextSize", 10)
GameCooltip:SetOption ("FixedWidth", 180)
Expand Down Expand Up @@ -4230,7 +4230,7 @@ WorldQuestTracker.OnToggleWorldMap = function (self)
--> party members ~party

-----------
--recursos disponíveis
--recursos dispon�veis
local xOffset = 35

local resource_GoldFrame = CreateFrame ("button", nil, WorldQuestTracker.DoubleTapFrame)
Expand Down Expand Up @@ -4346,6 +4346,7 @@ WorldQuestTracker.OnToggleWorldMap = function (self)

if (mapType == "zone") then
local qType = self.QuestType

if (qType == "gold") then
qType = QUESTTYPE_GOLD

Expand All @@ -4354,21 +4355,16 @@ WorldQuestTracker.OnToggleWorldMap = function (self)

elseif (qType == "apower") then
qType = QUESTTYPE_ARTIFACTPOWER

elseif (qType == "petbattle") then
qType = QUESTTYPE_PET

end

local widgets = WorldQuestTracker.Cache_ShownWidgetsOnZoneMap
for _, widget in ipairs (widgets) do
if (widget.QuestType == qType) then
--WorldQuestTracker.AddQuestToTracker (widget)
tinsert (questTableToTrack, widget)
--[=[
--]=]
end
end
end

if (WorldQuestTracker.db.profile.sound_enabled) then
Expand Down Expand Up @@ -4739,7 +4735,7 @@ WorldQuestTracker.OnToggleWorldMap = function (self)

--------------

--animação
--anima��o
worldFramePOIs:SetScript ("OnShow", function()
worldFramePOIs.fadeInAnimation:Play()
end)
Expand Down
15 changes: 10 additions & 5 deletions WorldQuestTracker_ZoneMap.lua
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ function WorldQuestTracker.CreateZoneWidget (index, name, parent, pinTemplate) -
button.rareSerpent:SetHeight (34 * 1.1)
button.rareSerpent:SetPoint ("CENTER", 1, -1)

-- é a sombra da serpente no fundo, pode ser na cor azul ou roxa
-- a sombra da serpente no fundo, pode ser na cor azul ou roxa
button.rareGlow = supportFrame:CreateTexture (nil, "background")
button.rareGlow:SetPoint ("CENTER", 1, -2)
button.rareGlow:SetSize (48, 48)
Expand All @@ -339,7 +339,7 @@ function WorldQuestTracker.CreateZoneWidget (index, name, parent, pinTemplate) -
button.circleBorder:SetPoint ("bottomright", supportFrame, "bottomright", 1, -1)
button.circleBorder:SetTexture ([[Interface\AddOns\WorldQuestTracker\media\border_zone_browT]])
button.circleBorder:SetTexCoord (0, 1, 0, 1)
--problema das quests de profissão com verde era a circleBorder
--problema das quests de profiss�o com verde era a circleBorder

--borda quadrada
button.squareBorder = supportFrame:CreateTexture (nil, "OVERLAY", 1)
Expand Down Expand Up @@ -555,7 +555,7 @@ function WorldQuestTracker.UpdateZoneWidgets (forceUpdate)

local index = 1

--parar a animação de loading
--parar a anima��o de loading
if (WorldQuestTracker.IsPlayingLoadAnimation()) then
WorldQuestTracker.StopLoadingAnimation()
end
Expand Down Expand Up @@ -1017,6 +1017,7 @@ function WorldQuestTracker.SetupWorldQuestButton (self, worldQuestType, rarity,
self.questTypeBlip:SetTexture (WorldQuestTracker.MapData.QuestTypeIcons [WQT_QUESTTYPE_PETBATTLE].icon)
self.questTypeBlip:SetTexCoord (unpack (WorldQuestTracker.MapData.QuestTypeIcons [WQT_QUESTTYPE_PETBATTLE].coords))
self.questTypeBlip:SetAlpha (1)
self.QuestType = QUESTTYPE_PET

elseif (worldQuestType == LE_QUEST_TAG_TYPE_PROFESSION) then

Expand All @@ -1025,7 +1026,7 @@ function WorldQuestTracker.SetupWorldQuestButton (self, worldQuestType, rarity,
else
self.questTypeBlip:Hide()
end

-- tempo restante
local timeLeft = WorldQuestTracker.GetQuest_TimeLeft (questID)
if (timeLeft < 1) then
Expand Down Expand Up @@ -1157,6 +1158,10 @@ function WorldQuestTracker.SetupWorldQuestButton (self, worldQuestType, rarity,
okay = true
end

if (worldQuestType == LE_QUEST_TAG_TYPE_PET_BATTLE) then
self.QuestType = QUESTTYPE_PET
end

if (not okay) then
if (UpdateDebug) then print ("NeedUpdate 4") end
WorldQuestTracker.ScheduleZoneMapUpdate()
Expand All @@ -1173,7 +1178,7 @@ function WorldQuestTracker.SetupWorldQuestButton (self, worldQuestType, rarity,
end
end

--agenda uma atualização se algum dado de alguma quest não estiver disponível ainda
--agenda uma atualiza��o se algum dado de alguma quest n�o estiver dispon�vel ainda
local do_zonemap_update = function (self)
WorldQuestTracker.UpdateZoneWidgets (self.IsForceUpdate)
end
Expand Down
4 changes: 2 additions & 2 deletions libs/DF/fw.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

local dversion = 153
local dversion = 154
local major, minor = "DetailsFramework-1.0", dversion
local DF, oldminor = LibStub:NewLibrary (major, minor)

Expand All @@ -21,7 +21,7 @@ SMALL_NUMBER = 0.000001
ALPHA_BLEND_AMOUNT = 0.8400251

DF.AuthorInfo = {
Name = "Tercioo",
Name = "Terciob",
Discord = "https://discord.gg/AGSzAZX",
}

Expand Down

0 comments on commit a08bd93

Please sign in to comment.