Added Buddies to Damage Meter UI

reframework/autorun/MHR_Overlay/Misc/config.lua

@@ -4208,6 +4208,7 @@ function config.init()
 
 				hide_myself = false,
 				hide_other_players = false,
+				hide_servants = false,
 				hide_total_damage = false,
 
 				hide_module_if_total_damage_is_zero = false,
@@ -4218,8 +4219,10 @@ function config.init()
 				freeze_dps_on_quest_end = true,
 				
 				show_my_otomos_separately = true,
-				show_other_otomos_separately = true,
-				show_followers_separately = true,
+				show_other_player_otomos_separately = true,
+				show_servant_otomos_separately = true,
+				
+
 
 				orientation = "Vertical", -- "Vertical" or "Horizontal"
 				highlighted_bar = "Me",
@@ -4263,7 +4266,36 @@ function config.init()
 						type = false,
 						id = false,
 						name = true
+					},
+
+					servants = {
+						type = false,
+						id = false,
+						name = true
+					},
+					
+					my_otomos = {
+						level = true,
+						type = false,
+						id = false,
+						name = true
+					},
+
+					other_player_otomos = {
+						level = true,
+						type = false,
+						id = false,
+						name = true
+					},
+
+					servant_otomos = {
+						level = true,
+						type = false,
+						id = false,
+						name = true
 					}
+
+					
 				},
 
 				text = "%s",
@@ -4295,6 +4327,18 @@ function config.init()
 					others = {
 						master_rank = true,
 						hunter_rank = true
+					},
+
+					my_otomos = {
+						level = true,
+					},
+
+					other_player_otomos = {
+						level = true,
+					},
+
+					servant_otomos = {
+						level = true
 					}
 				},
 

reframework/autorun/MHR_Overlay/Misc/language.lua

@@ -317,9 +317,9 @@ language.default_language = {
 		id = "ID",
 		name = "Name",
 
-		show_my_otomos_separately = "Show my Buddies separately",
-		show_other_otomos_separately = "Show other Buddies separately",
-		show_followers_separately = "Show Followers separately",
+		show_my_otomos_separately = "Show My Buddies separately",
+		show_other_player_otomos_separately = "Show Other Player Buddies separately",
+		show_servant_otomos_separately = "Show Follower Buddies separately",
 
 		dps_mode = "DPS Mode",
 		dps = "DPS",
@@ -394,6 +394,7 @@ language.default_language = {
 
 		hide_myself = "Hide Myself",
 		hide_other_players = "Hide Other Players",
+		hide_servants = "Hide Followers",
 		hide_total_damage = "Hide Total Damage",
 
 		player_name_size_limit = "Player Name Size Limit",
@@ -433,6 +434,12 @@ language.default_language = {
 		highest_health_percentage = "Highest Health Percentage",
 
 		reframework_outdated = "Installed REFramework version is outdated. Please, update. Otherwise, MHR Overlay won't work correctly.",
+
+		servants = "Followers",
+		my_otomos = "My Buddies",
+		other_player_otomos = "Other Player Buddies",
+		servant_otomos = "Servant Buddies",
+		level = "Level"
 	}
 };
 
@@ -449,9 +456,7 @@ function language.load()
 	end
 
 	for i, language_file_name in ipairs(language_files) do
-		local language_name = language_file_name:gsub(language.language_folder, ""):gsub(".json"
-			,
-			"");
+		local language_name = language_file_name:gsub(language.language_folder, ""):gsub(".json","");
 
 		local loaded_language = json.load_file(language_file_name);
 		if loaded_language ~= nil then

reframework/autorun/MHR_Overlay/Misc/unicode_helpers.lua

@@ -39,7 +39,7 @@ function unicode_helpers.map(s, f, no_subs)
 		for b, e in s:gmatch("()" .. pattern .. "()") do
 			i = i + 1;
 			local c = e - b;
-			f(i, c, b)
+			f(i, c, b);
 		end
 	else
 		for b, c in s:gmatch("()(" .. pattern .. ")") do
@@ -51,6 +51,34 @@ end
 
 -- THE REST
 
+-- returns the number of characters in a UTF-8 string
+function unicode_helpers.len(s)
+	-- count the number of non-continuing bytes
+	return select(2, s:gsub('[^\128-\193]', ''));
+end
+
+-- replace all utf8 chars with mapping
+function unicode_helpers.replace(s, map)
+	return s:gsub(pattern, map);
+end
+
+-- reverse a utf8 string
+function unicode_helpers.reverse(s)
+	-- reverse the individual greater-than-single-byte characters
+	s = s:gsub(pattern,function (c)
+		return #c > 1 and c:reverse()
+	end);
+
+	return s:reverse();
+end
+
+-- strip non-ascii characters from a utf8 string
+function unicode_helpers.strip(s)
+	return s:gsub(pattern, function(c)
+		return #c > 1 and '';
+	end);
+end
+
 -- generator for the above -- to iterate over all utf8 chars
 function unicode_helpers.chars(s, no_subs)
 	return coroutine.wrap(function()