WoWInterface SVN UrbanAchiever
Compare Revisions
- This comparison shows the changes necessary to convert path
/trunk
- from Rev 24 to Rev 25
- ↔ Reverse comparison
Rev 24 → Rev 25
Main.lua
1366,12 → 1366,14
| if self.masterList[id].isAchievement == false then |
| --Statistic |
| self.frame.display:Hide() |
| --[[self.frame.display.icon:Hide() |
| --self.frame.display:Hide() |
| self.frame.display.icon:Hide() |
| self.frame.display.icon:SetWidth(1) |
| self.frame.display.shield:Hide() |
| self.frame.display.reward:SetText("") |
| self.frame.display.points:SetText("") |
| self.frame.display.desc:SetText("") |
| self.frame.display.name:SetJustifyH("MIDDLE") |
| for a = 1, #self.frame.display.criteriaButtons do |
| self.frame.display.criteriaButtons[a]:Hide() |
1379,17 → 1381,19
| self.frame.display.criteriaButtons[a].bar:Hide() |
| end |
| self.frame.display.criteriaButtons[1]:Show() |
| self.frame.display.criteriaButtons[1].text:SetText(GetStatistic(id)) |
| --self.frame.display.criteriaButtons[1]:Show() |
| self.frame.display.reward:SetText(GetStatistic(id)) |
| if self.isComparing then |
| self.frame.display.criteriaButtons[2]:Show() |
| self.frame.display.criteriaButtons[2].text:SetText(GetComparisonStatistic(id)) |
| --self.frame.display.criteriaButtons[2]:Show() |
| self.frame.display.compareDate:SetText(GetComparisonStatistic(id)) |
| end |
| ]]-- |
| else |
| --Achievement |
| self.frame.display.icon:Show() |
| self.frame.display.icon:SetWidth(64) |
| self.frame.display.shield:Show() |
| self.frame.display.name:SetJustifyH("LEFT") |
| if completed then completed = month .. "/" .. day .. "/0" .. year else completed = "" end |
1417,9 → 1421,8
| self.frame.display.compareDate:SetText(string.format("%s Completed: %d/%d/0%d", self.comparisonUnitName, m or -1, d or -1, y or -1)) |
| end |
| end |
| self:RefreshCriteriaButtons() |
| end |
| self:RefreshCriteriaButtons() |
| end |
| ------------------------------------------------------------- |
1450,65 → 1453,67
| criteriaName, criteriaType, criteriaCompleted, criteriaQuantity, criteriaReqQuantity,icon ,criteriaFlags, criteriaAssetID, quantityStr = |
| GetAchievementCriteriaInfo(self.currentAch, a) |
| if criteriaCompleted then |
| str = "|CFF00FF00" |
| else |
| str = "|CFF808080" |
| end |
| str = str .. (criteriaName or "no name") |
| if self.isComparing and not compDone then |
| --compDone = GetAchievementComparisonInfo(self.currentAch,1) |
| compCriteriaText,comparisonComplete = GetCriteriaComparisonInfo(self.currentAch, a, 1) |
| self.frame.display.criteriaButtons[buttonNum].comparison:Show() |
| offset = offset + 16 |
| if comparisonComplete then |
| self.frame.display.criteriaButtons[buttonNum].comparison:SetTexture("Interface\\RaidFrame\\ReadyCheck-Ready") |
| if criteriaType then --Some Achievements seem to throw out the wrong number of criteria, causing errors. |
| if criteriaCompleted then |
| str = "|CFF00FF00" |
| else |
| self.frame.display.criteriaButtons[buttonNum].comparison:SetTexture("Interface\\RaidFrame\\ReadyCheck-NotReady") |
| str = "|CFF808080" |
| end |
| end |
| if criteriaType == 8 then |
| --Its a meta achievement |
| _,_,_,_,_,_,_,_,_,icon = GetAchievementInfo(criteriaAssetID) |
| self.frame.display.criteriaButtons[buttonNum].icon:SetTexture(icon) |
| self.frame.display.criteriaButtons[buttonNum].icon:Show() |
| offset = offset + 16 |
| self.frame.display.criteriaButtons[buttonNum]:SetID(criteriaAssetID) |
| elseif (bit.band(criteriaFlags, ACHIEVEMENT_CRITERIA_PROGRESS_BAR) == ACHIEVEMENT_CRITERIA_PROGRESS_BAR) then |
| --Its a progress bar |
| offset = 1 |
| self.frame.display.criteriaButtons[buttonNum].comparison:Hide() |
| str = "" |
| --self.frame.display.criteriaButtons[buttonNum]:Hide() |
| str = str .. criteriaName -- .. "= " .. criteriaQuantity .. " (" .. criteriaAssetID .. ")" |
| self.frame.display.criteriaButtons[buttonNum].bar:Show() |
| self.frame.display.criteriaButtons[buttonNum].bar:SetMinMaxValues(0,criteriaReqQuantity) |
| self.frame.display.criteriaButtons[buttonNum].bar:SetValue(criteriaQuantity) |
| self.frame.display.criteriaButtons[buttonNum].bar.text:SetText(quantityStr) |
| if self.isComparing and compCriteriaText then |
| self.frame.display.criteriaButtons[buttonNum].compareBar:Show() |
| self.frame.display.criteriaButtons[buttonNum].compareBar:SetMinMaxValues(0, criteriaReqQuantity) |
| if compDone then |
| self.frame.display.criteriaButtons[buttonNum].compareBar:SetValue(criteriaReqQuantity) |
| self.frame.display.criteriaButtons[buttonNum].compareBar.text:SetText(criteriaReqQuantity .. " / " .. criteriaReqQuantity) |
| if self.isComparing and not compDone then |
| --compDone = GetAchievementComparisonInfo(self.currentAch,1) |
| compCriteriaText,comparisonComplete = GetCriteriaComparisonInfo(self.currentAch, a, 1) |
| self.frame.display.criteriaButtons[buttonNum].comparison:Show() |
| offset = offset + 16 |
| if comparisonComplete then |
| self.frame.display.criteriaButtons[buttonNum].comparison:SetTexture("Interface\\RaidFrame\\ReadyCheck-Ready") |
| else |
| local _,_,min, max = string.find(compCriteriaText, "(%d+)/(%d+)") |
| self.frame.display.criteriaButtons[buttonNum].compareBar:SetValue(min) |
| self.frame.display.criteriaButtons[buttonNum].compareBar.text:SetText(min .. " / " .. criteriaReqQuantity) |
| self.frame.display.criteriaButtons[buttonNum].comparison:SetTexture("Interface\\RaidFrame\\ReadyCheck-NotReady") |
| end |
| end |
| if criteriaType == CRITERIA_TYPE_ACHIEVEMENT then |
| --Its a meta achievement |
| _,_,_,_,_,_,_,_,_,icon = GetAchievementInfo(criteriaAssetID) |
| self.frame.display.criteriaButtons[buttonNum].icon:SetTexture(icon) |
| self.frame.display.criteriaButtons[buttonNum].icon:Show() |
| offset = offset + 16 |
| self.frame.display.criteriaButtons[buttonNum]:SetID(criteriaAssetID) |
| elseif (bit.band(criteriaFlags, ACHIEVEMENT_CRITERIA_PROGRESS_BAR) == ACHIEVEMENT_CRITERIA_PROGRESS_BAR) then |
| --Its a progress bar |
| offset = 1 |
| self.frame.display.criteriaButtons[buttonNum].comparison:Hide() |
| str = "" |
| --self.frame.display.criteriaButtons[buttonNum]:Hide() |
| self.frame.display.criteriaButtons[buttonNum].bar:Show() |
| self.frame.display.criteriaButtons[buttonNum].bar:SetMinMaxValues(0,criteriaReqQuantity) |
| self.frame.display.criteriaButtons[buttonNum].bar:SetValue(criteriaQuantity) |
| self.frame.display.criteriaButtons[buttonNum].bar.text:SetText(quantityStr) |
| if self.isComparing and compCriteriaText then |
| self.frame.display.criteriaButtons[buttonNum].compareBar:Show() |
| self.frame.display.criteriaButtons[buttonNum].compareBar:SetMinMaxValues(0, criteriaReqQuantity) |
| if compDone then |
| self.frame.display.criteriaButtons[buttonNum].compareBar:SetValue(criteriaReqQuantity) |
| self.frame.display.criteriaButtons[buttonNum].compareBar.text:SetText(criteriaReqQuantity .. " / " .. criteriaReqQuantity) |
| else |
| local _,_,min, max = string.find(compCriteriaText, "(%d+)/(%d+)") |
| self.frame.display.criteriaButtons[buttonNum].compareBar:SetValue(min) |
| self.frame.display.criteriaButtons[buttonNum].compareBar.text:SetText(min .. " / " .. criteriaReqQuantity) |
| end |
| end |
| end |
| self.frame.display.criteriaButtons[buttonNum].text:SetText(str) |
| self.frame.display.criteriaButtons[buttonNum].offset:SetWidth(offset) |
| buttonNum = buttonNum + 1 |
| end |
| self.frame.display.criteriaButtons[buttonNum].text:SetText(str) |
| self.frame.display.criteriaButtons[buttonNum].offset:SetWidth(offset) |
| buttonNum = buttonNum + 1 |
| end |
| end |
1856,7 → 1861,12
| end |
| local height = 20 |
| local id, name,_,_,_,_,_,_,_,icon = GetAchievementInfo(id) |
| local id, name, _,completed, _,_,_,_,_,icon = GetAchievementInfo(id) |
| --If the achievement is completed, color it green. |
| if completed then |
| name = "|Cff00ff00" .. name |
| end |
| self.tracker.achievements[num].icon:SetNormalTexture(icon) |
| self.tracker.achievements[num].name:SetText(name) |
| self.tracker.achievements[num].bar:Hide() |
WoWInterface
AddOn Sites
© 2004 - 2022 MMOUI
vBulletin © 2024, Jelsoft Enterprises Ltd