romanmir/MHR-Overlay
1
0
Fork 0
mirror of https://github.com/GreenComfyTea/MHR-Overlay.git synced 2026-01-24 12:28:03 -08:00
Code Issues Packages Projects Releases Wiki Activity

Pull Most Buff Name from the Game

Browse Source 
+ Solve Consumable Buff Timer Collisions
This commit is contained in:
GreenComfyTea
2023-09-03 13:36:03 +03:00
parent bf282ca13b
commit 8ae3928fdc
21 changed files with 1082 additions and 948 deletions
Download Patch File Download Diff File Expand all files Collapse all files

159
reframework/autorun/MHR_Overlay/Buffs/consumables.lua
View File

@@ -8,6 +8,7 @@ local players;
local utils;
local language;
local error_handler;
local endemic_life_buffs;
local sdk = sdk;
local tostring = tostring;
@@ -55,6 +56,20 @@ this.list = {
gourmet_fish = nil,
};
local consumable_ids = {
demondrug = 68157917,
mega_demondrug = 68157918,
armorskin = 68157922,
mega_armorskin = 68157923,
might_seed = 68157919,
adamant_seed = 68157924,
demon_powder = 68157920,
hardshell_powder = 68157925,
immunizer = 68157911,
dash_juice = 68157913,
gourmet_fish = 68157909
}
local consumables_type_name = "consumables";
local player_manager_type_def = sdk.find_type_definition("snow.player.PlayerManager");
@@ -65,10 +80,13 @@ local player_user_data_item_parameter_type_def = get_ref_item_parameter_method:g
local demondrug_atk_up_field = player_user_data_item_parameter_type_def:get_field("_DemondrugAtkUp");
local great_demondrug_atk_up_field = player_user_data_item_parameter_type_def:get_field("_GreatDemondrugAtkUp");
local armorskin_def_up_field = player_user_data_item_parameter_type_def:get_field("_ArmorSkinDefUp");
local great_armorskin_def_up_field = player_user_data_item_parameter_type_def:get_field("_GreatArmorSkinDefUp");
local might_seed_atk_up_field = player_user_data_item_parameter_type_def:get_field("_MightSeedAtkUp");
local might_seed_timer_field = player_user_data_item_parameter_type_def:get_field("_MightSeedTimer");
local adamant_seed_timer_field = player_user_data_item_parameter_type_def:get_field("_AdamantSeedTimer");
local demondrug_powder_timer_field = player_user_data_item_parameter_type_def:get_field("_DemondrugPowderTimer");
local armorskin_powder_timer_field = player_user_data_item_parameter_type_def:get_field("_ArmorSkinPowderTimer");
@@ -99,6 +117,9 @@ local stamina_up_buff_second_timer_field = player_data_type_def:get_field("_Stam
-- Gourmet Fish
local fish_regene_enable_field = player_data_type_def:get_field("_FishRegeneEnableTimer");
local data_shortcut_type_def = sdk.find_type_definition("snow.data.DataShortcut");
local get_name_method = data_shortcut_type_def:get_method("getName(snow.data.ContentsIdSystem.ItemId)");
function this.update(player_data)
local item_parameter = get_ref_item_parameter_method:call(singletons.player_manager);
if item_parameter == nil then
@@ -106,44 +127,27 @@ function this.update(player_data)
return;
end
local cached_language = language.current_language
this.update_demondrug(player_data, item_parameter);
this.update_armorskin(player_data, item_parameter);
this.update_might_seed(player_data, item_parameter);
this.update_dash_juice(player_data, item_parameter);
buffs.update_generic_buff(this.list, consumables_type_name, "adamant_seed", this.get_consumable_name,
player_data, def_up_buff_second_field, player_data, def_up_buff_second_timer_field, item_parameter, adamant_seed_timer_field);
buffs.update_generic_buff(this.list, consumables_type_name, "demon_powder", this.get_consumable_name,
player_data, atk_up_item_second_field, player_data, atk_up_item_second_timer_field, item_parameter, demondrug_powder_timer_field);
buffs.update_generic_buff(this.list, consumables_type_name, "hardshell_powder", this.get_consumable_name,
player_data, def_up_item_second_field, player_data, def_up_item_second_timer_field, item_parameter, armorskin_powder_timer_field);
buffs.update_generic_buff(this.list, consumables_type_name, "immunizer", this.get_consumable_name,
nil, nil, player_data, vitalizer_timer_field, item_parameter, vitalizer_timer_const_field);
buffs.update_generic_buff(this.list, consumables_type_name, "might_seed",
player_data, atk_up_buff_second_field,
player_data, atk_up_buff_second_timer_field,
item_parameter, might_seed_timer_field);
buffs.update_generic_buff(this.list, consumables_type_name, "adamant_seed",
player_data, def_up_buff_second_field,
player_data, def_up_buff_second_timer_field,
item_parameter, adamant_seed_timer_field);
buffs.update_generic_buff(this.list, consumables_type_name, "demon_powder",
player_data, atk_up_item_second_field,
player_data, atk_up_item_second_timer_field,
item_parameter, demondrug_powder_timer_field);
buffs.update_generic_buff(this.list, consumables_type_name, "hardshell_powder",
player_data, def_up_item_second_field,
player_data, def_up_item_second_timer_field,
item_parameter, armorskin_powder_timer_field);
buffs.update_generic_buff(this.list, consumables_type_name, "immunizer",
nil, nil,
player_data, vitalizer_timer_field,
item_parameter, vitalizer_timer_const_field);
buffs.update_generic_buff(this.list, consumables_type_name, "immunizer",
nil, nil,
player_data, stamina_up_buff_second_timer_field,
item_parameter, stamina_up_buff_second_field);
buffs.update_generic_buff(this.list, consumables_type_name, "gourmet_fish",
nil, nil,
player_data, fish_regene_enable_field,
nil, nil);
buffs.update_generic_buff(this.list, consumables_type_name, "gourmet_fish", this.get_consumable_name,
nil, nil, player_data, fish_regene_enable_field, nil, nil);
end
function this.update_demondrug(player_data, item_parameter)
@@ -171,14 +175,17 @@ function this.update_demondrug(player_data, item_parameter)
return;
end
local consumable_key;
if demondrug_value == demondrug_const_value then
buffs.update_generic(this.list, consumables_type_name, "demondrug");
consumable_key = "demondrug";
this.list.mega_demondrug = nil;
elseif demondrug_value == mega_demondrug_const_value then
buffs.update_generic(this.list, consumables_type_name, "mega_demondrug");
consumable_key = "mega_demondrug";
this.list.demondrug = nil;
end
buffs.update_generic(this.list, consumables_type_name, consumable_key, this.get_consumable_name);
end
function this.update_armorskin(player_data, item_parameter)
@@ -206,26 +213,81 @@ function this.update_armorskin(player_data, item_parameter)
return;
end
local consumable_key;
if armorskin_value == armorskin_const_value then
buffs.update_generic(this.list, consumables_type_name, "armorskin");
consumable_key = "armorskin";
this.list.mega_armorskin = nil;
elseif armorskin_value == mega_armorskin_const_value then
buffs.update_generic(this.list, consumables_type_name, "mega_armorskin");
consumable_key = "mega_armorskin";
this.list.armorskin = nil;
end
buffs.update_generic(this.list, consumables_type_name, consumable_key, this.get_consumable_name);
end
function this.init_names()
for consumable_key, consumable in pairs(this.list) do
local name = language.current_language.consumables[consumable_key];
if name == nil then
name = consumable_key;
end
consumable.name = name;
function this.update_might_seed(player_data, item_parameter)
local atk_up_buff_second = atk_up_buff_second_field:get_data(player_data);
if atk_up_buff_second == nil then
error_handler.report("consumables.update_might_seed", "Failed to access Data: atk_up_buff_second");
return;
end
local might_seed_atk_up = might_seed_atk_up_field:get_data(item_parameter);
if might_seed_atk_up == nil then
error_handler.report("consumables.update_might_seed", "Failed to access Data: might_seed_atk_up");
return;
end
if atk_up_buff_second ~= might_seed_atk_up then
this.list.might_seed = nil;
return;
end
this.update_generic_buff(this.list, consumables_type_name, "might_seed", this.get_consumable_name,
nil, nil, player_data, atk_up_buff_second_timer_field, item_parameter, might_seed_timer_field);
end
function this.update_dash_juice(player_data, item_parameter)
local stamina_up_buff_second_timer = stamina_up_buff_second_timer_field:get_data(player_data);
if stamina_up_buff_second_timer == nil then
error_handler.report("consumables.update_dash_juice", "Failed to access Data: stamina_up_buff_second_timer");
return;
end
local stamina_up_buff_second = stamina_up_buff_second_field:get_data(item_parameter);
if stamina_up_buff_second == nil then
error_handler.report("consumables.update_dash_juice", "Failed to access Data: stamina_up_buff_second");
return;
end
if utils.number.is_equal(stamina_up_buff_second_timer, 0) then
this.list.dash_juice = nil;
return;
end
local timer = stamina_up_buff_second_timer / 60;
local dash_juice_consumable = this.list.dash_juice;
if dash_juice_consumable == nil
or (dash_juice_consumable ~= nil and timer > dash_juice_consumable.timer) then
if timer <= endemic_life_buffs.peepersects_duration + 0.1 then
this.list.dash_juice = nil;
return;
end
end
buffs.update_generic(this.list, consumables_type_name, "dash_juice", this.get_consumable_name, 1, timer, stamina_up_buff_second);
end
function this.get_consumable_name(consumable_key)
local consumable_name = get_name_method:call(nil, consumable_ids[consumable_key]);
if consumable_name == nil then
error_handler.report("consumables.get_consumable_name", string.format("Failed to access Data: %s_name", consumable_key));
return consumable_key;
end
return consumable_name;
end
function this.init_dependencies()
@@ -237,6 +299,7 @@ function this.init_dependencies()
players = require("MHR_Overlay.Damage_Meter.players");
language = require("MHR_Overlay.Misc.language");
error_handler = require("MHR_Overlay.Misc.error_handler");
endemic_life_buffs = require("MHR_Overlay.Buffs.endemic_life_buffs");
end
function this.init_module()