Module:Damage: Difference between revisions

no edit summary
No edit summary
No edit summary
Line 18: Line 18:
end
end


function tableMerge(t1,t2)
function tableMerge(first_table, second_table)
     for k,v in spairs(t2) do
     for k,v in pairs(second_table) do first_table[k] = v end
        t1[#k] = v
    end
end
end


Line 137: Line 135:
     pvals['total_damage_useful_passive1'] = fvals.total_damage_useful * passive1[1]
     pvals['total_damage_useful_passive1'] = fvals.total_damage_useful * passive1[1]


     local ret1 = tableMerge(fvals, tvals)
     tableMerge(fvals, tvals)  


     local ret = {}
     local ret = {}
     for k,v in spairs(ret1) do
     for k,v in spairs(fvals) do
         table.insert(ret, k..': '..v)
         table.insert(ret, k..': '..v)
     end
     end