Revert "Whitelist default.json localization file"

This reverts commit 9560dad602.

README.md

@@ -34,11 +34,11 @@
 		<img alt="Platform" src="https://custom-icon-badges.demolab.com/badge/platform-win%20%7C%20linux%20%7C%20steam%20deck-blue?logo=device-desktop" />
 	</a>
 	<a href="">
-		<img alt="Maintenance" src="https://custom-icon-badges.demolab.com/maintenance/yes/2023?logo=tools" />
+		<img alt="Maintenance" src="https://custom-icon-badges.demolab.com/maintenance/yes/2024?logo=tools" />
 	</a>
 	<br>
 	<a href="https://www.nexusmods.com/monsterhunterrise/mods/26">
-		<img alt="REFramework Dependency" src="https://custom-icon-badges.demolab.com/badge/dependency-REFramework%20v1.503%2B-green?logo=package-dependencies" />
+		<img alt="REFramework Dependency" src="https://custom-icon-badges.demolab.com/badge/dependency-REFramework%20v1.605%2B-green?logo=package-dependencies" />
 	</a>
    	<a href="https://www.nexusmods.com/monsterhunterrise/mods/134">
 		<img alt="REFramework Direct2D Dependency" src="https://custom-icon-badges.demolab.com/badge/dependency-REFramework%20Direct2D%20v0.4.0%2B-yellow?logo=package-dependencies" />

reframework/autorun/MHR_Overlay.lua

@@ -543,7 +543,6 @@ end
 
 re.on_frame(function()
 	time.update_timers();
-	keyboard.update();
 
 	if d2d == nil or not config.current_config.global_settings.renderer.use_d2d_if_available then
 		draw_loop();

reframework/autorun/MHR_Overlay/Buffs/abnormal_statuses.lua

@@ -254,6 +254,8 @@ function this.update_poison(player)
 	local poison_level = poison_level_field:get_data(player);
 	if poison_level == nil then
 		error_handler.report("abnormal_statuses.update_poison", "Failed to access Data: poison_level");
+		this.list.poison = nil;
+		this.list.deadly_poison = nil;
 		return;
 	end
 
@@ -289,6 +291,8 @@ function this.update_bubbleblight(player)
 	local bubble_type = bubble_type_field:get_data(player);
 	if bubble_type == nil then
 		error_handler.report("abnormal_statuses.update_bubbleblight", "Failed to access Data: bubble_Type");
+		this.list.minor_bubbleblight = nil;
+		this.list.major_bubbleblight = nil;
 		return;
 	end
 
@@ -315,12 +319,14 @@ function this.update_muck(player)
 	local is_mud_damage = get_is_mud_damage_method:call(player);
 	if is_mud_damage == nil then
 		error_handler.report("abnormal_statuses.update_generic_boolean_value_method", "Failed to access Data: is_mud_damage");
+		this.list.muck = nil;
 		return;
 	end
 
 	local is_gold_mud_damage = get_is_gold_mud_damage_method:call(player);
 	if is_gold_mud_damage == nil then
 		error_handler.report("abnormal_statuses.update_generic_boolean_value_method", "Failed to access Data: is_gold_mud_damage");
+		this.list.muck = nil;
 		return;
 	end
 
@@ -340,12 +346,14 @@ function this.update_frenzy_infection(player)
 	local virus_accumulator_value = virus_accumulator_field:get_data(player);
 	if virus_accumulator_value == nil then
 		error_handler.report("abnormal_statuses.update_frenzy_infection", "Failed to access Data: virus_accumulator_value");
+		this.list.frenzy_infection = nil;
 		return;
 	end
 
 	local virus_timer = virus_timer_field:get_data(player);
 	if virus_timer == nil then
 		error_handler.report("abnormal_statuses.update_frenzy_infection", "Failed to access Data: virus_timer");
+		this.list.frenzy_infection = nil;
 		return;
 	end
 
@@ -361,6 +369,7 @@ end
 
 function this.update_sleep(player)
 	if this.apply_filter("sleep") then
+		this.list.sleep = nil;
 		return;
 	end
 

reframework/autorun/MHR_Overlay/Buffs/buffs.lua

@@ -256,6 +256,7 @@ function this.update_generic_buff(buff_list, filter_list, get_name_function,
 		
 		if value == nil then
 			error_handler.report("buffs.update_generic_number", string.format("Failed to access Data: %s_value", buff_key));
+			buff_list[buff_key] = nil;
 			return;
 		end
 
@@ -292,6 +293,7 @@ function this.update_generic_buff(buff_list, filter_list, get_name_function,
 
 		if timer == nil then
 			error_handler.report("buffs.update_generic_number", string.format("Failed to access Data: %s_timer", buff_key));
+			buff_list[buff_key] = nil;
 			return;
 		end
 

reframework/autorun/MHR_Overlay/Buffs/dango_skills.lua

@@ -221,11 +221,13 @@ function this.update_dango_insurance()
 
 	if singletons.player_manager == nil then
 		error_handler.report("dango_skills.update_dango_insurance", "Failed to access Data: player_manager");
+		this.list.dango_insurance = nil;
 		return;
 	end
 
 	if singletons.quest_manager == nil then
 		error_handler.report("dango_skills.update_dango_insurance", "Failed to access Data: quest_manager");
+		this.list.dango_insurance = nil;
 		return;
 	end
 
@@ -234,12 +236,14 @@ function this.update_dango_insurance()
 	local flag_cat_skill_insurance = flag_cat_skill_insurance_field:get_data(singletons.quest_manager);
 	if flag_cat_skill_insurance == nil then
 		error_handler.report("dango_skills.update_dango_insurance", "Failed to access Data: flag_cat_skill_insurance");
+		this.list.dango_insurance = nil;
 		return;
 	end
 
 	local is_cat_skill_insurance = is_cat_skill_insurance_method:call(singletons.quest_manager, flag_cat_skill_insurance);
 	if is_cat_skill_insurance == nil then
 		error_handler.report("dango_skills.update_dango_insurance", "Failed to access Data: is_cat_skill_insurance");
+		this.list.dango_insurance = nil;
 		return;
 	end
 
@@ -261,6 +265,7 @@ function this.update_dango_insurance_defense_up(player_data)
 	local insurance_def_up_lv3 = kitchen_skill_insurance_def_up_lv3_field:get_data(player_data);
 	if insurance_def_up_lv3 == nil then
 		error_handler.report("dango_skills.update_dango_insurance_defense_up", "Failed to access Data: insurance_def_up_lv3");
+		this.list.dango_insurance_defense_up = nil;
 		return;
 	end
 
@@ -269,6 +274,7 @@ function this.update_dango_insurance_defense_up(player_data)
 
 		if insurance_def_up_lv4 == nil then
 			error_handler.report("dango_skills.update_dango_insurance_defense_up", "Failed to access Data: insurance_def_up_lv4");
+			this.list.dango_insurance_defense_up = nil;
 			return;
 		end
 
@@ -293,6 +299,7 @@ function this.update_dango_flyer(player)
 	local is_kitchen_skill_wire_stop_regene = get_is_kitchen_skill_wire_stop_regene_method:call(player);
 	if is_kitchen_skill_wire_stop_regene == nil then
 		error_handler.report("dango_skills.update_dango_flyer", "Failed to access Data: is_kitchen_skill_wire_stop_regene");
+		this.list.dango_flyer = nil;
 		return;
 	end
 
@@ -301,6 +308,7 @@ function this.update_dango_flyer(player)
 		local is_kitchen_skill_wire_stop_heal_spd = get_is_kitchen_skill_wire_stop_heal_spd_method:call(player);
 		if is_kitchen_skill_wire_stop_heal_spd == nil then
 			error_handler.report("dango_skills.update_dango_flyer", "Failed to access Data: is_kitchen_skill_wire_stop_heal_spd");
+			this.list.dango_flyer = nil;
 			return;
 		end
 
@@ -331,6 +339,7 @@ function this.update_super_recovery_dango(player)
 	local kitchen_skill_surume_regene_timer = get_kitchen_skill_surume_regene_timer_method:call(player);
 	if kitchen_skill_surume_regene_timer == nil then
 		error_handler.report("dango_skills.update_super_recovery_dango", "Failed to access Data: kitchen_skill_surume_regene_timer");
+		this.list.super_recovery_dango = nil;
 		return;
 	end
 

reframework/autorun/MHR_Overlay/Buffs/endemic_life_buffs.lua

@@ -144,6 +144,8 @@ function this.update_ruby_and_gold_wirebugs(player, player_data)
 	local marionette_mode_type = get_marionette_mode_type_method:call(player);
 	if marionette_mode_type == nil then
 		error_handler.report("endemic_life_buffs.update_ruby_and_gold_wirebugs", "Failed to access Data: marionette_mode_type");
+		this.list.ruby_wirebug = nil;
+		this.list.gold_wirebug = nil;
 	end
 
 	if marionette_mode_type ~= 1 and marionette_mode_type ~= 2 then
@@ -168,6 +170,7 @@ function this.update_butterflame(player_data)
 	local atk_up_buff_second = atk_up_buff_second_field:get_data(player_data);
 	if atk_up_buff_second == nil then
 		error_handler.report("item_buffs.update_butterflame", "Failed to access Data: atk_up_buff_second");
+		this.list.butterflame = nil;
 		return;
 	end
 

reframework/autorun/MHR_Overlay/Buffs/item_buffs.lua

@@ -171,6 +171,8 @@ function this.update_demondrug(player_data, item_parameter)
 	local demondrug_value = atk_up_alive_field:get_data(player_data);
 	if demondrug_value == nil then
 		error_handler.report("item_buffs.update_demondrug", "Failed to access Data: demondrug_value");
+		this.list.demondrug = nil;
+		this.list.mega_demondrug = nil;
 		return;
 	end
 
@@ -183,12 +185,16 @@ function this.update_demondrug(player_data, item_parameter)
 	local demondrug_const_value = demondrug_atk_up_field:get_data(item_parameter);
 	if demondrug_const_value == nil then
 		error_handler.report("item_buffs.update_demondrug", "Failed to access Data: demondrug_const_value");
+		this.list.demondrug = nil;
+		this.list.mega_demondrug = nil;
 		return;
 	end
 
 	local mega_demondrug_const_value = great_demondrug_atk_up_field:get_data(item_parameter);
 	if mega_demondrug_const_value == nil then
 		error_handler.report("item_buffs.update_demondrug", "Failed to access Data: mega_demondrug_const_value");
+		this.list.demondrug = nil;
+		this.list.mega_demondrug = nil;
 		return;
 	end
 
@@ -222,6 +228,8 @@ function this.update_armorskin(player_data, item_parameter)
 	local armorskin_value = def_up_alive_field:get_data(player_data);
 	if armorskin_value == nil then
 		error_handler.report("item_buffs.update_armorskin", "Failed to access Data: armorskin_value");
+		this.list.armorskin = nil;
+		this.list.mega_armorskin = nil;
 		return;
 	end
 
@@ -234,12 +242,16 @@ function this.update_armorskin(player_data, item_parameter)
 	local armorskin_const_value = armorskin_def_up_field:get_data(item_parameter);
 	if armorskin_const_value == nil then
 		error_handler.report("item_buffs.update_armorskin", "Failed to access Data: armorskin_const_value");
+		this.list.armorskin = nil;
+		this.list.mega_armorskin = nil;
 		return;
 	end
 
 	local mega_armorskin_const_value = great_armorskin_def_up_field:get_data(item_parameter);
 	if mega_armorskin_const_value == nil then
 		error_handler.report("item_buffs.update_armorskin", "Failed to access Data: mega_armorskin_const_value");
+		this.list.armorskin = nil;
+		this.list.mega_armorskin = nil;
 		return;
 	end
 
@@ -269,12 +281,14 @@ function this.update_might_seed(player_data, item_parameter)
 	local atk_up_buff_second = atk_up_buff_second_field:get_data(player_data);
 	if atk_up_buff_second == nil then
 		error_handler.report("item_buffs.update_might_seed", "Failed to access Data: atk_up_buff_second");
+		this.list.might_seed = nil;
 		return;
 	end
 
 	local might_seed_atk_up = might_seed_atk_up_field:get_data(item_parameter);
 	if might_seed_atk_up == nil then
 		error_handler.report("item_buffs.update_might_seed", "Failed to access Data: might_seed_atk_up");
+		this.list.might_seed = nil;
 		return;
 	end
 

reframework/autorun/MHR_Overlay/Buffs/melody_effects.lua

@@ -153,6 +153,7 @@ function this.update(master_player)
 		local music_data = get_value_method:call(music_data_array, id);
 		if music_data == nil then
 			error_handler.report("melody_effects.update", "Failed to access Data: music_data No." .. tostring(id));
+			this.list[lua_index] = nil;
 			goto continue;
 		end
 
@@ -165,6 +166,7 @@ function this.update_melody_effect(lua_index, id, key, melody_effect, melody_dat
 	local melody_timer = time_field:get_data(melody_data);
 	if melody_timer == nil then
 		error_handler.report("melody_effects.update_melody_effect", "Failed to access Data: melody_timer No. " .. tostring(id));
+		this.list[lua_index] = nil;
 		return;
 	end
 

reframework/autorun/MHR_Overlay/Buffs/misc_buffs.lua

@@ -131,12 +131,14 @@ function this.update_attack_up(player_data, item_parameter)
 	local atk_up_buff_second = atk_up_buff_second_field:get_data(player_data);
 	if atk_up_buff_second == nil then
 		error_handler.report("item_buffs.update_attack_up", "Failed to access Data: atk_up_buff_second");
+		this.list.attack_up = nil;
 		return;
 	end
 
 	local might_seed_atk_up = might_seed_atk_up_field:get_data(item_parameter);
 	if might_seed_atk_up == nil then
 		error_handler.report("item_buffs.update_might_seed", "Failed to access Data: might_seed_atk_up");
+		this.list.attack_up = nil;
 		return;
 	end
 

reframework/autorun/MHR_Overlay/Buffs/rampage_skills.lua

@@ -88,7 +88,7 @@ function this.update_rampage_skill(key, value_owner, value_holder, timer_owner,
 end
 
 function this.apply_filter(key)
-	return this.apply_filter(this.list, config.current_config.buff_UI.filter.rampage_skills, key);
+	return buffs.apply_filter(this.list, config.current_config.buff_UI.filter.rampage_skills, key);
 end
 
 function this.init_all_UI()

reframework/autorun/MHR_Overlay/Buffs/skills.lua

@@ -515,6 +515,7 @@ function this.update_wind_mantle(player, weapon_type)
 	local is_wind_mantle_enable = is_equip_skill_226_enable_field:get_data(player);
 	if is_wind_mantle_enable == nil then
 		error_handler.report("skills.update_wind_mantle", "Failed to access Data: is_wind_mantle_enable");
+		this.list.wind_mantle = nil;
 		return;
 	end
 
@@ -526,12 +527,14 @@ function this.update_wind_mantle(player, weapon_type)
 	local wind_mantle_timer = equip_skill_226_attack_off_timer_field:get_data(player);
 	if wind_mantle_timer == nil then
 		error_handler.report("skills.update_wind_mantle", "Failed to access Data: wind_mantle_timer");
+		this.list.wind_mantle = nil;
 		return;
 	end
 
 	local wind_mantle_value = equip_skill_226_attack_count_field:get_data(player);
 	if wind_mantle_value == nil then
 		error_handler.report("skills.update_wind_mantle", "Failed to access Data: wind_mantle_value");
+		this.list.wind_mantle = nil;
 		return;
 	end
 
@@ -565,10 +568,12 @@ function this.update_maximum_might(player_data)
 	local whole_body_timer = whole_body_timer_field:get_data(player_data);
 	if whole_body_timer == nil then
 		error_handler.report("skills.update_maximum_might", "Failed to access Data: whole_body_timer");
+		this.list.maximum_might = nil;
 		return;
 	end
 
 	if player_info.list.max_stamina == -1 then
+		this.list.maximum_might = nil;
 		return;
 	end
 
@@ -628,6 +633,7 @@ function this.update_bloodlust()
 		local bloodlust_name = this.get_skill_name("bloodlust");
 		if bloodlust_name == nil then
 			error_handler.report("skills.update_bloodlust", "Failed to access Data: bloodlust_name");
+			this.list.bloodlust = nil;
 			return;
 		end
 
@@ -645,6 +651,7 @@ function this.update_frenzied_bloodlust(player, player_data)
 	local hunter_wire_skill_231_num = get_hunter_wire_skill_231_num_method:call(player);
 	if hunter_wire_skill_231_num == nil then
 		error_handler.report("skills.update_frenzied_bloodlust", "Failed to access Data: hunter_wire_skill_231_num");
+		this.list.frenzied_bloodlust = nil;
 		return;
 	end
 
@@ -658,12 +665,14 @@ function this.update_frenzied_bloodlust(player, player_data)
 	local equip_skill_231_wire_num_timer = equip_skill_231_wire_num_timer_field:get_data(player_data);
 	if equip_skill_231_wire_num_timer == nil then
 		error_handler.report("skills.update_frenzied_bloodlust", "Failed to access Data: equip_skill_231_wire_num_timer");
+		this.list.frenzied_bloodlust = nil;
 		return;
 	end
 
 	local equip_skill_231_wp_off_timer = equip_skill_231_wp_off_timer_field:get_data(player_data);
 	if equip_skill_231_wp_off_timer == nil then
 		error_handler.report("skills.update_frenzied_bloodlust", "Failed to access Data: equip_skill_231_wp_off_timer");
+		this.list.frenzied_bloodlust = nil;
 		return;
 	end
 
@@ -771,6 +780,7 @@ function this.update_resentment(player_data)
 	local r_vital = r_vital_field:get_data(player_data);
 	if r_vital == nil then
 		error_handler.report("skills.update_resentment", "Failed to access Data: r_vital");
+		this.list.resentment = nil;
 		return;
 	end
 
@@ -803,6 +813,7 @@ function this.update_spiribirds_call(player_data)
 	local equip_skill_211_timer = equip_skill_211_timer_field:get_data(player_data);
 	if equip_skill_211_timer == nil then
 		error_handler.report("skills.update_spiribirds_call", "Failed to access Data: equip_skill_211_timer");
+		this.list.spiribirds_call = nil;
 		return;
 	end
 

reframework/autorun/MHR_Overlay/Buffs/weapon_skills.lua

@@ -304,7 +304,7 @@ local insect_glaive_type_name = "insect_glaive";
 -- 13 Bow
 local bow_type_name = "bow";
 
-local previous_weapon_type = -1;
+local previous_weapon_type = 0;
 local previous_weapon_key = "great_sword";
 
 local spirit_gauge_breakpoints = {3, 2};
@@ -503,7 +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;
+	previous_weapon_key = this.keys[previous_weapon_type + 1].key;
 
 	if weapon_type == 0 then
 		this.update_great_sword_skills(player);
@@ -587,34 +587,40 @@ function this.update_harvest_moon()
 
 	if singletons.long_sword_shell_manager == nil then
 		error_handler.report("weapon_skills.update_harvest_moon", "Failed to access Data: long_sword_shell_manager");
+		this.list.harvest_moon = nil;
 		return;
 	end
 
 	local master_long_sword_shell_010_list =  get_master_long_sword_shell_010s_method:call(singletons.long_sword_shell_manager, players.myself.id);
 	if master_long_sword_shell_010_list == nil then
 		error_handler.report("weapon_skills.update_harvest_moon", "Failed to access Data: master_long_sword_shell_010_list");
+		this.list.harvest_moon = nil;
 		return;
 	end
 
 	local master_long_sword_shell_010_list_count = get_long_sword_shell_010_list_count_method:call(master_long_sword_shell_010_list);
 	if master_long_sword_shell_010_list_count == nil then
 		error_handler.report("weapon_skills.update_harvest_moon", "Failed to access Data: master_long_sword_shell_010_list_count");
+		this.list.harvest_moon = nil;
 		return;
 	end
 
 	if master_long_sword_shell_010_list_count == 0 then
+		this.list.harvest_moon = nil;
 		return;
 	end
 
 	local master_long_sword_shell_010 = get_long_sword_shell_010_list_item_method:call(master_long_sword_shell_010_list, 0);
 	if master_long_sword_shell_010 == nil then
 		error_handler.report("weapon_skills.update_harvest_moon", "Failed to access Data: master_long_sword_shell_010");
+		this.list.harvest_moon = nil;
 		return;
 	end
 
 	local life_timer = long_sword_shell_010_life_timer_field:get_data(master_long_sword_shell_010);
 	if life_timer == nil then
 		error_handler.report("weapon_skills.update_harvest_moon", "Failed to access Data: life_timer");
+		this.list.harvest_moon = nil;
 		return;
 	end
 
@@ -640,6 +646,7 @@ function this.update_wyvernblast_reload(player_data)
 	local wyvernblast_reload_timer = wyvernblast_reload_timer_field:get_data(player_data);
 	if wyvernblast_reload_timer == nil then
 		error_handler.report("weapon_skills.update_wyvernblast_reload", "Failed to access Data: heavy_bowgun_overheat_timer_field");
+		this.list.wyvernblast_reload = nil;
 		return;
 	end
 
@@ -669,18 +676,21 @@ function this.update_rising_moon()
 	
 	if singletons.light_bowgun_shell_manager == nil then
 		error_handler.report("weapon_skills.update_rising_moon", "Failed to access Data: light_bowgun_shell_manager");
+		this.list.rising_moon = nil;
 		return;
 	end
 
 	local light_bowgun_shell_030s_speed_boost_list =  get_light_bowgun_shell_030s_speed_boost_list_method:call(singletons.light_bowgun_shell_manager);
 	if light_bowgun_shell_030s_speed_boost_list == nil then
 		error_handler.report("weapon_skills.update_rising_moon", "Failed to access Data: light_bowgun_shell_030s_speed_boost_list");
+		this.list.rising_moon = nil;
 		return;
 	end
 
 	local light_bowgun_shell_030_speed_boost_list_count = get_light_bowgun_shell_030_list_count_method:call(light_bowgun_shell_030s_speed_boost_list);
 	if light_bowgun_shell_030_speed_boost_list_count == nil then
 		error_handler.report("weapon_skills.update_rising_moon", "Failed to access Data: light_bowgun_shell_030_speed_boost_list_count");
+		this.list.rising_moon = nil;
 		return;
 	end
 
@@ -693,12 +703,14 @@ function this.update_rising_moon()
 	local light_bowgun_shell_030 = get_light_bowgun_shell_030_list_item_method:call(light_bowgun_shell_030s_speed_boost_list, 0);
 	if light_bowgun_shell_030 == nil then
 		error_handler.report("weapon_skills.update_rising_moon", "Failed to access Data: light_bowgun_shell_030");
+		this.list.rising_moon = nil;
 		return;
 	end
 
 	local is_hit_enable = light_bowgun_shell_030_is_enable_hit_field:get_data(light_bowgun_shell_030);
 	if is_hit_enable == nil then
 		error_handler.report("weapon_skills.update_rising_moon", "Failed to access Data: is_hit_enable");
+		this.list.rising_moon = nil;
 		return;
 	end
 
@@ -710,6 +722,7 @@ function this.update_rising_moon()
 	local timer = light_bowgun_shell_030_timer_field:get_data(light_bowgun_shell_030);
 	if timer == nil then
 		error_handler.report("weapon_skills.update_rising_moon", "Failed to access Data: timer");
+		this.list.rising_moon = nil;
 		return;
 	end
 
@@ -728,18 +741,21 @@ function this.update_setting_sun()
 
 	if singletons.light_bowgun_shell_manager == nil then
 		error_handler.report("weapon_skills.update_setting_sun", "Failed to access Data: light_bowgun_shell_manager");
+		this.list.setting_sun = nil;
 		return;
 	end
 
 	local light_bowgun_shell_030s_all_list =  get_light_bowgun_shell_030s_all_list_method:call(singletons.light_bowgun_shell_manager);
 	if light_bowgun_shell_030s_all_list == nil then
 		error_handler.report("weapon_skills.update_setting_sun", "Failed to access Data: light_bowgun_shell_030s_all_list");
+		this.list.setting_sun = nil;
 		return;
 	end
 
 	local light_bowgun_shell_030_all_list_count = get_light_bowgun_shell_030_list_count_method:call(light_bowgun_shell_030s_all_list);
 	if light_bowgun_shell_030_all_list_count == nil then
 		error_handler.report("weapon_skills.update_setting_sun", "Failed to access Data: light_bowgun_shell_030_all_list_count");
+		this.list.setting_sun = nil;
 		return;
 	end
 
@@ -757,12 +773,14 @@ function this.update_setting_sun()
 	local light_bowgun_shell_030 = get_light_bowgun_shell_030_list_item_method:call(light_bowgun_shell_030s_all_list, 0);
 	if light_bowgun_shell_030 == nil then
 		error_handler.report("weapon_skills.update_setting_sun", "Failed to access Data: light_bowgun_shell_030");
+		this.list.setting_sun = nil;
 		return;
 	end
 
 	local is_hit_enable = light_bowgun_shell_030_is_enable_hit_field:get_data(light_bowgun_shell_030);
 	if is_hit_enable == nil then
 		error_handler.report("weapon_skills.update_setting_sun", "Failed to access Data: is_hit_enable");
+		this.list.setting_sun = nil;
 		return;
 	end
 
@@ -774,6 +792,7 @@ function this.update_setting_sun()
 	local timer = light_bowgun_shell_030_timer_field:get_data(light_bowgun_shell_030);
 	if timer == nil then
 		error_handler.report("weapon_skills.update_setting_sun", "Failed to access Data: timer");
+		this.list.setting_sun = nil;
 		return;
 	end
 
@@ -793,6 +812,7 @@ function this.update_overheat(player_data)
 	local heavy_bowgun_overheat_timer = heavy_bowgun_overheat_timer_field:get_data(player_data);
 	if heavy_bowgun_overheat_timer_field == nil then
 		error_handler.report("weapon_skills.update_overheat", "Failed to access Data: heavy_bowgun_overheat_timer_field");
+		this.list.overheat = nil;
 		return;
 	end
 
@@ -828,6 +848,7 @@ function this.update_twin_wine(player)
 	local chain_death_match_shell = chain_death_match_shell_field:get_data(player);
 	if chain_death_match_shell == nil then
 		error_handler.report("weapon_skills.update_twin_wine", "Failed to access Data: chain_death_match_shell");
+		this.list.twin_wine = nil;
 		return;
 	end
 
@@ -852,6 +873,7 @@ function this.update_archdemon_mode(player)
 	local is_kijin_kyouka = is_kijin_kyouka_field:get_data(player);
 	if is_kijin_kyouka == nil then
 		error_handler.report("weapon_skills.update_archdemon_mode", "Failed to access Data: is_kijin_kyouka");
+		this.list.archdemon_mode = nil;
 		return;
 	end
 
@@ -863,6 +885,7 @@ function this.update_archdemon_mode(player)
 	local kijin_kyouka_gauge = get_kijin_kyouka_gauge_method:call(player);
 	if kijin_kyouka_gauge == nil then
 		error_handler.report("weapon_skills.update_archdemon_mode", "Failed to access Data: kijin_kyouka_gauge");
+		this.list.archdemon_mode = nil;
 		return;
 	end
 
@@ -888,18 +911,21 @@ function this.update_bead_of_resonance()
 
 	if singletons.horn_shell_manager == nil then
 		error_handler.report("weapon_skills.update_bead_of_resonance", "Failed to access Data: horn_shell_manager");
+		this.list.bead_of_resonance = nil;
 		return;
 	end
 
 	local horn_shell_003s_array = horn_shell_003s_field:get_data(singletons.horn_shell_manager);
 	if horn_shell_003s_array == nil then
 		error_handler.report("weapon_skills.update_bead_of_resonance", "Failed to access Data: horn_shell_003s_list");
+		this.list.bead_of_resonance = nil;
 		return;
 	end
 
 	local horn_shell_003s_array_length = get_length_method:call(horn_shell_003s_array);
 	if horn_shell_003s_array_length == nil then
 		error_handler.report("weapon_skills.update_bead_of_resonance", "Failed to access Data: horn_shell_003s_array_length");
+		this.list.bead_of_resonance = nil;
 		return;
 	end
 
@@ -911,12 +937,14 @@ function this.update_bead_of_resonance()
 	local horn_shell_003_list = get_value_method:call(horn_shell_003s_array, players.myself.id);
 	if horn_shell_003_list == nil then
 		error_handler.report("weapon_skills.update_bead_of_resonance", "Failed to access Data: horn_shell_003_list");
+		this.list.bead_of_resonance = nil;
 		return;
 	end
 
 	local horn_shell_003_list_count = get_horn_shell_003_list_count_method:call(horn_shell_003_list);
 	if horn_shell_003_list_count == nil then
 		error_handler.report("weapon_skills.update_bead_of_resonance", "Failed to access Data: horn_shell_003_list_count");
+		this.list.bead_of_resonance = nil;
 		return;
 	end
 
@@ -928,12 +956,14 @@ function this.update_bead_of_resonance()
 	local horn_shell_003 = get_horn_shell_003_list_item_method:call(horn_shell_003_list, 0);
 	if horn_shell_003 == nil then
 		error_handler.report("weapon_skills.update_bead_of_resonance", "Failed to access Data: horn_shell_003");
+		this.list.bead_of_resonance = nil;
 		return;
 	end
 
 	local life_timer = horn_shell_003_life_timer_field:get_data(horn_shell_003);
 	if life_timer == nil then
 		error_handler.report("weapon_skills.update_bead_of_resonance", "Failed to access Data: life_timer");
+		this.list.bead_of_resonance = nil;
 		return;
 	end
 
@@ -952,18 +982,19 @@ function this.update_sonic_bloom(player)
 
 	local blast_speaker_shell = get_ref_blast_speaker_shell_method:call(player);
 	if blast_speaker_shell == nil then
-		this.list.bead_of_resonance = nil;
+		this.list.sonic_bloom = nil;
 		return;
 	end
 
 	local life_timer = horn_shell_020_life_timer_field:get_data(blast_speaker_shell);
 	if life_timer == nil then
 		error_handler.report("weapon_skills.update_sonic_bloom", "Failed to access Data: life_timer");
+		this.list.sonic_bloom = nil;
 		return;
 	end
 
 	if utils.number.is_equal(life_timer, 0) then
-		this.list.bead_of_resonance = nil;
+		this.list.sonic_bloom = nil;
 		return;
 	end
 
@@ -972,7 +1003,6 @@ end
 
 function this.update_charge_blade_skills(player)
 	this.update_weapon_skill("element_boost", charge_blade_type_name, nil, nil, player, shield_buff_timer_field);
-
 	this.update_weapon_skill("sword_boost_mode", charge_blade_type_name, nil, nil, player, sword_buff_timer_field);
 end
 
@@ -999,6 +1029,7 @@ function this.update_all_extracts_mix(player)
 	local is_get_all_extractive = is_get_all_extractive_method:call(player);
 	if is_get_all_extractive == nil then
 		error_handler.report("weapon_skills.update_all_extracts_mix", "Failed to access Data: is_get_all_extractive");
+		this.list.all_extracts_mix = nil;
 		return;
 	end
 
@@ -1010,6 +1041,7 @@ function this.update_all_extracts_mix(player)
 	local red_extractive_time = get_red_extractive_time_method:call(player);
 	if red_extractive_time == nil then
 		error_handler.report("weapon_skills.update_all_extracts_mix", "Failed to access Data: red_extractive_time");
+		this.list.all_extracts_mix = nil;
 		return;
 	end
 
@@ -1029,6 +1061,7 @@ function this.update_extract(player, extract_key, time_holder)
 	local extractive_time = time_holder:call(player);
 	if extractive_time == nil then
 		error_handler.report("weapon_skills.update_extract", string.format("Failed to access Data: %s_extractive_time", extract_key));
+		this.list[extract_key] = nil;
 		return;
 	end
 

reframework/autorun/MHR_Overlay/Game_Handler/keyboard.lua

@@ -9,6 +9,7 @@ local large_monster;
 local damage_meter_UI;
 local time;
 local error_handler;
+local quest_status;
 
 local sdk = sdk;
 local tostring = tostring;
@@ -49,6 +50,7 @@ local hard_keyboard_field_type_def = hard_keyboard_field:get_type();
 local get_down_method = hard_keyboard_field_type_def:get_method("getDown");
 local get_trigger_method = hard_keyboard_field_type_def:get_method("getTrg");
 local get_release_method = hard_keyboard_field_type_def:get_method("getRelease");
+local update_method = hard_keyboard_field_type_def:get_method("update");
 
 this.hotkey_modifiers_down = {
 	ctrl = false,
@@ -334,13 +336,7 @@ this.keys = {
 	--[254] = "Clear"
 };
 
-function this.update()
+function this.update(hard_keyboard)
-	if singletons.game_keyboard == nil then
-		error_handler.report("keyboard.update", "Failed to access Data: game_keyboard");
-		return;
-	end
-
-	local hard_keyboard = hard_keyboard_field:get_data(singletons.game_keyboard);
 	if hard_keyboard == nil then
 		error_handler.report("keyboard.update", "Failed to access Data: hard_keyboard");
 		return;
@@ -480,6 +476,28 @@ function this.register_hotkey(hard_keyboard)
 				return true;
 			end
 		end
+	elseif customization_menu.buff_UI_waiting_for_key then
+		for key, key_name in pairs(this.keys) do
+			if get_release_method:call(hard_keyboard, key) then
+				cached_config.buff_UI.ctrl = this.hotkey_modifiers_down.ctrl;
+				cached_config.buff_UI.shift = this.hotkey_modifiers_down.shift;
+				cached_config.buff_UI.alt = this.hotkey_modifiers_down.alt;
+				cached_config.buff_UI.key = key;
+				customization_menu.buff_UI_waiting_for_key = false;
+				return true;
+			end
+		end
+	elseif customization_menu.stats_UI_waiting_for_key then
+		for key, key_name in pairs(this.keys) do
+			if get_release_method:call(hard_keyboard, key) then
+				cached_config.stats_UI.ctrl = this.hotkey_modifiers_down.ctrl;
+				cached_config.stats_UI.shift = this.hotkey_modifiers_down.shift;
+				cached_config.stats_UI.alt = this.hotkey_modifiers_down.alt;
+				cached_config.stats_UI.key = key;
+				customization_menu.stats_UI_waiting_for_key = false;
+				return true;
+			end
+		end
 	end
 
 	return false;
@@ -503,7 +521,10 @@ function this.check_hotkeys(hard_keyboard)
 				or config.current_config.large_monster_UI.dynamic.enabled
 				or config.current_config.large_monster_UI.static.enabled
 				or config.current_config.large_monster_UI.highlighted.enabled
-				or config.current_config.damage_meter_UI.enabled;
+				or config.current_config.damage_meter_UI.enabled
+				or config.current_config.endemic_life_UI.enabled
+				or config.current_config.buff_UI.enabled
+				or config.current_config.stats_UI.enabled;
 
 			config.current_config.time_UI.enabled = not is_any_enabled;
 			config.current_config.small_monster_UI.enabled = not is_any_enabled;
@@ -511,6 +532,9 @@ function this.check_hotkeys(hard_keyboard)
 			config.current_config.large_monster_UI.static.enabled = not is_any_enabled;
 			config.current_config.large_monster_UI.highlighted.enabled = not is_any_enabled;
 			config.current_config.damage_meter_UI.enabled = not is_any_enabled;
+			config.current_config.endemic_life_UI.enabled = not is_any_enabled;
+			config.current_config.buff_UI.enabled = not is_any_enabled;
+			config.current_config.stats_UI.enabled = not is_any_enabled;
 		end
 	end
 
@@ -631,6 +655,34 @@ function this.check_hotkeys(hard_keyboard)
 			config.current_config.endemic_life_UI.enabled = not config.current_config.endemic_life_UI.enabled;
 		end
 	end
+
+	if not (cached_config.buff_UI.ctrl and not this.hotkey_modifiers_down.ctrl)
+	and not (cached_config.buff_UI.shift and not this.hotkey_modifiers_down.shift)
+	and not (cached_config.buff_UI.alt and not this.hotkey_modifiers_down.alt) then
+
+		local buff_UI_key_release = get_release_method:call(hard_keyboard, math.tointeger(cached_config.buff_UI.key));
+
+		if buff_UI_key_release == nil then
+			error_handler.report("keyboard.check_hotkeys", "Failed to access Data: buff_UI_key_release");
+
+		elseif buff_UI_key_release then
+			config.current_config.buff_UI.enabled = not config.current_config.buff_UI.enabled;
+		end
+	end
+
+	if not (cached_config.stats_UI.ctrl and not this.hotkey_modifiers_down.ctrl)
+	and not (cached_config.stats_UI.shift and not this.hotkey_modifiers_down.shift)
+	and not (cached_config.stats_UI.alt and not this.hotkey_modifiers_down.alt) then
+
+		local stats_UI_key_release = get_release_method:call(hard_keyboard, math.tointeger(cached_config.stats_UI.key));
+
+		if stats_UI_key_release == nil then
+			error_handler.report("keyboard.check_hotkeys", "Failed to access Data: stats_UI_key_release");
+
+		elseif stats_UI_key_release then
+			config.current_config.stats_UI.enabled = not config.current_config.stats_UI.enabled;
+		end
+	end
 end
 
 function this.get_hotkey_name(hotkey)
@@ -661,9 +713,19 @@ function this.init_dependencies()
 	damage_meter_UI = require("MHR_Overlay.UI.Modules.damage_meter_UI");
 	time = require("MHR_Overlay.Game_Handler.time");
 	error_handler = require("MHR_Overlay.Misc.error_handler");
+	quest_status = require("MHR_Overlay.Game_Handler.quest_status");
 end
 
 function this.init_module()
+	sdk.hook(update_method, function(args)
+		
+		local hard_keyboard = sdk.to_managed_object(args[2]);
+
+		this.update(hard_keyboard);
+
+	end, function(retval)
+		return retval;
+	end);
 end
 
 return this;

reframework/autorun/MHR_Overlay/Game_Handler/time.lua

@@ -74,14 +74,14 @@ function this.new_timer(callback, cooldown_seconds, start_offset_seconds)
 	this.timer_list[callback] =  timer;
 end
 
-function this.new_delay_timer(callback, delay)
+function this.new_delay_timer(callback, delay_seconds)
-	if callback == nil or delay == nil then
+	if callback == nil or delay_seconds == nil then
 		return;
 	end
 
 	local delay_timer = {};
 	delay_timer.callback = callback;
-	delay_timer.delay = delay;
+	delay_timer.delay = delay_seconds;
 	
 	delay_timer.init_time = os.clock();
 

reframework/autorun/MHR_Overlay/Misc/config.lua

@@ -36,7 +36,7 @@ local os = os;
 local ValueType = ValueType;
 local package = package;
 
-this.version = "2.6";
+this.version = "2.6.5";
 
 this.config_folder = "MHR Overlay\\configs\\";
 this.current_config_value_file_name = "MHR Overlay\\config.json";
@@ -292,6 +292,20 @@ function this.init_default()
 					ctrl = false,
 					alt = false,
 					key = 0
+				},
+
+				buff_UI = {
+					shift = false,
+					ctrl = false,
+					alt = false,
+					key = 0
+				},
+
+				stats_UI = {
+					shift = false,
+					ctrl = false,
+					alt = false,
+					key = 0
 				}
 			}
 		},
@@ -9201,7 +9215,7 @@ function this.load_configs()
 			table.insert(this.config_names, this.current_config_name);
 			table.insert(this.configs, this.current_config);
 	
-			this.save(this.current_config_name, this.current_config);
+			this.save(string.format("%s\\%s.json", this.config_folder, this.current_config_name), this.current_config);
 		end
 
 		this.save_current_config_name();

reframework/autorun/MHR_Overlay/UI/customization_menu.lua

@@ -145,6 +145,8 @@ this.large_monster_highlighted_UI_waiting_for_key = false;
 this.time_UI_waiting_for_key = false;
 this.damage_meter_UI_waiting_for_key = false;
 this.endemic_life_UI_waiting_for_key = false;
+this.buff_UI_waiting_for_key = false;
+this.stats_UI_waiting_for_key = false;
 this.menu_font_changed = false;
 
 this.config_name_input = "";
@@ -387,6 +389,7 @@ function this.draw()
 	local language_changed = false;
 	local modifiers_changed = false;
 	local modules_changed = false;
+	local hotkeys_changed = false;
 	local global_settings_changed = false;
 	local timer_delays_changed = false;
 	local small_monster_UI_changed = false;
@@ -422,7 +425,7 @@ function this.draw()
 
 	config_changed, apply_font_requested = this.draw_config();
 	modules_changed = this.draw_modules();
-	this.draw_hotkeys();
+	hotkeys_changed = this.draw_hotkeys();
 	global_settings_changed, modifiers_changed, timer_delays_changed, apply_font_requested, language_changed = this.draw_global_settings(apply_font_requested, config_changed);
 	small_monster_UI_changed = this.draw_small_monster_UI();
 
@@ -517,7 +520,7 @@ function this.draw()
 		this.reload_font();
 	end
 
-	if window_changed or modules_changed or global_settings_changed or small_monster_UI_changed or large_monster_dynamic_UI_changed or
+	if window_changed or modules_changed or hotkeys_changed or global_settings_changed or small_monster_UI_changed or large_monster_dynamic_UI_changed or
 		large_monster_static_UI_changed or large_monster_highlighted_UI_changed or time_UI_changed or damage_meter_UI_changed or
 		endemic_life_UI_changed or buff_UI_changed or stats_UI_changed or modifiers_changed or config_changed or debug_changed then
 		config.save_current();
@@ -653,6 +656,8 @@ function this.draw_modules()
 end
 
 function this.draw_hotkeys()
+	local config_changed = false;
+
 	if imgui.tree_node(language.current_language.customization_menu.hotkeys) then
 		if this.all_UI_waiting_for_key then
 			if imgui.button(language.current_language.customization_menu.press_any_key) then
@@ -661,25 +666,26 @@ function this.draw_hotkeys()
 				config.current_config.global_settings.hotkeys_with_modifiers.all_UI.shift = false;
 				config.current_config.global_settings.hotkeys_with_modifiers.all_UI.alt = false;
 				this.all_UI_waiting_for_key = false;
+				config_changed = true;
 			end
 
 		elseif imgui.button(language.current_language.customization_menu.all_UI) then
-			local is_any_other_waiting = this.small_monster_UI_waiting_for_key or
-				                             this.large_monster_UI_waiting_for_key or
-				                             this.large_monster_dynamic_UI_waiting_for_key or
-				                             this.large_monster_static_UI_waiting_for_key or
-				                             this.large_monster_highlighted_UI_waiting_for_key or
-				                             this.time_UI_waiting_for_key or
-				                             this.damage_meter_UI_waiting_for_key or
-				                             this.endemic_life_UI_waiting_for_key;
-			if not is_any_other_waiting then
 			this.all_UI_waiting_for_key = true;
-			end
+			this.small_monster_UI_waiting_for_key = false;
+			this.large_monster_UI_waiting_for_key = false;
+			this.large_monster_dynamic_UI_waiting_for_key = false;
+			this.large_monster_static_UI_waiting_for_key = false;
+			this.large_monster_highlighted_UI_waiting_for_key = false;
+			this.time_UI_waiting_for_key = false;
+			this.damage_meter_UI_waiting_for_key = false;
+			this.endemic_life_UI_waiting_for_key = false;
+			this.buff_UI_waiting_for_key = false;
+			this.stats_UI_waiting_for_key = false;
 		end
 
 		imgui.same_line();
-
 		imgui.text(keyboard.get_hotkey_name(config.current_config.global_settings.hotkeys_with_modifiers.all_UI));
+		
 		if this.small_monster_UI_waiting_for_key then
 			if imgui.button(language.current_language.customization_menu.press_any_key) then
 				config.current_config.global_settings.hotkeys_with_modifiers.small_monster_UI.key = 0;
@@ -687,24 +693,25 @@ function this.draw_hotkeys()
 				config.current_config.global_settings.hotkeys_with_modifiers.small_monster_UI.shift = false;
 				config.current_config.global_settings.hotkeys_with_modifiers.small_monster_UI.alt = false;
 				this.small_monster_UI_waiting_for_key = false;
+				config_changed = true;
 			end
 		elseif imgui.button(language.current_language.customization_menu.small_monster_UI) then
-			local is_any_other_waiting = this.all_UI_waiting_for_key or
+			this.all_UI_waiting_for_key = false;
-				                             this.large_monster_UI_waiting_for_key or
-				                             this.large_monster_dynamic_UI_waiting_for_key or
-				                             this.large_monster_static_UI_waiting_for_key or
-				                             this.large_monster_highlighted_UI_waiting_for_key or
-				                             this.time_UI_waiting_for_key or
-				                             this.damage_meter_UI_waiting_for_key or
-				                             this.endemic_life_UI_waiting_for_key;
-			if not is_any_other_waiting then
 			this.small_monster_UI_waiting_for_key = true;
-			end
+			this.large_monster_UI_waiting_for_key = false;
+			this.large_monster_dynamic_UI_waiting_for_key = false;
+			this.large_monster_static_UI_waiting_for_key = false;
+			this.large_monster_highlighted_UI_waiting_for_key = false;
+			this.time_UI_waiting_for_key = false;
+			this.damage_meter_UI_waiting_for_key = false;
+			this.endemic_life_UI_waiting_for_key = false;
+			this.buff_UI_waiting_for_key = false;
+			this.stats_UI_waiting_for_key = false;
 		end
 
 		imgui.same_line();
-
 		imgui.text(keyboard.get_hotkey_name(config.current_config.global_settings.hotkeys_with_modifiers.small_monster_UI));
+		
 		if this.large_monster_UI_waiting_for_key then
 			if imgui.button(language.current_language.customization_menu.press_any_key) then
 				config.current_config.global_settings.hotkeys_with_modifiers.large_monster_UI.key = 0;
@@ -712,24 +719,25 @@ function this.draw_hotkeys()
 				config.current_config.global_settings.hotkeys_with_modifiers.large_monster_UI.shift = false;
 				config.current_config.global_settings.hotkeys_with_modifiers.large_monster_UI.alt = false;
 				this.large_monster_UI_waiting_for_key = false;
+				config_changed = true;
 			end
 		elseif imgui.button(language.current_language.customization_menu.large_monster_UI) then
-			local is_any_other_waiting = this.all_UI_waiting_for_key or
+			this.all_UI_waiting_for_key = false;
-				                             this.small_monster_UI_waiting_for_key or
+			this.small_monster_UI_waiting_for_key = false;
-				                             this.large_monster_dynamic_UI_waiting_for_key or
-				                             this.large_monster_static_UI_waiting_for_key or
-				                             this.large_monster_highlighted_UI_waiting_for_key or
-				                             this.time_UI_waiting_for_key or
-				                             this.damage_meter_UI_waiting_for_key or
-				                             this.endemic_life_UI_waiting_for_key;
-			if not is_any_other_waiting then
 			this.large_monster_UI_waiting_for_key = true;
-			end
+			this.large_monster_dynamic_UI_waiting_for_key = false;
+			this.large_monster_static_UI_waiting_for_key = false;
+			this.large_monster_highlighted_UI_waiting_for_key = false;
+			this.time_UI_waiting_for_key = false;
+			this.damage_meter_UI_waiting_for_key = false;
+			this.endemic_life_UI_waiting_for_key = false;
+			this.buff_UI_waiting_for_key = false;
+			this.stats_UI_waiting_for_key = false;
 		end
 
 		imgui.same_line();
-
 		imgui.text(keyboard.get_hotkey_name(config.current_config.global_settings.hotkeys_with_modifiers.large_monster_UI));
+		
 		if this.large_monster_dynamic_UI_waiting_for_key then
 			if imgui.button(language.current_language.customization_menu.press_any_key) then
 				config.current_config.global_settings.hotkeys_with_modifiers.large_monster_dynamic_UI.key = 0;
@@ -737,25 +745,25 @@ function this.draw_hotkeys()
 				config.current_config.global_settings.hotkeys_with_modifiers.large_monster_dynamic_UI.shift = false;
 				config.current_config.global_settings.hotkeys_with_modifiers.large_monster_dynamic_UI.alt = false;
 				this.large_monster_dynamic_UI_waiting_for_key = false;
+				config_changed = true;
 			end
 		elseif imgui.button(language.current_language.customization_menu.large_monster_dynamic_UI) then
-			local is_any_other_waiting = this.all_UI_waiting_for_key or
+			this.all_UI_waiting_for_key = false;
-				                             this.small_monster_UI_waiting_for_key or
+			this.small_monster_UI_waiting_for_key = false;
-				                             this.large_monster_UI_waiting_for_key or
+			this.large_monster_UI_waiting_for_key = false;
-				                             this.large_monster_static_UI_waiting_for_key or
-				                             this.large_monster_highlighted_UI_waiting_for_key or
-				                             this.time_UI_waiting_for_key or
-				                             this.damage_meter_UI_waiting_for_key or
-				                             this.endemic_life_UI_waiting_for_key;
-			if not is_any_other_waiting then
 			this.large_monster_dynamic_UI_waiting_for_key = true;
-			end
+			this.large_monster_static_UI_waiting_for_key = false;
+			this.large_monster_highlighted_UI_waiting_for_key = false;
+			this.time_UI_waiting_for_key = false;
+			this.damage_meter_UI_waiting_for_key = false;
+			this.endemic_life_UI_waiting_for_key = false;
+			this.buff_UI_waiting_for_key = false;
+			this.stats_UI_waiting_for_key = false;
 		end
 
 		imgui.same_line();
+		imgui.text(keyboard.get_hotkey_name(config.current_config.global_settings.hotkeys_with_modifiers.large_monster_dynamic_UI));
 		
-		imgui.text(keyboard.get_hotkey_name(config.current_config.global_settings.hotkeys_with_modifiers
-			                                    .large_monster_dynamic_UI));
 		if this.large_monster_static_UI_waiting_for_key then
 			if imgui.button(language.current_language.customization_menu.press_any_key) then
 				config.current_config.global_settings.hotkeys_with_modifiers.large_monster_static_UI.key = 0;
@@ -763,25 +771,25 @@ function this.draw_hotkeys()
 				config.current_config.global_settings.hotkeys_with_modifiers.large_monster_static_UI.shift = false;
 				config.current_config.global_settings.hotkeys_with_modifiers.large_monster_static_UI.alt = false;
 				this.large_monster_static_UI_waiting_for_key = false;
+				config_changed = true;
 			end
 		elseif imgui.button(language.current_language.customization_menu.large_monster_static_UI) then
-			local is_any_other_waiting = this.all_UI_waiting_for_key or
+			this.all_UI_waiting_for_key = false;
-				                             this.small_monster_UI_waiting_for_key or
+			this.small_monster_UI_waiting_for_key = false;
-				                             this.large_monster_UI_waiting_for_key or
+			this.large_monster_UI_waiting_for_key = false;
-				                             this.large_monster_dynamic_UI_waiting_for_key or
+			this.large_monster_dynamic_UI_waiting_for_key = false;
-				                             this.large_monster_highlighted_UI_waiting_for_key or
-				                             this.time_UI_waiting_for_key or
-				                             this.damage_meter_UI_waiting_for_key or
-				                             this.endemic_life_UI_waiting_for_key;
-			if not is_any_other_waiting then
 			this.large_monster_static_UI_waiting_for_key = true;
-			end
+			this.large_monster_highlighted_UI_waiting_for_key = false;
+			this.time_UI_waiting_for_key = false;
+			this.damage_meter_UI_waiting_for_key = false;
+			this.endemic_life_UI_waiting_for_key = false;
+			this.buff_UI_waiting_for_key = false;
+			this.stats_UI_waiting_for_key = false;
 		end
 
 		imgui.same_line();
+		imgui.text(keyboard.get_hotkey_name(config.current_config.global_settings.hotkeys_with_modifiers.large_monster_static_UI));
 		
-		imgui.text(keyboard.get_hotkey_name(config.current_config.global_settings.hotkeys_with_modifiers
-			                                    .large_monster_static_UI));
 		if this.large_monster_highlighted_UI_waiting_for_key then
 			if imgui.button(language.current_language.customization_menu.press_any_key) then
 				config.current_config.global_settings.hotkeys_with_modifiers.large_monster_highlighted_UI.key = 0;
@@ -789,23 +797,25 @@ function this.draw_hotkeys()
 				config.current_config.global_settings.hotkeys_with_modifiers.large_monster_highlighted_UI.shift = false;
 				config.current_config.global_settings.hotkeys_with_modifiers.large_monster_highlighted_UI.alt = false;
 				this.large_monster_highlighted_UI_waiting_for_key = false;
+				config_changed = true;
 			end
 		elseif imgui.button(language.current_language.customization_menu.large_monster_highlighted_UI) then
-			local is_any_other_waiting = this.all_UI_waiting_for_key or
+			this.all_UI_waiting_for_key = false;
-				                             this.small_monster_UI_waiting_for_key or
+			this.small_monster_UI_waiting_for_key = false;
-				                             this.large_monster_UI_waiting_for_key or
+			this.large_monster_UI_waiting_for_key = false;
-				                             this.large_monster_dynamic_UI_waiting_for_key or
+			this.large_monster_dynamic_UI_waiting_for_key = false;
-				                             this.large_monster_static_UI_waiting_for_key or
+			this.large_monster_static_UI_waiting_for_key = false;
-				                             this.time_UI_waiting_for_key or
-				                             this.damage_meter_UI_waiting_for_key or
-				                             this.endemic_life_UI_waiting_for_key;
-			if not is_any_other_waiting then
 			this.large_monster_highlighted_UI_waiting_for_key = true;
+			this.time_UI_waiting_for_key = false;
+			this.damage_meter_UI_waiting_for_key = false;
+			this.endemic_life_UI_waiting_for_key = false;
+			this.buff_UI_waiting_for_key = false;
+			this.stats_UI_waiting_for_key = false;
 		end
-		end
+
 		imgui.same_line();
-		imgui.text(keyboard.get_hotkey_name(config.current_config.global_settings.hotkeys_with_modifiers
+		imgui.text(keyboard.get_hotkey_name(config.current_config.global_settings.hotkeys_with_modifiers.large_monster_highlighted_UI));
-			                                    .large_monster_highlighted_UI));
+		
 		if this.time_UI_waiting_for_key then
 			if imgui.button(language.current_language.customization_menu.press_any_key) then
 				config.current_config.global_settings.hotkeys_with_modifiers.time_UI.key = 0;
@@ -813,24 +823,25 @@ function this.draw_hotkeys()
 				config.current_config.global_settings.hotkeys_with_modifiers.time_UI.shift = false;
 				config.current_config.global_settings.hotkeys_with_modifiers.time_UI.alt = false;
 				this.time_UI_waiting_for_key = false;
+				config_changed = true;
 			end
 		elseif imgui.button(language.current_language.customization_menu.time_UI) then
-			local is_any_other_waiting = this.all_UI_waiting_for_key or
+			this.all_UI_waiting_for_key = false;
-				                             this.small_monster_UI_waiting_for_key or
+			this.small_monster_UI_waiting_for_key = false;
-				                             this.large_monster_UI_waiting_for_key or
+			this.large_monster_UI_waiting_for_key = false;
-				                             this.large_monster_dynamic_UI_waiting_for_key or
+			this.large_monster_dynamic_UI_waiting_for_key = false;
-				                             this.large_monster_static_UI_waiting_for_key or
+			this.large_monster_static_UI_waiting_for_key = false;
-				                             this.large_monster_highlighted_UI_waiting_for_key or
+			this.large_monster_highlighted_UI_waiting_for_key = false;
-				                             this.damage_meter_UI_waiting_for_key or
-				                             this.endemic_life_UI_waiting_for_key;
-			if not is_any_other_waiting then
 			this.time_UI_waiting_for_key = true;
-			end
+			this.damage_meter_UI_waiting_for_key = false;
+			this.endemic_life_UI_waiting_for_key = false;
+			this.buff_UI_waiting_for_key = false;
+			this.stats_UI_waiting_for_key = false;
 		end
 
 		imgui.same_line();
-
 		imgui.text(keyboard.get_hotkey_name(config.current_config.global_settings.hotkeys_with_modifiers.time_UI));
+		
 		if this.damage_meter_UI_waiting_for_key then
 			if imgui.button(language.current_language.customization_menu.press_any_key) then
 				config.current_config.global_settings.hotkeys_with_modifiers.damage_meter_UI.key = 0;
@@ -838,24 +849,25 @@ function this.draw_hotkeys()
 				config.current_config.global_settings.hotkeys_with_modifiers.damage_meter_UI.shift = false;
 				config.current_config.global_settings.hotkeys_with_modifiers.damage_meter_UI.alt = false;
 				this.damage_meter_UI_waiting_for_key = false;
+				config_changed = true;
 			end
 		elseif imgui.button(language.current_language.customization_menu.damage_meter_UI) then
-			local is_any_other_waiting = this.all_UI_waiting_for_key or
+			this.all_UI_waiting_for_key = false;
-				                             this.small_monster_UI_waiting_for_key or
+			this.small_monster_UI_waiting_for_key = false;
-				                             this.large_monster_UI_waiting_for_key or
+			this.large_monster_UI_waiting_for_key = false;
-				                             this.large_monster_dynamic_UI_waiting_for_key or
+			this.large_monster_dynamic_UI_waiting_for_key = false;
-				                             this.large_monster_static_UI_waiting_for_key or
+			this.large_monster_static_UI_waiting_for_key = false;
-				                             this.large_monster_highlighted_UI_waiting_for_key or
+			this.large_monster_highlighted_UI_waiting_for_key = false;
-				                             this.time_UI_waiting_for_key or
+			this.time_UI_waiting_for_key = false;
-				                             this.endemic_life_UI_waiting_for_key;
-			if not is_any_other_waiting then
 			this.damage_meter_UI_waiting_for_key = true;
-			end
+			this.endemic_life_UI_waiting_for_key = false;
+			this.buff_UI_waiting_for_key = false;
+			this.stats_UI_waiting_for_key = false;
 		end
 
 		imgui.same_line();
-
 		imgui.text(keyboard.get_hotkey_name(config.current_config.global_settings.hotkeys_with_modifiers.damage_meter_UI));
+		
 		if this.endemic_life_UI_waiting_for_key then
 			if imgui.button(language.current_language.customization_menu.press_any_key) then
 				config.current_config.global_settings.hotkeys_with_modifiers.endemic_life_UI.key = 0;
@@ -863,26 +875,81 @@ function this.draw_hotkeys()
 				config.current_config.global_settings.hotkeys_with_modifiers.endemic_life_UI.shift = false;
 				config.current_config.global_settings.hotkeys_with_modifiers.endemic_life_UI.alt = false;
 				this.endemic_life_UI_waiting_for_key = false;
+				config_changed = true;
 			end
 		elseif imgui.button(language.current_language.customization_menu.endemic_life_UI) then
-			local is_any_other_waiting = this.all_UI_waiting_for_key or
+			this.all_UI_waiting_for_key = false;
-				                             this.small_monster_UI_waiting_for_key or
+			this.small_monster_UI_waiting_for_key = false;
-				                             this.large_monster_UI_waiting_for_key or
+			this.large_monster_UI_waiting_for_key = false;
-				                             this.large_monster_dynamic_UI_waiting_for_key or
+			this.large_monster_dynamic_UI_waiting_for_key = false;
-				                             this.large_monster_static_UI_waiting_for_key or
+			this.large_monster_static_UI_waiting_for_key = false;
-				                             this.large_monster_highlighted_UI_waiting_for_key or
+			this.large_monster_highlighted_UI_waiting_for_key = false;
-				                             this.time_UI_waiting_for_key or
+			this.time_UI_waiting_for_key = false;
-				                             this.endemic_life_UI_waiting_for_key;
+			this.damage_meter_UI_waiting_for_key = false;
-			if not is_any_other_waiting then
 			this.endemic_life_UI_waiting_for_key = true;
-			end
+			this.buff_UI_waiting_for_key = false;
+			this.stats_UI_waiting_for_key = false;
 		end
 
 		imgui.same_line();
-
 		imgui.text(keyboard.get_hotkey_name(config.current_config.global_settings.hotkeys_with_modifiers.endemic_life_UI));
+		
+		if this.buff_UI_waiting_for_key then
+			if imgui.button(language.current_language.customization_menu.press_any_key) then
+				config.current_config.global_settings.hotkeys_with_modifiers.buff_UI.key = 0;
+				config.current_config.global_settings.hotkeys_with_modifiers.buff_UI.ctrl = false;
+				config.current_config.global_settings.hotkeys_with_modifiers.buff_UI.shift = false;
+				config.current_config.global_settings.hotkeys_with_modifiers.buff_UI.alt = false;
+				this.buff_UI_waiting_for_key = false;
+				config_changed = true;
+			end
+		elseif imgui.button(language.current_language.customization_menu.buff_UI) then
+			this.all_UI_waiting_for_key = false;
+			this.small_monster_UI_waiting_for_key = false;
+			this.large_monster_UI_waiting_for_key = false;
+			this.large_monster_dynamic_UI_waiting_for_key = false;
+			this.large_monster_static_UI_waiting_for_key = false;
+			this.large_monster_highlighted_UI_waiting_for_key = false;
+			this.time_UI_waiting_for_key = false;
+			this.damage_meter_UI_waiting_for_key = false;
+			this.endemic_life_UI_waiting_for_key = false;
+			this.buff_UI_waiting_for_key = true;
+			this.stats_UI_waiting_for_key = false;
+		end
+
+		imgui.same_line();
+		imgui.text(keyboard.get_hotkey_name(config.current_config.global_settings.hotkeys_with_modifiers.buff_UI));
+		
+		if this.stats_UI_waiting_for_key then
+			if imgui.button(language.current_language.customization_menu.press_any_key) then
+				config.current_config.global_settings.hotkeys_with_modifiers.stats_UI.key = 0;
+				config.current_config.global_settings.hotkeys_with_modifiers.stats_UI.ctrl = false;
+				config.current_config.global_settings.hotkeys_with_modifiers.stats_UI.shift = false;
+				config.current_config.global_settings.hotkeys_with_modifiers.stats_UI.alt = false;
+				this.stats_UI_waiting_for_key = false;
+				config_changed = true;
+			end
+		elseif imgui.button(language.current_language.customization_menu.stats_UI) then
+			this.all_UI_waiting_for_key = false;
+			this.small_monster_UI_waiting_for_key = false;
+			this.large_monster_UI_waiting_for_key = false;
+			this.large_monster_dynamic_UI_waiting_for_key = false;
+			this.large_monster_static_UI_waiting_for_key = false;
+			this.large_monster_highlighted_UI_waiting_for_key = false;
+			this.time_UI_waiting_for_key = false;
+			this.damage_meter_UI_waiting_for_key = false;
+			this.endemic_life_UI_waiting_for_key = false;
+			this.buff_UI_waiting_for_key = false;
+			this.stats_UI_waiting_for_key = true;
+		end
+
+		imgui.same_line();
+		imgui.text(keyboard.get_hotkey_name(config.current_config.global_settings.hotkeys_with_modifiers.stats_UI));
+		
 		imgui.tree_pop();
 	end
+
+	return config_changed;
 end
 
 function this.draw_global_settings(apply_font_requested, language_changed)