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

Remove magical numbers of stealth monster ids + process toadversary properly + Fix Crown Threshold Typo

Browse Source
This commit is contained in:
GreenComfyTea
2023-08-06 14:25:22 +03:00
parent 9e8c77f480
commit e389f6cf53
2 changed files with 103 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

191
reframework/autorun/MHR_Overlay/Monsters/large_monster.lua
View File

@@ -20,6 +20,7 @@ local time;
local body_part; local body_part;
local part_names; local part_names;
local error_handler; local error_handler;
local quest_status;
local sdk = sdk; local sdk = sdk;
local tostring = tostring; local tostring = tostring;
@@ -54,7 +55,14 @@ local ValueType = ValueType;
local package = package; local package = package;
this.list = {}; this.list = {};
this.higlighted_id = -1; this.highlighted_id = -1;
this.monster_ids = {
chameleos = 25,
toadversary = 131,
lucent_nargacuga = 549,
risen_chameleos = 2073
}
function this.new(enemy) function this.new(enemy)
local monster = {}; local monster = {};
@@ -65,10 +73,11 @@ function this.new(enemy)
monster.id = 0; monster.id = 0;
monster.unique_id = 0; monster.unique_id = 0;
monster.health = 0; monster.health = 100000;
monster.max_health = 999999; monster.max_health = 100000;
monster.health_percentage = 0; monster.health_percentage = 0;
monster.missing_health = 0; monster.missing_health = 0;
monster.is_health_initialized = false;
monster.is_capturable = true; monster.is_capturable = true;
monster.capture_health = 0; monster.capture_health = 0;
@@ -111,17 +120,16 @@ function this.new(enemy)
monster.distance = 0; monster.distance = 0;
monster.name = "Large Monster"; monster.name = "Large Monster";
monster.size = 1; monster.size = -1;
monster.small_border = 0; monster.small_border = -1;
monster.big_border = 5; monster.big_border = -1;
monster.king_border = 10; monster.king_border = -1;
monster.crown = ""; monster.crown = "";
monster.is_anomaly = false; monster.is_anomaly = false;
monster.parts = {}; monster.parts = {};
monster.ailments = ailments.init_ailments(); monster.ailments = ailments.init_ailments();
monster.rider_id = -1; monster.rider_id = -1;
monster.dynamic_UI = {}; monster.dynamic_UI = {};
@@ -134,17 +142,12 @@ function this.new(enemy)
this.init_UI(monster, monster.highlighted_UI, config.current_config.large_monster_UI.highlighted); this.init_UI(monster, monster.highlighted_UI, config.current_config.large_monster_UI.highlighted);
this.update_position(enemy, monster); this.update_position(enemy, monster);
local physical_param = this.update_health(enemy, monster);
this.update_stamina(enemy, monster, nil); this.update_stamina(enemy, monster, nil);
this.update_stamina_timer(enemy, monster, nil); this.update_stamina_timer(enemy, monster, nil);
this.update_rage(enemy, monster, nil); this.update_rage(enemy, monster, nil);
this.update_rage_timer(enemy, monster, nil); this.update_rage_timer(enemy, monster, nil);
this.update(enemy, monster); this.update(enemy, monster);
pcall(this.update_parts, enemy, monster, physical_param);
pcall(this.update_anomaly_parts, enemy, monster, nil); pcall(this.update_anomaly_parts, enemy, monster, nil);
if this.list[enemy] == nil then if this.list[enemy] == nil then
@@ -159,6 +162,7 @@ function this.get_monster(enemy)
if monster == nil then if monster == nil then
monster = this.new(enemy); monster = this.new(enemy);
end end
return monster; return monster;
end end
@@ -266,78 +270,80 @@ local tg_camera_type_def = get_tg_camera_method:get_return_type();
local get_targeting_enemy_index_field = tg_camera_type_def:get_field("OldTargetingEmIndex"); local get_targeting_enemy_index_field = tg_camera_type_def:get_field("OldTargetingEmIndex");
function this.init(monster, enemy) function this.init(monster, enemy)
local enemy_type = enemy_type_field:get_data(enemy); local monster_id = enemy_type_field:get_data(enemy);
if enemy_type == nil then if monster_id == nil then
error_handler.report("large_monster.init", "Failed to Access Data: enemy_type"); error_handler.report("large_monster.init", "Failed to Access Data: enemy_type");
return; return;
end end
monster.id = enemy_type; monster.id = monster_id;
if monster.id == 549 or monster.id == 25 or monster.id == 2073 then if monster_id == this.monster_ids.lucent_nargacuga or monster_id == this.monster_ids.chameleos or monster_id == this.monster_ids.risen_chameleos then
monster.can_go_stealth = true; monster.can_go_stealth = true;
end end
local enemy_name = get_enemy_name_message_method:call(singletons.message_manager, enemy_type); local enemy_name = get_enemy_name_message_method:call(singletons.message_manager, monster_id);
if enemy_name ~= nil then if enemy_name ~= nil then
monster.name = enemy_name; monster.name = enemy_name;
else else
error_handler.report("large_monster.init", "Failed to Access Data: enemy_name"); error_handler.report("large_monster.init", "Failed to Access Data: enemy_name");
end end
local set_info = get_set_info_method:call(enemy); if monster_id ~= this.monster_ids.toadversary then
if set_info ~= nil then local set_info = get_set_info_method:call(enemy);
local unique_id = get_unique_id_method:call(set_info); if set_info ~= nil then
if unique_id ~= nil then local unique_id = get_unique_id_method:call(set_info);
monster.unique_id = unique_id; if unique_id ~= nil then
monster.unique_id = unique_id;
else
error_handler.report("large_monster.init", "Failed to Access Data: unique_id");
end
else else
error_handler.report("large_monster.init", "Failed to Access Data: unique_id"); error_handler.report("large_monster.init", "Failed to Access Data: set_info");
end end
else
error_handler.report("large_monster.init", "Failed to Access Data: set_info");
end
local size_info = find_enemy_size_info_method:call(singletons.enemy_manager, enemy_type); local size_info = find_enemy_size_info_method:call(singletons.enemy_manager, monster_id);
if size_info ~= nil then if size_info ~= nil then
local small_border = get_small_border_method:call(size_info); local small_border = get_small_border_method:call(size_info);
local big_border = get_big_border_method:call(size_info); local big_border = get_big_border_method:call(size_info);
local king_border = get_king_border_method:call(size_info); local king_border = get_king_border_method:call(size_info);
local size = get_monster_list_register_scale_method:call(enemy); local size = get_monster_list_register_scale_method:call(enemy);
if small_border ~= nil then if small_border ~= nil then
monster.small_border = small_border; monster.small_border = small_border;
else
error_handler.report("large_monster.init", "Failed to Access Data: small_border");
end
if big_border ~= nil then
monster.big_border = big_border;
else
error_handler.report("large_monster.init", "Failed to Access Data: big_border");
end
if king_border ~= nil then
monster.king_border = king_border;
else
error_handler.report("large_monster.init", "Failed to Access Data: king_border");
end
if size ~= nil then
monster.size = size;
else
error_handler.report("large_monster.init", "Failed to Access Data: size");
end
if monster.size <= monster.small_border then
monster.crown = language.current_language.UI.mini;
elseif monster.size >= monster.king_border then
monster.crown = language.current_language.UI.gold;
elseif monster.size >= monster.big_border then
monster.crown = language.current_language.UI.silver;
end
else else
error_handler.report("large_monster.init", "Failed to Access Data: small_border"); error_handler.report("large_monster.init", "Failed to Access Data: size_info");
end end
if big_border ~= nil then
monster.big_border = big_border;
else
error_handler.report("large_monster.init", "Failed to Access Data: big_border");
end
if king_border ~= nil then
monster.king_border = king_border;
else
error_handler.report("large_monster.init", "Failed to Access Data: king_border");
end
if size ~= nil then
monster.size = size;
else
error_handler.report("large_monster.init", "Failed to Access Data: size");
end
if monster.size <= monster.small_border then
monster.crown = language.current_language.UI.mini;
elseif monster.size >= monster.king_border then
monster.crown = language.current_language.UI.gold;
elseif monster.size >= monster.big_border then
monster.crown = language.current_language.UI.silver;
end
else
error_handler.report("large_monster.init", "Failed to Access Data: size_info");
end end
local is_capture_enable = true; local is_capture_enable = true;
@@ -360,9 +366,7 @@ function this.init(monster, enemy)
error_handler.report("large_monster.init", "Failed to Access Data: damage_param"); error_handler.report("large_monster.init", "Failed to Access Data: damage_param");
end end
--local curia_param = enemy:get_field("<CuriaParam>k__BackingField");
local mystery_param = get_mystery_param_method:call(enemy); local mystery_param = get_mystery_param_method:call(enemy);
local is_anomaly = mystery_param ~= nil; local is_anomaly = mystery_param ~= nil;
monster.is_anomaly = is_anomaly; monster.is_anomaly = is_anomaly;
@@ -526,13 +530,13 @@ function this.update(enemy, monster)
error_handler.report("large_monster.update", "Failed to Access Data: is_disp_icon_mini_map"); error_handler.report("large_monster.update", "Failed to Access Data: is_disp_icon_mini_map");
end end
if monster.id == 549 or monster.id == 25 or monster.id == 2073 then if monster.id == this.monster_ids.lucent_nargacuga or monster.id == this.monster_ids.chameleos or monster.id == this.monster_ids.risen_chameleos then
monster.can_go_stealth = true; monster.can_go_stealth = true;
end end
if monster.can_go_stealth then if monster.can_go_stealth then
-- Lucent Nargacuga -- Lucent Nargacuga
if monster.id == 549 then if monster.id == this.monster_ids.lucent_nargacuga then
local is_stealth = is_stealth_method:call(enemy); local is_stealth = is_stealth_method:call(enemy);
if is_stealth == nil then if is_stealth == nil then
monster.is_stealth = is_stealth; monster.is_stealth = is_stealth;
@@ -541,7 +545,7 @@ function this.update(enemy, monster)
end end
-- Chameleos and Risen Chameleos -- Chameleos and Risen Chameleos
elseif monster.id == 25 or monster.id == 2073 then elseif monster.id == this.monster_ids.chameleos or monster.id == this.monster_ids.risen_chameleos then
local stealth_controller = get_stealth_ctrl_method:call(enemy); local stealth_controller = get_stealth_ctrl_method:call(enemy);
if stealth_controller ~= nil then if stealth_controller ~= nil then
local status = get_current_status_method:call(stealth_controller); local status = get_current_status_method:call(stealth_controller);
@@ -1135,33 +1139,31 @@ function this.update_anomaly_parts(enemy, monster, mystery_param)
end end
end end
function this.update_higlighted_id() function this.update_highlighted_id()
if quest_status.flow_state <= quest_status.flow_states.IN_LOBBY
or quest_status.flow_state == quest_status.flow_states.LOADING_QUEST
or quest_status.flow_state >= quest_status.flow_states.QUEST_END_ANIMATION then
return;
end
if singletons.gui_manager == nil then if singletons.gui_manager == nil then
error_handler.report("large_monster.update_higlighted_id", "Failed to Access Data: gui_manager"); error_handler.report("large_monster.update_highlighted_id", "Failed to Access Data: gui_manager");
return; return;
end end
--xy = xy .. tostring(1.2) .. "\n";
--xy = xy .. tostring(get_tg_camera_method) .. "\n";
--xy = xy .. tostring(singletons.gui_manager) .. "\n";
local gui_hud_target_camera = get_tg_camera_method:call(singletons.gui_manager); local gui_hud_target_camera = get_tg_camera_method:call(singletons.gui_manager);
--xy = xy .. tostring(1.3) .. "\n";
if gui_hud_target_camera == nil then if gui_hud_target_camera == nil then
error_handler.report("large_monster.update_higlighted_id", "Failed to Access Data: gui_hud_target_camera"); error_handler.report("large_monster.update_highlighted_id", "Failed to Access Data: gui_hud_target_camera");
return; return;
end end
--xy = xy .. tostring(1.4) .. "\n";
local highlighted_id = get_targeting_enemy_index_field:get_data(gui_hud_target_camera); local highlighted_id = get_targeting_enemy_index_field:get_data(gui_hud_target_camera);
--xy = xy .. tostring(1.5) .. "\n";
if highlighted_id == nil then if highlighted_id == nil then
-- xy = xy .. tostring(1.6) .. "\n"; error_handler.report("large_monster_UI.update_highlighted_id", "Failed to Access Data: highlighted_id");
error_handler.report("large_monster_UI.update_higlighted_id", "Failed to Access Data: highlighted_id");
return; return;
end end
this.highlighted_id = highlighted_id; this.highlighted_id = highlighted_id;
--xy = xy .. tostring(1.8) .. "\n";
end end
function this.draw(monster, type, cached_config, position_on_screen, opacity_scale) function this.draw(monster, type, cached_config, position_on_screen, opacity_scale)
@@ -1183,20 +1185,29 @@ function this.draw(monster, type, cached_config, position_on_screen, opacity_sca
end end
if cached_config.monster_name_label.include.monster_id then if cached_config.monster_name_label.include.monster_id then
monster_name_text = monster_name_text .. tostring(monster.id) .. " "; monster_name_text = string.format("%s%s ", monster_name_text, tostring(monster.id));
end end
if cached_config.monster_name_label.include.crown and monster.crown ~= "" then if cached_config.monster_name_label.include.crown and monster.crown ~= "" then
monster_name_text = monster_name_text .. string.format("%s ", monster.crown); monster_name_text = string.format("%s%s ", monster_name_text, monster.crown);
end end
if cached_config.monster_name_label.include.size then if cached_config.monster_name_label.include.size and monster.size ~= -1 then
monster_name_text = monster_name_text .. string.format("#%.0f ", 100 * monster.size); monster_name_text = string.format("%s#%.0f ", monster_name_text, 100 * monster.size);
end end
if cached_config.monster_name_label.include.crown_thresholds then
if monster.small_border ~= -1 then
monster_name_text = string.format("%s<=%.0f ", monster_name_text, 100 * monster.small_border);
end
if cached_config.monster_name_label.include.scrown_thresholds then if monster.big_border ~= -1 then
monster_name_text = monster_name_text .. string.format("<=%.0f >=%.0f >=%.0f", 100 * monster.small_border, monster_name_text = string.format("%s>=%.0f ", monster_name_text, 100 * monster.big_border);
100 * monster.big_border, 100 * monster.king_border); end
if monster.king_border ~= -1 then
monster_name_text = string.format("%s>=%.0f ", monster_name_text, 100 * monster.king_border);
end
end end
if monster.is_capturable and monster.health < monster.capture_health then if monster.is_capturable and monster.health < monster.capture_health then
@@ -1272,6 +1283,8 @@ function this.init_dependencies()
config = require("MHR_Overlay.Misc.config"); config = require("MHR_Overlay.Misc.config");
utils = require("MHR_Overlay.Misc.utils"); utils = require("MHR_Overlay.Misc.utils");
body_part = require("MHR_Overlay.Monsters.body_part"); body_part = require("MHR_Overlay.Monsters.body_part");
quest_status = require("MHR_Overlay.Game_Handler.quest_status");
health_UI_entity = require("MHR_Overlay.UI.UI_Entities.health_UI_entity"); health_UI_entity = require("MHR_Overlay.UI.UI_Entities.health_UI_entity");
stamina_UI_entity = require("MHR_Overlay.UI.UI_Entities.stamina_UI_entity"); stamina_UI_entity = require("MHR_Overlay.UI.UI_Entities.stamina_UI_entity");
rage_UI_entity = require("MHR_Overlay.UI.UI_Entities.rage_UI_entity"); rage_UI_entity = require("MHR_Overlay.UI.UI_Entities.rage_UI_entity");
@@ -1290,7 +1303,7 @@ function this.init_dependencies()
end end
function this.init_module() function this.init_module()
time.new_timer(this.update_higlighted_id, 1/30); time.new_timer(this.update_highlighted_id, 1/30);
end end
return this; return this;

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

@@ -115,7 +115,7 @@ function this.draw(dynamic_enabled, static_enabled, highlighted_enabled)
if monster.health > highlighted_monster.health then if monster.health > highlighted_monster.health then
highlighted_monster = monster; highlighted_monster = monster;
end end
elseif cached_config.highlighted.auto_highlight.mode == "Lowest Health Percentage" then elseif cached_config.highlighted.auto_highlight.mode == "Lowest Health Percentage" then
if monster.health_percentage < highlighted_monster.health_percentage then if monster.health_percentage < highlighted_monster.health_percentage then
highlighted_monster = monster; highlighted_monster = monster;
@@ -139,7 +139,6 @@ function this.draw(dynamic_enabled, static_enabled, highlighted_enabled)
highlighted_monster = monster; highlighted_monster = monster;
end end
end end
table.insert(displayed_monsters, monster); table.insert(displayed_monsters, monster);
::continue:: ::continue::
end end