WoWInterface SVN MorgDKP

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /
    from Rev 18 to Rev 19
    ↔ Reverse comparison
  •

Rev 18 → Rev 19

trunk/MorgDKPOptions.lua
401,10 → 401,10
name = L["enablemlde"],
desc = L["enablemldedesc"],
get = function()
return MLmode
return self.MLmode
end,
set = function(v)
MLmode = v
self.MLmode = v
end,
disabled = "~IsActive",
order = 3
trunk/MorgDKP.xml
2541,6 → 2541,7
</OnLeave>
<OnClick>
MorgDKP.db.account.defaults.dkpaward = not MorgDKP.db.account.defaults.dkpaward
MorgDKP:ToggleDKPAward()
MorgDKP:UpdateOptionFrame()
</OnClick>
</Scripts>
trunk/BidQuery.lua
533,7 → 533,10
Lootwinner = nil
if self.db.account.defaults.bidwar then
if self.db.account.defaults.justenough and #self.querytooltips[dkpitem] > 1 then
if self.querytooltips[dkpitem][2][4] > 0 then itempoints = self.querytooltips[dkpitem][2][4] end
if self.querytooltips[dkpitem][2][4] > 0 then
itempoints = self.querytooltips[dkpitem][2][4]
self.querytooltips[dkpitem][1][4] = itempoints
end
else itempoints = self.querytooltips[dkpitem][1][4]
end
self.db.account.items[dkpitem].points = itempoints
trunk/DKPtracker.lua
62,7 → 62,7
local raidID = tbl.unitid
local _, race = UnitRace(raidID)
local level = UnitLevel(raidID)
local guild = GetGuildInfo(raidID)
local guild, _, _ = GetGuildInfo(raidID)
local class = BC[string.upper(string.sub(tbl.class,1,1))..string.lower(string.sub(tbl.class,2,-1))]
if name and name ~= "" and name ~= "UNKNOWN" then
if not attendees[name] then attendees[name] = { } end
370,7 → 370,7
if not name then
if oldclass ~= "PET" and class ~= "PET" then
if self.oldname ~= oldname then
if name ~= UnitName("player") and not UnitCanAttack("player", "raid"..oldunitid) then
if name ~= UnitName("player") and not UnitCanAttack("player", oldunitid) then
if not self.db.account.raidlog[self.db.account.defaults.raidnum].leave then self.db.account.raidlog[self.db.account.defaults.raidnum].leave = { } end
self.db.account.raidlog[self.db.account.defaults.raidnum].leave[oldname] = ttime
DEFAULT_CHAT_FRAME:AddMessage(oldname..L["leftraid"]..ttime)
trunk/MorgDKPFu.lua
145,7 → 145,7
function MorgDKPFu:OnClick()
if MorgDKP:IsActive() then
if IsAltKeyDown() then
MLmode = not MLmode
MorgDKP.MLmode = not MorgDKP.MLmode
self:Update()
elseif IsShiftKeyDown() then
MorgDKP:ListDKP("All")
172,7 → 172,7
local dkpstatus = L["normal"]
local Quality = {[1] = "|c009d9d9dPoor|r", [2] = "|c00ffffffCommon|r", [3] = "|c001eff00Uncommon|r", [4] = "|c000070ddRare|r", [5] = "|c00a335eeEpic|r", [6] = "|c00ff8000Legendary|r", [7] = "|c00e6cc80Artifact|r"}
if not inraid or not MorgDKP.db.account.defaults.mlooter then colortog = 1 end
if MLmode then MLstatustext = L["statuson"] end
if MorgDKP.MLmode then MLstatustext = L["statuson"] end
if MorgDKP.db.account.defaults.relational and MorgDKP.db.account.defaults.zerosum then dkpstatus = L["enablerelationaldkp"] .. " & " .. L["enablezerosum"]
elseif MorgDKP.db.account.defaults.relational then dkpstatus = L["enablerelationaldkp"]
elseif MorgDKP.db.account.defaults.zerosum then dkpstatus = L["enablezerosum"]
trunk/MorgDKP.lua
16,7 → 16,7
 
MorgDKP = AceLibrary("AceAddon-2.0"):new("AceEvent-2.0", "AceHook-2.1", "AceConsole-2.0","AceComm-2.0", "AceDB-2.0")
 
MorgDKP.version = "6.87"
MorgDKP.version = "6.88"
MorgDKP.commPrefix = "MorgDKP"
MorgDKP.commVersion = 6.2
 
304,10 → 304,8
self.origitempoints = { }
self.queryneeded = nil
self.killed = { }
MLmode = true
raidmembers = { }
Raidchanged = nil
self.hasitem = nil
self.MLmode = true
self.hasitem = nil
self.requestsync = nil
self.repliedleader = nil
self.random = {}
320,11 → 318,9
self:ConvertDB()
self.db.account.defaults.dbupdated = 3
end
if MorgDKP_Items then StaticPopup_Show ("MorgImport") end
if MorgDKP_Items then StaticPopup_Show ("MorgImport") end
self:ToggleDKPAward()
if UnitInRaid("player") and self.db.account.defaults.InRaid then
if self.db.account.defaults.dkpaward and not self:IsEventScheduled("MorgDKP_Award") then
self:ScheduleRepeatingEvent("MorgDKP_Award", self.RecurrentReward, self.db.account.defaults.dkpsched, self )
end
if not self:IsEventScheduled("MorgDKP_Attendance") then self:ScheduleRepeatingEvent("MorgDKP_Attendance", self.CheckAttendance, 60, self ) end
end
if self.db.account.defaults.restoreautozone then
359,6 → 355,16
elseif self:IsEventRegistered("PLAYER_DEAD") then self:UnregisterEvent("PLAYER_DEAD") end
end
 
function MorgDKP:ToggleDKPAward()
local ON = self:IsEventScheduled("MorgDKP_Award")
if self.db.account.defaults.InRaid and self.db.account.defaults.dkpaward then
if not ON then self:ScheduleRepeatingEvent("MorgDKP_Award", self.RecurrentReward, self.db.account.defaults.dkpsched, self ) end
self:Print("AWARD ON")
return
end
if ON then self:CancelScheduledEvent("MorgDKP_Award") self:Print("AWARD OFF") end
end
 
function MorgDKP:IsRaided()
if not UnitInRaid("player") then
DEFAULT_CHAT_FRAME:AddMessage(L["needraid"])
450,7 → 456,7
function MorgDKP:GiveBOE(id, link)
if not self.db.account.items[id] then DEFAULT_CHAT_FRAME:AddMessage(L["noitem"]); return end
if not charstring then DEFAULT_CHAT_FRAME:AddMessage(L["validname"]) return end
if MLmode and (charstring == self.db.account.defaults.mlooter or charstring == self.db.account.defaults.disenchanter) then
if self.MLmode and (charstring == self.db.account.defaults.mlooter or charstring == self.db.account.defaults.disenchanter) then
DEFAULT_CHAT_FRAME:AddMessage(L["nolootrec"])
return
end
677,7 → 683,7
itemCount = 1
end
-- Make sure there is a link
if MLmode and (sPlayer == self.db.account.defaults.mlooter or sPlayer == self.db.account.defaults.disenchanter) and not self.given then return
if self.MLmode and (sPlayer == self.db.account.defaults.mlooter or sPlayer == self.db.account.defaults.disenchanter) and not self.given then return
else self.given = nil end
if not MorgDKP:CheckRaid(sPlayer) then return end
if sLink and sPlayer then
trunk/MorgDKP.toc
1,6 → 1,6
## Interface: 20400
## Author: Morg & Fryguy
## Title: MorgDKP - |cffffffffv|r|cff00ff006.87|r
## Title: MorgDKP - |cffffffffv|r|cff00ff006.88|r
## Notes: Inspects all members of raid and saves in database, as well as lists people's dkp values
## DefaultState: 1
## SavedVariables: MorgDKPDB, MorgDKPFuBarDB
trunk/RaidFunctions.lua
368,16 → 368,16
DEFAULT_CHAT_FRAME:AddMessage(L["badformat"])
return
end
local update = self:GetServerTime()
local POOL = self:GetPool(self.raidid)
local killtime = date("%m/%d/%y %H:%M:%S")
table.insert(self.db.account.raidlog[self.raidid].bosskills, {
["name"] = name,
["note"] = note,
["time"] = update,
["time"] = killtime,
["attendees"] = attendees,
["value"] = value,
["trash"] = 0})
DEFAULT_CHAT_FRAME:AddMessage(name..L["bosskill"]..update.." and "..tostring(#attendees)..L["attadded"])
DEFAULT_CHAT_FRAME:AddMessage(name..L["bosskill"]..killtime.." and "..tostring(#attendees)..L["attadded"])
if value ~= 0 then self:AwardDKP(nil, value, POOL, attendees) end
self:ClearRaidFrame()
self:ChangeRaidsFrame(self.raidid)
829,6 → 829,7
end
 
function MorgDKP:DeleteCurrentDKPChange()
self:AwardDKP(0, self.db.account.raidlog.dkpevents[self.editpool][self.editevent].value, self.editpool, self.db.account.raidlog.dkpevents[self.editpool][self.editevent].members)
table.remove(self.db.account.raidlog.dkpevents[self.editpool], self.editevent)
MorgDKP_RaidsPage3Members:Hide()
MorgDKP_RaidsPage3Value:SetText("0")
839,8 → 840,10
function MorgDKP:AddDKPChange()
if self.addtype == "individual" then return end
local attendees = self:AttendtoArray(MorgDKP_RaidsPage3Members)
local value = MorgDKP_RaidsPage3Value:GetText()
self:AddMemberData(self.addtype, attendees)
MorgDKP_RaidsPage3Members:SetText("")
self:AwardDKP(nil, value, self.editpool, attendees)
self:ChangeDKPFrame(self.editpool)
end