diff --git a/reframework/autorun/MHR_Overlay/Buffs/abnormal_statuses.lua b/reframework/autorun/MHR_Overlay/Buffs/abnormal_statuses.lua index 8490095..6d977a2 100644 --- a/reframework/autorun/MHR_Overlay/Buffs/abnormal_statuses.lua +++ b/reframework/autorun/MHR_Overlay/Buffs/abnormal_statuses.lua @@ -372,9 +372,15 @@ function this.update_sleep(player) this.update_abnormal_status("sleep", nil, nil, player, sleep_duration_timer_field); end +function this.init_all_UI() + for abnormal_status_key, abnormal_status in pairs(this.list) do + buffs.init_UI(abnormal_status); + end +end + function this.init_names() - for abnormal_status_key, debuff in pairs(this.list) do - debuff.name = this.get_abnormal_status_name(abnormal_status_key); + for abnormal_status_key, abnormal_status in pairs(this.list) do + abnormal_status.name = this.get_abnormal_status_name(abnormal_status_key); end end diff --git a/reframework/autorun/MHR_Overlay/Buffs/buffs.lua b/reframework/autorun/MHR_Overlay/Buffs/buffs.lua index 2b251da..0e10b97 100644 --- a/reframework/autorun/MHR_Overlay/Buffs/buffs.lua +++ b/reframework/autorun/MHR_Overlay/Buffs/buffs.lua @@ -111,15 +111,34 @@ function this.init_buffs() this.list = {}; end +function this.init_all_UI() + abnormal_statuses.init_all_UI(); + item_buffs.init_all_UI(); + endemic_life_buffs.init_all_UI(); + melody_effects.init_all_UI(); + dango_skills.init_all_UI(); + rampage_skills.init_all_UI(); + skills.init_all_UI(); + weapon_skills.init_all_UI(); + otomo_moves.init_all_UI(); + misc_buffs.init_all_UI(); +end + function this.init_UI(buff) - local cached_config = config.current_config.buff_UI; + local cached_config = config.current_config.buff_UI[buff.type]; buff.buff_UI = buff_UI_entity.new(cached_config.bar, cached_config.name_label, cached_config.timer_label); end function this.init_names() abnormal_statuses.init_names(); + item_buffs.init_names(); + endemic_life_buffs.init_names(); + melody_effects.init_names(); + dango_skills.init_names(); + rampage_skills.init_names(); skills.init_names(); weapon_skills.init_names(); + otomo_moves.init_names(); misc_buffs.init_names(); end diff --git a/reframework/autorun/MHR_Overlay/Buffs/dango_skills.lua b/reframework/autorun/MHR_Overlay/Buffs/dango_skills.lua index 47c9497..b6dff2f 100644 --- a/reframework/autorun/MHR_Overlay/Buffs/dango_skills.lua +++ b/reframework/autorun/MHR_Overlay/Buffs/dango_skills.lua @@ -344,6 +344,18 @@ function this.update_super_recovery_dango(player) this.update_generic("super_recovery_dango"); end +function this.init_all_UI() + for dango_skill_key, dango_skill in pairs(this.list) do + buffs.init_UI(dango_skill); + end +end + +function this.init_names() + for dango_skill_key, dango_skill in pairs(this.list) do + dango_skill.name = this.get_dango_skill_name(dango_skill_key); + end +end + function this.get_dango_skill_name(key) local dango_skill_id = dango_skill_ids[key]; if dango_skill_id == nil then diff --git a/reframework/autorun/MHR_Overlay/Buffs/endemic_life_buffs.lua b/reframework/autorun/MHR_Overlay/Buffs/endemic_life_buffs.lua index d09ec91..23ce3df 100644 --- a/reframework/autorun/MHR_Overlay/Buffs/endemic_life_buffs.lua +++ b/reframework/autorun/MHR_Overlay/Buffs/endemic_life_buffs.lua @@ -179,6 +179,18 @@ function this.update_butterflame(player_data) this.update_endemic_life_buff("butterflame", nil, nil, player_data, atk_up_buff_second_timer_field); end +function this.init_all_UI() + for endemic_life_key, endemic_life in pairs(this.list) do + buffs.init_UI(endemic_life); + end +end + +function this.init_names() + for endemic_life_key, endemic_life in pairs(this.list) do + endemic_life.name = this.get_endemic_life_name(endemic_life_key); + end +end + function this.get_endemic_life_name(key) if singletons.message_manager == nil then error_handler.report("endemic_life_buffs.get_endemic_life_name", "Failed to access Data: message_manager"); diff --git a/reframework/autorun/MHR_Overlay/Buffs/item_buffs.lua b/reframework/autorun/MHR_Overlay/Buffs/item_buffs.lua index a63346b..ec73431 100644 --- a/reframework/autorun/MHR_Overlay/Buffs/item_buffs.lua +++ b/reframework/autorun/MHR_Overlay/Buffs/item_buffs.lua @@ -282,6 +282,18 @@ function this.update_might_seed(player_data, item_parameter) this.update_item_buff("might_seed", nil, nil, player_data, atk_up_buff_second_timer_field); end +function this.init_all_UI() + for item_buff_key, item_buff in pairs(this.list) do + buffs.init_UI(item_buff); + end +end + +function this.init_names() + for item_buff_key, item_buff in pairs(this.list) do + item_buff.name = this.get_item_buff_name(item_buff_key); + end +end + function this.get_item_buff_name(key) local item_buff_name = get_name_method:call(nil, item_ids[key]); if item_buff_name == nil then diff --git a/reframework/autorun/MHR_Overlay/Buffs/melody_effects.lua b/reframework/autorun/MHR_Overlay/Buffs/melody_effects.lua index a7a2a34..b2865cf 100644 --- a/reframework/autorun/MHR_Overlay/Buffs/melody_effects.lua +++ b/reframework/autorun/MHR_Overlay/Buffs/melody_effects.lua @@ -215,6 +215,18 @@ function this.apply_filter(key, lua_index) return true; end +function this.init_all_UI() + for melody_effect_id, melody_effect in pairs(this.list) do + buffs.init_UI(melody_effect); + end +end + +function this.init_names() + for melody_effect_id, melody_effect in pairs(this.list) do + melody_effect.name = this.get_melody_effect_name(melody_effect_id - 1); + end +end + function this.get_melody_effect_name(id) local melody_effect_name = get_name_method:call(nil, id); if melody_effect_name == nil then diff --git a/reframework/autorun/MHR_Overlay/Buffs/misc_buffs.lua b/reframework/autorun/MHR_Overlay/Buffs/misc_buffs.lua index d1011bc..5a944b9 100644 --- a/reframework/autorun/MHR_Overlay/Buffs/misc_buffs.lua +++ b/reframework/autorun/MHR_Overlay/Buffs/misc_buffs.lua @@ -148,9 +148,15 @@ function this.update_attack_up(player_data, item_parameter) this.update_misc_buff("attack_up", nil, nil, player_data, atk_up_buff_second_timer_field); end +function this.init_all_UI() + for misc_buff_key, misc_buff in pairs(this.list) do + buffs.init_UI(misc_buff); + end +end + function this.init_names() - for misc_buff_key, dango in pairs(this.list) do - dango.name = this.get_misc_buff_name(misc_buff_key); + for misc_buff_key, misc_buff in pairs(this.list) do + misc_buff.name = this.get_misc_buff_name(misc_buff_key); end end diff --git a/reframework/autorun/MHR_Overlay/Buffs/otomo_moves.lua b/reframework/autorun/MHR_Overlay/Buffs/otomo_moves.lua index 41465b7..4e55b02 100644 --- a/reframework/autorun/MHR_Overlay/Buffs/otomo_moves.lua +++ b/reframework/autorun/MHR_Overlay/Buffs/otomo_moves.lua @@ -119,6 +119,18 @@ function this.apply_filter(key) return buffs.apply_filter(this.list, config.current_config.buff_UI.filter.otomo_moves, key); end +function this.init_all_UI() + for otomo_move_key, otomo_move in pairs(this.list) do + buffs.init_UI(otomo_move); + end +end + +function this.init_names() + for otomo_move_key, otomo_move in pairs(this.list) do + otomo_move.name = this.get_otomo_move_name(otomo_move_key); + end +end + function this.get_otomo_move_name(key) local otomo_move_name = get_name_method:call(nil, otomo_moves_ids[key]); if otomo_move_name == nil then diff --git a/reframework/autorun/MHR_Overlay/Buffs/rampage_skills.lua b/reframework/autorun/MHR_Overlay/Buffs/rampage_skills.lua index bb79384..283cd14 100644 --- a/reframework/autorun/MHR_Overlay/Buffs/rampage_skills.lua +++ b/reframework/autorun/MHR_Overlay/Buffs/rampage_skills.lua @@ -91,9 +91,15 @@ function this.apply_filter(key) return this.apply_filter(this.list, config.current_config.buff_UI.filter.rampage_skills, key); end +function this.init_all_UI() + for rampage_skill_key, rampage_skill in pairs(this.list) do + buffs.init_UI(rampage_skill); + end +end + function this.init_names() - for rampage_skill_key, skill in pairs(this.list) do - skill.name = this.get_rampage_skill_name(rampage_skill_key); + for rampage_skill_key, rampage_skill in pairs(this.list) do + rampage_skill.name = this.get_rampage_skill_name(rampage_skill_key); end end diff --git a/reframework/autorun/MHR_Overlay/Buffs/skills.lua b/reframework/autorun/MHR_Overlay/Buffs/skills.lua index 01513bc..83fc19f 100644 --- a/reframework/autorun/MHR_Overlay/Buffs/skills.lua +++ b/reframework/autorun/MHR_Overlay/Buffs/skills.lua @@ -837,6 +837,12 @@ function this.update_blood_awakening(player, player_data) this.update_skill("blood_awakening", player, get_equip_skill_232_lv_method, player_data, equip_skill_232_timer_field, nil, nil, blood_awakening_breakpoints); end +function this.init_all_UI() + for skill_key, skill in pairs(this.list) do + buffs.init_UI(skill); + end +end + function this.init_names() for skill_key, skill in pairs(this.list) do skill.name = this.get_skill_name(skill_key); diff --git a/reframework/autorun/MHR_Overlay/Buffs/weapon_skills.lua b/reframework/autorun/MHR_Overlay/Buffs/weapon_skills.lua index c124bee..b0d2395 100644 --- a/reframework/autorun/MHR_Overlay/Buffs/weapon_skills.lua +++ b/reframework/autorun/MHR_Overlay/Buffs/weapon_skills.lua @@ -1044,6 +1044,12 @@ function this.update_bow_skills(player, player_data) this.update_weapon_skill("arc_shot_brace", bow_type_name, nil, nil, player_data, super_armor_item_timer_field); end +function this.init_all_UI() + for weapon_skill_key, weapon_skill in pairs(this.list) do + buffs.init_UI(weapon_skill); + end +end + function this.init_names() for weapon_skill_key, weapon_skill in pairs(this.list) do weapon_skill.name = this.get_weapon_skill_name(weapon_skill_key); diff --git a/reframework/autorun/MHR_Overlay/Damage_Meter/damage_hook.lua b/reframework/autorun/MHR_Overlay/Damage_Meter/damage_hook.lua index 0bf9772..4c3bf8f 100644 --- a/reframework/autorun/MHR_Overlay/Damage_Meter/damage_hook.lua +++ b/reframework/autorun/MHR_Overlay/Damage_Meter/damage_hook.lua @@ -231,33 +231,6 @@ function this.update_damage(enemy, enemy_calc_damage_info) players.update_damage(players.total, damage_source_type, is_large_monster, damage_object); players.update_damage(player, damage_source_type, is_large_monster, damage_object); - - --[[xy = string.format( - - PhysicalPartsVitalDamage(): %s - PhysicalPartsBreakVitalDamage(): %s - PhysicalPartsLossVitalDamage(): %s - PhysicalMultiPartsVitalDamage(): %s - - ElementPartsVitalDamage(): %s - ElementPartsBreakVitalDamage(): %s - ElementPartsLossVitalDamage(): %s - ElementMultiPartsVitalDamage(): %s - - IsBreakPartsDamage(): %s - , - tostring(enemy_calc_damage_info:get_PhysicalPartsVitalDamage()), - tostring(enemy_calc_damage_info:get_PhysicalPartsBreakVitalDamage()), - tostring(enemy_calc_damage_info:get_PhysicalPartsLossVitalDamage()), - tostring(enemy_calc_damage_info:get_PhysicalMultiPartsVitalDamage()), - - tostring(enemy_calc_damage_info:get_ElementPartsVitalDamage()), - tostring(enemy_calc_damage_info:get_ElementPartsBreakVitalDamage()), - tostring(enemy_calc_damage_info:get_ElementPartsLossVitalDamage()), - tostring(enemy_calc_damage_info:get_ElementMultiPartsVitalDamage()), - - tostring(enemy_calc_damage_info:get_IsBreakPartsDamage()) - );]] end function this.cart(dead_player_id, flag_cat_skill_insurance) diff --git a/reframework/autorun/MHR_Overlay/Misc/config.lua b/reframework/autorun/MHR_Overlay/Misc/config.lua index 1d967d7..3393b49 100644 --- a/reframework/autorun/MHR_Overlay/Misc/config.lua +++ b/reframework/autorun/MHR_Overlay/Misc/config.lua @@ -7741,94 +7741,933 @@ function this.init_default() } }, - name_label = { - visibility = true, - - settings = { - right_alignment_shift = 0 - }, - - text_formatting = "%s", - - include = { - skill_level = true - }, - - offset = { - x = 5, - y = 0 - }, - - color = 0xFFFEFF88, - - shadow = { + abnormal_statuses = { + name_label = { visibility = true, - - offset = { - x = 1, - y = 1 + + settings = { + right_alignment_shift = 0 }, - - color = 0xFF000000 + + text_formatting = "%s", + + include = { + skill_level = true + }, + + offset = { + x = 5, + y = 0 + }, + + color = 0xFFFEFF88, + + shadow = { + visibility = true, + + offset = { + x = 1, + y = 1 + }, + + color = 0xFF000000 + } + }, + + timer_label = { + visibility = true, + + settings = { + right_alignment_shift = 0 + }, + + text_formatting = "%2.0f:%02.0f", + + offset = { + x = 200, + y = 0 + }, + + color = 0xFFFEFF88, + + shadow = { + visibility = true, + + offset = { + x = 1, + y = 1 + }, + + color = 0xFF000000 + } + }, + + bar = { + visibility = true, + + settings = { + fill_direction = "Left to Right" + }, + + offset = { + x = 0, + y = 17 + }, + + size = { + width = 240, + height = 5 + }, + + outline = { + visibility = true, + thickness = 1, + offset = 0, + style = "Center" + }, + + colors = { + foreground = 0xA76FD456, + background = 0xA7000000, + outline = 0xC0000000 + } } }, - timer_label = { - visibility = true, - - settings = { - right_alignment_shift = 0 - }, - - text_formatting = "%2.0f:%02.0f", - - offset = { - x = 200, - y = 0 - }, - - color = 0xFFFFBF81, - - shadow = { + item_buffs = { + name_label = { visibility = true, - - offset = { - x = 1, - y = 1 + + settings = { + right_alignment_shift = 0 }, - - color = 0xFF000000 + + text_formatting = "%s", + + include = { + skill_level = true + }, + + offset = { + x = 5, + y = 0 + }, + + color = 0xFFFEFF88, + + shadow = { + visibility = true, + + offset = { + x = 1, + y = 1 + }, + + color = 0xFF000000 + } + }, + + timer_label = { + visibility = true, + + settings = { + right_alignment_shift = 0 + }, + + text_formatting = "%2.0f:%02.0f", + + offset = { + x = 200, + y = 0 + }, + + color = 0xFFFEFF88, + + shadow = { + visibility = true, + + offset = { + x = 1, + y = 1 + }, + + color = 0xFF000000 + } + }, + + bar = { + visibility = true, + + settings = { + fill_direction = "Left to Right" + }, + + offset = { + x = 0, + y = 17 + }, + + size = { + width = 240, + height = 5 + }, + + outline = { + visibility = true, + thickness = 1, + offset = 0, + style = "Center" + }, + + colors = { + foreground = 0xA76FD456, + background = 0xA7000000, + outline = 0xC0000000 + } } }, - bar = { - visibility = true, - - settings = { - fill_direction = "Left to Right" - }, - - offset = { - x = 0, - y = 17 - }, - - size = { - width = 240, - height = 5 - }, - - outline = { + endemic_life_buffs = { + name_label = { visibility = true, - thickness = 1, - offset = 0, - style = "Center" + + settings = { + right_alignment_shift = 0 + }, + + text_formatting = "%s", + + include = { + skill_level = true + }, + + offset = { + x = 5, + y = 0 + }, + + color = 0xFFFEFF88, + + shadow = { + visibility = true, + + offset = { + x = 1, + y = 1 + }, + + color = 0xFF000000 + } }, + + timer_label = { + visibility = true, + + settings = { + right_alignment_shift = 0 + }, + + text_formatting = "%2.0f:%02.0f", + + offset = { + x = 200, + y = 0 + }, + + color = 0xFFFEFF88, + + shadow = { + visibility = true, + + offset = { + x = 1, + y = 1 + }, + + color = 0xFF000000 + } + }, + + bar = { + visibility = true, + + settings = { + fill_direction = "Left to Right" + }, + + offset = { + x = 0, + y = 17 + }, + + size = { + width = 240, + height = 5 + }, + + outline = { + visibility = true, + thickness = 1, + offset = 0, + style = "Center" + }, + + colors = { + foreground = 0xA76FD456, + background = 0xA7000000, + outline = 0xC0000000 + } + } + }, - colors = { - foreground = 0xA76FD456, - background = 0xA7000000, - outline = 0xC0000000 + melody_effects = { + name_label = { + visibility = true, + + settings = { + right_alignment_shift = 0 + }, + + text_formatting = "%s", + + include = { + skill_level = true + }, + + offset = { + x = 5, + y = 0 + }, + + color = 0xFFFEFF88, + + shadow = { + visibility = true, + + offset = { + x = 1, + y = 1 + }, + + color = 0xFF000000 + } + }, + + timer_label = { + visibility = true, + + settings = { + right_alignment_shift = 0 + }, + + text_formatting = "%2.0f:%02.0f", + + offset = { + x = 200, + y = 0 + }, + + color = 0xFFFEFF88, + + shadow = { + visibility = true, + + offset = { + x = 1, + y = 1 + }, + + color = 0xFF000000 + } + }, + + bar = { + visibility = true, + + settings = { + fill_direction = "Left to Right" + }, + + offset = { + x = 0, + y = 17 + }, + + size = { + width = 240, + height = 5 + }, + + outline = { + visibility = true, + thickness = 1, + offset = 0, + style = "Center" + }, + + colors = { + foreground = 0xA76FD456, + background = 0xA7000000, + outline = 0xC0000000 + } + } + }, + + dango_skills = { + name_label = { + visibility = true, + + settings = { + right_alignment_shift = 0 + }, + + text_formatting = "%s", + + include = { + skill_level = true + }, + + offset = { + x = 5, + y = 0 + }, + + color = 0xFFFEFF88, + + shadow = { + visibility = true, + + offset = { + x = 1, + y = 1 + }, + + color = 0xFF000000 + } + }, + + timer_label = { + visibility = true, + + settings = { + right_alignment_shift = 0 + }, + + text_formatting = "%2.0f:%02.0f", + + offset = { + x = 200, + y = 0 + }, + + color = 0xFFFEFF88, + + shadow = { + visibility = true, + + offset = { + x = 1, + y = 1 + }, + + color = 0xFF000000 + } + }, + + bar = { + visibility = true, + + settings = { + fill_direction = "Left to Right" + }, + + offset = { + x = 0, + y = 17 + }, + + size = { + width = 240, + height = 5 + }, + + outline = { + visibility = true, + thickness = 1, + offset = 0, + style = "Center" + }, + + colors = { + foreground = 0xA76FD456, + background = 0xA7000000, + outline = 0xC0000000 + } + } + }, + + rampage_skills = { + name_label = { + visibility = true, + + settings = { + right_alignment_shift = 0 + }, + + text_formatting = "%s", + + include = { + skill_level = true + }, + + offset = { + x = 5, + y = 0 + }, + + color = 0xFFFEFF88, + + shadow = { + visibility = true, + + offset = { + x = 1, + y = 1 + }, + + color = 0xFF000000 + } + }, + + timer_label = { + visibility = true, + + settings = { + right_alignment_shift = 0 + }, + + text_formatting = "%2.0f:%02.0f", + + offset = { + x = 200, + y = 0 + }, + + color = 0xFFFEFF88, + + shadow = { + visibility = true, + + offset = { + x = 1, + y = 1 + }, + + color = 0xFF000000 + } + }, + + bar = { + visibility = true, + + settings = { + fill_direction = "Left to Right" + }, + + offset = { + x = 0, + y = 17 + }, + + size = { + width = 240, + height = 5 + }, + + outline = { + visibility = true, + thickness = 1, + offset = 0, + style = "Center" + }, + + colors = { + foreground = 0xA76FD456, + background = 0xA7000000, + outline = 0xC0000000 + } + } + }, + + skills = { + name_label = { + visibility = true, + + settings = { + right_alignment_shift = 0 + }, + + text_formatting = "%s", + + include = { + skill_level = true + }, + + offset = { + x = 5, + y = 0 + }, + + color = 0xFFFEFF88, + + shadow = { + visibility = true, + + offset = { + x = 1, + y = 1 + }, + + color = 0xFF000000 + } + }, + + timer_label = { + visibility = true, + + settings = { + right_alignment_shift = 0 + }, + + text_formatting = "%2.0f:%02.0f", + + offset = { + x = 200, + y = 0 + }, + + color = 0xFFFEFF88, + + shadow = { + visibility = true, + + offset = { + x = 1, + y = 1 + }, + + color = 0xFF000000 + } + }, + + bar = { + visibility = true, + + settings = { + fill_direction = "Left to Right" + }, + + offset = { + x = 0, + y = 17 + }, + + size = { + width = 240, + height = 5 + }, + + outline = { + visibility = true, + thickness = 1, + offset = 0, + style = "Center" + }, + + colors = { + foreground = 0xA76FD456, + background = 0xA7000000, + outline = 0xC0000000 + } + } + }, + + weapon_skills = { + name_label = { + visibility = true, + + settings = { + right_alignment_shift = 0 + }, + + text_formatting = "%s", + + include = { + skill_level = true + }, + + offset = { + x = 5, + y = 0 + }, + + color = 0xFFFEFF88, + + shadow = { + visibility = true, + + offset = { + x = 1, + y = 1 + }, + + color = 0xFF000000 + } + }, + + timer_label = { + visibility = true, + + settings = { + right_alignment_shift = 0 + }, + + text_formatting = "%2.0f:%02.0f", + + offset = { + x = 200, + y = 0 + }, + + color = 0xFFFEFF88, + + shadow = { + visibility = true, + + offset = { + x = 1, + y = 1 + }, + + color = 0xFF000000 + } + }, + + bar = { + visibility = true, + + settings = { + fill_direction = "Left to Right" + }, + + offset = { + x = 0, + y = 17 + }, + + size = { + width = 240, + height = 5 + }, + + outline = { + visibility = true, + thickness = 1, + offset = 0, + style = "Center" + }, + + colors = { + foreground = 0xA76FD456, + background = 0xA7000000, + outline = 0xC0000000 + } + } + }, + + otomo_moves = { + name_label = { + visibility = true, + + settings = { + right_alignment_shift = 0 + }, + + text_formatting = "%s", + + include = { + skill_level = true + }, + + offset = { + x = 5, + y = 0 + }, + + color = 0xFFFEFF88, + + shadow = { + visibility = true, + + offset = { + x = 1, + y = 1 + }, + + color = 0xFF000000 + } + }, + + timer_label = { + visibility = true, + + settings = { + right_alignment_shift = 0 + }, + + text_formatting = "%2.0f:%02.0f", + + offset = { + x = 200, + y = 0 + }, + + color = 0xFFFEFF88, + + shadow = { + visibility = true, + + offset = { + x = 1, + y = 1 + }, + + color = 0xFF000000 + } + }, + + bar = { + visibility = true, + + settings = { + fill_direction = "Left to Right" + }, + + offset = { + x = 0, + y = 17 + }, + + size = { + width = 240, + height = 5 + }, + + outline = { + visibility = true, + thickness = 1, + offset = 0, + style = "Center" + }, + + colors = { + foreground = 0xA76FD456, + background = 0xA7000000, + outline = 0xC0000000 + } + } + }, + + misc_buffs = { + name_label = { + visibility = true, + + settings = { + right_alignment_shift = 0 + }, + + text_formatting = "%s", + + include = { + skill_level = true + }, + + offset = { + x = 5, + y = 0 + }, + + color = 0xFFFEFF88, + + shadow = { + visibility = true, + + offset = { + x = 1, + y = 1 + }, + + color = 0xFF000000 + } + }, + + timer_label = { + visibility = true, + + settings = { + right_alignment_shift = 0 + }, + + text_formatting = "%2.0f:%02.0f", + + offset = { + x = 200, + y = 0 + }, + + color = 0xFFFEFF88, + + shadow = { + visibility = true, + + offset = { + x = 1, + y = 1 + }, + + color = 0xFF000000 + } + }, + + bar = { + visibility = true, + + settings = { + fill_direction = "Left to Right" + }, + + offset = { + x = 0, + y = 17 + }, + + size = { + width = 240, + height = 5 + }, + + outline = { + visibility = true, + thickness = 1, + offset = 0, + style = "Center" + }, + + colors = { + foreground = 0xA76FD456, + background = 0xA7000000, + outline = 0xC0000000 + } } } }, diff --git a/reframework/autorun/MHR_Overlay/UI/customization_menu.lua b/reframework/autorun/MHR_Overlay/UI/customization_menu.lua index 8ae7644..64c3dbb 100644 --- a/reframework/autorun/MHR_Overlay/UI/customization_menu.lua +++ b/reframework/autorun/MHR_Overlay/UI/customization_menu.lua @@ -500,9 +500,7 @@ function this.draw() end if buff_UI_changed or modifiers_changed or config_changed then - -- for _, buff in pairs(buffs.list) do - -- buffs.init_UI(buff); - -- end + buffs.init_all_UI(); end if stats_UI_changed or modifiers_changed or config_changed then @@ -2408,10 +2406,6 @@ function this.draw_buff_UI() end if imgui.tree_node(language.current_language.customization_menu.filter) then - - -- weapon_skills = "Weapon Skills", - -- otomo_moves = "Buddy Moves", - -- misc_buffs = "Misc Buffs", if imgui.tree_node(language.current_language.customization_menu.abnormal_statuses) then @@ -2587,18 +2581,148 @@ function this.draw_buff_UI() imgui.tree_pop(); end + imgui.tree_pop(); + end + + if imgui.tree_node(language.current_language.customization_menu.abnormal_statuses) then + + changed = label_customization.draw(language.current_language.customization_menu.name_label, cached_config.abnormal_statuses.name_label); + config_changed = config_changed or changed; + + changed = label_customization.draw(language.current_language.customization_menu.timer_label, cached_config.abnormal_statuses.timer_label); + config_changed = config_changed or changed; + + changed = bar_customization.draw(language.current_language.customization_menu.bar, cached_config.abnormal_statuses.bar); + config_changed = config_changed or changed; + + imgui.tree_pop(); + end + + if imgui.tree_node(language.current_language.customization_menu.item_buffs) then + + changed = label_customization.draw(language.current_language.customization_menu.name_label, cached_config.item_buffs.name_label); + config_changed = config_changed or changed; + + changed = label_customization.draw(language.current_language.customization_menu.timer_label, cached_config.item_buffs.timer_label); + config_changed = config_changed or changed; + + changed = bar_customization.draw(language.current_language.customization_menu.bar, cached_config.item_buffs.bar); + config_changed = config_changed or changed; imgui.tree_pop(); end - changed = label_customization.draw(language.current_language.customization_menu.name_label, cached_config.name_label); - config_changed = config_changed or changed; + if imgui.tree_node(language.current_language.customization_menu.endemic_life_buffs) then + + changed = label_customization.draw(language.current_language.customization_menu.name_label, cached_config.endemic_life_buffs.name_label); + config_changed = config_changed or changed; - changed = label_customization.draw(language.current_language.customization_menu.timer_label, cached_config.timer_label); - config_changed = config_changed or changed; + changed = label_customization.draw(language.current_language.customization_menu.timer_label, cached_config.endemic_life_buffs.timer_label); + config_changed = config_changed or changed; - changed = bar_customization.draw(language.current_language.customization_menu.bar, cached_config.bar); - config_changed = config_changed or changed; + changed = bar_customization.draw(language.current_language.customization_menu.bar, cached_config.endemic_life_buffs.bar); + config_changed = config_changed or changed; + + imgui.tree_pop(); + end + + if imgui.tree_node(language.current_language.customization_menu.melody_effects) then + + changed = label_customization.draw(language.current_language.customization_menu.name_label, cached_config.melody_effects.name_label); + config_changed = config_changed or changed; + + changed = label_customization.draw(language.current_language.customization_menu.timer_label, cached_config.melody_effects.timer_label); + config_changed = config_changed or changed; + + changed = bar_customization.draw(language.current_language.customization_menu.bar, cached_config.melody_effects.bar); + config_changed = config_changed or changed; + + imgui.tree_pop(); + end + + if imgui.tree_node(language.current_language.customization_menu.dango_skills) then + + changed = label_customization.draw(language.current_language.customization_menu.name_label, cached_config.dango_skills.name_label); + config_changed = config_changed or changed; + + changed = label_customization.draw(language.current_language.customization_menu.timer_label, cached_config.dango_skills.timer_label); + config_changed = config_changed or changed; + + changed = bar_customization.draw(language.current_language.customization_menu.bar, cached_config.dango_skills.bar); + config_changed = config_changed or changed; + + imgui.tree_pop(); + end + + if imgui.tree_node(language.current_language.customization_menu.rampage_skills) then + + changed = label_customization.draw(language.current_language.customization_menu.name_label, cached_config.rampage_skills.name_label); + config_changed = config_changed or changed; + + changed = label_customization.draw(language.current_language.customization_menu.timer_label, cached_config.rampage_skills.timer_label); + config_changed = config_changed or changed; + + changed = bar_customization.draw(language.current_language.customization_menu.bar, cached_config.rampage_skills.bar); + config_changed = config_changed or changed; + + imgui.tree_pop(); + end + + if imgui.tree_node(language.current_language.customization_menu.skills) then + + changed = label_customization.draw(language.current_language.customization_menu.name_label, cached_config.skills.name_label); + config_changed = config_changed or changed; + + changed = label_customization.draw(language.current_language.customization_menu.timer_label, cached_config.skills.timer_label); + config_changed = config_changed or changed; + + changed = bar_customization.draw(language.current_language.customization_menu.bar, cached_config.skills.bar); + config_changed = config_changed or changed; + + imgui.tree_pop(); + end + + if imgui.tree_node(language.current_language.customization_menu.weapon_skills) then + + changed = label_customization.draw(language.current_language.customization_menu.name_label, cached_config.weapon_skills.name_label); + config_changed = config_changed or changed; + + changed = label_customization.draw(language.current_language.customization_menu.timer_label, cached_config.weapon_skills.timer_label); + config_changed = config_changed or changed; + + changed = bar_customization.draw(language.current_language.customization_menu.bar, cached_config.weapon_skills.bar); + config_changed = config_changed or changed; + + imgui.tree_pop(); + end + + if imgui.tree_node(language.current_language.customization_menu.otomo_moves) then + + changed = label_customization.draw(language.current_language.customization_menu.name_label, cached_config.otomo_moves.name_label); + config_changed = config_changed or changed; + + changed = label_customization.draw(language.current_language.customization_menu.timer_label, cached_config.otomo_moves.timer_label); + config_changed = config_changed or changed; + + changed = bar_customization.draw(language.current_language.customization_menu.bar, cached_config.otomo_moves.bar); + config_changed = config_changed or changed; + + imgui.tree_pop(); + end + + if imgui.tree_node(language.current_language.customization_menu.misc_buffs) then + + changed = label_customization.draw(language.current_language.customization_menu.name_label, cached_config.misc_buffs.name_label); + config_changed = config_changed or changed; + + changed = label_customization.draw(language.current_language.customization_menu.timer_label, cached_config.misc_buffs.timer_label); + config_changed = config_changed or changed; + + changed = bar_customization.draw(language.current_language.customization_menu.bar, cached_config.misc_buffs.bar); + config_changed = config_changed or changed; + + imgui.tree_pop(); + end imgui.tree_pop(); end