Added hotkeys, separated player initialization and drawing.

reframework/autorun/MHR_Overlay/UI/Modules/damage_meter_UI.lua

@@ -12,14 +12,8 @@ damage_meter_UI.last_displayed_players = {};
 damage_meter_UI.freeze_displayed_players = false;
 
 local lobby_manager_type_def = sdk.find_type_definition("snow.LobbyManager");
-local my_hunter_info_field = lobby_manager_type_def:get_field("_myHunterInfo");
-local myself_index_field = lobby_manager_type_def:get_field("_myselfIndex");
-local myself_quest_index_field = lobby_manager_type_def:get_field("_myselfQuestIndex");
-
 local quest_hunter_info_field = lobby_manager_type_def:get_field("_questHunterInfo");
-
-local my_hunter_info_type_def = my_hunter_info_field:get_type();
-local name_field = my_hunter_info_type_def:get_field("_name");
+local hunter_info_field = lobby_manager_type_def:get_field("_hunterInfo");
 
 local quest_hunter_info_type_def = quest_hunter_info_field:get_type();
 local get_count_method = quest_hunter_info_type_def:get_method("get_Count");
@@ -27,10 +21,48 @@ local get_item_method = quest_hunter_info_type_def:get_method("get_Item");
 
 local hunter_info_type_def = sdk.find_type_definition("snow.LobbyManager.HunterInfo");
 local member_index_field = hunter_info_type_def:get_field("_memberIndex");
-local hunter_rank_field = hunter_info_type_def:get_field("_hunterRank");
 
-local progress_manager_type_def = sdk.find_type_definition("snow.progress.ProgressManager");
-local get_hunter_rank_method = progress_manager_type_def:get_method("get_HunterRank");
+function damage_meter_UI.get_players(player_info_list)
+	-- other players
+	if player_info_list == nil then
+		customization_menu.status = "No player info list";
+		return {};
+	end
+
+	local quest_players = {};
+
+	local count = get_count_method:call(player_info_list);
+	
+	if count == nil then
+		customization_menu.status = "No player info list count";
+		return {};
+	end
+
+	for i = 0, count - 1 do
+		local player_info = get_item_method:call(player_info_list, i);
+
+		if player_info == nil then
+			goto continue;
+		end
+
+		local player_id = member_index_field:get_data(player_info);
+		if player_id == nil then
+			goto continue;
+		end
+		
+		local _player = player.get_player(player_id);
+		if _player ~= nil then
+			if player_id == player.myself.id and config.current_config.damage_meter_UI.settings.my_damage_bar_location ~= "Normal" then
+				goto continue;
+			end
+			table.insert(quest_players, _player);
+		end
+
+		::continue::
+	end
+
+	return quest_players;
+end
 
 function damage_meter_UI.draw()
 
@@ -38,150 +70,60 @@ function damage_meter_UI.draw()
 		return;
 	end
 
-	if singletons.lobby_manager == nil then
-		return;
-	end
-	
-	if singletons.progress_manager == nil then
-		return;
-	end
-
-	-- myself player
-	local myself_player_info = my_hunter_info_field:get_data(singletons.lobby_manager);
-	if myself_player_info == nil then
-		customization_menu.status = "No myself player info list";
-		return;
-	end
-
-	local myself_player_name = name_field:get_data(myself_player_info);
-	if myself_player_name == nil then
-		customization_menu.status = "No myself player name";
-		return;
-	end
-
-	if quest_status.is_online then
-		player.myself_id = myself_quest_index_field:get_data(singletons.lobby_manager);
-		if player.myself_id == nil then
-			customization_menu.status = "No myself player id";
-			return;
-		end
-	else
-		player.myself_id = myself_index_field:get_data(singletons.lobby_manager);
-		if player.myself_id == nil then
-			customization_menu.status = "No myself player id";
-			return;
-		end
-	end
-
-	local myself_hunter_rank = get_hunter_rank_method:call(singletons.progress_manager);
-	if myself_hunter_rank == nil then
-		customization_menu.status = "No myself hunter rank";
-		myself_hunter_rank = 0;
-	end
-
-	if player.list[player.myself_id] == nil then
-		player.list[player.myself_id] = player.new(player.myself_id, myself_player_name, myself_hunter_rank);
-		player.myself = player.list[player.myself_id];
-	else
-
-	end
-
 	local quest_players = {};
-
-	if damage_meter_UI.freeze_displayed_players then
+	if damage_meter_UI.freeze_displayed_players and damage_meter_UI.last_displayed_players ~= {} then
 		quest_players = damage_meter_UI.last_displayed_players;
+	elseif quest_status.index < 2 then
+		local player_info_list = hunter_info_field:get_data(singletons.lobby_manager);
+		quest_players = damage_meter_UI.get_players(player_info_list);
 	else
-		-- other players
 		local player_info_list = quest_hunter_info_field:get_data(singletons.lobby_manager);
-		if player_info_list == nil then
-			customization_menu.status = "No player info list";
-		end
+		quest_players = damage_meter_UI.get_players(player_info_list);
+	end
 
-		local count = get_count_method:call(player_info_list);
-		if count == nil then
-			customization_menu.status = "No player info list count";
-			return;
-		end
-
-		for i = 0, count - 1 do
-			
-			local player_info = get_item_method:call(player_info_list, i);
-			if player_info == nil then
-				goto continue
-			end
-
-			local player_id = member_index_field:get_data(player_info)
-			if player_id == nil then
-				goto continue
-			end
-
-			local player_hunter_rank = hunter_rank_field:get_data(player_info);
-			if player_hunter_rank == nil then
-				goto continue
-			end
-
-			if player_id == player.myself_id and config.current_config.damage_meter_UI.settings.my_damage_bar_location ~= "Normal" then
-				player.list[player.myself_id].hunter_rank = player_hunter_rank;
-				goto continue
-			end
-
-			local player_name = name_field:get_data(player_info);
-			if player_name == nil then
-				goto continue
-			end
-
-			if player.list[player_id] == nil then
-				player.list[player_id] = player.new(player_id, player_name, player_hunter_rank);
-			elseif player.list[player_id].name ~= player_name then
-				player.list[player_id] = player.new(player_id, player_name, player_hunter_rank);
-			end
-
-			table.insert(quest_players, player.list[player_id]);
-
-			::continue::
-		end
-
-		-- sort here
-		if config.current_config.damage_meter_UI.sorting.type == "Normal" and config.current_config.damage_meter_UI.sorting.reversed_order then
-
-			local reversed_quest_players = {};
-			for i = #quest_players, 1, -1 do
-				table.insert(reversed_quest_players, quest_players[i]);
-			end
-			quest_players = reversed_quest_players;
-		elseif config.current_config.damage_meter_UI.sorting.type == "DPS" then
-			if config.current_config.damage_meter_UI.sorting.reversed_order then
-				table.sort(quest_players, function(left, right)
-					return left.dps < right.dps;
-				end);
+	if not damage_meter_UI.freeze_displayed_players then
+		if #quest_players ~= 0 then
+			-- sort here
+			if config.current_config.damage_meter_UI.sorting.type == "Normal" and config.current_config.damage_meter_UI.sorting.reversed_order then
+	
+				local reversed_quest_players = {};
+				for i = #quest_players, 1, -1 do
+					table.insert(reversed_quest_players, quest_players[i]);
+				end
+				quest_players = reversed_quest_players;
+			elseif config.current_config.damage_meter_UI.sorting.type == "DPS" then
+				if config.current_config.damage_meter_UI.sorting.reversed_order then
+					table.sort(quest_players, function(left, right)
+						return left.dps < right.dps;
+					end);
+				else
+					table.sort(quest_players, function(left, right)
+						return left.dps > right.dps;
+					end);
+				end
 			else
-				table.sort(quest_players, function(left, right)
-					return left.dps > right.dps;
-				end);
-			end
-		else
-			if config.current_config.damage_meter_UI.sorting.reversed_order then
-				table.sort(quest_players, function(left, right)
-					return left.display.total_damage < right.display.total_damage;
-				end);
-			else
-				table.sort(quest_players, function(left, right)
-					return left.display.total_damage > right.display.total_damage;
-				end);
+				if config.current_config.damage_meter_UI.sorting.reversed_order then
+					table.sort(quest_players, function(left, right)
+						return left.display.total_damage < right.display.total_damage;
+					end);
+				else
+					table.sort(quest_players, function(left, right)
+						return left.display.total_damage > right.display.total_damage;
+					end);
+				end
 			end
 		end
-		
+
 		if config.current_config.damage_meter_UI.settings.my_damage_bar_location == "First" then
-			table.insert(quest_players, 1, player.list[player.myself_id]);
+			table.insert(quest_players, 1, player.myself);
 		elseif config.current_config.damage_meter_UI.settings.my_damage_bar_location == "Last" then
-			table.insert(quest_players, #quest_players + 1, player.list[player.myself_id]);
-		elseif #quest_players == 0 then
-			table.insert(quest_players, 1, player.list[player.myself_id]);
+			table.insert(quest_players, #quest_players + 1, player.myself);
+		elseif #player.list == 0 then
+			table.insert(quest_players, player.myself);
 		end
-
 		damage_meter_UI.last_displayed_players = quest_players;
 	end
-
+	
 	local top_damage = 0;
 	local top_dps = 0;
 	for _, _player in ipairs(quest_players) do
@@ -193,7 +135,7 @@ function damage_meter_UI.draw()
 			top_dps = _player.dps;
 		end
 	end
-
+	
 	-- draw
 	local position_on_screen = screen.calculate_absolute_coordinates(config.current_config.damage_meter_UI.position);
 	for _, _player in ipairs(quest_players) do
@@ -205,9 +147,9 @@ function damage_meter_UI.draw()
 		player.draw(_player, position_on_screen, 1, top_damage, top_dps);
 
 		if config.current_config.damage_meter_UI.settings.orientation == "Horizontal" then
-			position_on_screen.x = position_on_screen.x + config.current_config.damage_meter_UI.spacing.x;
+			position_on_screen.x = position_on_screen.x + config.current_config.damage_meter_UI.spacing.x * config.current_config.global_settings.modifiers.global_scale_modifier;
 		else
-			position_on_screen.y = position_on_screen.y + config.current_config.damage_meter_UI.spacing.y;
+			position_on_screen.y = position_on_screen.y + config.current_config.damage_meter_UI.spacing.y * config.current_config.global_settings.modifiers.global_scale_modifier;
 		end
 
 		::continue1::
@@ -223,9 +165,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, 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);
-	drawing.draw_label(config.current_config.damage_meter_UI.total_dps_label, position_on_screen, 1, player.total.dps);
+	player.draw_total(position_on_screen, 1);
 end
 
 function damage_meter_UI.init_module()

reframework/autorun/MHR_Overlay/UI/Modules/large_monster_UI.lua

@@ -23,6 +23,7 @@ function large_monster_UI.draw(dynamic_enabled, static_enabled, highlighted_enab
 	local displayed_monsters = {};
 
 	local highlighted_id = -1;
+	local monster_id_shift = 0;
 	local highlighted_monster = nil;
 
 	if singletons.gui_manager ~= nil then
@@ -36,7 +37,6 @@ function large_monster_UI.draw(dynamic_enabled, static_enabled, highlighted_enab
 		end
 	end
 
-
 	local enemy_count = get_boss_enemy_count_method:call(singletons.enemy_manager);
 	if enemy_count == nil then
 		return;
@@ -55,7 +55,9 @@ function large_monster_UI.draw(dynamic_enabled, static_enabled, highlighted_enab
 			goto continue;
 		end
 
-		if i == highlighted_id then
+		if monster.dead_or_captured then
+			monster_id_shift = monster_id_shift + 1;
+		elseif i == highlighted_id + monster_id_shift then
 			highlighted_monster = monster;
 		end
 
@@ -114,8 +116,8 @@ function large_monster_UI.draw_dynamic(displayed_monsters, highlighted_monster)
 				goto continue;
 			end
 			
-			position_on_screen.x = position_on_screen.x + config.current_config.large_monster_UI.dynamic.viewport_offset.x;
-			position_on_screen.y = position_on_screen.y + config.current_config.large_monster_UI.dynamic.viewport_offset.y;
+			position_on_screen.x = position_on_screen.x + config.current_config.large_monster_UI.dynamic.viewport_offset.x * config.current_config.global_settings.modifiers.global_scale_modifier;
+			position_on_screen.y = position_on_screen.y + config.current_config.large_monster_UI.dynamic.viewport_offset.y * config.current_config.global_settings.modifiers.global_scale_modifier;
 	
 			local opacity_scale = 1;
 			if monster.distance > config.current_config.large_monster_UI.dynamic.settings.max_distance then
@@ -199,9 +201,9 @@ function large_monster_UI.draw_static(displayed_monsters, highlighted_monster)
 		}
 		
 		if config.current_config.large_monster_UI.static.settings.orientation == "Horizontal" then
-			monster_position_on_screen.x = monster_position_on_screen.x + config.current_config.large_monster_UI.static.spacing.x * i;
+			monster_position_on_screen.x = monster_position_on_screen.x + config.current_config.large_monster_UI.static.spacing.x * i * config.current_config.global_settings.modifiers.global_scale_modifier;
 		else
-			monster_position_on_screen.y = monster_position_on_screen.y + config.current_config.large_monster_UI.static.spacing.y * i;
+			monster_position_on_screen.y = monster_position_on_screen.y + config.current_config.large_monster_UI.static.spacing.y * i  * config.current_config.global_settings.modifiers.global_scale_modifier;
 		end
 
 		large_monster.draw_static(monster, monster_position_on_screen, 1);

reframework/autorun/MHR_Overlay/UI/Modules/time_UI.lua

@@ -3,6 +3,9 @@ local time;
 local screen;
 local config;
 local drawing;
+local table_helpers;
+
+time_UI.label = nil;
 
 function time_UI.draw()
 	local elapsed_minutes = time.elapsed_minutes;
@@ -14,7 +17,14 @@ function time_UI.draw()
 
 	local position_on_screen = screen.calculate_absolute_coordinates(config.current_config.time_UI.position);
 	
-	drawing.draw_label(config.current_config.time_UI.time_label, position_on_screen, 1, elapsed_minutes, elapsed_seconds);
+	drawing.draw_label(time_UI.label , position_on_screen, 1, elapsed_minutes, elapsed_seconds);
+end
+
+function time_UI.init_UI()
+	time_UI.label = table_helpers.deep_copy(config.current_config.time_UI.time_label);
+
+	time_UI.label.offset.x = time_UI.label.offset.x * config.current_config.global_settings.modifiers.global_scale_modifier;
+	time_UI.label.offset.y = time_UI.label.offset.y * config.current_config.global_settings.modifiers.global_scale_modifier;
 end
 
 function time_UI.init_module()
@@ -22,6 +32,9 @@ function time_UI.init_module()
 	screen = require("MHR_Overlay.Game_Handler.screen");
 	config = require("MHR_Overlay.Misc.config");
 	drawing = require("MHR_Overlay.UI.drawing");
+	table_helpers = require("MHR_Overlay.Misc.table_helpers");
+
+	time_UI.init_UI()
 end
 
 return time_UI;