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

Compare commits

base: romanmir:v2.7.1
Branches Tags
romanmir:main
romanmir:v2.7.4 romanmir:v2.7.3 romanmir:v2.7.2 romanmir:v2.7.1 romanmir:v2.7 romanmir:v2.6.6 romanmir:v2.6.5 romanmir:v2.6.4 romanmir:v2.6.3 romanmir:v2.6.2 romanmir:v2.6.1 romanmir:v2.6 romanmir:v2.5 romanmir:v2.4.2
...
compare: romanmir:v2.7.2
Branches Tags
romanmir:main
romanmir:v2.7.4 romanmir:v2.7.3 romanmir:v2.7.2 romanmir:v2.7.1 romanmir:v2.7 romanmir:v2.6.6 romanmir:v2.6.5 romanmir:v2.6.4 romanmir:v2.6.3 romanmir:v2.6.2 romanmir:v2.6.1 romanmir:v2.6 romanmir:v2.5 romanmir:v2.4.2

5 Commits
v2.7.1 ... v2.7.2

Author SHA1 Message Date
GreenComfyTea
e0e7c9d824 Update README.md 2024-06-29 10:47:58 +03:00
GreenComfyTea
3bd627fdfb Update README.md 2024-06-29 10:47:36 +03:00
GreenComfyTea
beeb45db46 Bump version to v2.7.2 2024-06-29 10:39:08 +03:00
GreenComfyTea
a82168fc4e Micro optimizations 2024-06-29 10:38:51 +03:00
GreenComfyTea
d62a72a778 [Monster UI] Fix an issue when run away monsters UI was not disappearing 2024-06-29 10:38:29 +03:00
4 changed files with 110 additions and 78 deletions
Expand all files Collapse all files

4
README.md
View File

@@ -38,10 +38,10 @@
</a> </a>
<br> <br>
<a href="https://www.nexusmods.com/monsterhunterrise/mods/26"> <a href="https://www.nexusmods.com/monsterhunterrise/mods/26">
<img alt="REFramework Dependency" src="https://custom-icon-badges.demolab.com/badge/dependency-REFramework%20v1.605%2B-green?logo=package-dependencies" /> <img alt="REFramework Dependency" src="https://custom-icon-badges.demolab.com/badge/dependency-REFramework%20v1.5.6%2B-green?logo=package-dependencies" />
</a> </a>
<a href="https://www.nexusmods.com/monsterhunterrise/mods/134"> <a href="https://www.nexusmods.com/monsterhunterrise/mods/134">
<img alt="REFramework Direct2D Dependency" src="https://custom-icon-badges.demolab.com/badge/dependency-REFramework%20Direct2D%20v1.0.0%2B-yellow?logo=package-dependencies" /> <img alt="REFramework Direct2D Dependency" src="https://custom-icon-badges.demolab.com/badge/dependency-REFramework%20Direct2D%20v1.0.1%2B-green?logo=package-dependencies" />
</a> </a>
<br> <br>
<br> <br>

161
reframework/autorun/MHR_Overlay.lua
View File

@@ -271,14 +271,16 @@ log.info("[MHR Overlay] Loaded.");
-- #region -- #region
local function update_modules(module_visibility_config, flow_state_name) local function update_modules(module_visibility_config, flow_state_name)
if module_visibility_config.small_monster_UI and config.current_config.small_monster_UI.enabled then local current_config = config.current_config;
if module_visibility_config.small_monster_UI and current_config.small_monster_UI.enabled then
local success, error = pcall(small_monster_UI.update); local success, error = pcall(small_monster_UI.update);
if not success then if not success then
error_handler.report("MHR_Overlay.update_modules", string.format("[%s] Small Monster UI: %s", flow_state_name, tostring(error))); error_handler.report("MHR_Overlay.update_modules", string.format("[%s] Small Monster UI: %s", flow_state_name, tostring(error)));
end end
end end
local large_monster_UI_config = config.current_config.large_monster_UI; local large_monster_UI_config = current_config.large_monster_UI;
local dynamic_enabled = large_monster_UI_config.dynamic.enabled and module_visibility_config.large_monster_dynamic_UI; local dynamic_enabled = large_monster_UI_config.dynamic.enabled and module_visibility_config.large_monster_dynamic_UI;
local static_enabled = large_monster_UI_config.static.enabled and module_visibility_config.large_monster_static_UI; local static_enabled = large_monster_UI_config.static.enabled and module_visibility_config.large_monster_static_UI;
@@ -291,21 +293,21 @@ local function update_modules(module_visibility_config, flow_state_name)
end end
end end
if config.current_config.damage_meter_UI.enabled and module_visibility_config.damage_meter_UI then if current_config.damage_meter_UI.enabled and module_visibility_config.damage_meter_UI then
local success, error = pcall(damage_meter_UI.update); local success, error = pcall(damage_meter_UI.update);
if not success then if not success then
error_handler.report("MHR_Overlay.update_modules", string.format("[%s] Damage Meter UI: %s", flow_state_name, tostring(error))); error_handler.report("MHR_Overlay.update_modules", string.format("[%s] Damage Meter UI: %s", flow_state_name, tostring(error)));
end end
end end
if config.current_config.endemic_life_UI.enabled and module_visibility_config.endemic_life_UI then if current_config.endemic_life_UI.enabled and module_visibility_config.endemic_life_UI then
local success, error = pcall(env_creature_UI.update); local success, error = pcall(env_creature_UI.update);
if not success then if not success then
error_handler.report("MHR_Overlay.update_modules", string.format("[%s] Endemic Life UI: %s", flow_state_name, tostring(error))); error_handler.report("MHR_Overlay.update_modules", string.format("[%s] Endemic Life UI: %s", flow_state_name, tostring(error)));
end end
end end
if config.current_config.buff_UI.enabled and module_visibility_config.buff_UI then if current_config.buff_UI.enabled and module_visibility_config.buff_UI then
local success, error = pcall(buff_UI.update); local success, error = pcall(buff_UI.update);
if not success then if not success then
error_handler.report("MHR_Overlay.update_modules", string.format("[%s] Buff UI: %s", flow_state_name, tostring(error))); error_handler.report("MHR_Overlay.update_modules", string.format("[%s] Buff UI: %s", flow_state_name, tostring(error)));
@@ -314,14 +316,16 @@ local function update_modules(module_visibility_config, flow_state_name)
end end
local function draw_modules(module_visibility_config, flow_state_name) local function draw_modules(module_visibility_config, flow_state_name)
if module_visibility_config.small_monster_UI and config.current_config.small_monster_UI.enabled then local current_config = config.current_config;
if module_visibility_config.small_monster_UI and current_config.small_monster_UI.enabled then
local success, error = pcall(small_monster_UI.draw); local success, error = pcall(small_monster_UI.draw);
if not success then if not success then
error_handler.report("MHR_Overlay.draw_modules", string.format("[%s] Small Monster UI: %s", flow_state_name, tostring(error))); error_handler.report("MHR_Overlay.draw_modules", string.format("[%s] Small Monster UI: %s", flow_state_name, tostring(error)));
end end
end end
local large_monster_UI_config = config.current_config.large_monster_UI; local large_monster_UI_config = current_config.large_monster_UI;
local dynamic_enabled = large_monster_UI_config.dynamic.enabled and module_visibility_config.large_monster_dynamic_UI; local dynamic_enabled = large_monster_UI_config.dynamic.enabled and module_visibility_config.large_monster_dynamic_UI;
local static_enabled = large_monster_UI_config.static.enabled and module_visibility_config.large_monster_static_UI; local static_enabled = large_monster_UI_config.static.enabled and module_visibility_config.large_monster_static_UI;
@@ -334,35 +338,35 @@ local function draw_modules(module_visibility_config, flow_state_name)
end end
end end
if config.current_config.time_UI.enabled and module_visibility_config.time_UI then if current_config.time_UI.enabled and module_visibility_config.time_UI then
local success, error = pcall(time_UI.draw); local success, error = pcall(time_UI.draw);
if not success then if not success then
error_handler.report("MHR_Overlay.draw_modules", string.format("[%s] Time UI: %s", flow_state_name, tostring(error))); error_handler.report("MHR_Overlay.draw_modules", string.format("[%s] Time UI: %s", flow_state_name, tostring(error)));
end end
end end
if config.current_config.damage_meter_UI.enabled and module_visibility_config.damage_meter_UI then if current_config.damage_meter_UI.enabled and module_visibility_config.damage_meter_UI then
local success, error = pcall(damage_meter_UI.draw); local success, error = pcall(damage_meter_UI.draw);
if not success then if not success then
error_handler.report("MHR_Overlay.draw_modules", string.format("[%s] Damage Meter UI: %s", flow_state_name, tostring(error))); error_handler.report("MHR_Overlay.draw_modules", string.format("[%s] Damage Meter UI: %s", flow_state_name, tostring(error)));
end end
end end
if config.current_config.endemic_life_UI.enabled and module_visibility_config.endemic_life_UI then if current_config.endemic_life_UI.enabled and module_visibility_config.endemic_life_UI then
local success, error = pcall(env_creature_UI.draw); local success, error = pcall(env_creature_UI.draw);
if not success then if not success then
error_handler.report("MHR_Overlay.draw_modules", string.format("[%s] Endemic Life UI: %s", flow_state_name, tostring(error))); error_handler.report("MHR_Overlay.draw_modules", string.format("[%s] Endemic Life UI: %s", flow_state_name, tostring(error)));
end end
end end
if config.current_config.buff_UI.enabled and module_visibility_config.buff_UI then if current_config.buff_UI.enabled and module_visibility_config.buff_UI then
local success, error = pcall(buff_UI.draw); local success, error = pcall(buff_UI.draw);
if not success then if not success then
error_handler.report("MHR_Overlay.draw_modules", string.format("[%s] Buff UI: %s", flow_state_name, tostring(error))); error_handler.report("MHR_Overlay.draw_modules", string.format("[%s] Buff UI: %s", flow_state_name, tostring(error)));
end end
end end
if config.current_config.stats_UI.enabled and module_visibility_config.stats_UI then if current_config.stats_UI.enabled and module_visibility_config.stats_UI then
local success, error = pcall(stats_UI.draw); local success, error = pcall(stats_UI.draw);
if not success then if not success then
error_handler.report("MHR_Overlay.draw_modules", string.format("[%s] Stats UI: %s", flow_state_name, tostring(error))); error_handler.report("MHR_Overlay.draw_modules", string.format("[%s] Stats UI: %s", flow_state_name, tostring(error)));
@@ -371,14 +375,18 @@ local function draw_modules(module_visibility_config, flow_state_name)
end end
local function update_UI() local function update_UI()
if quest_status.flow_state == quest_status.flow_states.IN_TRAINING_AREA then local current_config = config.current_config;
local module_visibility_config = current_config.global_settings.module_visibility;
local flow_states = quest_status.flow_states;
local large_monster_UI_config = config.current_config.large_monster_UI; if quest_status.flow_state == flow_states.IN_TRAINING_AREA then
local module_visibility_config = config.current_config.global_settings.module_visibility.in_training_area;
local dynamic_enabled = large_monster_UI_config.dynamic.enabled and module_visibility_config.large_monster_dynamic_UI; local large_monster_UI_config = current_config.large_monster_UI;
local static_enabled = large_monster_UI_config.static.enabled and module_visibility_config.large_monster_static_UI; local module_visibility_in_training_area_config = module_visibility_config.in_training_area;
local highlighted_enabled = large_monster_UI_config.highlighted.enabled and module_visibility_config.large_monster_highlighted_UI;
local dynamic_enabled = large_monster_UI_config.dynamic.enabled and module_visibility_in_training_area_config.large_monster_dynamic_UI;
local static_enabled = large_monster_UI_config.static.enabled and module_visibility_in_training_area_config.large_monster_static_UI;
local highlighted_enabled = large_monster_UI_config.highlighted.enabled and module_visibility_in_training_area_config.large_monster_highlighted_UI;
if dynamic_enabled or static_enabled or highlighted_enabled then if dynamic_enabled or static_enabled or highlighted_enabled then
local success, error = pcall(large_monster_UI.update, dynamic_enabled, static_enabled, highlighted_enabled); local success, error = pcall(large_monster_UI.update, dynamic_enabled, static_enabled, highlighted_enabled);
@@ -387,69 +395,73 @@ local function update_UI()
end end
end end
if config.current_config.damage_meter_UI.enabled and module_visibility_config.damage_meter_UI then if current_config.damage_meter_UI.enabled and module_visibility_in_training_area_config.damage_meter_UI then
local success, error = pcall(damage_meter_UI.update); local success, error = pcall(damage_meter_UI.update);
if not success then if not success then
error_handler.report("MHR_Overlay.update_UI", string.format("[In Training Area] Damage Meter UI: %s", tostring(error))); error_handler.report("MHR_Overlay.update_UI", string.format("[In Training Area] Damage Meter UI: %s", tostring(error)));
end end
end end
if config.current_config.endemic_life_UI.enabled and module_visibility_config.endemic_life_UI then if current_config.endemic_life_UI.enabled and module_visibility_in_training_area_config.endemic_life_UI then
local success, error = pcall(env_creature_UI.update); local success, error = pcall(env_creature_UI.update);
if not success then if not success then
error_handler.report("MHR_Overlay.update_UI", string.format("[In Training Area] Endemic Life UI: %s", tostring(error))); error_handler.report("MHR_Overlay.update_UI", string.format("[In Training Area] Endemic Life UI: %s", tostring(error)));
end end
end end
if config.current_config.buff_UI.enabled and module_visibility_config.buff_UI then if current_config.buff_UI.enabled and module_visibility_in_training_area_config.buff_UI then
local success, error = pcall(buff_UI.update); local success, error = pcall(buff_UI.update);
if not success then if not success then
error_handler.report("MHR_Overlay.update_UI", string.format("[In Training Area] Buff UI: %s", tostring(error))); error_handler.report("MHR_Overlay.update_UI", string.format("[In Training Area] Buff UI: %s", tostring(error)));
end end
end end
elseif quest_status.flow_state == quest_status.flow_states.CUTSCENE then elseif quest_status.flow_state == flow_states.CUTSCENE then
update_modules(config.current_config.global_settings.module_visibility.cutscene, "Cutscene"); update_modules(module_visibility_config.cutscene, "Cutscene");
elseif quest_status.flow_state == quest_status.flow_states.LOADING_QUEST then elseif quest_status.flow_state == flow_states.LOADING_QUEST then
update_modules(config.current_config.global_settings.module_visibility.loading_quest, "Loading Quest"); update_modules(module_visibility_config.loading_quest, "Loading Quest");
elseif quest_status.flow_state == quest_status.flow_states.QUEST_START_ANIMATION then elseif quest_status.flow_state == flow_states.QUEST_START_ANIMATION then
update_modules(config.current_config.global_settings.module_visibility.quest_start_animation, "Quest Start Animation"); update_modules(module_visibility_config.quest_start_animation, "Quest Start Animation");
elseif quest_status.flow_state >= quest_status.flow_states.PLAYING_QUEST and quest_status.flow_state <= quest_status.flow_states.WYVERN_RIDING_START_ANIMATION then elseif quest_status.flow_state >= flow_states.PLAYING_QUEST and quest_status.flow_state <= flow_states.WYVERN_RIDING_START_ANIMATION then
update_modules(config.current_config.global_settings.module_visibility.playing_quest, "Playing Quest"); update_modules(module_visibility_config.playing_quest, "Playing Quest");
elseif quest_status.flow_state == quest_status.flow_states.KILLCAM then elseif quest_status.flow_state == flow_states.KILLCAM then
update_modules(config.current_config.global_settings.module_visibility.killcam, "Killcam"); update_modules(module_visibility_config.killcam, "Killcam");
elseif quest_status.flow_state == quest_status.flow_states.QUEST_END_TIMER then elseif quest_status.flow_state == flow_states.QUEST_END_TIMER then
update_modules(config.current_config.global_settings.module_visibility.quest_end_timer, "Quest End Timer"); update_modules(module_visibility_config.quest_end_timer, "Quest End Timer");
elseif quest_status.flow_state == quest_status.flow_states.QUEST_END_ANIMATION then elseif quest_status.flow_state == flow_states.QUEST_END_ANIMATION then
update_modules(config.current_config.global_settings.module_visibility.quest_end_animation, "Quest End Animation"); update_modules(module_visibility_config.quest_end_animation, "Quest End Animation");
elseif quest_status.flow_state == quest_status.flow_states.QUEST_END_SCREEN then elseif quest_status.flow_state == flow_states.QUEST_END_SCREEN then
update_modules(config.current_config.global_settings.module_visibility.quest_end_screen, "Quest End Screen"); update_modules(module_visibility_config.quest_end_screen, "Quest End Screen");
elseif quest_status.flow_state == quest_status.flow_states.REWARD_SCREEN then elseif quest_status.flow_state == flow_states.REWARD_SCREEN then
update_modules(config.current_config.global_settings.module_visibility.reward_screen, "Reward Screen"); update_modules(module_visibility_config.reward_screen, "Reward Screen");
elseif quest_status.flow_state == quest_status.flow_states.SUMMARY_SCREEN then elseif quest_status.flow_state == flow_states.SUMMARY_SCREEN then
update_modules(config.current_config.global_settings.module_visibility.summary_screen, "Summary Screen"); update_modules(module_visibility_config.summary_screen, "Summary Screen");
end end
end end
local function draw_loop() local function draw_loop()
if quest_status.flow_state == quest_status.flow_states.IN_LOBBY then local current_config = config.current_config;
local module_visibility_config = config.current_config.global_settings.module_visibility.in_lobby; local module_visibility_config = current_config.global_settings.module_visibility;
local flow_states = quest_status.flow_states;
if config.current_config.stats_UI.enabled and module_visibility_config.stats_UI then if quest_status.flow_state == flow_states.IN_LOBBY then
local module_visibility_in_lobby_config = module_visibility_config.in_lobby;
if current_config.stats_UI.enabled and module_visibility_in_lobby_config.stats_UI then
local success, error = pcall(stats_UI.draw); local success, error = pcall(stats_UI.draw);
if not success then if not success then
error_handler.report("MHR_Overlay.main_loop", string.format("[In Training Area] Stats UI: %s", tostring(error))); error_handler.report("MHR_Overlay.main_loop", string.format("[In Training Area] Stats UI: %s", tostring(error)));
end end
end end
elseif quest_status.flow_state == quest_status.flow_states.IN_TRAINING_AREA then elseif quest_status.flow_state == flow_states.IN_TRAINING_AREA then
local large_monster_UI_config = config.current_config.large_monster_UI; local large_monster_UI_config = current_config.large_monster_UI;
local module_visibility_config = config.current_config.global_settings.module_visibility.in_training_area; local module_visibility_in_training_area_config = module_visibility_config.in_training_area;
local dynamic_enabled = large_monster_UI_config.dynamic.enabled and module_visibility_config.large_monster_dynamic_UI; local dynamic_enabled = large_monster_UI_config.dynamic.enabled and module_visibility_in_training_area_config.large_monster_dynamic_UI;
local static_enabled = large_monster_UI_config.static.enabled and module_visibility_config.large_monster_static_UI; local static_enabled = large_monster_UI_config.static.enabled and module_visibility_in_training_area_config.large_monster_static_UI;
local highlighted_enabled = large_monster_UI_config.highlighted.enabled and module_visibility_config.large_monster_highlighted_UI; local highlighted_enabled = large_monster_UI_config.highlighted.enabled and module_visibility_in_training_area_config.large_monster_highlighted_UI;
if dynamic_enabled or static_enabled or highlighted_enabled then if dynamic_enabled or static_enabled or highlighted_enabled then
local success, error = pcall(large_monster_UI.draw, dynamic_enabled, static_enabled, highlighted_enabled); local success, error = pcall(large_monster_UI.draw, dynamic_enabled, static_enabled, highlighted_enabled);
@@ -458,55 +470,54 @@ local function draw_loop()
end end
end end
if config.current_config.damage_meter_UI.enabled and module_visibility_config.damage_meter_UI then if current_config.damage_meter_UI.enabled and module_visibility_in_training_area_config.damage_meter_UI then
local success, error = pcall(damage_meter_UI.draw); local success, error = pcall(damage_meter_UI.draw);
if not success then if not success then
error_handler.report("MHR_Overlay.main_loop", string.format("[In Training Area] Damage Meter UI: %s", tostring(error))); error_handler.report("MHR_Overlay.main_loop", string.format("[In Training Area] Damage Meter UI: %s", tostring(error)));
end end
end end
if config.current_config.endemic_life_UI.enabled and module_visibility_config.endemic_life_UI then if current_config.endemic_life_UI.enabled and module_visibility_in_training_area_config.endemic_life_UI then
local success, error = pcall(env_creature_UI.draw); local success, error = pcall(env_creature_UI.draw);
if not success then if not success then
error_handler.report("MHR_Overlay.main_loop", string.format("[In Training Area] Endemic Life UI: %s", tostring(error))); error_handler.report("MHR_Overlay.main_loop", string.format("[In Training Area] Endemic Life UI: %s", tostring(error)));
end end
end end
if config.current_config.buff_UI.enabled and module_visibility_config.buff_UI then if current_config.buff_UI.enabled and module_visibility_in_training_area_config.buff_UI then
local success, error = pcall(buff_UI.draw); local success, error = pcall(buff_UI.draw);
if not success then if not success then
error_handler.report("MHR_Overlay.main_loop", string.format("[In Training Area] Buff UI: %s", tostring(error))); error_handler.report("MHR_Overlay.main_loop", string.format("[In Training Area] Buff UI: %s", tostring(error)));
end end
end end
if config.current_config.stats_UI.enabled and module_visibility_config.stats_UI then if current_config.stats_UI.enabled and module_visibility_in_training_area_config.stats_UI then
local success, error = pcall(stats_UI.draw); local success, error = pcall(stats_UI.draw);
if not success then if not success then
error_handler.report("MHR_Overlay.main_loop", string.format("[In Training Area] Stats UI: %s", tostring(error))); error_handler.report("MHR_Overlay.main_loop", string.format("[In Training Area] Stats UI: %s", tostring(error)));
end end
end end
elseif quest_status.flow_state == flow_states.CUTSCENE then
elseif quest_status.flow_state == quest_status.flow_states.CUTSCENE then draw_modules(module_visibility_config.cutscene, "Cutscene");
draw_modules(config.current_config.global_settings.module_visibility.cutscene, "Cutscene"); elseif quest_status.flow_state == flow_states.LOADING_QUEST then
elseif quest_status.flow_state == quest_status.flow_states.LOADING_QUEST then draw_modules(module_visibility_config.loading_quest, "Loading Quest");
draw_modules(config.current_config.global_settings.module_visibility.loading_quest, "Loading Quest"); elseif quest_status.flow_state == flow_states.QUEST_START_ANIMATION then
elseif quest_status.flow_state == quest_status.flow_states.QUEST_START_ANIMATION then draw_modules(module_visibility_config.quest_start_animation, "Quest Start Animation");
draw_modules(config.current_config.global_settings.module_visibility.quest_start_animation, "Quest Start Animation"); elseif quest_status.flow_state >= flow_states.PLAYING_QUEST and quest_status.flow_state <= flow_states.WYVERN_RIDING_START_ANIMATION then
elseif quest_status.flow_state >= quest_status.flow_states.PLAYING_QUEST and quest_status.flow_state <= quest_status.flow_states.WYVERN_RIDING_START_ANIMATION then draw_modules(module_visibility_config.playing_quest, "Playing Quest");
draw_modules(config.current_config.global_settings.module_visibility.playing_quest, "Playing Quest"); elseif quest_status.flow_state == flow_states.KILLCAM then
elseif quest_status.flow_state == quest_status.flow_states.KILLCAM then draw_modules(module_visibility_config.killcam, "Killcam");
draw_modules(config.current_config.global_settings.module_visibility.killcam, "Killcam"); elseif quest_status.flow_state == flow_states.QUEST_END_TIMER then
elseif quest_status.flow_state == quest_status.flow_states.QUEST_END_TIMER then draw_modules(module_visibility_config.quest_end_timer, "Quest End Timer");
draw_modules(config.current_config.global_settings.module_visibility.quest_end_timer, "Quest End Timer"); elseif quest_status.flow_state == flow_states.QUEST_END_ANIMATION then
elseif quest_status.flow_state == quest_status.flow_states.QUEST_END_ANIMATION then draw_modules(module_visibility_config.quest_end_animation, "Quest End Animation");
draw_modules(config.current_config.global_settings.module_visibility.quest_end_animation, "Quest End Animation"); elseif quest_status.flow_state == flow_states.QUEST_END_SCREEN then
elseif quest_status.flow_state == quest_status.flow_states.QUEST_END_SCREEN then draw_modules(module_visibility_config.quest_end_screen, "Quest End Screen");
draw_modules(config.current_config.global_settings.module_visibility.quest_end_screen, "Quest End Screen"); elseif quest_status.flow_state == flow_states.REWARD_SCREEN then
elseif quest_status.flow_state == quest_status.flow_states.REWARD_SCREEN then draw_modules(module_visibility_config.reward_screen, "Reward Screen");
draw_modules(config.current_config.global_settings.module_visibility.reward_screen, "Reward Screen"); elseif quest_status.flow_state == flow_states.SUMMARY_SCREEN then
elseif quest_status.flow_state == quest_status.flow_states.SUMMARY_SCREEN then draw_modules(module_visibility_config.summary_screen, "Summary Screen");
draw_modules(config.current_config.global_settings.module_visibility.summary_screen, "Summary Screen");
end end
end end

2
reframework/autorun/MHR_Overlay/Misc/config.lua
View File

@@ -36,7 +36,7 @@ local os = os;
local ValueType = ValueType; local ValueType = ValueType;
local package = package; local package = package;
this.version = "2.7.1"; this.version = "2.7.2";
this.config_folder = "MHR Overlay\\configs\\"; this.config_folder = "MHR Overlay\\configs\\";
this.current_config_value_file_name = "MHR Overlay\\config.json"; this.current_config_value_file_name = "MHR Overlay\\config.json";

21
reframework/autorun/MHR_Overlay/Monsters/monster_hook.lua
View File

@@ -44,6 +44,7 @@ local enemy_character_base_type_def = sdk.find_type_definition("snow.enemy.Enemy
local enemy_character_base_update_method = enemy_character_base_type_def:get_method("update"); local enemy_character_base_update_method = enemy_character_base_type_def:get_method("update");
local is_boss_enemy_method = enemy_character_base_type_def:get_method("get_isBossEnemy"); local is_boss_enemy_method = enemy_character_base_type_def:get_method("get_isBossEnemy");
local on_destroy_method = enemy_character_base_type_def:get_method("onDestroy");
local enemy_damage_check_type_def = sdk.find_type_definition("snow.enemy.EnemyDamageCheck"); local enemy_damage_check_type_def = sdk.find_type_definition("snow.enemy.EnemyDamageCheck");
local damage_check_update_param_update_method = enemy_damage_check_type_def:get_method("updateParam"); local damage_check_update_param_update_method = enemy_damage_check_type_def:get_method("updateParam");
@@ -261,6 +262,20 @@ function this.update_rage_timer(anger_param, enemy)
large_monster.update_rage_timer(enemy, monster, anger_param); large_monster.update_rage_timer(enemy, monster, anger_param);
end end
function this.on_destroy(enemy)
local is_large = is_boss_enemy_method:call(enemy);
if is_large == nil then
error_handler.report("monster_hook.on_destroy", "Failed to Access Data: is_large");
return;
end
if is_large then
large_monster.list[enemy] = nil;
else
small_monster.list[enemy] = nil;
end
end
function this.init_dependencies() function this.init_dependencies()
small_monster = require("MHR_Overlay.Monsters.small_monster"); small_monster = require("MHR_Overlay.Monsters.small_monster");
large_monster = require("MHR_Overlay.Monsters.large_monster"); large_monster = require("MHR_Overlay.Monsters.large_monster");
@@ -296,6 +311,12 @@ function this.init_module()
end, function(retval) end, function(retval)
return retval; return retval;
end); end);
sdk.hook(on_destroy_method, function(args)
pcall(this.on_destroy, sdk.to_managed_object(args[2]));
end, function(retval)
return retval;
end);
end end
return this; return this;