Nuke pet happiness from orbit.

colors.lua

@@ -18,14 +18,6 @@ local colors = {
 	reaction = {},
 }
 
-if(not WoW41) then
-	colors.happiness = {
-		[1] = {1, 0, 0}, -- need.... | unhappy
-		[2] = {1, 1, 0}, -- new..... | content
-		[3] = {0, 1, 0}, -- colors.. | happy
-	}
-end
-
 -- We do this because people edit the vars directly, and changing the default
 -- globals makes SPICE FLOW!
 if(IsAddOnLoaded'!ClassColors' and CUSTOM_CLASS_COLORS) then

elements/health.lua

@@ -1,5 +1,3 @@
-local WoW41 = select(4, GetBuildInfo()) == 40100
-
 local parent, ns = ...
 local oUF = ns.oUF
 
@@ -28,8 +26,6 @@ local Update = function(self, event, unit, powerType)
 		t = self.colors.tapped
 	elseif(health.colorDisconnected and not UnitIsConnected(unit)) then
 		t = self.colors.disconnected
-	elseif(not WoW41 and health.colorHappiness and UnitIsUnit(unit, "pet") and GetPetHappiness()) then
-		t = self.colors.happiness[GetPetHappiness()]
 	elseif(health.colorClass and UnitIsPlayer(unit)) or
 		(health.colorClassNPC and not UnitIsPlayer(unit)) or
 		(health.colorClassPet and UnitPlayerControlled(unit) and not UnitIsPlayer(unit)) then

elements/power.lua

@@ -1,5 +1,3 @@
-local WoW41 = select(4, GetBuildInfo()) == 40100
-
 local parent, ns = ...
 local oUF = ns.oUF
 
@@ -33,8 +31,6 @@ local Update = function(self, event, unit)
 		t = self.colors.tapped
 	elseif(power.colorDisconnected and not UnitIsConnected(unit)) then
 		t = self.colors.disconnected
-	elseif(not WoW41 and power.colorHappiness and UnitIsUnit(unit, "pet") and GetPetHappiness()) then
-		t = self.colors.happiness[GetPetHappiness()]
 	elseif(power.colorPower) then
 		local ptype, ptoken, altR, altG, altB = UnitPowerType(unit)
 

elements/tags.lua

@@ -2,8 +2,6 @@
 -- Credits: Vika, Cladhaire, Tekkub
 ]]
 
-local WoW41 = select(4, GetBuildInfo()) == 40100
-
 local parent, ns = ...
 local oUF = ns.oUF
 
@@ -343,25 +341,6 @@ local tagEvents = {
 	["pereclipse"]          = 'UNIT_POWER',
 }
 
-if(not WoW41) then
-	tagStrings['happiness'] = [[function(u)
-		if(UnitIsUnit(u, 'pet')) then
-			local happiness = GetPetHappiness()
-			if(happiness == 1) then
-				return ":<"
-			elseif(happiness == 2) then
-				return ":|"
-			elseif(happiness == 3) then
-				return ":D"
-			end
-		end
-	end]]
-
-	tagEvents['happiness'] = 'UNIT_POWER'
-end
-
-
-
 local unitlessEvents = {
 	PLAYER_LEVEL_UP = true,
 	PLAYER_UPDATE_RESTING = true,

oUF.xml

@@ -20,7 +20,6 @@
 	<Script file='elements\pvp.lua' />
 	<Script file='elements\portraits.lua' />
 	<Script file='elements\range.lua' />
-	<Script file='elements\happiness.lua' />
 	<Script file='elements\castbar.lua' />
 	<Script file='elements\threat.lua' />
 	<Script file='elements\tags.lua' />