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

Bugfixes, added sorting by distance, localization system improvements

Browse Source
This commit is contained in:
GreenComfyTea
2022-02-12 19:59:07 +02:00
parent 3f1ceec534
commit 78722262f1
24 changed files with 868 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@ local player;
local quest_status;
local screen;
local drawing;
local language;
damage_meter_UI.last_displayed_players = {};
damage_meter_UI.freeze_displayed_players = false;
@@ -207,7 +208,7 @@ function damage_meter_UI.draw()
position_on_screen = screen.calculate_absolute_coordinates(config.current_config.damage_meter_UI.position);
end
drawing.draw_label(config.current_config.damage_meter_UI.total_damage_label, position_on_screen, 1);
drawing.draw_label(config.current_config.damage_meter_UI.total_damage_label, position_on_screen, 1, language.current_language.UI.total_damage);
drawing.draw_label(config.current_config.damage_meter_UI.total_damage_value_label, position_on_screen, 1, player.total.display.total_damage);
end
@@ -220,6 +221,7 @@ function damage_meter_UI.init_module()
quest_status = require("MHR_Overlay.Game_Handler.quest_status");
screen = require("MHR_Overlay.Game_Handler.screen");
drawing = require("MHR_Overlay.UI.drawing");
language = require("MHR_Overlay.Misc.language");
end
return damage_meter_UI;

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

@@ -31,26 +31,36 @@ function large_monster_UI.draw(dynamic_enabled, static_enabled)
local enemy = get_boss_enemy_method:call(singletons.enemy_manager, i);
if enemy == nil then
customization_menu.status = "No enemy";
break
goto continue;
end
local monster = large_monster.list[enemy];
if monster == nil then
customization_menu.status = "No monster hp entry";
break
goto continue;
end
table.insert(displayed_monsters, monster);
::continue::
end
if dynamic_enabled or config.current_config.large_monster_UI.static.sorting.type == "Distance" then
for _, monster in ipairs(displayed_monsters) do
monster.distance = (player.myself_position - monster.position):length();
end
end
if dynamic_enabled then
local i = 0;
for _, monster in ipairs(displayed_monsters) do
if config.current_config.large_monster_UI.dynamic.settings.max_distance == 0 then
break;
end
if monster.dead_or_captured and config.current_config.large_monster_UI.dynamic.settings.hide_dead_or_captured then
goto continue;
end
local position_on_screen = {};
local world_offset = Vector3f.new(config.current_config.large_monster_UI.dynamic.world_offset.x, config.current_config.large_monster_UI.dynamic.world_offset.y, config.current_config.large_monster_UI.dynamic.world_offset.z);
@@ -65,13 +75,12 @@ function large_monster_UI.draw(dynamic_enabled, static_enabled)
position_on_screen.y = position_on_screen.y + config.current_config.large_monster_UI.dynamic.viewport_offset.y;
local opacity_scale = 1;
local distance = (player.myself_position - monster.position):length();
if distance > config.current_config.large_monster_UI.dynamic.settings.max_distance then
if monster.distance > config.current_config.large_monster_UI.dynamic.settings.max_distance then
goto continue;
end
if config.current_config.large_monster_UI.dynamic.settings.opacity_falloff then
opacity_scale = 1 - (distance / config.current_config.large_monster_UI.dynamic.settings.max_distance);
opacity_scale = 1 - (monster.distance / config.current_config.large_monster_UI.dynamic.settings.max_distance);
end
large_monster.draw_dynamic(monster, position_on_screen, opacity_scale);
@@ -111,12 +120,26 @@ function large_monster_UI.draw(dynamic_enabled, static_enabled)
return left.health_percentage < right.health_percentage;
end);
end
elseif config.current_config.large_monster_UI.static.sorting.type == "Distance" then
if config.current_config.large_monster_UI.static.sorting.reversed_order then
table.sort(displayed_monsters, function(left, right)
return left.distance > right.distance;
end);
else
table.sort(displayed_monsters, function(left, right)
return left.distance < right.distance;
end);
end
end
local position_on_screen = screen.calculate_absolute_coordinates(config.current_config.large_monster_UI.static.position);
local i = 0;
for _, monster in ipairs(displayed_monsters) do
if monster.dead_or_captured and config.current_config.large_monster_UI.static.settings.hide_dead_or_captured then
goto continue;
end
local monster_position_on_screen = {
x = position_on_screen.x,
y = position_on_screen.y
@@ -131,6 +154,7 @@ function large_monster_UI.draw(dynamic_enabled, static_enabled)
large_monster.draw_static(monster, monster_position_on_screen, 1);
i = i + 1;
::continue::
end
end
end

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

@@ -31,21 +31,32 @@ function small_monster_UI.draw()
local enemy = get_zako_enemy_method:call(singletons.enemy_manager, i);
if enemy == nil then
customization_menu.status = "No enemy";
break
goto continue;
end
local monster = small_monster.list[enemy];
if monster == nil then
customization_menu.status = "No monster hp entry";
break
goto continue;
end
if monster.dead_or_captured and config.current_config.small_monster_UI.settings.hide_dead_or_captured then
goto continue;
end
table.insert(displayed_monsters, monster);
::continue::
end
if config.current_config.small_monster_UI.dynamic_positioning.enabled
or (not config.current_config.small_monster_UI.dynamic_positioning.enabled and config.current_config.small_monster_UI.static_sorting.type == "Distance") then
for _, monster in ipairs(displayed_monsters) do
monster.distance = (player.myself_position - monster.position):length();
end
end
if not config.current_config.small_monster_UI.dynamic_positioning.enabled then
-- sort here
if config.current_config.small_monster_UI.static_sorting.type == "Normal" and config.current_config.small_monster_UI.static_sorting.reversed_order then
local reversed_monsters = {};
for i = #displayed_monsters, 1, -1 do
@@ -74,6 +85,16 @@ function small_monster_UI.draw()
return left.health_percentage < right.health_percentage;
end);
end
elseif config.current_config.small_monster_UI.static_sorting.type == "Distance" then
if config.current_config.small_monster_UI.static_sorting.reversed_order then
table.sort(displayed_monsters, function(left, right)
return left.distance > right.distance;
end);
else
table.sort(displayed_monsters, function(left, right)
return left.distance < right.distance;
end);
end
end
end
@@ -109,14 +130,12 @@ function small_monster_UI.draw()
return;
end
local distance = (player.myself_position - monster.position):length();
if distance > config.current_config.small_monster_UI.dynamic_positioning.max_distance then
if monster.distance > config.current_config.small_monster_UI.dynamic_positioning.max_distance then
goto continue;
end
if config.current_config.small_monster_UI.dynamic_positioning.opacity_falloff then
opacity_scale = 1 - (distance / config.current_config.small_monster_UI.dynamic_positioning.max_distance);
opacity_scale = 1 - (monster.distance / config.current_config.small_monster_UI.dynamic_positioning.max_distance);
end
end