Merge branch 'combat_table_updates' into 'master'

Makes combat tables for items refer back to their source item.

Adds a `self` property to `o.combat` and `o.special_combat` that refers back to item's full table. Combat tables tend to get passed around through various functions and callbacks and it can be difficult to connect a combat table to a full object. This makes the link two-way (`o.combat.self == o`).

This doesn't break saves, but any functionality dependent on the link *will* require a new save, as it only applies to newly generated items.

See merge request !693

@@ -732,6 +732,14 @@ function _M:finishEntity(level, type, e, ego_filter)
 		for i = 1, #s do e:stack(s[i], true) end
 	end
 
+	-- Add self-referential property to combat tables
+	if e.combat then
+		e.combat.self = e
+	end
+	if e.special_combat then
+		e.special_combat.self = e
+	end
+	
 	e:resolve(nil, true)
 	e:check("finish", e, self, level)
 	self:triggerHook{"Zone:finishEntity", type=type, e=e}