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

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

6
reframework/autorun/MHR_Overlay.lua
View File

@@ -14,7 +14,7 @@ local table_helpers = require("MHR_Overlay.Misc.table_helpers");
local unicode_helpers = require("MHR_Overlay.Misc.unicode_helpers");
local part_names = require("MHR_Overlay.Misc.part_names");
local player = require("MHR_Overlay.Damage_Meter.player");
local players = require("MHR_Overlay.Damage_Meter.players");
local non_players = require("MHR_Overlay.Damage_Meter.non_players");
local damage_hook = require("MHR_Overlay.Damage_Meter.damage_hook");
@@ -81,7 +81,7 @@ ailment_buildup_UI_entity.init_module();
body_part_UI_entity.init_module();
damage_hook.init_module();
player.init_module();
players.init_module();
non_players.init_module();
quest_status.init_module();
@@ -179,7 +179,7 @@ local function main_loop()
customization_menu.status = "OK";
singletons.init();
screen.update_window_size();
player.update_myself_position();
players.update_myself_position();
quest_status.update_is_online();
--quest_status.update_is_quest_host();
time.tick();

18
reframework/autorun/MHR_Overlay/Damage_Meter/damage_hook.lua
View File

@@ -1,6 +1,6 @@
local damage_hook = {};
local quest_status;
local player;
local players;
local small_monster;
local large_monster;
local ailments;
@@ -163,7 +163,7 @@ function damage_hook.update_damage(enemy, enemy_calc_damage_info)
local attacking_otomo = nil;
if not is_otomo_attack then
attacking_player = player.get_player(attacker_id);
attacking_player = players.get_player(attacker_id);
if attacking_player == nil then
attacking_player = non_players.get_servant(attacker_id);
@@ -179,21 +179,21 @@ function damage_hook.update_damage(enemy, enemy_calc_damage_info)
end
else
if attacker_id < 4 then
attacking_player = player.get_player(attacker_id);
attacking_player = players.get_player(attacker_id);
attacking_otomo = non_players.get_otomo(attacker_id);
elseif attacker_id == 4 then
attacking_player = player.myself
attacking_player = players.myself
attacking_otomo = non_players.get_otomo(non_players.my_second_otomo_id);
else
attacking_player = non_players.get_servant(attacker_id - 1);
attacking_otomo = non_players.get_otomo(attacker_id - 1);
end
player.update_damage(attacking_otomo, damage_source_type, is_large_monster, damage_object);
players.update_damage(attacking_otomo, damage_source_type, is_large_monster, damage_object);
end
player.update_damage(player.total, damage_source_type, is_large_monster, damage_object);
player.update_damage(attacking_player, damage_source_type, is_large_monster, damage_object);
players.update_damage(players.total, damage_source_type, is_large_monster, damage_object);
players.update_damage(attacking_player, damage_source_type, is_large_monster, damage_object);
--xy = xy .. "\nPlayer: " .. tostring(attacker_id) ..
--" " .. tostring(attacking_player.name) ..
@@ -226,7 +226,7 @@ end
function damage_hook.cart(dead_player_id, flag_cat_skill_insurance)
-- flag_cat_skill_insurance = 0
-- flag_cat_skill_insurance = 1
local player_ = player.list[dead_player_id];
local player_ = players.list[dead_player_id];
if player_ == nil then
return;
end
@@ -246,7 +246,7 @@ local get_finish_shoot_wall_hit_damage_rate_method = enemy_character_base_type_d
function damage_hook.init_module()
quest_status = require("MHR_Overlay.Game_Handler.quest_status");
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");
ailments = require("MHR_Overlay.Monsters.ailments");

91
reframework/autorun/MHR_Overlay/Damage_Meter/non_players.lua
View File

@@ -9,29 +9,27 @@ local quest_status;
local drawing;
local language;
local unicode_helpers;
local player;
local players;
non_players.servant_list = {};
non_players.otomo_list = {};
non_players.my_second_otomo_id = -1;
function non_players.new(id, name, level, is_otomo, is_servant)
function non_players.new(id, name, level, type)
local non_player = {};
non_player.id = id;
non_player.name = name;
non_player.level = level;
non_player.is_player = false;
non_player.is_otomo = is_otomo;
non_player.is_servant = is_servant;
non_player.type = type;
non_player.join_time = -1;
non_player.first_hit_time = -1;
non_player.dps = 0;
non_player.small_monsters = player.init_damage_sources()
non_player.large_monsters = player.init_damage_sources();
non_player.small_monsters = players.init_damage_sources()
non_player.large_monsters = players.init_damage_sources();
non_player.display = {};
non_player.display.total_damage = 0;
@@ -148,12 +146,11 @@ function non_players.update_servant_list()
end
if non_players.servant_list[id] == nil then
local servant = non_players.new(id, name, 0, false, true);
non_players.servant_list[id] = servant;
non_players.servant_list[id] = non_players.new(id, name, 0, players.types.servant);
end
if not cached_config.settings.hide_servants then
table.insert(player.display_list, non_players.servant_list[id]);
table.insert(players.display_list, non_players.servant_list[id]);
end
::continue::
@@ -191,11 +188,11 @@ function non_players.update_my_otomos()
local level = otomo_create_data_level_field:get_data(first_otomo) or 0;
if non_players.otomo_list[0] == nil then
non_players.otomo_list[0] = non_players.new(0, name, level, true, false);
non_players.otomo_list[0] = non_players.new(0, name, level, players.types.my_otomo);
end
if cached_config.settings.show_my_otomos_separately then
table.insert(player.display_list, non_players.otomo_list[0]);
table.insert(players.display_list, non_players.otomo_list[0]);
end
end
end
@@ -208,11 +205,11 @@ function non_players.update_my_otomos()
-- the secondary otomo is actually the 4th one!
if non_players.otomo_list[non_players.my_second_otomo_id] == nil then
non_players.otomo_list[non_players.my_second_otomo_id] = non_players.new(non_players.my_second_otomo_id, name, level, true, false);
non_players.otomo_list[non_players.my_second_otomo_id] = non_players.new(non_players.my_second_otomo_id, name, level, players.types.my_otomo);
end
if cached_config.settings.show_my_otomos_separately then
table.insert(player.display_list, non_players.otomo_list[non_players.my_second_otomo_id]);
table.insert(players.display_list, non_players.otomo_list[non_players.my_second_otomo_id]);
end
end
end
@@ -252,11 +249,11 @@ function non_players.update_servant_otomos()
--name = unicode_helpers.sub(name, 13);
if non_players.otomo_list[member_id] == nil then
non_players.otomo_list[member_id] = non_players.new(member_id, name, level, true, true);
non_players.otomo_list[member_id] = non_players.new(member_id, name, level, players.types.servant_otomo);
end
if cached_config.settings.show_servant_otomos_separately then
table.insert(player.display_list, non_players.otomo_list[member_id]);
table.insert(players.display_list, non_players.otomo_list[member_id]);
end
end
@@ -291,12 +288,6 @@ function non_players.update_otomos(otomo_info_field_)
goto continue;
end
local is_servant = false;
if id >= 4 then
is_servant = true;
end
local name = otomo_info_name_field:get_data(otomo_info);
if name == nil then
goto continue;
@@ -307,23 +298,29 @@ function non_players.update_otomos(otomo_info_field_)
local otomo_in_list = non_players.otomo_list[id];
if otomo_in_list == nil or (otomo_in_list.name ~= name and otomo_in_list.level) then
local otomo = non_players.new(id, name, level, true, is_servant);
non_players.otomo_list[id] = otomo;
end
if id == players.myself.id then
local otomo = non_players.new(id, name, level, players.types.my_otomo);
non_players.otomo_list[id] = otomo;
if id == player.myself.id then
if cached_config.settings.show_my_otomos_separately then
table.insert(player.display_list, non_players.otomo_list[id]);
end
elseif is_servant then
if cached_config.settings.show_servant_otomos_separately then
table.insert(player.display_list, non_players.otomo_list[id]);
end
else
if cached_config.settings.show_other_player_otomos_separately then
table.insert(player.display_list, non_players.otomo_list[id]);
end
end
if cached_config.settings.show_my_otomos_separately then
table.insert(players.display_list, otomo);
end
elseif id >= 4 then
local otomo = non_players.new(id, name, level, players.types.servant_otomo);
non_players.otomo_list[id] = otomo;
if cached_config.settings.show_servant_otomos_separately then
table.insert(players.display_list, non_players);
end
else
local otomo = non_players.new(id, name, level, players.types.my_otomo);
non_players.otomo_list[id] = otomo;
if cached_config.settings.show_other_player_otomos_separately then
table.insert(players.display_list, non_players);
end
end
end
::continue::
end
@@ -332,13 +329,15 @@ end
function non_players.init_UI(non_player)
local cached_config = config.current_config.damage_meter_UI;
non_player.damage_UI = damage_UI_entity.new(cached_config.damage_bar, cached_config.highlighted_damage_bar,
cached_config.player_name_label, cached_config.dps_label, cached_config.master_hunter_rank_label,
cached_config.damage_value_label, cached_config.damage_percentage_label, cached_config.cart_count_label);
end
function non_players.draw(non_player, position_on_screen, opacity_scale, top_damage, top_dps)
damage_UI_entity.draw(non_player, position_on_screen, opacity_scale, top_damage, top_dps);
if non_player.type == players.types.servant then
non_player.damage_UI = damage_UI_entity.new(cached_config.servants, non_player.type);
elseif non_player.type == players.types.my_otomo then
non_player.damage_UI = damage_UI_entity.new(cached_config.my_otomos, non_player.type);
elseif non_player.type == players.types.other_player_otomo then
non_player.damage_UI = damage_UI_entity.new(cached_config.other_player_otomos, non_player.type);
elseif non_player.type == players.types.servant_otomo then
non_player.damage_UI = damage_UI_entity.new(cached_config.servant_otomos, non_player.type);
end
end
function non_players.init_module()
@@ -351,7 +350,7 @@ function non_players.init_module()
quest_status = require("MHR_Overlay.Game_Handler.quest_status");
drawing = require("MHR_Overlay.UI.drawing");
language = require("MHR_Overlay.Misc.language");
player = require("MHR_Overlay.Damage_Meter.player");
players = require("MHR_Overlay.Damage_Meter.players");
unicode_helpers = require("MHR_Overlay.Misc.unicode_helpers");
non_players.init();

284
reframework/autorun/MHR_Overlay/Damage_Meter/player.lua → reframework/autorun/MHR_Overlay/Damage_Meter/players.lua
View File

@@ -1,4 +1,4 @@
local player = {};
local players = {};
local config;
local table_helpers;
local singletons;
@@ -10,21 +10,31 @@ local drawing;
local language;
local non_players;
player.list = {};
player.myself = nil;
player.myself_position = Vector3f.new(0, 0, 0);
player.total = nil;
players.list = {};
players.myself = nil;
players.myself_position = Vector3f.new(0, 0, 0);
players.total = nil;
player.display_list = {}
players.display_list = {}
function player.new(id, name, master_rank, hunter_rank)
players.types = {
["myself"] = 0,
["other_player"] = 1,
["servant"] = 2,
["my_otomo"] = 4,
["other_player_otomo"] = 8,
["servant_otomo"] = 16,
["total"] = 32
}
function players.new(id, name, master_rank, hunter_rank, type)
local new_player = {};
new_player.id = id;
new_player.name = name; -- 齁ODO
new_player.name = name;
new_player.hunter_rank = hunter_rank;
new_player.master_rank = master_rank;
new_player.is_player = true;
new_player.type = type;
new_player.cart_count = 0;
@@ -32,8 +42,8 @@ function player.new(id, name, master_rank, hunter_rank)
new_player.first_hit_time = -1;
new_player.dps = 0;
new_player.small_monsters = player.init_damage_sources()
new_player.large_monsters = player.init_damage_sources();
new_player.small_monsters = players.init_damage_sources()
new_player.large_monsters = players.init_damage_sources();
new_player.display = {};
new_player.display.total_damage = 0;
@@ -41,16 +51,12 @@ function player.new(id, name, master_rank, hunter_rank)
new_player.display.elemental_damage = 0;
new_player.display.ailment_damage = 0;
if name == "Total" then
player.init_total_UI(new_player);
else
player.init_UI(new_player);
end
players.init_UI(new_player);
return new_player;
end
function player.init_damage_sources()
function players.init_damage_sources()
local monster_type = {};
monster_type.total_damage = 0;
@@ -115,11 +121,11 @@ function player.init_damage_sources()
return monster_type;
end
function player.get_player(player_id)
return player.list[player_id];
function players.get_player(player_id)
return players.list[player_id];
end
function player.update_damage(_player, damage_source_type, is_large_monster, damage_object)
function players.update_damage(_player, damage_source_type, is_large_monster, damage_object)
if _player == nil then
return;
end
@@ -134,33 +140,33 @@ function player.update_damage(_player, damage_source_type, is_large_monster, dam
end
if damage_source_type == "player" then
player.merge_damage(player_monster_type, damage_object);
players.merge_damage(player_monster_type, damage_object);
elseif damage_source_type == "bomb" then
player.merge_damage(player_monster_type.bombs, damage_object);
players.merge_damage(player_monster_type.bombs, damage_object);
elseif damage_source_type == "kunai" then
player.merge_damage(player_monster_type.kunai, damage_object);
players.merge_damage(player_monster_type.kunai, damage_object);
elseif damage_source_type == "installation" then
player.merge_damage(player_monster_type.installations, damage_object);
players.merge_damage(player_monster_type.installations, damage_object);
elseif damage_source_type == "otomo" then
player.merge_damage(player_monster_type.otomo, damage_object);
players.merge_damage(player_monster_type.otomo, damage_object);
elseif damage_source_type == "wyvern riding" then
player.merge_damage(player_monster_type.wyvern_riding, damage_object);
players.merge_damage(player_monster_type.wyvern_riding, damage_object);
elseif damage_source_type == "poison" then
player.merge_damage(player_monster_type.poison, damage_object);
players.merge_damage(player_monster_type.poison, damage_object);
elseif damage_source_type == "blast" then
player.merge_damage(player_monster_type.blast, damage_object);
players.merge_damage(player_monster_type.blast, damage_object);
elseif damage_source_type == "endemic life" then
player.merge_damage(player_monster_type.endemic_life, damage_object);
players.merge_damage(player_monster_type.endemic_life, damage_object);
elseif damage_source_type == "other" then
player.merge_damage(player_monster_type.other, damage_object);
players.merge_damage(player_monster_type.other, damage_object);
else
player.merge_damage(player_monster_type, damage_object);
players.merge_damage(player_monster_type, damage_object);
end
player.update_display(_player);
players.update_display(_player);
end
function player.update_display(_player)
function players.update_display(_player)
if _player == nil then
return;
end
@@ -174,54 +180,54 @@ function player.update_display(_player)
if cached_config.tracked_monster_types.small_monsters then
if cached_config.tracked_damage_types.player_damage then
player.merge_damage(_player.display, _player.small_monsters);
players.merge_damage(_player.display, _player.small_monsters);
end
if cached_config.tracked_damage_types.bomb_damage then
player.merge_damage(_player.display, _player.small_monsters.bombs);
players.merge_damage(_player.display, _player.small_monsters.bombs);
end
if cached_config.tracked_damage_types.kunai_damage then
player.merge_damage(_player.display, _player.small_monsters.kunai);
players.merge_damage(_player.display, _player.small_monsters.kunai);
end
if cached_config.tracked_damage_types.installation_damage then
player.merge_damage(_player.display, _player.small_monsters.installations);
players.merge_damage(_player.display, _player.small_monsters.installations);
end
if cached_config.tracked_damage_types.otomo_damage then
if _player.is_otomo then
if _player.id == player.myself.id or _player.id == non_players.my_second_otomo_id then
if _player.id == players.myself.id or _player.id == non_players.my_second_otomo_id then
if cached_config.settings.show_my_otomos_separately then
player.merge_damage(_player.display, _player.small_monsters.otomo);
players.merge_damage(_player.display, _player.small_monsters.otomo);
end
elseif _player.is_servant then
if cached_config.settings.show_servant_otomos_separately then
player.merge_damage(_player.display, _player.small_monsters.otomo);
players.merge_damage(_player.display, _player.small_monsters.otomo);
end
else
if cached_config.settings.show_other_player_otomos_separately then
player.merge_damage(_player.display, _player.small_monsters.otomo);
players.merge_damage(_player.display, _player.small_monsters.otomo);
end
end
else
if _player == player.myself then
if _player == players.myself then
if not cached_config.settings.show_my_otomos_separately then
player.merge_damage(_player.display, _player.small_monsters.otomo);
players.merge_damage(_player.display, _player.small_monsters.otomo);
end
elseif _player.is_servant then
if not cached_config.settings.show_servant_otomos_separately then
player.merge_damage(_player.display, _player.small_monsters.otomo);
players.merge_damage(_player.display, _player.small_monsters.otomo);
end
else
if not cached_config.settings.show_other_player_otomos_separately then
player.merge_damage(_player.display, _player.small_monsters.otomo);
players.merge_damage(_player.display, _player.small_monsters.otomo);
end
end
@@ -229,76 +235,76 @@ function player.update_display(_player)
end
if cached_config.tracked_damage_types.wyvern_riding_damage then
player.merge_damage(_player.display, _player.small_monsters.wyvern_riding);
players.merge_damage(_player.display, _player.small_monsters.wyvern_riding);
end
if cached_config.tracked_damage_types.poison_damage then
player.merge_damage(_player.display, _player.small_monsters.poison);
players.merge_damage(_player.display, _player.small_monsters.poison);
end
if cached_config.tracked_damage_types.blast_damage then
player.merge_damage(_player.display, _player.small_monsters.blast);
players.merge_damage(_player.display, _player.small_monsters.blast);
end
if cached_config.tracked_damage_types.endemic_life_damage then
player.merge_damage(_player.display, _player.small_monsters.endemic_life);
players.merge_damage(_player.display, _player.small_monsters.endemic_life);
end
if cached_config.tracked_damage_types.other_damage then
player.merge_damage(_player.display, _player.small_monsters.other);
players.merge_damage(_player.display, _player.small_monsters.other);
end
end
if cached_config.tracked_monster_types.large_monsters then
if cached_config.tracked_damage_types.player_damage then
player.merge_damage(_player.display, _player.large_monsters);
players.merge_damage(_player.display, _player.large_monsters);
end
if cached_config.tracked_damage_types.bomb_damage then
player.merge_damage(_player.display, _player.large_monsters.bombs);
players.merge_damage(_player.display, _player.large_monsters.bombs);
end
if cached_config.tracked_damage_types.kunai_damage then
player.merge_damage(_player.display, _player.large_monsters.kunai);
players.merge_damage(_player.display, _player.large_monsters.kunai);
end
if cached_config.tracked_damage_types.installation_damage then
player.merge_damage(_player.display, _player.large_monsters.installations);
players.merge_damage(_player.display, _player.large_monsters.installations);
end
if cached_config.tracked_damage_types.otomo_damage then
if _player.is_otomo then
if _player.id == player.myself.id or _player.id == non_players.my_second_otomo_id then
if _player.id == players.myself.id or _player.id == non_players.my_second_otomo_id then
if cached_config.settings.show_my_otomos_separately then
player.merge_damage(_player.display, _player.large_monsters.otomo);
players.merge_damage(_player.display, _player.large_monsters.otomo);
end
elseif _player.is_servant then
if cached_config.settings.show_servant_otomos_separately then
player.merge_damage(_player.display, _player.large_monsters.otomo);
players.merge_damage(_player.display, _player.large_monsters.otomo);
end
else
if cached_config.settings.show_other_player_otomos_separately then
player.merge_damage(_player.display, _player.large_monsters.otomo);
players.merge_damage(_player.display, _player.large_monsters.otomo);
end
end
else
if _player == player.myself then
if _player == players.myself then
if not cached_config.settings.show_my_otomos_separately then
player.merge_damage(_player.display, _player.large_monsters.otomo);
players.merge_damage(_player.display, _player.large_monsters.otomo);
end
elseif _player.is_servant then
if not cached_config.settings.show_servant_otomos_separately then
player.merge_damage(_player.display, _player.large_monsters.otomo);
players.merge_damage(_player.display, _player.large_monsters.otomo);
end
else
if not cached_config.settings.show_other_player_otomos_separately then
player.merge_damage(_player.display, _player.large_monsters.otomo);
players.merge_damage(_player.display, _player.large_monsters.otomo);
end
end
@@ -306,28 +312,28 @@ function player.update_display(_player)
end
if cached_config.tracked_damage_types.wyvern_riding_damage then
player.merge_damage(_player.display, _player.large_monsters.wyvern_riding);
players.merge_damage(_player.display, _player.large_monsters.wyvern_riding);
end
if cached_config.tracked_damage_types.poison_damage then
player.merge_damage(_player.display, _player.large_monsters.poison);
players.merge_damage(_player.display, _player.large_monsters.poison);
end
if cached_config.tracked_damage_types.blast_damage then
player.merge_damage(_player.display, _player.large_monsters.blast);
players.merge_damage(_player.display, _player.large_monsters.blast);
end
if cached_config.tracked_damage_types.endemic_life_damage then
player.merge_damage(_player.display, _player.large_monsters.endemic_life);
players.merge_damage(_player.display, _player.large_monsters.endemic_life);
end
if cached_config.tracked_damage_types.other_damage then
player.merge_damage(_player.display, _player.large_monsters.other);
players.merge_damage(_player.display, _player.large_monsters.other);
end
end
end
function player.merge_damage(first, second)
function players.merge_damage(first, second)
first.total_damage = first.total_damage + second.total_damage;
first.physical_damage = first.physical_damage + second.physical_damage;
first.elemental_damage = first.elemental_damage + second.elemental_damage;
@@ -336,28 +342,28 @@ function player.merge_damage(first, second)
return first;
end
function player.update_dps(bypass_freeze)
function players.update_dps(bypass_freeze)
local cached_config = config.current_config.damage_meter_UI.settings;
if cached_config.freeze_dps_on_quest_end and quest_status.flow_state >= quest_status.flow_states.KILLCAM and not bypass_freeze then
return;
end
player.total.dps = 0;
for _, _player in pairs(player.list) do
player.update_player_dps(_player);
players.total.dps = 0;
for _, _player in pairs(players.list) do
players.update_player_dps(_player);
end
for _, servant in pairs(non_players.servant_list) do
player.update_player_dps(servant);
players.update_player_dps(servant);
end
for _, otomo in pairs(non_players.otomo_list) do
player.update_player_dps(otomo);
players.update_player_dps(otomo);
end
end
function player.update_player_dps(_player)
function players.update_player_dps(_player)
local cached_config = config.current_config.damage_meter_UI.settings;
if _player.join_time == -1 then
@@ -378,54 +384,54 @@ function player.update_player_dps(_player)
end
end
player.total.dps = player.total.dps + _player.dps;
players.total.dps = players.total.dps + _player.dps;
end
function player.sort_players()
function players.sort_players()
local cached_config = config.current_config.damage_meter_UI;
if cached_config.settings.my_damage_bar_location == "Normal" then
table.insert(player.display_list, player.myself);
table.insert(players.display_list, players.myself);
end
-- sort here
if cached_config.sorting.type == "Normal" then
if cached_config.sorting.reversed_order then
table.sort(player.display_list, function(left, right)
table.sort(players.display_list, function(left, right)
return left.id > right.id;
end);
else
table.sort(player.display_list, function(left, right)
table.sort(players.display_list, function(left, right)
return left.id < right.id;
end);
end
elseif cached_config.sorting.type == "DPS" then
if cached_config.sorting.reversed_order then
table.sort(player.display_list, function(left, right)
table.sort(players.display_list, function(left, right)
return left.dps < right.dps;
end);
else
table.sort(player.display_list, function(left, right)
table.sort(players.display_list, function(left, right)
return left.dps > right.dps;
end);
end
else
if cached_config.sorting.reversed_order then
table.sort(player.display_list, function(left, right)
table.sort(players.display_list, function(left, right)
return left.display.total_damage < right.display.total_damage;
end);
else
table.sort(player.display_list, function(left, right)
table.sort(players.display_list, function(left, right)
return left.display.total_damage > right.display.total_damage;
end);
end
end
if cached_config.settings.my_damage_bar_location == "First" then
table.insert(player.display_list, 1, player.myself);
table.insert(players.display_list, 1, players.myself);
elseif cached_config.settings.my_damage_bar_location == "Last" then
table.insert(player.display_list, player.myself);
table.insert(players.display_list, players.myself);
end
end
@@ -435,7 +441,7 @@ local find_master_player_method = player_manager_type_def:get_method("findMaster
local player_base_type_def = sdk.find_type_definition("snow.player.PlayerBase");
local get_pos_field = player_base_type_def:get_method("get_Pos");
function player.update_myself_position()
function players.update_myself_position()
if singletons.player_manager == nil then
customization_menu.status = "No player manager";
return;
@@ -449,15 +455,15 @@ function player.update_myself_position()
local position = get_pos_field:call(master_player);
if position ~= nil then
player.myself_position = position;
players.myself_position = position;
end
end
function player.init()
player.list = {};
player.display_list = {};
player.total = player.new(0, "Total", 0, 0);
player.myself = player.new(-1, "Dummy", -1, -1);
function players.init()
players.list = {};
players.display_list = {};
players.total = players.new(0, "Total", 0, 0, players.types.total);
players.myself = players.new(-1, "Dummy", -1, -1, players.types.myself);
end
local lobby_manager_type_def = sdk.find_type_definition("snow.LobbyManager");
@@ -487,15 +493,15 @@ local get_master_rank_method = progress_manager_type_def:get_method("get_MasterR
local get_master_player_id_method = player_manager_type_def:get_method("getMasterPlayerID");
function player.update_player_list(is_on_quest)
function players.update_player_list(is_on_quest)
if is_on_quest then
player.update_player_list_(quest_hunter_info_field);
players.update_player_list_(quest_hunter_info_field);
else
player.update_player_list_(hunter_info_field);
players.update_player_list_(hunter_info_field);
end
end
function player.update_player_list_(hunter_info_field_)
function players.update_player_list_(hunter_info_field_)
local cached_config = config.current_config.damage_meter_UI;
if singletons.lobby_manager == nil then
@@ -529,10 +535,10 @@ function player.update_player_list_(hunter_info_field_)
return;
end
if player.myself == nil or myself_id ~= player.myself.id then
player.list[player.myself.id] = nil;
player.myself = player.new(myself_id, myself_player_name, myself_master_rank, myself_hunter_rank);
player.list[myself_id] = player.myself;
if players.myself == nil or myself_id ~= players.myself.id then
players.list[players.myself.id] = nil;
players.myself = players.new(myself_id, myself_player_name, myself_master_rank, myself_hunter_rank, players.types.myself);
players.list[myself_id] = players.myself;
end
-- other players
@@ -568,74 +574,42 @@ function player.update_player_list_(hunter_info_field_)
goto continue
end
local player_in_list = player.list[id];
local player_in_list = players.list[id];
if player_in_list == nil or (player_in_list.name ~= name and player_in_list.hunter_rank ~= hunter_rank and player_in_list.master_rank ~= master_rank) then
local _player = player.new(id, name, master_rank, hunter_rank);
player.list[id] = _player;
if player_in_list.name == player.myself.name then
player.myself = _player
if player_in_list.name == players.myself.name then
players.myself = players.new(id, name, master_rank, hunter_rank, players.types.myself);
players.list[id] = players.myself;
else
players.list[id] = players.new(id, name, master_rank, hunter_rank, players.types.other_player);
end
end
if player_in_list ~= player.myself then
table.insert(player.display_list, player_in_list);
if player_in_list ~= players.myself then
table.insert(players.display_list, player_in_list);
end
::continue::
end
end
function player.init_UI(_player)
function players.init_UI(_player)
local cached_config = config.current_config.damage_meter_UI;
_player.damage_UI = damage_UI_entity.new(cached_config.damage_bar, cached_config.highlighted_damage_bar,
cached_config.player_name_label, cached_config.dps_label, cached_config.master_hunter_rank_label,
cached_config.damage_value_label, cached_config.damage_percentage_label, cached_config.cart_count_label);
end
function player.init_total_UI(_player)
local cached_config = config.current_config.damage_meter_UI;
local global_scale_modifier = config.current_config.global_settings.modifiers.global_scale_modifier;
_player.damage_UI = {
total_damage_label = table_helpers.deep_copy(cached_config.total_damage_label),
total_damage_value_label = table_helpers.deep_copy(cached_config.total_damage_value_label),
total_dps_label = table_helpers.deep_copy(cached_config.total_dps_label),
total_cart_count_label = table_helpers.deep_copy(cached_config.total_cart_count_label),
};
_player.damage_UI.total_damage_label.offset.x = _player.damage_UI.total_damage_label.offset.x * global_scale_modifier;
_player.damage_UI.total_damage_label.offset.y = _player.damage_UI.total_damage_label.offset.y * global_scale_modifier;
_player.damage_UI.total_damage_value_label.offset.x = _player.damage_UI.total_damage_value_label.offset.x *
global_scale_modifier;
_player.damage_UI.total_damage_value_label.offset.y = _player.damage_UI.total_damage_value_label.offset.y *
global_scale_modifier;
_player.damage_UI.total_dps_label.offset.x = _player.damage_UI.total_dps_label.offset.x * global_scale_modifier;
_player.damage_UI.total_dps_label.offset.y = _player.damage_UI.total_dps_label.offset.y * global_scale_modifier;
_player.damage_UI.total_cart_count_label.offset.x = _player.damage_UI.total_cart_count_label.offset.x * global_scale_modifier;
_player.damage_UI.total_cart_count_label.offset.y = _player.damage_UI.total_cart_count_label.offset.y * global_scale_modifier;
end
function player.draw(_player, position_on_screen, opacity_scale, top_damage, top_dps)
damage_UI_entity.draw(_player, position_on_screen, opacity_scale, top_damage, top_dps);
end
function player.draw_total(position_on_screen, opacity_scale)
drawing.draw_label(player.total.damage_UI.total_damage_label, position_on_screen, opacity_scale, language.current_language.UI.total_damage);
drawing.draw_label(player.total.damage_UI.total_damage_value_label, position_on_screen, opacity_scale, player.total.display.total_damage);
drawing.draw_label(player.total.damage_UI.total_dps_label, position_on_screen, opacity_scale, player.total.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
drawing.draw_label(player.total.damage_UI.total_cart_count_label, position_on_screen, opacity_scale, quest_status.cart_count, quest_status.max_cart_count);
if _player.type == players.types.myself then
_player.damage_UI = damage_UI_entity.new(cached_config.myself, _player.type);
elseif _player.type == players.types.other_player then
_player.damage_UI = damage_UI_entity.new(cached_config.other_players, _player.type);
elseif _player.type == players.types.total then
_player.damage_UI = damage_UI_entity.new(cached_config.total, _player.type);
end
end
function player.init_module()
function players.draw(_player, position_on_screen, opacity_scale, top_damage, top_dps)
damage_UI_entity.draw(_player, position_on_screen, opacity_scale, top_damage, top_dps);
end
function players.init_module()
config = require("MHR_Overlay.Misc.config");
table_helpers = require("MHR_Overlay.Misc.table_helpers");
singletons = require("MHR_Overlay.Game_Handler.singletons");
@@ -647,7 +621,7 @@ function player.init_module()
language = require("MHR_Overlay.Misc.language");
non_players = require("MHR_Overlay.Damage_Meter.non_players");
player.init();
players.init();
end
return player;
return players;

4
reframework/autorun/MHR_Overlay/Game_Handler/keyboard.lua
View File

@@ -2,7 +2,7 @@ local config = require "MHR_Overlay.Misc.config"
local keyboard = {};
local singletons;
local customization_menu;
local player;
local players;
local small_monster;
local large_monster;
local damage_meter_UI;
@@ -574,7 +574,7 @@ end
function keyboard.init_module()
singletons = require("MHR_Overlay.Game_Handler.singletons");
customization_menu = require("MHR_Overlay.UI.customization_menu");
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");
damage_meter_UI = require("MHR_Overlay.UI.Modules.damage_meter_UI");

6
reframework/autorun/MHR_Overlay/Game_Handler/quest_status.lua
View File

@@ -2,7 +2,7 @@ local quest_status = {};
local singletons;
local customization_menu;
local player;
local players;
local small_monster;
local large_monster;
local damage_meter_UI;
@@ -107,7 +107,7 @@ function quest_status.set_flow_state(new_flow_state)
end
if quest_status.flow_state == quest_status.flow_states.IN_LOBBY or quest_status.flow_state == quest_status.flow_states.IN_TRAINING_AREA then
player.init();
players.init();
non_players.init();
small_monster.init_list();
large_monster.init_list();
@@ -341,7 +341,7 @@ end
function quest_status.init_module()
singletons = require("MHR_Overlay.Game_Handler.singletons");
customization_menu = require("MHR_Overlay.UI.customization_menu");
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");
damage_meter_UI = require("MHR_Overlay.UI.Modules.damage_meter_UI");

19
reframework/autorun/MHR_Overlay/Game_Handler/time.lua
View File

@@ -2,7 +2,7 @@ local time = {};
local singletons;
local customization_menu;
local quest_status;
local player;
local players;
local non_players;
local config;
local small_monster;
@@ -30,20 +30,21 @@ function time.tick()
end
local quest_time_elapsed_minutes = get_quest_elapsed_time_min_method:call(singletons.quest_manager);
if quest_time_elapsed_minutes ~= nil then
if quest_time_elapsed_minutes == nil then
customization_menu.status = "No quest time elapsed minutes";
else
time.elapsed_minutes = quest_time_elapsed_minutes;
end
local quest_time_total_elapsed_seconds = get_quest_elapsed_time_sec_method:call(singletons.quest_manager);
if quest_time_total_elapsed_seconds ~= nil then
if quest_time_total_elapsed_seconds == nil then
customization_menu.status = "No quest time total elapsed seconds";
else
time.total_elapsed_seconds = quest_time_total_elapsed_seconds;
end
time.elapsed_seconds = quest_time_total_elapsed_seconds - quest_time_elapsed_minutes * 60;
if time.total_elapsed_script_seconds - time.last_elapsed_script_seconds > 0.5 then
@@ -51,18 +52,18 @@ function time.tick()
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);
player.update_dps(false);
player.sort_players();
players.update_dps(false);
players.sort_players();
end
end
function time.init_module()
player = require("MHR_Overlay.Damage_Meter.player");
players = require("MHR_Overlay.Damage_Meter.players");
singletons = require("MHR_Overlay.Game_Handler.singletons");
customization_menu = require("MHR_Overlay.UI.customization_menu");
config = require("MHR_Overlay.Misc.config");

1051
reframework/autorun/MHR_Overlay/Misc/config.lua
View File

File diff suppressed because it is too large Load Diff

8
reframework/autorun/MHR_Overlay/Misc/language.lua
View File

@@ -439,7 +439,13 @@ language.default_language = {
my_otomos = "My Buddies",
other_player_otomos = "Other Player Buddies",
servant_otomos = "Servant Buddies",
level = "Level"
level = "Level",
name_label = "Name Label",
myself = "Myself",
total = "Total",
level_label = "Level Label"
}
};

4
reframework/autorun/MHR_Overlay/Monsters/ailment_buildup.lua
View File

@@ -1,5 +1,5 @@
local ailment_buildup = {};
local player;
local players;
local language;
local config;
local ailments;
@@ -139,7 +139,7 @@ function ailment_buildup.draw(monster, ailment_buildup_UI, cached_config, ailmen
end
function ailment_buildup.init_module()
player = require("MHR_Overlay.Damage_Meter.player");
players = require("MHR_Overlay.Damage_Meter.players");
language = require("MHR_Overlay.Misc.language");
config = require("MHR_Overlay.Misc.config");
ailments = require("MHR_Overlay.Monsters.ailments");

10
reframework/autorun/MHR_Overlay/Monsters/ailments.lua
View File

@@ -1,5 +1,5 @@
local ailments = {};
local player;
local players;
local language;
local config;
local ailment_UI_entity;
@@ -664,10 +664,10 @@ function ailments.apply_ailment_damage(monster, ailment_type, ailment_damage)
damage_object.elemental_damage = 0;
damage_object.ailment_damage = damage_portion;
local attacking_player = player.get_player(attacker_id);
local attacking_player = players.get_player(attacker_id);
if attacking_player ~= nil then
player.update_damage(attacking_player, damage_source_type, true, damage_object);
players.update_damage(attacking_player, damage_source_type, true, damage_object);
end
end
@@ -677,11 +677,11 @@ function ailments.apply_ailment_damage(monster, ailment_type, ailment_damage)
damage_object.elemental_damage = 0;
damage_object.ailment_damage = ailment_damage;
player.update_damage(player.total, damage_source_type, true, damage_object);
players.update_damage(players.total, damage_source_type, true, damage_object);
end
function ailments.init_module()
player = require("MHR_Overlay.Damage_Meter.player");
players = require("MHR_Overlay.Damage_Meter.players");
language = require("MHR_Overlay.Misc.language");
config = require("MHR_Overlay.Misc.config");
ailment_UI_entity = require("MHR_Overlay.UI.UI_Entities.ailment_UI_entity");

4
reframework/autorun/MHR_Overlay/Monsters/large_monster.lua
View File

@@ -14,7 +14,7 @@ local body_part_UI_entity;
local screen;
local drawing;
local ailments;
local player;
local players;
local time;
local body_part;
@@ -883,7 +883,7 @@ function large_monster.init_module()
drawing = require("MHR_Overlay.UI.drawing");
part_names = require("MHR_Overlay.Misc.part_names");
ailments = require("MHR_Overlay.Monsters.ailments");
player = require("MHR_Overlay.Damage_Meter.player");
players = require("MHR_Overlay.Damage_Meter.players");
time = require("MHR_Overlay.Game_Handler.time");
ailment_buildup = require("MHR_Overlay.Monsters.ailment_buildup");
end

8
reframework/autorun/MHR_Overlay/Monsters/monster_hook.lua
View File

@@ -3,7 +3,7 @@ local small_monster;
local large_monster;
local config;
local ailments;
local player;
local players;
local quest_status;
local enemy_character_base_type_def = sdk.find_type_definition("snow.enemy.EnemyCharacterBase");
@@ -118,7 +118,7 @@ function monster_hook.update_large_monster(enemy)
large_monster.update_stamina_timer(enemy, monster, nil);
large_monster.update_rage_timer(enemy, monster, nil);
if quest_status.is_online and player.myself.id ~= 0 then
if quest_status.is_online and players.myself.id ~= 0 then
local physical_param = large_monster.update_health(enemy, monster);
pcall(large_monster.update_parts, enemy, monster, physical_param);
end
@@ -158,7 +158,7 @@ function monster_hook.update_small_monster(enemy)
small_monster.update(enemy, monster);
if quest_status.is_online and player.myself.id ~= 0 then
if quest_status.is_online and players.myself.id ~= 0 then
small_monster.update_health(enemy, monster);
end
end
@@ -223,7 +223,7 @@ function monster_hook.init_module()
large_monster = require("MHR_Overlay.Monsters.large_monster");
config = require("MHR_Overlay.Misc.config");
ailments = require("MHR_Overlay.Monsters.ailments");
player = require("MHR_Overlay.Damage_Meter.player");
players = require("MHR_Overlay.Damage_Meter.players");
quest_status = require("MHR_Overlay.Game_Handler.quest_status");
sdk.hook(enemy_character_base_update_method, function(args)

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