Text provider '+<#n>k' now abbreviates millions as '+<#n>M'. Hitpoints text...

Text provider '+<#n>k' now abbreviates millions as '+<#n>M'. Hitpoints text now abbreviates millions as '<n>M'. Tooltip text now abbreviates millions as '<n>M'.

VuhDo.toc

 ## Interface: 70000
 ## Title: VuhDo ['vu:du:]
 ## Author: Iza@Gilneas, humfras, Ivaria@Hyjal
-## Version: 3.76
+## Version: 3.77
 ## Notes: Raid Frames providing click-heal functionality, buff and debuff control, main tank management and much more
 ## SavedVariablesPerCharacter: VUHDO_CONFIG, VUHDO_PANEL_SETUP, VUHDO_SPELL_ASSIGNMENTS, VUHDO_HOSTILE_SPELL_ASSIGNMENTS, VUHDO_MM_SETTINGS, VUHDO_PLAYER_TARGETS, VUHDO_MAINTANK_NAMES, VUHDO_BUFF_SETTINGS, VUHDO_POWER_TYPE_COLORS, VUHDO_SPELLS_KEYBOARD, VUHDO_SPELL_CONFIG, VUHDO_BUFF_ORDER, VUHDO_SPEC_LAYOUTS, VUHDO_GROUP_SIZE, VUHDO_RAID, VUHDO_INDICATOR_CONFIG
 ## SavedVariables: VUHDO_DEFAULT_LAYOUT, VUHDO_DEFAULT_PROFILE, VUHDO_PROFILES, VUHDO_MANUAL_ROLES, VUHDO_SPELL_LAYOUTS, VUHDO_USER_CLASS_COLORS, VUHDO_DEBUFF_BLACKLIST, VUHDO_BOUQUETS, VUHDO_COMBAT_LOG_TRACE, VUHDO_GLOBAL_CONFIG, VUHDO_DEBUG

VuhDoBarCustomizerHealth.lua

@@ -136,8 +136,9 @@ end
 
 --
 local function VUHDO_getKiloText(aNumber, aMaxNumber, aSetup)
-	return aSetup["LIFE_TEXT"]["verbose"] and aNumber
-	  or aMaxNumber > 100000 and format("%.0fk", aNumber * 0.001)
+	return aSetup["LIFE_TEXT"]["verbose"] and aNumber 
+		or aMaxNumber > 1000000 and format("%.1fM", aNumber * 0.000001)
+		or aMaxNumber > 100000 and format("%.0fk", aNumber * 0.001)
 		or aMaxNumber > 10000 and format("%.1fk", aNumber * 0.001)
 		or aNumber;
 end

VuhDoOptions/VuhDoOptions.toc

 ## Interface: 70000
 ## Title: VuhDo ['vu:du:] - Options
 ## Author: Iza@Gilneas, humfras, Ivaria@Hyjal
-## Version: 3.76
+## Version: 3.77
 ## Notes: VuhDo Options
 ## SavedVariables: VUHDO_OPTIONS_SETTINGS
 ## SavedVariablesPerCharacter: VUHDO_GLOBAL_ICONS, VUHDO_GI_SCAN_IDX

VuhDoTextProviders.lua

@@ -87,12 +87,20 @@ end
 
 --
 local function VUHDO_kiloValidator(anInfo, aValue)
-	return aValue >= 500 and floor(aValue * 0.001 + 0.5) or "";
+	
+	return aValue >= 500 and VUHDO_round(aValue * 0.001) or "";
+
 end
 
 
 local function VUHDO_plusKiloValidator(anInfo, aValue)
-	return aValue >= 500 and format("+%dk", aValue * 0.001 + 0.5) or "";
+
+	if aValue >= 1000000 then
+		return format("+%.1fM", aValue * 0.000001) or "";
+	elseif aValue >= 500 then
+		return format("+%dk", VUHDO_round(aValue * 0.001)) or "";
+	end
+
 end
 
 --

VuhDoToolbox.lua

@@ -35,6 +35,7 @@ local IsControlKeyDown = IsControlKeyDown;
 local IsShiftKeyDown = IsShiftKeyDown;
 local VUHDO_atan2 = math.atan2;
 local VUHDO_PI, VUHDO_2_PI = math.pi, math.pi * 2;
+local floor = floor;
 local pairs = pairs;
 local type = type;
 local abs = abs;
@@ -887,3 +888,16 @@ function VUHDO_isSpecialUnit(aUnit)
 
 end
 
+
+
+function VUHDO_round(number, digits)
+
+	if digits then
+		local shift = 10 ^ digits;
+
+		return floor(number * shift + 0.5) / shift;
+	else
+		return floor(number + 0.5);
+	end
+
+end

VuhDoTooltip.lua

@@ -240,9 +240,12 @@ end
 
 --
 local function VUHDO_getKiloText(aNumber)
-	return aNumber > 99500 and format("%dk", aNumber * 0.001)
+
+	return aNumber >= 1000000 and format("%.2fM", aNumber * 0.000001) 
+		or aNumber > 99500 and format("%dk", aNumber * 0.001)
 		or aNumber > 9500 and format("%.1fk", aNumber * 0.001)
 		or aNumber;
+
 end
 
 

changelog.txt

+Version 3.77
+
+
+Known issues:
+-- Limited support for Class Order Hall Bodyguards
+--   Bodyguards can be used in panels when set to target or focus
+--   Bodyguards have no unit ID so for now are only partially supported
+-- AOE advisor not yet updated for Legion
+--   Need new spell formulas and coefficients
+--   No support yet for new AOEs like 'Power Word: Radiance'
+-- Incoming heal estimation reported is not even close to accurate
+--   Bug in Blizzard API UnitGetIncomingHeals() - returns bogus values
+
+
+Improvements:
+-- Text provider '+<#n>k' now abbreviates millions as '+<#n>M'
+-- Hitpoints text now abbreviates millions as '<n>M'
+-- Tooltip text now abbreviates millions as '<n>M'
+
+
+--------------------------------------------------------------
 Version 3.76