From cb60b512bbdd44506171a029aa473fde3fcaffb1 Mon Sep 17 00:00:00 2001 From: GreenComfyTea Date: Sun, 10 Jul 2022 11:50:11 +0300 Subject: [PATCH] Add options to hide me, other players and total. --- .../autorun/MHR_Overlay/Misc/config.lua | 6 +++++- .../autorun/MHR_Overlay/Misc/language.lua | 6 +++++- .../MHR_Overlay/UI/Modules/damage_meter_UI.lua | 17 ++++++++++++++--- .../MHR_Overlay/UI/customization_menu.lua | 18 ++++++++++++++++++ .../data/MHR Overlay/languages/en-us.json | 3 +++ .../data/MHR Overlay/languages/ko-kr.json | 3 +++ .../data/MHR Overlay/languages/ru-ru.json | 3 +++ .../data/MHR Overlay/languages/zh-cn.json | 3 +++ .../data/MHR Overlay/languages/zh-tw.json | 3 +++ 9 files changed, 57 insertions(+), 5 deletions(-) diff --git a/reframework/autorun/MHR_Overlay/Misc/config.lua b/reframework/autorun/MHR_Overlay/Misc/config.lua index e4ae4c1..80670d7 100644 --- a/reframework/autorun/MHR_Overlay/Misc/config.lua +++ b/reframework/autorun/MHR_Overlay/Misc/config.lua @@ -3775,7 +3775,11 @@ function config.init() highlighted_bar = "Me", damage_bar_relative_to = "Top Damage", -- "total damage" or "top damage" my_damage_bar_location = "First", -- "normal" or "first" or "last" - dps_mode = "First Hit" + dps_mode = "First Hit", + + hide_myself = false, + hide_other_players = false, + hide_total_damage = false }, sorting = { diff --git a/reframework/autorun/MHR_Overlay/Misc/language.lua b/reframework/autorun/MHR_Overlay/Misc/language.lua index fbe2c12..c75d471 100644 --- a/reframework/autorun/MHR_Overlay/Misc/language.lua +++ b/reframework/autorun/MHR_Overlay/Misc/language.lua @@ -370,7 +370,11 @@ language.default_language = { other_damage = "Other Damage", wyvern_riding_damage = "Wyvern Riding Damage", - endemic_life_damage = "Endemic Life Damage" + endemic_life_damage = "Endemic Life Damage", + + hide_myself = "Hide Myself", + hide_other_players = "Hide Other Players", + hide_total_damage = "Hide Total Damage" } }; diff --git a/reframework/autorun/MHR_Overlay/UI/Modules/damage_meter_UI.lua b/reframework/autorun/MHR_Overlay/UI/Modules/damage_meter_UI.lua index 1cd16e9..e986683 100644 --- a/reframework/autorun/MHR_Overlay/UI/Modules/damage_meter_UI.lua +++ b/reframework/autorun/MHR_Overlay/UI/Modules/damage_meter_UI.lua @@ -146,9 +146,16 @@ function damage_meter_UI.draw() -- draw local position_on_screen = screen.calculate_absolute_coordinates(cached_config.position); for _, _player in ipairs(quest_players) do - if _player.display.total_damage == 0 and cached_config.settings.hide_player_if_player_damage_is_zero then - goto continue1 + goto continue; + end + + if _player == player.myself then + if cached_config.settings.hide_myself then + goto continue; + end + elseif cached_config.settings.hide_other_players then + goto continue; end player.draw(_player, position_on_screen, 1, top_damage, top_dps); @@ -159,11 +166,15 @@ function damage_meter_UI.draw() position_on_screen.y = position_on_screen.y + cached_config.spacing.y * global_scale_modifier; end - ::continue1:: + ::continue:: end -- draw total damage + if cached_config.settings.hide_total_damage then + return; + end + if cached_config.settings.hide_total_if_total_damage_is_zero and player.total.display.total_damage == 0 then return; end diff --git a/reframework/autorun/MHR_Overlay/UI/customization_menu.lua b/reframework/autorun/MHR_Overlay/UI/customization_menu.lua index dfcf856..2a76d49 100644 --- a/reframework/autorun/MHR_Overlay/UI/customization_menu.lua +++ b/reframework/autorun/MHR_Overlay/UI/customization_menu.lua @@ -15040,6 +15040,24 @@ function customization_menu.draw() damage_meter_UI_changed = damage_meter_UI_changed or changed; if imgui.tree_node(language.current_language.customization_menu.settings) then + changed, config.current_config.damage_meter_UI.settings.hide_myself = imgui.checkbox( + language.current_language.customization_menu.hide_myself, + config.current_config.damage_meter_UI.settings.hide_myself); + config_changed = config_changed or changed; + damage_meter_UI_changed = damage_meter_UI_changed or changed; + + changed, config.current_config.damage_meter_UI.settings.hide_other_players = imgui.checkbox( + language.current_language.customization_menu.hide_other_players, + config.current_config.damage_meter_UI.settings.hide_other_players); + config_changed = config_changed or changed; + damage_meter_UI_changed = damage_meter_UI_changed or changed; + + changed, config.current_config.damage_meter_UI.settings.hide_total_damage = imgui.checkbox( + language.current_language.customization_menu.hide_total_damage, + config.current_config.damage_meter_UI.settings.hide_total_damage); + config_changed = config_changed or changed; + damage_meter_UI_changed = damage_meter_UI_changed or changed; + changed, config.current_config.damage_meter_UI.settings.hide_module_if_total_damage_is_zero = imgui.checkbox( language.current_language.customization_menu.hide_module_if_total_damage_is_zero, config.current_config.damage_meter_UI.settings.hide_module_if_total_damage_is_zero); diff --git a/reframework/data/MHR Overlay/languages/en-us.json b/reframework/data/MHR Overlay/languages/en-us.json index 535a0ce..4cc754a 100644 --- a/reframework/data/MHR Overlay/languages/en-us.json +++ b/reframework/data/MHR Overlay/languages/en-us.json @@ -110,7 +110,10 @@ "hide_inactive_ailments_with_no_buildup_support": "Hide Inactive Ailments with no Buildup Support", "hide_inactive_creatures": "Hide Inactive Creatures", "hide_module_if_total_damage_is_zero": "Hide Module if Total Damage is 0", + "hide_myself": "Hide Myself", + "hide_other_players": "Hide Other Players", "hide_player_if_player_damage_is_zero": "Hide Player if Player Damage is 0", + "hide_total_damage": "Hide Total Damage", "hide_total_if_total_damage_is_zero": "Hide Total if Total Damage is 0", "hide_undamaged_parts": "Hide Undamaged Parts", "highlighted": "Highlighted (targeted)", diff --git a/reframework/data/MHR Overlay/languages/ko-kr.json b/reframework/data/MHR Overlay/languages/ko-kr.json index 1a46431..4f540b2 100644 --- a/reframework/data/MHR Overlay/languages/ko-kr.json +++ b/reframework/data/MHR Overlay/languages/ko-kr.json @@ -110,7 +110,10 @@ "hide_inactive_ailments_with_no_buildup_support": "누적치가 없고 걸리지 않은 상태이상 숨김", "hide_inactive_creatures": "쿨타임인 환경생물 숨김", "hide_module_if_total_damage_is_zero": "총 대미지가 0이면 모듈 숨김", + "hide_myself": "Hide Myself", + "hide_other_players": "Hide Other Players", "hide_player_if_player_damage_is_zero": "헌터 대미지가 0이면 헌터 숨김", + "hide_total_damage": "Hide Total Damage", "hide_total_if_total_damage_is_zero": "총 대미지가 0이면 모두 숨김", "hide_undamaged_parts": "피해를 입히지 않은 부위 숨김", "highlighted": "타겟 몬스터 표시", diff --git a/reframework/data/MHR Overlay/languages/ru-ru.json b/reframework/data/MHR Overlay/languages/ru-ru.json index 67bf3b2..c007083 100644 --- a/reframework/data/MHR Overlay/languages/ru-ru.json +++ b/reframework/data/MHR Overlay/languages/ru-ru.json @@ -110,7 +110,10 @@ "hide_inactive_ailments_with_no_buildup_support": "Скрыть неактивные аномальные статусы без поддержки накопления", "hide_inactive_creatures": "Скрыть неактивных существ", "hide_module_if_total_damage_is_zero": "Скрыть модуль, если общий урон равен 0", + "hide_myself": "Hide Myself", + "hide_other_players": "Hide Other Players", "hide_player_if_player_damage_is_zero": "Скрыть игрока, если его урон равен 0", + "hide_total_damage": "Hide Total Damage", "hide_total_if_total_damage_is_zero": "Скрыть общий урон, если он равен 0", "hide_undamaged_parts": "Скрыть неповреждённые части тела", "highlighted": "Помеченный", diff --git a/reframework/data/MHR Overlay/languages/zh-cn.json b/reframework/data/MHR Overlay/languages/zh-cn.json index ebbdca8..0a112ea 100644 --- a/reframework/data/MHR Overlay/languages/zh-cn.json +++ b/reframework/data/MHR Overlay/languages/zh-cn.json @@ -110,7 +110,10 @@ "hide_inactive_ailments_with_no_buildup_support": "隐藏无积累值的非激活状态异常", "hide_inactive_creatures": "隐藏没有激活的生物", "hide_module_if_total_damage_is_zero": "当总伤害为0时隐藏该模块", + "hide_myself": "Hide Myself", + "hide_other_players": "Hide Other Players", "hide_player_if_player_damage_is_zero": "当玩家伤害为0时隐藏该玩家", + "hide_total_damage": "Hide Total Damage", "hide_total_if_total_damage_is_zero": "当总伤害为0时隐藏总伤害", "hide_undamaged_parts": "隐藏没有受到伤害的部位", "highlighted": "高亮(目标)", diff --git a/reframework/data/MHR Overlay/languages/zh-tw.json b/reframework/data/MHR Overlay/languages/zh-tw.json index 3900ab5..46d39b9 100644 --- a/reframework/data/MHR Overlay/languages/zh-tw.json +++ b/reframework/data/MHR Overlay/languages/zh-tw.json @@ -110,7 +110,10 @@ "hide_inactive_ailments_with_no_buildup_support": "隱藏無累積值的非觸發下異常狀態", "hide_inactive_creatures": "隱藏不可觸發的環境生物", "hide_module_if_total_damage_is_zero": "當總傷害為0時,隱藏玩家輸出資訊", + "hide_myself": "Hide Myself", + "hide_other_players": "Hide Other Players", "hide_player_if_player_damage_is_zero": "當玩家傷害為0時,隱藏玩家傷害", + "hide_total_damage": "Hide Total Damage", "hide_total_if_total_damage_is_zero": "當總傷害為0時,隱藏總傷害", "hide_undamaged_parts": "隱藏沒受到傷害的部位", "highlighted": "鎖定的魔物資訊(目標)",