Module:Damage: Difference between revisions

Module:Damage (view source)

26 bytes added , 2 April 2022

no edit summary

70,868

edits

@@ Line 16: / Line 16: @@
          end
      end
+end
+function tableMerge(t1,t2)
+    for i=1,#t2 do
+        t1[#t1+1] = t2[i]
+    end
+    return t1
 end
@@ Line 111: / Line 118: @@
          end
      end
-    -- local ret = {}
-    -- for k,v in spairs(tvals) do
-    --     table.insert(ret, k..': '..v)
-    -- end
-    -- return table.concat(ret, " / ")
      -- get passives
@@ Line 137: / Line 137: @@
      pvals['total_damage_useful_passive1'] = fvals.total_damage_useful * passive1[1]
+    local ret1 = tableMerge(fvals, tvals)
+    ret1 = tableMerge(ret1, pvals)
      local ret = {}
-     for k,v in spairs(pvals) do
+     for k,v in spairs(ret1) do
          table.insert(ret, k..': '..v)
      end