diff --git a/src/actions/HangAction.lua b/src/actions/HangAction.lua index 00f27b3..bd64acc 100644 --- a/src/actions/HangAction.lua +++ b/src/actions/HangAction.lua @@ -761,27 +761,20 @@ local function workWinReward(role, bonusData, rewardType, count, sweep) end end - if rewardType == 3 then - reward = bonusData.reward:toNumMap() - for itemId, c in pairs(reward) do - reward[itemId] = c * count - end - for i = 1, count do - local chance = bonusData.chance:randWeight(true) - if chance[1] ~= 0 then - reward[chance[1]] = (reward[chance[1]] or 0) + chance[2] - end - end + reward = bonusData.reward:toNumMap() + for itemId, c in pairs(reward) do + reward[itemId] = c * count end - if sweep then - -- local bnousReward = role:getBnousSweep() - -- for key, value in pairs(bnousReward) do - -- reward[key] = (reward[key] or 0) + value * count - -- end + for i = 1, count do + local chance = bonusData.chance:randWeight(true) + print(chance) + dump(chance) + if chance[1] ~= 0 then + reward[chance[1]] = (reward[chance[1]] or 0) + chance[2] + end end reward, change = role:award(reward, {log = {desc = "workBattle", int1 = bonusData.id}}) - -- role:checkTaskEnter("BonusPass", {id = bonusData.id, count = count}) return reward, change end -- libgit2 0.21.2