Add Followers to Damage Meter UI

This commit is contained in:
GreenComfyTea
2022-11-26 13:24:12 +02:00
parent a0e6974ad7
commit d4c4267c35
19 changed files with 624 additions and 210 deletions

View File

@@ -6,6 +6,7 @@ local large_monster;
local ailments;
local table_helpers;
local singletons;
local non_players;
local enemy_character_base_type_def = sdk.find_type_definition("snow.enemy.EnemyCharacterBase");
local enemy_character_base_after_calc_damage_damage_side_method = enemy_character_base_type_def:get_method("afterCalcDamage_DamageSide");
@@ -87,14 +88,14 @@ function damage_hook.update_damage(enemy, enemy_calc_damage_info)
-- 4 is virtual player in singleplayer that "owns" 2nd otomo
if not quest_status.is_online and attacker_id == 4 then
attacker_id = player.myself.id;
--attacker_id = player.myself.id;
end
if is_marionette_attack then
large_monster.update_all_riders();
for enemy, monster in pairs(large_monster.list) do
if monster.unique_id == attacker_id then
attacker_id = monster.rider_id;
--attacker_id = monster.rider_id;
break
end
end
@@ -151,22 +152,25 @@ function damage_hook.update_damage(enemy, enemy_calc_damage_info)
-- 31 - EcSwampLeech
-- 32 - EcPenetrateFish
--xy = "\nPlayer: " .. tostring(attacker_id) ..
--" Damage: " .. tostring(damage_object.total_damage) ..
--" Type: (" .. tostring(attacker_type) ..
--") " ..
--" Condition Damage: " .. tostring(condition_damage) ..
--" Condition Type: (" .. tostring(attacker_type) ..
--") " .. tostring(condition_type);
local damage_source_type = damage_hook.get_damage_source_type(attacker_type, is_marionette_attack);
--if string.len(xy) > 2300 then
-- xy = "";
--end
local attacking_player = non_players.get_servant(attacker_id);
if attacking_player == nil then
attacking_player = player.get_player(attacker_id);
end
local damage_source_type = damage_hook.get_damage_source_type(attacker_type,
is_marionette_attack);
xy = xy .. "\nPlayer: " .. tostring(attacker_id) ..
" " .. tostring(attacking_player.name) ..
" Damage: " .. tostring(damage_object.total_damage) ..
" Type: (" .. tostring(attacker_type) ..
") " ..
" Condition Damage: " .. tostring(condition_damage) ..
" Condition Type: (" .. tostring(attacker_type) ..
") " .. tostring(condition_type);
local attacking_player = player.get_player(attacker_id);
if string.len(xy) > 2300 then
xy = "";
end
local monster;
if is_large_monster then
@@ -222,6 +226,7 @@ function damage_hook.init_module()
ailments = require("MHR_Overlay.Monsters.ailments");
table_helpers = require("MHR_Overlay.Misc.table_helpers");
singletons = require("MHR_Overlay.Game_Handler.singletons");
non_players = require("MHR_Overlay.Damage_Meter.non_players");
--sdk.hook(get_finish_shoot_wall_hit_damage_rate_method, function(args)
-- pcall(damage_hook.on_get_finish_shoot_wall_hit_damage_rate, sdk.to_managed_object(args[2]), sdk.to_float(args[3]), sdk.to_int64(args--[4]));

View File

@@ -0,0 +1,154 @@
local non_players = {};
local config;
local table_helpers;
local singletons;
local customization_menu;
local non_player_damage_UI_entity;
local time;
local quest_status;
local drawing;
local language;
local player;
non_players.servant_list = {};
non_players.otomo_list = {};
function non_players.new(id, name, is_otomo)
local non_player = {};
non_player.id = id;
non_player.name = name;
non_player.is_player = false;
non_player.is_otomo = is_otomo;
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.display = {};
non_player.display.total_damage = 0;
non_player.display.physical_damage = 0;
non_player.display.elemental_damage = 0;
non_player.display.ailment_damage = 0;
non_players.init_UI(non_player);
return non_player;
end
function non_players.get_servant(servant_id)
return non_players.servant_list[servant_id];
end
function non_players.get_otomo(otomo_id)
return non_players.otomo_list[otomo_id];
end
function non_players.init()
non_players.servant_list = {};
non_players.otomo_list = {};
end
local servant_manager_type_def = sdk.find_type_definition("snow.ai.ServantManager");
local get_quest_servant_id_list_method = servant_manager_type_def:get_method("getQuestServantIdList");
local get_ai_control_by_servant_id_method = servant_manager_type_def:get_method("getAIControlByServantID");
local list_type_def = get_quest_servant_id_list_method:get_return_type();
local get_count_method = list_type_def:get_method("get_Count");
local get_item_method = list_type_def:get_method("get_Item");
local ai_control_type_def = get_ai_control_by_servant_id_method:get_return_type();
local get_servant_info_method = ai_control_type_def:get_method("get_ServantInfo");
local servant_info_type_def = get_servant_info_method:get_return_type();
local get_servant_name_method = servant_info_type_def:get_method("get_ServantName");
local get_servant_player_index_method = servant_info_type_def:get_method("get_ServantPlayerIndex");
function non_players.update_servant_list()
if singletons.servant_manager == nil then
return;
end
local quest_servant_id_list = get_quest_servant_id_list_method:call(singletons.servant_manager);
if quest_servant_id_list == nil then
customization_menu.status = "No quest servant id list";
return;
end
local servant_count = get_count_method:call(quest_servant_id_list);
if servant_count == nil then
customization_menu.status = "No quest servant id list count";
return;
end
for i = 0, servant_count - 1 do
local servant_id = get_item_method:call(quest_servant_id_list, i);
if servant_id == nil then
goto continue;
end
local servant_name = "Follower";
local player_id = -1;
local ai_control = get_ai_control_by_servant_id_method:call(singletons.servant_manager, servant_id);
if ai_control ~= nil then
local servant_info = get_servant_info_method:call(ai_control);
if servant_info ~= nil then
local name = get_servant_name_method:call(servant_info);
if name ~= nil then
servant_name = name;
end
local id = get_servant_player_index_method:call(servant_info);
if id == nil then
goto continue;
end
player_id = id;
end
end
if non_players.servant_list[player_id] == nil then
local servant = non_players.new(player_id, servant_name, false);
non_players.servant_list[player_id] = servant;
end
::continue::
end
end
function non_players.init_UI(non_player)
local cached_config = config.current_config.damage_meter_UI;
non_player.damage_UI = non_player_damage_UI_entity.new(cached_config.damage_bar,
cached_config.highlighted_damage_bar, cached_config.player_name_label, cached_config.dps_label,
cached_config.damage_value_label, cached_config.damage_percentage_label);
end
function non_players.draw(non_player, position_on_screen, opacity_scale, top_damage, top_dps)
non_player_damage_UI_entity.draw(non_player, position_on_screen, opacity_scale, top_damage, top_dps);
end
function non_players.init_module()
config = require("MHR_Overlay.Misc.config");
table_helpers = require("MHR_Overlay.Misc.table_helpers");
singletons = require("MHR_Overlay.Game_Handler.singletons");
customization_menu = require("MHR_Overlay.UI.customization_menu");
non_player_damage_UI_entity = require("MHR_Overlay.UI.UI_Entities.non_player_damage_UI_entity");
time = require("MHR_Overlay.Game_Handler.time");
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");
non_players.init();
end
return non_players;

View File

@@ -3,7 +3,7 @@ local config;
local table_helpers;
local singletons;
local customization_menu;
local damage_UI_entity;
local player_damage_UI_entity;
local time;
local quest_status;
local drawing;
@@ -22,134 +22,17 @@ function player.new(id, guid, name, master_rank, hunter_rank)
new_player.hunter_rank = hunter_rank;
new_player.master_rank = master_rank;
new_player.is_player = true;
new_player.cart_count = 0;
new_player.join_time = -1;
new_player.first_hit_time = -1;
new_player.dps = 0;
new_player.small_monsters = {};
new_player.small_monsters.total_damage = 0;
new_player.small_monsters.physical_damage = 0;
new_player.small_monsters.elemental_damage = 0;
new_player.small_monsters.ailment_damage = 0;
new_player.small_monsters.bombs = {};
new_player.small_monsters.bombs.total_damage = 0;
new_player.small_monsters.bombs.physical_damage = 0;
new_player.small_monsters.bombs.elemental_damage = 0;
new_player.small_monsters.bombs.ailment_damage = 0;
new_player.small_monsters.kunai = {};
new_player.small_monsters.kunai.total_damage = 0;
new_player.small_monsters.kunai.physical_damage = 0;
new_player.small_monsters.kunai.elemental_damage = 0;
new_player.small_monsters.kunai.ailment_damage = 0;
new_player.small_monsters.installations = {};
new_player.small_monsters.installations.total_damage = 0;
new_player.small_monsters.installations.physical_damage = 0;
new_player.small_monsters.installations.elemental_damage = 0;
new_player.small_monsters.installations.ailment_damage = 0;
new_player.small_monsters.otomo = {};
new_player.small_monsters.otomo.total_damage = 0;
new_player.small_monsters.otomo.physical_damage = 0;
new_player.small_monsters.otomo.elemental_damage = 0;
new_player.small_monsters.otomo.ailment_damage = 0;
new_player.small_monsters.wyvern_riding = {};
new_player.small_monsters.wyvern_riding.total_damage = 0;
new_player.small_monsters.wyvern_riding.physical_damage = 0;
new_player.small_monsters.wyvern_riding.elemental_damage = 0;
new_player.small_monsters.wyvern_riding.ailment_damage = 0;
new_player.small_monsters.poison = {};
new_player.small_monsters.poison.total_damage = 0;
new_player.small_monsters.poison.physical_damage = 0;
new_player.small_monsters.poison.elemental_damage = 0;
new_player.small_monsters.poison.ailment_damage = 0;
new_player.small_monsters.blast = {};
new_player.small_monsters.blast.total_damage = 0;
new_player.small_monsters.blast.physical_damage = 0;
new_player.small_monsters.blast.elemental_damage = 0;
new_player.small_monsters.blast.ailment_damage = 0;
new_player.small_monsters.endemic_life = {};
new_player.small_monsters.endemic_life.total_damage = 0;
new_player.small_monsters.endemic_life.physical_damage = 0;
new_player.small_monsters.endemic_life.elemental_damage = 0;
new_player.small_monsters.endemic_life.ailment_damage = 0;
new_player.small_monsters.other = {};
new_player.small_monsters.other.total_damage = 0;
new_player.small_monsters.other.physical_damage = 0;
new_player.small_monsters.other.elemental_damage = 0;
new_player.small_monsters.other.ailment_damage = 0;
new_player.large_monsters = {};
new_player.large_monsters.total_damage = 0;
new_player.large_monsters.physical_damage = 0;
new_player.large_monsters.elemental_damage = 0;
new_player.large_monsters.ailment_damage = 0;
new_player.large_monsters.bombs = {};
new_player.large_monsters.bombs.total_damage = 0;
new_player.large_monsters.bombs.physical_damage = 0;
new_player.large_monsters.bombs.elemental_damage = 0;
new_player.large_monsters.bombs.ailment_damage = 0;
new_player.large_monsters.kunai = {};
new_player.large_monsters.kunai.total_damage = 0;
new_player.large_monsters.kunai.physical_damage = 0;
new_player.large_monsters.kunai.elemental_damage = 0;
new_player.large_monsters.kunai.ailment_damage = 0;
new_player.large_monsters.installations = {};
new_player.large_monsters.installations.total_damage = 0;
new_player.large_monsters.installations.physical_damage = 0;
new_player.large_monsters.installations.elemental_damage = 0;
new_player.large_monsters.installations.ailment_damage = 0;
new_player.large_monsters.otomo = {};
new_player.large_monsters.otomo.total_damage = 0;
new_player.large_monsters.otomo.physical_damage = 0;
new_player.large_monsters.otomo.elemental_damage = 0;
new_player.large_monsters.otomo.ailment_damage = 0;
new_player.large_monsters.wyvern_riding = {};
new_player.large_monsters.wyvern_riding.total_damage = 0;
new_player.large_monsters.wyvern_riding.physical_damage = 0;
new_player.large_monsters.wyvern_riding.elemental_damage = 0;
new_player.large_monsters.wyvern_riding.ailment_damage = 0;
new_player.large_monsters.poison = {};
new_player.large_monsters.poison.total_damage = 0;
new_player.large_monsters.poison.physical_damage = 0;
new_player.large_monsters.poison.elemental_damage = 0;
new_player.large_monsters.poison.ailment_damage = 0;
new_player.large_monsters.blast = {};
new_player.large_monsters.blast.total_damage = 0;
new_player.large_monsters.blast.physical_damage = 0;
new_player.large_monsters.blast.elemental_damage = 0;
new_player.large_monsters.blast.ailment_damage = 0;
new_player.large_monsters.endemic_life = {};
new_player.large_monsters.endemic_life.total_damage = 0;
new_player.large_monsters.endemic_life.physical_damage = 0;
new_player.large_monsters.endemic_life.elemental_damage = 0;
new_player.large_monsters.endemic_life.ailment_damage = 0;
new_player.large_monsters.other = {};
new_player.large_monsters.other.total_damage = 0;
new_player.large_monsters.other.physical_damage = 0;
new_player.large_monsters.other.elemental_damage = 0;
new_player.large_monsters.other.ailment_damage = 0;
new_player.small_monsters = player.init_damage_sources()
new_player.large_monsters = player.init_damage_sources();
new_player.display = {};
new_player.display.total_damage = 0;
new_player.display.physical_damage = 0;
@@ -165,6 +48,71 @@ function player.new(id, guid, name, master_rank, hunter_rank)
return new_player;
end
function player.init_damage_sources()
local monster_type = {};
monster_type.total_damage = 0;
monster_type.physical_damage = 0;
monster_type.elemental_damage = 0;
monster_type.ailment_damage = 0;
monster_type.bombs = {};
monster_type.bombs.total_damage = 0;
monster_type.bombs.physical_damage = 0;
monster_type.bombs.elemental_damage = 0;
monster_type.bombs.ailment_damage = 0;
monster_type.kunai = {};
monster_type.kunai.total_damage = 0;
monster_type.kunai.physical_damage = 0;
monster_type.kunai.elemental_damage = 0;
monster_type.kunai.ailment_damage = 0;
monster_type.installations = {};
monster_type.installations.total_damage = 0;
monster_type.installations.physical_damage = 0;
monster_type.installations.elemental_damage = 0;
monster_type.installations.ailment_damage = 0;
monster_type.otomo = {};
monster_type.otomo.total_damage = 0;
monster_type.otomo.physical_damage = 0;
monster_type.otomo.elemental_damage = 0;
monster_type.otomo.ailment_damage = 0;
monster_type.wyvern_riding = {};
monster_type.wyvern_riding.total_damage = 0;
monster_type.wyvern_riding.physical_damage = 0;
monster_type.wyvern_riding.elemental_damage = 0;
monster_type.wyvern_riding.ailment_damage = 0;
monster_type.poison = {};
monster_type.poison.total_damage = 0;
monster_type.poison.physical_damage = 0;
monster_type.poison.elemental_damage = 0;
monster_type.poison.ailment_damage = 0;
monster_type.blast = {};
monster_type.blast.total_damage = 0;
monster_type.blast.physical_damage = 0;
monster_type.blast.elemental_damage = 0;
monster_type.blast.ailment_damage = 0;
monster_type.endemic_life = {};
monster_type.endemic_life.total_damage = 0;
monster_type.endemic_life.physical_damage = 0;
monster_type.endemic_life.elemental_damage = 0;
monster_type.endemic_life.ailment_damage = 0;
monster_type.other = {};
monster_type.other.total_damage = 0;
monster_type.other.physical_damage = 0;
monster_type.other.elemental_damage = 0;
monster_type.other.ailment_damage = 0;
return monster_type;
end
function player.get_player(player_id)
return player.list[player_id];
end
@@ -499,7 +447,7 @@ end
function player.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,
_player.damage_UI = player_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
@@ -531,14 +479,17 @@ function player.init_total_UI(_player)
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);
player_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);
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 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);
end
end
function player.init_module()
@@ -546,7 +497,7 @@ function player.init_module()
table_helpers = require("MHR_Overlay.Misc.table_helpers");
singletons = require("MHR_Overlay.Game_Handler.singletons");
customization_menu = require("MHR_Overlay.UI.customization_menu");
damage_UI_entity = require("MHR_Overlay.UI.UI_Entities.damage_UI_entity");
player_damage_UI_entity = require("MHR_Overlay.UI.UI_Entities.player_damage_UI_entity");
time = require("MHR_Overlay.Game_Handler.time");
quest_status = require("MHR_Overlay.Game_Handler.quest_status");
drawing = require("MHR_Overlay.UI.drawing");