mirror of
https://github.com/GreenComfyTea/MHR-Overlay.git
synced 2026-05-02 05:39:57 -07:00
Merge table_helpers and unicode_helpers into utils
This commit is contained in:
GreenComfyTea
@@ -1,7 +1,7 @@
|
||||
local ailment_UI_entity = {};
|
||||
|
||||
local config;
|
||||
local table_helpers;
|
||||
local utils;
|
||||
local drawing;
|
||||
local language;
|
||||
|
||||
@@ -33,6 +33,9 @@ local imgui = imgui;
|
||||
local draw = draw;
|
||||
local Vector2f = Vector2f;
|
||||
local reframework = reframework;
|
||||
local os = os;
|
||||
local ValueType = ValueType;
|
||||
local package = package;
|
||||
|
||||
function ailment_UI_entity.new(visibility, bar, name_label, text_label, value_label, percentage_label, timer_label)
|
||||
local entity = {};
|
||||
@@ -40,12 +43,12 @@ function ailment_UI_entity.new(visibility, bar, name_label, text_label, value_la
|
||||
local global_scale_modifier = config.current_config.global_settings.modifiers.global_scale_modifier;
|
||||
|
||||
entity.visibility = visibility;
|
||||
entity.bar = table_helpers.deep_copy(bar);
|
||||
entity.name_label = table_helpers.deep_copy(name_label);
|
||||
entity.text_label = table_helpers.deep_copy(text_label);
|
||||
entity.value_label = table_helpers.deep_copy(value_label);
|
||||
entity.percentage_label = table_helpers.deep_copy(percentage_label);
|
||||
entity.timer_label = table_helpers.deep_copy(timer_label);
|
||||
entity.bar = utils.table.deep_copy(bar);
|
||||
entity.name_label = utils.table.deep_copy(name_label);
|
||||
entity.text_label = utils.table.deep_copy(text_label);
|
||||
entity.value_label = utils.table.deep_copy(value_label);
|
||||
entity.percentage_label = utils.table.deep_copy(percentage_label);
|
||||
entity.timer_label = utils.table.deep_copy(timer_label);
|
||||
|
||||
entity.bar.offset.x = entity.bar.offset.x * global_scale_modifier;
|
||||
entity.bar.offset.y = entity.bar.offset.y * global_scale_modifier;
|
||||
@@ -116,7 +119,7 @@ function ailment_UI_entity.draw(ailment, ailment_UI, cached_config, position_on_
|
||||
end
|
||||
|
||||
function ailment_UI_entity.init_module()
|
||||
table_helpers = require("MHR_Overlay.Misc.table_helpers");
|
||||
utils = require("MHR_Overlay.Misc.utils");
|
||||
drawing = require("MHR_Overlay.UI.drawing");
|
||||
config = require("MHR_Overlay.Misc.config");
|
||||
language = require("MHR_Overlay.Misc.language");
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
local ailment_buildup_UI_entity = {};
|
||||
|
||||
local table_helpers;
|
||||
local utils;
|
||||
local drawing;
|
||||
local config;
|
||||
local players;
|
||||
@@ -34,6 +34,9 @@ local imgui = imgui;
|
||||
local draw = draw;
|
||||
local Vector2f = Vector2f;
|
||||
local reframework = reframework;
|
||||
local os = os;
|
||||
local ValueType = ValueType;
|
||||
local package = package;
|
||||
|
||||
function ailment_buildup_UI_entity.new(buildup_bar, highlighted_buildup_bar, ailment_name_label, player_name_label,
|
||||
buildup_value_label, buildup_percentage_label, total_buildup_label,
|
||||
@@ -43,14 +46,14 @@ function ailment_buildup_UI_entity.new(buildup_bar, highlighted_buildup_bar, ail
|
||||
local global_scale_modifier = config.current_config.global_settings.modifiers.global_scale_modifier;
|
||||
|
||||
--entity.visibility = visibility;
|
||||
entity.buildup_bar = table_helpers.deep_copy(buildup_bar);
|
||||
entity.highlighted_buildup_bar = table_helpers.deep_copy(highlighted_buildup_bar);
|
||||
entity.ailment_name_label = table_helpers.deep_copy(ailment_name_label);
|
||||
entity.player_name_label = table_helpers.deep_copy(player_name_label);
|
||||
entity.buildup_value_label = table_helpers.deep_copy(buildup_value_label);
|
||||
entity.buildup_percentage_label = table_helpers.deep_copy(buildup_percentage_label);
|
||||
entity.total_buildup_label = table_helpers.deep_copy(total_buildup_label);
|
||||
entity.total_buildup_value_label = table_helpers.deep_copy(total_buildup_value_label);
|
||||
entity.buildup_bar = utils.table.deep_copy(buildup_bar);
|
||||
entity.highlighted_buildup_bar = utils.table.deep_copy(highlighted_buildup_bar);
|
||||
entity.ailment_name_label = utils.table.deep_copy(ailment_name_label);
|
||||
entity.player_name_label = utils.table.deep_copy(player_name_label);
|
||||
entity.buildup_value_label = utils.table.deep_copy(buildup_value_label);
|
||||
entity.buildup_percentage_label = utils.table.deep_copy(buildup_percentage_label);
|
||||
entity.total_buildup_label = utils.table.deep_copy(total_buildup_label);
|
||||
entity.total_buildup_value_label = utils.table.deep_copy(total_buildup_value_label);
|
||||
|
||||
entity.buildup_bar.offset.x = entity.buildup_bar.offset.x * global_scale_modifier;
|
||||
entity.buildup_bar.offset.y = entity.buildup_bar.offset.y * global_scale_modifier;
|
||||
@@ -115,7 +118,7 @@ function ailment_buildup_UI_entity.draw(player, player_buildup, ailment_buildup_
|
||||
end
|
||||
|
||||
function ailment_buildup_UI_entity.init_module()
|
||||
table_helpers = require("MHR_Overlay.Misc.table_helpers");
|
||||
utils = require("MHR_Overlay.Misc.utils");
|
||||
drawing = require("MHR_Overlay.UI.drawing");
|
||||
config = require("MHR_Overlay.Misc.config");
|
||||
players = require("MHR_Overlay.Damage_Meter.players");
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
local body_part_UI_entity = {};
|
||||
|
||||
local config;
|
||||
local table_helpers;
|
||||
local utils;
|
||||
local drawing;
|
||||
|
||||
local sdk = sdk;
|
||||
@@ -32,6 +32,9 @@ local imgui = imgui;
|
||||
local draw = draw;
|
||||
local Vector2f = Vector2f;
|
||||
local reframework = reframework;
|
||||
local os = os;
|
||||
local ValueType = ValueType;
|
||||
local package = package;
|
||||
|
||||
function body_part_UI_entity.new(part_visibility, part_name_label, flinch_visibility, flinch_bar, flinch_text_label,
|
||||
flinch_value_label, flinch_percentage_label, break_visibility, break_bar, break_text_label, break_value_label,
|
||||
@@ -46,15 +49,15 @@ function body_part_UI_entity.new(part_visibility, part_name_label, flinch_visibi
|
||||
entity.break_visibility = break_visibility;
|
||||
entity.loss_visibility = loss_visibility;
|
||||
|
||||
entity.part_name_label = table_helpers.deep_copy(part_name_label);
|
||||
entity.part_name_label = utils.table.deep_copy(part_name_label);
|
||||
|
||||
entity.part_name_label.offset.x = entity.part_name_label.offset.x * global_scale_modifier;
|
||||
entity.part_name_label.offset.y = entity.part_name_label.offset.y * global_scale_modifier;
|
||||
|
||||
entity.flinch_bar = table_helpers.deep_copy(flinch_bar);
|
||||
entity.flinch_text_label = table_helpers.deep_copy(flinch_text_label);
|
||||
entity.flinch_value_label = table_helpers.deep_copy(flinch_value_label);
|
||||
entity.flinch_percentage_label = table_helpers.deep_copy(flinch_percentage_label);
|
||||
entity.flinch_bar = utils.table.deep_copy(flinch_bar);
|
||||
entity.flinch_text_label = utils.table.deep_copy(flinch_text_label);
|
||||
entity.flinch_value_label = utils.table.deep_copy(flinch_value_label);
|
||||
entity.flinch_percentage_label = utils.table.deep_copy(flinch_percentage_label);
|
||||
|
||||
entity.flinch_bar.offset.x = entity.flinch_bar.offset.x * global_scale_modifier;
|
||||
entity.flinch_bar.offset.y = entity.flinch_bar.offset.y * global_scale_modifier;
|
||||
@@ -72,10 +75,10 @@ function body_part_UI_entity.new(part_visibility, part_name_label, flinch_visibi
|
||||
entity.flinch_percentage_label.offset.x = entity.flinch_percentage_label.offset.x * global_scale_modifier;
|
||||
entity.flinch_percentage_label.offset.y = entity.flinch_percentage_label.offset.y * global_scale_modifier;
|
||||
|
||||
entity.break_bar = table_helpers.deep_copy(break_bar);
|
||||
entity.break_text_label = table_helpers.deep_copy(break_text_label);
|
||||
entity.break_value_label = table_helpers.deep_copy(break_value_label);
|
||||
entity.break_percentage_label = table_helpers.deep_copy(break_percentage_label);
|
||||
entity.break_bar = utils.table.deep_copy(break_bar);
|
||||
entity.break_text_label = utils.table.deep_copy(break_text_label);
|
||||
entity.break_value_label = utils.table.deep_copy(break_value_label);
|
||||
entity.break_percentage_label = utils.table.deep_copy(break_percentage_label);
|
||||
|
||||
entity.break_bar.offset.x = entity.break_bar.offset.x * global_scale_modifier;
|
||||
entity.break_bar.offset.y = entity.break_bar.offset.y * global_scale_modifier;
|
||||
@@ -93,10 +96,10 @@ function body_part_UI_entity.new(part_visibility, part_name_label, flinch_visibi
|
||||
entity.break_percentage_label.offset.x = entity.break_percentage_label.offset.x * global_scale_modifier;
|
||||
entity.break_percentage_label.offset.y = entity.break_percentage_label.offset.y * global_scale_modifier;
|
||||
|
||||
entity.loss_bar = table_helpers.deep_copy(loss_bar);
|
||||
entity.loss_text_label = table_helpers.deep_copy(loss_text_label);
|
||||
entity.loss_value_label = table_helpers.deep_copy(loss_value_label);
|
||||
entity.loss_health_percentage_label = table_helpers.deep_copy(loss_health_percentage_label);
|
||||
entity.loss_bar = utils.table.deep_copy(loss_bar);
|
||||
entity.loss_text_label = utils.table.deep_copy(loss_text_label);
|
||||
entity.loss_value_label = utils.table.deep_copy(loss_value_label);
|
||||
entity.loss_health_percentage_label = utils.table.deep_copy(loss_health_percentage_label);
|
||||
|
||||
entity.loss_bar.offset.x = entity.loss_bar.offset.x * global_scale_modifier;
|
||||
entity.loss_bar.offset.y = entity.loss_bar.offset.y * global_scale_modifier;
|
||||
@@ -248,7 +251,7 @@ function body_part_UI_entity.draw(part, part_UI, cached_config, position_on_scre
|
||||
end
|
||||
|
||||
function body_part_UI_entity.init_module()
|
||||
table_helpers = require("MHR_Overlay.Misc.table_helpers");
|
||||
utils = require("MHR_Overlay.Misc.utils");
|
||||
drawing = require("MHR_Overlay.UI.drawing");
|
||||
config = require("MHR_Overlay.Misc.config");
|
||||
end
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
local buff_UI_entity = {};
|
||||
|
||||
local config;
|
||||
local table_helpers;
|
||||
local utils;
|
||||
local drawing;
|
||||
local language;
|
||||
|
||||
@@ -33,6 +33,9 @@ local imgui = imgui;
|
||||
local draw = draw;
|
||||
local Vector2f = Vector2f;
|
||||
local reframework = reframework;
|
||||
local os = os;
|
||||
local ValueType = ValueType;
|
||||
local package = package;
|
||||
|
||||
function buff_UI_entity.new(bar, name_label, timer_label)
|
||||
local entity = {};
|
||||
@@ -40,9 +43,9 @@ function buff_UI_entity.new(bar, name_label, timer_label)
|
||||
local global_scale_modifier = config.current_config.global_settings.modifiers.global_scale_modifier;
|
||||
|
||||
--entity.visibility = visibility;
|
||||
entity.bar = table_helpers.deep_copy(bar);
|
||||
entity.name_label = table_helpers.deep_copy(name_label);
|
||||
entity.timer_label = table_helpers.deep_copy(timer_label);
|
||||
entity.bar = utils.table.deep_copy(bar);
|
||||
entity.name_label = utils.table.deep_copy(name_label);
|
||||
entity.timer_label = utils.table.deep_copy(timer_label);
|
||||
|
||||
entity.bar.offset.x = entity.bar.offset.x * global_scale_modifier;
|
||||
entity.bar.offset.y = entity.bar.offset.y * global_scale_modifier;
|
||||
@@ -79,7 +82,7 @@ function buff_UI_entity.draw(buff, buff_UI, position_on_screen, opacity_scale)
|
||||
end
|
||||
|
||||
function buff_UI_entity.init_module()
|
||||
table_helpers = require("MHR_Overlay.Misc.table_helpers");
|
||||
utils = require("MHR_Overlay.Misc.utils");
|
||||
drawing = require("MHR_Overlay.UI.drawing");
|
||||
config = require("MHR_Overlay.Misc.config");
|
||||
language = require("MHR_Overlay.Misc.language");
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
local damage_UI_entity = {};
|
||||
|
||||
local table_helpers;
|
||||
local utils;
|
||||
local drawing;
|
||||
local config;
|
||||
local players;
|
||||
@@ -36,19 +36,22 @@ local imgui = imgui;
|
||||
local draw = draw;
|
||||
local Vector2f = Vector2f;
|
||||
local reframework = reframework;
|
||||
local os = os;
|
||||
local ValueType = ValueType;
|
||||
local package = package;
|
||||
|
||||
function damage_UI_entity.new(damage_meter_UI_elements, type)
|
||||
local entity = {};
|
||||
|
||||
local global_scale_modifier = config.current_config.global_settings.modifiers.global_scale_modifier;
|
||||
|
||||
entity.bar = table_helpers.deep_copy(damage_meter_UI_elements.damage_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 = utils.table.deep_copy(damage_meter_UI_elements.damage_bar);
|
||||
entity.name_label = utils.table.deep_copy(damage_meter_UI_elements.name_label);
|
||||
entity.hunter_rank_label = utils.table.deep_copy(damage_meter_UI_elements.hunter_rank_label);
|
||||
entity.cart_count_label = utils.table.deep_copy(damage_meter_UI_elements.cart_count_label);
|
||||
entity.dps_label = utils.table.deep_copy(damage_meter_UI_elements.dps_label);
|
||||
entity.value_label = utils.table.deep_copy(damage_meter_UI_elements.damage_value_label);
|
||||
entity.percentage_label = utils.table.deep_copy(damage_meter_UI_elements.damage_percentage_label);
|
||||
|
||||
entity.player_name_size_limit = config.current_config.damage_meter_UI.settings.player_name_size_limit;
|
||||
|
||||
@@ -231,7 +234,7 @@ function damage_UI_entity.draw(player, position_on_screen, opacity_scale, top_da
|
||||
end
|
||||
|
||||
function damage_UI_entity.init_module()
|
||||
table_helpers = require("MHR_Overlay.Misc.table_helpers");
|
||||
utils = require("MHR_Overlay.Misc.utils");
|
||||
drawing = require("MHR_Overlay.UI.drawing");
|
||||
config = require("MHR_Overlay.Misc.config");
|
||||
players = require("MHR_Overlay.Damage_Meter.players");
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
local health_UI_entity = {};
|
||||
|
||||
local table_helpers;
|
||||
local utils;
|
||||
local drawing;
|
||||
local language;
|
||||
local config;
|
||||
@@ -33,6 +33,9 @@ local imgui = imgui;
|
||||
local draw = draw;
|
||||
local Vector2f = Vector2f;
|
||||
local reframework = reframework;
|
||||
local os = os;
|
||||
local ValueType = ValueType;
|
||||
local package = package;
|
||||
|
||||
function health_UI_entity.new(visibility, bar, text_label, value_label, percentage_label)
|
||||
local entity = {};
|
||||
@@ -40,10 +43,10 @@ function health_UI_entity.new(visibility, bar, text_label, value_label, percenta
|
||||
local global_scale_modifier = config.current_config.global_settings.modifiers.global_scale_modifier;
|
||||
|
||||
entity.visibility = visibility;
|
||||
entity.bar = table_helpers.deep_copy(bar);
|
||||
entity.text_label = table_helpers.deep_copy(text_label);
|
||||
entity.value_label = table_helpers.deep_copy(value_label);
|
||||
entity.percentage_label = table_helpers.deep_copy(percentage_label);
|
||||
entity.bar = utils.table.deep_copy(bar);
|
||||
entity.text_label = utils.table.deep_copy(text_label);
|
||||
entity.value_label = utils.table.deep_copy(value_label);
|
||||
entity.percentage_label = utils.table.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;
|
||||
@@ -89,7 +92,7 @@ function health_UI_entity.draw(monster, health_UI, position_on_screen, opacity_s
|
||||
end
|
||||
|
||||
function health_UI_entity.init_module()
|
||||
table_helpers = require("MHR_Overlay.Misc.table_helpers");
|
||||
utils = require("MHR_Overlay.Misc.utils");
|
||||
drawing = require("MHR_Overlay.UI.drawing");
|
||||
language = require("MHR_Overlay.Misc.language");
|
||||
config = require("MHR_Overlay.Misc.config");
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
local rage_UI_entity = {};
|
||||
|
||||
local table_helpers;
|
||||
local utils;
|
||||
local drawing;
|
||||
local language;
|
||||
local config;
|
||||
@@ -33,6 +33,9 @@ local imgui = imgui;
|
||||
local draw = draw;
|
||||
local Vector2f = Vector2f;
|
||||
local reframework = reframework;
|
||||
local os = os;
|
||||
local ValueType = ValueType;
|
||||
local package = package;
|
||||
|
||||
function rage_UI_entity.new(visibility, bar, text_label, value_label, percentage_label, timer_label)
|
||||
local entity = {};
|
||||
@@ -40,11 +43,11 @@ function rage_UI_entity.new(visibility, bar, text_label, value_label, percentage
|
||||
local global_scale_modifier = config.current_config.global_settings.modifiers.global_scale_modifier;
|
||||
|
||||
entity.visibility = visibility;
|
||||
entity.bar = table_helpers.deep_copy(bar);
|
||||
entity.text_label = table_helpers.deep_copy(text_label);
|
||||
entity.value_label = table_helpers.deep_copy(value_label);
|
||||
entity.percentage_label = table_helpers.deep_copy(percentage_label);
|
||||
entity.timer_label = table_helpers.deep_copy(timer_label);
|
||||
entity.bar = utils.table.deep_copy(bar);
|
||||
entity.text_label = utils.table.deep_copy(text_label);
|
||||
entity.value_label = utils.table.deep_copy(value_label);
|
||||
entity.percentage_label = utils.table.deep_copy(percentage_label);
|
||||
entity.timer_label = utils.table.deep_copy(timer_label);
|
||||
|
||||
entity.bar.offset.x = entity.bar.offset.x * global_scale_modifier;
|
||||
entity.bar.offset.y = entity.bar.offset.y * global_scale_modifier;
|
||||
@@ -103,7 +106,7 @@ function rage_UI_entity.draw(monster, rage_UI, position_on_screen, opacity_scale
|
||||
end
|
||||
|
||||
function rage_UI_entity.init_module()
|
||||
table_helpers = require("MHR_Overlay.Misc.table_helpers");
|
||||
utils = require("MHR_Overlay.Misc.utils");
|
||||
drawing = require("MHR_Overlay.UI.drawing");
|
||||
language = require("MHR_Overlay.Misc.language");
|
||||
config = require("MHR_Overlay.Misc.config");
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
local stamina_UI_entity = {};
|
||||
|
||||
local table_helpers;
|
||||
local utils;
|
||||
local drawing;
|
||||
local language;
|
||||
local config;
|
||||
@@ -33,6 +33,9 @@ local imgui = imgui;
|
||||
local draw = draw;
|
||||
local Vector2f = Vector2f;
|
||||
local reframework = reframework;
|
||||
local os = os;
|
||||
local ValueType = ValueType;
|
||||
local package = package;
|
||||
|
||||
function stamina_UI_entity.new(visibility, bar, text_label, value_label, percentage_label, timer_label)
|
||||
local entity = {};
|
||||
@@ -40,11 +43,11 @@ function stamina_UI_entity.new(visibility, bar, text_label, value_label, percent
|
||||
local global_scale_modifier = config.current_config.global_settings.modifiers.global_scale_modifier;
|
||||
|
||||
entity.visibility = visibility;
|
||||
entity.bar = table_helpers.deep_copy(bar);
|
||||
entity.text_label = table_helpers.deep_copy(text_label);
|
||||
entity.value_label = table_helpers.deep_copy(value_label);
|
||||
entity.percentage_label = table_helpers.deep_copy(percentage_label);
|
||||
entity.timer_label = table_helpers.deep_copy(timer_label);
|
||||
entity.bar = utils.table.deep_copy(bar);
|
||||
entity.text_label = utils.table.deep_copy(text_label);
|
||||
entity.value_label = utils.table.deep_copy(value_label);
|
||||
entity.percentage_label = utils.table.deep_copy(percentage_label);
|
||||
entity.timer_label = utils.table.deep_copy(timer_label);
|
||||
|
||||
entity.bar.offset.x = entity.bar.offset.x * global_scale_modifier;
|
||||
entity.bar.offset.y = entity.bar.offset.y * global_scale_modifier;
|
||||
@@ -100,7 +103,7 @@ function stamina_UI_entity.draw(monster, stamina_UI, position_on_screen, opacity
|
||||
end
|
||||
|
||||
function stamina_UI_entity.init_module()
|
||||
table_helpers = require("MHR_Overlay.Misc.table_helpers");
|
||||
utils = require("MHR_Overlay.Misc.utils");
|
||||
drawing = require("MHR_Overlay.UI.drawing");
|
||||
language = require("MHR_Overlay.Misc.language");
|
||||
config = require("MHR_Overlay.Misc.config");
|
||||
|
||||
Reference in New Issue
Block a user