From 170f27fea8cc8e18b3b08cda4b446f063f5bfe87 Mon Sep 17 00:00:00 2001 From: Steven Jackson Date: Thu, 17 Jul 2014 20:43:36 -0500 Subject: [PATCH] forgot archy --- .../SVUI/packages/laborer/common/archaeology.lua | 22 +++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/Interface/AddOns/SVUI/packages/laborer/common/archaeology.lua b/Interface/AddOns/SVUI/packages/laborer/common/archaeology.lua index 228cb92..f1da0d2 100644 --- a/Interface/AddOns/SVUI/packages/laborer/common/archaeology.lua +++ b/Interface/AddOns/SVUI/packages/laborer/common/archaeology.lua @@ -228,8 +228,7 @@ EVENT HANDLER ]]-- do local SURVEYCDFONT = SuperVillain.Media.font.numbers - local SURVEYRED = {0,1,1} - local SURVEYGRN = {1,0.5,0} + local SURVEYRED = {0,0.5,1} local last = 0 local time = 3 @@ -239,17 +238,24 @@ do local ArchCanSurvey, ArchWillSurvey = false, false; SurveyCooldown:SetPoint("CENTER", 0, -80) - SurveyCooldown:SetSize(40, 40) + SurveyCooldown:SetSize(150, 150) SurveyCooldown.text = SurveyCooldown:CreateFontString(nil, "OVERLAY") - SurveyCooldown.text:SetFont(SURVEYCDFONT, 99, "OUTLINE") + SurveyCooldown.text:SetAllPoints(SurveyCooldown) + SurveyCooldown.text:SetFont(SURVEYCDFONT, 150, "OUTLINE") SurveyCooldown.text:SetTextColor(0,1,0.12,0.5) SurveyCooldown.text:SetPoint("CENTER") + SurveyCooldown:SetScale(1.5) local Arch_OnEvent = function(self, event, ...) if(InCombatLockdown() or not archSpell) then return end - if(ArchCanSurvey and (event == "ARCHAEOLOGY_SURVEY_CAST" or event == "CURRENCY_DISPLAY_UPDATE")) then + if(event == "CURRENCY_DISPLAY_UPDATE" or event == "CHAT_MSG_SKILL" or event == "ARTIFACT_COMPLETE") then + local msg = GetTitleAndSkill() + MOD.TitleWindow:Clear() + MOD.TitleWindow:AddMessage(msg) + end + if(CanScanResearchSite() and (event == "CURRENCY_DISPLAY_UPDATE")) then UpdateArtifactCache() - elseif(event == "ARTIFACT_COMPLETE" or event == "ARTIFACT_DIG_SITE_UPDATED") then + elseif(event == "ARCHAEOLOGY_SURVEY_CAST" or event == "ARTIFACT_COMPLETE" or event == "ARTIFACT_DIG_SITE_UPDATED") then UpdateArtifactCache() elseif(event == "ARTIFACT_HISTORY_READY" or event == "ARTIFACT_DIGSITE_COMPLETE") then NEEDS_UPDATE = true @@ -292,7 +298,7 @@ do self.text:SetText("") time = 3 end - self.text:SetTextColor(SURVEYRED[time],SURVEYGRN[time],0.12,0.5) + self.text:SetTextColor(SURVEYRED[time],1,0.12,0.8) last = 0 end end; @@ -319,6 +325,8 @@ do ArchEventHandler:RegisterEvent("CURRENCY_DISPLAY_UPDATE") ArchEventHandler:RegisterEvent("ARCHAEOLOGY_SURVEY_CAST") + + ArchEventHandler:RegisterEvent("CHAT_MSG_SKILL") ArchEventHandler:SetScript("OnEvent", Arch_OnEvent) if(playerRace ~= "Dwarf") then -- 1.7.9.5