Add vehicles back for Wrath

Code taken from Nevcairiel#25

Author: truchonh

ShadowedUnitFrames.lua

@@ -5,6 +5,9 @@
 ShadowUF = select(2, ...)
 
 local L = ShadowUF.L
+
+local WoWWrath = (WOW_PROJECT_ID == WOW_PROJECT_WRATH_CLASSIC)
+
 ShadowUF.dbRevision = 61
 ShadowUF.dbRevisionClassic = 5
 ShadowUF.playerUnit = "player"
@@ -13,7 +16,7 @@ ShadowUF.modules = {}
 ShadowUF.moduleOrder = {}
 ShadowUF.unitList = {"player", "pet", "pettarget", "target", "targettarget", "targettargettarget", "focus", "focustarget", "party", "partypet", "partytarget", "partytargettarget", "raid", "raidpet", "boss", "bosstarget", "maintank", "maintanktarget", "mainassist", "mainassisttarget", "arena", "arenatarget", "arenapet", "battleground", "battlegroundtarget", "battlegroundpet", "arenatargettarget", "battlegroundtargettarget", "maintanktargettarget", "mainassisttargettarget", "bosstargettarget"}
 ShadowUF.fakeUnits = {["targettarget"] = true, ["targettargettarget"] = true, ["pettarget"] = true, ["arenatarget"] = true, ["arenatargettarget"] = true, ["focustarget"] = true, ["focustargettarget"] = true, ["partytarget"] = true, ["raidtarget"] = true, ["bosstarget"] = true, ["maintanktarget"] = true, ["mainassisttarget"] = true, ["battlegroundtarget"] = true, ["partytargettarget"] = true, ["battlegroundtargettarget"] = true, ["maintanktargettarget"] = true, ["mainassisttargettarget"] = true, ["bosstargettarget"] = true}
-L.units = {["raidpet"] = L["Raid pet"], ["PET"] = L["Pet"], ["arena"] = L["Arena"], ["arenapet"] = L["Arena Pet"], ["arenatarget"] = L["Arena Target"], ["arenatargettarget"] = L["Arena Target of Target"], ["boss"] = L["Boss"], ["bosstarget"] = L["Boss Target"], ["focus"] = L["Focus"], ["focustarget"] = L["Focus Target"], ["mainassist"] = L["Main Assist"], ["mainassisttarget"] = L["Main Assist Target"], ["maintank"] = L["Main Tank"], ["maintanktarget"] = L["Main Tank Target"], ["party"] = L["Party"], ["partypet"] = L["Party Pet"], ["partytarget"] = L["Party Target"], ["pet"] = L["Pet"], ["pettarget"] = L["Pet Target"], ["player"] = L["Player"],["raid"] = L["Raid"], ["target"] = L["Target"], ["targettarget"] = L["Target of Target"], ["targettargettarget"] = L["Target of Target of Target"], ["battleground"] = L["Battleground"], ["battlegroundpet"] = L["Battleground Pet"], ["battlegroundtarget"] = L["Battleground Target"], ["partytargettarget"] = L["Party Target of Target"], ["battlegroundtargettarget"] = L["Battleground Target of Target"], ["maintanktargettarget"] = L["Main Tank Target of Target"], ["mainassisttargettarget"] = L["Main Assist Target of Target"], ["bosstargettarget"] = L["Boss Target of Target"]}
+L.units = {["raidpet"] = L["Raid pet"], ["PET"] = L["Pet"], ["VEHICLE"] = L["Vehicle"], ["arena"] = L["Arena"], ["arenapet"] = L["Arena Pet"], ["arenatarget"] = L["Arena Target"], ["arenatargettarget"] = L["Arena Target of Target"], ["boss"] = L["Boss"], ["bosstarget"] = L["Boss Target"], ["focus"] = L["Focus"], ["focustarget"] = L["Focus Target"], ["mainassist"] = L["Main Assist"], ["mainassisttarget"] = L["Main Assist Target"], ["maintank"] = L["Main Tank"], ["maintanktarget"] = L["Main Tank Target"], ["party"] = L["Party"], ["partypet"] = L["Party Pet"], ["partytarget"] = L["Party Target"], ["pet"] = L["Pet"], ["pettarget"] = L["Pet Target"], ["player"] = L["Player"],["raid"] = L["Raid"], ["target"] = L["Target"], ["targettarget"] = L["Target of Target"], ["targettargettarget"] = L["Target of Target of Target"], ["battleground"] = L["Battleground"], ["battlegroundpet"] = L["Battleground Pet"], ["battlegroundtarget"] = L["Battleground Target"], ["partytargettarget"] = L["Party Target of Target"], ["battlegroundtargettarget"] = L["Battleground Target of Target"], ["maintanktargettarget"] = L["Main Tank Target of Target"], ["mainassisttargettarget"] = L["Main Assist Target of Target"], ["bosstargettarget"] = L["Boss Target of Target"]}
 L.shortUnits = {["battleground"] = L["BG"], ["battlegroundtarget"] = L["BG Target"], ["battlegroundpet"] = L["BG Pet"], ["battlegroundtargettarget"] = L["BG ToT"], ["arenatargettarget"] = L["Arena ToT"], ["partytargettarget"] = L["Party ToT"], ["bosstargettarget"] = L["Boss ToT"], ["maintanktargettarget"] = L["MT ToT"], ["mainassisttargettarget"] = L["MA ToT"]}
 
 -- Cache the units so we don't have to concat every time it updates
@@ -678,6 +681,12 @@ function ShadowUF:HideBlizzardFrames()
 
 		-- We keep these in case someone is still using the default auras, otherwise it messes up vehicle stuff
 		PlayerFrame:RegisterEvent("PLAYER_ENTERING_WORLD")
+		if WoWWrath then
+			PlayerFrame:RegisterEvent("UNIT_ENTERING_VEHICLE")
+			PlayerFrame:RegisterEvent("UNIT_ENTERED_VEHICLE")
+			PlayerFrame:RegisterEvent("UNIT_EXITING_VEHICLE")
+			PlayerFrame:RegisterEvent("UNIT_EXITED_VEHICLE")
+		end
 		PlayerFrame:SetMovable(true)
 		PlayerFrame:SetUserPlaced(true)
 		PlayerFrame:SetDontSavePosition(true)

ShadowedUnitFrames.xml

@@ -1,4 +1,8 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/">
 	<Button name="SUF_SecureUnitTemplate" virtual="true" inherits="SecureUnitButtonTemplate, SecureHandlerStateTemplate">
+		<Attributes>
+			<Attribute name="refreshUnitChange" type="string" value="local unit = self:GetAttribute('unit'); if unit then RegisterStateDriver(self, 'vehicleui', ('[target=%s,unithasvehicleui]vehicle; no'):format(unit)) else UnregisterStateDriver(self, 'vehicleui') end" />
+			<Attribute name="_onstate-vehicleui" type="string" value="local unit = self:GetAttribute('unit'); if unit and newstate == 'vehicle' and UnitPlayerOrPetInRaid(unit) and not UnitTargetsVehicleInRaidUI(unit) then self:SetAttribute('toggleForVehicle', false) else self:SetAttribute('toggleForVehicle', true) end" />
+		</Attributes>
 	</Button>
 </Ui>

modules/auraindicators.lua

@@ -23,7 +23,7 @@ Indicators.auraConfig = setmetatable({}, {
 		return tbl[index]
 end})
 
-local playerUnits = {player = true, pet = true}
+local playerUnits = {player = true, vehicle = true, pet = true}
 local backdropTbl = {bgFile = "Interface\\Addons\\ShadowedUnitFrames\\mediabackdrop", edgeFile = "Interface\\Addons\\ShadowedUnitFrames\\media\\backdrop", tile = true, tileSize = 1, edgeSize = 1}
 
 function Indicators:OnEnable(frame)

modules/auras.lua

@@ -1,5 +1,5 @@
 local Auras = {}
-local playerUnits = {player = true, pet = true}
+local playerUnits = {player = true, vehicle = true, pet = true}
 local mainHand, offHand, tempEnchantScan = {time = 0}, {time = 0}
 local canCure = ShadowUF.Units.canCure
 ShadowUF:RegisterModule(Auras, "auras", ShadowUF.L["Auras"])
@@ -236,7 +236,11 @@ local function hideTooltip(self)
 end
 
 local function cancelAura(self, mouse)
-	if( mouse ~= "RightButton" or not UnitIsUnit(self.parent.unit, "player") or InCombatLockdown() or self.filter == "TEMP" ) then
+	if( 
+		mouse ~= "RightButton" 
+		or ( not UnitIsUnit(self.parent.unit, "player") and not UnitIsUnit(self.parent.unit, "vehicle") ) 
+		or InCombatLockdown() or self.filter == "TEMP" 
+	) then
 		return
 	end
 
@@ -477,6 +481,17 @@ end
 
 -- Unfortunately, temporary enchants have basically no support beyond hacks. So we will hack!
 tempEnchantScan = function(self, elapsed)
+	if( self.parent.unit == self.parent.vehicleUnit and self.lastTemporary > 0 ) then
+		mainHand.has = false
+		offHand.has = false
+
+		self.temporaryEnchants = 0
+		self.lastTemporary = 0
+
+		Auras:Update(self.parent)
+		return
+	end
+	
 	timeElapsed = timeElapsed + elapsed
 	if( timeElapsed < 0.50 ) then return end
 	timeElapsed = timeElapsed - 0.50

modules/combopoints.lua

@@ -1,5 +1,7 @@
 if( not ShadowUF.ComboPoints ) then return end
 
+local WoWWrath = (WOW_PROJECT_ID == WOW_PROJECT_WRATH_CLASSIC)
+
 local Combo = setmetatable({}, {__index = ShadowUF.ComboPoints})
 ShadowUF:RegisterModule(Combo, "comboPoints", ShadowUF.L["Combo points"])
 local cpConfig = {max = MAX_COMBO_POINTS, key = "comboPoints", colorKey = "COMBOPOINTS", powerType = Enum.PowerType.ComboPoints, eventType = "COMBO_POINTS", icon = "Interface\\AddOns\\ShadowedUnitFrames\\media\\textures\\combo"}
@@ -30,11 +32,21 @@ function Combo:GetMaxPoints()
 end
 
 function Combo:GetPoints(unit)
-	return UnitPower("player", cpConfig.powerType)
+	-- For Malygos dragons, they also self cast their CP on themselves, which is why we check CP on ourself
+	if( WoWWrath and UnitHasVehicleUI("player") and UnitHasVehiclePlayerFrameUI("player") ) then
+		local points = GetComboPoints("vehicle", "target")
+		if( points == 0 ) then
+			points = GetComboPoints("vehicle", "vehicle")
+		end
+
+		return points
+	else
+		return UnitPower("player", cpConfig.powerType)
+	end
 end
 
 function Combo:Update(frame, event, unit, powerType)
-	if( not event or ( unit == frame.unit or unit == "player" ) ) then
+	if( not event or ( unit == frame.unit or unit == frame.vehicleUnit or unit == "player" or unit == "vehicle" ) ) then
 		ShadowUF.ComboPoints.Update(self, frame, event, unit, powerType)
 	end
 end

modules/defaultlayout.lua

@@ -138,6 +138,7 @@ function ShadowUF:LoadDefaultLayout(useMerge)
 		MONK = {r = 0.0, g = 1.00 , b = 0.59},
 		DEMONHUNTER = {r = 0.64, g = 0.19, b = 0.79},
 		PET = {r = 0.20, g = 0.90, b = 0.20},
+		VEHICLE = {r = 0.23, g = 0.41, b = 0.23},
 	}
 	config.powerColors = {
 		MANA = {r = 0.30, g = 0.50, b = 0.85},

modules/druid.lua

@@ -22,7 +22,7 @@ function Druid:OnLayoutApplied(frame)
 end
 
 function Druid:PowerChanged(frame)
-	local visible = UnitPowerType(frame.unit) ~= Enum.PowerType.Mana
+	local visible = UnitPowerType(frame.unit) ~= Enum.PowerType.Mana and not frame.inVehicle
 	local type = visible and "RegisterUnitEvent" or "UnregisterSingleEvent"
 
 	frame[type](frame, "UNIT_POWER_FREQUENT", self, "Update")

modules/health.lua

@@ -91,6 +91,8 @@ function Health:UpdateColor(frame)
 		return
 	elseif( ShadowUF.db.profile.units[frame.unitType].healthBar.colorDispel and frame.healthBar.hasDebuff ) then
 		color = DebuffTypeColor[frame.healthBar.hasDebuff]
+	elseif( frame.inVehicle ) then
+		color = ShadowUF.db.profile.classColors.VEHICLE
 	elseif( not UnitPlayerControlled(unit) and UnitIsTapDenied(unit) and UnitCanAttack("player", unit) ) then
 		color = ShadowUF.db.profile.healthColors.tapped
 	elseif( not UnitPlayerOrPetInRaid(unit) and not UnitPlayerOrPetInParty(unit) and ( ( ( reactionType == "player" or reactionType == "both" ) and UnitIsPlayer(unit) and not UnitIsFriend(unit, "player") ) or ( ( reactionType == "npc" or reactionType == "both" )  and not UnitIsPlayer(unit) ) ) ) then

modules/indicators.lua

@@ -1,5 +1,7 @@
 local Indicators = {list = {"status", "pvp", "leader", "resurrect", "masterLoot", "raidTarget", "ready", "role", "class", "phase", "happiness" }}
 
+local WoWWrath = (WOW_PROJECT_ID == WOW_PROJECT_WRATH_CLASSIC)
+
 ShadowUF:RegisterModule(Indicators, "indicators", ShadowUF.L["Indicators"])
 
 function Indicators:UpdateClass(frame)
@@ -131,6 +133,12 @@ local function combatMonitor(self, elapsed)
 	end
 end
 
+-- It looks like the combat check for players is a bit buggy when they are in a vehicle, so swap it to also check polling
+function Indicators:CheckVehicle(frame)
+	frame.indicators.timeElapsed = 0
+	frame.indicators:SetScript("OnUpdate", frame.inVehicle and combatMonitor or nil)
+end
+
 function Indicators:UpdateStatus(frame)
 	if( not frame.indicators.status or not frame.indicators.status.enabled ) then return end
 
@@ -260,6 +268,9 @@ function Indicators:OnEnable(frame)
 		frame.indicators.parent = frame
 
 		if( frame.unitType == "player" ) then
+			if WoWWrath then
+				frame:RegisterUpdateFunc(self, "CheckVehicle")
+			end
 			frame:RegisterNormalEvent("PLAYER_REGEN_ENABLED", self, "UpdateStatus")
 			frame:RegisterNormalEvent("PLAYER_REGEN_DISABLED", self, "UpdateStatus")
 			frame:RegisterNormalEvent("PLAYER_UPDATE_RESTING", self, "UpdateStatus")

modules/tags.lua

@@ -792,7 +792,17 @@ Tags.defaultTags = {
 			return ShadowUF.L["Offline"]
 		end
 	end]],
-	["cpoints"] = [[function(unit, unitOwner)
+	["cpoints"] = WoWWrath and [[function(unit, unitOwner)
+		if( UnitHasVehicleUI("player") and UnitHasVehiclePlayerFrameUI("player") ) then
+			local points = GetComboPoints("vehicle")
+			if( points == 0 ) then
+				points = GetComboPoints("vehicle", "vehicle")
+			end
+			return points
+		else
+			return UnitPower("player", Enum.PowerType.ComboPoints)
+		end
+	end]] or [[function(unit, unitOwner)
 		return UnitPower("player", Enum.PowerType.ComboPoints)
 	end]],
 	["smartlevel"] = [[function(unit, unitOwner)