From 6392fa3db2385f56c45b4525509fdcb9a69ba1f6 Mon Sep 17 00:00:00 2001 From: GreenComfyTea Date: Mon, 25 Jul 2022 11:12:32 +0300 Subject: [PATCH] Add Filters to Parts. --- .../autorun/MHR_Overlay/Misc/config.lua | 81 +++- .../autorun/MHR_Overlay/Misc/language.lua | 11 +- .../MHR_Overlay/Monsters/body_part.lua | 181 ++++++- .../MHR_Overlay/Monsters/large_monster.lua | 2 + .../MHR_Overlay/UI/customization_menu.lua | 452 ++++++++++++------ .../data/MHR Overlay/languages/en-us.json | 7 + .../data/MHR Overlay/languages/ko-kr.json | 7 + .../data/MHR Overlay/languages/ru-ru.json | 11 +- .../data/MHR Overlay/languages/zh-cn.json | 7 + .../data/MHR Overlay/languages/zh-tw.json | 7 + 10 files changed, 576 insertions(+), 190 deletions(-) diff --git a/reframework/autorun/MHR_Overlay/Misc/config.lua b/reframework/autorun/MHR_Overlay/Misc/config.lua index b2d3ce0..587d40c 100644 --- a/reframework/autorun/MHR_Overlay/Misc/config.lua +++ b/reframework/autorun/MHR_Overlay/Misc/config.lua @@ -169,30 +169,6 @@ function config.init() y = 0, anchor = "Top-Left" }, - - filter = { - paralysis = true, - sleep = true, - stun = true, - flash = true, - poison = true, - blast = true, - exhaust = true, - ride = true, - waterblight = true, - fireblight = true, - iceblight = true, - thunderblight = true, - - fall_trap = true, - shock_trap = true, - tranq_bomb = true, - dung_bomb = true, - steel_fang = true, - quick_sand = true, - fall_otomo_trap = true, - shock_otomo_trap = true - }, monster_name_label = { visibility = true, @@ -326,6 +302,30 @@ function config.init() type = "Normal", reversed_order = false }, + + filter = { + paralysis = true, + sleep = true, + stun = true, + flash = true, + poison = true, + blast = true, + exhaust = true, + ride = true, + waterblight = true, + fireblight = true, + iceblight = true, + thunderblight = true, + + fall_trap = true, + shock_trap = true, + tranq_bomb = true, + dung_bomb = true, + steel_fang = true, + quick_sand = true, + fall_otomo_trap = true, + shock_otomo_trap = true + }, ailment_name_label = { visibility = true, @@ -1033,6 +1033,17 @@ function config.init() reversed_order = false }, + filter = + { + health_break_severe = true, + health_break = true, + health_severe = true, + health = true, + break_severe = true, + break_ = true, + severe = true + }, + part_name_label = { visibility = true, text = "%s", @@ -2086,6 +2097,17 @@ function config.init() reversed_order = false }, + filter = + { + health_break_severe = true, + health_break = true, + health_severe = true, + health = true, + break_severe = true, + break_ = true, + severe = true + }, + part_name_label = { visibility = true, text = "%s", @@ -3121,6 +3143,17 @@ function config.init() reversed_order = false }, + filter = + { + health_break_severe = true, + health_break = true, + health_severe = true, + health = true, + break_severe = true, + break_ = true, + severe = true + }, + part_name_label = { visibility = true, text = "%s", diff --git a/reframework/autorun/MHR_Overlay/Misc/language.lua b/reframework/autorun/MHR_Overlay/Misc/language.lua index 8614a85..db1a8eb 100644 --- a/reframework/autorun/MHR_Overlay/Misc/language.lua +++ b/reframework/autorun/MHR_Overlay/Misc/language.lua @@ -383,7 +383,16 @@ language.default_language = { prioritize_large_monsters = "Large Monsters on High Priority", max_monster_updates_per_tick = "Max Monster Updates per Tick", - freeze_dps_on_quest_clear = "Freeze DPS when Quest is cleared" + freeze_dps_on_quest_clear = "Freeze DPS when Quest is cleared", + + + health_break_severe_filter = "Health + Break + Severe", + health_break_filter = "Health + Break", + health_severe_filter = "Health + Severe", + health_filter = "Health", + break_severe_filter = "Break + Severe", + break_filter = "Break", + severe_filter = "Severe" } }; diff --git a/reframework/autorun/MHR_Overlay/Monsters/body_part.lua b/reframework/autorun/MHR_Overlay/Monsters/body_part.lua index c261cad..7002593 100644 --- a/reframework/autorun/MHR_Overlay/Monsters/body_part.lua +++ b/reframework/autorun/MHR_Overlay/Monsters/body_part.lua @@ -197,16 +197,64 @@ function body_part.draw_dynamic(monster, parts_position_on_screen, opacity_scale local displayed_parts = {}; for REpart, part in pairs(monster.parts) do + local health_supported = part.max_health >= 0; + local break_supported = part.break_max_health >= 0; + local severe_supported = part.loss_max_health >= 0; + + if health_supported then + if break_supported then + if severe_supported then + if not cached_config.filter.health_break_severe then + goto continue; + end + else + if not cached_config.filter.health_break then + goto continue; + end + end + else + if severe_supported then + if not cached_config.filter.health_severe then + goto continue; + end + else + if not cached_config.filter.health then + goto continue; + end + end + end + else + if break_supported then + if severe_supported then + if not cached_config.filter.break_severe then + goto continue; + end + else + if not cached_config.filter.break_ then + goto continue; + end + end + else + if severe_supported then + if not cached_config.filter.severe then + goto continue; + end + else + goto continue; + end + end + end + if cached_config.settings.hide_undamaged_parts - and ((part.health == part.max_health and part.flinch_count == 0) or part.max_health < 0) - and ((part.break_health == part.break_max_health and part.break_count == 0) or part.break_max_health < 0) - and ((part.loss_health == part.loss_max_health and not part.is_severed) or part.loss_max_health < 0) then + and ((part.health == part.max_health and part.flinch_count == 0) or not health_supported) + and ((part.break_health == part.break_max_health and part.break_count == 0) or not break_supported) + and ((part.loss_health == part.loss_max_health and not part.is_severed) or not severe_supported) then goto continue; end - if (not part.body_part_dynamic_UI.flinch_visibility or part.max_health < 0) - and (not part.body_part_dynamic_UI.break_visibility or part.break_max_health < 0 or part.break_count >= part.break_max_count) - and (not part.body_part_dynamic_UI.loss_visibility or part.loss_max_health < 0 or part.is_severed) then + if (not part.body_part_dynamic_UI.flinch_visibility or not health_supported) + and (not part.body_part_dynamic_UI.break_visibility or not break_supported or part.break_count >= part.break_max_count) + and (not part.body_part_dynamic_UI.loss_visibility or not severe_supported or part.is_severed) then goto continue; end @@ -331,15 +379,64 @@ function body_part.draw_static(monster, parts_position_on_screen, opacity_scale) local displayed_parts = {}; for REpart, part in pairs(monster.parts) do + local health_supported = part.max_health >= 0; + local break_supported = part.break_max_health >= 0; + local severe_supported = part.loss_max_health >= 0; + + if health_supported then + if break_supported then + if severe_supported then + if not cached_config.filter.health_break_severe then + goto continue; + end + else + if not cached_config.filter.health_break then + goto continue; + end + end + else + if severe_supported then + if not cached_config.filter.health_severe then + goto continue; + end + else + if not cached_config.filter.health then + goto continue; + end + end + end + else + if break_supported then + if severe_supported then + if not cached_config.filter.break_severe then + goto continue; + end + else + if not cached_config.filter.break_ then + goto continue; + end + end + else + if severe_supported then + if not cached_config.filter.severe then + goto continue; + end + else + goto continue; + end + end + end + if cached_config.settings.hide_undamaged_parts - and ((part.health == part.max_health and part.flinch_count == 0) or part.max_health < 0) - and ((part.break_health == part.break_max_health and part.break_count == 0) or part.break_max_health < 0) - and ((part.loss_health == part.loss_max_health and not part.is_severed) or part.loss_max_health < 0) then + and ((part.health == part.max_health and part.flinch_count == 0) or not health_supported) + and ((part.break_health == part.break_max_health and part.break_count == 0) or not break_supported) + and ((part.loss_health == part.loss_max_health and not part.is_severed) or not severe_supported) then goto continue; end - if (not part.body_part_static_UI.flinch_visibility or part.max_health < 0) - and (not part.body_part_static_UI.break_visibility or part.break_max_health < 0 or part.break_count >= part.break_max_count) - and (not part.body_part_static_UI.loss_visibility or part.loss_max_health < 0 or part.is_severed) then + + if (not part.body_part_static_UI.flinch_visibility or not health_supported) + and (not part.body_part_static_UI.break_visibility or not break_supported or part.break_count >= part.break_max_count) + and (not part.body_part_static_UI.loss_visibility or not severe_supported or part.is_severed) then goto continue; end @@ -465,16 +562,64 @@ function body_part.draw_highlighted(monster, parts_position_on_screen, opacity_s local displayed_parts = {}; for REpart, part in pairs(monster.parts) do + local health_supported = part.max_health >= 0; + local break_supported = part.break_max_health >= 0; + local severe_supported = part.loss_max_health >= 0; + + if health_supported then + if break_supported then + if severe_supported then + if not cached_config.filter.health_break_severe then + goto continue; + end + else + if not cached_config.filter.health_break then + goto continue; + end + end + else + if severe_supported then + if not cached_config.filter.health_severe then + goto continue; + end + else + if not cached_config.filter.health then + goto continue; + end + end + end + else + if break_supported then + if severe_supported then + if not cached_config.filter.break_severe then + goto continue; + end + else + if not cached_config.filter.break_ then + goto continue; + end + end + else + if severe_supported then + if not cached_config.filter.severe then + goto continue; + end + else + goto continue; + end + end + end + if cached_config.settings.hide_undamaged_parts - and ((part.health == part.max_health and part.flinch_count == 0) or part.max_health < 0) - and ((part.break_health == part.break_max_health and part.break_count == 0) or part.break_max_health < 0) - and ((part.loss_health == part.loss_max_health and not part.is_severed) or part.loss_max_health < 0) then + and ((part.health == part.max_health and part.flinch_count == 0) or not health_supported) + and ((part.break_health == part.break_max_health and part.break_count == 0) or not break_supported) + and ((part.loss_health == part.loss_max_health and not part.is_severed) or not severe_supported) then goto continue; end - if (not part.body_part_highlighted_UI.flinch_visibility or part.max_health < 0) - and (not part.body_part_highlighted_UI.break_visibility or part.break_max_health < 0 or part.break_count >= part.break_max_count) - and (not part.body_part_highlighted_UI.loss_visibility or part.loss_max_health < 0 or part.is_severed) then + if (not part.body_part_highlighted_UI.flinch_visibility or not health_supported) + and (not part.body_part_highlighted_UI.break_visibility or not break_supported or part.break_count >= part.break_max_count) + and (not part.body_part_highlighted_UI.loss_visibility or not severe_supported or part.is_severed) then goto continue; end diff --git a/reframework/autorun/MHR_Overlay/Monsters/large_monster.lua b/reframework/autorun/MHR_Overlay/Monsters/large_monster.lua index 570cb12..fb3a317 100644 --- a/reframework/autorun/MHR_Overlay/Monsters/large_monster.lua +++ b/reframework/autorun/MHR_Overlay/Monsters/large_monster.lua @@ -88,6 +88,8 @@ function large_monster.new(enemy) large_monster.init_dynamic_UI(monster); large_monster.init_highlighted_UI(monster); + monster.name = monster.name .. " " .. tostring(monster.id); + if large_monster.list[enemy] == nil then large_monster.list[enemy] = monster; end diff --git a/reframework/autorun/MHR_Overlay/UI/customization_menu.lua b/reframework/autorun/MHR_Overlay/UI/customization_menu.lua index af86764..46e1605 100644 --- a/reframework/autorun/MHR_Overlay/UI/customization_menu.lua +++ b/reframework/autorun/MHR_Overlay/UI/customization_menu.lua @@ -1083,151 +1083,6 @@ function customization_menu.draw() imgui.tree_pop(); end - if imgui.tree_node(language.current_language.customization_menu.filter) then - changed, config.current_config.small_monster_UI.ailments.filter.paralysis = imgui.checkbox(language.current_language - .ailments.paralysis, - config.current_config.small_monster_UI.ailments.filter.paralysis); - - config_changed = config_changed or changed; - large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; - - changed, config.current_config.small_monster_UI.ailments.filter.sleep = imgui.checkbox(language.current_language - .ailments.sleep, - config.current_config.small_monster_UI.ailments.filter.sleep); - - config_changed = config_changed or changed; - large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; - - changed, config.current_config.small_monster_UI.ailments.filter.stun = imgui.checkbox(language.current_language - .ailments.stun, - config.current_config.small_monster_UI.ailments.filter.stun); - - config_changed = config_changed or changed; - large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; - - changed, config.current_config.small_monster_UI.ailments.filter.flash = imgui.checkbox(language.current_language - .ailments.flash, - config.current_config.small_monster_UI.ailments.filter.flash); - - config_changed = config_changed or changed; - large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; - - changed, config.current_config.small_monster_UI.ailments.filter.poison = imgui.checkbox(language - .current_language.ailments.poison, - config.current_config.small_monster_UI.ailments.filter.poison); - - config_changed = config_changed or changed; - large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; - - changed, config.current_config.small_monster_UI.ailments.filter.blast = imgui.checkbox(language - .current_language.ailments.blast, - config.current_config.small_monster_UI.ailments.filter.blast); - - config_changed = config_changed or changed; - large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; - - changed, config.current_config.small_monster_UI.ailments.filter.exhaust = imgui.checkbox(language - .current_language.ailments.exhaust, - config.current_config.small_monster_UI.ailments.filter.exhaust); - - config_changed = config_changed or changed; - large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; - - changed, config.current_config.small_monster_UI.ailments.filter.ride = imgui.checkbox(language - .current_language.ailments.ride, - config.current_config.small_monster_UI.ailments.filter.ride); - - config_changed = config_changed or changed; - large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; - - changed, config.current_config.small_monster_UI.ailments.filter.waterblight = imgui.checkbox(language - .current_language.ailments.waterblight, - config.current_config.small_monster_UI.ailments.filter.waterblight); - - config_changed = config_changed or changed; - large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; - - changed, config.current_config.small_monster_UI.ailments.filter.fireblight = imgui.checkbox(language - .current_language.ailments.fireblight, - config.current_config.small_monster_UI.ailments.filter.fireblight); - - config_changed = config_changed or changed; - large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; - - changed, config.current_config.small_monster_UI.ailments.filter.iceblight = imgui.checkbox(language - .current_language.ailments.iceblight, - config.current_config.small_monster_UI.ailments.filter.iceblight); - - config_changed = config_changed or changed; - large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; - - changed, config.current_config.small_monster_UI.ailments.filter.thunderblight = imgui.checkbox(language - .current_language.ailments.thunderblight, - config.current_config.small_monster_UI.ailments.filter.thunderblight); - - config_changed = config_changed or changed; - large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; - - changed, config.current_config.small_monster_UI.ailments.filter.fall_trap = imgui.checkbox(language - .current_language.ailments.fall_trap, - config.current_config.small_monster_UI.ailments.filter.fall_trap); - - config_changed = config_changed or changed; - large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; - - changed, config.current_config.small_monster_UI.ailments.filter.shock_trap = imgui.checkbox(language - .current_language.ailments.shock_trap, - config.current_config.small_monster_UI.ailments.filter.shock_trap); - - config_changed = config_changed or changed; - large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; - - changed, config.current_config.small_monster_UI.ailments.filter.tranq_bomb = imgui.checkbox(language - .current_language.ailments.tranq_bomb, - config.current_config.small_monster_UI.ailments.filter.tranq_bomb); - - config_changed = config_changed or changed; - large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; - - changed, config.current_config.small_monster_UI.ailments.filter.dung_bomb = imgui.checkbox(language - .current_language.ailments.dung_bomb, - config.current_config.small_monster_UI.ailments.filter.dung_bomb); - - config_changed = config_changed or changed; - large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; - - changed, config.current_config.small_monster_UI.ailments.filter.steel_fang = imgui.checkbox(language - .current_language.ailments.steel_fang, - config.current_config.small_monster_UI.ailments.filter.steel_fang); - - config_changed = config_changed or changed; - large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; - - changed, config.current_config.small_monster_UI.ailments.filter.quick_sand = imgui.checkbox(language - .current_language.ailments.quick_sand, - config.current_config.small_monster_UI.ailments.filter.quick_sand); - - config_changed = config_changed or changed; - large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; - - changed, config.current_config.small_monster_UI.ailments.filter.fall_otomo_trap = imgui.checkbox(language - .current_language.ailments.fall_otomo_trap, - config.current_config.small_monster_UI.ailments.filter.fall_otomo_trap); - - config_changed = config_changed or changed; - large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; - - changed, config.current_config.small_monster_UI.ailments.filter.shock_otomo_trap = imgui.checkbox(language - .current_language.ailments.shock_otomo_trap, - config.current_config.small_monster_UI.ailments.filter.shock_otomo_trap); - - config_changed = config_changed or changed; - large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; - - - imgui.tree_pop(); - end - if imgui.tree_node(language.current_language.customization_menu.monster_name_label) then changed, config.current_config.small_monster_UI.monster_name_label.visibility = imgui.checkbox(language.current_language .customization_menu.visible, @@ -1697,6 +1552,151 @@ function customization_menu.draw() imgui.tree_pop(); end + if imgui.tree_node(language.current_language.customization_menu.filter) then + changed, config.current_config.small_monster_UI.ailments.filter.paralysis = imgui.checkbox(language.current_language + .ailments.paralysis, + config.current_config.small_monster_UI.ailments.filter.paralysis); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + changed, config.current_config.small_monster_UI.ailments.filter.sleep = imgui.checkbox(language.current_language + .ailments.sleep, + config.current_config.small_monster_UI.ailments.filter.sleep); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + changed, config.current_config.small_monster_UI.ailments.filter.stun = imgui.checkbox(language.current_language + .ailments.stun, + config.current_config.small_monster_UI.ailments.filter.stun); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + changed, config.current_config.small_monster_UI.ailments.filter.flash = imgui.checkbox(language.current_language + .ailments.flash, + config.current_config.small_monster_UI.ailments.filter.flash); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + changed, config.current_config.small_monster_UI.ailments.filter.poison = imgui.checkbox(language + .current_language.ailments.poison, + config.current_config.small_monster_UI.ailments.filter.poison); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + changed, config.current_config.small_monster_UI.ailments.filter.blast = imgui.checkbox(language + .current_language.ailments.blast, + config.current_config.small_monster_UI.ailments.filter.blast); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + changed, config.current_config.small_monster_UI.ailments.filter.exhaust = imgui.checkbox(language + .current_language.ailments.exhaust, + config.current_config.small_monster_UI.ailments.filter.exhaust); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + changed, config.current_config.small_monster_UI.ailments.filter.ride = imgui.checkbox(language + .current_language.ailments.ride, + config.current_config.small_monster_UI.ailments.filter.ride); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + changed, config.current_config.small_monster_UI.ailments.filter.waterblight = imgui.checkbox(language + .current_language.ailments.waterblight, + config.current_config.small_monster_UI.ailments.filter.waterblight); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + changed, config.current_config.small_monster_UI.ailments.filter.fireblight = imgui.checkbox(language + .current_language.ailments.fireblight, + config.current_config.small_monster_UI.ailments.filter.fireblight); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + changed, config.current_config.small_monster_UI.ailments.filter.iceblight = imgui.checkbox(language + .current_language.ailments.iceblight, + config.current_config.small_monster_UI.ailments.filter.iceblight); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + changed, config.current_config.small_monster_UI.ailments.filter.thunderblight = imgui.checkbox(language + .current_language.ailments.thunderblight, + config.current_config.small_monster_UI.ailments.filter.thunderblight); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + changed, config.current_config.small_monster_UI.ailments.filter.fall_trap = imgui.checkbox(language + .current_language.ailments.fall_trap, + config.current_config.small_monster_UI.ailments.filter.fall_trap); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + changed, config.current_config.small_monster_UI.ailments.filter.shock_trap = imgui.checkbox(language + .current_language.ailments.shock_trap, + config.current_config.small_monster_UI.ailments.filter.shock_trap); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + changed, config.current_config.small_monster_UI.ailments.filter.tranq_bomb = imgui.checkbox(language + .current_language.ailments.tranq_bomb, + config.current_config.small_monster_UI.ailments.filter.tranq_bomb); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + changed, config.current_config.small_monster_UI.ailments.filter.dung_bomb = imgui.checkbox(language + .current_language.ailments.dung_bomb, + config.current_config.small_monster_UI.ailments.filter.dung_bomb); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + changed, config.current_config.small_monster_UI.ailments.filter.steel_fang = imgui.checkbox(language + .current_language.ailments.steel_fang, + config.current_config.small_monster_UI.ailments.filter.steel_fang); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + changed, config.current_config.small_monster_UI.ailments.filter.quick_sand = imgui.checkbox(language + .current_language.ailments.quick_sand, + config.current_config.small_monster_UI.ailments.filter.quick_sand); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + changed, config.current_config.small_monster_UI.ailments.filter.fall_otomo_trap = imgui.checkbox(language + .current_language.ailments.fall_otomo_trap, + config.current_config.small_monster_UI.ailments.filter.fall_otomo_trap); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + changed, config.current_config.small_monster_UI.ailments.filter.shock_otomo_trap = imgui.checkbox(language + .current_language.ailments.shock_otomo_trap, + config.current_config.small_monster_UI.ailments.filter.shock_otomo_trap); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + + imgui.tree_pop(); + end + if imgui.tree_node(language.current_language.customization_menu.ailment_name_label) then changed, config.current_config.small_monster_UI.ailments.ailment_name_label.visibility = imgui.checkbox(language.current_language .customization_menu.visible, @@ -4397,6 +4397,60 @@ function customization_menu.draw() imgui.tree_pop(); end + if imgui.tree_node(language.current_language.customization_menu.filter) then + changed, config.current_config.large_monster_UI.dynamic.body_parts.filter.health_break_severe = imgui.checkbox(language.current_language + .customization_menu.health_break_severe_filter, + config.current_config.large_monster_UI.dynamic.body_parts.filter.health_break_severe); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + changed, config.current_config.large_monster_UI.dynamic.body_parts.filter.health_break = imgui.checkbox(language.current_language + .customization_menu.health_break_filter, + config.current_config.large_monster_UI.dynamic.body_parts.filter.health_break); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + changed, config.current_config.large_monster_UI.dynamic.body_parts.filter.health_severe = imgui.checkbox(language.current_language + .customization_menu.health_severe_filter, + config.current_config.large_monster_UI.dynamic.body_parts.filter.health_severe); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + changed, config.current_config.large_monster_UI.dynamic.body_parts.filter.health = imgui.checkbox(language.current_language + .customization_menu.health_filter, + config.current_config.large_monster_UI.dynamic.body_parts.filter.health); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + changed, config.current_config.large_monster_UI.dynamic.body_parts.filter.break_severe = imgui.checkbox(language.current_language + .customization_menu.break_severe_filter, + config.current_config.large_monster_UI.dynamic.body_parts.filter.break_severe); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + changed, config.current_config.large_monster_UI.dynamic.body_parts.filter.break_ = imgui.checkbox(language.current_language + .customization_menu.break_filter, + config.current_config.large_monster_UI.dynamic.body_parts.filter.break_); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + changed, config.current_config.large_monster_UI.dynamic.body_parts.filter.severe = imgui.checkbox(language.current_language + .customization_menu.severe_filter, + config.current_config.large_monster_UI.dynamic.body_parts.filter.severe); + + config_changed = config_changed or changed; + large_monster_dynamic_UI_changed = large_monster_dynamic_UI_changed or changed; + + + imgui.tree_pop(); + end + if imgui.tree_node(language.current_language.customization_menu.part_name_label) then changed, config.current_config.large_monster_UI.dynamic.body_parts.part_name_label.visibility = imgui.checkbox(language .current_language.customization_menu.visible, @@ -8598,6 +8652,60 @@ function customization_menu.draw() imgui.tree_pop(); end + if imgui.tree_node(language.current_language.customization_menu.filter) then + changed, config.current_config.large_monster_UI.static.body_parts.filter.health_break_severe = imgui.checkbox(language.current_language + .customization_menu.health_break_severe_filter, + config.current_config.large_monster_UI.static.body_parts.filter.health_break_severe); + + config_changed = config_changed or changed; + large_monster_static_UI_changed = large_monster_static_UI_changed or changed; + + changed, config.current_config.large_monster_UI.static.body_parts.filter.health_break = imgui.checkbox(language.current_language + .customization_menu.health_break_filter, + config.current_config.large_monster_UI.static.body_parts.filter.health_break); + + config_changed = config_changed or changed; + large_monster_static_UI_changed = large_monster_static_UI_changed or changed; + + changed, config.current_config.large_monster_UI.static.body_parts.filter.health_severe = imgui.checkbox(language.current_language + .customization_menu.health_severe_filter, + config.current_config.large_monster_UI.static.body_parts.filter.health_severe); + + config_changed = config_changed or changed; + large_monster_static_UI_changed = large_monster_static_UI_changed or changed; + + changed, config.current_config.large_monster_UI.static.body_parts.filter.health = imgui.checkbox(language.current_language + .customization_menu.health_filter, + config.current_config.large_monster_UI.static.body_parts.filter.health); + + config_changed = config_changed or changed; + large_monster_static_UI_changed = large_monster_static_UI_changed or changed; + + changed, config.current_config.large_monster_UI.static.body_parts.filter.break_severe = imgui.checkbox(language.current_language + .customization_menu.break_severe_filter, + config.current_config.large_monster_UI.static.body_parts.filter.break_severe); + + config_changed = config_changed or changed; + large_monster_static_UI_changed = large_monster_static_UI_changed or changed; + + changed, config.current_config.large_monster_UI.static.body_parts.filter.break_ = imgui.checkbox(language.current_language + .customization_menu.break_filter, + config.current_config.large_monster_UI.static.body_parts.filter.break_); + + config_changed = config_changed or changed; + large_monster_static_UI_changed = large_monster_static_UI_changed or changed; + + changed, config.current_config.large_monster_UI.static.body_parts.filter.severe = imgui.checkbox(language.current_language + .customization_menu.severe_filter, + config.current_config.large_monster_UI.static.body_parts.filter.severe); + + config_changed = config_changed or changed; + large_monster_static_UI_changed = large_monster_static_UI_changed or changed; + + + imgui.tree_pop(); + end + if imgui.tree_node(language.current_language.customization_menu.part_name_label) then changed, config.current_config.large_monster_UI.static.body_parts.part_name_label.visibility = imgui.checkbox(language.current_language .customization_menu.visible, @@ -12708,6 +12816,60 @@ function customization_menu.draw() imgui.tree_pop(); end + if imgui.tree_node(language.current_language.customization_menu.filter) then + changed, config.current_config.large_monster_UI.highlighted.body_parts.filter.health_break_severe = imgui.checkbox(language.current_language + .customization_menu.health_break_severe_filter, + config.current_config.large_monster_UI.highlighted.body_parts.filter.health_break_severe); + + config_changed = config_changed or changed; + large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; + + changed, config.current_config.large_monster_UI.highlighted.body_parts.filter.health_break = imgui.checkbox(language.current_language + .customization_menu.health_break_filter, + config.current_config.large_monster_UI.highlighted.body_parts.filter.health_break); + + config_changed = config_changed or changed; + large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; + + changed, config.current_config.large_monster_UI.highlighted.body_parts.filter.health_severe = imgui.checkbox(language.current_language + .customization_menu.health_severe_filter, + config.current_config.large_monster_UI.highlighted.body_parts.filter.health_severe); + + config_changed = config_changed or changed; + large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; + + changed, config.current_config.large_monster_UI.highlighted.body_parts.filter.health = imgui.checkbox(language.current_language + .customization_menu.health_filter, + config.current_config.large_monster_UI.highlighted.body_parts.filter.health); + + config_changed = config_changed or changed; + large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; + + changed, config.current_config.large_monster_UI.highlighted.body_parts.filter.break_severe = imgui.checkbox(language.current_language + .customization_menu.break_severe_filter, + config.current_config.large_monster_UI.highlighted.body_parts.filter.break_severe); + + config_changed = config_changed or changed; + large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; + + changed, config.current_config.large_monster_UI.highlighted.body_parts.filter.break_ = imgui.checkbox(language.current_language + .customization_menu.break_filter, + config.current_config.large_monster_UI.highlighted.body_parts.filter.break_); + + config_changed = config_changed or changed; + large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; + + changed, config.current_config.large_monster_UI.highlighted.body_parts.filter.severe = imgui.checkbox(language.current_language + .customization_menu.severe_filter, + config.current_config.large_monster_UI.highlighted.body_parts.filter.severe); + + config_changed = config_changed or changed; + large_monster_highlighted_UI_changed = large_monster_highlighted_UI_changed or changed; + + + imgui.tree_pop(); + end + if imgui.tree_node(language.current_language.customization_menu.part_name_label) then changed, config.current_config.large_monster_UI.highlighted.body_parts.part_name_label.visibility = imgui.checkbox(language .current_language.customization_menu.visible, diff --git a/reframework/data/MHR Overlay/languages/en-us.json b/reframework/data/MHR Overlay/languages/en-us.json index f4264df..5b73b01 100644 --- a/reframework/data/MHR Overlay/languages/en-us.json +++ b/reframework/data/MHR Overlay/languages/en-us.json @@ -57,9 +57,11 @@ "bottom_left": "Bottom-Left", "bottom_right": "Bottom-Right", "break_count": "Break Count", + "break_filter": "Break", "break_health": "Break Health", "break_health_percentage": "Break Health Percentage", "break_max_count": "Break Max Count", + "break_severe_filter": "Break + Severe", "buildup": "Buildup", "buildup_bar": "Buildup Bar", "buildup_bars_are_relative_to": "Buildup Bars are relative to", @@ -103,7 +105,11 @@ "global_scale_modifier": "Global Scale Modifier", "global_settings": "Global Settings", "health": "Health", + "health_break_filter": "Health + Break", + "health_break_severe_filter": "Health + Break + Severe", + "health_filter": "Health", "health_percentage": "Health Percentage", + "health_severe_filter": "Health + Severe", "height": "Height", "hide_ailments_with_zero_buildup": "Hide Ailments when Buildup is 0", "hide_all_active_ailments": "Hide All Active Ailments", @@ -189,6 +195,7 @@ "render_not_highlighted_monsters": "Render Not Highlighted Monsters", "reversed_order": "Reversed Order", "settings": "Settings", + "severe_filter": "Severe", "shadow": "Shadow", "size": "Size", "small_monster_UI": "Small Monster UI", diff --git a/reframework/data/MHR Overlay/languages/ko-kr.json b/reframework/data/MHR Overlay/languages/ko-kr.json index a74305e..c235b05 100644 --- a/reframework/data/MHR Overlay/languages/ko-kr.json +++ b/reframework/data/MHR Overlay/languages/ko-kr.json @@ -57,9 +57,11 @@ "bottom_left": "좌하단", "bottom_right": "우하단", "break_count": "파괴 횟수", + "break_filter": "Break", "break_health": "파괴 수치", "break_health_percentage": "파괴 수치 비율", "break_max_count": "최대 파괴 횟수", + "break_severe_filter": "Break + Severe", "buildup": "누적치", "buildup_bar": "누적치 바", "buildup_bars_are_relative_to": "기준으로 누적치 바", @@ -103,7 +105,11 @@ "global_scale_modifier": "전역 크기 배율", "global_settings": "전역 설정", "health": "체력", + "health_break_filter": "Health + Break", + "health_break_severe_filter": "Health + Break + Severe", + "health_filter": "Health", "health_percentage": "체력 비율", + "health_severe_filter": "Health + Severe", "height": "높이", "hide_ailments_with_zero_buildup": "누적치가 0이면 상태이상 숨김", "hide_all_active_ailments": "걸린 상태이상 모두 숨김", @@ -189,6 +195,7 @@ "render_not_highlighted_monsters": "타겟이 아닌 몬스터 표시", "reversed_order": "역순", "settings": "설정", + "severe_filter": "Severe", "shadow": "그림자", "size": "크기", "small_monster_UI": "소형 몬스터 UI", diff --git a/reframework/data/MHR Overlay/languages/ru-ru.json b/reframework/data/MHR Overlay/languages/ru-ru.json index 33bd3a0..054fcdd 100644 --- a/reframework/data/MHR Overlay/languages/ru-ru.json +++ b/reframework/data/MHR Overlay/languages/ru-ru.json @@ -57,9 +57,11 @@ "bottom_left": "Левый нижний угол", "bottom_right": "Правй нижний угол", "break_count": "Счётчик повреждений", + "break_filter": "Повреждение", "break_health": "Повреждение части", "break_health_percentage": "Повреждение части в процентах", "break_max_count": "Максимальное кол-во повреждений", + "break_severe_filter": "Повреждение + Отсечение", "buildup": "Накопление", "buildup_bar": "Шкала накопления", "buildup_bars_are_relative_to": "Шкалы накопления расположены относительно к", @@ -67,8 +69,8 @@ "buildup_percentage_label": "Метка накопления в процентах", "buildup_value_label": "Метка значения накопления", "capture_line": "Линия здоровья захвата", - "cart_count": "Cart Count", - "cart_count_label": "Метка кол-ва смертей", + "cart_count": "Кол-во потерь сознания", + "cart_count_label": "Метка кол-ва потерь сознания", "color": "Цвет", "colors": "Цвета", "creature_name_label": "Метка имени существа", @@ -103,7 +105,11 @@ "global_scale_modifier": "Глобальный модификатор размера", "global_settings": "Общие настройки", "health": "Здоровье", + "health_break_filter": "Здоровье + Повреждение", + "health_break_severe_filter": "Здоровье + Повреждение + Отсечение", + "health_filter": "Здоровье", "health_percentage": "Здоровье в процентах", + "health_severe_filter": "Здоровье + Отсечение", "height": "Высота", "hide_ailments_with_zero_buildup": "Скрыть аномальный статус, если накопление равно 0", "hide_all_active_ailments": "Скрыть все активные аномальные статусы", @@ -189,6 +195,7 @@ "render_not_highlighted_monsters": "Показывать непомеченных монстров", "reversed_order": "Обратный порядок", "settings": "Настройки", + "severe_filter": "Отсечение", "shadow": "Тень", "size": "Размер", "small_monster_UI": "Интерфейс малых монстров", diff --git a/reframework/data/MHR Overlay/languages/zh-cn.json b/reframework/data/MHR Overlay/languages/zh-cn.json index b8990ed..1632ae3 100644 --- a/reframework/data/MHR Overlay/languages/zh-cn.json +++ b/reframework/data/MHR Overlay/languages/zh-cn.json @@ -57,9 +57,11 @@ "bottom_left": "左下", "bottom_right": "右下", "break_count": "破坏次数", + "break_filter": "Break", "break_health": "Break Health", "break_health_percentage": "Break Health Percentage", "break_max_count": "Break Max Count", + "break_severe_filter": "Break + Severe", "buildup": "积累值", "buildup_bar": "积累值条", "buildup_bars_are_relative_to": "积累值条基于", @@ -103,7 +105,11 @@ "global_scale_modifier": "全局比例更改", "global_settings": "全局设定", "health": "生命", + "health_break_filter": "Health + Break", + "health_break_severe_filter": "Health + Break + Severe", + "health_filter": "Health", "health_percentage": "生命百分比", + "health_severe_filter": "Health + Severe", "height": "高度", "hide_ailments_with_zero_buildup": "当积累值为0时隐藏该状态异常", "hide_all_active_ailments": "隐藏所有激活的状态异常", @@ -189,6 +195,7 @@ "render_not_highlighted_monsters": "渲染非高亮怪物", "reversed_order": "逆向排序", "settings": "设定", + "severe_filter": "Severe", "shadow": "阴影", "size": "大小", "small_monster_UI": "小型怪物UI", diff --git a/reframework/data/MHR Overlay/languages/zh-tw.json b/reframework/data/MHR Overlay/languages/zh-tw.json index ba67778..3e97659 100644 --- a/reframework/data/MHR Overlay/languages/zh-tw.json +++ b/reframework/data/MHR Overlay/languages/zh-tw.json @@ -57,9 +57,11 @@ "bottom_left": "左下", "bottom_right": "右下", "break_count": "破壞次數", + "break_filter": "Break", "break_health": "Break Health", "break_health_percentage": "Break Health Percentage", "break_max_count": "Break Max Count", + "break_severe_filter": "Break + Severe", "buildup": "累積值", "buildup_bar": "累積值條", "buildup_bars_are_relative_to": "Buildup Bars are relative to", @@ -103,7 +105,11 @@ "global_scale_modifier": "全域比例更改", "global_settings": "全域設定", "health": "生命", + "health_break_filter": "Health + Break", + "health_break_severe_filter": "Health + Break + Severe", + "health_filter": "Health", "health_percentage": "生命百分比", + "health_severe_filter": "Health + Severe", "height": "高度", "hide_ailments_with_zero_buildup": "當累積值為0時,隱藏該異常狀態", "hide_all_active_ailments": "隱藏觸發中的異常狀態", @@ -189,6 +195,7 @@ "render_not_highlighted_monsters": "渲染非目標魔物", "reversed_order": "反向排序", "settings": "設定", + "severe_filter": "Severe", "shadow": "陰影", "size": "大小", "small_monster_UI": "小型魔物 UI",