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
Kris
VuhDo
Commits
5edff430
Commit
5edff430
authored
7 years ago
by
Ivaria
Browse files
Options
Download
Email Patches
Plain Diff
Workaround for Antoran High Command vehicles, see known issues
parent
895d4c31
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
86 additions
and
46 deletions
+86
-46
VuhDo.lua
VuhDo.lua
+6
-2
VuhDoBarCustomizerHealth.lua
VuhDoBarCustomizerHealth.lua
+16
-7
VuhDoBarCustomizerHots.lua
VuhDoBarCustomizerHots.lua
+7
-5
VuhDoBarCustomizerMana.lua
VuhDoBarCustomizerMana.lua
+9
-7
VuhDoBouquetValidators.lua
VuhDoBouquetValidators.lua
+18
-12
VuhDoBouquets.lua
VuhDoBouquets.lua
+4
-1
VuhDoCombatLogParser.lua
VuhDoCombatLogParser.lua
+6
-4
VuhDoMacroFactory.lua
VuhDoMacroFactory.lua
+2
-0
VuhDoPlayerTargetEventHandler.lua
VuhDoPlayerTargetEventHandler.lua
+6
-4
VuhDoToolbox.lua
VuhDoToolbox.lua
+6
-3
changelog.txt
changelog.txt
+6
-1
No files found.
VuhDo.lua
View file @
5edff430
...
...
@@ -441,8 +441,12 @@ function VUHDO_updateHealth(aUnit, aMode)
tOwner
=
VUHDO_RAID
[
aUnit
][
"ownerUnit"
];
-- tOwner may not be present when leaving a vehicle
if
VUHDO_RAID
[
tOwner
]
and
VUHDO_RAID
[
tOwner
][
"isVehicle"
]
then
VUHDO_setHealth
(
tOwner
,
aMode
);
VUHDO_updateHealthBarsFor
(
tOwner
,
aMode
);
-- Blizzard has broken the way vehicles work for the Antoran High Command encounter
-- For now just disable vehicle support (note: this breaks encounters like Malygos)
--VUHDO_setHealth(tOwner, aMode);
--VUHDO_updateHealthBarsFor(tOwner, aMode);
VUHDO_setHealth
(
aUnit
,
aMode
);
VUHDO_updateHealthBarsFor
(
aUnit
,
aMode
);
end
end
...
...
This diff is collapsed.
Click to expand it.
VuhDoBarCustomizerHealth.lua
View file @
5edff430
...
...
@@ -307,9 +307,11 @@ function VUHDO_getDisplayUnit(aButton)
return
VUHDO_CUSTOM_INFO
[
"fixResolveId"
],
VUHDO_RAID
[
VUHDO_CUSTOM_INFO
[
"fixResolveId"
]];
end
else
if
VUHDO_RAID
[
tUnit
]
and
VUHDO_RAID
[
tUnit
][
"isVehicle"
]
then
tUnit
=
VUHDO_RAID
[
tUnit
][
"petUnit"
];
end
-- Blizzard has broken the way vehicles work for the Antoran High Command encounter
-- For now just disable vehicle support (note: this breaks encounters like Malygos)
--if VUHDO_RAID[tUnit] and VUHDO_RAID[tUnit]["isVehicle"] then
-- tUnit = VUHDO_RAID[tUnit]["petUnit"];
--end
return
tUnit
,
VUHDO_RAID
[
tUnit
];
end
end
...
...
@@ -382,6 +384,7 @@ function VUHDO_customizeText(aButton, aMode, anIsTarget)
tOwnerInfo
=
VUHDO_RAID
[
tInfo
[
"ownerUnit"
]];
tIndex
=
tInfo
[
"name"
]
..
(
tInfo
[
"ownerUnit"
]
or
""
)
..
tPanelNum
;
if
not
VUHDO_NAME_TEXTS
[
tIndex
]
then
if
tSetup
[
"ID_TEXT"
][
"showName"
]
then
...
...
@@ -411,9 +414,15 @@ function VUHDO_customizeText(aButton, aMode, anIsTarget)
-- Add title flags
if
tSetup
[
"ID_TEXT"
][
"showTags"
]
and
not
anIsTarget
then
if
"focus"
==
tUnit
then
tTextString
=
format
(
"|cffff0000%s|r-%s"
,
VUHDO_I18N_FOC
,
tTextString
);
elseif
"target"
==
tUnit
then
tTextString
=
format
(
"|cffff0000%s|r-%s"
,
VUHDO_I18N_TAR
,
tTextString
);
elseif
tOwnerInfo
and
tOwnerInfo
[
"isVehicle"
]
then
tTextString
=
format
(
"|cffff0000%s|r-%s"
,
VUHDO_I18N_VEHICLE
,
tTextString
);
end
if
"focus"
==
tUnit
then
tTextString
=
format
(
"|cffff0000%s|r-%s"
,
VUHDO_I18N_FOC
,
tTextString
);
elseif
"target"
==
tUnit
then
tTextString
=
format
(
"|cffff0000%s|r-%s"
,
VUHDO_I18N_TAR
,
tTextString
);
-- Blizzard has broken the way vehicles work for the Antoran High Command encounter
-- For now just disable vehicle support (note: this breaks encounters like Malygos)
--elseif tOwnerInfo and tOwnerInfo["isVehicle"] then
-- tTextString = format("|cffff0000%s|r-%s", VUHDO_I18N_VEHICLE, tTextString);
end
end
end
...
...
This diff is collapsed.
Click to expand it.
VuhDoBarCustomizerHots.lua
View file @
5edff430
...
...
@@ -501,11 +501,13 @@ local tSpellId, tDebuffOffset;
local
tNow
;
local
tFilter
;
local
function
VUHDO_updateHots
(
aUnit
,
anInfo
)
if
anInfo
[
"isVehicle"
]
then
VUHDO_removeHots
(
aUnit
);
aUnit
=
anInfo
[
"petUnit"
];
if
not
aUnit
then
return
;
end
-- bei z.B. focus/target
end
-- Blizzard has broken the way vehicles work for the Antoran High Command encounter
-- For now just disable vehicle support (note: this breaks encounters like Malygos)
--if anInfo["isVehicle"] then
-- VUHDO_removeHots(aUnit);
-- aUnit = anInfo["petUnit"];
-- if not aUnit then return; end-- bei z.B. focus/target
--end
if
not
VUHDO_MY_HOTS
[
aUnit
]
then
VUHDO_MY_HOTS
[
aUnit
]
=
{
};
end
if
not
VUHDO_OTHER_HOTS
[
aUnit
]
then
VUHDO_OTHER_HOTS
[
aUnit
]
=
{
};
end
...
...
This diff is collapsed.
Click to expand it.
VuhDoBarCustomizerMana.lua
View file @
5edff430
...
...
@@ -43,13 +43,15 @@ local tPowerType;
function
VUHDO_updateManaBars
(
aUnit
,
aChange
)
tInfo
=
VUHDO_RAID
[
aUnit
];
if
(
tInfo
[
"isVehicle"
])
then
aUnit
=
tInfo
[
"petUnit"
];
if
not
aUnit
then
return
;
end
tInfo
=
VUHDO_RAID
[
aUnit
];
if
not
tInfo
then
return
;
end
end
-- Blizzard has broken the way vehicles work for the Antoran High Command encounter
-- For now just disable vehicle support (note: this breaks encounters like Malygos)
--if (tInfo["isVehicle"]) then
-- aUnit = tInfo["petUnit"];
-- if not aUnit then return; end
--
-- tInfo = VUHDO_RAID[aUnit];
-- if not tInfo then return; end
--end
if
not
VUHDO_isConfigDemoUsers
()
then
if
1
==
aChange
then
...
...
This diff is collapsed.
Click to expand it.
VuhDoBouquetValidators.lua
View file @
5edff430
...
...
@@ -348,22 +348,26 @@ end
--
local
function
VUHDO_playerTargetValidator
(
anInfo
,
_
)
if
anInfo
[
"isPet"
]
and
(
VUHDO_RAID
[
anInfo
[
"ownerUnit"
]]
or
tEmptyInfo
)[
"isVehicle"
]
then
return
anInfo
[
"ownerUnit"
]
==
VUHDO_getCurrentPlayerTarget
(),
nil
,
-
1
,
-
1
,
-
1
;
else
-- Blizzard has broken the way vehicles work for the Antoran High Command encounter
-- For now just disable vehicle support (note: this breaks encounters like Malygos)
--if anInfo["isPet"] and (VUHDO_RAID[anInfo["ownerUnit"]] or tEmptyInfo)["isVehicle"] then
-- return anInfo["ownerUnit"] == VUHDO_getCurrentPlayerTarget(), nil, -1, -1, -1;
--else
return
anInfo
[
"unit"
]
==
VUHDO_getCurrentPlayerTarget
(),
nil
,
-
1
,
-
1
,
-
1
;
end
--
end
end
--
local
function
VUHDO_playerFocusValidator
(
anInfo
,
_
)
if
anInfo
[
"isPet"
]
and
(
VUHDO_RAID
[
anInfo
[
"ownerUnit"
]]
or
tEmptyInfo
)[
"isVehicle"
]
then
return
anInfo
[
"ownerUnit"
]
==
VUHDO_getCurrentPlayerFocus
(),
nil
,
-
1
,
-
1
,
-
1
;
else
-- Blizzard has broken the way vehicles work for the Antoran High Command encounter
-- For now just disable vehicle support (note: this breaks encounters like Malygos)
--if anInfo["isPet"] and (VUHDO_RAID[anInfo["ownerUnit"]] or tEmptyInfo)["isVehicle"] then
-- return anInfo["ownerUnit"] == VUHDO_getCurrentPlayerFocus(), nil, -1, -1, -1;
--else
return
anInfo
[
"unit"
]
==
VUHDO_getCurrentPlayerFocus
(),
nil
,
-
1
,
-
1
,
-
1
;
end
--
end
end
...
...
@@ -371,11 +375,13 @@ end
--
local
function
VUHDO_mouseOverTargetValidator
(
anInfo
,
_
)
if
anInfo
[
"isPet"
]
and
(
VUHDO_RAID
[
anInfo
[
"ownerUnit"
]]
or
tEmptyInfo
)[
"isVehicle"
]
then
return
anInfo
[
"ownerUnit"
]
==
VUHDO_getCurrentMouseOver
(),
nil
,
-
1
,
-
1
,
-
1
;
else
-- Blizzard has broken the way vehicles work for the Antoran High Command encounter
-- For now just disable vehicle support (note: this breaks encounters like Malygos)
--if anInfo["isPet"] and (VUHDO_RAID[anInfo["ownerUnit"]] or tEmptyInfo)["isVehicle"] then
-- return anInfo["ownerUnit"] == VUHDO_getCurrentMouseOver(), nil, -1, -1, -1;
--else
return
anInfo
[
"unit"
]
==
VUHDO_getCurrentMouseOver
(),
nil
,
-
1
,
-
1
,
-
1
;
end
--
end
end
...
...
This diff is collapsed.
Click to expand it.
VuhDoBouquets.lua
View file @
5edff430
...
...
@@ -218,7 +218,10 @@ local tEmptyInfo = { };
local
function
VUHDO_evaluateBouquet
(
aUnit
,
aBouquetName
,
anInfo
)
tUnit
=
(
VUHDO_RAID
[
aUnit
]
or
tEmptyInfo
)[
"isVehicle"
]
and
VUHDO_RAID
[
aUnit
][
"petUnit"
]
or
aUnit
;
-- Blizzard has broken the way vehicles work for the Antoran High Command encounter
-- For now just disable vehicle support (note: this breaks encounters like Malygos)
--tUnit = (VUHDO_RAID[aUnit] or tEmptyInfo)["isVehicle"] and VUHDO_RAID[aUnit]["petUnit"] or aUnit;
tUnit
=
aUnit
;
tInfo
=
anInfo
or
VUHDO_RAID
[
tUnit
];
if
not
tInfo
then
...
...
This diff is collapsed.
Click to expand it.
VuhDoCombatLogParser.lua
View file @
5edff430
...
...
@@ -84,11 +84,13 @@ function VUHDO_clParserSetCurrentFocus()
for
tUnit
,
tInfo
in
pairs
(
VUHDO_RAID
)
do
if
UnitIsUnit
(
"focus"
,
tUnit
)
and
tUnit
~=
"focus"
and
tUnit
~=
"target"
then
if
tInfo
[
"isPet"
]
and
(
VUHDO_RAID
[
tInfo
[
"ownerUnit"
]]
or
{})[
"isVehicle"
]
then
sCurrentFocus
=
tInfo
[
"ownerUnit"
];
else
-- Blizzard has broken the way vehicles work for the Antoran High Command encounter
-- For now just disable vehicle support (note: this breaks encounters like Malygos)
--if tInfo["isPet"] and (VUHDO_RAID[tInfo["ownerUnit"]] or {})["isVehicle"] then
-- sCurrentFocus = tInfo["ownerUnit"];
--else
sCurrentFocus
=
tUnit
;
end
--
end
break
;
end
end
...
...
This diff is collapsed.
Click to expand it.
VuhDoMacroFactory.lua
View file @
5edff430
...
...
@@ -386,6 +386,8 @@ local function VUHDO_generateRaidMacroTemplate(anAction, anIsKeyboard, aTarget,
else
tVehicleCond
=
""
;
end
-- Blizzard has broken the way vehicles work for the Antoran High Command encounter
-- For now just disable vehicle support (note: this breaks encounters like Malygos)
tText
=
tText
..
tCastText
..
"["
..
tModiSpell
..
"nounithasvehicleui,@vuhdo]"
..
tVehicleCond
..
" "
..
anAction
..
"
\n
"
;
tText
=
tText
..
tSpellPost
;
if
aPet
then
...
...
This diff is collapsed.
Click to expand it.
VuhDoPlayerTargetEventHandler.lua
View file @
5edff430
...
...
@@ -44,11 +44,13 @@ function VUHDO_updatePlayerTarget()
tTargetUnit
=
nil
;
for
tUnit
,
tInfo
in
pairs
(
VUHDO_RAID
)
do
if
UnitIsUnit
(
"target"
,
tUnit
)
and
tUnit
~=
"focus"
and
tUnit
~=
"target"
and
not
VUHDO_isBossUnit
(
tUnit
)
then
if
tInfo
[
"isPet"
]
and
(
VUHDO_RAID
[
tInfo
[
"ownerUnit"
]]
or
tEmptyInfo
)[
"isVehicle"
]
then
tTargetUnit
=
tInfo
[
"ownerUnit"
];
else
-- Blizzard has broken the way vehicles work for the Antoran High Command encounter
-- For now just disable vehicle support (note: this breaks encounters like Malygos)
--if tInfo["isPet"] and (VUHDO_RAID[tInfo["ownerUnit"]] or tEmptyInfo)["isVehicle"] then
-- tTargetUnit = tInfo["ownerUnit"];
--else
tTargetUnit
=
tUnit
;
end
--
end
break
;
end
end
...
...
This diff is collapsed.
Click to expand it.
VuhDoToolbox.lua
View file @
5edff430
...
...
@@ -552,9 +552,12 @@ end
--
local
tInfo
;
function
VUHDO_resolveVehicleUnit
(
aUnit
)
tInfo
=
VUHDO_RAID
[
aUnit
]
or
sEmpty
;
return
tInfo
[
"isPet"
]
and
(
VUHDO_RAID
[
tInfo
[
"ownerUnit"
]]
or
sEmpty
)[
"isVehicle"
]
and
tInfo
[
"ownerUnit"
]
or
aUnit
;
-- Blizzard has broken the way vehicles work for the Antoran High Command encounter
-- For now just disable vehicle support (note: this breaks encounters like Malygos)
--tInfo = VUHDO_RAID[aUnit] or sEmpty;
--return tInfo["isPet"] and (VUHDO_RAID[tInfo["ownerUnit"]] or sEmpty)["isVehicle"]
-- and tInfo["ownerUnit"] or aUnit;
return
aUnit
;
end
...
...
This diff is collapsed.
Click to expand it.
changelog.txt
View file @
5edff430
...
...
@@ -11,11 +11,16 @@ Known issues:
-- This was an intentional breaking change by Blizzard
-- This breaks AOE Advice, Clusters and out-of-range direction arrow
-- At this time there is no way to fix or renable these features
-- Blizzard has changed the way vehicles work for Antoran High Command
-- For now I've just disabled the proper vehicle support
-- Targeting a player in vehicle will still targe the vehicle unit
-- However, mouseover/click-to-heal should work properly
-- Healing actual vehicles (e.g. Ulduar) is now broken though
Bugfixes:
-- Fixed saving/loading of per profile Spell Trace settings
-- Workaround for Antoran High Command vehicles, see known issues
Improvements:
...
...
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