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

Initial Sunbreak update.

Browse Source 
- Added Monster Rank.
- Fixed Poison and Blast Damage.
This commit is contained in:
GreenComfyTea
2022-07-02 14:16:58 +03:00
parent c506a3073b
commit 9a5e05d229
9 changed files with 206 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,11 @@ function damage_UI_entity.draw(_player, position_on_screen, opacity_scale, top_d
local player_name_text = "";
if player_include.hunter_rank then
if player_include.master_rank and player_include.hunter_rank then
player_name_text = string.format("[%d:%d] ", _player.master_rank, _player.hunter_rank);
elseif player_include.master_rank then
player_name_text = string.format("[%d] ", _player.master_rank);
elseif player_include.hunter_rank then
player_name_text = string.format("[%d] ", _player.hunter_rank);
end
@@ -89,6 +93,8 @@ function damage_UI_entity.draw(_player, position_on_screen, opacity_scale, top_d
end
end
if _player.id == player.myself.id 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
@@ -100,11 +106,21 @@ function damage_UI_entity.draw(_player, position_on_screen, opacity_scale, top_d
end
if _player.id == player.myself.id then
if _player.damage_UI.hunter_rank_label.enable_for.me then
drawing.draw_label(_player.damage_UI.hunter_rank_label, position_on_screen, opacity_scale, _player.hunter_rank);
if _player.damage_UI.hunter_rank_label.include.myself.master_rank and _player.damage_UI.hunter_rank_label.include.myself.hunter_rank then
drawing.draw_label(_player.damage_UI.hunter_rank_label, position_on_screen, opacity_scale, string.format("%d:%d", _player.master_rank, _player.hunter_rank));
elseif _player.damage_UI.hunter_rank_label.include.myself.master_rank then
drawing.draw_label(_player.damage_UI.hunter_rank_label, position_on_screen, opacity_scale, string.format("%d", _player.master_rank));
elseif _player.damage_UI.hunter_rank_label.include.myself.hunter_rank then
drawing.draw_label(_player.damage_UI.hunter_rank_label, position_on_screen, opacity_scale, string.format("%d", _player.hunter_rank));
end
else
if _player.damage_UI.hunter_rank_label.include.others.master_rank and _player.damage_UI.hunter_rank_label.include.others.hunter_rank then
drawing.draw_label(_player.damage_UI.hunter_rank_label, position_on_screen, opacity_scale, string.format("%d:%d", _player.master_rank, _player.hunter_rank));
elseif _player.damage_UI.hunter_rank_label.include.others.master_rank then
drawing.draw_label(_player.damage_UI.hunter_rank_label, position_on_screen, opacity_scale, string.format("%d", _player.master_rank));
elseif _player.damage_UI.hunter_rank_label.include.others.hunter_rank then
drawing.draw_label(_player.damage_UI.hunter_rank_label, position_on_screen, opacity_scale, string.format("%d", _player.hunter_rank));
end
elseif _player.damage_UI.hunter_rank_label.enable_for.other_players then
drawing.draw_label(_player.damage_UI.hunter_rank_label, position_on_screen, opacity_scale, _player.hunter_rank);
end
drawing.draw_label(_player.damage_UI.player_name_label, position_on_screen, opacity_scale, player_name_text);

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

@@ -15271,6 +15271,12 @@ function customization_menu.draw()
if imgui.tree_node(language.current_language.customization_menu.include) then
if imgui.tree_node(language.current_language.customization_menu.me) then
changed, config.current_config.damage_meter_UI.player_name_label.include.myself.master_rank = imgui.checkbox(
language.current_language.customization_menu.master_rank,
config.current_config.damage_meter_UI.player_name_label.include.myself.master_rank);
config_changed = config_changed or changed;
damage_meter_UI_changed = damage_meter_UI_changed or changed;
changed, config.current_config.damage_meter_UI.player_name_label.include.myself.hunter_rank = imgui.checkbox(
language.current_language.customization_menu.hunter_rank,
config.current_config.damage_meter_UI.player_name_label.include.myself.hunter_rank);
@@ -15299,6 +15305,12 @@ function customization_menu.draw()
end
if imgui.tree_node(language.current_language.customization_menu.other_players) then
changed, config.current_config.damage_meter_UI.player_name_label.include.others.master_rank = imgui.checkbox(
language.current_language.customization_menu.master_rank,
config.current_config.damage_meter_UI.player_name_label.include.others.master_rank);
config_changed = config_changed or changed;
damage_meter_UI_changed = damage_meter_UI_changed or changed;
changed, config.current_config.damage_meter_UI.player_name_label.include.others.hunter_rank = imgui.checkbox(
language.current_language.customization_menu.hunter_rank,
config.current_config.damage_meter_UI.player_name_label.include.others.hunter_rank);
@@ -15394,39 +15406,58 @@ function customization_menu.draw()
end
if imgui.tree_node(language.current_language.customization_menu.hunter_rank_label) then
changed, config.current_config.damage_meter_UI.hunter_rank_label.visibility = imgui.checkbox(language.current_language
changed, config.current_config.damage_meter_UI.master_hunter_rank_label.visibility = imgui.checkbox(language.current_language
.customization_menu.visible,
config.current_config.damage_meter_UI.hunter_rank_label.visibility);
config.current_config.damage_meter_UI.master_hunter_rank_label.visibility);
config_changed = config_changed or changed;
damage_meter_UI_changed = damage_meter_UI_changed or changed;
if imgui.tree_node(language.current_language.customization_menu.enable_for) then
changed, config.current_config.damage_meter_UI.hunter_rank_label.enable_for.me = imgui.checkbox(
language.current_language.customization_menu.me,
config.current_config.damage_meter_UI.hunter_rank_label.enable_for.me);
config_changed = config_changed or changed;
damage_meter_UI_changed = damage_meter_UI_changed or changed;
if imgui.tree_node(language.current_language.customization_menu.include) then
if imgui.tree_node(language.current_language.customization_menu.me) then
changed, config.current_config.damage_meter_UI.master_hunter_rank_label.include.myself.master_rank = imgui.checkbox(
language.current_language.customization_menu.master_rank,
config.current_config.damage_meter_UI.player_name_label.include.myself.master_rank);
config_changed = config_changed or changed;
damage_meter_UI_changed = damage_meter_UI_changed or changed;
changed, config.current_config.damage_meter_UI.hunter_rank_label.enable_for.other_players = imgui.checkbox(
language.current_language.customization_menu.other_players,
config.current_config.damage_meter_UI.hunter_rank_label.enable_for.other_players);
config_changed = config_changed or changed;
damage_meter_UI_changed = damage_meter_UI_changed or changed;
changed, config.current_config.damage_meter_UI.master_hunter_rank_label.include.myself.hunter_rank = imgui.checkbox(
language.current_language.customization_menu.hunter_rank,
config.current_config.damage_meter_UI.player_name_label.include.myself.hunter_rank);
config_changed = config_changed or changed;
damage_meter_UI_changed = damage_meter_UI_changed or changed;
imgui.tree_pop();
end
if imgui.tree_node(language.current_language.customization_menu.other_players) then
changed, config.current_config.damage_meter_UI.master_hunter_rank_label.include.others.master_rank = imgui.checkbox(
language.current_language.customization_menu.master_rank,
config.current_config.damage_meter_UI.player_name_label.include.others.master_rank);
config_changed = config_changed or changed;
damage_meter_UI_changed = damage_meter_UI_changed or changed;
changed, config.current_config.damage_meter_UI.master_hunter_rank_label.include.others.hunter_rank = imgui.checkbox(
language.current_language.customization_menu.hunter_rank,
config.current_config.damage_meter_UI.player_name_label.include.others.hunter_rank);
config_changed = config_changed or changed;
damage_meter_UI_changed = damage_meter_UI_changed or changed;
imgui.tree_pop();
end
imgui.tree_pop();
end
if imgui.tree_node(language.current_language.customization_menu.offset) then
changed, config.current_config.damage_meter_UI.hunter_rank_label.offset.x = imgui.drag_float(language.current_language
changed, config.current_config.damage_meter_UI.master_hunter_rank_label.offset.x = imgui.drag_float(language.current_language
.customization_menu.x,
config.current_config.damage_meter_UI.hunter_rank_label.offset.x, 0.1, -screen.width, screen.width, "%.1f");
config.current_config.damage_meter_UI.master_hunter_rank_label.offset.x, 0.1, -screen.width, screen.width, "%.1f");
config_changed = config_changed or changed;
damage_meter_UI_changed = damage_meter_UI_changed or changed;
changed, config.current_config.damage_meter_UI.hunter_rank_label.offset.y = imgui.drag_float(language.current_language
changed, config.current_config.damage_meter_UI.master_hunter_rank_label.offset.y = imgui.drag_float(language.current_language
.customization_menu.y,
config.current_config.damage_meter_UI.hunter_rank_label.offset.y, 0.1, -screen.height, screen.height, "%.1f");
config.current_config.damage_meter_UI.master_hunter_rank_label.offset.y, 0.1, -screen.height, screen.height, "%.1f");
config_changed = config_changed or changed;
damage_meter_UI_changed = damage_meter_UI_changed or changed;
@@ -15434,8 +15465,8 @@ function customization_menu.draw()
end
if imgui.tree_node(language.current_language.customization_menu.color) then
changed, config.current_config.damage_meter_UI.hunter_rank_label.color = imgui.color_picker_argb("",
config.current_config.damage_meter_UI.hunter_rank_label.color, customization_menu.color_picker_flags);
changed, config.current_config.damage_meter_UI.master_hunter_rank_label.color = imgui.color_picker_argb("",
config.current_config.damage_meter_UI.master_hunter_rank_label.color, customization_menu.color_picker_flags);
config_changed = config_changed or changed;
damage_meter_UI_changed = damage_meter_UI_changed or changed;
@@ -15443,22 +15474,22 @@ function customization_menu.draw()
end
if imgui.tree_node(language.current_language.customization_menu.shadow) then
changed, config.current_config.damage_meter_UI.hunter_rank_label.shadow.visibility = imgui.checkbox(language.current_language
changed, config.current_config.damage_meter_UI.master_hunter_rank_label.shadow.visibility = imgui.checkbox(language.current_language
.customization_menu.visible,
config.current_config.damage_meter_UI.hunter_rank_label.shadow.visibility);
config.current_config.damage_meter_UI.master_hunter_rank_label.shadow.visibility);
config_changed = config_changed or changed;
damage_meter_UI_changed = damage_meter_UI_changed or changed;
if imgui.tree_node(language.current_language.customization_menu.offset) then
changed, config.current_config.damage_meter_UI.hunter_rank_label.shadow.offset.x = imgui.drag_float(language.current_language
changed, config.current_config.damage_meter_UI.master_hunter_rank_label.shadow.offset.x = imgui.drag_float(language.current_language
.customization_menu.x,
config.current_config.damage_meter_UI.hunter_rank_label.shadow.offset.x, 0.1, -screen.width, screen.width, "%.1f");
config.current_config.damage_meter_UI.master_hunter_rank_label.shadow.offset.x, 0.1, -screen.width, screen.width, "%.1f");
config_changed = config_changed or changed;
damage_meter_UI_changed = damage_meter_UI_changed or changed;
changed, config.current_config.damage_meter_UI.hunter_rank_label.shadow.offset.y = imgui.drag_float(language.current_language
changed, config.current_config.damage_meter_UI.master_hunter_rank_label.shadow.offset.y = imgui.drag_float(language.current_language
.customization_menu.y,
config.current_config.damage_meter_UI.hunter_rank_label.shadow.offset.y, 0.1, -screen.height, screen.height,
config.current_config.damage_meter_UI.master_hunter_rank_label.shadow.offset.y, 0.1, -screen.height, screen.height,
"%.1f");
config_changed = config_changed or changed;
damage_meter_UI_changed = damage_meter_UI_changed or changed;
@@ -15467,8 +15498,8 @@ function customization_menu.draw()
end
if imgui.tree_node(language.current_language.customization_menu.color) then
changed, config.current_config.damage_meter_UI.hunter_rank_label.shadow.color = imgui.color_picker_argb("",
config.current_config.damage_meter_UI.hunter_rank_label.shadow.color, customization_menu.color_picker_flags);
changed, config.current_config.damage_meter_UI.master_hunter_rank_label.shadow.color = imgui.color_picker_argb("",
config.current_config.damage_meter_UI.master_hunter_rank_label.shadow.color, customization_menu.color_picker_flags);
config_changed = config_changed or changed;
damage_meter_UI_changed = damage_meter_UI_changed or changed;