diff --git a/reframework/autorun/MHR_Overlay.lua b/reframework/autorun/MHR_Overlay.lua index 4c1d2d8..405cecd 100644 --- a/reframework/autorun/MHR_Overlay.lua +++ b/reframework/autorun/MHR_Overlay.lua @@ -45,6 +45,9 @@ local utils = require("MHR_Overlay.Misc.utils"); local buffs = require("MHR_Overlay.Buffs.buffs"); local consumables = require("MHR_Overlay.Buffs.consumables"); local melody_effects = require("MHR_Overlay.Buffs.melody_effects"); +local endemic_life_buffs = require("MHR_Overlay.Buffs.endemic_life_buffs"); +local skills = require("MHR_Overlay.Buffs.skills"); +local dangos = require("MHR_Overlay.Buffs.dangos"); local players = require("MHR_Overlay.Damage_Meter.players"); local non_players = require("MHR_Overlay.Damage_Meter.non_players"); @@ -118,6 +121,9 @@ buff_UI_entity.init_dependencies(); buffs.init_dependencies(); consumables.init_dependencies(); melody_effects.init_dependencies(); +endemic_life_buffs.init_dependencies(); +skills.init_dependencies(); +dangos.init_dependencies(); damage_hook.init_dependencies(); players.init_dependencies(); @@ -186,6 +192,9 @@ buff_UI_entity.init_module(); buffs.init_module(); consumables.init_module(); melody_effects.init_module(); +endemic_life_buffs.init_module(); +skills.init_module(); +dangos.init_module(); damage_hook.init_module(); players.init_module(); diff --git a/reframework/autorun/MHR_Overlay/Buffs/buffs.lua b/reframework/autorun/MHR_Overlay/Buffs/buffs.lua index 55ec86c..7987384 100644 --- a/reframework/autorun/MHR_Overlay/Buffs/buffs.lua +++ b/reframework/autorun/MHR_Overlay/Buffs/buffs.lua @@ -11,6 +11,9 @@ local language; local time; local quest_status; local error_handler; +local endemic_life_buffs; +local skills; +local dangos; local sdk = sdk; local tostring = tostring; @@ -48,6 +51,7 @@ this.types = { consumable = 0, melody_effect = 1, dango = 2, + skill = 4, }; local player_manager_type_def = sdk.find_type_definition("snow.player.PlayerManager"); @@ -62,10 +66,10 @@ local system_array_type_def = sdk.find_type_definition("System.Array"); local length_method = system_array_type_def:get_method("get_Length"); local get_value_method = system_array_type_def:get_method("GetValue(System.Int32)"); -function this.new(type, key, name, value, duration) +function this.new(type, key, name, level, duration) local is_infinite = false; - value = value or 0; + level = level or 1; if duration == nil then duration = 0; @@ -77,7 +81,7 @@ function this.new(type, key, name, value, duration) buff.type = type; buff.key = key; buff.name = name; - buff.value = value; + buff.level = level; buff.timer = duration; buff.duration = duration; @@ -110,6 +114,9 @@ end function this.init_names() consumables.init_names(); melody_effects.init_names(); + endemic_life_buffs.init_names(); + skills.init_names(); + dangos.init_names(); end function this.update() @@ -137,10 +144,15 @@ function this.update() local master_player_data = get_player_data_method:call(master_player); if master_player_data ~= nil then consumables.update(master_player_data); + endemic_life_buffs.update(master_player_data); + skills.update(master_player_data); + dangos.update(master_player_data); else error_handler.report("buffs.update", "Failed to access Data: master_player_data"); end + --xy = master_player_data._Attack; + local music_data_array = music_data_field:get_data(master_player); if music_data_array ~= nil then local music_data_table = {}; @@ -194,6 +206,9 @@ function this.init_dependencies() time = require("MHR_Overlay.Game_Handler.time"); quest_status = require("MHR_Overlay.Game_Handler.quest_status"); error_handler = require("MHR_Overlay.Misc.error_handler"); + endemic_life_buffs = require("MHR_Overlay.Buffs.endemic_life_buffs"); + skills = require("MHR_Overlay.Buffs.skills"); + dangos = require("MHR_Overlay.Buffs.dangos"); end function this.init_module() diff --git a/reframework/autorun/MHR_Overlay/Buffs/consumables.lua b/reframework/autorun/MHR_Overlay/Buffs/consumables.lua index 3692c6a..796b197 100644 --- a/reframework/autorun/MHR_Overlay/Buffs/consumables.lua +++ b/reframework/autorun/MHR_Overlay/Buffs/consumables.lua @@ -50,7 +50,8 @@ this.list = { adamant_seed = nil, hardshell_powder = nil, immunizer = nil, - dash_juice = nil + dash_juice = nil, + gourmet_fish = nil, }; local player_manager_type_def = sdk.find_type_definition("snow.player.PlayerManager"); @@ -92,6 +93,8 @@ local def_up_item_second_timer_field = player_data_type_def:get_field("_DefUpIte local vitalizer_timer_field = player_data_type_def:get_field("_VitalizerTimer"); -- Dash Juice local stamina_up_buff_second_timer_field = player_data_type_def:get_field("_StaminaUpBuffSecondTimer"); +-- Gourmet Fish +local fish_regene_enable_field = player_data_type_def:get_field("_FishRegeneEnableTimer"); local system_array_type_def = sdk.find_type_definition("System.Array"); local length_method = system_array_type_def:get_method("get_Length"); @@ -112,6 +115,7 @@ function this.update(player_data) this.update_hardshell_powder(player_data, item_parameter); this.update_immunizer(player_data, item_parameter); this.update_dash_juice(player_data, item_parameter); + this.update_gourmet_fish(player_data, item_parameter); end function this.update_demondrug(player_data, item_parameter) @@ -146,7 +150,7 @@ function this.update_demondrug(player_data, item_parameter) local name = language.current_language.consumables.demondrug; - this.list.demondrug = buffs.new(buffs.types.consumable, "demondrug", name, demondrug_value); + this.list.demondrug = buffs.new(buffs.types.consumable, "demondrug", name); this.list.mega_demondrug = nil; elseif demondrug_value == mega_demondrug_const_value then @@ -158,7 +162,7 @@ function this.update_demondrug(player_data, item_parameter) local name = language.current_language.consumables.mega_demondrug; this.list.demondrug = nil; - this.list.mega_demondrug = buffs.new(buffs.types.consumable, "mega_demondrug", name, demondrug_value); + this.list.mega_demondrug = buffs.new(buffs.types.consumable, "mega_demondrug", name); end end @@ -195,7 +199,7 @@ function this.update_armorskin(player_data, item_parameter) local name = language.current_language.consumables.armorskin; - this.list.armorskin = buffs.new(buffs.types.consumable, "armorskin", name, armorskin_value); + this.list.armorskin = buffs.new(buffs.types.consumable, "armorskin", name); this.list.mega_armorskin = nil; elseif armorskin_value == mega_armorskin_const_value then @@ -207,7 +211,7 @@ function this.update_armorskin(player_data, item_parameter) local name = language.current_language.consumables.mega_armorskin; this.list.armorskin = nil; - this.list.mega_armorskin = buffs.new(buffs.types.consumable, "mega_armorskin", name, armorskin_value); + this.list.mega_armorskin = buffs.new(buffs.types.consumable, "mega_armorskin", name); end end @@ -239,10 +243,9 @@ function this.update_might_seed(player_data, item_parameter) local name = language.current_language.consumables.might_seed; - buff = buffs.new(buffs.types.consumable, "might_seed", name, might_seed_value, might_seed_timer_const_value); + buff = buffs.new(buffs.types.consumable, "might_seed", name, 1, might_seed_timer_const_value); this.list.might_seed = buff; else - buff.value = might_seed_value; buffs.update_timer(buff, might_seed_timer / 60); end end @@ -275,10 +278,9 @@ function this.update_adamant_seed(player_data, item_parameter) local name = language.current_language.consumables.adamant_seed; - buff = buffs.new(buffs.types.consumable, "adamant_seed", name, adamant_seed_value, adamant_seed_timer_const_value); + buff = buffs.new(buffs.types.consumable, "adamant_seed", name, 1, adamant_seed_timer_const_value); this.list.adamant_seed = buff; else - buff.value = adamant_seed_value; buffs.update_timer(buff, adamant_seed_timer / 60); end end @@ -311,10 +313,9 @@ function this.update_demon_powder(player_data, item_parameter) local name = language.current_language.consumables.demon_powder; - buff = buffs.new(buffs.types.consumable, "demon_powder", name, demon_powder_value, demon_powder_timer_const_value); + buff = buffs.new(buffs.types.consumable, "demon_powder", name, demon_powder_timer_const_value); this.list.demon_powder = buff; else - buff.value = demon_powder_value; buffs.update_timer(buff, demon_powder_timer / 60); end end @@ -347,10 +348,9 @@ function this.update_hardshell_powder(player_data, item_parameter) local name = language.current_language.consumables.hardshell_powder; - buff = buffs.new(buffs.types.consumable, "hardshell_powder", name, hardshell_powder_value, demon_powder_timer_const_value); + buff = buffs.new(buffs.types.consumable, "hardshell_powder", name, 1, demon_powder_timer_const_value); this.list.hardshell_powder = buff; else - buff.value = hardshell_powder_value; buffs.update_timer(buff, hardshell_powder_timer / 60); end end @@ -377,7 +377,7 @@ function this.update_immunizer(player_data, item_parameter) local name = language.current_language.consumables.immunizer; - buff = buffs.new(buffs.types.consumable, "immunizer", name, 0, immunizer_timer_const_value); + buff = buffs.new(buffs.types.consumable, "immunizer", name, 1, immunizer_timer_const_value); this.list.immunizer = buff; else buffs.update_timer(buff, immunizer_timer / 60); @@ -401,19 +401,49 @@ function this.update_dash_juice(player_data, item_parameter) if buff == nil then local dash_juice_timer_const_value = stamina_up_buff_second_field:get_data(item_parameter); if dash_juice_timer_const_value == nil then - error_handler.report("consumables.update_dash_juice", "Failed to access Data: dash_juice_timer"); + error_handler.report("consumables.update_dash_juice", "Failed to access Data: dash_juice_timer_const_value"); return; end local name = language.current_language.consumables.dash_juice; - buff = buffs.new(buffs.types.consumable, "dash_juice", name, 0, dash_juice_timer_const_value); + buff = buffs.new(buffs.types.consumable, "dash_juice", name, 1, dash_juice_timer_const_value); this.list.dash_juice = buff; else buffs.update_timer(buff, dash_juice_timer / 60); end end +function this.update_gourmet_fish(player_data, item_parameter) + local gourmet_fish_timer = fish_regene_enable_field:get_data(player_data); + if gourmet_fish_timer == nil then + error_handler.report("consumables.update_gourmet_fish", "Failed to access Data: gourmet_fish_timer"); + return; + end + + if gourmet_fish_timer == 0 then + this.list.gourmet_fish = nil; + return; + end + + local buff = this.list.gourmet_fish; + + if buff == nil then + --local gourmet_fish_timer_const_value = stamina_up_buff_second_field:get_data(item_parameter); + --if gourmet_fish_timer_const_value == nil then + -- error_handler.report("consumables.update_gourmet_fish", "Failed to access Data: gourmet_fish_timer_const_value"); + -- return; + --end + + local name = language.current_language.consumables.gourmet_fish; + + buff = buffs.new(buffs.types.consumable, "gourmet_fish", name, 1, gourmet_fish_timer); + this.list.gourmet_fish = buff; + else + buffs.update_timer(buff, gourmet_fish_timer / 60); + end +end + function this.init_names() for key, buff in pairs(this.list) do buff.name = language.current_language.consumables[key]; diff --git a/reframework/autorun/MHR_Overlay/Buffs/dangos.lua b/reframework/autorun/MHR_Overlay/Buffs/dangos.lua new file mode 100644 index 0000000..853c554 --- /dev/null +++ b/reframework/autorun/MHR_Overlay/Buffs/dangos.lua @@ -0,0 +1,127 @@ +local this = {}; + +local buffs; +local buff_UI_entity; +local config; +local singletons; +local players; +local utils; +local language; +local error_handler; + +local sdk = sdk; +local tostring = tostring; +local pairs = pairs; +local ipairs = ipairs; +local tonumber = tonumber; +local require = require; +local pcall = pcall; +local table = table; +local string = string; +local Vector3f = Vector3f; +local d2d = d2d; +local math = math; +local json = json; +local log = log; +local fs = fs; +local next = next; +local type = type; +local setmetatable = setmetatable; +local getmetatable = getmetatable; +local assert = assert; +local select = select; +local coroutine = coroutine; +local utf8 = utf8; +local re = re; +local imgui = imgui; +local draw = draw; +local Vector2f = Vector2f; +local reframework = reframework; +local os = os; +local ValueType = ValueType; +local package = package; + +this.list = { + dango_defender = nil, +}; + +local player_manager_type_def = sdk.find_type_definition("snow.player.PlayerManager"); +local get_player_data_method = player_manager_type_def:get_method("get_PlayerData"); +local get_ref_item_parameter_method = player_manager_type_def:get_method("get_RefItemParameter"); + +local player_user_data_item_parameter_type_def = get_ref_item_parameter_method:get_return_type(); + +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_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"); +local vitalizer_timer_const_field = player_user_data_item_parameter_type_def:get_field("_VitalizerTimer"); +local stamina_up_buff_second_field = player_user_data_item_parameter_type_def:get_field("_StaminaUpBuffSecond"); + +local player_data_type_def = sdk.find_type_definition("snow.player.PlayerData"); +-- Dango Defender +local kitchen_skill_048_field = player_data_type_def:get_field("_KitchenSkill048_Damage"); + +local system_array_type_def = sdk.find_type_definition("System.Array"); +local length_method = system_array_type_def:get_method("get_Length"); +local get_value_method = system_array_type_def:get_method("GetValue(System.Int32)"); + +function this.update(player_data) + local item_parameter = get_ref_item_parameter_method:call(singletons.player_manager); + if item_parameter == nil then + error_handler.report("dangos.update", "Failed to access Data: item_parameter"); + return; + end + + --this.update_dango_defender(player_data, item_parameter); +end + +-- Not working?? +function this.update_dango_defender(player_data, item_parameter) + local dango_defender_value = kitchen_skill_048_field:get_data(player_data); + if dango_defender_value == nil then + error_handler.report("dangos.update_dango_defender", "Failed to access Data: dango_defender_value"); + return; + end + + if dango_defender_value < 200 then + this.list.dango_defender = nil; + return; + end + + local buff = this.list.dango_defender; + if buff ~= nil then + return; + end + + local name = language.current_language.dangos.dango_defender_hi; + + this.list.dango_defender = buffs.new(buffs.types.dango, "dango_defender", name, 1); +end + +function this.init_names() + for key, buff in pairs(this.list) do + buff.name = language.current_language.dangos[key]; + end +end + +function this.init_dependencies() + buffs = require("MHR_Overlay.Buffs.buffs"); + config = require("MHR_Overlay.Misc.config"); + utils = require("MHR_Overlay.Misc.utils"); + buff_UI_entity = require("MHR_Overlay.UI.UI_Entities.buff_UI_entity"); + singletons = require("MHR_Overlay.Game_Handler.singletons"); + players = require("MHR_Overlay.Damage_Meter.players"); + language = require("MHR_Overlay.Misc.language"); + error_handler = require("MHR_Overlay.Misc.error_handler"); +end + +function this.init_module() +end + +return this; \ No newline at end of file diff --git a/reframework/autorun/MHR_Overlay/Buffs/endemic_life_buffs.lua b/reframework/autorun/MHR_Overlay/Buffs/endemic_life_buffs.lua new file mode 100644 index 0000000..4da27f9 --- /dev/null +++ b/reframework/autorun/MHR_Overlay/Buffs/endemic_life_buffs.lua @@ -0,0 +1,156 @@ +local this = {}; + +local buffs; +local buff_UI_entity; +local config; +local singletons; +local players; +local utils; +local language; +local error_handler; +local env_creature; + +local sdk = sdk; +local tostring = tostring; +local pairs = pairs; +local ipairs = ipairs; +local tonumber = tonumber; +local require = require; +local pcall = pcall; +local table = table; +local string = string; +local Vector3f = Vector3f; +local d2d = d2d; +local math = math; +local json = json; +local log = log; +local fs = fs; +local next = next; +local type = type; +local setmetatable = setmetatable; +local getmetatable = getmetatable; +local assert = assert; +local select = select; +local coroutine = coroutine; +local utf8 = utf8; +local re = re; +local imgui = imgui; +local draw = draw; +local Vector2f = Vector2f; +local reframework = reframework; +local os = os; +local ValueType = ValueType; +local package = package; + +this.list = { + cutterfly = nil, + clothfly = nil +}; + +local player_manager_type_def = sdk.find_type_definition("snow.player.PlayerManager"); +local get_player_data_method = player_manager_type_def:get_method("get_PlayerData"); +local get_ref_item_parameter_method = player_manager_type_def:get_method("get_RefItemParameter"); + +local player_user_data_item_parameter_type_def = get_ref_item_parameter_method:get_return_type(); +local demondrug_atk_up_field = player_user_data_item_parameter_type_def:get_field("_DemondrugAtkUp"); + +local player_data_type_def = sdk.find_type_definition("snow.player.PlayerData"); +-- Cutterfly +local crit_up_ec_second_timer_field = player_data_type_def:get_field("_CritUpEcSecondTimer"); +-- Clothfly +local def_up_buff_second_rate_timer_field = player_data_type_def:get_field("_DefUpBuffSecondRateTimer"); + +local system_array_type_def = sdk.find_type_definition("System.Array"); +local length_method = system_array_type_def:get_method("get_Length"); +local get_value_method = system_array_type_def:get_method("GetValue(System.Int32)"); + +local message_manager_type_def = sdk.find_type_definition("snow.gui.MessageManager"); +local get_env_creature_name_message_method = message_manager_type_def:get_method("getEnvCreatureNameMessage"); + +function this.update(player_data) + local item_parameter = get_ref_item_parameter_method:call(singletons.player_manager); + if item_parameter == nil then + error_handler.report("endemic_life_buffs.update", "Failed to access Data: item_parameter"); + return; + end + + this.update_cutterfly(player_data, item_parameter); + this.update_clothfly(player_data, item_parameter); +end + +function this.update_cutterfly(player_data, item_parameter) + local cutterfly_timer = crit_up_ec_second_timer_field:get_data(player_data); + if cutterfly_timer == nil then + error_handler.report("endemic_life_buffs.update_cutterfly", "Failed to access Data: cutterfly_timer"); + return; + end + + if cutterfly_timer == 0 then + this.list.cutterfly = nil; + return; + end + + local buff = this.list.cutterfly; + + if buff == nil then + local name = get_env_creature_name_message_method:call(singletons.message_manager, env_creature.creature_ids.cutterfly); + if name == nil then + error_handler.report("endemic_life_buffs.update_cutterfly", "Failed to access Data: name"); + return; + end + + buff = buffs.new(buffs.types.consumable, "cutterfly", name, 1, cutterfly_timer / 60); + this.list.cutterfly = buff; + else + buffs.update_timer(buff, cutterfly_timer / 60); + end +end + +function this.update_clothfly(player_data, item_parameter) + local clothfly_timer = def_up_buff_second_rate_timer_field:get_data(player_data); + if clothfly_timer == nil then + error_handler.report("endemic_life_buffs.update_clothfly", "Failed to access Data: clothfly_timer"); + return; + end + + if clothfly_timer == 0 then + this.list.clothfly = nil; + return; + end + + local buff = this.list.clothfly; + + if buff == nil then + local name = get_env_creature_name_message_method:call(singletons.message_manager, env_creature.creature_ids.clothfly); + if name == nil then + error_handler.report("endemic_life_buffs.update_clothfly", "Failed to access Data: name"); + return; + end + + buff = buffs.new(buffs.types.consumable, "clothfly", name, 1, clothfly_timer / 60); + this.list.clothfly = buff; + else + buffs.update_timer(buff, clothfly_timer / 60); + end +end + +function this.init_names() + -- Nothing to do here +end + +function this.init_dependencies() + buffs = require("MHR_Overlay.Buffs.buffs"); + config = require("MHR_Overlay.Misc.config"); + utils = require("MHR_Overlay.Misc.utils"); + buff_UI_entity = require("MHR_Overlay.UI.UI_Entities.buff_UI_entity"); + singletons = require("MHR_Overlay.Game_Handler.singletons"); + players = require("MHR_Overlay.Damage_Meter.players"); + language = require("MHR_Overlay.Misc.language"); + error_handler = require("MHR_Overlay.Misc.error_handler"); + env_creature = require("MHR_Overlay.Endemic_Life.env_creature"); +end + +function this.init_module() +end + +return this; \ No newline at end of file diff --git a/reframework/autorun/MHR_Overlay/Buffs/melody_effects.lua b/reframework/autorun/MHR_Overlay/Buffs/melody_effects.lua index 5e4af84..69702c5 100644 --- a/reframework/autorun/MHR_Overlay/Buffs/melody_effects.lua +++ b/reframework/autorun/MHR_Overlay/Buffs/melody_effects.lua @@ -130,10 +130,9 @@ function this.update(melody_data_table) local key = melody_effect_keys[lua_index]; local name = language.current_language.melody_effects[key]; - buff = buffs.new(buffs.types.melody_effect, key, name, melody_timer, melody_timer / 60); + buff = buffs.new(buffs.types.melody_effect, key, name, 1, melody_timer / 60); this.list[lua_index] = buff; else - buff.value = melody_timer; buffs.update_timer(buff, melody_timer / 60); end diff --git a/reframework/autorun/MHR_Overlay/Buffs/skills.lua b/reframework/autorun/MHR_Overlay/Buffs/skills.lua new file mode 100644 index 0000000..5408da5 --- /dev/null +++ b/reframework/autorun/MHR_Overlay/Buffs/skills.lua @@ -0,0 +1,233 @@ +local this = {}; + +local buffs; +local buff_UI_entity; +local config; +local singletons; +local players; +local utils; +local language; +local error_handler; +local env_creature; + +local sdk = sdk; +local tostring = tostring; +local pairs = pairs; +local ipairs = ipairs; +local tonumber = tonumber; +local require = require; +local pcall = pcall; +local table = table; +local string = string; +local Vector3f = Vector3f; +local d2d = d2d; +local math = math; +local json = json; +local log = log; +local fs = fs; +local next = next; +local type = type; +local setmetatable = setmetatable; +local getmetatable = getmetatable; +local assert = assert; +local select = select; +local coroutine = coroutine; +local utf8 = utf8; +local re = re; +local imgui = imgui; +local draw = draw; +local Vector2f = Vector2f; +local reframework = reframework; +local os = os; +local ValueType = ValueType; +local package = package; + +this.list = { + burst = nil, + kushala_daora_soul = nil, + intrepid_heart = nil, + dereliction = nil, +}; + +local player_manager_type_def = sdk.find_type_definition("snow.player.PlayerManager"); +local get_player_data_method = player_manager_type_def:get_method("get_PlayerData"); +local get_ref_item_parameter_method = player_manager_type_def:get_method("get_RefItemParameter"); + +local player_user_data_item_parameter_type_def = get_ref_item_parameter_method:get_return_type(); +local demondrug_atk_up_field = player_user_data_item_parameter_type_def:get_field("_DemondrugAtkUp"); + +local player_data_type_def = sdk.find_type_definition("snow.player.PlayerData"); +-- Burst +local rengeki_power_up_count_field = player_data_type_def:get_field("_RengekiPowerUpCnt"); +local rengeki_power_up_timer_field = player_data_type_def:get_field("_RengekiPowerUpTimer"); +-- Kushala Daora Soul +local hyakuryu_dragon_power_up_count_field = player_data_type_def:get_field("_HyakuryuDragonPowerUpCnt"); +local hyakuryu_dragon_power_up_timer_field = player_data_type_def:get_field("_HyakuryuDragonPowerUpTimer"); +-- Intrepid Heart +local equip_skill_223_accumulator_field = player_data_type_def:get_field("_EquipSkill223Accumulator"); +-- Derelection +local symbiosis_skill_lost_vital_field = player_data_type_def:get_field("_SymbiosisSkillLostVital"); + +local system_array_type_def = sdk.find_type_definition("System.Array"); +local length_method = system_array_type_def:get_method("get_Length"); +local get_value_method = system_array_type_def:get_method("GetValue(System.Int32)"); + +function this.update(player_data) + local item_parameter = get_ref_item_parameter_method:call(singletons.player_manager); + if item_parameter == nil then + error_handler.report("skills.update", "Failed to access Data: item_parameter"); + return; + end + + this.update_burst(player_data); + this.update_kushala_daora_soul(player_data); + this.update_intrepid_heart(player_data); + this.update_dereliction(player_data); + + --xy = string.format("%s\n%s", player_data._Attack, player_data._SymbiosisSkillLostVital); +end + +function this.update_burst(player_data) + local burst_value = rengeki_power_up_count_field:get_data(player_data); + if burst_value == nil then + error_handler.report("skills.update_burst", "Failed to access Data: burst_value"); + return; + end + + if burst_value == 0 then + this.list.burst = nil; + return; + end + + local burst_timer = rengeki_power_up_timer_field:get_data(player_data); + if burst_timer == nil then + error_handler.report("skills.update_burst", "Failed to access Data: burst_timer"); + return; + end + + local skill_level = 1; + if burst_value >= 5 then + skill_level = 2; + end + + local buff = this.list.burst; + if buff == nil then + local name = language.current_language.skills.burst; + + buff = buffs.new(buffs.types.skill, "burst", name, skill_level, burst_timer / 60); + this.list.burst = buff; + else + buff.level = skill_level; + buffs.update_timer(buff, burst_timer / 60); + end +end + +function this.update_kushala_daora_soul(player_data) + local kushala_daora_soul_value = hyakuryu_dragon_power_up_count_field:get_data(player_data); + if kushala_daora_soul_value == nil then + error_handler.report("skills.update_kushala_daora_soul", "Failed to access Data: kushala_daora_soul_value"); + return; + end + + if kushala_daora_soul_value == 0 then + this.list.kushala_daora_soul = nil; + this.list.kushala_daora_soul_2 = nil; + return; + end + + local kushala_daora_soul_timer = hyakuryu_dragon_power_up_timer_field:get_data(player_data); + if kushala_daora_soul_timer == nil then + error_handler.report("skills.update_kushala_daora_soul", "Failed to access Data: kushala_daora_soul_timer"); + return; + end + + local skill_level = 1; + if kushala_daora_soul_value >= 5 then + skill_level = 2; + end + + local buff = this.list.kushala_daora_soul; + if buff == nil then + local name = language.current_language.skills.kushala_daora_soul; + + buff = buffs.new(buffs.types.skill, "kushala_daora_soul", name, skill_level, kushala_daora_soul_timer / 60); + this.list.kushala_daora_soul = buff; + else + buff.level = skill_level; + buffs.update_timer(buff, kushala_daora_soul_timer / 60); + end +end + +function this.update_intrepid_heart(player_data) + local intrepid_heart_value = equip_skill_223_accumulator_field:get_data(player_data); + if intrepid_heart_value == nil then + error_handler.report("skills.update_intrepid_heart", "Failed to access Data: intrepid_heart_value"); + return; + end + + if intrepid_heart_value < 400 then + this.list.intrepid_heart = nil; + return; + end + + local buff = this.list.intrepid_heart; + if buff == nil then + local name = language.current_language.skills.intrepid_heart; + + buff = buffs.new(buffs.types.skill, "intrepid_heart", name, 1); + this.list.intrepid_heart = buff; + end +end + +function this.update_dereliction(player_data) + local dereliction_value = symbiosis_skill_lost_vital_field:get_data(player_data); + if dereliction_value == nil then + error_handler.report("skills.update_derelection", "Failed to access Data: dereliction_value"); + return; + end + + if dereliction_value == 0 then + this.list.dereliction = nil; + return; + end + + local skill_level = 1; + if dereliction_value >= 100 then + skill_level = 3; + elseif dereliction_value >= 50 then + skill_level = 2; + end + + local buff = this.list.dereliction; + if buff == nil then + local name = language.current_language.skills.dereliction; + + buff = buffs.new(buffs.types.skill, "dereliction", name, skill_level); + this.list.dereliction = buff; + else + buff.level = skill_level; + end +end + +function this.init_names() + for key, buff in pairs(this.list) do + buff.name = language.current_language.skills[key]; + end +end + +function this.init_dependencies() + buffs = require("MHR_Overlay.Buffs.buffs"); + config = require("MHR_Overlay.Misc.config"); + utils = require("MHR_Overlay.Misc.utils"); + buff_UI_entity = require("MHR_Overlay.UI.UI_Entities.buff_UI_entity"); + singletons = require("MHR_Overlay.Game_Handler.singletons"); + players = require("MHR_Overlay.Damage_Meter.players"); + language = require("MHR_Overlay.Misc.language"); + error_handler = require("MHR_Overlay.Misc.error_handler"); + env_creature = require("MHR_Overlay.Endemic_Life.env_creature"); +end + +function this.init_module() +end + +return this; \ No newline at end of file diff --git a/reframework/autorun/MHR_Overlay/Endemic_Life/env_creature.lua b/reframework/autorun/MHR_Overlay/Endemic_Life/env_creature.lua index 01efd8b..3bc22ec 100644 --- a/reframework/autorun/MHR_Overlay/Endemic_Life/env_creature.lua +++ b/reframework/autorun/MHR_Overlay/Endemic_Life/env_creature.lua @@ -41,6 +41,11 @@ local package = package; this.list = {}; +this.creature_ids = { + cutterfly = 50, + clothfly = 7 +}; + function this.new(REcreature) local creature = {}; diff --git a/reframework/autorun/MHR_Overlay/Misc/config.lua b/reframework/autorun/MHR_Overlay/Misc/config.lua index 4a0a721..9e957d2 100644 --- a/reframework/autorun/MHR_Overlay/Misc/config.lua +++ b/reframework/autorun/MHR_Overlay/Misc/config.lua @@ -7493,6 +7493,10 @@ function this.init_default() text_formatting = "%s", + include = { + skill_level = true + }, + offset = { x = 5, y = 0 diff --git a/reframework/autorun/MHR_Overlay/Misc/language.lua b/reframework/autorun/MHR_Overlay/Misc/language.lua index 1654c6e..51db5fa 100644 --- a/reframework/autorun/MHR_Overlay/Misc/language.lua +++ b/reframework/autorun/MHR_Overlay/Misc/language.lua @@ -200,7 +200,8 @@ this.default_language = { demon_powder = "Demon Powder", hardshell_powder = "Hardshell Powder", immunizer = "Immunizer", - dash_juice = "Dash Juice" + dash_juice = "Dash Juice", + gourmet_fish = "Gourmet Fish" }, melody_effects = { @@ -234,6 +235,17 @@ this.default_language = { sharpness_extension = "Sharpness Extension" }, + skills = { + burst = "Burst", + kushala_daora_soul = "Kushala Daora Soul", + intrepid_heart = "Intrepid Heart", + dereliction = "Dereliction" + }, + + dangos = { + dango_defender_hi = "Dango Defender (Hi)" + }, + UI = { HP = "HP:", stamina = "Stamina:", diff --git a/reframework/autorun/MHR_Overlay/UI/Modules/buff_UI.lua b/reframework/autorun/MHR_Overlay/UI/Modules/buff_UI.lua index d5a3809..0761ab2 100644 --- a/reframework/autorun/MHR_Overlay/UI/Modules/buff_UI.lua +++ b/reframework/autorun/MHR_Overlay/UI/Modules/buff_UI.lua @@ -5,9 +5,12 @@ local config; local buffs; local consumables; local melody_effects; +local endemic_life_buff; local screen; local utils; local error_handler; +local skills; +local dangos; local sdk = sdk; local tostring = tostring; @@ -69,6 +72,36 @@ function this.draw() ::continue2:: end + for key, endemic_life_buff in pairs(endemic_life_buff.list) do + if not endemic_life_buff.is_active then + goto continue3; + end + + table.insert(displayed_buffs, endemic_life_buff); + + ::continue3:: + end + + for key, skill in pairs(skills.list) do + if not skill.is_active then + goto continue4; + end + + table.insert(displayed_buffs, skill); + + ::continue4:: + end + + for key, dango_buff in pairs(dangos.list) do + if not dango_buff.is_active then + goto continue5; + end + + table.insert(displayed_buffs, dango_buff); + + ::continue5:: + end + -- sort if cached_config.sorting.type == "Name" then if cached_config.sorting.reversed_order then @@ -139,6 +172,9 @@ function this.init_dependencies() --drawing = require("MHR_Overlay.UI.drawing"); utils = require("MHR_Overlay.Misc.utils"); error_handler = require("MHR_Overlay.Misc.error_handler"); + endemic_life_buff = require("MHR_Overlay.Buffs.endemic_life_buffs"); + skills = require("MHR_Overlay.Buffs.skills"); + dangos = require("MHR_Overlay.Buffs.dangos"); end function this.init_module() diff --git a/reframework/autorun/MHR_Overlay/UI/UI_Entities/buff_UI_entity.lua b/reframework/autorun/MHR_Overlay/UI/UI_Entities/buff_UI_entity.lua index f344ba9..c366539 100644 --- a/reframework/autorun/MHR_Overlay/UI/UI_Entities/buff_UI_entity.lua +++ b/reframework/autorun/MHR_Overlay/UI/UI_Entities/buff_UI_entity.lua @@ -73,7 +73,12 @@ function this.draw(buff, buff_UI, position_on_screen, opacity_scale) drawing.draw_bar(buff_UI.bar, position_on_screen, opacity_scale, 1); end - drawing.draw_label(buff_UI.name_label, position_on_screen, opacity_scale, buff.name); + local buff_name = buff.name; + if cached_config.name_label.include.skill_level and buff.level > 1 then + buff_name = string.format("%s %d", buff_name, buff.level); + end + + drawing.draw_label(buff_UI.name_label, position_on_screen, opacity_scale, buff_name); if not buff.is_infinite then drawing.draw_label(buff_UI.timer_label, position_on_screen, opacity_scale, buff.minutes_left, buff.seconds_left); diff --git a/reframework/data/MHR Overlay/languages/en-us.json b/reframework/data/MHR Overlay/languages/en-us.json index 035dcbd..fe85153 100644 --- a/reframework/data/MHR Overlay/languages/en-us.json +++ b/reframework/data/MHR Overlay/languages/en-us.json @@ -44,6 +44,7 @@ "dash_juice": "Dash Juice", "demon_powder": "Demon Powder", "demondrug": "Demondrug", + "gourmet_fish": "Gourmet Fish", "hardshell_powder": "Hardshell Powder", "immunizer": "Immunizer", "mega_armorskin": "Mega Armorskin", @@ -339,6 +340,9 @@ "y": "Y", "z": "Z" }, + "dangos": { + "dango_defender_hi": "Dango Defender (Hi)" + }, "font_name": "", "melody_effects": { "affinity_up": "Affinity Up", @@ -439,6 +443,12 @@ "wingclaws": "Wingclaws", "wings": "Wings" }, + "skills": { + "burst": "Burst", + "dereliction": "Dereliction", + "intrepid_heart": "Intrepid Heart", + "kushala_daora_soul": "Kushala Daora Soul" + }, "unicode_glyph_ranges": [ 0 ] diff --git a/reframework/data/MHR Overlay/languages/ja-jp.json b/reframework/data/MHR Overlay/languages/ja-jp.json index 70b371d..b4a690b 100644 --- a/reframework/data/MHR Overlay/languages/ja-jp.json +++ b/reframework/data/MHR Overlay/languages/ja-jp.json @@ -44,6 +44,7 @@ "dash_juice": "Dash Juice", "demon_powder": "Demon Powder", "demondrug": "Demondrug", + "gourmet_fish": "Gourmet Fish", "hardshell_powder": "Hardshell Powder", "immunizer": "Immunizer", "mega_armorskin": "Mega Armorskin", @@ -339,6 +340,9 @@ "y": "Y", "z": "Z" }, + "dangos": { + "dango_defender_hi": "Dango Defender (Hi)" + }, "font_name": "NotoSansJP-Bold.otf", "melody_effects": { "affinity_up": "Affinity Up", @@ -439,6 +443,12 @@ "wingclaws": "Wingclaws", "wings": "翼" }, + "skills": { + "burst": "Burst", + "dereliction": "Dereliction", + "intrepid_heart": "Intrepid Heart", + "kushala_daora_soul": "Kushala Daora Soul" + }, "unicode_glyph_ranges": [ 32, 255, diff --git a/reframework/data/MHR Overlay/languages/ko-kr.json b/reframework/data/MHR Overlay/languages/ko-kr.json index 9129516..144cdea 100644 --- a/reframework/data/MHR Overlay/languages/ko-kr.json +++ b/reframework/data/MHR Overlay/languages/ko-kr.json @@ -44,6 +44,7 @@ "dash_juice": "Dash Juice", "demon_powder": "Demon Powder", "demondrug": "Demondrug", + "gourmet_fish": "Gourmet Fish", "hardshell_powder": "Hardshell Powder", "immunizer": "Immunizer", "mega_armorskin": "Mega Armorskin", @@ -340,6 +341,9 @@ "y": "Y", "z": "Z" }, + "dangos": { + "dango_defender_hi": "Dango Defender (Hi)" + }, "font_name": "NotoSansKR-Bold.otf", "melody_effects": { "affinity_up": "Affinity Up", @@ -440,6 +444,12 @@ "wingclaws": "날개발톱", "wings": "날개" }, + "skills": { + "burst": "Burst", + "dereliction": "Dereliction", + "intrepid_heart": "Intrepid Heart", + "kushala_daora_soul": "Kushala Daora Soul" + }, "unicode_glyph_ranges": [ 32, 255, diff --git a/reframework/data/MHR Overlay/languages/ru-ru.json b/reframework/data/MHR Overlay/languages/ru-ru.json index 1529399..dbb4567 100644 --- a/reframework/data/MHR Overlay/languages/ru-ru.json +++ b/reframework/data/MHR Overlay/languages/ru-ru.json @@ -44,6 +44,7 @@ "dash_juice": "Dash Juice", "demon_powder": "Demon Powder", "demondrug": "Demondrug", + "gourmet_fish": "Gourmet Fish", "hardshell_powder": "Hardshell Powder", "immunizer": "Immunizer", "mega_armorskin": "Mega Armorskin", @@ -340,6 +341,9 @@ "y": "Y", "z": "Z" }, + "dangos": { + "dango_defender_hi": "Dango Defender (Hi)" + }, "font_name": "NotoSansKR-Bold.otf", "melody_effects": { "affinity_up": "Affinity Up", @@ -440,6 +444,12 @@ "wingclaws": "Крыло-коготь", "wings": "Крылья" }, + "skills": { + "burst": "Burst", + "dereliction": "Dereliction", + "intrepid_heart": "Intrepid Heart", + "kushala_daora_soul": "Kushala Daora Soul" + }, "unicode_glyph_ranges": [ 32, 255, diff --git a/reframework/data/MHR Overlay/languages/zh-cn.json b/reframework/data/MHR Overlay/languages/zh-cn.json index 4f74d60..ef998bc 100644 --- a/reframework/data/MHR Overlay/languages/zh-cn.json +++ b/reframework/data/MHR Overlay/languages/zh-cn.json @@ -44,6 +44,7 @@ "dash_juice": "Dash Juice", "demon_powder": "Demon Powder", "demondrug": "Demondrug", + "gourmet_fish": "Gourmet Fish", "hardshell_powder": "Hardshell Powder", "immunizer": "Immunizer", "mega_armorskin": "Mega Armorskin", @@ -340,6 +341,9 @@ "y": "Y轴", "z": "Z轴" }, + "dangos": { + "dango_defender_hi": "Dango Defender (Hi)" + }, "font_name": "NotoSansSC-Bold.otf", "melody_effects": { "affinity_up": "Affinity Up", @@ -440,6 +444,12 @@ "wingclaws": "翼爪", "wings": "翼" }, + "skills": { + "burst": "Burst", + "dereliction": "Dereliction", + "intrepid_heart": "Intrepid Heart", + "kushala_daora_soul": "Kushala Daora Soul" + }, "unicode_glyph_ranges": [ 32, 255, diff --git a/reframework/data/MHR Overlay/languages/zh-tw.json b/reframework/data/MHR Overlay/languages/zh-tw.json index f5206e5..61e066f 100644 --- a/reframework/data/MHR Overlay/languages/zh-tw.json +++ b/reframework/data/MHR Overlay/languages/zh-tw.json @@ -44,6 +44,7 @@ "dash_juice": "Dash Juice", "demon_powder": "Demon Powder", "demondrug": "Demondrug", + "gourmet_fish": "Gourmet Fish", "hardshell_powder": "Hardshell Powder", "immunizer": "Immunizer", "mega_armorskin": "Mega Armorskin", @@ -340,6 +341,9 @@ "y": "Y軸", "z": "Z軸" }, + "dangos": { + "dango_defender_hi": "Dango Defender (Hi)" + }, "font_name": "NotoSansTC-Bold.otf", "melody_effects": { "affinity_up": "Affinity Up", @@ -440,6 +444,12 @@ "wingclaws": "翼爪", "wings": "翅膀" }, + "skills": { + "burst": "Burst", + "dereliction": "Dereliction", + "intrepid_heart": "Intrepid Heart", + "kushala_daora_soul": "Kushala Daora Soul" + }, "unicode_glyph_ranges": [ 32, 255,