From 7f385320268543eb09a0f45f3b2d574af35862cf Mon Sep 17 00:00:00 2001 From: GreenComfyTea Date: Wed, 9 Aug 2023 16:09:13 +0300 Subject: [PATCH] Buffs: Use default values --- .../autorun/MHR_Overlay/Buffs/buffs.lua | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/reframework/autorun/MHR_Overlay/Buffs/buffs.lua b/reframework/autorun/MHR_Overlay/Buffs/buffs.lua index 7987384..7db5345 100644 --- a/reframework/autorun/MHR_Overlay/Buffs/buffs.lua +++ b/reframework/autorun/MHR_Overlay/Buffs/buffs.lua @@ -69,13 +69,20 @@ local get_value_method = system_array_type_def:get_method("GetValue(System.Int32 function this.new(type, key, name, level, duration) local is_infinite = false; - level = level or 1; + if name == nil then + name = utils.constants.uninitialized_string; + end if duration == nil then duration = 0; + end + + if duration == 0 then is_infinite = true; end + level = level or 1; + local buff = {}; buff.type = type; @@ -145,7 +152,7 @@ function this.update() if master_player_data ~= nil then consumables.update(master_player_data); endemic_life_buffs.update(master_player_data); - skills.update(master_player_data); + skills.update(master_player, master_player_data); dangos.update(master_player_data); else error_handler.report("buffs.update", "Failed to access Data: master_player_data"); @@ -174,10 +181,6 @@ function this.update() end end -function this.draw(buff, buff_UI, position_on_screen, opacity_scale) - buff_UI_entity.draw(buff, buff_UI, position_on_screen, opacity_scale); -end - function this.update_timer(buff, timer) if timer < 0 then timer = 0; @@ -194,6 +197,11 @@ function this.update_timer(buff, timer) end end +function this.draw(buff, buff_UI, position_on_screen, opacity_scale) + buff_UI_entity.draw(buff, buff_UI, position_on_screen, opacity_scale); +end + + function this.init_dependencies() config = require("MHR_Overlay.Misc.config"); buff_UI_entity = require("MHR_Overlay.UI.UI_Entities.buff_UI_entity");