Skip to content

Commit 1bde386

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/arcane-power'
2 parents d2dacc8 + 935f9f7 commit 1bde386

4 files changed

Lines changed: 30 additions & 6 deletions

File tree

Config.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ local function GetOptions()
373373
cPointDisplay:HideUIElements()
374374
end,
375375
order = 10,
376-
disabled = function() if (tid == "cp" or tid == "hp" or tid == "ss") then return false else return true end end,
376+
disabled = function() if (tid == "cp" or tid == "hp" or tid == "ss" or tid == "ac") then return false else return true end end,
377377
},
378378
showatzero = {
379379
type = "toggle",

Core.lua

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,26 @@ cPointDisplay.Types = {
77
name = "General",
88
points = {
99
[1] = {name = "Combo Points", id = "cp", barcount = 5},
10-
},
10+
}
1111
},
1212
["PALADIN"] = {
1313
name = "Paladin",
1414
points = {
1515
[1] = {name = "Holy Power", id = "hp", barcount = 5},
16-
},
16+
}
1717
},
1818
["WARLOCK"] = {
1919
name = "Warlock",
2020
points = {
2121
[1] = {name = "Soul Shards", id = "ss", barcount = 5},
22-
},
22+
}
2323
},
24+
["MAGE"] = {
25+
name = "Mage",
26+
points = {
27+
[1] = {name = "Arcane Charges", id = "ac", barcount = 4}
28+
}
29+
}
2430
}
2531
local Types = cPointDisplay.Types
2632

@@ -514,6 +520,12 @@ function cPointDisplay:GetPoints(CurClass, CurType)
514520
if CurType == "ss" then
515521
NewPoints = UnitPower("player", SPELL_POWER_SOUL_SHARDS)
516522
end
523+
-- Mage
524+
elseif CurClass == "MAGE" and PlayerSpec == SPEC_MAGE_ARCANE then
525+
-- Arcane Charges
526+
if CurType == "ac" then
527+
NewPoints = UnitPower("player", SPELL_POWER_ARCANE_CHARGES)
528+
end
517529
end
518530
Points[CurType] = NewPoints
519531
end
@@ -963,6 +975,14 @@ function cPointDisplay:HideUIElements()
963975
SSF:SetScript("OnShow", function(self) self:Hide() end)
964976
end
965977
end
978+
979+
if db["MAGE"].types["ac"].enabled and db["MAGE"].types["ac"].general.hideui then
980+
local APF = MageArcaneChargesFrame
981+
if APF then
982+
APF:Hide()
983+
APF:SetScript("OnShow", function(self) self:Hide() end)
984+
end
985+
end
966986
end
967987

968988
function cPointDisplay:UpdateSpec()
@@ -1017,6 +1037,9 @@ function cPointDisplay:PLAYER_LOGIN()
10171037
tinsert(EventList, "UNIT_POWER")
10181038
tinsert(EventList, "UNIT_DISPLAYPOWER")
10191039
end
1040+
if (PlayerClass == "MAGE") then
1041+
tinsert(EventList, "UNIT_POWER")
1042+
end
10201043
local UpdateSpeed = (1 / db.updatespeed)
10211044
self:RegisterBucketEvent(EventList, UpdateSpeed, "UpdatePoints")
10221045
-- Instant Events

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Then open the renamed file and change the string `nibPointDisplayDB` to `cPointD
1212
- Combo Points
1313
- Holy Power
1414
- Soul Shards
15+
- Arcane Charges *(new)*
1516

1617
###Requests
1718

cPointDisplay.toc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
## Interface: 70000
22
## Title: |cFFFF9933c|rPointDisplay
33
## Author: Nibelheim, ChronosSF
4-
## Notes: Customizable graphical point display (Combo Points, Holy Power, Soul Shards). Fan update of nibPointDisplay by Nibelheim.
5-
## Version: 1.0.0
4+
## Notes: Customizable graphical point display (Combo Points, Holy Power, Soul Shards, Arcane Power). Fan update of nibPointDisplay by Nibelheim.
5+
## Version: 1.1.0
66
## SavedVariables: cPointDisplayDB
77
## OptionalDeps: Ace3, LibSharedMedia-3.0, AceGUI-3.0-SharedMediaWidgets
88

0 commit comments

Comments
 (0)