Skip to content

Commit 1da63c9

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/mongoose-bite'
2 parents 45dcf57 + 1b83944 commit 1da63c9

File tree

3 files changed

+22
-5
lines changed

3 files changed

+22
-5
lines changed

Core.lua

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ cPointDisplay.Types = {
2626
points = {
2727
[1] = {name = "Arcane Charges", id = "ac", barcount = 4}
2828
}
29+
},
30+
["HUNTER"] = {
31+
name = "Hunter",
32+
points = {
33+
[1] = {name = "Mongoose Bite Charges", id = "mb", barcount = 3}
34+
}
2935
}
3036
}
3137
local Types = cPointDisplay.Types
@@ -440,6 +446,7 @@ function cPointDisplay:UpdatePointDisplay(...)
440446

441447
-- Do we hide the Display
442448
if ((Points[tid] == 0 and not db[ic].types[tid].general.showatzero)
449+
or (Points[tid] == nil)
443450
or (ic ~= PlayerClass and ic ~= "GENERAL") -- Not my class
444451
or ((PlayerClass ~= "ROGUE" and (PlayerClass ~= "DRUID" and PlayerSpec ~= 1)) and (ic == "GENERAL") and not UnitHasVehicleUI("player")) -- Impossible to have Combo Points
445452
or (db[ic].types[tid].general.hidein.vehicle and UnitHasVehicleUI("player")) -- Hide in vehicle
@@ -516,7 +523,7 @@ function cPointDisplay:GetPoints(CurClass, CurType)
516523
end
517524
end
518525
-- Paladin
519-
elseif CurClass == "PALADIN" then
526+
elseif CurClass == "PALADIN" and PlayerSpec == 3 then -- hp is only for retribution
520527
-- Holy Power
521528
if CurType == "hp" then
522529
NewPoints = UnitPower("player", SPELL_POWER_HOLY_POWER)
@@ -533,6 +540,12 @@ function cPointDisplay:GetPoints(CurClass, CurType)
533540
if CurType == "ac" then
534541
NewPoints = UnitPower("player", SPELL_POWER_ARCANE_CHARGES)
535542
end
543+
-- Hunter
544+
elseif CurClass == "HUNTER" and PlayerSpec == 3 then
545+
-- Mongoose Bite Charges
546+
if CurType == "mb" then
547+
NewPoints = GetSpellCharges(190928)
548+
end
536549
end
537550
Points[CurType] = NewPoints
538551
end
@@ -993,7 +1006,7 @@ function cPointDisplay:HideUIElements()
9931006
end
9941007

9951008
function cPointDisplay:UpdateSpec()
996-
PlayerSpec = GetActiveSpecGroup()
1009+
PlayerSpec = GetSpecialization()
9971010
end
9981011

9991012
function cPointDisplay:PLAYER_ENTERING_WORLD()
@@ -1051,6 +1064,9 @@ function cPointDisplay:PLAYER_LOGIN()
10511064
self:RegisterBucketEvent(EventList, UpdateSpeed, "UpdatePoints")
10521065
-- Instant Events
10531066
self:RegisterEvent("PLAYER_TARGET_CHANGED", "UpdatePoints")
1067+
if (PlayerClass == "HUNTER") then
1068+
self:RegisterEvent("SPELL_UPDATE_CHARGES", "UpdatePoints")
1069+
end
10541070

10551071
-- Class Colors
10561072
if CUSTOM_CLASS_COLORS then

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ 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)*
15+
- Arcane Charges
16+
- Mongoose Bite Charges *(new)*
1617

1718
###Requests
1819

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, Arcane Power). Fan update of nibPointDisplay by Nibelheim.
5-
## Version: 1.1.0
4+
## Notes: Customizable graphical point display (Combo Points, Holy Power, Soul Shards, etc.). Fan update of nibPointDisplay by Nibelheim.
5+
## Version: 1.1.2
66
## SavedVariables: cPointDisplayDB
77
## OptionalDeps: Ace3, LibSharedMedia-3.0, AceGUI-3.0-SharedMediaWidgets
88

0 commit comments

Comments
 (0)