ElEditors, Interface administrators, Administrators
70,868
edits
No edit summary |
No edit summary |
||
Line 18: | Line 18: | ||
end | end | ||
function tableMerge( | function tableMerge(first_table, second_table) | ||
for k,v in | for k,v in pairs(second_table) do first_table[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] | ||
tableMerge(fvals, tvals) | |||
local ret = {} | local ret = {} | ||
for k,v in spairs( | for k,v in spairs(fvals) do | ||
table.insert(ret, k..': '..v) | table.insert(ret, k..': '..v) | ||
end | end |