Update ru-ru.json to v2.6 + Add Buff Include Name

reframework/autorun/MHR_Overlay/Buffs/weapon_skills.lua

@@ -106,64 +106,6 @@ this.keys = {
 			"power_sheathe"
 		}
 	},
-	-- Long Sword
-	{
-		key = "long_sword",
-		skill_keys = {
-			"harvest_moon",
-			"spirit_gauge",
-			"spirit_gauge_autofill", -- Soaring Kick, Iai Slash
-		}
-	},
-	-- Sword & Shield
-	{
-		key = "sword_and_shield",
-		skill_keys = {
-			"destroyer_oil"
-		}
-	},
-	-- Dual Blades
-	{
-		key = "dual_blades",
-		skill_keys = {
-			"archdemon_mode",
-			"ironshine_silk",
-		}
-	},
-	-- Lance
-	{
-		key = "lance",
-		skill_keys = {
-			"anchor_rage",
-			"spiral_thrust",
-			"twin_wine"
-		}
-	},
-	-- Gunlance
-	{
-		key = "gunlance",
-		skill_keys = {
-			"erupting_cannon", 
-			"ground_splitter",
-
-		}
-	},
-	-- Hammer
-	{
-		key = "hammer",
-		skill_keys = {
-			"impact_burst"
-		}
-	},
-	-- Hunting Horn
-	{
-		key = "hunting_horn",
-		skill_keys = {
-			"bead_of_resonance",
-			"silkbind_shockwave",
-			"sonic_bloom"
-		}
-	},
 	-- Switch Axe
 	{
 		key = "switch_axe",
@@ -173,22 +115,13 @@ this.keys = {
 			"switch_charger",
 		}
 	},
-	-- Charge Blade
+	-- Long Sword
 	{
-		key = "charge_blade",
+		key = "long_sword",
 		skill_keys = {
-			"element_boost",
-			"sword_boost_mode"
-		}
-	},
-	-- Insect Glaive
-	{
-		key = "insect_glaive",
-		skill_keys = {
-			"red_extract",
-			"white_extract",
-			"orange_extract",
-			"all_extracts_mix"
+			"harvest_moon",
+			"spirit_gauge",
+			"spirit_gauge_autofill", -- Soaring Kick, Iai Slash
 		}
 	},
 	-- Light Bowgun
@@ -210,6 +143,73 @@ this.keys = {
 			"wyvernsnipe_reload"
 		}
 	},
+	-- Hammer
+	{
+		key = "hammer",
+		skill_keys = {
+			"impact_burst"
+		}
+	},
+	-- Gunlance
+	{
+		key = "gunlance",
+		skill_keys = {
+			"erupting_cannon", 
+			"ground_splitter",
+
+		}
+	},
+	-- Lance
+	{
+		key = "lance",
+		skill_keys = {
+			"anchor_rage",
+			"spiral_thrust",
+			"twin_wine"
+		}
+	},
+	-- Sword & Shield
+	{
+		key = "sword_and_shield",
+		skill_keys = {
+			"destroyer_oil"
+		}
+	},
+	-- Dual Blades
+	{
+		key = "dual_blades",
+		skill_keys = {
+			"archdemon_mode",
+			"ironshine_silk",
+		}
+	},
+	-- Hunting Horn
+	{
+		key = "hunting_horn",
+		skill_keys = {
+			"bead_of_resonance",
+			"silkbind_shockwave",
+			"sonic_bloom"
+		}
+	},
+	-- Charge Blade
+	{
+		key = "charge_blade",
+		skill_keys = {
+			"element_boost",
+			"sword_boost_mode"
+		}
+	},
+	-- Insect Glaive
+	{
+		key = "insect_glaive",
+		skill_keys = {
+			"red_extract",
+			"white_extract",
+			"orange_extract",
+			"all_extracts_mix"
+		}
+	},
 	-- Bow
 	{
 		key = "bow",
@@ -305,6 +305,7 @@ local insect_glaive_type_name = "insect_glaive";
 local bow_type_name = "bow";
 
 local previous_weapon_type = -1;
+local previous_weapon_key = "great_sword";
 
 local spirit_gauge_breakpoints = {3, 2};
 
@@ -502,6 +503,7 @@ function this.update(player, player_data, weapon_type)
 	end
 
 	previous_weapon_type = weapon_type;
+	previous_weapon_key = this.keys[previous_weapon_type].key;
 
 	if weapon_type == 0 then
 		this.update_great_sword_skills(player);
@@ -1061,7 +1063,7 @@ function this.get_weapon_skill_name(weapon_skill_key)
 	local weapon_skill_id = weapon_skill_ids[weapon_skill_key];
 	if weapon_skill_id == nil then
 		
-		local weapon_skill_name = language.current_language.weapon_skills[weapon_skill_key];
+		local weapon_skill_name = language.current_language.weapon_skills[previous_weapon_key][weapon_skill_key];
 		if weapon_skill_name == nil then
 			return weapon_skill_key;
 		end

reframework/autorun/MHR_Overlay/Misc/config.lua

@@ -7757,7 +7757,8 @@ function this.init_default()
 					text_formatting = "%s",
 	
 					include = {
-						skill_level = true
+						name = true,
+						effect_level = true
 					},
 	
 					offset = {
@@ -7850,7 +7851,8 @@ function this.init_default()
 					text_formatting = "%s",
 	
 					include = {
-						skill_level = true
+						name = true,
+						effect_level = true
 					},
 	
 					offset = {
@@ -7943,7 +7945,8 @@ function this.init_default()
 					text_formatting = "%s",
 	
 					include = {
-						skill_level = true
+						name = true,
+						effect_level = true
 					},
 	
 					offset = {
@@ -8036,7 +8039,8 @@ function this.init_default()
 					text_formatting = "%s",
 	
 					include = {
-						skill_level = true
+						name = true,
+						effect_level = true
 					},
 	
 					offset = {
@@ -8129,7 +8133,8 @@ function this.init_default()
 					text_formatting = "%s",
 	
 					include = {
-						skill_level = true
+						name = true,
+						effect_level = true
 					},
 	
 					offset = {
@@ -8222,7 +8227,8 @@ function this.init_default()
 					text_formatting = "%s",
 	
 					include = {
-						skill_level = true
+						name = true,
+						effect_level = true
 					},
 	
 					offset = {
@@ -8315,7 +8321,8 @@ function this.init_default()
 					text_formatting = "%s",
 	
 					include = {
-						skill_level = true
+						name = true,
+						effect_level = true
 					},
 	
 					offset = {
@@ -8408,7 +8415,8 @@ function this.init_default()
 					text_formatting = "%s",
 	
 					include = {
-						skill_level = true
+						name = true,
+						effect_level = true
 					},
 	
 					offset = {
@@ -8501,7 +8509,8 @@ function this.init_default()
 					text_formatting = "%s",
 	
 					include = {
-						skill_level = true
+						name = true,
+						effect_level = true
 					},
 	
 					offset = {
@@ -8594,7 +8603,8 @@ function this.init_default()
 					text_formatting = "%s",
 	
 					include = {
-						skill_level = true
+						name = true,
+						effect_level = true
 					},
 	
 					offset = {

reframework/autorun/MHR_Overlay/Misc/language.lua

@@ -272,7 +272,7 @@ this.default_language = {
 		divine_protection = "Divine Protection",
 		health_recovery_s = "Health Recovery (S)",
 		health_recovery_l = "Health Recovery (L)",
-		health_recovery_s_antidote = "Health Recovery (S) + (Antidote)",
+		health_recovery_s_antidote = "Health Recovery (S) + Antidote",
 		health_regeneration = "Health Regeneration",
 		stamina_use_reduced = "Stamina Use Reduced",
 		stamina_recovery_up = "Stamina Recovery Up",
@@ -310,7 +310,7 @@ this.default_language = {
 		agitator = "Agitator",
 		berserk = "Berserk",
 		bladescale_hone = "Bladescale Hone",
-		blood_awakening = "Blood Awakened",
+		blood_awakening = "Blood Awakening",
 		bloodlust = "Bloodlust",
 		burst = "Burst",
 		coalescence = "Coalescence",
@@ -903,7 +903,7 @@ this.default_language = {
 
 		infinite_buffs_location = "Infinite Buffs Location",
 
-		skill_level = "Skill Level"
+		effect_level = "Effect Level",
 	},
 };
 

reframework/autorun/MHR_Overlay/UI/UI_Entities/buff_UI_entity.lua

@@ -73,9 +73,13 @@ function this.draw(buff, buff_UI, position_on_screen, opacity_scale)
 		drawing.draw_bar(buff_UI.bar, position_on_screen, opacity_scale, 1);
 	end
 
-	local buff_name = buff.name;
-	if buff_UI.name_label.include.skill_level and buff.level > 1 then
-		buff_name = string.format("%s %s%d", buff_name, language.current_language.UI.lv, buff.level);
+	local buff_name = "";
+	if buff_UI.name_label.include.name then
+		buff_name = string.format("%s ", buff.name);
+	end
+
+	if buff_UI.name_label.include.effect_level and buff.level > 1 then
+		buff_name = string.format("%s%s%d", buff_name, language.current_language.UI.lv, buff.level);
 	end
 
 	drawing.draw_label(buff_UI.name_label, position_on_screen, opacity_scale, buff_name);

reframework/autorun/MHR_Overlay/UI/customization_menu.lua

@@ -591,6 +591,7 @@ function this.draw()
 
 	if buff_UI_changed or modifiers_changed or config_changed then
 		buffs.init_all_UI();
+		buffs.init_names();
 	end
 
 	if stats_UI_changed or modifiers_changed or config_changed then