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

Refactor Damage Meter UI config;

Browse Source
This commit is contained in:
GreenComfyTea
2023-01-02 14:18:32 +02:00
parent 575b46c70d
commit a8ec321dae
37 changed files with 1462 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
reframework/autorun/MHR_Overlay/UI/Customizations/ailment_buildups_customization.lua
View File

@@ -3,7 +3,7 @@ local ailment_buildups_customization = {};
local table_helpers;
local config;
local screen;
local player;
local players;
local large_monster;
local small_monster;
local env_creature;
@@ -254,7 +254,7 @@ function ailment_buildups_customization.init_module()
language = require("MHR_Overlay.Misc.language");
config = require("MHR_Overlay.Misc.config");
screen = require("MHR_Overlay.Game_Handler.screen");
player = require("MHR_Overlay.Damage_Meter.player");
players = require("MHR_Overlay.Damage_Meter.players");
small_monster = require("MHR_Overlay.Monsters.small_monster");
large_monster = require("MHR_Overlay.Monsters.large_monster");
env_creature = require("MHR_Overlay.Endemic_Life.env_creature");

4
reframework/autorun/MHR_Overlay/UI/Customizations/ailments_customization.lua
View File

@@ -3,7 +3,7 @@ local ailments_customization = {};
local table_helpers;
local config;
local screen;
local player;
local players;
local large_monster;
local small_monster;
local env_creature;
@@ -337,7 +337,7 @@ function ailments_customization.init_module()
language = require("MHR_Overlay.Misc.language");
config = require("MHR_Overlay.Misc.config");
screen = require("MHR_Overlay.Game_Handler.screen");
player = require("MHR_Overlay.Damage_Meter.player");
players = require("MHR_Overlay.Damage_Meter.players");
small_monster = require("MHR_Overlay.Monsters.small_monster");
large_monster = require("MHR_Overlay.Monsters.large_monster");
env_creature = require("MHR_Overlay.Endemic_Life.env_creature");

4
reframework/autorun/MHR_Overlay/UI/Customizations/bar_customization.lua
View File

@@ -3,7 +3,7 @@ local bar_customization = {};
local table_helpers;
local config;
local screen;
local player;
local players;
local large_monster;
local small_monster;
local env_creature;
@@ -164,7 +164,7 @@ function bar_customization.init_module()
language = require("MHR_Overlay.Misc.language");
config = require("MHR_Overlay.Misc.config");
screen = require("MHR_Overlay.Game_Handler.screen");
player = require("MHR_Overlay.Damage_Meter.player");
players = require("MHR_Overlay.Damage_Meter.players");
small_monster = require("MHR_Overlay.Monsters.small_monster");
large_monster = require("MHR_Overlay.Monsters.large_monster");
env_creature = require("MHR_Overlay.Endemic_Life.env_creature");

4
reframework/autorun/MHR_Overlay/UI/Customizations/body_parts_customization.lua
View File

@@ -3,7 +3,7 @@ local body_parts_customization = {};
local table_helpers;
local config;
local screen;
local player;
local players;
local large_monster;
local small_monster;
local env_creature;
@@ -330,7 +330,7 @@ function body_parts_customization.init_module()
language = require("MHR_Overlay.Misc.language");
config = require("MHR_Overlay.Misc.config");
screen = require("MHR_Overlay.Game_Handler.screen");
player = require("MHR_Overlay.Damage_Meter.player");
players = require("MHR_Overlay.Damage_Meter.players");
small_monster = require("MHR_Overlay.Monsters.small_monster");
large_monster = require("MHR_Overlay.Monsters.large_monster");
env_creature = require("MHR_Overlay.Endemic_Life.env_creature");

4
reframework/autorun/MHR_Overlay/UI/Customizations/health_customization.lua
View File

@@ -3,7 +3,7 @@ local large_monster_UI_customization = {};
local table_helpers;
local config;
local screen;
local player;
local players;
local large_monster;
local small_monster;
local env_creature;
@@ -62,7 +62,7 @@ function large_monster_UI_customization.init_module()
language = require("MHR_Overlay.Misc.language");
config = require("MHR_Overlay.Misc.config");
screen = require("MHR_Overlay.Game_Handler.screen");
player = require("MHR_Overlay.Damage_Meter.player");
players = require("MHR_Overlay.Damage_Meter.players");
small_monster = require("MHR_Overlay.Monsters.small_monster");
large_monster = require("MHR_Overlay.Monsters.large_monster");
env_creature = require("MHR_Overlay.Endemic_Life.env_creature");

31
reframework/autorun/MHR_Overlay/UI/Customizations/label_customization.lua
View File

@@ -3,7 +3,7 @@ local label_customization = {};
local table_helpers;
local config;
local screen;
local player;
local players;
local large_monster;
local small_monster;
local env_creature;
@@ -18,36 +18,41 @@ function label_customization.draw(label_name, label)
local changed = false;
if imgui.tree_node(label_name) then
changed, label.visibility = imgui.checkbox(language.current_language.customization_menu.visible
, label.visibility);
changed, label.visibility = imgui.checkbox(language.current_language.customization_menu.visible, label.visibility);
label_changed = label_changed or changed;
if label.include ~= nil then
if imgui.tree_node(language.current_language.customization_menu.include) then
for include_name, include in pairs(label.include) do
changed, label.include[include_name] = imgui.checkbox(language.current_language.customization_menu[include_name], include);
label_changed = label_changed or changed;
end
imgui.tree_pop();
end
end
-- add text format
if imgui.tree_node(language.current_language.customization_menu.offset) then
changed, label.offset.x = imgui.drag_float(language.current_language.customization_menu.x,
label.offset.x, 0.1, -screen.width, screen.width, "%.1f");
changed, label.offset.x = imgui.drag_float(language.current_language.customization_menu.x, label.offset.x, 0.1, -screen.width, screen.width, "%.1f");
label_changed = label_changed or changed;
changed, label.offset.y = imgui.drag_float(language.current_language.customization_menu.y,
label.offset.y, 0.1, -screen.height, screen.height, "%.1f");
changed, label.offset.y = imgui.drag_float(language.current_language.customization_menu.y, label.offset.y, 0.1, -screen.height, screen.height, "%.1f");
label_changed = label_changed or changed;
imgui.tree_pop();
end
if imgui.tree_node(language.current_language.customization_menu.color) then
changed, label.color = imgui.color_picker_argb("", label.color,
customization_menu.color_picker_flags);
changed, label.color = imgui.color_picker_argb("", label.color, customization_menu.color_picker_flags);
label_changed = label_changed or changed;
imgui.tree_pop();
end
if imgui.tree_node(language.current_language.customization_menu.shadow) then
changed, label.shadow.visibility = imgui.checkbox(language.current_language.customization_menu.visible
, label.shadow.visibility);
changed, label.shadow.visibility = imgui.checkbox(language.current_language.customization_menu.visible, label.shadow.visibility);
label_changed = label_changed or changed;
if imgui.tree_node(language.current_language.customization_menu.offset) then
@@ -84,7 +89,7 @@ function label_customization.init_module()
language = require("MHR_Overlay.Misc.language");
config = require("MHR_Overlay.Misc.config");
screen = require("MHR_Overlay.Game_Handler.screen");
player = require("MHR_Overlay.Damage_Meter.player");
players = require("MHR_Overlay.Damage_Meter.players");
small_monster = require("MHR_Overlay.Monsters.small_monster");
large_monster = require("MHR_Overlay.Monsters.large_monster");
env_creature = require("MHR_Overlay.Endemic_Life.env_creature");

4
reframework/autorun/MHR_Overlay/UI/Customizations/large_monster_UI_customization.lua
View File

@@ -3,7 +3,7 @@ local large_monster_UI_customization = {};
local table_helpers;
local config;
local screen;
local player;
local players;
local large_monster;
local small_monster;
local env_creature;
@@ -147,7 +147,7 @@ function large_monster_UI_customization.init_module()
language = require("MHR_Overlay.Misc.language");
config = require("MHR_Overlay.Misc.config");
screen = require("MHR_Overlay.Game_Handler.screen");
player = require("MHR_Overlay.Damage_Meter.player");
players = require("MHR_Overlay.Damage_Meter.players");
small_monster = require("MHR_Overlay.Monsters.small_monster");
large_monster = require("MHR_Overlay.Monsters.large_monster");
env_creature = require("MHR_Overlay.Endemic_Life.env_creature");

4
reframework/autorun/MHR_Overlay/UI/Customizations/line_customization.lua
View File

@@ -3,7 +3,7 @@ local line_customization = {};
local table_helpers;
local config;
local screen;
local player;
local players;
local large_monster;
local small_monster;
local env_creature;
@@ -69,7 +69,7 @@ function line_customization.init_module()
language = require("MHR_Overlay.Misc.language");
config = require("MHR_Overlay.Misc.config");
screen = require("MHR_Overlay.Game_Handler.screen");
player = require("MHR_Overlay.Damage_Meter.player");
players = require("MHR_Overlay.Damage_Meter.players");
small_monster = require("MHR_Overlay.Monsters.small_monster");
large_monster = require("MHR_Overlay.Monsters.large_monster");
env_creature = require("MHR_Overlay.Endemic_Life.env_creature");

4
reframework/autorun/MHR_Overlay/UI/Customizations/module_visibility_customization.lua
View File

@@ -3,7 +3,7 @@ local module_visibility_customization = {};
local table_helpers;
local config;
local screen;
local player;
local players;
local large_monster;
local small_monster;
local env_creature;
@@ -69,7 +69,7 @@ function module_visibility_customization.init_module()
language = require("MHR_Overlay.Misc.language");
config = require("MHR_Overlay.Misc.config");
screen = require("MHR_Overlay.Game_Handler.screen");
player = require("MHR_Overlay.Damage_Meter.player");
players = require("MHR_Overlay.Damage_Meter.players");
small_monster = require("MHR_Overlay.Monsters.small_monster");
large_monster = require("MHR_Overlay.Monsters.large_monster");
env_creature = require("MHR_Overlay.Endemic_Life.env_creature");

4
reframework/autorun/MHR_Overlay/UI/Customizations/rage_customization.lua
View File

@@ -3,7 +3,7 @@ local rage_customization = {};
local table_helpers;
local config;
local screen;
local player;
local players;
local large_monster;
local small_monster;
local env_creature;
@@ -65,7 +65,7 @@ function rage_customization.init_module()
language = require("MHR_Overlay.Misc.language");
config = require("MHR_Overlay.Misc.config");
screen = require("MHR_Overlay.Game_Handler.screen");
player = require("MHR_Overlay.Damage_Meter.player");
players = require("MHR_Overlay.Damage_Meter.players");
small_monster = require("MHR_Overlay.Monsters.small_monster");
large_monster = require("MHR_Overlay.Monsters.large_monster");
env_creature = require("MHR_Overlay.Endemic_Life.env_creature");

4
reframework/autorun/MHR_Overlay/UI/Customizations/stamina_customization.lua
View File

@@ -3,7 +3,7 @@ local stamina_customization = {};
local table_helpers;
local config;
local screen;
local player;
local players;
local large_monster;
local small_monster;
local env_creature;
@@ -65,7 +65,7 @@ function stamina_customization.init_module()
language = require("MHR_Overlay.Misc.language");
config = require("MHR_Overlay.Misc.config");
screen = require("MHR_Overlay.Game_Handler.screen");
player = require("MHR_Overlay.Damage_Meter.player");
players = require("MHR_Overlay.Damage_Meter.players");
small_monster = require("MHR_Overlay.Monsters.small_monster");
large_monster = require("MHR_Overlay.Monsters.large_monster");
env_creature = require("MHR_Overlay.Endemic_Life.env_creature");

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

@@ -2,7 +2,7 @@ local damage_meter_UI = {};
local singletons;
local config;
local customization_menu;
local player;
local players;
local non_players;
local quest_status;
local screen;
@@ -28,7 +28,7 @@ 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;
if player.total.display.total_damage == 0 and cached_config.settings.hide_module_if_total_damage_is_zero then
if players.total.display.total_damage == 0 and cached_config.settings.hide_module_if_total_damage_is_zero then
return;
end
@@ -39,7 +39,7 @@ function damage_meter_UI.draw()
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;
else
quest_players = player.display_list;
quest_players = players.display_list;
end
damage_meter_UI.last_displayed_players = quest_players;
@@ -64,11 +64,11 @@ function damage_meter_UI.draw()
return;
end
if cached_config.settings.hide_total_if_total_damage_is_zero and player.total.display.total_damage == 0 then
if cached_config.settings.hide_total_if_total_damage_is_zero and players.total.display.total_damage == 0 then
return;
end
player.draw_total(position_on_screen, 1);
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;
@@ -83,32 +83,26 @@ 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
if _player == player.myself then
if _player.type == players.types.myself then
if cached_config.settings.hide_myself then
goto continue
end
elseif _player.is_servant then
if cached_config.settings.hide_servants and not _player.is_otomo then
elseif _player.type == players.types.servant then
if cached_config.settings.hide_servants then
goto continue
end
else
if cached_config.settings.hide_other_players and not _player.is_otomo then
elseif _player.type == players.types.other_player then
if cached_config.settings.hide_other_players then
goto continue
end
end
if _player.is_player then
player.draw(_player, position_on_screen, 1, top_damage, top_dps);
else
non_players.draw(_player, position_on_screen, 1, top_damage, top_dps);
end
players.draw(_player, 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
@@ -125,7 +119,7 @@ function damage_meter_UI.draw()
return;
end
if cached_config.settings.hide_total_if_total_damage_is_zero and player.total.display.total_damage == 0 then
if cached_config.settings.hide_total_if_total_damage_is_zero and players.total.display.total_damage == 0 then
return;
end
@@ -133,7 +127,7 @@ function damage_meter_UI.draw()
position_on_screen = screen.calculate_absolute_coordinates(cached_config.position);
end
player.draw_total(position_on_screen, 1);
players.draw(players.total, position_on_screen, 1);
end
end
@@ -141,7 +135,7 @@ function damage_meter_UI.init_module()
singletons = require("MHR_Overlay.Game_Handler.singletons");
config = require("MHR_Overlay.Misc.config");
customization_menu = require("MHR_Overlay.UI.customization_menu");
player = require("MHR_Overlay.Damage_Meter.player");
players = require("MHR_Overlay.Damage_Meter.players");
non_players = require("MHR_Overlay.Damage_Meter.non_players");
quest_status = require("MHR_Overlay.Game_Handler.quest_status");
screen = require("MHR_Overlay.Game_Handler.screen");

6
reframework/autorun/MHR_Overlay/UI/Modules/env_creature_UI.lua
View File

@@ -4,7 +4,7 @@ local config;
local customization_menu;
local large_monster;
local screen;
local player;
local players;
local drawing;
local table_helpers;
local health_UI_entity;
@@ -46,7 +46,7 @@ function env_creature_UI.draw()
position_on_screen.x = position_on_screen.x + cached_config.viewport_offset.x * global_scale_modifier;
position_on_screen.y = position_on_screen.y + cached_config.viewport_offset.y * global_scale_modifier;
creature.distance = (player.myself_position - creature.position):length();
creature.distance = (players.myself_position - creature.position):length();
local opacity_scale = 1;
if creature.distance > cached_config.settings.max_distance then
@@ -68,7 +68,7 @@ function env_creature_UI.init_module()
customization_menu = require("MHR_Overlay.UI.customization_menu");
large_monster = require("MHR_Overlay.Monsters.large_monster");
screen = require("MHR_Overlay.Game_Handler.screen");
player = require("MHR_Overlay.Damage_Meter.player");
players = require("MHR_Overlay.Damage_Meter.players");
drawing = require("MHR_Overlay.UI.drawing");
table_helpers = require("MHR_Overlay.Misc.table_helpers");
health_UI_entity = require("MHR_Overlay.UI.UI_Entities.health_UI_entity");

6
reframework/autorun/MHR_Overlay/UI/Modules/large_monster_UI.lua
View File

@@ -4,7 +4,7 @@ local config;
local customization_menu;
local large_monster;
local screen;
local player;
local players;
local drawing;
local table_helpers;
local health_UI_entity;
@@ -70,7 +70,7 @@ function large_monster_UI.draw(dynamic_enabled, static_enabled, highlighted_enab
end
if update_distance then
monster.distance = (player.myself_position - monster.position):length();
monster.distance = (players.myself_position - monster.position):length();
end
if cached_config.highlighted.auto_highlight.enabled then
@@ -294,7 +294,7 @@ function large_monster_UI.init_module()
customization_menu = require("MHR_Overlay.UI.customization_menu");
large_monster = require("MHR_Overlay.Monsters.large_monster");
screen = require("MHR_Overlay.Game_Handler.screen");
player = require("MHR_Overlay.Damage_Meter.player");
players = require("MHR_Overlay.Damage_Meter.players");
drawing = require("MHR_Overlay.UI.drawing");
table_helpers = require("MHR_Overlay.Misc.table_helpers");
health_UI_entity = require("MHR_Overlay.UI.UI_Entities.health_UI_entity");

6
reframework/autorun/MHR_Overlay/UI/Modules/small_monster_UI.lua
View File

@@ -4,7 +4,7 @@ local config;
local small_monster;
local customization_menu;
local screen;
local player;
local players;
local drawing;
local table_helpers;
local health_UI_entity;
@@ -53,7 +53,7 @@ function small_monster_UI.draw()
if cached_config.dynamic_positioning.enabled
or (not cached_config.dynamic_positioning.enabled and cached_config.static_sorting.type == "Distance") then
for _, monster in ipairs(displayed_monsters) do
monster.distance = (player.myself_position - monster.position):length();
monster.distance = (players.myself_position - monster.position):length();
end
end
@@ -160,7 +160,7 @@ function small_monster_UI.init_module()
customization_menu = require("MHR_Overlay.UI.customization_menu");
small_monster = require("MHR_Overlay.Monsters.small_monster");
screen = require("MHR_Overlay.Game_Handler.screen");
player = require("MHR_Overlay.Damage_Meter.player");
players = require("MHR_Overlay.Damage_Meter.players");
drawing = require("MHR_Overlay.UI.drawing");
table_helpers = require("MHR_Overlay.Misc.table_helpers");
health_UI_entity = require("MHR_Overlay.UI.UI_Entities.health_UI_entity");

8
reframework/autorun/MHR_Overlay/UI/UI_Entities/ailment_buildup_UI_entity.lua
View File

@@ -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

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

@@ -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");

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

@@ -3,7 +3,7 @@ local customization_menu = {};
local table_helpers;
local config;
local screen;
local player;
local players;
local large_monster;
local small_monster;
local env_creature;
@@ -150,7 +150,7 @@ function customization_menu.init()
customization_menu.displayed_buildup_bar_relative_types = {language.current_language.customization_menu.total_buildup,
language.current_language.customization_menu.top_buildup};
customization_menu.displayed_damage_meter_UI_highlighted_bar_types =
{language.current_language.customization_menu.me, language.current_language.customization_menu.top_damage,
{language.current_language.customization_menu.top_damage,
language.current_language.customization_menu.top_dps, language.current_language.customization_menu.none};
customization_menu.displayed_damage_meter_UI_damage_bar_relative_types =
@@ -217,8 +217,7 @@ function customization_menu.init()
customization_menu.buildup_bar_relative_types = {language.default_language.customization_menu.total_buildup,
language.default_language.customization_menu.top_buildup};
customization_menu.damage_meter_UI_highlighted_bar_types = {language.default_language.customization_menu.me,
language.default_language.customization_menu.top_damage,
customization_menu.damage_meter_UI_highlighted_bar_types = {language.default_language.customization_menu.top_damage,
language.default_language.customization_menu.top_dps,
language.default_language.customization_menu.none};
customization_menu.damage_meter_UI_damage_bar_relative_types =
@@ -557,8 +556,8 @@ function customization_menu.draw()
end
if damage_meter_UI_changed or modifiers_changed then
for _, _player in pairs(player.list) do
player.init_UI(_player);
for _, _player in pairs(players.list) do
players.init_UI(_player);
end
@@ -570,7 +569,7 @@ function customization_menu.draw()
non_players.init_UI(otomo);
end
player.init_total_UI(player.total);
players.init_total_UI(players.total);
end
if endemic_life_UI_changed or modifiers_changed then
@@ -659,11 +658,11 @@ function customization_menu.draw_global_settings()
small_monster.init_list();
large_monster.init_list();
env_creature.init_list();
player.init_UI(player.myself);
player.init_UI(player.total);
players.init_UI(players.myself);
players.init_UI(players.total);
for _, _player in pairs(player.list) do
player.init_UI(_player);
for _, _player in pairs(players.list) do
players.init_UI(_player);
end
for _, servant in pairs(non_players.servant_list) do
@@ -1685,7 +1684,7 @@ function customization_menu.draw_damage_meter_UI()
imgui.tree_pop();
end
--[[
if imgui.tree_node(language.current_language.customization_menu.player_name_label) then
changed, cached_config.player_name_label.visibility = imgui.checkbox(
language.current_language.customization_menu.visible, cached_config.player_name_label.visibility);
@@ -2039,7 +2038,160 @@ function customization_menu.draw_damage_meter_UI()
imgui.tree_pop();
end
]]
if imgui.tree_node(language.current_language.customization_menu.myself) then
changed = label_customization.draw(language.current_language.customization_menu.name_label, cached_config.myself.name_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.hunter_rank_label, cached_config.myself.hunter_rank_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.cart_count_label, cached_config.myself.cart_count_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.dps_label, cached_config.myself.dps_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.damage_value_label, cached_config.myself.damage_value_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.damage_percentage_label, cached_config.myself.damage_percentage_label);
config_changed = config_changed or changed;
changed = bar_customization.draw(language.current_language.customization_menu.damage_bar, cached_config.myself.damage_bar);
config_changed = config_changed or changed;
imgui.tree_pop();
end
if imgui.tree_node(language.current_language.customization_menu.other_players) then
changed = label_customization.draw(language.current_language.customization_menu.name_label, cached_config.other_players.name_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.hunter_rank_label, cached_config.other_players.hunter_rank_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.cart_count_label, cached_config.other_players.cart_count_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.dps_label, cached_config.other_players.dps_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.damage_value_label, cached_config.other_players.damage_value_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.damage_percentage_label, cached_config.other_players.damage_percentage_label);
config_changed = config_changed or changed;
changed = bar_customization.draw(language.current_language.customization_menu.damage_bar, cached_config.other_players.damage_bar);
config_changed = config_changed or changed;
imgui.tree_pop();
end
if imgui.tree_node(language.current_language.customization_menu.servants) then
changed = label_customization.draw(language.current_language.customization_menu.name_label, cached_config.servants.name_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.dps_label, cached_config.servants.dps_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.damage_value_label, cached_config.servants.damage_value_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.damage_percentage_label, cached_config.servants.damage_percentage_label);
config_changed = config_changed or changed;
changed = bar_customization.draw(language.current_language.customization_menu.damage_bar, cached_config.servants.damage_bar);
config_changed = config_changed or changed;
imgui.tree_pop();
end
if imgui.tree_node(language.current_language.customization_menu.my_otomos) then
changed = label_customization.draw(language.current_language.customization_menu.name_label, cached_config.my_otomos.name_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.level_label, cached_config.my_otomos.hunter_rank_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.dps_label, cached_config.my_otomos.dps_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.damage_value_label, cached_config.my_otomos.damage_value_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.damage_percentage_label, cached_config.my_otomos.damage_percentage_label);
config_changed = config_changed or changed;
changed = bar_customization.draw(language.current_language.customization_menu.damage_bar, cached_config.my_otomos.damage_bar);
config_changed = config_changed or changed;
imgui.tree_pop();
end
if imgui.tree_node(language.current_language.customization_menu.other_player_otomos) then
changed = label_customization.draw(language.current_language.customization_menu.name_label, cached_config.other_player_otomos.name_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.level_label, cached_config.other_player_otomos.hunter_rank_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.dps_label, cached_config.other_player_otomos.dps_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.damage_value_label, cached_config.other_player_otomos.damage_value_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.damage_percentage_label, cached_config.other_player_otomos.damage_percentage_label);
config_changed = config_changed or changed;
changed = bar_customization.draw(language.current_language.customization_menu.damage_bar, cached_config.other_player_otomos.damage_bar);
config_changed = config_changed or changed;
imgui.tree_pop();
end
if imgui.tree_node(language.current_language.customization_menu.servant_otomos) then
changed = label_customization.draw(language.current_language.customization_menu.name_label, cached_config.servant_otomos.name_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.level_label, cached_config.servant_otomos.hunter_rank_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.dps_label, cached_config.servant_otomos.dps_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.damage_value_label, cached_config.servant_otomos.damage_value_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.damage_percentage_label, cached_config.servant_otomos.damage_percentage_label);
config_changed = config_changed or changed;
changed = bar_customization.draw(language.current_language.customization_menu.damage_bar, cached_config.servant_otomos.damage_bar);
config_changed = config_changed or changed;
imgui.tree_pop();
end
if imgui.tree_node(language.current_language.customization_menu.total) then
changed = label_customization.draw(language.current_language.customization_menu.name_label, cached_config.total.name_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.cart_count_label, cached_config.total.cart_count_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.dps_label, cached_config.total.dps_label);
config_changed = config_changed or changed;
changed = label_customization.draw(language.current_language.customization_menu.damage_value_label, cached_config.total.damage_value_label);
config_changed = config_changed or changed;
imgui.tree_pop();
end
--[[
changed = label_customization.draw(language.current_language.customization_menu.cart_count_label, cached_config.cart_count_label);
config_changed = config_changed or changed;
@@ -2070,35 +2222,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);
players.display_list = {};
players.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);
for _, _player in pairs(players.list) do
players.update_display(_player);
end
for _, servant in pairs(non_players.servant_list) do
player.update_display(servant);
players.update_display(servant);
end
for _, otomo in pairs(non_players.otomo_list) do
player.update_display(otomo);
players.update_display(otomo);
end
player.update_display(player.total);
player.update_dps(true);
players.update_display(players.total);
players.update_dps(true);
end
if config_changed then
player.sort_players();
players.sort_players();
end
imgui.tree_pop();
@@ -2187,7 +2340,7 @@ function customization_menu.init_module()
language = require("MHR_Overlay.Misc.language");
config = require("MHR_Overlay.Misc.config");
screen = require("MHR_Overlay.Game_Handler.screen");
player = require("MHR_Overlay.Damage_Meter.player");
players = require("MHR_Overlay.Damage_Meter.players");
small_monster = require("MHR_Overlay.Monsters.small_monster");
large_monster = require("MHR_Overlay.Monsters.large_monster");
env_creature = require("MHR_Overlay.Endemic_Life.env_creature");