WoWInterface SVN MorgDKP

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /
    from Rev 25 to Rev 26
    ↔ Reverse comparison
  •

Rev 25 → Rev 26

trunk/MorgDKP/DKPtracker.lua
309,6 → 309,13
local POOL = self.db.account.defaults.raid
if not quiet then
DEFAULT_CHAT_FRAME:AddMessage(Note..L["bosskill"]..killTime.." and "..tostring(counter)..L["attadded"])
if id ~= 1 and self.Starttime then
local totaltime = self:TimeDiff(self.Starttime, killTime)
local min = math.floor(totaltime/60)
local sec = totaltime - (min * 60)
if sec < 10 then sec = "0"..sec end
DEFAULT_CHAT_FRAME:AddMessage(Note..string.format(L["bosstime"], min, sec))
end
self:AwardDKP(nil, value, POOL, attendees)
if self.db.account.defaults.waitaward then self:AwardWaitlistDKP(value, POOL, Boss, id) end
end
trunk/MorgDKP/plugins/morgdkp/Morgfunc.php
308,7 → 308,7
 
function CheckAlias($names, $eqdkp, $table_prefix) {
$aliases = FetchAllAliases($eqdkp, $table_prefix);
if (empty($aliases)) return $names;
if (empty($aliases) || empty($names) ) return $names;
foreach ($names as $num => $alt) {
$alt = rtrim($alt);
$alt = ucwords($alt);
trunk/MorgDKP/plugins/morgdkp/Morgaction.php
40,8 → 40,13
if (!empty($changes)) {
foreach ($changes as $change) {
$name = stripslashes(restoretext($change['name']));
$change['members'] = CheckAlias($change['members'], $change['eqdkp'], $change['prefix']);
$needchanged[] = array('addtype'=>$change['addtype'], 'name'=>$name, 'value'=>$change['value'], 'eqdkp'=>$change['eqdkp'], 'prefix'=>$change['prefix'], 'event'=>$change['event'], 'members'=>$change['members']);
$members = array();
foreach ($change['members'] as $memberkey => $member) {
$members[$memberkey] = stripslashes(restoretext($member));
}
$members = CheckAlias($members, $change['eqdkp'], $change['prefix']);
restoretext_deep($members);
$needchanged[] = array('addtype'=>$change['addtype'], 'name'=>$name, 'value'=>$change['value'], 'eqdkp'=>$change['eqdkp'], 'prefix'=>$change['prefix'], 'event'=>$change['event'], 'members'=>$members);
}
}
if (!empty($needchanged)) {
72,10 → 77,12
$attend = restoretext_deep($boss['attendees']);
$attend = stripslashes_deep($attend);
$attend = CheckAlias($attend, $raid['eqdkp'], $raid['prefix']);
asort($attend);
$attend = array_unique($attend);
$RAID[$i]['events'][$eventindex] = array('name'=>$bossname, 'note'=>$bossnote,'value'=>$boss['value'], 'time'=>$boss['time'], 'attendees'=>$attend, 'trash'=>$boss['trash'], 'index'=>$eventindex);
$eventindex++;
if (! empty($attend)) {
asort($attend);
$attend = array_unique($attend);
$RAID[$i]['events'][$eventindex] = array('name'=>$bossname, 'note'=>$bossnote,'value'=>$boss['value'], 'time'=>$boss['time'], 'attendees'=>$attend, 'trash'=>$boss['trash'], 'index'=>$eventindex);
$eventindex++;
}
}
}
$trashdone = false;
trunk/MorgDKP/MorgDKP-deDE.lua
116,6 → 116,7
bidwaroptionsdesc = "Different BidWar options.",
bossattemptmode = "Boss Attempt Mode",
bossattemptmodedesc = "Enable's a mode where a boss attempt is recorded when you die via a confirmation dialogue.",
bosstime = " took %s:%s to defeat!",
broadlead = "Broadcast Leader",
broadleaddesc = "Broadcast leader status to raid.",
changedcost = "Changed item cost from %s to %s for %s.",
154,6 → 155,8
enablerandomdesc = "Enable random rolling for items.",
enablesilentauction = "Silent Auction",
enablesilentauctiondesc = "Enable BidWar mode with only one round of bidding and no reporting to raid chat.",
enableskall = "SK Spend-all",
enableskalldesc = "Enable Suicide Kings spend all DKP.",
enablewait = "Award DKP",
enablewaitdesc = "Award DKP to the current members of the waitlist.",
enablewhisper = "Bidding Whispers",
trunk/MorgDKP/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.91"
MorgDKP.version = "6.92"
MorgDKP.commPrefix = "MorgDKP"
MorgDKP.commVersion = 6.2
 
271,6 → 271,7
leadbroadcast = nil,
restoreautozone = nil,
devmode = nil,
SKall = nil,
ignore = { [1] = "|cffa335ee|Hitem:22450:0:0:0:0:0:0:0|h[Void Crystal]|h|r", [2] = "|cffa335ee|Hitem:29434:0:0:0:0:0:0:0|h[Badge of Justice]|h|r",
[3] = "|cffa335ee|Hitem:18562:0:0:0:0:0:0:0|h[Elementium Ore]|h|r", [4] = "|cff0070dd|Hitem:22448:0:0:0:0:0:0:0|h[Small Prismatic Shard]|h|r",
[5] = "|cff0070dd|Hitem:22449:0:0:0:0:0:0:0|h[Large Prismatic Shard]|h|r", [6] = "|cff0070dd|Hitem:14344:0:0:0:0:0:0:0|h[Large Brilliant Shard]|h|r",
310,6 → 311,7
self.repliedleader = nil
self.random = {}
self.given = nil
self.Starttime = nil
self.Fonts = {
['GameFontNormal'] = {['Font'] = { GameFontNormal:GetFont() }},
['GameFontNormalSmall'] = {['Font'] = { GameFontNormalSmall:GetFont() }},
338,6 → 340,7
self:RegisterEvent("CHAT_MSG_MONSTER_YELL", "HostileYell")
self:RegisterEvent("CHAT_MSG_MONSTER_EMOTE", "HostileEmote")
self:RegisterEvent("GUILD_ROSTER_UPDATE", "GuildUpdate")
self:RegisterEvent("PLAYER_REGEN_DISABLED", "StartCombat")
self:RegisterComm(self.commPrefix, "GUILD", "OnCommReceive")
self:RegisterComm(self.commPrefix, "GROUP", "OnCommReceive")
self:HookStuff()
366,6 → 369,11
if ON then self:CancelScheduledEvent("MorgDKP_Award") self:Print("AWARD OFF") end
end
 
function MorgDKP:StartCombat()
if not self.db.account.defaults.InRaid then return end
self.Starttime = date("%m/%d/%y %H:%M:%S")
end
 
function MorgDKP:IsRaided()
if not UnitInRaid("player") then
DEFAULT_CHAT_FRAME:AddMessage(L["needraid"])
779,6 → 787,7
["prefix"] = self.db.account.defaults.eqDKP[POOL].prefix
}
)
if self.db.account.defaults.SKall then itempoints = points end
points = points - itempoints
self.db.account.info[player][POOL].points = points
self.db.account.info[player][POOL].spent = self.db.account.info[player][POOL].spent + itempoints
trunk/MorgDKP/MorgDKP.toc
1,6 → 1,6
## Interface: 20400
## Author: Morgalm & Fryguy
## Title: MorgDKP - |cffffffffv|r|cff00ff006.91|r
## Title: MorgDKP - |cffffffffv|r|cff00ff006.92|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/MorgDKP/MorgDKP-enUS.lua
35,6 → 35,7
bossattemptmode = "Boss Attempt Mode",
bossattemptmodedesc = "Enable's a mode where a boss attempt is recorded when you die via a confirmation dialogue.",
bosskill = " recorded at ",
bosstime = " defeated in %s:%s!",
broadlead = "Broadcast Leader",
broadleaddesc = "Broadcast leader status to raid.",
bwarsteps = "BidWar Step",
91,6 → 92,8
enablerelationaldkpdesc = "Enable RDKP for calculating the earned/spent dkp ratio.",
enablesilentauction = "Silent Auction",
enablesilentauctiondesc = "Enable BidWar mode with only one round of bidding and no reporting to raid chat.",
enableskall = "SK Spend-all",
enableskalldesc = "Enable Suicide Kings spend all DKP.",
enablewait = "Award DKP",
enablewaitdesc = "Award DKP to the current members of the waitlist.",
enablewhisper = "Whisper System",
trunk/MorgDKP/MorgDKPOptions.lua
341,6 → 341,18
disabled = function() return db.defaults.random or db.defaults.zerosum or db.defaults.bidwar end,
order = 118
},
skall = {
type = "toggle",
name = L["enableskall"],
desc = L["enableskalldesc"],
get = function()
return db.defaults.SKall
end,
set = function(v)
db.defaults.SKall = v
end,
order = 120
},
bossattempt = {
type = "toggle",
name = L["bossattemptmode"],
352,7 → 364,7
db.defaults.attemptmode = v
self:TogglePlayerDies(db.defaults.attemptmode)
end,
order = 120
order = 122
}
}
}
600,6 → 612,18
disabled = function() return db.defaults.random or db.defaults.zerosum or db.defaults.bidwar end,
order = 210
},
skall = {
type = "toggle",
name = L["enableskall"],
desc = L["enableskalldesc"],
get = function()
return db.defaults.SKall
end,
set = function(v)
db.defaults.SKall = v
end,
order = 120
},
},
},
otherO = {