Fixed Leaves Tide to make the bleeding correctly attributed to the caster

git-svn-id: http://svn.net-core.org/repos/t-engine4@6012 51575b47-30f0-44d4-a5cc-537603b46e54

game/engines/default/engine/Entity.lua

@@ -848,8 +848,10 @@ function _M:loadList(file, no_default, res, mod, loaded)
 		newEntity = function(t)
 			-- Do we inherit things ?
 			if t.base then
-				local temp = table.clone(res[t.base], true, {uid=true, define_as = true})
-				if res[t.base].onEntityMerge then res[t.base]:onEntityMerge(temp) end
+				local base = res[t.base]
+				if not base and res.import_source then base = res.import_source[t.base] end
+				local temp = table.clone(base, true, {uid=true, define_as = true})
+				if base.onEntityMerge then base:onEntityMerge(temp) end
 				table.mergeAppendArray(temp, t, true)
 				t = temp
 				t.base = nil

game/modules/tome/data/damage_types.lua

@@ -2252,7 +2252,7 @@ newDamageType{
 		if target then
 			if src:reactionToward(target) < 0 then
 				local reapplied = target:hasEffect(target.EFF_CUT)
-				target:setEffect(target.EFF_CUT, 2, { power=dam.dam }, reapplied)
+				target:setEffect(target.EFF_CUT, 2, { power=dam.dam, src=src }, reapplied)
 			else
 				local reapplied = target:hasEffect(target.EFF_LEAVES_COVER)
 				target:setEffect(target.EFF_LEAVES_COVER, 1, { power=dam.chance }, reapplied)

game/modules/tome/data/zones/infinite-dungeon/npcs.lua

@@ -34,6 +34,7 @@ local function loadOuter(file)
 			e.can_talk = nil
 			e.on_acquire_target = nil
 		end
+--	end, {ignore_loaded=true, import_source=loading_list}, loaded)
 	end)
 	for i, e in ipairs(list) do
 		if e.allow_infinite_dungeon then