mirror of
https://github.com/GreenComfyTea/MHR-Overlay.git
synced 2026-01-24 20:38:03 -08:00
Changed how HR is displayed
This commit is contained in:
@@ -143,7 +143,7 @@ local damage_meter_UI = {
|
|||||||
reverse_order = false,
|
reverse_order = false,
|
||||||
|
|
||||||
visibility = {
|
visibility = {
|
||||||
id = true,
|
id = false,
|
||||||
name = true,
|
name = true,
|
||||||
hunter_rank = true,
|
hunter_rank = true,
|
||||||
damage_bar = true,
|
damage_bar = true,
|
||||||
@@ -173,34 +173,29 @@ local damage_meter_UI = {
|
|||||||
y = 0
|
y = 0
|
||||||
},
|
},
|
||||||
|
|
||||||
hunter_rank = {
|
|
||||||
x = -50,
|
|
||||||
y = 0
|
|
||||||
},
|
|
||||||
|
|
||||||
damage_bar = {
|
damage_bar = {
|
||||||
x = 0,
|
x = 0,
|
||||||
y = 17
|
y = 17
|
||||||
},
|
},
|
||||||
|
|
||||||
player_damage = {
|
player_damage = {
|
||||||
x = 120,
|
x = 145,
|
||||||
y = 0
|
y = 0
|
||||||
},
|
},
|
||||||
|
|
||||||
player_damage_percentage = {
|
player_damage_percentage = {
|
||||||
x = 180,
|
x = 205,
|
||||||
y = 0
|
y = 0
|
||||||
},
|
},
|
||||||
|
|
||||||
total_damage = {
|
total_damage = {
|
||||||
x = 120,
|
x = 145,
|
||||||
y = 0
|
y = 0
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
damage_bar = {
|
damage_bar = {
|
||||||
width = 225,
|
width = 250,
|
||||||
height = 5
|
height = 5
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -210,11 +205,6 @@ local damage_meter_UI = {
|
|||||||
y = 1
|
y = 1
|
||||||
},
|
},
|
||||||
|
|
||||||
hunter_rank = {
|
|
||||||
x = 1,
|
|
||||||
y = 1
|
|
||||||
},
|
|
||||||
|
|
||||||
player_damage = {
|
player_damage = {
|
||||||
x = 1,
|
x = 1,
|
||||||
y = 1
|
y = 1
|
||||||
@@ -237,11 +227,6 @@ local damage_meter_UI = {
|
|||||||
shadow = 0xFF000000
|
shadow = 0xFF000000
|
||||||
},
|
},
|
||||||
|
|
||||||
hunter_rank = {
|
|
||||||
text = 0xFFE1F4CC,
|
|
||||||
shadow = 0xFF000000
|
|
||||||
},
|
|
||||||
|
|
||||||
damage_bar = {
|
damage_bar = {
|
||||||
player_damage = 0xA7F4A3CC,
|
player_damage = 0xA7F4A3CC,
|
||||||
others_damage = 0xA7000000
|
others_damage = 0xA7000000
|
||||||
@@ -321,7 +306,7 @@ re.on_frame(function()
|
|||||||
damage_meter();
|
damage_meter();
|
||||||
end
|
end
|
||||||
|
|
||||||
draw.text("x:\n" .. tostring(x), 500, 800, 0xFFFFFFFF);
|
--draw.text("x:\n" .. tostring(x), 500, 800, 0xFFFFFFFF);
|
||||||
end);
|
end);
|
||||||
|
|
||||||
function get_window_size()
|
function get_window_size()
|
||||||
@@ -749,7 +734,7 @@ function merge_damage(first, second)
|
|||||||
first.ailment_damage = first.ailment_damage + second.ailment_damage;
|
first.ailment_damage = first.ailment_damage + second.ailment_damage;
|
||||||
end
|
end
|
||||||
|
|
||||||
total = init_player(0, "Total");
|
total = init_player(0, "Total", 0);
|
||||||
|
|
||||||
function get_player(player_id)
|
function get_player(player_id)
|
||||||
if players[player_id] == nil then
|
if players[player_id] == nil then
|
||||||
@@ -1011,38 +996,30 @@ function damage_meter()
|
|||||||
end
|
end
|
||||||
|
|
||||||
if damage_meter_UI.visibility.id or damage_meter_UI.visibility.name then
|
if damage_meter_UI.visibility.id or damage_meter_UI.visibility.name then
|
||||||
local id_name_text = "";
|
local name_text = "";
|
||||||
|
|
||||||
|
if damage_meter_UI.visibility.hunter_rank then
|
||||||
|
name_text = string.format("[%d] ", player.hunter_rank);
|
||||||
|
end
|
||||||
|
|
||||||
if damage_meter_UI.visibility.id then
|
if damage_meter_UI.visibility.id then
|
||||||
id_name_text = player.id;
|
name_text = name_text .. string.format("%d", player.id);
|
||||||
end
|
end
|
||||||
|
|
||||||
if damage_meter_UI.visibility.name then
|
if damage_meter_UI.visibility.name then
|
||||||
if damage_meter_UI.visibility.id then
|
if damage_meter_UI.visibility.id then
|
||||||
id_name_text = id_name_text .. " ";
|
name_text = name_text .. " ";
|
||||||
end
|
end
|
||||||
|
|
||||||
id_name_text = id_name_text .. player.name;
|
name_text = name_text .. player.name;
|
||||||
end
|
end
|
||||||
|
|
||||||
if damage_meter_UI.shadows.name then
|
if damage_meter_UI.shadows.name then
|
||||||
--name shadow
|
--name shadow
|
||||||
draw.text(id_name_text, screen_position.x + damage_meter_UI.offsets.name.x + damage_meter_UI.shadow_offsets.name.x, screen_position.y + damage_meter_UI.offsets.name.y + damage_meter_UI.shadow_offsets.name.y, damage_meter_UI.colors.name.shadow);
|
draw.text(name_text, screen_position.x + damage_meter_UI.offsets.name.x + damage_meter_UI.shadow_offsets.name.x, screen_position.y + damage_meter_UI.offsets.name.y + damage_meter_UI.shadow_offsets.name.y, damage_meter_UI.colors.name.shadow);
|
||||||
end
|
end
|
||||||
--name
|
--name
|
||||||
draw.text(id_name_text, screen_position.x + damage_meter_UI.offsets.name.x, screen_position.y + damage_meter_UI.offsets.name.y, damage_meter_UI.colors.name.text);
|
draw.text(name_text, screen_position.x + damage_meter_UI.offsets.name.x, screen_position.y + damage_meter_UI.offsets.name.y, damage_meter_UI.colors.name.text);
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
if damage_meter_UI.visibility.hunter_rank and player.hunter_rank ~= 0 then
|
|
||||||
local hunter_rank_text = "HR" .. player.hunter_rank;
|
|
||||||
|
|
||||||
if damage_meter_UI.shadows.hunter_rank then
|
|
||||||
--hunter rank shadow
|
|
||||||
draw.text(hunter_rank_text, screen_position.x + damage_meter_UI.offsets.hunter_rank.x + damage_meter_UI.shadow_offsets.hunter_rank.x, screen_position.y + damage_meter_UI.offsets.hunter_rank.y + damage_meter_UI.shadow_offsets.hunter_rank.y, damage_meter_UI.colors.hunter_rank.shadow);
|
|
||||||
end
|
|
||||||
--hunter rank
|
|
||||||
draw.text(hunter_rank_text, screen_position.x + damage_meter_UI.offsets.hunter_rank.x, screen_position.y + damage_meter_UI.offsets.hunter_rank.y, damage_meter_UI.colors.hunter_rank.text);
|
|
||||||
end
|
end
|
||||||
|
|
||||||
if damage_meter_UI.visibility.player_damage then
|
if damage_meter_UI.visibility.player_damage then
|
||||||
|
|||||||
Reference in New Issue
Block a user