Skip to content

Commit 94d373b

Browse files
authored
Merge pull request #20 from ChronosSF/add-shaman-dh
add dh, shaman and fullbar
2 parents 597c10b + 04ec133 commit 94d373b

File tree

3 files changed

+36
-11
lines changed

3 files changed

+36
-11
lines changed

Core.lua

+32-10
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,47 @@ cPointDisplay.Types = {
66
["GENERAL"] = {
77
name = "General",
88
points = {
9-
[1] = {name = "Combo Points", id = "cp", barcount = 5},
10-
[2] = {name = "Combo Points with Deeper Stratagem", id = "cp6", barcount = 6},
9+
[1] = { name = "Combo Points", id = "cp", barcount = 5, fullcount = 5 },
10+
[2] = { name = "Combo Points with Deeper Stratagem", id = "cp6", barcount = 6, fullcount = 6 },
1111
}
1212
},
1313
["PALADIN"] = {
1414
name = "Paladin",
1515
points = {
16-
[1] = {name = "Holy Power", id = "hp", barcount = 5},
16+
[1] = { name = "Holy Power", id = "hp", barcount = 5, fullcount = 5 },
1717
}
1818
},
1919
["WARLOCK"] = {
2020
name = "Warlock",
2121
points = {
22-
[1] = {name = "Soul Shards", id = "ss", barcount = 5},
23-
[2] = {name = "Soul Shards Precise", id = "ssf", barcount = 5},
22+
[1] = { name = "Soul Shards", id = "ss", barcount = 5, fullcount = 5 },
23+
[2] = { name = "Soul Shards Precise", id = "ssf", barcount = 5, fullcount = 5 },
2424
}
2525
},
2626
["MAGE"] = {
2727
name = "Mage",
2828
points = {
29-
[1] = {name = "Arcane Charges", id = "ac", barcount = 4},
30-
[2] = {name = "Icicles", id = "ic", barcount = 5}
29+
[1] = { name = "Arcane Charges", id = "ac", barcount = 4, fullcount = 4},
30+
[2] = { name = "Icicles", id = "ic", barcount = 5, fullcount = 5}
3131
}
3232
},
3333
["MONK"] = {
3434
name = "Monk",
3535
points = {
36-
[1] = {name = "Chi", id = "c5", barcount = 5},
37-
[2] = {name = "Chi with Ascension", id = "c6", barcount = 6}
36+
[1] = { name = "Chi", id = "c5", barcount = 5, fullcount = 5 },
37+
[2] = { name = "Chi with Ascension", id = "c6", barcount = 6, fullcount = 6 }
38+
}
39+
},
40+
["SHAMAN"] = {
41+
name = "Shaman",
42+
points = {
43+
[1] = { name = "Maelstrom Weapon", id = "mw", barcount = 10, fullcount = 5 }
44+
}
45+
},
46+
["DEMONHUNTER"] = {
47+
name = "Demon Hunter",
48+
points = {
49+
[1] = { name = "Soul Fragments", id = "sf", barcount = 5, fullcount = 5 }
3850
}
3951
}
4052
}
@@ -415,7 +427,7 @@ local function SetPointBarTextures(ic, it, tid, i, points)
415427
Frames[ic][tid].bars[i].border:SetWidth(dbc.size.width - dbc.border.full.inset)
416428

417429
-- Colors
418-
if points < Types[ic].points[it].barcount then
430+
if points < Types[ic].points[it].fullcount then
419431
if db.classcolor.enabled then
420432
Frames[ic][tid].bars[i].bg:SetVertexColor(cc.bg.normal.r, cc.bg.normal.g, cc.bg.normal.b, dbc.bg.full.color.a)
421433
Frames[ic][tid].bars[i].border:SetBackdropBorderColor(cc.border.normal.r, cc.border.normal.g, cc.border.normal.b, dbc.border.full.color.a)
@@ -596,6 +608,16 @@ function cPointDisplay:GetPoints(CurClass, CurType)
596608
elseif CurType == "ic" and PlayerSpec == 3 then
597609
NewPoints = GetBuffCount(205473) -- Icicle buff id
598610
end
611+
-- Shaman
612+
elseif CurClass == "SHAMAN" then
613+
if CurType == "mw" and PlayerSpec == 2 then
614+
NewPoints = GetBuffCount(344179) -- Maelstrom Weapon buff id
615+
end
616+
-- Demon Hunter
617+
elseif CurClass == "DEMONHUNTER" then
618+
if CurType == "sf" and PlayerSpec == 2 then
619+
NewPoints = GetBuffCount(203981) -- Soul Fragments buff id
620+
end
599621
end
600622
Points[CurType] = NewPoints
601623
end

README.md

+3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@ cPointDisplay supports SharedMedia for textures. The default package contains Tr
1818
- Arcane Charges
1919
- Chi
2020
- Icicles
21+
- Soul Fragments
22+
- Maelstrom Weapon**
2123

2224
***Note***: For Soul Shards both full and fractional values are supported. Enable only one of them. The `Soul Shards Precise` units will work properly for Demonology and Affliction.
25+
***Note***: Maelstrom Weapon lights up as though it is full on 5 stacks.
2326

2427
## Options
2528

cPointDisplay.toc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
## Title: |cFFFF9933c|rPointDisplay
33
## Author: Nibelheim, ChronosSF
44
## Notes: Customizable graphical point display (Combo Points, Holy Power, Soul Shards, etc.). Fan update of nibPointDisplay by Nibelheim.
5-
## Version: 9.0.1
5+
## Version: 9.0.2
66
## SavedVariables: cPointDisplayDB
77
## OptionalDeps: Ace3, LibSharedMedia-3.0, AceGUI-3.0-SharedMediaWidgets
88

0 commit comments

Comments
 (0)