Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
momo
VuhDo
Commits
0f47560a
Commit
0f47560a
authored
10 years ago
by
humfras
Browse files
Options
Download
Email Patches
Plain Diff
- removed Guard group buff
- added talent check
parent
8826520f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
4 deletions
+31
-4
VuhDoShieldAbsorb.lua
VuhDoShieldAbsorb.lua
+1
-1
VuhDoToolbox.lua
VuhDoToolbox.lua
+30
-3
No files found.
VuhDoShieldAbsorb.lua
View file @
0f47560a
...
...
@@ -14,7 +14,7 @@ local VUHDO_SHIELDS = {
[
114908
]
=
15
,
-- VUHDO_SPELL_ID.SPIRIT_SHELL (Buff) -- ok
[
116849
]
=
12
,
-- Life Cocoon
[
115295
]
=
30
,
-- Guard (brewmaster monk's self buff, unglyphed)
[
118604
]
=
30
,
-- Guard (brewmaster monk's black ox statue (cast on group), unglyphed)
--
[118604] = 30, -- Guard (brewmaster monk's black ox statue (cast on group), unglyphed)
--[123402] = 30, -- Guard (brewmaster monk's self buff, with Glyph of Guard) - Magic damage ONLY
--[136070] = 30, -- Guard (brewmaster monk's black ox statue (cast on group), with Glyph of Guard) - Magic damage ONLY
[
112048
]
=
6
,
-- Shield Barrier (Prot warrior)
...
...
This diff is collapsed.
Click to expand it.
VuhDoToolbox.lua
View file @
0f47560a
...
...
@@ -452,6 +452,32 @@ function VUHDO_isSpellKnown(aSpellName)
end
--
function
VUHDO_isTalentKnown
(
aTalentName
,
onlyActiveSpec
)
if
onlyActiveSpec
then
for
tier
=
1
,
7
do
for
column
=
1
,
3
do
local
id
,
name
,
texture
,
selected
,
available
=
GetTalentInfo
(
tier
,
column
,
GetActiveSpecGroup
())
if
name
==
aTalentName
and
selected
then
return
true
end
end
end
else
for
group
=
1
,
2
do
for
tier
=
1
,
7
do
for
column
=
1
,
3
do
local
id
,
name
,
texture
,
selected
,
available
=
GetTalentInfo
(
tier
,
column
,
group
)
if
name
==
aTalentName
and
selected
then
return
true
end
end
end
end
end
return
false
end
--
local
tDeltaSecs
;
...
...
@@ -622,7 +648,7 @@ end
--
local
tActionLowerName
;
local
tIsMacroKnown
,
tIsSpellKnown
local
tIsMacroKnown
,
tIsSpellKnown
,
tIsTalentKnown
function
VUHDO_isActionValid
(
anActionName
,
anIsCustom
)
if
(
anActionName
or
""
)
==
""
then
...
...
@@ -642,13 +668,14 @@ function VUHDO_isActionValid(anActionName, anIsCustom)
tIsMacroKnown
=
GetMacroIndexByName
(
anActionName
)
~=
0
;
tIsSpellKnown
=
VUHDO_isSpellKnown
(
anActionName
);
tIsTalentKnown
=
VUHDO_isTalentKnown
(
anActionName
,
true
);
if
tIsSpellKnown
and
tIsMacroKnown
then
if
(
tIsSpellKnown
or
tIsTalentKnown
)
and
tIsMacroKnown
then
VUHDO_Msg
(
format
(
VUHDO_I18N_AMBIGUOUS_MACRO
,
anActionName
),
1
,
0
.
3
,
0
.
3
);
return
VUHDO_I18N_WARNING
,
1
,
0
.
3
,
0
.
3
,
"WRN"
;
elseif
tIsMacroKnown
then
return
VUHDO_I18N_MACRO
,
0
.
8
,
0
.
8
,
1
,
"MCR"
;
elseif
tIsSpellKnown
then
elseif
(
tIsSpellKnown
or
tIsTalentKnown
)
then
return
VUHDO_I18N_SPELL
,
1
,
0
.
8
,
0
.
8
,
"SPL"
;
elseif
IsUsableItem
(
anActionName
)
then
return
VUHDO_I18N_ITEM
,
1
,
1
,
0
.
8
,
"ITM"
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment