Refactoring

reframework/autorun/MHR_Overlay/Misc/language.lua

@@ -47,7 +47,7 @@ language.default_language = {
 		left_leg_mud = "Leg L (Mud)",
 		right_leg_mud = "Leg R (Mud)",
 		tail_mud = "Tail (Mud)",
-		
+
 		tail_windsac = "Tail (Windsac)",
 		chest_windsac = "Chest (Windsac)",
 		back_windsac = "Back (Windsac)",
@@ -96,7 +96,7 @@ language.default_language = {
 		flash = "Flash",
 		poison = "Poison",
 		blast = "Blast",
-		exhaust ="Exhaust",
+		exhaust = "Exhaust",
 		ride = "Wyvern Riding",
 		waterblight = "Waterblight",
 		fireblight = "Fireblight",
@@ -207,7 +207,7 @@ language.default_language = {
 		text_label = "Text Label",
 		value_label = "Value Label",
 		percentage_label = "Percentage Label",
-		bar =  "Bar",
+		bar = "Bar",
 
 		width = "Width",
 		height = "Height",
@@ -279,7 +279,7 @@ language.default_language = {
 		my_damage_bar_location = "My Damage Bar Location",
 		first = "First",
 		last = "Last",
-		
+
 		small_monsters = "Small Monsters",
 		large_monsters = "Large Monsters",
 
@@ -293,7 +293,7 @@ language.default_language = {
 		blast_damage = "Blast Damage",
 
 		damage = "Damage",
-		
+
 		other_players = "Other Players",
 		hunter_rank = "Hunter Rank",
 		word_player = "Word \"Player\"";
@@ -385,21 +385,28 @@ language.default_language = {
 
 		freeze_dps_on_quest_clear = "Freeze DPS when Quest is cleared",
 
-			
+
 		health_break_severe_filter = "Health + Break + Severe",
 		health_break_filter = "Health + Break",
 		health_severe_filter = "Health + Severe",
 		health_filter = "Health",
 		break_severe_filter = "Break + Severe",
 		break_filter = "Break",
-		severe_filter = "Severe"
+		severe_filter = "Severe",
+
+		outline = "Outline",
+		thickness = "Thickness",
+		style = "Style",
+		inside = "Inside",
+		outside = "Outside",
+		center = "Center"
 	}
 };
 
 language.current_language = {};
 
-language.language_names = {"default"};
-language.languages = {language.default_language};
+language.language_names = { "default" };
+language.languages = { language.default_language };
 
 function language.load()
 	local language_files = fs.glob([[MHR Overlay\\languages\\.*json]]);
@@ -409,7 +416,9 @@ 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
@@ -436,11 +445,10 @@ function language.save(file_name, language_table)
 	end
 end
 
-function language.save_default();
+function language.save_default()
 	language.save(language.language_folder .. "en-us.json", language.default_language)
 end
 
-
 function language.update(index)
 	language.current_language = table_helpers.deep_copy(language.languages[index]);
 end
@@ -452,4 +460,4 @@ function language.init_module()
 	language.current_language = table_helpers.deep_copy(language.default_language);
 end
 
-return language;
+return language;

reframework/autorun/MHR_Overlay/Misc/table_helpers.lua

@@ -11,9 +11,13 @@ function table_helpers.deep_copy(original, copies)
 			copy = {};
 			copies[original] = copy;
 			for original_key, original_value in next, original, nil do
-				copy[table_helpers.deep_copy(original_key, copies)] = table_helpers.deep_copy(original_value, copies);
+				copy[table_helpers.deep_copy(original_key, copies)] = table_helpers.deep_copy(original_value
+					,
+					copies);
 			end
-			setmetatable(copy, table_helpers.deep_copy(getmetatable(original), copies));
+			setmetatable(copy,
+				table_helpers.deep_copy(getmetatable(original)
+					, copies));
 		end
 	else -- number, string, boolean, etc
 		copy = original;
@@ -36,7 +40,7 @@ function table_helpers.find_index(table, value, nullable)
 end
 
 function table_helpers.merge(...)
-	local tables_to_merge = {...};
+	local tables_to_merge = { ... };
 	assert(#tables_to_merge > 1, "There should be at least two tables to merge them");
 
 	for key, table in ipairs(tables_to_merge) do
@@ -64,11 +68,11 @@ end
 function table_helpers.tostring(table)
 	if type(table) == "table" then
 		local s = "{ \n";
-		for k,v in pairs(table) do
+		for k, v in pairs(table) do
 			if type(k) ~= "number" then
 				k = "\"" .. k .. "\"";
 			end
-			s = s .. "\t[" .. k .."] = " .. table_helpers.tostring(v) .. ",\n";
+			s = s .. "\t[" .. k .. "] = " .. table_helpers.tostring(v) .. ",\n";
 		end
 		return s .. "} \n";
 	else
@@ -79,4 +83,4 @@ end
 function table_helpers.init_module()
 end
 
-return table_helpers;
+return table_helpers;

reframework/autorun/MHR_Overlay/Misc/unicode_helpers.lua

@@ -19,7 +19,7 @@ local unicode_helpers = {};
 -- 1110xxxx	10xxxxxx 10xxxxxx          | FFFF   (65535)
 -- 11110xxx	10xxxxxx 10xxxxxx 10xxxxxx | 10FFFF (1114111)
 
-local pattern = '[%z\1-\127\194-\244][\128-\191]*';
+local pattern = "[%z\1-\127\194-\244][\128-\191]*";
 
 -- helper function
 function unicode_helpers.relative_position(position, length)
@@ -36,13 +36,13 @@ function unicode_helpers.map(s, f, no_subs)
 	local i = 0;
 
 	if no_subs then
-		for b, e in s:gmatch('()' .. pattern .. '()') do
+		for b, e in s:gmatch("()" .. pattern .. "()") do
 			i = i + 1;
 			local c = e - b;
 			f(i, c, b)
 		end
 	else
-		for b, c in s:gmatch('()(' .. pattern .. ')') do
+		for b, c in s:gmatch("()(" .. pattern .. ")") do
 			i = i + 1;
 			f(i, c, b);
 		end
@@ -53,7 +53,7 @@ end
 
 -- generator for the above -- to iterate over all utf8 chars
 function unicode_helpers.chars(s, no_subs)
-	return coroutine.wrap(function ()
+	return coroutine.wrap(function()
 		return unicode_helpers.map(s, coroutine.yield, no_subs);
 	end);
 end
@@ -61,52 +61,51 @@ end
 -- like string.sub() but i, j are utf8 strings
 -- a utf8-safe string.sub()
 function unicode_helpers.sub(string, i, j)
-		local l = utf8.len(string);
+	local l = utf8.len(string);
 
-		i =       unicode_helpers.relative_position(i, l);
-		j = j and unicode_helpers.relative_position(j, l) or l;
+	i = unicode_helpers.relative_position(i, l);
+	j = j and unicode_helpers.relative_position(j, l) or l;
 
-		if i < 1 then
-			i = 1;
-		end
-
-		if j > l then
-			j = l;
-		end
-
-		if i > j then
-			return '';
-		end
-
-		local diff = j - i;
-		local iterator = unicode_helpers.chars(string, true);
-
-		-- advance up to i
-		for _ = 1, i - 1 do
-			iterator();
-		end
-
-		local c, b = select(2, iterator());
-
-		-- i and j are the same, single-charaacter sub
-		if diff == 0 then
-			return string.sub(string, b, b + c - 1);
-		end
-
-		i = b;
-
-		-- advance up to j
-		for _ = 1, diff - 1 do
-			iterator();
-		end
-
-		c, b = select(2, iterator());
-
-		return string.sub(string, i, b + c - 1);
+	if i < 1 then
+		i = 1;
 	end
 
+	if j > l then
+		j = l;
+	end
+
+	if i > j then
+		return "";
+	end
+
+	local diff = j - i;
+	local iterator = unicode_helpers.chars(string, true);
+
+	-- advance up to i
+	for _ = 1, i - 1 do
+		iterator();
+	end
+
+	local c, b = select(2, iterator());
+
+	-- i and j are the same, single-charaacter sub
+	if diff == 0 then
+		return string.sub(string, b, b + c - 1);
+	end
+
+	i = b;
+
+	-- advance up to j
+	for _ = 1, diff - 1 do
+		iterator();
+	end
+
+	c, b = select(2, iterator());
+
+	return string.sub(string, i, b + c - 1);
+end
 
 function unicode_helpers.init_module()
 end
 
-return unicode_helpers;
+return unicode_helpers;