romanmir/MHR-Overlay
1
0
Fork 0
mirror of https://github.com/GreenComfyTea/MHR-Overlay.git synced 2026-01-25 12:58:06 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix "highlighted (targeted)" being used in damage meter

Browse Source
This commit is contained in:
GreenComfyTea
2023-02-06 16:53:13 +02:00
parent ccd64f534c
commit c74a93a3b2
9 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
reframework/autorun/MHR_Overlay/Misc/config.lua
View File

@@ -4267,7 +4267,7 @@ function config.init_default()
orientation = "Vertical", -- "Vertical" or "Horizontal" orientation = "Vertical", -- "Vertical" or "Horizontal"
highlighted_bar = "None", highlight = "Top Damage",
damage_bar_relative_to = "Top Damage", -- "total damage" or "top damage" damage_bar_relative_to = "Top Damage", -- "total damage" or "top damage"
my_damage_bar_location = "Last", -- "normal" or "first" or "last" my_damage_bar_location = "Last", -- "normal" or "first" or "last"
total_damage_location = "First", total_damage_location = "First",

6
reframework/autorun/MHR_Overlay/Misc/language.lua
View File

@@ -268,7 +268,7 @@ language.default_language = {
dynamically_positioned = "Dynamically Positioned", dynamically_positioned = "Dynamically Positioned",
statically_positioned = "Statically Positioned", statically_positioned = "Statically Positioned",
highlighted = "Highlighted (targeted)", highlighted_targeted = "Highlighted (targeted)",
include = "Include", include = "Include",
monster_name = "Monster Name", monster_name = "Monster Name",
@@ -485,7 +485,9 @@ language.default_language = {
duplicate = "Duplicate", duplicate = "Duplicate",
delete = "Delete", delete = "Delete",
new = "New", new = "New",
reset = "Reset" reset = "Reset",
highlighted = "Highlighted"
} }
}; };

18
reframework/autorun/MHR_Overlay/UI/customization_menu.lua
View File

@@ -80,7 +80,7 @@ customization_menu.displayed_ailment_buildups_sorting_types = {};
customization_menu.displayed_highlighted_buildup_bar_types = {}; customization_menu.displayed_highlighted_buildup_bar_types = {};
customization_menu.displayed_buildup_bar_relative_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_damage_bar_relative_types = {};
customization_menu.displayed_damage_meter_UI_my_damage_bar_location_types = {}; customization_menu.displayed_damage_meter_UI_my_damage_bar_location_types = {};
customization_menu.displayed_damage_meter_UI_total_damage_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.highlighted_buildup_bar_types = {};
customization_menu.buildup_bar_relative_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_damage_bar_relative_types = {};
customization_menu.damage_meter_UI_my_damage_bar_location_types = {}; customization_menu.damage_meter_UI_my_damage_bar_location_types = {};
customization_menu.damage_meter_UI_total_damage_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, customization_menu.displayed_buildup_bar_relative_types = {language.current_language.customization_menu.total_buildup,
language.current_language.customization_menu.top_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_damage,
language.current_language.customization_menu.top_dps, language.current_language.customization_menu.none}; 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, customization_menu.buildup_bar_relative_types = {language.default_language.customization_menu.total_buildup,
language.default_language.customization_menu.top_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.top_dps,
language.default_language.customization_menu.none}; language.default_language.customization_menu.none};
customization_menu.damage_meter_UI_damage_bar_relative_types = 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 config_changed = false;
local index = 1; 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; local cached_config = config.current_config.large_monster_UI.highlighted;
changed, cached_config.enabled = imgui.checkbox( changed, cached_config.enabled = imgui.checkbox(
@@ -1590,14 +1590,14 @@ function customization_menu.draw_damage_meter_UI()
end end
changed, index = imgui.combo( changed, index = imgui.combo(
language.current_language.customization_menu.highlighted_bar, language.current_language.customization_menu.highlighted,
table_helpers.find_index(customization_menu.damage_meter_UI_highlighted_bar_types, cached_config.settings.highlighted_bar), table_helpers.find_index(customization_menu.damage_meter_UI_highlighted_entity_types, cached_config.settings.highlighted_bar),
customization_menu.displayed_damage_meter_UI_highlighted_bar_types); customization_menu.displayed_damage_meter_UI_highlighted_entity_types);
config_changed = config_changed or changed; config_changed = config_changed or changed;
if changed then 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 end
changed, index = imgui.combo( changed, index = imgui.combo(

3
reframework/data/MHR Overlay/languages/en-us.json
View File

@@ -137,10 +137,11 @@
"hide_undamaged_parts": "Hide Undamaged Parts", "hide_undamaged_parts": "Hide Undamaged Parts",
"highest_health": "Highest Health", "highest_health": "Highest Health",
"highest_health_percentage": "Highest Health Percentage", "highest_health_percentage": "Highest Health Percentage",
"highlighted": "Highlighted (targeted)", "highlighted": "Highlighted",
"highlighted_bar": "Highlighted Bar", "highlighted_bar": "Highlighted Bar",
"highlighted_buildup_bar": "Highlighted Buildup Bar", "highlighted_buildup_bar": "Highlighted Buildup Bar",
"highlighted_damage_bar": "Highlighted Damage Bar", "highlighted_damage_bar": "Highlighted Damage Bar",
"highlighted_targeted": "Highlighted (targeted)",
"horizontal": "Horizontal", "horizontal": "Horizontal",
"hotkeys": "Hotkeys", "hotkeys": "Hotkeys",
"hunter_rank": "Hunter Rank", "hunter_rank": "Hunter Rank",

3
reframework/data/MHR Overlay/languages/ja-jp.json
View File

@@ -137,10 +137,11 @@
"hide_undamaged_parts": "攻撃していない部位の表示を隠す", "hide_undamaged_parts": "攻撃していない部位の表示を隠す",
"highest_health": "Highest Health", "highest_health": "Highest Health",
"highest_health_percentage": "Highest Health Percentage", "highest_health_percentage": "Highest Health Percentage",
"highlighted": "詳細表示 (ターゲット)", "highlighted": "詳細表示",
"highlighted_bar": "ハイライトされたバー", "highlighted_bar": "ハイライトされたバー",
"highlighted_buildup_bar": "ハイライトされた蓄積値バー", "highlighted_buildup_bar": "ハイライトされた蓄積値バー",
"highlighted_damage_bar": "ハイライトされたダメージバー", "highlighted_damage_bar": "ハイライトされたダメージバー",
"highlighted_targeted": "詳細表示 (ターゲット)",
"horizontal": "水平", "horizontal": "水平",
"hotkeys": "ホットキー", "hotkeys": "ホットキー",
"hunter_rank": "ハンターランク", "hunter_rank": "ハンターランク",

3
reframework/data/MHR Overlay/languages/ko-kr.json
View File

@@ -137,10 +137,11 @@
"hide_undamaged_parts": "피해를 입히지 않은 부위 숨김", "hide_undamaged_parts": "피해를 입히지 않은 부위 숨김",
"highest_health": "가장 체력이 높은", "highest_health": "가장 체력이 높은",
"highest_health_percentage": "가장 체력 비율이 높은", "highest_health_percentage": "가장 체력 비율이 높은",
"highlighted": "타겟이 된 몬스터 표시", "highlighted": "Highlighted",
"highlighted_bar": "타겟이 된 몬스터 바", "highlighted_bar": "타겟이 된 몬스터 바",
"highlighted_buildup_bar": "타겟이 된 몬스터 누적치 바", "highlighted_buildup_bar": "타겟이 된 몬스터 누적치 바",
"highlighted_damage_bar": "타겟이 된 몬스터 대미지 바", "highlighted_damage_bar": "타겟이 된 몬스터 대미지 바",
"highlighted_targeted": "타겟이 된 몬스터 표시",
"horizontal": "가로", "horizontal": "가로",
"hotkeys": "단축키", "hotkeys": "단축키",
"hunter_rank": "헌터 랭크", "hunter_rank": "헌터 랭크",

1
reframework/data/MHR Overlay/languages/ru-ru.json
View File

@@ -141,6 +141,7 @@
"highlighted_bar": "Помеченная шкала", "highlighted_bar": "Помеченная шкала",
"highlighted_buildup_bar": "Помеченная шкала накопления", "highlighted_buildup_bar": "Помеченная шкала накопления",
"highlighted_damage_bar": "Помеченная шкала урона", "highlighted_damage_bar": "Помеченная шкала урона",
"highlighted_targeted": "Помеченный",
"horizontal": "Горизонтально", "horizontal": "Горизонтально",
"hotkeys": "Горячие клавиши", "hotkeys": "Горячие клавиши",
"hunter_rank": "Ранг охотника", "hunter_rank": "Ранг охотника",

3
reframework/data/MHR Overlay/languages/zh-cn.json
View File

@@ -137,10 +137,11 @@
"hide_undamaged_parts": "隐藏没有受到伤害的部位", "hide_undamaged_parts": "隐藏没有受到伤害的部位",
"highest_health": "Highest Health", "highest_health": "Highest Health",
"highest_health_percentage": "Highest Health Percentage", "highest_health_percentage": "Highest Health Percentage",
"highlighted": "高亮(目标)", "highlighted": "高亮",
"highlighted_bar": "高亮条", "highlighted_bar": "高亮条",
"highlighted_buildup_bar": "高亮积累值条", "highlighted_buildup_bar": "高亮积累值条",
"highlighted_damage_bar": "高亮伤害条", "highlighted_damage_bar": "高亮伤害条",
"highlighted_targeted": "高亮(目标)",
"horizontal": "水平", "horizontal": "水平",
"hotkeys": "热键", "hotkeys": "热键",
"hunter_rank": "猎人等級", "hunter_rank": "猎人等級",

3
reframework/data/MHR Overlay/languages/zh-tw.json
View File

@@ -137,10 +137,11 @@
"hide_undamaged_parts": "隱藏沒受到傷害的部位", "hide_undamaged_parts": "隱藏沒受到傷害的部位",
"highest_health": "最高血量", "highest_health": "最高血量",
"highest_health_percentage": "最高血量百分比", "highest_health_percentage": "最高血量百分比",
"highlighted": "鎖定的魔物資訊(目標)", "highlighted": "鎖定的魔物資訊",
"highlighted_bar": "重點條", "highlighted_bar": "重點條",
"highlighted_buildup_bar": "重點累積條", "highlighted_buildup_bar": "重點累積條",
"highlighted_damage_bar": "重點傷害條", "highlighted_damage_bar": "重點傷害條",
"highlighted_targeted": "鎖定的魔物資訊(目標)",
"horizontal": "水平", "horizontal": "水平",
"hotkeys": "快捷鍵", "hotkeys": "快捷鍵",
"hunter_rank": "獵人等級", "hunter_rank": "獵人等級",