From c74a93a3b22037391d259d8eb269d420820ae57d Mon Sep 17 00:00:00 2001 From: GreenComfyTea Date: Mon, 6 Feb 2023 16:53:13 +0200 Subject: [PATCH] Fix "highlighted (targeted)" being used in damage meter --- .../autorun/MHR_Overlay/Misc/config.lua | 2 +- .../autorun/MHR_Overlay/Misc/language.lua | 6 ++++-- .../MHR_Overlay/UI/customization_menu.lua | 18 +++++++++--------- .../data/MHR Overlay/languages/en-us.json | 3 ++- .../data/MHR Overlay/languages/ja-jp.json | 3 ++- .../data/MHR Overlay/languages/ko-kr.json | 3 ++- .../data/MHR Overlay/languages/ru-ru.json | 1 + .../data/MHR Overlay/languages/zh-cn.json | 3 ++- .../data/MHR Overlay/languages/zh-tw.json | 3 ++- 9 files changed, 25 insertions(+), 17 deletions(-) diff --git a/reframework/autorun/MHR_Overlay/Misc/config.lua b/reframework/autorun/MHR_Overlay/Misc/config.lua index a81122e..485b38e 100644 --- a/reframework/autorun/MHR_Overlay/Misc/config.lua +++ b/reframework/autorun/MHR_Overlay/Misc/config.lua @@ -4267,7 +4267,7 @@ function config.init_default() orientation = "Vertical", -- "Vertical" or "Horizontal" - highlighted_bar = "None", + highlight = "Top Damage", damage_bar_relative_to = "Top Damage", -- "total damage" or "top damage" my_damage_bar_location = "Last", -- "normal" or "first" or "last" total_damage_location = "First", diff --git a/reframework/autorun/MHR_Overlay/Misc/language.lua b/reframework/autorun/MHR_Overlay/Misc/language.lua index c1b40b0..2ce34d6 100644 --- a/reframework/autorun/MHR_Overlay/Misc/language.lua +++ b/reframework/autorun/MHR_Overlay/Misc/language.lua @@ -268,7 +268,7 @@ language.default_language = { dynamically_positioned = "Dynamically Positioned", statically_positioned = "Statically Positioned", - highlighted = "Highlighted (targeted)", + highlighted_targeted = "Highlighted (targeted)", include = "Include", monster_name = "Monster Name", @@ -485,7 +485,9 @@ language.default_language = { duplicate = "Duplicate", delete = "Delete", new = "New", - reset = "Reset" + reset = "Reset", + + highlighted = "Highlighted" } }; diff --git a/reframework/autorun/MHR_Overlay/UI/customization_menu.lua b/reframework/autorun/MHR_Overlay/UI/customization_menu.lua index 1c066db..a180757 100644 --- a/reframework/autorun/MHR_Overlay/UI/customization_menu.lua +++ b/reframework/autorun/MHR_Overlay/UI/customization_menu.lua @@ -80,7 +80,7 @@ customization_menu.displayed_ailment_buildups_sorting_types = {}; customization_menu.displayed_highlighted_buildup_bar_types = {}; customization_menu.displayed_buildup_bar_relative_types = {}; -customization_menu.displayed_damage_meter_UI_highlighted_bar_types = {}; +customization_menu.displayed_damage_meter_UI_highlighted_entity_types = {}; customization_menu.displayed_damage_meter_UI_damage_bar_relative_types = {}; customization_menu.displayed_damage_meter_UI_my_damage_bar_location_types = {}; customization_menu.displayed_damage_meter_UI_total_damage_location_types = {}; @@ -99,7 +99,7 @@ customization_menu.ailment_buildups_sorting_types = {}; customization_menu.highlighted_buildup_bar_types = {}; customization_menu.buildup_bar_relative_types = {}; -customization_menu.damage_meter_UI_highlighted_bar_types = {}; +customization_menu.damage_meter_UI_highlighted_entity_types = {}; customization_menu.damage_meter_UI_damage_bar_relative_types = {}; customization_menu.damage_meter_UI_my_damage_bar_location_types = {}; customization_menu.damage_meter_UI_total_damage_location_types = {}; @@ -180,7 +180,7 @@ function customization_menu.init() customization_menu.displayed_buildup_bar_relative_types = {language.current_language.customization_menu.total_buildup, language.current_language.customization_menu.top_buildup}; - customization_menu.displayed_damage_meter_UI_highlighted_bar_types = + customization_menu.displayed_damage_meter_UI_highlighted_entity_types = {language.current_language.customization_menu.top_damage, language.current_language.customization_menu.top_dps, language.current_language.customization_menu.none}; @@ -248,7 +248,7 @@ function customization_menu.init() customization_menu.buildup_bar_relative_types = {language.default_language.customization_menu.total_buildup, language.default_language.customization_menu.top_buildup}; - customization_menu.damage_meter_UI_highlighted_bar_types = {language.default_language.customization_menu.top_damage, + customization_menu.damage_meter_UI_highlighted_entity_types = {language.default_language.customization_menu.top_damage, language.default_language.customization_menu.top_dps, language.default_language.customization_menu.none}; customization_menu.damage_meter_UI_damage_bar_relative_types = @@ -1391,7 +1391,7 @@ function customization_menu.draw_large_monster_highlighted_UI() local config_changed = false; local index = 1; - if imgui.tree_node(language.current_language.customization_menu.highlighted) then + if imgui.tree_node(language.current_language.customization_menu.highlighted_targeted) then local cached_config = config.current_config.large_monster_UI.highlighted; changed, cached_config.enabled = imgui.checkbox( @@ -1590,14 +1590,14 @@ function customization_menu.draw_damage_meter_UI() end changed, index = imgui.combo( - language.current_language.customization_menu.highlighted_bar, - table_helpers.find_index(customization_menu.damage_meter_UI_highlighted_bar_types, cached_config.settings.highlighted_bar), - customization_menu.displayed_damage_meter_UI_highlighted_bar_types); + language.current_language.customization_menu.highlighted, + table_helpers.find_index(customization_menu.damage_meter_UI_highlighted_entity_types, cached_config.settings.highlighted_bar), + customization_menu.displayed_damage_meter_UI_highlighted_entity_types); config_changed = config_changed or changed; if changed then - cached_config.settings.highlighted_bar = customization_menu.damage_meter_UI_highlighted_bar_types[index]; + cached_config.settings.highlighted_bar = customization_menu.damage_meter_UI_highlighted_entity_types[index]; end changed, index = imgui.combo( diff --git a/reframework/data/MHR Overlay/languages/en-us.json b/reframework/data/MHR Overlay/languages/en-us.json index dc51d81..be02eb2 100644 --- a/reframework/data/MHR Overlay/languages/en-us.json +++ b/reframework/data/MHR Overlay/languages/en-us.json @@ -137,10 +137,11 @@ "hide_undamaged_parts": "Hide Undamaged Parts", "highest_health": "Highest Health", "highest_health_percentage": "Highest Health Percentage", - "highlighted": "Highlighted (targeted)", + "highlighted": "Highlighted", "highlighted_bar": "Highlighted Bar", "highlighted_buildup_bar": "Highlighted Buildup Bar", "highlighted_damage_bar": "Highlighted Damage Bar", + "highlighted_targeted": "Highlighted (targeted)", "horizontal": "Horizontal", "hotkeys": "Hotkeys", "hunter_rank": "Hunter Rank", diff --git a/reframework/data/MHR Overlay/languages/ja-jp.json b/reframework/data/MHR Overlay/languages/ja-jp.json index 6f5030b..1cf84ba 100644 --- a/reframework/data/MHR Overlay/languages/ja-jp.json +++ b/reframework/data/MHR Overlay/languages/ja-jp.json @@ -137,10 +137,11 @@ "hide_undamaged_parts": "攻撃していない部位の表示を隠す", "highest_health": "Highest Health", "highest_health_percentage": "Highest Health Percentage", - "highlighted": "詳細表示 (ターゲット)", + "highlighted": "詳細表示", "highlighted_bar": "ハイライトされたバー", "highlighted_buildup_bar": "ハイライトされた蓄積値バー", "highlighted_damage_bar": "ハイライトされたダメージバー", + "highlighted_targeted": "詳細表示 (ターゲット)", "horizontal": "水平", "hotkeys": "ホットキー", "hunter_rank": "ハンターランク", diff --git a/reframework/data/MHR Overlay/languages/ko-kr.json b/reframework/data/MHR Overlay/languages/ko-kr.json index c122017..9acc5e3 100644 --- a/reframework/data/MHR Overlay/languages/ko-kr.json +++ b/reframework/data/MHR Overlay/languages/ko-kr.json @@ -137,10 +137,11 @@ "hide_undamaged_parts": "피해를 입히지 않은 부위 숨김", "highest_health": "가장 체력이 높은", "highest_health_percentage": "가장 체력 비율이 높은", - "highlighted": "타겟이 된 몬스터 표시", + "highlighted": "Highlighted", "highlighted_bar": "타겟이 된 몬스터 바", "highlighted_buildup_bar": "타겟이 된 몬스터 누적치 바", "highlighted_damage_bar": "타겟이 된 몬스터 대미지 바", + "highlighted_targeted": "타겟이 된 몬스터 표시", "horizontal": "가로", "hotkeys": "단축키", "hunter_rank": "헌터 랭크", diff --git a/reframework/data/MHR Overlay/languages/ru-ru.json b/reframework/data/MHR Overlay/languages/ru-ru.json index e7dfcdd..ca5d4b3 100644 --- a/reframework/data/MHR Overlay/languages/ru-ru.json +++ b/reframework/data/MHR Overlay/languages/ru-ru.json @@ -141,6 +141,7 @@ "highlighted_bar": "Помеченная шкала", "highlighted_buildup_bar": "Помеченная шкала накопления", "highlighted_damage_bar": "Помеченная шкала урона", + "highlighted_targeted": "Помеченный", "horizontal": "Горизонтально", "hotkeys": "Горячие клавиши", "hunter_rank": "Ранг охотника", diff --git a/reframework/data/MHR Overlay/languages/zh-cn.json b/reframework/data/MHR Overlay/languages/zh-cn.json index e38ac3e..62db7eb 100644 --- a/reframework/data/MHR Overlay/languages/zh-cn.json +++ b/reframework/data/MHR Overlay/languages/zh-cn.json @@ -137,10 +137,11 @@ "hide_undamaged_parts": "隐藏没有受到伤害的部位", "highest_health": "Highest Health", "highest_health_percentage": "Highest Health Percentage", - "highlighted": "高亮(目标)", + "highlighted": "高亮", "highlighted_bar": "高亮条", "highlighted_buildup_bar": "高亮积累值条", "highlighted_damage_bar": "高亮伤害条", + "highlighted_targeted": "高亮(目标)", "horizontal": "水平", "hotkeys": "热键", "hunter_rank": "猎人等級", diff --git a/reframework/data/MHR Overlay/languages/zh-tw.json b/reframework/data/MHR Overlay/languages/zh-tw.json index f1cc956..e3315d5 100644 --- a/reframework/data/MHR Overlay/languages/zh-tw.json +++ b/reframework/data/MHR Overlay/languages/zh-tw.json @@ -137,10 +137,11 @@ "hide_undamaged_parts": "隱藏沒受到傷害的部位", "highest_health": "最高血量", "highest_health_percentage": "最高血量百分比", - "highlighted": "鎖定的魔物資訊(目標)", + "highlighted": "鎖定的魔物資訊", "highlighted_bar": "重點條", "highlighted_buildup_bar": "重點累積條", "highlighted_damage_bar": "重點傷害條", + "highlighted_targeted": "鎖定的魔物資訊(目標)", "horizontal": "水平", "hotkeys": "快捷鍵", "hunter_rank": "獵人等級",