Light Meter 

--- a/LightMeter.lua	2009-12-21 17:15:38.000000000 -0800
+++ b/LightMeter.lua	2010-06-04 09:48:53.000000000 -0700
@@ -192,10 +192,16 @@
         LightMeter_OOC = false;
     elseif event == "COMBAT_LOG_EVENT_UNFILTERED" then
     	local timestamp, logevent, sourceGUID, sourceName, sourceFlags, destGUID, destName, destFlags = select(1, ...)
+    	if(sourceName) then
+	    	sourceName = sourceName:gsub("-"," - ")
+	    end
+	    if(destName) then
+			destName = destName:gsub("-"," - ")
+		end
     	local prefix,suffix = strsplit( "_" , logevent , 2 )
     	if logevent == "SPELL_HEAL" then
     		-- direct healing spell
-    		local spellID,spellName,spellSchool,amount,overhealing,crit = select( 9, ... )
+    		local spellID,spellName,spellSchool,amount,overhealing,absorbed,crit = select( 9, ... )
     		if ( sourceName == UnitName("player") and destName == LightMeterTarget ) then
                 -- player cast the spell, and landed on target, so update ghost bar
                 LightMeter_UpdateGhostBar( destName , spellID , spellName , amount , overhealing , crit )
@@ -242,7 +248,7 @@
     	end
     elseif ( event == "UNIT_MAXHEALTH" or event == "UNIT_HEALTH" ) then
     	local unitID = params[1]
-    	if ( LightMeterTarget and UnitName(unitID) == LightMeterTarget ) then
+    	if ( LightMeterTarget and GetUnitName(unitID,true) == LightMeterTarget ) then
     		LightMeterTargetMaxHealth = UnitHealthMax( unitID )
     		LightMeter_UpdateHealth( unitID )
     	end
@@ -261,6 +267,9 @@
     elseif event == "UNIT_SPELLCAST_SENT" then
     	--lmprint( table.concat( params , " | " ) )
     	local casterUnit,spellName,spellRank,spellTarget = select( 1 , ... )
+    	if(spellTarget) then
+			spellTarget = spellTarget:gsub("-", " - ")
+		end
     	if ( casterUnit == "player" and LightMeterSpellCoefs[ spellName ] ) then
     		-- source is player and spell is healing spell, so show the yellow bar
     		--lmprint( spellTarget )
@@ -276,11 +285,11 @@
     		--lmprint( "UNIT_SPELLCAST_SENT"..tostring(tid) )
     		
     		LightMeter_TargetChange( tid ) -- ensures visibility
-    		if params[2] ~= "Power Word: Shield" then
-    			LightMeter_UpdateHealingBar( params[2] , params[3] ) -- name and rank of spell
+    		if spellName ~= "Power Word: Shield" then
+    			LightMeter_UpdateHealingBar( spellName, spellRank ) -- name and rank of spell
             else
                 -- PW:S, so update the shield
-                LightMeter_UpdateShield( LightMeter_UnitFromName( params[4] ) , params[3] )
+                LightMeter_UpdateShield( LightMeter_UnitFromName( spellTarget ) )
     		end
     		LightMeter_UpdateDisplay( tid )
     		LightMeterAllFadeTimer = 5
@@ -400,23 +409,23 @@
     local unitID = nil
     local nParty = GetNumPartyMembers()
     for i = 1,nParty do
-        if UnitName("party"..i) == unitName then
+        if GetUnitName("party"..i,true) == unitName then
             unitID = "party"..i
         end
     end
     local nRaid = GetNumRaidMembers()
     for i = 1,nRaid do
-        if UnitName("raid"..i) == unitName then
+        if GetUnitName("raid"..i,true) == unitName then
             unitID = "raid"..i
         end
     end
     if not unitID then
         -- haven't found yet, so check target and focus
-        if UnitName("focus") == unitName then
+        if GetUnitName("focus",true) == unitName then
             unitID = "focus"
-        elseif UnitName("target") == unitName then
+        elseif GetUnitName("target",true) == unitName then
             unitID = "target"
-        elseif UnitName("player") == unitName then
+        elseif GetUnitName("player",true) == unitName then
         	unitID = "player"
         end
     end
@@ -432,11 +441,11 @@
 		return
 	end
 	
-    if UnitName( targetID ) then
+    if GetUnitName( targetID, true ) then
         if ( UnitIsFriend( targetID , "player" ) ) then
             -- filter out NPCs when OOC
             if ( UnitIsPlayer( targetID ) or not LightMeter_OOC ) then
-                LightMeterTarget = UnitName( targetID )
+                LightMeterTarget = GetUnitName( targetID, true )
                 LightMeterTargetHealth = UnitHealth( targetID )
                 LightMeter_UpdateHealth( targetID )
                 LightMeter_Frames.TargetName:SetText( "|cffffffff"..LightMeterTarget )
@@ -516,7 +525,7 @@
 end
 
 function LightMeter_UpdateShield( unitID , spellRank )
-	local unitName = UnitName( unitID )
+	local unitName = GetUnitName( unitID, true )
 	
 	local h = LightMeter_ExpectedHealing( nil , "Power Word: Shield" , spellRank )
 	LightMeter_AborbRecord = 0
@@ -566,7 +575,7 @@
     local nameTalent, iconPath, tier, column, currentRank = GetTalentInfo( 1 , 24 )
 	if currentRank == 0 then return end -- not specced for DA
     
-    local h = amount * 0.3 -- strength of shield is 1/3 of full amount of critical heal, including overhealing
+    local h = amount * 0.1 * currentRank -- strength of shield is 10% of full amount of critical heal, including overhealing, per rank
     --lmprint( (amount - overhealing)*.3 .. "/" .. amount*.3 )
     LightMeter_AborbRecord = 0
     
@@ -1698,7 +1707,7 @@
                 local nameTalent, iconPath, tier, column, currentRank = GetTalentInfo( 1 , 27 )
                 local talentBorrowedTime = currentRank * 0.08
                 local sp = GetSpellBonusHealing()
-                local ih = 0.2 * ( 2230 + sp * 1.881*1.5/3.5 + sp * talentBorrowedTime ) * ( 1 + talentTwinDisciplines ) * ( 1 + talentFocusedPower ) * ( 1 + talentFocusedPower ) * 1.1
+                local ih = 0.2 * ( h + sp * 1.881*1.5/3.5 + sp * talentBorrowedTime ) * ( 1 + talentTwinDisciplines ) * ( 1 + talentFocusedPower ) * ( 1 + talentFocusedPower )
                 
                 GameTooltip:AddLine("Instant heal (glyph)",1,1,1)
                 local gicon = GetItemIcon("Glyph of Power Word: Shield")

local POS_Left = math.floor(LightMeter_ShieldTable[GetUnitName(unit,true)] or 0)
local DA_Left = math.floor(LightMeter_DivineAegisTable[GetUnitName(unit,true)] or 0)
local result = ""
if(POS_Left > 0) then
  result = result.."|cffff0000"..POS_Left
end
if(DA_Left>0) then
  result = result.." |cff00ff00"..DA_Left
end
return result