romanmir/MHR-Overlay
1
0
Fork 0
mirror of https://github.com/GreenComfyTea/MHR-Overlay.git synced 2026-01-24 04:18:11 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Damage Meter UI bugs

Browse Source 
when Hide Total Damage was hiding whole module instead
This commit is contained in:
GreenComfyTea
2023-08-16 12:21:22 +03:00
parent f2675e6d23
commit aac30e7a08
4 changed files with 43 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
reframework/autorun/MHR_Overlay/UI/Modules/damage_meter_UI.lua
View File

@@ -67,7 +67,7 @@ function this.update()
this.displayed_players = {};
for id, player in pairs(players.list) do
if player ~= players.myself then
if player ~= players.myself or cached_config.settings.my_damage_bar_location == "Normal" then
this.add_to_displayed_players_list(player, cached_config);
end
end
@@ -94,12 +94,25 @@ function this.update()
end
end
this.calculate_top_damage_and_dps();
this.sort();
this.last_displayed_players = this.displayed_players;
end
function this.calculate_top_damage_and_dps()
top_damage = 0;
top_dps = 0;
for _, player in ipairs(this.displayed_players) do
if player.display.total_damage > top_damage then
top_damage = player.display.total_damage;
end
if player.dps > top_dps then
top_dps = player.dps;
end
end
end
function this.add_to_displayed_players_list(player, cached_config, position)
cached_config = cached_config.settings;
position = position or #(this.displayed_players) + 1;
@@ -141,20 +154,6 @@ function this.add_to_displayed_players_list(player, cached_config, position)
--end
end
function this.calculate_top_damage_and_dps()
top_damage = 0;
top_dps = 0;
for _, player in ipairs(this.displayed_players) do
if player.display.total_damage > top_damage then
top_damage = player.display.total_damage;
end
if player.dps > top_dps then
top_dps = player.dps;
end
end
end
function this.sort()
local cached_config = config.current_config.damage_meter_UI;
@@ -210,25 +209,22 @@ function this.draw()
if players.total.display.total_damage == 0 and cached_config.settings.hide_module_if_total_damage_is_zero then
return;
end
this.calculate_top_damage_and_dps();
local position_on_screen = screen.calculate_absolute_coordinates(cached_config.position);
-- draw total damage
if cached_config.settings.total_damage_location == "First" then
if cached_config.settings.hide_total_damage then
return;
end
if cached_config.settings.total_damage_location == "First"
and not cached_config.settings.hide_total_damage then
if not (cached_config.settings.hide_total_if_total_damage_is_zero and players.total.display.total_damage == 0) then
players.draw(players.total, position_on_screen, 1);
if cached_config.settings.hide_total_if_total_damage_is_zero and players.total.display.total_damage == 0 then
return;
end
players.draw(players.total, position_on_screen, 1, top_damage, top_dps);
if cached_config.settings.orientation == "Horizontal" then
position_on_screen.x = position_on_screen.x + cached_config.spacing.x * global_scale_modifier;
else
position_on_screen.y = position_on_screen.y + cached_config.spacing.y * global_scale_modifier;
if cached_config.settings.orientation == "Horizontal" then
position_on_screen.x = position_on_screen.x + cached_config.spacing.x * global_scale_modifier;
else
position_on_screen.y = position_on_screen.y + cached_config.spacing.y * global_scale_modifier;
end
end
end
@@ -251,20 +247,17 @@ function this.draw()
end
-- draw total damage
if cached_config.settings.total_damage_location == "Last" then
if cached_config.settings.hide_total_damage then
return;
end
if cached_config.settings.total_damage_location == "Last"
and not cached_config.settings.hide_total_damage then
if cached_config.settings.hide_total_if_total_damage_is_zero and players.total.display.total_damage == 0 then
return;
end
if not (cached_config.settings.hide_total_if_total_damage_is_zero and players.total.display.total_damage == 0) then
if not cached_config.settings.total_damage_offset_is_relative then
position_on_screen = screen.calculate_absolute_coordinates(cached_config.position);
end
if not cached_config.settings.total_damage_offset_is_relative then
position_on_screen = screen.calculate_absolute_coordinates(cached_config.position);
end
players.draw(players.total, position_on_screen, 1);
players.draw(players.total, position_on_screen, 1);
end
end
end

3
reframework/autorun/MHR_Overlay/UI/UI_Entities/damage_UI_entity.lua
View File

@@ -115,6 +115,9 @@ end
function this.draw(player, position_on_screen, opacity_scale, top_damage, top_dps)
local cached_config = config.current_config.damage_meter_UI;
top_damage = top_damage or 0;
top_dps = top_dps or 0;
local name_include = nil;
if player.damage_UI.name_label ~= nil then
name_include = player.damage_UI.name_label.include;

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

@@ -2123,10 +2123,6 @@ function this.draw_damage_meter_UI()
players.update_dps(true);
end
if config_changed then
players.sort_players();
end
imgui.tree_pop();
end