diff --git a/src/models/RolePlugin.lua b/src/models/RolePlugin.lua index cc1036c..42208c7 100644 --- a/src/models/RolePlugin.lua +++ b/src/models/RolePlugin.lua @@ -2787,8 +2787,8 @@ function RolePlugin.bind(Role) return self:getDeltaValue(result, value) + self:getDeltaValue(levelReault, value) end - local function appendBnous(dstBnous, srcBnous) - if not dstBnous or not srcBnous then return end + local function appendAdvBnous(dstBnous, srcBnous) + if not dstBnous and not srcBnous then return end for time, set in pairs(srcBnous) do if not dstBnous[time] then dstBnous[time] = {} @@ -2798,12 +2798,20 @@ function RolePlugin.bind(Role) end end end + + local function appendTableBnous(dstBnous, srcBnous) + if not dstBnous and not srcBnous then return end + for k, v in pairs(srcBnous) do + dstBnous[k] = (dstBnous[k] or 0) + v + end + end function Role:getBnousAdv() local towerBnous = self:getTowerBnousActive() local levelBnous = self:getLevelBnous() local adv = levelBnous[SystemBnousType.Adv] or {} - appendBnous(towerBnous[SystemBnousType.Adv], adv) - return towerBnous[SystemBnousType.Adv] or {} + towerBnous[SystemBnousType.Adv] = towerBnous[SystemBnousType.Adv] or {} + appendAdvBnous(towerBnous[SystemBnousType.Adv], adv) + return towerBnous[SystemBnousType.Adv] end function Role:getBnousHangTime() @@ -2817,16 +2825,18 @@ function RolePlugin.bind(Role) local towerBnous = self:getTowerBnousActive() local levelBnous = self:getLevelBnous() local pvpTicket = levelBnous[SystemBnousType.PvpTicket] or {} - appendBnous(towerBnous[SystemBnousType.PvpTicket], pvpTicket) - return towerBnous[SystemBnousType.PvpTicket] or {} + towerBnous[SystemBnousType.PvpTicket] = towerBnous[SystemBnousType.PvpTicket] or {} + appendTableBnous(towerBnous[SystemBnousType.PvpTicket], pvpTicket) + return towerBnous[SystemBnousType.PvpTicket] end function Role:getBnousSweep() local towerBnous = self:getTowerBnousActive() local levelBnous = self:getLevelBnous() local sweepReward = levelBnous[SystemBnousType.SweepReward] or {} - appendBnous(towerBnous[SystemBnousType.SweepReward], sweepReward) - return towerBnous[SystemBnousType.SweepReward] or {} + towerBnous[SystemBnousType.SweepReward] = towerBnous[SystemBnousType.SweepReward] or {} + appendTableBnous(towerBnous[SystemBnousType.SweepReward], sweepReward) + return towerBnous[SystemBnousType.SweepReward] end function Role:getBnousDismantlingMaximum() -- libgit2 0.21.2