mirror of
https://github.com/GreenComfyTea/MHR-Overlay.git
synced 2026-01-25 04:48:22 -08:00
Added Buddies to Damage Meter UI
This commit is contained in:
GreenComfyTea
@@ -24,56 +24,6 @@ local get_item_method = quest_hunter_info_type_def:get_method("get_Item");
|
||||
local hunter_info_type_def = sdk.find_type_definition("snow.LobbyManager.HunterInfo");
|
||||
local member_index_field = hunter_info_type_def:get_field("_memberIndex");
|
||||
|
||||
function damage_meter_UI.get_players(player_info_list)
|
||||
local cached_config = config.current_config.damage_meter_UI;
|
||||
|
||||
-- other players
|
||||
if player_info_list == nil then
|
||||
customization_menu.status = "No player info list";
|
||||
return {};
|
||||
end
|
||||
|
||||
local quest_players = {};
|
||||
|
||||
local count = get_count_method:call(player_info_list);
|
||||
|
||||
if count == nil then
|
||||
customization_menu.status = "No player info list count";
|
||||
return {};
|
||||
end
|
||||
|
||||
for i = 0, count - 1 do
|
||||
local player_info = get_item_method:call(player_info_list, i);
|
||||
|
||||
if player_info == nil then
|
||||
goto continue
|
||||
end
|
||||
|
||||
local player_id = member_index_field:get_data(player_info);
|
||||
if player_id == nil then
|
||||
goto continue
|
||||
end
|
||||
|
||||
local _player = player.get_player(player_id);
|
||||
if _player ~= nil then
|
||||
if _player == player.myself and cached_config.settings.my_damage_bar_location ~= "Normal" then
|
||||
goto continue
|
||||
end
|
||||
table.insert(quest_players, _player);
|
||||
end
|
||||
|
||||
::continue::
|
||||
end
|
||||
|
||||
if cached_config.settings.show_followers_separately then
|
||||
for id, non_player in pairs(non_players.servant_list) do
|
||||
table.insert(quest_players, non_player);
|
||||
end
|
||||
end
|
||||
|
||||
return quest_players;
|
||||
end
|
||||
|
||||
function damage_meter_UI.draw()
|
||||
local cached_config = config.current_config.damage_meter_UI;
|
||||
local global_scale_modifier = config.current_config.global_settings.modifiers.global_scale_modifier;
|
||||
@@ -84,60 +34,15 @@ function damage_meter_UI.draw()
|
||||
|
||||
local quest_players = {};
|
||||
|
||||
--damage_meter_UI.freeze_displayed_players = true;
|
||||
|
||||
if damage_meter_UI.freeze_displayed_players and not table_helpers.is_empty(damage_meter_UI.last_displayed_players) then
|
||||
quest_players = damage_meter_UI.last_displayed_players;
|
||||
elseif quest_status.flow_state == quest_status.flow_states.IN_LOBBY or quest_status.flow_state == quest_status.flow_states.IN_TRAINING_AREA then
|
||||
local player_info_list = hunter_info_field:get_data(singletons.lobby_manager);
|
||||
quest_players = damage_meter_UI.get_players(player_info_list);
|
||||
else
|
||||
local player_info_list = quest_hunter_info_field:get_data(singletons.lobby_manager);
|
||||
quest_players = damage_meter_UI.get_players(player_info_list);
|
||||
quest_players = player.display_list;
|
||||
end
|
||||
|
||||
if not damage_meter_UI.freeze_displayed_players or table_helpers.is_empty(damage_meter_UI.last_displayed_players) then
|
||||
if #quest_players ~= 0 then
|
||||
-- sort here
|
||||
if cached_config.sorting.type == "Normal" then
|
||||
if cached_config.sorting.reversed_order then
|
||||
local reversed_quest_players = {};
|
||||
for i = #quest_players, 1, -1 do
|
||||
table.insert(reversed_quest_players, quest_players[i]);
|
||||
end
|
||||
quest_players = reversed_quest_players;
|
||||
end
|
||||
elseif cached_config.sorting.type == "DPS" then
|
||||
if cached_config.sorting.reversed_order then
|
||||
table.sort(quest_players, function(left, right)
|
||||
return left.dps < right.dps;
|
||||
end);
|
||||
else
|
||||
table.sort(quest_players, function(left, right)
|
||||
return left.dps > right.dps;
|
||||
end);
|
||||
end
|
||||
else
|
||||
if cached_config.sorting.reversed_order then
|
||||
table.sort(quest_players, function(left, right)
|
||||
return left.display.total_damage < right.display.total_damage;
|
||||
end);
|
||||
else
|
||||
table.sort(quest_players, function(left, right)
|
||||
return left.display.total_damage > right.display.total_damage;
|
||||
end);
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if cached_config.settings.my_damage_bar_location == "First" then
|
||||
table.insert(quest_players, 1, player.myself);
|
||||
elseif cached_config.settings.my_damage_bar_location == "Last" then
|
||||
table.insert(quest_players, #quest_players + 1, player.myself);
|
||||
elseif #player.list == 0 then
|
||||
table.insert(quest_players, player.myself);
|
||||
end
|
||||
|
||||
damage_meter_UI.last_displayed_players = quest_players;
|
||||
end
|
||||
damage_meter_UI.last_displayed_players = quest_players;
|
||||
|
||||
local top_damage = 0;
|
||||
local top_dps = 0;
|
||||
@@ -178,6 +83,7 @@ function damage_meter_UI.draw()
|
||||
end
|
||||
|
||||
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 continue
|
||||
end
|
||||
@@ -186,8 +92,14 @@ function damage_meter_UI.draw()
|
||||
if cached_config.settings.hide_myself then
|
||||
goto continue
|
||||
end
|
||||
elseif cached_config.settings.hide_other_players then
|
||||
goto continue
|
||||
elseif _player.is_servant then
|
||||
if cached_config.settings.hide_servants and not _player.is_otomo then
|
||||
goto continue
|
||||
end
|
||||
else
|
||||
if cached_config.settings.hide_other_players and not _player.is_otomo then
|
||||
goto continue
|
||||
end
|
||||
end
|
||||
|
||||
if _player.is_player then
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
local player_damage_UI_entity = {};
|
||||
local damage_UI_entity = {};
|
||||
local table_helpers;
|
||||
local drawing;
|
||||
local config;
|
||||
local player;
|
||||
local language;
|
||||
local quest_status;
|
||||
local non_players;
|
||||
|
||||
function player_damage_UI_entity.new(bar, highlighted_bar, player_name_label, dps_label, hunter_rank_label, value_label,
|
||||
percentage_label, cart_count_label)
|
||||
function damage_UI_entity.new(bar, highlighted_bar, name_label, dps_label,
|
||||
hunter_rank_label, value_label, percentage_label, cart_count_label)
|
||||
local entity = {};
|
||||
|
||||
local global_scale_modifier = config.current_config.global_settings.modifiers.global_scale_modifier;
|
||||
@@ -15,12 +16,12 @@ function player_damage_UI_entity.new(bar, highlighted_bar, player_name_label, dp
|
||||
--entity.visibility = visibility;
|
||||
entity.bar = table_helpers.deep_copy(bar);
|
||||
entity.highlighted_bar = table_helpers.deep_copy(highlighted_bar);
|
||||
entity.player_name_label = table_helpers.deep_copy(player_name_label);
|
||||
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.cart_count_label = table_helpers.deep_copy(cart_count_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.offset.x = entity.bar.offset.x * global_scale_modifier;
|
||||
entity.bar.offset.y = entity.bar.offset.y * global_scale_modifier;
|
||||
@@ -36,8 +37,8 @@ function player_damage_UI_entity.new(bar, highlighted_bar, player_name_label, dp
|
||||
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;
|
||||
|
||||
entity.player_name_label.offset.x = entity.player_name_label.offset.x * global_scale_modifier;
|
||||
entity.player_name_label.offset.y = entity.player_name_label.offset.y * global_scale_modifier;
|
||||
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;
|
||||
|
||||
entity.player_name_size_limit = config.current_config.damage_meter_UI.settings.player_name_size_limit *
|
||||
global_scale_modifier;
|
||||
@@ -60,38 +61,67 @@ function player_damage_UI_entity.new(bar, highlighted_bar, player_name_label, dp
|
||||
return entity;
|
||||
end
|
||||
|
||||
function player_damage_UI_entity.draw(_player, position_on_screen, opacity_scale, top_damage, top_dps)
|
||||
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 player_include = cached_config.player_name_label.include.others;
|
||||
if _player.id == player.myself.id then
|
||||
player_include = cached_config.player_name_label.include.myself;
|
||||
local name_include;
|
||||
local type;
|
||||
local is_myself = false;
|
||||
local hunter_rank_include;
|
||||
|
||||
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;
|
||||
else
|
||||
name_include = cached_config.player_name_label.include.others;
|
||||
hunter_rank_include = cached_config.master_hunter_rank_label.include.others;
|
||||
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 player_name_text = "";
|
||||
local name_text = "";
|
||||
|
||||
if player_include.master_rank and player_include.hunter_rank then
|
||||
player_name_text = string.format("[%d:%d] ", _player.master_rank, _player.hunter_rank);
|
||||
elseif player_include.master_rank then
|
||||
player_name_text = string.format("[%d] ", _player.master_rank);
|
||||
elseif player_include.hunter_rank then
|
||||
player_name_text = string.format("[%d] ", _player.hunter_rank);
|
||||
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_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
|
||||
player_name_text = player_name_text .. string.format("x%d ", _player.cart_count);
|
||||
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 player_include.type then
|
||||
player_name_text = player_name_text .. language.current_language.UI.player .. " ";
|
||||
if name_include.type then
|
||||
name_text = name_text .. type .. " ";
|
||||
end
|
||||
|
||||
if player_include.id then
|
||||
player_name_text = player_name_text .. string.format("%d ", _player.id);
|
||||
if name_include.id then
|
||||
name_text = name_text .. string.format("%d ", _player.id);
|
||||
end
|
||||
|
||||
if player_include.name then
|
||||
player_name_text = player_name_text .. _player.name;
|
||||
if name_include.name then
|
||||
name_text = name_text .. _player.name;
|
||||
end
|
||||
|
||||
local player_damage_percentage = 0;
|
||||
@@ -110,9 +140,7 @@ function player_damage_UI_entity.draw(_player, position_on_screen, opacity_scale
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
||||
if _player.id == player.myself.id and cached_config.settings.highlighted_bar == "Me" then
|
||||
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);
|
||||
@@ -122,51 +150,38 @@ function player_damage_UI_entity.draw(_player, position_on_screen, opacity_scale
|
||||
drawing.draw_bar(_player.damage_UI.bar, position_on_screen, opacity_scale, player_damage_bar_percentage);
|
||||
end
|
||||
|
||||
if _player.id == player.myself.id then
|
||||
if _player.damage_UI.hunter_rank_label.include.myself.master_rank and
|
||||
_player.damage_UI.hunter_rank_label.include.myself.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 _player.damage_UI.hunter_rank_label.include.myself.master_rank then
|
||||
drawing.draw_label(_player.damage_UI.hunter_rank_label, position_on_screen, opacity_scale,
|
||||
string.format("%d", _player.master_rank));
|
||||
elseif _player.damage_UI.hunter_rank_label.include.myself.hunter_rank then
|
||||
drawing.draw_label(_player.damage_UI.hunter_rank_label, position_on_screen, opacity_scale,
|
||||
string.format("%d", _player.hunter_rank));
|
||||
end
|
||||
else
|
||||
if _player.damage_UI.hunter_rank_label.include.others.master_rank and
|
||||
_player.damage_UI.hunter_rank_label.include.others.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 _player.damage_UI.hunter_rank_label.include.others.master_rank then
|
||||
drawing.draw_label(_player.damage_UI.hunter_rank_label, position_on_screen, opacity_scale,
|
||||
string.format("%d", _player.master_rank));
|
||||
elseif _player.damage_UI.hunter_rank_label.include.others.hunter_rank then
|
||||
drawing.draw_label(_player.damage_UI.hunter_rank_label, position_on_screen, opacity_scale,
|
||||
string.format("%d", _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));
|
||||
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));
|
||||
end
|
||||
end
|
||||
|
||||
player_name_text = drawing.limit_text_size(player_name_text, _player.damage_UI.player_name_size_limit);
|
||||
name_text = drawing.limit_text_size(name_text, _player.damage_UI.player_name_size_limit);
|
||||
|
||||
drawing.draw_label(_player.damage_UI.player_name_label, position_on_screen, opacity_scale, player_name_text);
|
||||
drawing.draw_label(_player.damage_UI.name_label, position_on_screen, opacity_scale, name_text);
|
||||
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 quest_status.flow_state ~= quest_status.flow_states.IN_LOBBY and quest_status.flow_state ~= quest_status.flow_states.IN_TRAINING_AREA then
|
||||
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
|
||||
drawing.draw_label(_player.damage_UI.cart_count_label, position_on_screen, opacity_scale, _player.cart_count);
|
||||
end
|
||||
end
|
||||
|
||||
function player_damage_UI_entity.init_module()
|
||||
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");
|
||||
language = require("MHR_Overlay.Misc.language");
|
||||
quest_status = require("MHR_Overlay.Game_Handler.quest_status");
|
||||
non_players = require("MHR_Overlay.Damage_Meter.non_players");
|
||||
end
|
||||
|
||||
return player_damage_UI_entity;
|
||||
return damage_UI_entity;
|
||||
@@ -1,116 +0,0 @@
|
||||
local non_player_damage_UI_entity = {};
|
||||
local table_helpers;
|
||||
local drawing;
|
||||
local config;
|
||||
local player;
|
||||
local language;
|
||||
|
||||
function non_player_damage_UI_entity.new(bar, highlighted_bar, name_label, dps_label, value_label, percentage_label)
|
||||
local entity = {};
|
||||
|
||||
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.value_label = table_helpers.deep_copy(value_label);
|
||||
entity.percentage_label = table_helpers.deep_copy(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.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;
|
||||
|
||||
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;
|
||||
|
||||
entity.name_size_limit = config.current_config.damage_meter_UI.settings.player_name_size_limit * global_scale_modifier;
|
||||
|
||||
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;
|
||||
|
||||
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;
|
||||
|
||||
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;
|
||||
|
||||
return entity;
|
||||
end
|
||||
|
||||
function non_player_damage_UI_entity.draw(non_player, position_on_screen, opacity_scale, top_damage, top_dps)
|
||||
local cached_config = config.current_config.damage_meter_UI;
|
||||
|
||||
local include = cached_config.player_name_label.include.others;
|
||||
|
||||
local name_text = "";
|
||||
|
||||
if include.type then
|
||||
if non_player.is_otomo then
|
||||
name_text = name_text .. language.current_language.UI.otomo .. " ";
|
||||
else
|
||||
name_text = name_text .. language.current_language.UI.servant .. " ";
|
||||
end
|
||||
end
|
||||
|
||||
if include.id then
|
||||
name_text = name_text .. string.format("%d ", non_player.id);
|
||||
end
|
||||
|
||||
if include.name then
|
||||
name_text = name_text .. non_player.name;
|
||||
end
|
||||
|
||||
local player_damage_percentage = 0;
|
||||
if player.total.display.total_damage ~= 0 then
|
||||
player_damage_percentage = non_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 = non_player.display.total_damage / player.total.display.total_damage;
|
||||
end
|
||||
else
|
||||
if top_damage ~= 0 then
|
||||
player_damage_bar_percentage = non_player.display.total_damage / top_damage;
|
||||
end
|
||||
end
|
||||
|
||||
if cached_config.settings.highlighted_bar == "Top Damage" and non_player.display.total_damage == top_damage then
|
||||
drawing.draw_bar(non_player.damage_UI.highlighted_bar, position_on_screen, opacity_scale, player_damage_bar_percentage);
|
||||
elseif cached_config.settings.highlighted_bar == "Top DPS" and non_player.dps == top_dps then
|
||||
drawing.draw_bar(non_player.damage_UI.highlighted_bar, position_on_screen, opacity_scale, player_damage_bar_percentage);
|
||||
else
|
||||
drawing.draw_bar(non_player.damage_UI.bar, position_on_screen, opacity_scale, player_damage_bar_percentage);
|
||||
end
|
||||
|
||||
name_text = drawing.limit_text_size(name_text, non_player.damage_UI.name_size_limit);
|
||||
|
||||
drawing.draw_label(non_player.damage_UI.name_label, position_on_screen, opacity_scale, name_text);
|
||||
drawing.draw_label(non_player.damage_UI.value_label, position_on_screen, opacity_scale, non_player.display.total_damage);
|
||||
drawing.draw_label(non_player.damage_UI.percentage_label, position_on_screen, opacity_scale, 100 * player_damage_percentage);
|
||||
drawing.draw_label(non_player.damage_UI.dps_label, position_on_screen, opacity_scale, non_player.dps);
|
||||
end
|
||||
|
||||
function non_player_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");
|
||||
language = require("MHR_Overlay.Misc.language");
|
||||
end
|
||||
|
||||
return non_player_damage_UI_entity;
|
||||
@@ -12,6 +12,7 @@ local part_names;
|
||||
local time_UI;
|
||||
local keyboard;
|
||||
local non_players;
|
||||
local quest_status;
|
||||
|
||||
local label_customization;
|
||||
local bar_customization;
|
||||
@@ -565,6 +566,10 @@ function customization_menu.draw()
|
||||
non_players.init_UI(servant);
|
||||
end
|
||||
|
||||
for _, otomo in pairs(non_players.otomo_list) do
|
||||
non_players.init_UI(otomo);
|
||||
end
|
||||
|
||||
player.init_total_UI(player.total);
|
||||
end
|
||||
|
||||
@@ -1391,6 +1396,7 @@ end
|
||||
function customization_menu.draw_damage_meter_UI()
|
||||
local changed = false;
|
||||
local config_changed = false;
|
||||
local damage_display_changed = false;
|
||||
local index = 1;
|
||||
|
||||
if imgui.tree_node(language.current_language.customization_menu.damage_meter_UI) then
|
||||
@@ -1412,6 +1418,11 @@ function customization_menu.draw_damage_meter_UI()
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
|
||||
changed, cached_config.settings.hide_servants = imgui.checkbox(
|
||||
language.current_language.customization_menu.hide_servants, cached_config.settings.hide_servants);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
|
||||
changed, cached_config.settings.hide_total_damage = imgui.checkbox(
|
||||
language.current_language.customization_menu.hide_total_damage, cached_config.settings.hide_total_damage);
|
||||
|
||||
@@ -1446,16 +1457,19 @@ function customization_menu.draw_damage_meter_UI()
|
||||
language.current_language.customization_menu.show_my_otomos_separately, cached_config.settings.show_my_otomos_separately);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
damage_display_changed = damage_display_changed or changed;
|
||||
|
||||
changed, cached_config.settings.show_other_otomos_separately = imgui.checkbox(
|
||||
language.current_language.customization_menu.show_other_otomos_separately, cached_config.settings.show_other_otomos_separately);
|
||||
changed, cached_config.settings.show_other_player_otomos_separately = imgui.checkbox(
|
||||
language.current_language.customization_menu.show_other_player_otomos_separately, cached_config.settings.show_other_player_otomos_separately);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
damage_display_changed = damage_display_changed or changed;
|
||||
|
||||
changed, cached_config.settings.show_followers_separately = imgui.checkbox(
|
||||
language.current_language.customization_menu.show_followers_separately, cached_config.settings.show_followers_separately);
|
||||
changed, cached_config.settings.show_servant_otomos_separately = imgui.checkbox(
|
||||
language.current_language.customization_menu.show_servant_otomos_separately, cached_config.settings.show_servant_otomos_separately);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
damage_display_changed = damage_display_changed or changed;
|
||||
|
||||
changed, index = imgui.combo(
|
||||
language.current_language.customization_menu.orientation,
|
||||
@@ -1537,99 +1551,78 @@ function customization_menu.draw_damage_meter_UI()
|
||||
language.current_language.customization_menu.small_monsters, cached_config.tracked_monster_types.small_monsters);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
damage_display_changed = damage_display_changed or changed;
|
||||
|
||||
tracked_monster_types_changed = tracked_monster_types_changed or changed;
|
||||
changed, cached_config.tracked_monster_types.large_monsters = imgui.checkbox(
|
||||
language.current_language.customization_menu.large_monsters, cached_config.tracked_monster_types.large_monsters);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
tracked_monster_types_changed = tracked_monster_types_changed or changed;
|
||||
|
||||
if tracked_monster_types_changed then
|
||||
for player_id, _player in pairs(player.list) do
|
||||
_player.update_display(player);
|
||||
end
|
||||
|
||||
player.update_display(player.total);
|
||||
end
|
||||
damage_display_changed = damage_display_changed or changed;
|
||||
|
||||
imgui.tree_pop();
|
||||
end
|
||||
|
||||
if imgui.tree_node(language.current_language.customization_menu.tracked_damage_types) then
|
||||
local tracked_damage_types_changed = false;
|
||||
|
||||
changed, cached_config.tracked_damage_types.player_damage = imgui.checkbox(
|
||||
language.current_language.customization_menu.player_damage, cached_config.tracked_damage_types.player_damage);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
tracked_damage_types_changed = tracked_damage_types_changed or changed;
|
||||
damage_display_changed = damage_display_changed or changed;
|
||||
|
||||
changed, cached_config.tracked_damage_types.bomb_damage = imgui.checkbox(
|
||||
language.current_language.customization_menu.bomb_damage, cached_config.tracked_damage_types.bomb_damage);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
tracked_damage_types_changed = tracked_damage_types_changed or changed;
|
||||
damage_display_changed = damage_display_changed or changed;
|
||||
|
||||
changed, cached_config.tracked_damage_types.kunai_damage = imgui.checkbox(
|
||||
language.current_language.customization_menu.kunai_damage, cached_config.tracked_damage_types.kunai_damage);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
tracked_damage_types_changed = tracked_damage_types_changed or changed;
|
||||
damage_display_changed = damage_display_changed or changed;
|
||||
|
||||
changed, cached_config.tracked_damage_types.installation_damage = imgui.checkbox(
|
||||
language.current_language.customization_menu.installation_damage, cached_config.tracked_damage_types.installation_damage);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
tracked_damage_types_changed = tracked_damage_types_changed or changed;
|
||||
damage_display_changed = damage_display_changed or changed;
|
||||
|
||||
changed, cached_config.tracked_damage_types.otomo_damage = imgui.checkbox(
|
||||
language.current_language.customization_menu.otomo_damage, cached_config.tracked_damage_types.otomo_damage);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
tracked_damage_types_changed = tracked_damage_types_changed or changed;
|
||||
damage_display_changed = damage_display_changed or changed;
|
||||
|
||||
changed, cached_config.tracked_damage_types.wyvern_riding_damage = imgui.checkbox(
|
||||
language.current_language.customization_menu.wyvern_riding_damage, cached_config.tracked_damage_types.wyvern_riding_damage);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
tracked_damage_types_changed = tracked_damage_types_changed or changed;
|
||||
damage_display_changed = damage_display_changed or changed;
|
||||
|
||||
changed, cached_config.tracked_damage_types.poison_damage = imgui.checkbox(
|
||||
language.current_language.customization_menu.poison_damage, cached_config.tracked_damage_types.poison_damage);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
tracked_damage_types_changed = tracked_damage_types_changed or changed;
|
||||
damage_display_changed = damage_display_changed or changed;
|
||||
|
||||
changed, cached_config.tracked_damage_types.blast_damage = imgui.checkbox(
|
||||
language.current_language.customization_menu.blast_damage, cached_config.tracked_damage_types.blast_damage);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
tracked_damage_types_changed = tracked_damage_types_changed or changed;
|
||||
damage_display_changed = damage_display_changed or changed;
|
||||
|
||||
changed, cached_config.tracked_damage_types.endemic_life_damage = imgui.checkbox(
|
||||
language.current_language.customization_menu.endemic_life_damage, cached_config.tracked_damage_types.endemic_life_damage);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
tracked_damage_types_changed = tracked_damage_types_changed or changed;
|
||||
damage_display_changed = damage_display_changed or changed;
|
||||
|
||||
changed, cached_config.tracked_damage_types.other_damage = imgui.checkbox(
|
||||
language.current_language.customization_menu.other_damage, cached_config.tracked_damage_types.other_damage);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
tracked_damage_types_changed = tracked_damage_types_changed or changed;
|
||||
|
||||
if tracked_damage_types_changed then
|
||||
for _, _player in pairs(player.list) do
|
||||
player.update_display(_player);
|
||||
end
|
||||
|
||||
for _, servant in pairs(non_players.servant_list) do
|
||||
player.update_display(servant);
|
||||
end
|
||||
|
||||
player.update_display(player.total);
|
||||
end
|
||||
damage_display_changed = damage_display_changed or changed;
|
||||
|
||||
imgui.tree_pop();
|
||||
end
|
||||
@@ -1768,6 +1761,100 @@ function customization_menu.draw_damage_meter_UI()
|
||||
imgui.tree_pop();
|
||||
end
|
||||
|
||||
if imgui.tree_node(language.current_language.customization_menu.servants) then
|
||||
changed, cached_config.player_name_label.include.servants.type = imgui.checkbox(
|
||||
language.current_language.customization_menu.type, cached_config.player_name_label.include.servants.type);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
|
||||
changed, cached_config.player_name_label.include.servants.id = imgui.checkbox(
|
||||
language.current_language.customization_menu.id, cached_config.player_name_label.include.servants.id);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
|
||||
changed, cached_config.player_name_label.include.servants.name = imgui.checkbox(
|
||||
language.current_language.customization_menu.name, cached_config.player_name_label.include.servants.name);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
|
||||
imgui.tree_pop();
|
||||
end
|
||||
|
||||
if imgui.tree_node(language.current_language.customization_menu.my_otomos) then
|
||||
changed, cached_config.player_name_label.include.my_otomos.level = imgui.checkbox(
|
||||
language.current_language.customization_menu.level, cached_config.player_name_label.include.my_otomos.level);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
|
||||
|
||||
changed, cached_config.player_name_label.include.my_otomos.type = imgui.checkbox(
|
||||
language.current_language.customization_menu.type, cached_config.player_name_label.include.my_otomos.type);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
|
||||
changed, cached_config.player_name_label.include.my_otomos.id = imgui.checkbox(
|
||||
language.current_language.customization_menu.id, cached_config.player_name_label.include.my_otomos.id);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
|
||||
changed, cached_config.player_name_label.include.my_otomos.name = imgui.checkbox(
|
||||
language.current_language.customization_menu.name, cached_config.player_name_label.include.my_otomos.name);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
|
||||
imgui.tree_pop();
|
||||
end
|
||||
|
||||
if imgui.tree_node(language.current_language.customization_menu.other_player_otomos) then
|
||||
changed, cached_config.player_name_label.include.other_player_otomos.level = imgui.checkbox(
|
||||
language.current_language.customization_menu.level, cached_config.player_name_label.include.other_player_otomos.level);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
|
||||
|
||||
changed, cached_config.player_name_label.include.other_player_otomos.type = imgui.checkbox(
|
||||
language.current_language.customization_menu.type, cached_config.player_name_label.include.other_player_otomos.type);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
|
||||
changed, cached_config.player_name_label.include.other_player_otomos.id = imgui.checkbox(
|
||||
language.current_language.customization_menu.id, cached_config.player_name_label.include.other_player_otomos.id);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
|
||||
changed, cached_config.player_name_label.include.other_player_otomos.name = imgui.checkbox(
|
||||
language.current_language.customization_menu.name, cached_config.player_name_label.include.other_player_otomos.name);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
|
||||
imgui.tree_pop();
|
||||
end
|
||||
|
||||
if imgui.tree_node(language.current_language.customization_menu.servant_otomos) then
|
||||
changed, cached_config.player_name_label.include.servant_otomos.level = imgui.checkbox(
|
||||
language.current_language.customization_menu.level, cached_config.player_name_label.include.servant_otomos.level);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
|
||||
|
||||
changed, cached_config.player_name_label.include.servant_otomos.type = imgui.checkbox(
|
||||
language.current_language.customization_menu.type, cached_config.player_name_label.include.servant_otomos.type);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
|
||||
changed, cached_config.player_name_label.include.servant_otomos.id = imgui.checkbox(
|
||||
language.current_language.customization_menu.id, cached_config.player_name_label.include.servant_otomos.id);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
|
||||
changed, cached_config.player_name_label.include.servant_otomos.name = imgui.checkbox(
|
||||
language.current_language.customization_menu.name, cached_config.player_name_label.include.servant_otomos.name);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
|
||||
imgui.tree_pop();
|
||||
end
|
||||
|
||||
imgui.tree_pop();
|
||||
end
|
||||
|
||||
@@ -1839,12 +1926,12 @@ function customization_menu.draw_damage_meter_UI()
|
||||
|
||||
if imgui.tree_node(language.current_language.customization_menu.me) then
|
||||
changed, cached_config.master_hunter_rank_label.include.myself.master_rank = imgui.checkbox(
|
||||
language.current_language.customization_menu.master_rank, cached_config.player_name_label.include.myself.master_rank);
|
||||
language.current_language.customization_menu.master_rank, cached_config.master_hunter_rank_label.include.myself.master_rank);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
|
||||
changed, cached_config.master_hunter_rank_label.include.myself.hunter_rank = imgui.checkbox(
|
||||
language.current_language.customization_menu.hunter_rank, cached_config.player_name_label.include.myself.hunter_rank);
|
||||
language.current_language.customization_menu.hunter_rank, cached_config.master_hunter_rank_label.include.myself.hunter_rank);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
|
||||
@@ -1853,12 +1940,39 @@ function customization_menu.draw_damage_meter_UI()
|
||||
|
||||
if imgui.tree_node(language.current_language.customization_menu.other_players) then
|
||||
changed, cached_config.master_hunter_rank_label.include.others.master_rank = imgui.checkbox(
|
||||
language.current_language.customization_menu.master_rank, cached_config.player_name_label.include.others.master_rank);
|
||||
language.current_language.customization_menu.master_rank, cached_config.master_hunter_rank_label.include.others.master_rank);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
|
||||
changed, cached_config.master_hunter_rank_label.include.others.hunter_rank = imgui.checkbox(
|
||||
language.current_language.customization_menu.hunter_rank, cached_config.player_name_label.include.others.hunter_rank);
|
||||
language.current_language.customization_menu.hunter_rank, cached_config.master_hunter_rank_label.include.others.hunter_rank);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
|
||||
imgui.tree_pop();
|
||||
end
|
||||
|
||||
if imgui.tree_node(language.current_language.customization_menu.my_otomos) then
|
||||
changed, cached_config.master_hunter_rank_label.include.my_otomos.level = imgui.checkbox(
|
||||
language.current_language.customization_menu.level, cached_config.master_hunter_rank_label.include.my_otomos.level);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
|
||||
imgui.tree_pop();
|
||||
end
|
||||
|
||||
if imgui.tree_node(language.current_language.customization_menu.other_player_otomos) then
|
||||
changed, cached_config.master_hunter_rank_label.include.other_player_otomos.level = imgui.checkbox(
|
||||
language.current_language.customization_menu.level, cached_config.master_hunter_rank_label.include.other_player_otomos.level);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
|
||||
imgui.tree_pop();
|
||||
end
|
||||
|
||||
if imgui.tree_node(language.current_language.customization_menu.servant_otomos) then
|
||||
changed, cached_config.master_hunter_rank_label.include.servant_otomos.level = imgui.checkbox(
|
||||
language.current_language.customization_menu.level, cached_config.master_hunter_rank_label.include.servant_otomos.level);
|
||||
|
||||
config_changed = config_changed or changed;
|
||||
|
||||
@@ -1957,6 +2071,36 @@ function customization_menu.draw_damage_meter_UI()
|
||||
changed = bar_customization.draw(language.current_language.customization_menu.highlighted_damage_bar, cached_config.highlighted_damage_bar);
|
||||
config_changed = config_changed or changed;
|
||||
|
||||
if config_changed then
|
||||
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;
|
||||
|
||||
player.display_list = {};
|
||||
player.update_player_list(is_on_quest);
|
||||
non_players.update_servant_list();
|
||||
non_players.update_otomo_list(is_on_quest, quest_status.is_online);
|
||||
end
|
||||
|
||||
if damage_display_changed then
|
||||
for _, _player in pairs(player.list) do
|
||||
player.update_display(_player);
|
||||
end
|
||||
|
||||
for _, servant in pairs(non_players.servant_list) do
|
||||
player.update_display(servant);
|
||||
end
|
||||
|
||||
for _, otomo in pairs(non_players.otomo_list) do
|
||||
player.update_display(otomo);
|
||||
end
|
||||
|
||||
player.update_display(player.total);
|
||||
player.update_dps(true);
|
||||
end
|
||||
|
||||
if config_changed then
|
||||
player.sort_players();
|
||||
end
|
||||
|
||||
imgui.tree_pop();
|
||||
end
|
||||
|
||||
@@ -2051,6 +2195,7 @@ function customization_menu.init_module()
|
||||
time_UI = require("MHR_Overlay.UI.Modules.time_UI");
|
||||
keyboard = require("MHR_Overlay.Game_Handler.keyboard");
|
||||
non_players = require("MHR_Overlay.Damage_Meter.non_players");
|
||||
quest_status = require("MHR_Overlay.Game_Handler.quest_status");
|
||||
|
||||
label_customization = require("MHR_Overlay.UI.Customizations.label_customization");
|
||||
bar_customization = require("MHR_Overlay.UI.Customizations.bar_customization");
|
||||
|
||||
Reference in New Issue
Block a user