Skip to content

Commit

Permalink
tbc prep finalization
Browse files Browse the repository at this point in the history
Added TBC encounters
Added TBC zones
Fixed Class graph and filters
Changed version in header
Taidtuskecyh authored and Taidtuskecyh committed May 27, 2021
1 parent 63d5120 commit 52104b1
Showing 17 changed files with 873 additions and 81 deletions.
18 changes: 9 additions & 9 deletions CommunityDKP.lua
Original file line number Diff line number Diff line change
@@ -12,12 +12,12 @@ function CommDKP_RestoreFilterOptions() -- restores default filter selections
core.WorkingTable = CopyTable(CommDKP:GetTable(CommDKP_DKPTable, true))
core.CurView = "all"
core.CurSubView = "all"
for i=1, 9 do
for i=1, 10 do
CommDKP.ConfigTab1.checkBtn[i]:SetChecked(true)
end
CommDKP.ConfigTab1.checkBtn[10]:SetChecked(false)
CommDKP.ConfigTab1.checkBtn[11]:SetChecked(false)
CommDKP.ConfigTab1.checkBtn[12]:SetChecked(false)
CommDKP.ConfigTab1.checkBtn[13]:SetChecked(false)
CommDKPFilterChecks(CommDKP.ConfigTab1.checkBtn[1])
end

@@ -116,7 +116,7 @@ function CommDKP:FilterDKPTable(sort, reset) -- filters core.WorkingTab
end
end

if CommDKP.ConfigTab1.checkBtn[11]:GetChecked() then
if CommDKP.ConfigTab1.checkBtn[12]:GetChecked() then
local guildSize,_,_ = GetNumGuildMembers();
for i=1, guildSize do
local name,_,_,_,_,_,_,_,online = GetGuildRosterInfo(i)
@@ -129,22 +129,22 @@ function CommDKP:FilterDKPTable(sort, reset) -- filters core.WorkingTab
end
end
if(core.classFiltered[parentTable[k]["class"]] == true) and searchFilter == true then
if CommDKP.ConfigTab1.checkBtn[10]:GetChecked() or CommDKP.ConfigTab1.checkBtn[12]:GetChecked() then
if CommDKP.ConfigTab1.checkBtn[11]:GetChecked() or CommDKP.ConfigTab1.checkBtn[13]:GetChecked() then
for i=1, 40 do
tempName,_,_,_,_,tempClass = GetRaidRosterInfo(i)
if tempName and tempName == v.player and CommDKP.ConfigTab1.checkBtn[10]:GetChecked() then
if tempName and tempName == v.player and CommDKP.ConfigTab1.checkBtn[11]:GetChecked() then
tinsert(core.WorkingTable, v)
elseif tempName and tempName == v.player and CommDKP.ConfigTab1.checkBtn[12]:GetChecked() then
elseif tempName and tempName == v.player and CommDKP.ConfigTab1.checkBtn[13]:GetChecked() then
InRaid = true;
end
end
else
if ((CommDKP.ConfigTab1.checkBtn[11]:GetChecked() and IsOnline) or not CommDKP.ConfigTab1.checkBtn[11]:GetChecked()) then
if ((CommDKP.ConfigTab1.checkBtn[12]:GetChecked() and IsOnline) or not CommDKP.ConfigTab1.checkBtn[12]:GetChecked()) then
tinsert(core.WorkingTable, v)
end
end
if CommDKP.ConfigTab1.checkBtn[12]:GetChecked() and InRaid == false then
if CommDKP.ConfigTab1.checkBtn[11]:GetChecked() then
if CommDKP.ConfigTab1.checkBtn[13]:GetChecked() and InRaid == false then
if CommDKP.ConfigTab1.checkBtn[12]:GetChecked() then
if IsOnline then
tinsert(core.WorkingTable, v)
end
2 changes: 1 addition & 1 deletion CommunityDKP.toc
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
## Title: |cff9900ffCommunity|r |cff595959DKP|r
## Author: Vapok-BloodsailBuccaneers
## Notes: Feature-rich DKP Management Tool
## Version: 3.2.5
## Version: 3.2.7
## DefaultState: enabled
## SavedVariables: CommDKP_DB, CommDKP_Loot, CommDKP_DKPTable, CommDKP_DKPHistory, CommDKP_MinBids, CommDKP_MaxBids, CommDKP_Whitelist, CommDKP_Standby, CommDKP_Archive, CommDKP_Profiles

59 changes: 30 additions & 29 deletions ConfigMenuTabs.lua
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ end

function CommDKPFilterChecks(self) -- sets/unsets check boxes in conjunction with "All" button, then runs CommDKP:FilterDKPTable() above
local verifyCheck = true; -- switches to false if the below loop finds anything unchecked
if (self:GetChecked() == false and not CommDKP.ConfigTab1.checkBtn[10]) then
if (self:GetChecked() == false and not CommDKP.ConfigTab1.checkBtn[11]) then
core.CurView = "limited"
core.CurSubView = "raid"
CommDKP.ConfigTab1.checkBtn[9]:SetChecked(false);
@@ -36,9 +36,9 @@ function CommDKPFilterChecks(self) -- sets/unsets check boxes in conjunc
end
end
if (verifyCheck == true) then
CommDKP.ConfigTab1.checkBtn[9]:SetChecked(true);
CommDKP.ConfigTab1.checkBtn[10]:SetChecked(true);
else
CommDKP.ConfigTab1.checkBtn[9]:SetChecked(false);
CommDKP.ConfigTab1.checkBtn[10]:SetChecked(false);
end
for k,v in pairs(core.classes) do
if (CommDKP.ConfigTab1.checkBtn[k]:GetChecked() == true) then
@@ -169,17 +169,17 @@ function CommDKP:ConfigMenuTabs()
CommDKP.ConfigTab1.checkBtn = checkBtn;

-- Create CheckBoxes
for i=1, 10 do
for i=1, 11 do
CommDKP.ConfigTab1.checkBtn[i] = CreateFrame("CheckButton", nil, CommDKP.ConfigTab1, "UICheckButtonTemplate");
if i <= 9 then CommDKP.ConfigTab1.checkBtn[i]:SetChecked(true) else CommDKP.ConfigTab1.checkBtn[i]:SetChecked(false) end;
if i <= 10 then CommDKP.ConfigTab1.checkBtn[i]:SetChecked(true) else CommDKP.ConfigTab1.checkBtn[i]:SetChecked(false) end;
CommDKP.ConfigTab1.checkBtn[i]:SetID(i)
if i <= 8 then
if i <= 9 then
CommDKP.ConfigTab1.checkBtn[i].text:SetText("|cff5151de"..API_CLASSES[core.classes[i]].."|r");
end
if i==9 then
if i==10 then
CommDKP.ConfigTab1.checkBtn[i]:SetScript("OnClick",
function()
for j=1, 9 do
for j=1, 10 do
if (checkAll) then
CommDKP.ConfigTab1.checkBtn[j]:SetChecked(false)
else
@@ -197,7 +197,7 @@ function CommDKP:ConfigMenuTabs()
core.classFiltered[v] = false;
end
end
elseif i==10 then
elseif i==11 then
CommDKP.ConfigTab1.checkBtn[i]:SetScript("OnClick", function(self)
CommDKP.ConfigTab1.checkBtn[12]:SetChecked(false);
CommDKPFilterChecks(self)
@@ -209,36 +209,37 @@ function CommDKP:ConfigMenuTabs()
end

-- Class Check Buttons:
CommDKP.ConfigTab1.checkBtn[1]:SetPoint("TOPLEFT", CommDKP.ConfigTab1, "TOPLEFT", 85, -70);
CommDKP.ConfigTab1.checkBtn[1]:SetPoint("TOPLEFT", CommDKP.ConfigTab1, "TOPLEFT", 60, -70);
CommDKP.ConfigTab1.checkBtn[2]:SetPoint("TOPLEFT", CommDKP.ConfigTab1.checkBtn[1], "TOPRIGHT", 50, 0);
CommDKP.ConfigTab1.checkBtn[3]:SetPoint("TOPLEFT", CommDKP.ConfigTab1.checkBtn[2], "TOPRIGHT", 50, 0);
CommDKP.ConfigTab1.checkBtn[4]:SetPoint("TOPLEFT", CommDKP.ConfigTab1.checkBtn[3], "TOPRIGHT", 50, 0);
CommDKP.ConfigTab1.checkBtn[5]:SetPoint("TOPLEFT", CommDKP.ConfigTab1.checkBtn[1], "BOTTOMLEFT", 0, -10);
CommDKP.ConfigTab1.checkBtn[6]:SetPoint("TOPLEFT", CommDKP.ConfigTab1.checkBtn[2], "BOTTOMLEFT", 0, -10);
CommDKP.ConfigTab1.checkBtn[7]:SetPoint("TOPLEFT", CommDKP.ConfigTab1.checkBtn[3], "BOTTOMLEFT", 0, -10);
CommDKP.ConfigTab1.checkBtn[8]:SetPoint("TOPLEFT", CommDKP.ConfigTab1.checkBtn[4], "BOTTOMLEFT", 0, -10);

CommDKP.ConfigTab1.checkBtn[9]:SetPoint("BOTTOMRIGHT", CommDKP.ConfigTab1.checkBtn[2], "TOPLEFT", 50, 0);
CommDKP.ConfigTab1.checkBtn[9].text:SetText("|cff5151de"..L["ALLCLASSES"].."|r");
CommDKP.ConfigTab1.checkBtn[10]:SetPoint("TOPLEFT", CommDKP.ConfigTab1.checkBtn[5], "BOTTOMLEFT", 0, 0);
CommDKP.ConfigTab1.checkBtn[10].text:SetText("|cff5151de"..L["INPARTYRAID"].."|r"); -- executed in filterDKPTable (CommunityDKP.lua)
CommDKP.ConfigTab1.checkBtn[5]:SetPoint("TOPLEFT", CommDKP.ConfigTab1.checkBtn[4], "TOPRIGHT", 50, 0);
CommDKP.ConfigTab1.checkBtn[6]:SetPoint("TOPLEFT", CommDKP.ConfigTab1.checkBtn[1], "BOTTOMLEFT", 0, -10);
CommDKP.ConfigTab1.checkBtn[7]:SetPoint("TOPLEFT", CommDKP.ConfigTab1.checkBtn[2], "BOTTOMLEFT", 0, -10);
CommDKP.ConfigTab1.checkBtn[8]:SetPoint("TOPLEFT", CommDKP.ConfigTab1.checkBtn[3], "BOTTOMLEFT", 0, -10);
CommDKP.ConfigTab1.checkBtn[9]:SetPoint("TOPLEFT", CommDKP.ConfigTab1.checkBtn[4], "BOTTOMLEFT", 0, -10);

CommDKP.ConfigTab1.checkBtn[11] = CreateFrame("CheckButton", nil, CommDKP.ConfigTab1, "UICheckButtonTemplate");
CommDKP.ConfigTab1.checkBtn[11]:SetID(11)
CommDKP.ConfigTab1.checkBtn[11].text:SetText("|cff5151de"..L["ONLINE"].."|r");
CommDKP.ConfigTab1.checkBtn[11].text:SetFontObject("CommDKPSmall")
CommDKP.ConfigTab1.checkBtn[11]:SetScript("OnClick", CommDKPFilterChecks)
CommDKP.ConfigTab1.checkBtn[11]:SetPoint("TOPLEFT", CommDKP.ConfigTab1.checkBtn[10], "TOPRIGHT", 100, 0);
CommDKP.ConfigTab1.checkBtn[10]:SetPoint("BOTTOMRIGHT", CommDKP.ConfigTab1.checkBtn[3], "TOPLEFT", 50, 0);
CommDKP.ConfigTab1.checkBtn[10].text:SetText("|cff5151de"..L["ALLCLASSES"].."|r");
CommDKP.ConfigTab1.checkBtn[11]:SetPoint("TOPLEFT", CommDKP.ConfigTab1.checkBtn[6], "BOTTOMLEFT", 50, 0);
CommDKP.ConfigTab1.checkBtn[11].text:SetText("|cff5151de"..L["INPARTYRAID"].."|r"); -- executed in filterDKPTable (CommunityDKP.lua)

CommDKP.ConfigTab1.checkBtn[12] = CreateFrame("CheckButton", nil, CommDKP.ConfigTab1, "UICheckButtonTemplate");
CommDKP.ConfigTab1.checkBtn[12]:SetID(12)
CommDKP.ConfigTab1.checkBtn[12].text:SetText("|cff5151de"..L["NOTINRAIDFILTER"].."|r");
CommDKP.ConfigTab1.checkBtn[12].text:SetText("|cff5151de"..L["ONLINE"].."|r");
CommDKP.ConfigTab1.checkBtn[12].text:SetFontObject("CommDKPSmall")
CommDKP.ConfigTab1.checkBtn[12]:SetScript("OnClick", function(self)
CommDKP.ConfigTab1.checkBtn[10]:SetChecked(false);
CommDKP.ConfigTab1.checkBtn[12]:SetScript("OnClick", CommDKPFilterChecks)
CommDKP.ConfigTab1.checkBtn[12]:SetPoint("TOPLEFT", CommDKP.ConfigTab1.checkBtn[11], "TOPRIGHT", 100, 0);

CommDKP.ConfigTab1.checkBtn[13] = CreateFrame("CheckButton", nil, CommDKP.ConfigTab1, "UICheckButtonTemplate");
CommDKP.ConfigTab1.checkBtn[13]:SetID(13)
CommDKP.ConfigTab1.checkBtn[13].text:SetText("|cff5151de"..L["NOTINRAIDFILTER"].."|r");
CommDKP.ConfigTab1.checkBtn[13].text:SetFontObject("CommDKPSmall")
CommDKP.ConfigTab1.checkBtn[13]:SetScript("OnClick", function(self)
CommDKP.ConfigTab1.checkBtn[13]:SetChecked(false);
CommDKPFilterChecks(self)
end)
CommDKP.ConfigTab1.checkBtn[12]:SetPoint("TOPLEFT", CommDKP.ConfigTab1.checkBtn[11], "TOPRIGHT", 65, 0);
CommDKP.ConfigTab1.checkBtn[13]:SetPoint("TOPLEFT", CommDKP.ConfigTab1.checkBtn[12], "TOPRIGHT", 65, 0);

core.ClassGraph = CommDKP:ClassGraph() -- draws class graph on tab1

72 changes: 69 additions & 3 deletions Core.lua
Original file line number Diff line number Diff line change
@@ -62,6 +62,11 @@ local defaults = {
theme2 = { r = 1, g = 0.37, b = 0.37, hex = "ff6060" }
}

--------------------------------------
-- Encounter ID's Library
--------------------------------------


core.PriceSortButtons = {}
core.WorkingTable = {}; -- table of all entries from CommDKP:GetTable(CommDKP_DKPTable, true) that are currently visible in the window. From CommDKP:GetTable(CommDKP_DKPTable, true)
core.EncounterList = { -- Event IDs must be in the exact same order as core.BossList declared in localization files
@@ -97,12 +102,73 @@ core.EncounterList = { -- Event IDs must be in the exact same order as core
ONYXIA = {1084},
WORLD = { -- No encounter IDs have been identified for these world bosses yet
"Azuregos", "Lord Kazzak", "Emeriss", "Lethon", "Ysondre", "Taerar"
}
},
KARAZHAN = {
652, -- "Attumen the Huntsman",
653, -- "Moroes",
654, -- "Maiden of Virtue",
655, -- "Opera Hall",
656, -- "The Curator",
657, -- "Terestian Illhoof",
658, -- "Shade of Aran",
659, -- "Netherspite",
660, -- "Chess Event",
661, -- "Prince Malchezaar",
662 -- "Nightbane"
},
GRULLSLAIR = {
649, -- "High King Maulgar",
650 -- "Gruul the Dragonkiller"
},
MAGTHERIDONSLAIR = {
651 -- "Magtheridon"
},
SERPENTSHRINECAVERN = {
632, -- "Hydross the Unstable",
624, -- "The Lurker Below",
625, -- "Leotheras the Blind",
626, -- "Fathom-Lord Karathress",
627, -- "Morogrim Tidewalker",
628 -- "Lady Vashj"
},
TEMPESTKEEP = {
730, -- "Al'ar",
731, -- "Void Reaver",
732, -- "High Astromancer Solarian",
733 -- "Kael'thas Sunstrider"
},
ZULAMAN = {
1189, -- "Akil'zon"
1190, -- Nalorakk
1191, -- Jan'alai
1192, -- Halazzi,
1193, -- Hex Lord Malacrass
1194 -- Daakara
},
BLACKTEMPLE = {
601, -- High Warlord Naj'entus,
602, -- Supremus
603, -- Shade of Akama
604, -- Teron Gorefiend,
605, -- Gurtogg Bloodboil
606, -- Reliquary of Souls
607, -- Mother Shahraz
608, -- The Illidari Council
609 -- Illidan Stormrage
},
SUNWELLPLATEAU = {
724, -- "Kalecgos",
725, -- "Brutallus",
726, -- "Felmyst",
727, -- "Eredar Twins",
728, -- "M'uru",
729 -- "Kil'jaeden"
}
}

core.CommDKPUI = {} -- global storing entire Configuration UI to hide/show UI
core.MonVersion = "v3.2.4";
core.BuildNumber = 30204;
core.MonVersion = "v3.2.7";
core.BuildNumber = 30207;
core.ReleaseNumber = 62
core.defaultTable = "__default";
core.SemVer = core.MonVersion.."-r"..tostring(core.ReleaseNumber);
84 changes: 81 additions & 3 deletions Localization/Localization.cn.lua
Original file line number Diff line number Diff line change
@@ -35,11 +35,89 @@ if GetLocale() == "zhCN" then
ONYXIA = {"奥妮克希亚"},
WORLD = {
"艾索雷苟斯", "卡札克领主", "艾莫莉丝", "雷索", "伊索德雷", "泰拉尔",
},

-- TBC Classic 2.5.1.38757
KARAZHAN = { -- 532
"猎手阿图门",
"莫罗斯",
"贞节圣女",
"歌剧院",
"馆长",
"特雷斯坦·邪蹄",
"埃兰之影",
"虚空幽龙",
"国际象棋",
"玛克扎尔王子",
"夜之魇"
},
GRULLSLAIR = { -- 565
"莫加尔大王",
"屠龙者格鲁尔"
},
MAGTHERIDONSLAIR = { -- 544
"玛瑟里顿"
},
SERPENTSHRINECAVERN = { -- 548
"不稳定的海度斯",
"鱼斯拉",
"盲眼者莱欧瑟拉斯",
"深水领主卡拉瑟雷斯",
"莫洛格里·踏潮者",
"瓦丝琪"
},
TEMPESTKEEP = { -- 550
"",
"空灵机甲",
"大星术师索兰莉安",
"凯尔萨斯·逐日者"
},
ZULAMAN = { -- 568
"埃基尔松",
"纳洛拉克",
"加亚莱",
"哈尔拉兹",
"妖术领主玛拉卡斯",
"达卡拉"
},
BLACKTEMPLE = { -- 564 map id
"高阶督军纳因图斯",
"苏普雷姆斯",
"阿卡玛之影",
"塔隆·血魔",
"古尔图格·血沸",
"灵魂之匣",
"莎赫拉丝主母",
"伊利达雷议会",
"伊利丹·怒风"
},
SUNWELLPLATEAU = { -- 580
"卡雷苟斯",
"布鲁塔卢斯",
"菲米丝",
"艾瑞达双子",
"穆鲁",
"基尔加丹"
}
}

-- 532, 565, 544, 548, 550, 568, 564, 580
core.ZoneList = {
"熔火之心", "黑翼巢穴", "安其拉神庙", "纳克萨玛斯", "祖尔古鲁布", "安其拉废墟", "奥妮克希亚的巢穴", "世界老板",
"熔火之心",
"黑翼巢穴",
"安其拉神庙",
"纳克萨玛斯",
"祖尔古鲁布",
"安其拉废墟",
"奥妮克希亚的巢穴",
"世界老板",
"卡拉贊", -- 532
"戈魯爾之巢", -- 565
"瑪瑟里頓的巢穴", -- 544
"盤牙:毒蛇神殿洞穴", -- 548
"風暴要塞", -- 550
"祖阿曼", -- 568
"黑暗神廟", -- 564,
"太陽之井" -- 580
}

core.L = {
@@ -820,7 +898,7 @@ if GetLocale() == "zhCN" then
MIGRATIONCOMPLETED = "Migration complete.|n|nPlease disable MonolithDKP and /reload the UI.", --TODO TRANSLATE:

--TODO TRANSLATE:
CHANGELOG1 = "CommunityDKP - v3.2.5-r64",
CHANGELOG1 = "CommunityDKP - v3.2.7-r66",
CHANGELOG2 = " - fixed broadcast window",
CHANGELOG3 = "",
CHANGELOG4 = "",
Loading

0 comments on commit 52104b1

Please sign in to comment.