mirror of
https://github.com/GreenComfyTea/MHR-Overlay.git
synced 2026-01-24 12:28:03 -08:00
Refactor Damage Meter UI config;
This commit is contained in:
GreenComfyTea
@@ -2,7 +2,7 @@ local ailment_buildup_UI_entity = {};
|
||||
local table_helpers;
|
||||
local drawing;
|
||||
local config;
|
||||
local player;
|
||||
local players;
|
||||
local language;
|
||||
|
||||
function ailment_buildup_UI_entity.new(buildup_bar, highlighted_buildup_bar, ailment_name_label, player_name_label,
|
||||
@@ -66,7 +66,7 @@ function ailment_buildup_UI_entity.draw(_player_buildup, ailment_buildup_UI, cac
|
||||
end
|
||||
end
|
||||
|
||||
if _player_buildup.id == player.myself.id and cached_config.settings.highlighted_bar == "Me" then
|
||||
if _player_buildup.id == players.myself.id and cached_config.settings.highlighted_bar == "Me" then
|
||||
drawing.draw_bar(ailment_buildup_UI.highlighted_buildup_bar, position_on_screen, opacity_scale, player_buildup_bar_percentage);
|
||||
elseif cached_config.settings.highlighted_bar == "Top Buildup" and _player_buildup.buildup == top_buildup then
|
||||
drawing.draw_bar(ailment_buildup_UI.highlighted_buildup_bar, position_on_screen, opacity_scale, player_buildup_bar_percentage);
|
||||
@@ -74,7 +74,7 @@ function ailment_buildup_UI_entity.draw(_player_buildup, ailment_buildup_UI, cac
|
||||
drawing.draw_bar(ailment_buildup_UI.buildup_bar, position_on_screen, opacity_scale, player_buildup_bar_percentage);
|
||||
end
|
||||
|
||||
local _player = player.get_player(_player_buildup.id);
|
||||
local _player = players.get_player(_player_buildup.id);
|
||||
local player_name = "Player " .. tostring(_player_buildup.id);
|
||||
if _player ~= nil then
|
||||
player_name = _player.name;
|
||||
@@ -89,7 +89,7 @@ function ailment_buildup_UI_entity.init_module()
|
||||
table_helpers = require("MHR_Overlay.Misc.table_helpers");
|
||||
drawing = require("MHR_Overlay.UI.drawing");
|
||||
config = require("MHR_Overlay.Misc.config");
|
||||
player = require("MHR_Overlay.Damage_Meter.player");
|
||||
players = require("MHR_Overlay.Damage_Meter.players");
|
||||
language = require("MHR_Overlay.Misc.language");
|
||||
end
|
||||
|
||||
|
||||
@@ -2,61 +2,91 @@ local damage_UI_entity = {};
|
||||
local table_helpers;
|
||||
local drawing;
|
||||
local config;
|
||||
local player;
|
||||
local players;
|
||||
local language;
|
||||
local quest_status;
|
||||
local non_players;
|
||||
|
||||
function damage_UI_entity.new(bar, highlighted_bar, name_label, dps_label,
|
||||
hunter_rank_label, value_label, percentage_label, cart_count_label)
|
||||
function damage_UI_entity.new(damage_meter_UI_elements, type)
|
||||
local entity = {};
|
||||
|
||||
local cached_config = config.current_config.damage_meter_UI;
|
||||
|
||||
local global_scale_modifier = config.current_config.global_settings.modifiers.global_scale_modifier;
|
||||
|
||||
--entity.visibility = visibility;
|
||||
entity.bar = table_helpers.deep_copy(bar);
|
||||
entity.highlighted_bar = table_helpers.deep_copy(highlighted_bar);
|
||||
entity.name_label = table_helpers.deep_copy(name_label);
|
||||
entity.dps_label = table_helpers.deep_copy(dps_label);
|
||||
entity.hunter_rank_label = table_helpers.deep_copy(hunter_rank_label);
|
||||
entity.value_label = table_helpers.deep_copy(value_label);
|
||||
entity.percentage_label = table_helpers.deep_copy(percentage_label);
|
||||
entity.cart_count_label = table_helpers.deep_copy(cart_count_label);
|
||||
entity.bar = table_helpers.deep_copy(damage_meter_UI_elements.damage_bar);
|
||||
entity.highlighted_bar = table_helpers.deep_copy(cached_config.highlighted_bar);
|
||||
entity.name_label = table_helpers.deep_copy(damage_meter_UI_elements.name_label);
|
||||
entity.hunter_rank_label = table_helpers.deep_copy(damage_meter_UI_elements.hunter_rank_label);
|
||||
entity.cart_count_label = table_helpers.deep_copy(damage_meter_UI_elements.cart_count_label);
|
||||
entity.dps_label = table_helpers.deep_copy(damage_meter_UI_elements.dps_label);
|
||||
entity.value_label = table_helpers.deep_copy(damage_meter_UI_elements.damage_value_label);
|
||||
entity.percentage_label = table_helpers.deep_copy(damage_meter_UI_elements.damage_percentage_label);
|
||||
|
||||
entity.bar.offset.x = entity.bar.offset.x * global_scale_modifier;
|
||||
entity.bar.offset.y = entity.bar.offset.y * global_scale_modifier;
|
||||
entity.bar.size.width = entity.bar.size.width * global_scale_modifier;
|
||||
entity.bar.size.height = entity.bar.size.height * global_scale_modifier;
|
||||
entity.bar.outline.thickness = entity.bar.outline.thickness * global_scale_modifier;
|
||||
entity.bar.outline.offset = entity.bar.outline.offset * global_scale_modifier;
|
||||
entity.player_name_size_limit = config.current_config.damage_meter_UI.settings.player_name_size_limit;
|
||||
|
||||
entity.highlighted_bar.offset.x = entity.highlighted_bar.offset.x * global_scale_modifier;
|
||||
entity.highlighted_bar.offset.y = entity.highlighted_bar.offset.y * global_scale_modifier;
|
||||
entity.highlighted_bar.size.width = entity.highlighted_bar.size.width * global_scale_modifier;
|
||||
entity.highlighted_bar.size.height = entity.highlighted_bar.size.height * global_scale_modifier;
|
||||
entity.highlighted_bar.outline.thickness = entity.highlighted_bar.outline.thickness * global_scale_modifier;
|
||||
entity.highlighted_bar.outline.offset = entity.highlighted_bar.outline.offset * global_scale_modifier;
|
||||
if type == players.types.total then
|
||||
entity.total_name = language.current_language.UI.total_damage;
|
||||
elseif type == players.types.myself or type == players.types.other_players then
|
||||
entity.type_name = language.current_language.UI.player;
|
||||
elseif type == players.types.servant then
|
||||
entity.type_name = language.current_language.UI.servant;
|
||||
else
|
||||
entity.type_name = language.current_language.UI.otomo;
|
||||
end
|
||||
|
||||
entity.name_label.offset.x = entity.name_label.offset.x * global_scale_modifier;
|
||||
entity.name_label.offset.y = entity.name_label.offset.y * global_scale_modifier;
|
||||
if entity.bar ~= nil then
|
||||
entity.bar.offset.x = entity.bar.offset.x * global_scale_modifier;
|
||||
entity.bar.offset.y = entity.bar.offset.y * global_scale_modifier;
|
||||
entity.bar.size.width = entity.bar.size.width * global_scale_modifier;
|
||||
entity.bar.size.height = entity.bar.size.height * global_scale_modifier;
|
||||
entity.bar.outline.thickness = entity.bar.outline.thickness * global_scale_modifier;
|
||||
entity.bar.outline.offset = entity.bar.outline.offset * global_scale_modifier;
|
||||
end
|
||||
|
||||
entity.player_name_size_limit = config.current_config.damage_meter_UI.settings.player_name_size_limit *
|
||||
global_scale_modifier;
|
||||
if entity.highlighted_bar ~= nil then
|
||||
entity.highlighted_bar.offset.x = entity.highlighted_bar.offset.x * global_scale_modifier;
|
||||
entity.highlighted_bar.offset.y = entity.highlighted_bar.offset.y * global_scale_modifier;
|
||||
entity.highlighted_bar.size.width = entity.highlighted_bar.size.width * global_scale_modifier;
|
||||
entity.highlighted_bar.size.height = entity.highlighted_bar.size.height * global_scale_modifier;
|
||||
entity.highlighted_bar.outline.thickness = entity.highlighted_bar.outline.thickness * global_scale_modifier;
|
||||
entity.highlighted_bar.outline.offset = entity.highlighted_bar.outline.offset * global_scale_modifier;
|
||||
end
|
||||
|
||||
entity.dps_label.offset.x = entity.dps_label.offset.x * global_scale_modifier;
|
||||
entity.dps_label.offset.y = entity.dps_label.offset.y * global_scale_modifier;
|
||||
if entity.name_label ~= nil then
|
||||
entity.name_label.offset.x = entity.name_label.offset.x * global_scale_modifier;
|
||||
entity.name_label.offset.y = entity.name_label.offset.y * global_scale_modifier;
|
||||
end
|
||||
|
||||
entity.hunter_rank_label.offset.x = entity.hunter_rank_label.offset.x * global_scale_modifier;
|
||||
entity.hunter_rank_label.offset.y = entity.hunter_rank_label.offset.y * global_scale_modifier;
|
||||
if entity.player_name_size_limit ~= nil then
|
||||
entity.player_name_size_limit = entity.player_name_size_limit * global_scale_modifier;
|
||||
end
|
||||
|
||||
entity.cart_count_label.offset.x = entity.cart_count_label.offset.x * global_scale_modifier;
|
||||
entity.cart_count_label.offset.y = entity.cart_count_label.offset.y * global_scale_modifier;
|
||||
if entity.hunter_rank_label ~= nil then
|
||||
entity.hunter_rank_label.offset.x = entity.hunter_rank_label.offset.x * global_scale_modifier;
|
||||
entity.hunter_rank_label.offset.y = entity.hunter_rank_label.offset.y * global_scale_modifier;
|
||||
end
|
||||
|
||||
if entity.cart_count_label ~= nil then
|
||||
entity.cart_count_label.offset.x = entity.cart_count_label.offset.x * global_scale_modifier;
|
||||
entity.cart_count_label.offset.y = entity.cart_count_label.offset.y * global_scale_modifier;
|
||||
end
|
||||
|
||||
entity.value_label.offset.x = entity.value_label.offset.x * global_scale_modifier;
|
||||
entity.value_label.offset.y = entity.value_label.offset.y * global_scale_modifier;
|
||||
if entity.dps_label ~= nil then
|
||||
entity.dps_label.offset.x = entity.dps_label.offset.x * global_scale_modifier;
|
||||
entity.dps_label.offset.y = entity.dps_label.offset.y * global_scale_modifier;
|
||||
end
|
||||
|
||||
entity.percentage_label.offset.x = entity.percentage_label.offset.x * global_scale_modifier;
|
||||
entity.percentage_label.offset.y = entity.percentage_label.offset.y * global_scale_modifier;
|
||||
if entity.value_label ~= nil then
|
||||
entity.value_label.offset.x = entity.value_label.offset.x * global_scale_modifier;
|
||||
entity.value_label.offset.y = entity.value_label.offset.y * global_scale_modifier;
|
||||
end
|
||||
|
||||
if entity.percentage_label ~= nil then
|
||||
entity.percentage_label.offset.x = entity.percentage_label.offset.x * global_scale_modifier;
|
||||
entity.percentage_label.offset.y = entity.percentage_label.offset.y * global_scale_modifier;
|
||||
end
|
||||
|
||||
return entity;
|
||||
end
|
||||
@@ -64,112 +94,106 @@ end
|
||||
function damage_UI_entity.draw(_player, position_on_screen, opacity_scale, top_damage, top_dps)
|
||||
local cached_config = config.current_config.damage_meter_UI;
|
||||
|
||||
local name_include;
|
||||
local type;
|
||||
local is_myself = false;
|
||||
local hunter_rank_include;
|
||||
local name_include = nil;
|
||||
if _player.damage_UI.name_label ~= nil then
|
||||
name_include = _player.damage_UI.name_label.include;
|
||||
end
|
||||
|
||||
if _player.is_player then
|
||||
type = language.current_language.UI.player;
|
||||
if _player.id == player.myself.id then
|
||||
name_include = cached_config.player_name_label.include.myself;
|
||||
hunter_rank_include = cached_config.master_hunter_rank_label.include.myself;
|
||||
is_myself = true;
|
||||
local hunter_rank_include = nil;
|
||||
if _player.damage_UI.hunter_rank_label ~= nil then
|
||||
hunter_rank_include = _player.damage_UI.hunter_rank_label.include;
|
||||
end
|
||||
|
||||
local is_on_quest = quest_status.flow_state ~= quest_status.flow_states.IN_LOBBY and quest_status.flow_state ~= quest_status.flow_states.IN_TRAINING_AREA;
|
||||
|
||||
local player_damage_percentage = 0;
|
||||
if players.total.display.total_damage ~= 0 then
|
||||
player_damage_percentage = _player.display.total_damage / players.total.display.total_damage;
|
||||
end
|
||||
|
||||
local player_damage_bar_percentage = 0;
|
||||
|
||||
if _player.type ~= players.types.total then
|
||||
if cached_config.settings.damage_bar_relative_to == "Total Damage" then
|
||||
if players.total.display.total_damage ~= 0 then
|
||||
player_damage_bar_percentage = _player.display.total_damage / players.total.display.total_damage;
|
||||
end
|
||||
else
|
||||
name_include = cached_config.player_name_label.include.others;
|
||||
hunter_rank_include = cached_config.master_hunter_rank_label.include.others;
|
||||
if top_damage ~= 0 then
|
||||
player_damage_bar_percentage = _player.display.total_damage / top_damage;
|
||||
end
|
||||
end
|
||||
elseif _player.is_otomo then
|
||||
type = language.current_language.UI.otomo;
|
||||
if _player.id == player.myself.id or _player.id == non_players.my_second_otomo_id then
|
||||
name_include = cached_config.player_name_label.include.my_otomos;
|
||||
hunter_rank_include = cached_config.master_hunter_rank_label.include.my_otomos;
|
||||
elseif _player.is_servant then
|
||||
name_include = cached_config.player_name_label.include.servant_otomos;
|
||||
hunter_rank_include = cached_config.master_hunter_rank_label.include.servant_otomos;
|
||||
else
|
||||
name_include = cached_config.player_name_label.include.other_player_otomos;
|
||||
hunter_rank_include = cached_config.master_hunter_rank_label.include.other_player_otomos;
|
||||
end
|
||||
else
|
||||
type = language.current_language.UI.servant;
|
||||
name_include = cached_config.player_name_label.include.servants;
|
||||
end
|
||||
|
||||
local name_text = "";
|
||||
|
||||
if name_include.master_rank and name_include.hunter_rank then
|
||||
name_text = string.format("[%d:%d] ", _player.master_rank, _player.hunter_rank);
|
||||
elseif name_include.master_rank then
|
||||
name_text = string.format("[%d] ", _player.master_rank);
|
||||
elseif name_include.hunter_rank then
|
||||
name_text = string.format("[%d] ", _player.hunter_rank);
|
||||
elseif name_include.level then
|
||||
name_text = string.format("[%d] ", _player.level);
|
||||
end
|
||||
if _player.type == players.types.total then
|
||||
name_text = _player.damage_UI.total_name;
|
||||
elseif name_include ~= nil then
|
||||
|
||||
if name_include.cart_count and quest_status.flow_state ~= quest_status.flow_states.IN_LOBBY and quest_status.flow_state ~= quest_status.flow_states.IN_TRAINING_AREA then
|
||||
name_text = name_text .. string.format("x%d ", _player.cart_count);
|
||||
end
|
||||
|
||||
if name_include.type then
|
||||
name_text = name_text .. type .. " ";
|
||||
end
|
||||
|
||||
if name_include.id then
|
||||
name_text = name_text .. string.format("%d ", _player.id);
|
||||
end
|
||||
|
||||
if name_include.name then
|
||||
name_text = name_text .. _player.name;
|
||||
end
|
||||
|
||||
local player_damage_percentage = 0;
|
||||
if player.total.display.total_damage ~= 0 then
|
||||
player_damage_percentage = _player.display.total_damage / player.total.display.total_damage;
|
||||
end
|
||||
|
||||
local player_damage_bar_percentage = 0;
|
||||
if cached_config.settings.damage_bar_relative_to == "Total Damage" then
|
||||
if player.total.display.total_damage ~= 0 then
|
||||
player_damage_bar_percentage = _player.display.total_damage / player.total.display.total_damage;
|
||||
if name_include.master_rank and name_include.hunter_rank then
|
||||
name_text = string.format("[%d:%d] ", _player.master_rank, _player.hunter_rank);
|
||||
elseif name_include.master_rank then
|
||||
name_text = string.format("[%d] ", _player.master_rank);
|
||||
elseif name_include.hunter_rank then
|
||||
name_text = string.format("[%d] ", _player.hunter_rank);
|
||||
elseif name_include.level then
|
||||
name_text = string.format("[%d] ", _player.level);
|
||||
end
|
||||
else
|
||||
if top_damage ~= 0 then
|
||||
player_damage_bar_percentage = _player.display.total_damage / top_damage;
|
||||
|
||||
if name_include.cart_count and is_on_quest then
|
||||
name_text = name_text .. string.format("x%d ", _player.cart_count);
|
||||
end
|
||||
|
||||
if name_include.type then
|
||||
name_text = name_text .. _player.damage_UI.type_name .. " ";
|
||||
end
|
||||
|
||||
if name_include.id then
|
||||
name_text = name_text .. string.format("%d ", _player.id);
|
||||
end
|
||||
|
||||
if name_include.name then
|
||||
name_text = name_text .. _player.name;
|
||||
end
|
||||
end
|
||||
|
||||
if is_myself and cached_config.settings.highlighted_bar == "Me" then
|
||||
drawing.draw_bar(_player.damage_UI.highlighted_bar, position_on_screen, opacity_scale, player_damage_bar_percentage);
|
||||
elseif cached_config.settings.highlighted_bar == "Top Damage" and _player.display.total_damage == top_damage then
|
||||
drawing.draw_bar(_player.damage_UI.highlighted_bar, position_on_screen, opacity_scale, player_damage_bar_percentage);
|
||||
elseif cached_config.settings.highlighted_bar == "Top DPS" and _player.dps == top_dps then
|
||||
drawing.draw_bar(_player.damage_UI.highlighted_bar, position_on_screen, opacity_scale, player_damage_bar_percentage);
|
||||
else
|
||||
drawing.draw_bar(_player.damage_UI.bar, position_on_screen, opacity_scale, player_damage_bar_percentage);
|
||||
end
|
||||
local hunter_rank_string = "";
|
||||
|
||||
if _player.damage_UI.hunter_rank_label ~= nil then
|
||||
if hunter_rank_include == nil then
|
||||
hunter_rank_string = string.format("%d", _player.level);
|
||||
elseif hunter_rank_include.master_rank and hunter_rank_include.hunter_rank then
|
||||
hunter_rank_string = string.format("%d:%d", _player.master_rank, _player.hunter_rank);
|
||||
|
||||
if hunter_rank_include ~= nil then
|
||||
if hunter_rank_include.master_rank and hunter_rank_include.hunter_rank then
|
||||
drawing.draw_label(_player.damage_UI.hunter_rank_label, position_on_screen, opacity_scale, string.format("%d:%d", _player.master_rank, _player.hunter_rank));
|
||||
elseif hunter_rank_include.master_rank then
|
||||
drawing.draw_label(_player.damage_UI.hunter_rank_label, position_on_screen, opacity_scale, string.format("%d", _player.master_rank));
|
||||
hunter_rank_string = string.format("%d", _player.master_rank);
|
||||
|
||||
elseif hunter_rank_include.hunter_rank then
|
||||
drawing.draw_label(_player.damage_UI.hunter_rank_label, position_on_screen, opacity_scale, string.format("%d", _player.hunter_rank));
|
||||
elseif hunter_rank_include.level then
|
||||
drawing.draw_label(_player.damage_UI.hunter_rank_label, position_on_screen, opacity_scale, string.format("%d", _player.level));
|
||||
hunter_rank_string = string.format("%d", _player.hunter_rank);
|
||||
end
|
||||
end
|
||||
|
||||
xy = 1
|
||||
|
||||
local bar = _player.damage_UI.bar;
|
||||
|
||||
if (cached_config.settings.highlighted_bar == "Top Damage" and _player.display.total_damage == top_damage) or
|
||||
(cached_config.settings.highlighted_bar == "Top DPS" and _player.dps == top_dps) then
|
||||
bar = _player.damage_UI.highlighted_bar;
|
||||
end
|
||||
|
||||
drawing.draw_bar(bar, position_on_screen, opacity_scale, player_damage_bar_percentage);
|
||||
|
||||
name_text = drawing.limit_text_size(name_text, _player.damage_UI.player_name_size_limit);
|
||||
|
||||
drawing.draw_label(_player.damage_UI.name_label, position_on_screen, opacity_scale, name_text);
|
||||
drawing.draw_label(_player.damage_UI.hunter_rank_label, position_on_screen, opacity_scale, hunter_rank_string);
|
||||
drawing.draw_label(_player.damage_UI.value_label, position_on_screen, opacity_scale, _player.display.total_damage);
|
||||
drawing.draw_label(_player.damage_UI.percentage_label, position_on_screen, opacity_scale, 100 * player_damage_percentage);
|
||||
drawing.draw_label(_player.damage_UI.dps_label, position_on_screen, opacity_scale, _player.dps);
|
||||
|
||||
if _player.is_player and quest_status.flow_state ~= quest_status.flow_states.IN_LOBBY and quest_status.flow_state ~= quest_status.flow_states.IN_TRAINING_AREA then
|
||||
if is_on_quest then
|
||||
drawing.draw_label(_player.damage_UI.cart_count_label, position_on_screen, opacity_scale, _player.cart_count);
|
||||
end
|
||||
end
|
||||
@@ -178,7 +202,7 @@ function damage_UI_entity.init_module()
|
||||
table_helpers = require("MHR_Overlay.Misc.table_helpers");
|
||||
drawing = require("MHR_Overlay.UI.drawing");
|
||||
config = require("MHR_Overlay.Misc.config");
|
||||
player = require("MHR_Overlay.Damage_Meter.player");
|
||||
players = require("MHR_Overlay.Damage_Meter.players");
|
||||
language = require("MHR_Overlay.Misc.language");
|
||||
quest_status = require("MHR_Overlay.Game_Handler.quest_status");
|
||||
non_players = require("MHR_Overlay.Damage_Meter.non_players");
|
||||
|
||||
Reference in New Issue
Block a user